diff --git a/keyboards/1upkeyboards/pi60/config.h b/keyboards/1upkeyboards/pi60/config.h
index 24a8d9218bb4..3ba6144e597c 100644
--- a/keyboards/1upkeyboards/pi60/config.h
+++ b/keyboards/1upkeyboards/pi60/config.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include "config_common.h"
-
 #define DYNAMIC_KEYMAP_LAYER_COUNT 10
 
 #define RGB_DI_PIN GP17
diff --git a/keyboards/25keys/zinc/rev1/post_config.h b/keyboards/25keys/zinc/rev1/post_config.h
index 54608f8f67b2..15857d3b0b30 100644
--- a/keyboards/25keys/zinc/rev1/post_config.h
+++ b/keyboards/25keys/zinc/rev1/post_config.h
@@ -15,6 +15,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#pragma once
+
 // RGB LED support
 // see ./rules.mk: LED_ANIMATIONS = yes or no
 //    see ./rules.mk: LED_BACK_ENABLE or LED_UNDERGLOW_ENABLE set yes
diff --git a/keyboards/25keys/zinc/reva/post_config.h b/keyboards/25keys/zinc/reva/post_config.h
index 54608f8f67b2..15857d3b0b30 100644
--- a/keyboards/25keys/zinc/reva/post_config.h
+++ b/keyboards/25keys/zinc/reva/post_config.h
@@ -15,6 +15,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#pragma once
+
 // RGB LED support
 // see ./rules.mk: LED_ANIMATIONS = yes or no
 //    see ./rules.mk: LED_BACK_ENABLE or LED_UNDERGLOW_ENABLE set yes
diff --git a/keyboards/adkb96/rev1/config.h b/keyboards/adkb96/rev1/config.h
index b8ab452acc40..c5a96736718f 100644
--- a/keyboards/adkb96/rev1/config.h
+++ b/keyboards/adkb96/rev1/config.h
@@ -16,6 +16,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#pragma once
+
 // wiring of each half
 #define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 }
diff --git a/keyboards/adm42/rev4/config.h b/keyboards/adm42/rev4/config.h
index 9ad330d8f79e..c03603b011ae 100644
--- a/keyboards/adm42/rev4/config.h
+++ b/keyboards/adm42/rev4/config.h
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #define MATRIX_COL_PINS { C6, B6, B5, B4, D7, D6, F0, F1, F4, F5, F6, F7 }
 #define MATRIX_ROW_PINS { C7, D5, D3, D2 }
 
diff --git a/keyboards/adpenrose/kintsugi/post_config.h b/keyboards/adpenrose/kintsugi/post_config.h
index e1f92f9e6023..36913903f757 100644
--- a/keyboards/adpenrose/kintsugi/post_config.h
+++ b/keyboards/adpenrose/kintsugi/post_config.h
@@ -15,6 +15,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#pragma once
+
 #ifndef OLED_FONT_H
 #    define OLED_FONT_H "lib/kintsugifont.c"
 #	 define OLED_TIMEOUT 120000
diff --git a/keyboards/akb/vero/mcuconf.h b/keyboards/akb/vero/mcuconf.h
index bf2d83997cb2..e93fdc1d2365 100644
--- a/keyboards/akb/vero/mcuconf.h
+++ b/keyboards/akb/vero/mcuconf.h
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #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/atlantis/encoder_actions.h b/keyboards/atlantis/encoder_actions.h
index 2484af52ae18..1a7fb72014de 100644
--- a/keyboards/atlantis/encoder_actions.h
+++ b/keyboards/atlantis/encoder_actions.h
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #include "quantum.h"
 
 void encoder_action_unregister(void);
diff --git a/keyboards/binepad/bnr1/v2/config.h b/keyboards/binepad/bnr1/v2/config.h
index 7fbf1cfab1a3..c408f95d383d 100644
--- a/keyboards/binepad/bnr1/v2/config.h
+++ b/keyboards/binepad/bnr1/v2/config.h
@@ -3,7 +3,5 @@
 
 #pragma once
 
