diff --git a/keyboards/akb/vero/mcuconf.h b/keyboards/akb/vero/mcuconf.h
index 3439c90d524a..bf2d83997cb2 100644
--- a/keyboards/akb/vero/mcuconf.h
+++ b/keyboards/akb/vero/mcuconf.h
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 /* Set PLL M divider from 4 (F411 GENERIC default) to 8, because of 16 MHz crystal on board */
 #undef STM32_PLLM_VALUE
 #define STM32_PLLM_VALUE                    8
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h b/keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h
index 0e5caa9f9a9d..c43f84e0de25 100644
--- a/keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/halconf.h
@@ -24,4 +24,4 @@
 #define SPI_USE_WAIT TRUE
 #define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
-#include_next "halconf.h"
+#include_next <halconf.h>
diff --git a/keyboards/bastardkb/charybdis/3x5/blackpill/mcuconf.h b/keyboards/bastardkb/charybdis/3x5/blackpill/mcuconf.h
index 3b9c9056f8c9..46b3b42f8b8a 100644
--- a/keyboards/bastardkb/charybdis/3x5/blackpill/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/3x5/blackpill/mcuconf.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #undef STM32_PWM_USE_TIM2
 #define STM32_PWM_USE_TIM2 TRUE
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h
index 9c4096701558..3defeed4dd64 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #if defined(KEYBOARD_bastardkb_charybdis_3x5_blackpill)
 #    undef STM32_I2C_USE_I2C1
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/mcuconf.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/mcuconf.h
index 0fdd67c3a29a..6aaf31428c12 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_2/mcuconf.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #undef RP_SPI_USE_SPI0
 #define RP_SPI_USE_SPI0 TRUE
diff --git a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/mcuconf.h b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/mcuconf.h
index 0fdd67c3a29a..6aaf31428c12 100644
--- a/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/3x5/v2/splinky_3/mcuconf.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #undef RP_SPI_USE_SPI0
 #define RP_SPI_USE_SPI0 TRUE
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h b/keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h
index 78885b687082..1ba700a80fa1 100644
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/halconf.h
@@ -24,4 +24,4 @@
 #define SPI_USE_WAIT TRUE
 #define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
-#include_next "halconf.h"
+#include_next <halconf.h>
diff --git a/keyboards/bastardkb/charybdis/3x6/blackpill/mcuconf.h b/keyboards/bastardkb/charybdis/3x6/blackpill/mcuconf.h
index 7adcb837deb8..e4cde4880be8 100644
--- a/keyboards/bastardkb/charybdis/3x6/blackpill/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/3x6/blackpill/mcuconf.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #undef STM32_PWM_USE_TIM2
 #define STM32_PWM_USE_TIM2 TRUE
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/mcuconf.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/mcuconf.h
index 0fdd67c3a29a..6aaf31428c12 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_2/mcuconf.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #undef RP_SPI_USE_SPI0
 #define RP_SPI_USE_SPI0 TRUE
diff --git a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/mcuconf.h b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/mcuconf.h
index 0fdd67c3a29a..6aaf31428c12 100644
--- a/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/3x6/v2/splinky_3/mcuconf.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #undef RP_SPI_USE_SPI0
 #define RP_SPI_USE_SPI0 TRUE
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h b/keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h
index 0e5caa9f9a9d..c43f84e0de25 100644
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/halconf.h
@@ -24,4 +24,4 @@
 #define SPI_USE_WAIT TRUE
 #define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 
-#include_next "halconf.h"
+#include_next <halconf.h>
diff --git a/keyboards/bastardkb/charybdis/4x6/blackpill/mcuconf.h b/keyboards/bastardkb/charybdis/4x6/blackpill/mcuconf.h
index 3b9c9056f8c9..46b3b42f8b8a 100644
--- a/keyboards/bastardkb/charybdis/4x6/blackpill/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/4x6/blackpill/mcuconf.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #undef STM32_PWM_USE_TIM2
 #define STM32_PWM_USE_TIM2 TRUE
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h
index 3a23d5f3707f..0541043c5384 100644
--- a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #if defined(KEYBOARD_bastardkb_charybdis_4x6_blackpill)
 #    undef STM32_PWM_USE_ADVANCED
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/mcuconf.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/mcuconf.h
index 0fdd67c3a29a..6aaf31428c12 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_2/mcuconf.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #undef RP_SPI_USE_SPI0
 #define RP_SPI_USE_SPI0 TRUE
diff --git a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/mcuconf.h b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/mcuconf.h
index 0fdd67c3a29a..6aaf31428c12 100644
--- a/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/4x6/v2/splinky_3/mcuconf.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #undef RP_SPI_USE_SPI0
 #define RP_SPI_USE_SPI0 TRUE
diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/halconf.h b/keyboards/bastardkb/dilemma/3x5_2/assembled/halconf.h
index 7a79bec953f6..57d15376d63a 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/assembled/halconf.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/halconf.h
@@ -19,4 +19,4 @@
 
 #define HAL_USE_SPI TRUE
 
-#include_next "halconf.h"
+#include_next <halconf.h>
diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/mcuconf.h b/keyboards/bastardkb/dilemma/3x5_2/assembled/mcuconf.h
index b54d705b5426..81821c159dca 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/assembled/mcuconf.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/mcuconf.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #undef RP_SPI_USE_SPI1
 #define RP_SPI_USE_SPI1 TRUE
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/halconf.h b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/halconf.h
index 135994a43cbc..906bd6519780 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/halconf.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/halconf.h
@@ -20,4 +20,4 @@
 #define HAL_USE_SPI TRUE
 #define HAL_USE_I2C TRUE
 
-#include_next "halconf.h"
+#include_next <halconf.h>
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/mcuconf.h b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/mcuconf.h
index f9aa8946657f..f194dd225ced 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/mcuconf.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/drashna/mcuconf.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #undef RP_SPI_USE_SPI1
 #define RP_SPI_USE_SPI1 TRUE
diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/halconf.h b/keyboards/bastardkb/dilemma/3x5_2/splinky/halconf.h
index a4c25c090a2e..2e098f5113d9 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/splinky/halconf.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/halconf.h
@@ -18,4 +18,4 @@
 
 #define HAL_USE_I2C TRUE
 
-#include_next "halconf.h"
+#include_next <halconf.h>
diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/mcuconf.h b/keyboards/bastardkb/dilemma/3x5_2/splinky/mcuconf.h
index 5e47eac54f95..c748d941e9a6 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/splinky/mcuconf.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/mcuconf.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #undef RP_I2C_USE_I2C1
 #define RP_I2C_USE_I2C1 TRUE
diff --git a/keyboards/bastardkb/dilemma/3x5_3/halconf.h b/keyboards/bastardkb/dilemma/3x5_3/halconf.h
index a3774605a8f7..b79b0f9e8867 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/halconf.h
+++ b/keyboards/bastardkb/dilemma/3x5_3/halconf.h
@@ -20,4 +20,4 @@
 #define HAL_USE_I2C TRUE
 #define HAL_USE_SPI TRUE
 
-#include_next "halconf.h"
+#include_next <halconf.h>
diff --git a/keyboards/bastardkb/dilemma/3x5_3/mcuconf.h b/keyboards/bastardkb/dilemma/3x5_3/mcuconf.h
index f9aa8946657f..f194dd225ced 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/mcuconf.h
+++ b/keyboards/bastardkb/dilemma/3x5_3/mcuconf.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #undef RP_SPI_USE_SPI1
 #define RP_SPI_USE_SPI1 TRUE
diff --git a/keyboards/controllerworks/mini36/halconf.h b/keyboards/controllerworks/mini36/halconf.h
index 1664802d6c8a..68ccc528d632 100644
--- a/keyboards/controllerworks/mini36/halconf.h
+++ b/keyboards/controllerworks/mini36/halconf.h
@@ -19,4 +19,4 @@
 
 #define HAL_USE_I2C TRUE
 
-#include_next "halconf.h"
+#include_next <halconf.h>
diff --git a/keyboards/controllerworks/mini36/mcuconf.h b/keyboards/controllerworks/mini36/mcuconf.h
index 7f0840c7a7df..c92e5035a842 100644
--- a/keyboards/controllerworks/mini36/mcuconf.h
+++ b/keyboards/controllerworks/mini36/mcuconf.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #undef RP_I2C_USE_I2C0
 #define RP_I2C_USE_I2C0 TRUE
\ No newline at end of file
diff --git a/keyboards/controllerworks/mini42/halconf.h b/keyboards/controllerworks/mini42/halconf.h
index 1664802d6c8a..68ccc528d632 100644
--- a/keyboards/controllerworks/mini42/halconf.h
+++ b/keyboards/controllerworks/mini42/halconf.h
@@ -19,4 +19,4 @@
 
 #define HAL_USE_I2C TRUE
 
-#include_next "halconf.h"
+#include_next <halconf.h>
diff --git a/keyboards/controllerworks/mini42/mcuconf.h b/keyboards/controllerworks/mini42/mcuconf.h
index 7f0840c7a7df..c92e5035a842 100644
--- a/keyboards/controllerworks/mini42/mcuconf.h
+++ b/keyboards/controllerworks/mini42/mcuconf.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #undef RP_I2C_USE_I2C0
 #define RP_I2C_USE_I2C0 TRUE
\ No newline at end of file
diff --git a/keyboards/drop/sense75/board.h b/keyboards/drop/sense75/board.h
index fc227f69b19e..5de178fa61c6 100644
--- a/keyboards/drop/sense75/board.h
+++ b/keyboards/drop/sense75/board.h
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#include_next "board.h"
+#include_next <board.h>
 
 #undef STM32_HSECLK
 #define STM32_HSECLK 16000000U
diff --git a/keyboards/halokeys/elemental75/chconf.h b/keyboards/halokeys/elemental75/chconf.h
index b780a0e77b2e..f826479adf30 100644
--- a/keyboards/halokeys/elemental75/chconf.h
+++ b/keyboards/halokeys/elemental75/chconf.h
@@ -18,4 +18,4 @@
 // so we need to change resolution and frequency to match.
 #define CH_CFG_ST_RESOLUTION 16
 #define CH_CFG_ST_FREQUENCY 10000
-#include_next "chconf.h"
+#include_next <chconf.h>
diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/mcuconf.h b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/mcuconf.h
index b8bb363d9123..f1a02293fd03 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/mcuconf.h
+++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/mcuconf.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #undef STM32_SERIAL_USE_USART1
 #define STM32_SERIAL_USE_USART1 TRUE
diff --git a/keyboards/handwired/macroboard/mcuconf.h b/keyboards/handwired/macroboard/mcuconf.h
index e62fb3341eaa..94fa17b95045 100644
--- a/keyboards/handwired/macroboard/mcuconf.h
+++ b/keyboards/handwired/macroboard/mcuconf.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #undef STM32_PWM_USE_TIM2
 #define STM32_PWM_USE_TIM2 TRUE
diff --git a/keyboards/handwired/onekey/blackpill_f401/mcuconf.h b/keyboards/handwired/onekey/blackpill_f401/mcuconf.h
index fcb7d84f9696..f69da38b271e 100644
--- a/keyboards/handwired/onekey/blackpill_f401/mcuconf.h
+++ b/keyboards/handwired/onekey/blackpill_f401/mcuconf.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #undef STM32_ADC_USE_ADC1
 #define STM32_ADC_USE_ADC1 TRUE
diff --git a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/mcuconf.h b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/mcuconf.h
index fcb7d84f9696..f69da38b271e 100755
--- a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/mcuconf.h
+++ b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/mcuconf.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #undef STM32_ADC_USE_ADC1
 #define STM32_ADC_USE_ADC1 TRUE