-#include "config_common.h"
-
 #define WEAR_LEVELING_LOGICAL_SIZE 1024
 #define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
diff --git a/keyboards/cannonkeys/ortho60v2/mcuconf.h b/keyboards/cannonkeys/ortho60v2/mcuconf.h
index 533c3f1e2300..75a6bb41ec7c 100644
--- a/keyboards/cannonkeys/ortho60v2/mcuconf.h
+++ b/keyboards/cannonkeys/ortho60v2/mcuconf.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 #undef RP_PWM_USE_PWM6
 #define RP_PWM_USE_PWM6 TRUE
diff --git a/keyboards/capsunlocked/cu80/v2_iso/rgb/config.h b/keyboards/capsunlocked/cu80/v2_iso/rgb/config.h
index 4d15aca40ccb..3fe745d27846 100644
--- a/keyboards/capsunlocked/cu80/v2_iso/rgb/config.h
+++ b/keyboards/capsunlocked/cu80/v2_iso/rgb/config.h
@@ -15,6 +15,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#pragma once
+
 /* enable RGB matrix */
 #define CU80_RGB
 
diff --git a/keyboards/clueboard/2x1800/2021/font.h b/keyboards/clueboard/2x1800/2021/font.h
index 5ddcbfba56f5..191d11dcee54 100644
--- a/keyboards/clueboard/2x1800/2021/font.h
+++ b/keyboards/clueboard/2x1800/2021/font.h
@@ -24,6 +24,8 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#pragma once
+
 // Top row of keyboard, when shift held
 #define CHR_TILDE      {0b00110000, 0b01000000, 0b00110000, 0b00001000, 0b00110000, 0b00000000}
 #define CHR_BANG       {0b00000000, 0b00000000, 0b11111010, 0b10000000, 0b00000000, 0b00000000}
diff --git a/keyboards/doio/kb38/config.h b/keyboards/doio/kb38/config.h
index ba8eb14a1194..416219d5c74b 100644
--- a/keyboards/doio/kb38/config.h
+++ b/keyboards/doio/kb38/config.h
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
-#include "config_common.h"
 
 #define RGB_DI_PIN F6
 #define RGB_MATRIX_LED_COUNT 44
diff --git a/keyboards/duck/eagle_viper/v2/indicator_leds.h b/keyboards/duck/eagle_viper/v2/indicator_leds.h
index fe66eef6b2fc..2c6f13101d4a 100644
--- a/keyboards/duck/eagle_viper/v2/indicator_leds.h
+++ b/keyboards/duck/eagle_viper/v2/indicator_leds.h
@@ -1 +1,3 @@
+#pragma once
+
 void indicator_leds_set(bool leds[8]);
diff --git a/keyboards/duck/lightsaver/indicator_leds.h b/keyboards/duck/lightsaver/indicator_leds.h
index fe66eef6b2fc..2c6f13101d4a 100644
--- a/keyboards/duck/lightsaver/indicator_leds.h
+++ b/keyboards/duck/lightsaver/indicator_leds.h
@@ -1 +1,3 @@
+#pragma once
+
 void indicator_leds_set(bool leds[8]);
diff --git a/keyboards/duck/octagon/v2/indicator_leds.h b/keyboards/duck/octagon/v2/indicator_leds.h
index 2c1bfe562435..9d89e3e3d17d 100644
--- a/keyboards/duck/octagon/v2/indicator_leds.h
+++ b/keyboards/duck/octagon/v2/indicator_leds.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #include "duck_led/duck_led.h"
 
 void indicator_leds_set(bool leds[7]);
diff --git a/keyboards/duck/tcv3/indicator_leds.h b/keyboards/duck/tcv3/indicator_leds.h
index ad3ec54f52a9..9bd437084d9c 100644
--- a/keyboards/duck/tcv3/indicator_leds.h
+++ b/keyboards/duck/tcv3/indicator_leds.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #include "duck_led/duck_led.h"
 
 void indicator_leds_set(bool leds[8]);
diff --git a/keyboards/ergodox_stm32/board.h b/keyboards/ergodox_stm32/board.h
index 23f949578944..c1c37c065998 100644
--- a/keyboards/ergodox_stm32/board.h
+++ b/keyboards/ergodox_stm32/board.h
@@ -15,6 +15,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#pragma once
+
 #include_next <board.h>
 
 #ifdef STM32_LSECLK
diff --git a/keyboards/gboards/engine/config.h b/keyboards/gboards/engine/config.h
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/keyboards/geekboards/macropad_v2/config.h b/keyboards/geekboards/macropad_v2/config.h
index eb9850804f97..eb01b1ad1373 100644
--- a/keyboards/geekboards/macropad_v2/config.h
+++ b/keyboards/geekboards/macropad_v2/config.h
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #define RGBLED_NUM 42
 #define RGB_MATRIX_LED_COUNT 42
 #define RGB_DI_PIN A7
diff --git a/keyboards/handwired/onekey/bluepill_f103c6/board.h b/keyboards/handwired/onekey/bluepill_f103c6/board.h
index 4889f351a65e..7513db63edbf 100644
--- a/keyboards/handwired/onekey/bluepill_f103c6/board.h
+++ b/keyboards/handwired/onekey/bluepill_f103c6/board.h
@@ -1,5 +1,8 @@
 // Copyright 2022 Sergey Vlasov (@sigprof)
 // SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
 #include_next <board.h>
 
 #undef STM32F103xB