diff --git a/keyboards/handwired/onekey/blackpill_f411/mcuconf.h b/keyboards/handwired/onekey/blackpill_f411/mcuconf.h
index fcb7d84f9696..f69da38b271e 100644
--- a/keyboards/handwired/onekey/blackpill_f411/mcuconf.h
+++ b/keyboards/handwired/onekey/blackpill_f411/mcuconf.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #undef STM32_ADC_USE_ADC1
 #define STM32_ADC_USE_ADC1 TRUE
diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/mcuconf.h b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/mcuconf.h
index fcb7d84f9696..f69da38b271e 100755
--- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/mcuconf.h
+++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/mcuconf.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #undef STM32_ADC_USE_ADC1
 #define STM32_ADC_USE_ADC1 TRUE
diff --git a/keyboards/handwired/onekey/evb_wb32f3g71/mcuconf.h b/keyboards/handwired/onekey/evb_wb32f3g71/mcuconf.h
index 7ef36ff66c7d..322282b4b3cb 100644
--- a/keyboards/handwired/onekey/evb_wb32f3g71/mcuconf.h
+++ b/keyboards/handwired/onekey/evb_wb32f3g71/mcuconf.h
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #undef WB32_ADC_USE_ADC1
 #define WB32_ADC_USE_ADC1 TRUE
diff --git a/keyboards/handwired/onekey/evb_wb32fq95/mcuconf.h b/keyboards/handwired/onekey/evb_wb32fq95/mcuconf.h
index 7ef36ff66c7d..322282b4b3cb 100644
--- a/keyboards/handwired/onekey/evb_wb32fq95/mcuconf.h
+++ b/keyboards/handwired/onekey/evb_wb32fq95/mcuconf.h
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #undef WB32_ADC_USE_ADC1
 #define WB32_ADC_USE_ADC1 TRUE
diff --git a/keyboards/handwired/onekey/keymaps/default/keymap.c b/keyboards/handwired/onekey/keymaps/default/keymap.c
index a5782f7a1368..1c0375e56ccc 100644
--- a/keyboards/handwired/onekey/keymaps/default/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/default/keymap.c
@@ -1,3 +1,5 @@
+// Copyright 2020 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/handwired/onekey/nucleo_f446re/board.h b/keyboards/handwired/onekey/nucleo_f446re/board.h
new file mode 100644
index 000000000000..0c5f4dde799a
--- /dev/null
+++ b/keyboards/handwired/onekey/nucleo_f446re/board.h
@@ -0,0 +1,9 @@
+// Copyright 2023 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <board.h>
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 8000000U
+#define STM32_HSE_BYPASS
diff --git a/keyboards/handwired/onekey/nucleo_f446re/config.h b/keyboards/handwired/onekey/nucleo_f446re/config.h
new file mode 100644
index 000000000000..612cbf0eab08
--- /dev/null
+++ b/keyboards/handwired/onekey/nucleo_f446re/config.h
@@ -0,0 +1,16 @@
+// Copyright 2021 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include "config_common.h"
+
+#define BACKLIGHT_PWM_DRIVER  PWMD4
+#define BACKLIGHT_PWM_CHANNEL 3
+#define BACKLIGHT_PAL_MODE    2
+
+#define RGB_CI_PIN B13
+
+#define ADC_PIN A0
+
+#define SOLENOID_PINS { B12, B13, B14, B15 }
+#define SOLENOID_PINS_ACTIVE_STATE { high, high, low }
diff --git a/keyboards/handwired/onekey/nucleo_f446re/halconf.h b/keyboards/handwired/onekey/nucleo_f446re/halconf.h
new file mode 100644
index 000000000000..e3fd1cf6e1ad
--- /dev/null
+++ b/keyboards/handwired/onekey/nucleo_f446re/halconf.h
@@ -0,0 +1,10 @@
+// Copyright 2023 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define HAL_USE_ADC TRUE
+#define HAL_USE_SPI TRUE
+#define HAL_USE_I2C TRUE
+#define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/handwired/onekey/nucleo_f446re/info.json b/keyboards/handwired/onekey/nucleo_f446re/info.json
new file mode 100644
index 000000000000..6b9206f98731
--- /dev/null
+++ b/keyboards/handwired/onekey/nucleo_f446re/info.json
@@ -0,0 +1,15 @@
+{
+    "keyboard_name": "Onekey Nucleo F446RE",
+    "processor": "STM32F446",
+    "bootloader": "stm32-dfu",
+    "matrix_pins": {
+        "cols": ["A2"],
+        "rows": ["A1"]
+    },
+    "backlight": {
+        "pin": "B8"
+    },
+    "rgblight": {
+        "pin": "A0"
+    }
+}
diff --git a/keyboards/handwired/onekey/nucleo_f446re/mcuconf.h b/keyboards/handwired/onekey/nucleo_f446re/mcuconf.h
new file mode 100644
index 000000000000..701d61d31de8
--- /dev/null
+++ b/keyboards/handwired/onekey/nucleo_f446re/mcuconf.h
@@ -0,0 +1,23 @@
+// Copyright 2023 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PLLM_VALUE
+#define STM32_PLLM_VALUE 4
+
+#undef STM32_PLLSAIM_VALUE
+#define STM32_PLLSAIM_VALUE 4
+
+#undef STM32_ADC_USE_ADC1
+#define STM32_ADC_USE_ADC1 TRUE
+
+#undef STM32_PWM_USE_TIM4
+#define STM32_PWM_USE_TIM4 TRUE
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
+
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1 TRUE
diff --git a/keyboards/handwired/onekey/nucleo_f446re/readme.md b/keyboards/handwired/onekey/nucleo_f446re/readme.md
new file mode 100644
index 000000000000..c7d13cb97385
--- /dev/null
+++ b/keyboards/handwired/onekey/nucleo_f446re/readme.md
@@ -0,0 +1,5 @@
+# STM32 Nucleo-L432 onekey
+
+To trigger keypress, short together pins *A1* and *A2*.
+
+You'll also need to connect `VIN`, `GND`, USB `D+` to `PA12`/`D2`, and USB `D-` to `PA11`/`D10`.
diff --git a/keyboards/handwired/onekey/nucleo_f446re/rules.mk b/keyboards/handwired/onekey/nucleo_f446re/rules.mk
new file mode 100644
index 000000000000..8515c3fae029
--- /dev/null
+++ b/keyboards/handwired/onekey/nucleo_f446re/rules.mk
@@ -0,0 +1 @@
+SRC += analog.c
diff --git a/keyboards/handwired/onekey/proton_c/mcuconf.h b/keyboards/handwired/onekey/proton_c/mcuconf.h
index 935056eb6a42..5bf9e0544b88 100644
--- a/keyboards/handwired/onekey/proton_c/mcuconf.h
+++ b/keyboards/handwired/onekey/proton_c/mcuconf.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #undef STM32_ADC_USE_ADC1
 #define STM32_ADC_USE_ADC1 TRUE