diff --git a/keyboards/hineybush/h87a/config.h b/keyboards/hineybush/h87a/config.h
index f15a2f499ec1..66255785f4d5 100644
--- a/keyboards/hineybush/h87a/config.h
+++ b/keyboards/hineybush/h87a/config.h
@@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#define CONFIG_H
-
+#pragma once
 
 /*
  * Keyboard Matrix Assignments
diff --git a/keyboards/horrortroll/handwired_k552/board.h b/keyboards/horrortroll/handwired_k552/board.h
index edd68f15ae95..bcea7cd793ab 100644
--- a/keyboards/horrortroll/handwired_k552/board.h
+++ b/keyboards/horrortroll/handwired_k552/board.h
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #include_next <board.h>
 
 #undef STM32F103xB
diff --git a/keyboards/jm60/board.h b/keyboards/jm60/board.h
index 23f949578944..c1c37c065998 100644
--- a/keyboards/jm60/board.h
+++ b/keyboards/jm60/board.h
@@ -15,6 +15,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#pragma once
+
 #include_next <board.h>
 
 #ifdef STM32_LSECLK
diff --git a/keyboards/kakunpc/business_card/config.h b/keyboards/kakunpc/business_card/config.h
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/keyboards/kbdfans/odin/rgb/config.h b/keyboards/kbdfans/odin/rgb/config.h
index 68c3539e0200..12c5e539da08 100644
--- a/keyboards/kbdfans/odin/rgb/config.h
+++ b/keyboards/kbdfans/odin/rgb/config.h
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #define MATRIX_ROW_PINS { A10, A9, A8, B14, B13, A2 }
 #define MATRIX_COL_PINS { A3, A4, A5, A6, A7, B0, B1, B2, B12, A15, B3, B4, B5, B6, B7, B8, C13, C14, C15, A0}
 
diff --git a/keyboards/kbdfans/odin/soldered/config.h b/keyboards/kbdfans/odin/soldered/config.h
index b44ccbb40d53..dcda05b8d0bf 100644
--- a/keyboards/kbdfans/odin/soldered/config.h
+++ b/keyboards/kbdfans/odin/soldered/config.h
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #define MATRIX_ROW_PINS { A10, A9, A8, B14, B13, A2 }
 #define MATRIX_COL_PINS { A3, A4, A5, A6, A7, B0, B1, B2, B12, A15, B3, B4, B5, B6, B7, B8, C13, C14, C15, A0}
 
diff --git a/keyboards/kbdfans/odin/v2/config.h b/keyboards/kbdfans/odin/v2/config.h
index 160a8e96e708..5ed85f0b918e 100644
--- a/keyboards/kbdfans/odin/v2/config.h
+++ b/keyboards/kbdfans/odin/v2/config.h
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
 
 #define MATRIX_ROW_PINS { A10, A9, A8, B14, B13, A2 }
 #define MATRIX_COL_PINS { A3, A4, A5, A6, A7, B0, B1, B2, B12, A15, B3, B4, B5, B6, B7, B8, C13, C14, C15, A0}
diff --git a/keyboards/kbdfans/odinmini/config.h b/keyboards/kbdfans/odinmini/config.h
index 55c82f43dff6..c189238244e4 100644
--- a/keyboards/kbdfans/odinmini/config.h
+++ b/keyboards/kbdfans/odinmini/config.h
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 8)
 
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
diff --git a/keyboards/keebio/encoder_actions.h b/keyboards/keebio/encoder_actions.h
index 2484af52ae18..1a7fb72014de 100644
--- a/keyboards/keebio/encoder_actions.h
+++ b/keyboards/keebio/encoder_actions.h
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #include "quantum.h"
 
 void encoder_action_unregister(void);
diff --git a/keyboards/keychron/common/keychron_common.h b/keyboards/keychron/common/keychron_common.h
index 9f943b898662..b492cda88fe4 100644
--- a/keyboards/keychron/common/keychron_common.h
+++ b/keyboards/keychron/common/keychron_common.h
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #include "stdint.h"
 #ifdef VIA_ENABLE
 #    include "via.h"
diff --git a/keyboards/keychron/v3/mcuconf.h b/keyboards/keychron/v3/mcuconf.h
index ea7ac022d7cb..0ca8c64850f4 100644
--- a/keyboards/keychron/v3/mcuconf.h
+++ b/keyboards/keychron/v3/mcuconf.h
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #include_next <mcuconf.h>
 
 #undef STM32_I2C_USE_I2C1
diff --git a/keyboards/keychron/v5/halconf.h b/keyboards/keychron/v5/halconf.h
index b74de4f0d4a8..41bddcb2799b 100644
--- a/keyboards/keychron/v5/halconf.h
+++ b/keyboards/keychron/v5/halconf.h
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #define HAL_USE_I2C TRUE
 
 #include_next <halconf.h>
diff --git a/keyboards/keychron/v5/mcuconf.h b/keyboards/keychron/v5/mcuconf.h
index ea7ac022d7cb..0ca8c64850f4 100644
--- a/keyboards/keychron/v5/mcuconf.h
+++ b/keyboards/keychron/v5/mcuconf.h
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #include_next <mcuconf.h>
 
 #undef STM32_I2C_USE_I2C1
diff --git a/keyboards/keychron/v6/halconf.h b/keyboards/keychron/v6/halconf.h
index a7e5474b8cdd..e490b49e005a 100644
--- a/keyboards/keychron/v6/halconf.h
+++ b/keyboards/keychron/v6/halconf.h
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #define HAL_USE_I2C TRUE
 #define PAL_USE_CALLBACKS TRUE
 
diff --git a/keyboards/keychron/v6/mcuconf.h b/keyboards/keychron/v6/mcuconf.h
index ea7ac022d7cb..0ca8c64850f4 100644
--- a/keyboards/keychron/v6/mcuconf.h
+++ b/keyboards/keychron/v6/mcuconf.h
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #include_next <mcuconf.h>
 
 #undef STM32_I2C_USE_I2C1
diff --git a/keyboards/linworks/whale75/chconf.h b/keyboards/linworks/whale75/chconf.h
deleted file mode 100644
index 156fcf1ee2f4..000000000000
--- a/keyboards/linworks/whale75/chconf.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 QMK Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include_next <chconf.h>
diff --git a/keyboards/linworks/whale75/mcuconf.h b/keyboards/linworks/whale75/mcuconf.h
index f6dc94d2db20..a89e1dd02b29 100644
--- a/keyboards/linworks/whale75/mcuconf.h
+++ b/keyboards/linworks/whale75/mcuconf.h
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #include_next <mcuconf.h>
 
 // Underglow uses TIM4, Backlight TIM1, so both are enabled here.
diff --git a/keyboards/lw75/config.h b/keyboards/lw75/config.h
index eb2d9efc2655..02e5be2413c7 100644
--- a/keyboards/lw75/config.h
+++ b/keyboards/lw75/config.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include "config_common.h"
-
 /* key matrix pins */
 #define MATRIX_ROW_PINS { E6, B7, D0, D1, D2, B1 }
 #define MATRIX_COL_PINS { D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, B0, B2 }
diff --git a/keyboards/macro3/post_config.h b/keyboards/macro3/post_config.h
index 0f94fe19e1a6..4e2b6cf1b986 100644
--- a/keyboards/macro3/post_config.h
+++ b/keyboards/macro3/post_config.h
@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: GPL-2.0+
  */
 
+#pragma once
+
 /* Top right key */
 #ifndef BOOTMAGIC_LITE_ROW
 #    define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/merge/uc1/config.h b/keyboards/merge/uc1/config.h
index 4257b17beb9e..488b2cfed352 100644
--- a/keyboards/merge/uc1/config.h
+++ b/keyboards/merge/uc1/config.h
@@ -14,6 +14,7 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
 
+#pragma once
 
 #define MATRIX_ROW_PINS { B1, B2 }
 #define MATRIX_COL_PINS { B3, B4 }
diff --git a/keyboards/merge/um70/config.h b/keyboards/merge/um70/config.h
index 553b939ee295..69500ee60375 100644
--- a/keyboards/merge/um70/config.h
+++ b/keyboards/merge/um70/config.h
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
 
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D6, D4 }
diff --git a/keyboards/merge/um80/config.h b/keyboards/merge/um80/config.h
index 0dd371ddc26c..bba359e02f17 100644
--- a/keyboards/merge/um80/config.h
+++ b/keyboards/merge/um80/config.h
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
 
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, C7 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D6, D4 }
diff --git a/keyboards/merge/uma/config.h b/keyboards/merge/uma/config.h
index 6e7d2b959c58..8744fc0fd512 100644
--- a/keyboards/merge/uma/config.h
+++ b/keyboards/merge/uma/config.h
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
 
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
 #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D6, D4 }
diff --git a/keyboards/mode/m80v1/config.h b/keyboards/mode/m80v1/config.h
index c50628ca5428..6b59fc98729e 100644
--- a/keyboards/mode/m80v1/config.h
+++ b/keyboards/mode/m80v1/config.h
@@ -15,6 +15,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#pragma once
+
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/nightly_boards/adellein/encoder_action.h b/keyboards/nightly_boards/adellein/encoder_action.h
index 098210d40c4f..fb226326324d 100644
--- a/keyboards/nightly_boards/adellein/encoder_action.h
+++ b/keyboards/nightly_boards/adellein/encoder_action.h
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #include "quantum.h"
 
 void encoder_action_unregister(void);
diff --git a/keyboards/nightly_boards/n40_o/encoder_action.h b/keyboards/nightly_boards/n40_o/encoder_action.h
index 098210d40c4f..fb226326324d 100644
--- a/keyboards/nightly_boards/n40_o/encoder_action.h
+++ b/keyboards/nightly_boards/n40_o/encoder_action.h
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #include "quantum.h"
 
 void encoder_action_unregister(void);