diff --git a/keyboards/handwired/onekey/rp2040/mcuconf.h b/keyboards/handwired/onekey/rp2040/mcuconf.h
index 5c2587395d77..e24a0d4f24eb 100644
--- a/keyboards/handwired/onekey/rp2040/mcuconf.h
+++ b/keyboards/handwired/onekey/rp2040/mcuconf.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #undef RP_PWM_USE_PWM0
 #define RP_PWM_USE_PWM0 TRUE
diff --git a/keyboards/handwired/pill60/blackpill_f401/mcuconf.h b/keyboards/handwired/pill60/blackpill_f401/mcuconf.h
index a8b0a56602c6..ab89514fb1c7 100644
--- a/keyboards/handwired/pill60/blackpill_f401/mcuconf.h
+++ b/keyboards/handwired/pill60/blackpill_f401/mcuconf.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #undef STM32_I2C_USE_I2C1
 #define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/handwired/pill60/blackpill_f411/mcuconf.h b/keyboards/handwired/pill60/blackpill_f411/mcuconf.h
index a8b0a56602c6..ab89514fb1c7 100644
--- a/keyboards/handwired/pill60/blackpill_f411/mcuconf.h
+++ b/keyboards/handwired/pill60/blackpill_f411/mcuconf.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #undef STM32_I2C_USE_I2C1
 #define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/mcuconf.h b/keyboards/handwired/tractyl_manuform/5x6_right/f303/mcuconf.h
index 5525a077d27c..12add21a0a2c 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/mcuconf.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/mcuconf.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #undef STM32_I2C_USE_I2C1
 #define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/mcuconf.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/mcuconf.h
index fd71b54b77da..d3a21f72c4d3 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/mcuconf.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/mcuconf.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #undef STM32_I2C_USE_I2C1
 #define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/handwired/uthol/rev3/mcuconf.h b/keyboards/handwired/uthol/rev3/mcuconf.h
index 24fb0ef3a571..437f957fa653 100644
--- a/keyboards/handwired/uthol/rev3/mcuconf.h
+++ b/keyboards/handwired/uthol/rev3/mcuconf.h
@@ -16,7 +16,7 @@
  */
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #undef STM32_I2C_USE_I2C1
 #define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/keebio/sinc/rev3/halconf.h b/keyboards/keebio/sinc/rev3/halconf.h
index a4c25c090a2e..2e098f5113d9 100644
--- a/keyboards/keebio/sinc/rev3/halconf.h
+++ b/keyboards/keebio/sinc/rev3/halconf.h
@@ -18,4 +18,4 @@
 
 #define HAL_USE_I2C TRUE
 
-#include_next "halconf.h"
+#include_next <halconf.h>
diff --git a/keyboards/keebio/sinc/rev3/mcuconf.h b/keyboards/keebio/sinc/rev3/mcuconf.h
index 5e47eac54f95..c748d941e9a6 100644
--- a/keyboards/keebio/sinc/rev3/mcuconf.h
+++ b/keyboards/keebio/sinc/rev3/mcuconf.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #undef RP_I2C_USE_I2C1
 #define RP_I2C_USE_I2C1 TRUE
diff --git a/keyboards/kin80/blackpill401/mcuconf.h b/keyboards/kin80/blackpill401/mcuconf.h
index e614a9dfa93f..76250cb8962b 100644
--- a/keyboards/kin80/blackpill401/mcuconf.h
+++ b/keyboards/kin80/blackpill401/mcuconf.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #undef STM32_I2C_USE_I2C1
 #define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/kin80/blackpill411/mcuconf.h b/keyboards/kin80/blackpill411/mcuconf.h
index e614a9dfa93f..76250cb8962b 100644
--- a/keyboards/kin80/blackpill411/mcuconf.h
+++ b/keyboards/kin80/blackpill411/mcuconf.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #undef STM32_I2C_USE_I2C1
 #define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/linworks/whale75/chconf.h b/keyboards/linworks/whale75/chconf.h
index d32319aacf01..156fcf1ee2f4 100644
--- a/keyboards/linworks/whale75/chconf.h
+++ b/keyboards/linworks/whale75/chconf.h
@@ -14,4 +14,4 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include_next "chconf.h"
+#include_next <chconf.h>
diff --git a/keyboards/linworks/whale75/mcuconf.h b/keyboards/linworks/whale75/mcuconf.h
index 044994708660..f6dc94d2db20 100644
--- a/keyboards/linworks/whale75/mcuconf.h
+++ b/keyboards/linworks/whale75/mcuconf.h
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 // Underglow uses TIM4, Backlight TIM1, so both are enabled here.
 #undef STM32_PWM_USE_TIM1
diff --git a/keyboards/mino_plus/soldered/mcuconf.h b/keyboards/mino_plus/soldered/mcuconf.h
index c1d45157c733..7968bd26da87 100644
--- a/keyboards/mino_plus/soldered/mcuconf.h
+++ b/keyboards/mino_plus/soldered/mcuconf.h
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #undef STM32_I2C_USE_I2C1
 #define STM32_I2C_USE_I2C1 TRUE
\ No newline at end of file
diff --git a/keyboards/moonlander/mcuconf.h b/keyboards/moonlander/mcuconf.h
index 69f458a9377b..032c853f4ebc 100644
--- a/keyboards/moonlander/mcuconf.h
+++ b/keyboards/moonlander/mcuconf.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 // for i2c expander, and ISSI
 #undef STM32_I2C_USE_I2C1
diff --git a/keyboards/planck/ez/mcuconf.h b/keyboards/planck/ez/mcuconf.h
index 44035e782720..7475b0990c69 100644
--- a/keyboards/planck/ez/mcuconf.h
+++ b/keyboards/planck/ez/mcuconf.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 // for i2c expander, and ISSI
 #undef STM32_I2C_USE_I2C1
diff --git a/keyboards/planck/rev6/mcuconf.h b/keyboards/planck/rev6/mcuconf.h
index dde67871cdda..540e708a6ee9 100644
--- a/keyboards/planck/rev6/mcuconf.h
+++ b/keyboards/planck/rev6/mcuconf.h
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 // The SysTick timer from the normal quantum/stm32 uses TIM2 -- the WS2812 pin used
 // on the Planck requires the use of TIM2 to run PWM -- rework which timers are
diff --git a/keyboards/planck/rev6_drop/mcuconf.h b/keyboards/planck/rev6_drop/mcuconf.h
index d7c29fcf65be..20337afbb27c 100644
--- a/keyboards/planck/rev6_drop/mcuconf.h
+++ b/keyboards/planck/rev6_drop/mcuconf.h
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 // The SysTick timer from the normal quantum/stm32 uses TIM2 -- the WS2812 pin used
 // on the Planck requires the use of TIM2 to run PWM -- rework which timers are
diff --git a/keyboards/preonic/rev3/mcuconf.h b/keyboards/preonic/rev3/mcuconf.h
index fbc4e7ca62ee..f534faccaf1e 100644
--- a/keyboards/preonic/rev3/mcuconf.h
+++ b/keyboards/preonic/rev3/mcuconf.h
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 // The SysTick timer from the normal quantum/stm32 uses TIM2 -- the WS2812 pin used
 // on the Planck requires the use of TIM2 to run PWM -- rework which timers are
diff --git a/keyboards/preonic/rev3_drop/mcuconf.h b/keyboards/preonic/rev3_drop/mcuconf.h
index b51bf6708e73..838a3bb69ee1 100644
--- a/keyboards/preonic/rev3_drop/mcuconf.h
+++ b/keyboards/preonic/rev3_drop/mcuconf.h
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 // The SysTick timer from the normal quantum/stm32 uses TIM2 -- the WS2812 pin used
 // on the Planck requires the use of TIM2 to run PWM -- rework which timers are
diff --git a/keyboards/splitkb/kyria/rev1/proton_c/chconf.h b/keyboards/splitkb/kyria/rev1/proton_c/chconf.h
index 7ca1d3d24310..8833e3d746fb 100644
--- a/keyboards/splitkb/kyria/rev1/proton_c/chconf.h
+++ b/keyboards/splitkb/kyria/rev1/proton_c/chconf.h
@@ -19,4 +19,4 @@
 #define CH_CFG_ST_RESOLUTION 16
 #define CH_CFG_ST_FREQUENCY  10000
 
-#include_next "chconf.h"
+#include_next <chconf.h>
diff --git a/keyboards/splitkb/kyria/rev2/proton_c/chconf.h b/keyboards/splitkb/kyria/rev2/proton_c/chconf.h
index 7ca1d3d24310..8833e3d746fb 100644
--- a/keyboards/splitkb/kyria/rev2/proton_c/chconf.h
+++ b/keyboards/splitkb/kyria/rev2/proton_c/chconf.h
@@ -19,4 +19,4 @@
 #define CH_CFG_ST_RESOLUTION 16
 #define CH_CFG_ST_FREQUENCY  10000
 
-#include_next "chconf.h"
+#include_next <chconf.h>
diff --git a/keyboards/teleport/native/mcuconf.h b/keyboards/teleport/native/mcuconf.h
index 8b5d373bc3e1..ff40f7ec9d9c 100644
--- a/keyboards/teleport/native/mcuconf.h
+++ b/keyboards/teleport/native/mcuconf.h
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 /* Set PLL M divider from 4 (F411 GENERIC default) to 8, because of 16 MHz crystal on board */
 #undef STM32_PLLM_VALUE
diff --git a/keyboards/tzarc/ghoul/rev1/stm32/board.h b/keyboards/tzarc/ghoul/rev1/stm32/board.h
index 5379bd4a179b..aadaac044934 100644
--- a/keyboards/tzarc/ghoul/rev1/stm32/board.h
+++ b/keyboards/tzarc/ghoul/rev1/stm32/board.h
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 #pragma once
 
-#include_next "board.h"
+#include_next <board.h>
 
 #ifdef BOARD_OTG_NOVBUSSENS
 #    undef BOARD_OTG_NOVBUSSENS
diff --git a/keyboards/weirdo/geminate60/chconf.h b/keyboards/weirdo/geminate60/chconf.h
index d58807924a00..a70b65c879d4 100644
--- a/keyboards/weirdo/geminate60/chconf.h
+++ b/keyboards/weirdo/geminate60/chconf.h
@@ -18,4 +18,4 @@
 // so we need to change resolution and frequency to match.
 #define CH_CFG_ST_RESOLUTION 16
 #define CH_CFG_ST_FREQUENCY 10000