diff --git a/keyboards/nightly_boards/n60_s/encoder_action.h b/keyboards/nightly_boards/n60_s/encoder_action.h
index 098210d40c4f..fb226326324d 100644
--- a/keyboards/nightly_boards/n60_s/encoder_action.h
+++ b/keyboards/nightly_boards/n60_s/encoder_action.h
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #include "quantum.h"
 
 void encoder_action_unregister(void);
diff --git a/keyboards/nightly_boards/octopad/encoder_action.h b/keyboards/nightly_boards/octopad/encoder_action.h
index 098210d40c4f..fb226326324d 100644
--- a/keyboards/nightly_boards/octopad/encoder_action.h
+++ b/keyboards/nightly_boards/octopad/encoder_action.h
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #include "quantum.h"
 
 void encoder_action_unregister(void);
diff --git a/keyboards/np12/config.h b/keyboards/np12/config.h
index ec1c0d34b5f1..cd4d98e943c1 100644
--- a/keyboards/np12/config.h
+++ b/keyboards/np12/config.h
@@ -14,8 +14,7 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */ 
 
-
-
+#pragma once
 
 #define MATRIX_ROW_PINS { D7, E6, B4, F7 }
 #define MATRIX_COL_PINS { D1, D0, D4, C6, F6 }
diff --git a/keyboards/planck/rev6/mcuconf.h b/keyboards/planck/rev6/mcuconf.h
index 540e708a6ee9..3196b43ca4d3 100644
--- a/keyboards/planck/rev6/mcuconf.h
+++ b/keyboards/planck/rev6/mcuconf.h
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #include_next <mcuconf.h>
 
 // The SysTick timer from the normal quantum/stm32 uses TIM2 -- the WS2812 pin used
diff --git a/keyboards/planck/rev6_drop/mcuconf.h b/keyboards/planck/rev6_drop/mcuconf.h
index 20337afbb27c..2837fb34ff8b 100644
--- a/keyboards/planck/rev6_drop/mcuconf.h
+++ b/keyboards/planck/rev6_drop/mcuconf.h
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #include_next <mcuconf.h>
 
 // The SysTick timer from the normal quantum/stm32 uses TIM2 -- the WS2812 pin used
diff --git a/keyboards/preonic/rev3/mcuconf.h b/keyboards/preonic/rev3/mcuconf.h
index f534faccaf1e..a8e3096b8aff 100644
--- a/keyboards/preonic/rev3/mcuconf.h
+++ b/keyboards/preonic/rev3/mcuconf.h
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #include_next <mcuconf.h>
 
 // The SysTick timer from the normal quantum/stm32 uses TIM2 -- the WS2812 pin used
diff --git a/keyboards/preonic/rev3_drop/mcuconf.h b/keyboards/preonic/rev3_drop/mcuconf.h
index 838a3bb69ee1..32c615b3a240 100644
--- a/keyboards/preonic/rev3_drop/mcuconf.h
+++ b/keyboards/preonic/rev3_drop/mcuconf.h
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #include_next <mcuconf.h>
 
 // The SysTick timer from the normal quantum/stm32 uses TIM2 -- the WS2812 pin used
diff --git a/keyboards/quarkeys/z67/hotswap/config.h b/keyboards/quarkeys/z67/hotswap/config.h
index 21c7736d1e5c..3e3ce2b0a2da 100644
--- a/keyboards/quarkeys/z67/hotswap/config.h
+++ b/keyboards/quarkeys/z67/hotswap/config.h
@@ -13,7 +13,6 @@
 */
 
 #pragma once
-#include "config_common.h"
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/quarkeys/z67/solder/config.h b/keyboards/quarkeys/z67/solder/config.h
index e406b168acb1..18ed99750047 100644
--- a/keyboards/quarkeys/z67/solder/config.h
+++ b/keyboards/quarkeys/z67/solder/config.h
@@ -13,7 +13,6 @@
 */
 
 #pragma once