-#include_next "chconf.h"
+#include_next <chconf.h>
diff --git a/keyboards/yandrstudio/buff67v3/board.h b/keyboards/yandrstudio/buff67v3/board.h
index d83804babdf7..e474f8ab33ff 100644
--- a/keyboards/yandrstudio/buff67v3/board.h
+++ b/keyboards/yandrstudio/buff67v3/board.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include_next "board.h"
+#include_next <board.h>
 
 #undef STM32_HSECLK
 #define STM32_HSECLK 16000000
diff --git a/keyboards/yandrstudio/eau87/board.h b/keyboards/yandrstudio/eau87/board.h
index d83804babdf7..e474f8ab33ff 100644
--- a/keyboards/yandrstudio/eau87/board.h
+++ b/keyboards/yandrstudio/eau87/board.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include_next "board.h"
+#include_next <board.h>
 
 #undef STM32_HSECLK
 #define STM32_HSECLK 16000000
diff --git a/keyboards/yandrstudio/eau_r2/board.h b/keyboards/yandrstudio/eau_r2/board.h
index a667bee461b6..49270b36a050 100644
--- a/keyboards/yandrstudio/eau_r2/board.h
+++ b/keyboards/yandrstudio/eau_r2/board.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include_next "board.h"
+#include_next <board.h>
 
 #undef STM32_HSECLK
 #define STM32_HSECLK 16000000
diff --git a/keyboards/yandrstudio/nightstar75/board.h b/keyboards/yandrstudio/nightstar75/board.h
index d83804babdf7..e474f8ab33ff 100644
--- a/keyboards/yandrstudio/nightstar75/board.h
+++ b/keyboards/yandrstudio/nightstar75/board.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include_next "board.h"
+#include_next <board.h>
 
 #undef STM32_HSECLK
 #define STM32_HSECLK 16000000
diff --git a/keyboards/yandrstudio/nz64/board.h b/keyboards/yandrstudio/nz64/board.h
index 8a068cd8831c..aaa6d1e5f4c9 100644
--- a/keyboards/yandrstudio/nz64/board.h
+++ b/keyboards/yandrstudio/nz64/board.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include_next "board.h"
+#include_next <board.h>
 
 #undef STM32_HSECLK
 #define STM32_HSECLK 16000000
diff --git a/keyboards/yandrstudio/nz67v2/board.h b/keyboards/yandrstudio/nz67v2/board.h
index a667bee461b6..49270b36a050 100644
--- a/keyboards/yandrstudio/nz67v2/board.h
+++ b/keyboards/yandrstudio/nz67v2/board.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include_next "board.h"
+#include_next <board.h>
 
 #undef STM32_HSECLK
 #define STM32_HSECLK 16000000
diff --git a/keyboards/yandrstudio/tg67/board.h b/keyboards/yandrstudio/tg67/board.h
index d83804babdf7..e474f8ab33ff 100644
--- a/keyboards/yandrstudio/tg67/board.h
+++ b/keyboards/yandrstudio/tg67/board.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include_next "board.h"
+#include_next <board.h>
 
 #undef STM32_HSECLK
 #define STM32_HSECLK 16000000
diff --git a/keyboards/yandrstudio/wave75/board.h b/keyboards/yandrstudio/wave75/board.h
index d83804babdf7..e474f8ab33ff 100644
--- a/keyboards/yandrstudio/wave75/board.h
+++ b/keyboards/yandrstudio/wave75/board.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include_next "board.h"
+#include_next <board.h>
 
 #undef STM32_HSECLK
 #define STM32_HSECLK 16000000
diff --git a/keyboards/yandrstudio/yr6095/board.h b/keyboards/yandrstudio/yr6095/board.h
index d83804babdf7..e474f8ab33ff 100644
--- a/keyboards/yandrstudio/yr6095/board.h
+++ b/keyboards/yandrstudio/yr6095/board.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include_next "board.h"
+#include_next <board.h>
 
 #undef STM32_HSECLK
 #define STM32_HSECLK 16000000
diff --git a/keyboards/yandrstudio/yr80/board.h b/keyboards/yandrstudio/yr80/board.h
index 0723a9c6b5e9..b33982f7e66f 100644
--- a/keyboards/yandrstudio/yr80/board.h
+++ b/keyboards/yandrstudio/yr80/board.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include_next "board.h"
+#include_next <board.h>
 
 #undef STM32_HSECLK
 #define STM32_HSECLK 16000000
diff --git a/keyboards/yandrstudio/zhou65/board.h b/keyboards/yandrstudio/zhou65/board.h
index 8a068cd8831c..aaa6d1e5f4c9 100644
--- a/keyboards/yandrstudio/zhou65/board.h
+++ b/keyboards/yandrstudio/zhou65/board.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include_next "board.h"
+#include_next <board.h>
 
 #undef STM32_HSECLK
 #define STM32_HSECLK 16000000
diff --git a/layouts/community/split_3x6_3/drashna/chconf.h b/layouts/community/split_3x6_3/drashna/chconf.h
index 9dbc78b97301..1e277d357dd3 100644
--- a/layouts/community/split_3x6_3/drashna/chconf.h
+++ b/layouts/community/split_3x6_3/drashna/chconf.h
@@ -7,5 +7,5 @@
 #if __has_include("platforms/chibios/common/configs/chconf.h")
 #    include_next "platforms/chibios/common/configs/chconf.h"
 #else
-#    include_next "chconf.h"
+#    include_next <chconf.h>
 #endif
diff --git a/lib/python/qmk/cli/lint.py b/lib/python/qmk/cli/lint.py
index c67809a697d9..897a6c4c0d0d 100644
--- a/lib/python/qmk/cli/lint.py
+++ b/lib/python/qmk/cli/lint.py
@@ -12,6 +12,8 @@
 from qmk.git import git_get_ignored_files
 from qmk.c_parse import c_source_files
 