-#include "config_common.h"
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/rmi_kb/squishyfrl/mcuconf.h b/keyboards/rmi_kb/squishyfrl/mcuconf.h
index b14bd32f8064..5fd42d2c7ae4 100644
--- a/keyboards/rmi_kb/squishyfrl/mcuconf.h
+++ b/keyboards/rmi_kb/squishyfrl/mcuconf.h
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #include_next <mcuconf.h>
 
 #undef STM32_PWM_USE_TIM2
diff --git a/keyboards/rmi_kb/squishytkl/mcuconf.h b/keyboards/rmi_kb/squishytkl/mcuconf.h
index b14bd32f8064..5fd42d2c7ae4 100644
--- a/keyboards/rmi_kb/squishytkl/mcuconf.h
+++ b/keyboards/rmi_kb/squishytkl/mcuconf.h
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #include_next <mcuconf.h>
 
 #undef STM32_PWM_USE_TIM2
diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/encoder_actions.h b/keyboards/sawnsprojects/krush/krush65/hotswap/encoder_actions.h
index 098210d40c4f..fb226326324d 100644
--- a/keyboards/sawnsprojects/krush/krush65/hotswap/encoder_actions.h
+++ b/keyboards/sawnsprojects/krush/krush65/hotswap/encoder_actions.h
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #include "quantum.h"
 
 void encoder_action_unregister(void);
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/encoder_actions.h b/keyboards/sawnsprojects/krush/krush65/solder/encoder_actions.h
index 098210d40c4f..fb226326324d 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/encoder_actions.h
+++ b/keyboards/sawnsprojects/krush/krush65/solder/encoder_actions.h
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #include "quantum.h"
 
 void encoder_action_unregister(void);
diff --git a/keyboards/spaceholdings/nebula68b/hs/config.h b/keyboards/spaceholdings/nebula68b/hs/config.h
index b66344faccd1..472798f75559 100755
--- a/keyboards/spaceholdings/nebula68b/hs/config.h
+++ b/keyboards/spaceholdings/nebula68b/hs/config.h
@@ -15,5 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#pragma once
+
 #undef RGB_MATRIX_LED_COUNT
 #define RGB_MATRIX_LED_COUNT 78
diff --git a/keyboards/stello65/beta/encoder_actions.h b/keyboards/stello65/beta/encoder_actions.h
index 2484af52ae18..1a7fb72014de 100644
--- a/keyboards/stello65/beta/encoder_actions.h
+++ b/keyboards/stello65/beta/encoder_actions.h
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #include "quantum.h"
 
 void encoder_action_unregister(void);
diff --git a/keyboards/teleport/native/mcuconf.h b/keyboards/teleport/native/mcuconf.h
index ff40f7ec9d9c..e12b90604165 100644
--- a/keyboards/teleport/native/mcuconf.h
+++ b/keyboards/teleport/native/mcuconf.h
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #include_next <mcuconf.h>
 
 /* Set PLL M divider from 4 (F411 GENERIC default) to 8, because of 16 MHz crystal on board */
diff --git a/keyboards/weirdo/geminate60/chconf.h b/keyboards/weirdo/geminate60/chconf.h
index a70b65c879d4..171f2f9bd0db 100644
--- a/keyboards/weirdo/geminate60/chconf.h
+++ b/keyboards/weirdo/geminate60/chconf.h
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 // Need to override the SysTick timer to use TIM3 -- this is a 16-bit timer on F303
 // so we need to change resolution and frequency to match.
 #define CH_CFG_ST_RESOLUTION 16
diff --git a/keyboards/wekey/we27/encoder_actions.h b/keyboards/wekey/we27/encoder_actions.h
index 2484af52ae18..1a7fb72014de 100644
--- a/keyboards/wekey/we27/encoder_actions.h
+++ b/keyboards/wekey/we27/encoder_actions.h
@@ -14,6 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #include "quantum.h"
 
 void encoder_action_unregister(void);