+CHIBIOS_CONF_CHECKS = ['chconf.h', 'halconf.h', 'mcuconf.h', 'board.h']
+
 
 def _list_defaultish_keymaps(kb):
     """Return default like keymaps for a given keyboard
@@ -64,6 +66,15 @@ def _handle_json_errors(kb, info):
     return ok
 
 
+def _chibios_conf_includenext_check(target):
+    """Check the ChibiOS conf.h for the correct inclusion of the next conf.h
+    """
+    for i, line in enumerate(target.open()):
+        if f'#include_next "{target.name}"' in line:
+            return f'Found `#include_next "{target.name}"` on line {i} of {target}, should be `#include_next <{target.name}>` (use angle brackets, not quotes)'
+    return None
+
+
 def _rules_mk_assignment_only(kb):
     """Check the keyboard-level rules.mk to ensure it only has assignments.
     """
@@ -121,6 +132,12 @@ def keymap_check(kb, km):
             cli.log.error(f'{kb}/{km}: The file "{file}" does not have a license header!')
             ok = False
 
+        if file.name in CHIBIOS_CONF_CHECKS:
+            check_error = _chibios_conf_includenext_check(file)
+            if check_error is not None:
+                cli.log.error(f'{kb}/{km}: {check_error}')
+                ok = False
+
     return ok
 
 
@@ -153,6 +170,12 @@ def keyboard_check(kb):
             cli.log.error(f'{kb}: The file "{file}" does not have a license header!')
             ok = False
 
+        if file.name in CHIBIOS_CONF_CHECKS:
+            check_error = _chibios_conf_includenext_check(file)
+            if check_error is not None:
+                cli.log.error(f'{kb}: {check_error}')
+                ok = False
+
     return ok
 
 
diff --git a/platforms/chibios/boards/BLACKPILL_STM32_F401/configs/board.h b/platforms/chibios/boards/BLACKPILL_STM32_F401/configs/board.h
index 78dcbac05c89..772204ae5d79 100644
--- a/platforms/chibios/boards/BLACKPILL_STM32_F401/configs/board.h
+++ b/platforms/chibios/boards/BLACKPILL_STM32_F401/configs/board.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include_next "board.h"
+#include_next <board.h>
 
 // Force B9 as input to align with qmk defaults
 #undef VAL_GPIOB_MODER
diff --git a/platforms/chibios/boards/BLACKPILL_STM32_F411/configs/board.h b/platforms/chibios/boards/BLACKPILL_STM32_F411/configs/board.h
index 30af6b0c8608..81c80b27731e 100644
--- a/platforms/chibios/boards/BLACKPILL_STM32_F411/configs/board.h
+++ b/platforms/chibios/boards/BLACKPILL_STM32_F411/configs/board.h
@@ -15,6 +15,6 @@
  */
 #pragma once
 
-#include_next "board.h"
+#include_next <board.h>
 
 #undef STM32_HSE_BYPASS
diff --git a/platforms/chibios/boards/BONSAI_C4/configs/board.h b/platforms/chibios/boards/BONSAI_C4/configs/board.h
index f1ee51c91f59..372b9bb8bc3d 100644
--- a/platforms/chibios/boards/BONSAI_C4/configs/board.h
+++ b/platforms/chibios/boards/BONSAI_C4/configs/board.h
@@ -15,6 +15,6 @@
  */
 #pragma once
 
-#include_next "board.h"
+#include_next <board.h>
 
 #undef STM32_HSE_BYPASS
\ No newline at end of file
diff --git a/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/board.h b/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/board.h
index b4363595d019..f0e959589651 100644
--- a/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/board.h
+++ b/platforms/chibios/boards/GENERIC_PROMICRO_RP2040/configs/board.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include_next "board.h"
+#include_next <board.h>
 
 #undef BOARD_RP_PICO_RP2040
 #define BOARD_GENERIC_PROMICRO_RP2040
diff --git a/platforms/chibios/boards/GENERIC_RP_RP2040/configs/board.h b/platforms/chibios/boards/GENERIC_RP_RP2040/configs/board.h
index 052050c94498..89f4f0d61cd7 100644
--- a/platforms/chibios/boards/GENERIC_RP_RP2040/configs/board.h
+++ b/platforms/chibios/boards/GENERIC_RP_RP2040/configs/board.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include_next "board.h"
+#include_next <board.h>
 
 #undef BOARD_RP_PICO_RP2040
 #define BOARD_GENERIC_RP2040
diff --git a/platforms/chibios/boards/GENERIC_STM32_F072XB/configs/board.h b/platforms/chibios/boards/GENERIC_STM32_F072XB/configs/board.h
index 30af6b0c8608..81c80b27731e 100644
--- a/platforms/chibios/boards/GENERIC_STM32_F072XB/configs/board.h
+++ b/platforms/chibios/boards/GENERIC_STM32_F072XB/configs/board.h
@@ -15,6 +15,6 @@
  */
 #pragma once
 
-#include_next "board.h"
+#include_next <board.h>
 
 #undef STM32_HSE_BYPASS
diff --git a/platforms/chibios/boards/GENERIC_STM32_F303XC/configs/board.h b/platforms/chibios/boards/GENERIC_STM32_F303XC/configs/board.h
index 97159964d054..4bca351422ff 100644
--- a/platforms/chibios/boards/GENERIC_STM32_F303XC/configs/board.h
+++ b/platforms/chibios/boards/GENERIC_STM32_F303XC/configs/board.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include_next "board.h"
+#include_next <board.h>
 
 #undef STM32_HSE_BYPASS
 
diff --git a/platforms/chibios/boards/GENERIC_STM32_F401XC/configs/board.h b/platforms/chibios/boards/GENERIC_STM32_F401XC/configs/board.h
index 78dcbac05c89..772204ae5d79 100644
--- a/platforms/chibios/boards/GENERIC_STM32_F401XC/configs/board.h
+++ b/platforms/chibios/boards/GENERIC_STM32_F401XC/configs/board.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include_next "board.h"
+#include_next <board.h>
 
 // Force B9 as input to align with qmk defaults
 #undef VAL_GPIOB_MODER
diff --git a/platforms/chibios/boards/GENERIC_STM32_F405XG/configs/board.h b/platforms/chibios/boards/GENERIC_STM32_F405XG/configs/board.h
index 8cb771bc12f9..e8e43f1567dc 100644
--- a/platforms/chibios/boards/GENERIC_STM32_F405XG/configs/board.h
+++ b/platforms/chibios/boards/GENERIC_STM32_F405XG/configs/board.h
@@ -19,7 +19,7 @@
 // The following is required to disable the pull-down on PA9, when PA9 is used for the keyboard matrix:
 #define BOARD_OTG_NOVBUSSENS
 
-#include_next "board.h"
+#include_next <board.h>
 
 #undef STM32_HSE_BYPASS
 
diff --git a/platforms/chibios/boards/GENERIC_STM32_F407XE/configs/board.h b/platforms/chibios/boards/GENERIC_STM32_F407XE/configs/board.h
index 22c4e4cd7e69..a0d53d86e7c7 100644
--- a/platforms/chibios/boards/GENERIC_STM32_F407XE/configs/board.h
+++ b/platforms/chibios/boards/GENERIC_STM32_F407XE/configs/board.h
@@ -19,6 +19,6 @@
 // The following is required to disable the pull-down on PA9, when PA9 is used for the keyboard matrix:
 #define BOARD_OTG_NOVBUSSENS
 
-#include_next "board.h"
+#include_next <board.h>
 
 #undef STM32_HSE_BYPASS
\ No newline at end of file
diff --git a/platforms/chibios/boards/GENERIC_STM32_F411XE/configs/board.h b/platforms/chibios/boards/GENERIC_STM32_F411XE/configs/board.h
index 30af6b0c8608..81c80b27731e 100644
--- a/platforms/chibios/boards/GENERIC_STM32_F411XE/configs/board.h
+++ b/platforms/chibios/boards/GENERIC_STM32_F411XE/configs/board.h
@@ -15,6 +15,6 @@
  */
 #pragma once
 
-#include_next "board.h"
+#include_next <board.h>
 
 #undef STM32_HSE_BYPASS
diff --git a/platforms/chibios/boards/GENERIC_STM32_F446XE/configs/board.h b/platforms/chibios/boards/GENERIC_STM32_F446XE/configs/board.h
index 80dfcffa991b..f05762c9b4d5 100644
--- a/platforms/chibios/boards/GENERIC_STM32_F446XE/configs/board.h
+++ b/platforms/chibios/boards/GENERIC_STM32_F446XE/configs/board.h
@@ -19,6 +19,6 @@
 // The following is required to disable the pull-down on PA9, when PA9 is used for the keyboard matrix:
 #define BOARD_OTG_NOVBUSSENS
 
-#include_next "board.h"
+#include_next <board.h>
 
 #undef STM32_HSE_BYPASS
diff --git a/platforms/chibios/boards/GENERIC_STM32_L412XB/configs/board.h b/platforms/chibios/boards/GENERIC_STM32_L412XB/configs/board.h
index de5f85acdd99..1f7183f1e7a0 100644
--- a/platforms/chibios/boards/GENERIC_STM32_L412XB/configs/board.h
+++ b/platforms/chibios/boards/GENERIC_STM32_L412XB/configs/board.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include_next "board.h"
+#include_next <board.h>
 
 #undef STM32L432xx
 #define STM32L422xx
diff --git a/platforms/chibios/boards/GENERIC_STM32_L433XC/configs/board.h b/platforms/chibios/boards/GENERIC_STM32_L433XC/configs/board.h
index 2e37d95fe39a..1075f50cada8 100644
--- a/platforms/chibios/boards/GENERIC_STM32_L433XC/configs/board.h
+++ b/platforms/chibios/boards/GENERIC_STM32_L433XC/configs/board.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include_next "board.h"
+#include_next <board.h>
 
 #undef STM32L432xx
 
diff --git a/platforms/chibios/boards/QMK_PM2040/configs/board.h b/platforms/chibios/boards/QMK_PM2040/configs/board.h
index 433e1c527fb6..371c1a0dca86 100644
--- a/platforms/chibios/boards/QMK_PM2040/configs/board.h
+++ b/platforms/chibios/boards/QMK_PM2040/configs/board.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include_next "board.h"
+#include_next <board.h>
 
 #undef BOARD_RP_PICO_RP2040
 #define BOARD_PM2040
diff --git a/platforms/chibios/boards/QMK_PROTON_C/configs/board.h b/platforms/chibios/boards/QMK_PROTON_C/configs/board.h
index 97159964d054..4bca351422ff 100644
--- a/platforms/chibios/boards/QMK_PROTON_C/configs/board.h
+++ b/platforms/chibios/boards/QMK_PROTON_C/configs/board.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include_next "board.h"
+#include_next <board.h>
 
 #undef STM32_HSE_BYPASS
 
diff --git a/platforms/chibios/boards/STEMCELL/configs/board.h b/platforms/chibios/boards/STEMCELL/configs/board.h
index 39cf79ab0949..33464e7eb8e5 100644
--- a/platforms/chibios/boards/STEMCELL/configs/board.h
+++ b/platforms/chibios/boards/STEMCELL/configs/board.h
@@ -3,6 +3,6 @@
 
 #pragma once
 
-#include_next "board.h"
+#include_next <board.h>
 
 #undef STM32_HSE_BYPASS