diff --git a/drivers/chibios/serial_usart.c b/drivers/chibios/serial_usart.c
index ded78410e..a3e21f90b 100644
--- a/drivers/chibios/serial_usart.c
+++ b/drivers/chibios/serial_usart.c
@@ -1,6 +1,6 @@
 #include "quantum.h"
 #include "serial.h"
-#include "printf.h"
+#include "print.h"
 
 #include <ch.h>
 #include <hal.h>
diff --git a/drivers/qwiic/micro_oled.c b/drivers/qwiic/micro_oled.c
index f63cf2e64..c7a4ee081 100644
--- a/drivers/qwiic/micro_oled.c
+++ b/drivers/qwiic/micro_oled.c
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include "util/font5x7.h"
 #include "util/font8x16.h"
-#include "string.h"
+#include <string.h>
 
 #define TOTALFONTS 2
 const unsigned char* fonts_pointer[] = {font5x7, font8x16};
diff --git a/keyboards/40percentclub/ut47/led.c b/keyboards/40percentclub/ut47/led.c
index 9458c038f..f5d8ffc12 100644
--- a/keyboards/40percentclub/ut47/led.c
+++ b/keyboards/40percentclub/ut47/led.c
@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <avr/io.h>
-#include "stdint.h"
+#include <stdint.h>
 #include "led.h"
 
 
diff --git a/keyboards/ai03/orbit/matrix.h b/keyboards/ai03/orbit/matrix.h
index c2bdd3098..664372b76 100644
--- a/keyboards/ai03/orbit/matrix.h
+++ b/keyboards/ai03/orbit/matrix.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#include <common/matrix.h>
+#include "common/matrix.h"
diff --git a/keyboards/ai03/orbit/transport.h b/keyboards/ai03/orbit/transport.h
index 422e2ecb9..67597652f 100644
--- a/keyboards/ai03/orbit/transport.h
+++ b/keyboards/ai03/orbit/transport.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/matrix.h>
+#include "common/matrix.h"
 
 #define ROWS_PER_HAND (MATRIX_ROWS/2)
 
diff --git a/keyboards/akegata_denki/device_one/boards/DEVICE_ONE/board.c b/keyboards/akegata_denki/device_one/boards/DEVICE_ONE/board.c
index 8e0303523..20b857d00 100644
--- a/keyboards/akegata_denki/device_one/boards/DEVICE_ONE/board.c
+++ b/keyboards/akegata_denki/device_one/boards/DEVICE_ONE/board.c
@@ -16,8 +16,8 @@
  * generator plugin. Do not edit manually.
  */
 
-#include "hal.h"
-#include "stm32_gpio.h"
+#include <hal.h>
+#include <stm32_gpio.h>
 
 /*===========================================================================*/
 /* Driver local definitions.                                                 */
diff --git a/keyboards/cannonkeys/bluepill/keyboard.c b/keyboards/cannonkeys/bluepill/keyboard.c
index c2e5946d4..6a8edd4a9 100644
--- a/keyboards/cannonkeys/bluepill/keyboard.c
+++ b/keyboards/cannonkeys/bluepill/keyboard.c
@@ -1,5 +1,5 @@
-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>
 #include "util.h"
 #include "quantum.h"
 
diff --git a/keyboards/cannonkeys/bluepill/ws2812.c b/keyboards/cannonkeys/bluepill/ws2812.c
index d30806d56..779e90519 100644
--- a/keyboards/cannonkeys/bluepill/ws2812.c
+++ b/keyboards/cannonkeys/bluepill/ws2812.c
@@ -6,7 +6,7 @@
  */
 
 #include "ws2812.h"
-#include "stdlib.h"
+#include <stdlib.h>
 
 #define BYTES_FOR_LED_BYTE 4
 #define NB_COLORS 3
diff --git a/keyboards/cannonkeys/satisfaction75/led.c b/keyboards/cannonkeys/satisfaction75/led.c
index 3ddcec202..18ef06acf 100644
--- a/keyboards/cannonkeys/satisfaction75/led.c
+++ b/keyboards/cannonkeys/satisfaction75/led.c
@@ -15,10 +15,9 @@ 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 "hal.h"
+#include <hal.h>
 #include "led_custom.h"
 #include "satisfaction75.h"
-#include "printf.h"
 
 static void breathing_callback(PWMDriver *pwmp);
 
diff --git a/keyboards/cannonkeys/satisfaction75/satisfaction75.c b/keyboards/cannonkeys/satisfaction75/satisfaction75.c
index c0ea68669..fd85b8230 100644
--- a/keyboards/cannonkeys/satisfaction75/satisfaction75.c
+++ b/keyboards/cannonkeys/satisfaction75/satisfaction75.c
@@ -2,8 +2,8 @@
 #include "print.h"
 #include "debug.h"
 
-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>
 
 #ifdef QWIIC_MICRO_OLED_ENABLE
 #include "micro_oled.h"
diff --git a/keyboards/chavdai40/boards/GENERIC_STM32_F042X6/board.c b/keyboards/chavdai40/boards/GENERIC_STM32_F042X6/board.c
index 2bd2c5e21..faf576541 100644
--- a/keyboards/chavdai40/boards/GENERIC_STM32_F042X6/board.c
+++ b/keyboards/chavdai40/boards/GENERIC_STM32_F042X6/board.c
@@ -19,8 +19,8 @@
  * generator plugin. Do not edit manually.
  */
 
-#include "hal.h"
-#include "stm32_gpio.h"
+#include <hal.h>
+#include <stm32_gpio.h>
 
 /*===========================================================================*/
 /* Driver local definitions.                                                 */
diff --git a/keyboards/clueboard/60/led.c b/keyboards/clueboard/60/led.c
index 20756f1e7..ad11ad5d4 100644
--- a/keyboards/clueboard/60/led.c
+++ b/keyboards/clueboard/60/led.c
@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "hal.h"
-#include "printf.h"
+#include <hal.h>
+#include "print.h"
 
 #ifdef BACKLIGHT_ENABLE
 #include "backlight.h"
diff --git a/keyboards/clueboard/66_hotswap/gen1/led.c b/keyboards/clueboard/66_hotswap/gen1/led.c
deleted file mode 100644
index f67259d2e..000000000
--- a/keyboards/clueboard/66_hotswap/gen1/led.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2017 skully <skullydazed@gmail.com>
- *
- * 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 2 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 "hal.h"
-#include "led.h"
-#include "printf.h"
diff --git a/keyboards/clueboard/66_hotswap/gen1/matrix.c b/keyboards/clueboard/66_hotswap/gen1/matrix.c
deleted file mode 100644
index 05386215e..000000000
--- a/keyboards/clueboard/66_hotswap/gen1/matrix.c
+++ /dev/null
@@ -1,159 +0,0 @@
-#include <stdint.h>
-#include <stdbool.h>
-#include <string.h>
-#include "hal.h"
-#include "timer.h"
-#include "wait.h"
-#include "printf.h"
-#include "matrix.h"
-#include "action.h"
-#include "keycode.h"
-#include <string.h>
-
-/*
- * #define MATRIX_ROW_PINS { PB11, PA6, PA3, PA2, PA1, PB5, PB6, PC15, PC14, PC13 }
- * #define MATRIX_COL_PINS { PB10, PB2, PB1, PB0, PA7, PB4, PB3, PB7 }
- */
-/* matrix state(1:on, 0:off) */
-static matrix_row_t matrix[MATRIX_ROWS];
-static matrix_row_t matrix_debouncing[MATRIX_COLS];
-static bool debouncing = false;
-static uint16_t debouncing_time = 0;
-
-__attribute__ ((weak))
-void matrix_init_user(void) {}
-
-__attribute__ ((weak))
-void matrix_scan_user(void) {}
-
-__attribute__ ((weak))
-void matrix_init_kb(void) {
-  matrix_init_user();
-}
-
-__attribute__ ((weak))
-void matrix_scan_kb(void) {
-  matrix_scan_user();
-}
-
-void matrix_init(void) {
-    printf("matrix init\n");
-    //debug_matrix = true;
-
-    // actual matrix setup
-    palSetPadMode(GPIOB, 10, PAL_MODE_OUTPUT_PUSHPULL);
-    palSetPadMode(GPIOB, 2, PAL_MODE_OUTPUT_PUSHPULL);
-    palSetPadMode(GPIOB, 1,  PAL_MODE_OUTPUT_PUSHPULL);
-    palSetPadMode(GPIOB, 0,  PAL_MODE_OUTPUT_PUSHPULL);
-    palSetPadMode(GPIOA, 7,  PAL_MODE_OUTPUT_PUSHPULL);
-    palSetPadMode(GPIOB, 4,  PAL_MODE_OUTPUT_PUSHPULL);
-    palSetPadMode(GPIOB, 3,  PAL_MODE_OUTPUT_PUSHPULL);
-    palSetPadMode(GPIOB, 7,  PAL_MODE_OUTPUT_PUSHPULL);
-
-    palSetPadMode(GPIOB, 11, PAL_MODE_INPUT_PULLDOWN);
-    palSetPadMode(GPIOA, 6,  PAL_MODE_INPUT_PULLDOWN);
-    palSetPadMode(GPIOA, 3,  PAL_MODE_INPUT_PULLDOWN);
-    palSetPadMode(GPIOA, 2, PAL_MODE_INPUT_PULLDOWN);
-    palSetPadMode(GPIOA, 1, PAL_MODE_INPUT_PULLDOWN);
-    palSetPadMode(GPIOB, 5, PAL_MODE_INPUT_PULLDOWN);
-    palSetPadMode(GPIOB, 6, PAL_MODE_INPUT_PULLDOWN);
-    palSetPadMode(GPIOC, 15,  PAL_MODE_INPUT_PULLDOWN);
-    palSetPadMode(GPIOC, 14,  PAL_MODE_INPUT_PULLDOWN);
-    palSetPadMode(GPIOC, 13,  PAL_MODE_INPUT_PULLDOWN);
-
-    memset(matrix, 0, MATRIX_ROWS * sizeof(matrix_row_t));
-    memset(matrix_debouncing, 0, MATRIX_COLS * sizeof(matrix_row_t));
-
-    matrix_init_quantum();
-}
-
-uint8_t matrix_scan(void) {
-    // actual matrix
-    for (int col = 0; col < MATRIX_COLS; col++) {
-        matrix_row_t data = 0;
-
-        // strobe col { PB10, PB2, PB1, PB0, PA7, PB4, PB3, PB7 }
-        switch (col) {
-            case 0: palSetPad(GPIOB, 10); break;
-            case 1: palSetPad(GPIOB, 2); break;
-            case 2: palSetPad(GPIOB, 1); break;
-            case 3: palSetPad(GPIOB, 0); break;
-            case 4: palSetPad(GPIOA, 7); break;
-            case 5: palSetPad(GPIOB, 4); break;
-            case 6: palSetPad(GPIOB, 3); break;
-            case 7: palSetPad(GPIOB, 7); break;
-        }
-
-        // need wait to settle pin state
-        wait_us(20);
-
-        // read row data { PB11, PA6, PA3, PA2, PA1, PB5, PB6, PC15, PC14, PC13 }
-        data = (
-            (palReadPad(GPIOB, 11) << 0 ) |
-            (palReadPad(GPIOA, 6)  << 1 ) |
-            (palReadPad(GPIOA, 3)  << 2 ) |
-            (palReadPad(GPIOA, 2) << 3 ) |
-            (palReadPad(GPIOA, 1) << 4 ) |
-            (palReadPad(GPIOB, 5) << 5 ) |
-            (palReadPad(GPIOB, 6) << 6 ) |
-            (palReadPad(GPIOC, 15)  << 7 ) |
-            (palReadPad(GPIOC, 14)  << 8 ) |
-            (palReadPad(GPIOC, 13)  << 9 )
-        );
-
-        // unstrobe  col { B11, B10, B2, B1, A7, B0 }
-        switch (col) {
-            case 0: palClearPad(GPIOB, 10); break;
-            case 1: palClearPad(GPIOB, 2); break;
-            case 2: palClearPad(GPIOB, 1); break;
-            case 3: palClearPad(GPIOB, 0); break;
-            case 4: palClearPad(GPIOA, 7); break;
-            case 5: palClearPad(GPIOB, 4); break;
-            case 6: palClearPad(GPIOB, 3); break;
-            case 7: palClearPad(GPIOB, 7); break;
-        }
-
-        if (matrix_debouncing[col] != data) {
-            matrix_debouncing[col] = data;
-            debouncing = true;
-            debouncing_time = timer_read();
-        }
-    }
-
-    if (debouncing && timer_elapsed(debouncing_time) > DEBOUNCE) {
-        for (int row = 0; row < MATRIX_ROWS; row++) {
-            matrix[row] = 0;
-            for (int col = 0; col < MATRIX_COLS; col++) {
-                matrix[row] |= ((matrix_debouncing[col] & (1 << row) ? 1 : 0) << col);
-            }
-        }
-        debouncing = false;
-    }
-
-    matrix_scan_quantum();
-
-    return 1;
-}
-
-bool matrix_is_on(uint8_t row, uint8_t col) {
-    return (matrix[row] & (1<<col));
-}
-
-matrix_row_t matrix_get_row(uint16_t row) {
-    return matrix[row];
-}
-
-void matrix_print(void) {
-    printf("\nr/c 01234567\n");
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        printf("%X0: ", row);
-        matrix_row_t data = matrix_get_row(row);
-        for (int col = 0; col < MATRIX_COLS; col++) {
-            if (data & (1<<col))
-                printf("1");
-            else
-                printf("0");
-        }
-        printf("\n");
-    }
-}
diff --git a/keyboards/clueboard/66_hotswap/gen1/rules.mk b/keyboards/clueboard/66_hotswap/gen1/rules.mk
index 3667d63b7..48740725a 100644
--- a/keyboards/clueboard/66_hotswap/gen1/rules.mk
+++ b/keyboards/clueboard/66_hotswap/gen1/rules.mk
@@ -16,10 +16,7 @@ CONSOLE_ENABLE = yes	# Console for debug
 COMMAND_ENABLE = yes    # Commands for debug and configuration
 #SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
 NKRO_ENABLE = yes	    # USB Nkey Rollover
-#CUSTOM_MATRIX = yes # Custom matrix file
 AUDIO_ENABLE = yes
 # SERIAL_LINK_ENABLE = yes
 
-# project specific files
-SRC =	led.c
 LAYOUTS = 66_ansi
diff --git a/keyboards/converter/adb_usb/led.h b/keyboards/converter/adb_usb/led.h
index 19952fae2..b33b6894e 100644
--- a/keyboards/converter/adb_usb/led.h
+++ b/keyboards/converter/adb_usb/led.h
@@ -19,7 +19,7 @@ Ported to QMK by Peter Roe <pete@13bit.me>
 
 #ifndef LED_H
 #define LED_H
-#include "stdint.h"
+#include <stdint.h>
 
 
 /* keyboard LEDs */
diff --git a/keyboards/converter/hp_46010a/matrix.c b/keyboards/converter/hp_46010a/matrix.c
index ac9224087..72a098746 100644
--- a/keyboards/converter/hp_46010a/matrix.c
+++ b/keyboards/converter/hp_46010a/matrix.c
@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "util.h"
 #include "matrix.h"
 #include "timer.h"
-#include "LUFA/Drivers/Peripheral/SPI.h"
+#include <LUFA/Drivers/Peripheral/SPI.h>
 
 #include "config.h"
 
diff --git a/keyboards/converter/ibm_terminal/led.c b/keyboards/converter/ibm_terminal/led.c
index e448e84ec..e0f31ee4e 100644
--- a/keyboards/converter/ibm_terminal/led.c
+++ b/keyboards/converter/ibm_terminal/led.c
@@ -15,7 +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/>.
 */
 
-#include "stdint.h"
+#include <stdint.h>
 #include "ps2.h"
 #include "led.h"
 
diff --git a/keyboards/converter/siemens_tastatur/matrix.c b/keyboards/converter/siemens_tastatur/matrix.c
index 9fcfe9fdf..2da4e33d3 100644
--- a/keyboards/converter/siemens_tastatur/matrix.c
+++ b/keyboards/converter/siemens_tastatur/matrix.c
@@ -22,8 +22,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "wait.h"
 #include "print.h"
 #include "matrix.h"
-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>
 
 static matrix_row_t matrix[MATRIX_ROWS];
 static matrix_row_t matrix_debouncing[MATRIX_ROWS];
diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_right/trackpad.h b/keyboards/crkbd/keymaps/vlukash_trackpad_right/trackpad.h
index 755abc7de..cce460a97 100644
--- a/keyboards/crkbd/keymaps/vlukash_trackpad_right/trackpad.h
+++ b/keyboards/crkbd/keymaps/vlukash_trackpad_right/trackpad.h
@@ -4,7 +4,7 @@
 #include "quantum.h"
 #include "report.h"
 #include <util/delay.h>
-#include "../../lib/lufa/LUFA/Drivers/Peripheral/SPI.h"
+#include <LUFA/Drivers/Peripheral/SPI.h>
 
 // Trackpad speed adjustments
 #define POINTER_SPEED_MULTIPLIER 2
diff --git a/keyboards/crkbd/rev1/legacy/config.h b/keyboards/crkbd/rev1/legacy/config.h
index 9e3676414..eae6f788a 100644
--- a/keyboards/crkbd/rev1/legacy/config.h
+++ b/keyboards/crkbd/rev1/legacy/config.h
@@ -18,6 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include <serial_config.h>
+#include "serial_config.h"
 
 #define PRODUCT         Corne Keyboard Rev.1 (Legacy Split)
diff --git a/keyboards/crkbd/rev1/legacy/split_scomm.c b/keyboards/crkbd/rev1/legacy/split_scomm.c
index c14bb32a4..eccf2f3d2 100644
--- a/keyboards/crkbd/rev1/legacy/split_scomm.c
+++ b/keyboards/crkbd/rev1/legacy/split_scomm.c
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <stdbool.h>
 #include <stdint.h>
 #include <stddef.h>
-#include <split_scomm.h>
+#include "split_scomm.h"
 #include "serial.h"
 #ifdef CONSOLE_ENABLE
   #include "debug.h"
diff --git a/keyboards/cu75/cu75.c b/keyboards/cu75/cu75.c
index 60c92b708..80941df39 100644
--- a/keyboards/cu75/cu75.c
+++ b/keyboards/cu75/cu75.c
@@ -10,7 +10,7 @@
 
 #ifdef AUDIO_ENABLE
 float test_sound[][2] = SONG(STARTUP_SOUND);
-#include <audio/audio.h>
+#include "audio.h"
 #endif
 
 uint16_t click_hz = CLICK_HZ;
diff --git a/keyboards/dekunukem/duckypad/keymaps/default/keymap.c b/keyboards/dekunukem/duckypad/keymaps/default/keymap.c
index 3b30c42ff..a87caa2cd 100644
--- a/keyboards/dekunukem/duckypad/keymaps/default/keymap.c
+++ b/keyboards/dekunukem/duckypad/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include QMK_KEYBOARD_H
 
-#include "stdio.h"
+#include <stdio.h>
 #include <unistd.h>
 #include <string.h>
 
diff --git a/keyboards/dm9records/ergoinu/config.h b/keyboards/dm9records/ergoinu/config.h
index dfc8a5293..ce3bf1e78 100644
--- a/keyboards/dm9records/ergoinu/config.h
+++ b/keyboards/dm9records/ergoinu/config.h
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #include "config_common.h"
-#include <serial_config.h>
+#include "serial_config.h"
 
 /* USB Device descriptor parameter
    VID & PID are lisenced from microchip sublisence program, Don't use other project! */
diff --git a/keyboards/ergodone/twimaster.c b/keyboards/ergodone/twimaster.c
index f91c08e6e..d6f3f7840 100644
--- a/keyboards/ergodone/twimaster.c
+++ b/keyboards/ergodone/twimaster.c
@@ -9,7 +9,7 @@
 #include <inttypes.h>
 #include <compat/twi.h>
 
-#include <i2cmaster.h>
+#include "i2cmaster.h"
 
 
 /* define CPU frequency in Mhz here if not defined in Makefile */
diff --git a/keyboards/ergodox_infinity/ergodox_infinity.c b/keyboards/ergodox_infinity/ergodox_infinity.c
index c69c1eb36..a9962f96a 100644
--- a/keyboards/ergodox_infinity/ergodox_infinity.c
+++ b/keyboards/ergodox_infinity/ergodox_infinity.c
@@ -1,6 +1,6 @@
 #include QMK_KEYBOARD_H
-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>
 #include "serial_link/system/serial_link.h"
 #ifdef VISUALIZER_ENABLE
 #include "lcd_backlight.h"
diff --git a/keyboards/ergodox_infinity/led.c b/keyboards/ergodox_infinity/led.c
index 8175c1c5c..0b50247d7 100644
--- a/keyboards/ergodox_infinity/led.c
+++ b/keyboards/ergodox_infinity/led.c
@@ -15,7 +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/>.
 */
 
-#include "hal.h"
+#include <hal.h>
 
 #include "led.h"
 
diff --git a/keyboards/ergodox_infinity/matrix.c b/keyboards/ergodox_infinity/matrix.c
index 941367a36..7baacd24d 100644
--- a/keyboards/ergodox_infinity/matrix.c
+++ b/keyboards/ergodox_infinity/matrix.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <stdint.h>
 #include <stdbool.h>
 #include <string.h>
-#include "hal.h"
+#include <hal.h>
 #include "timer.h"
 #include "wait.h"
 #include "print.h"
diff --git a/keyboards/ergodox_stm32/boards/ERGODOX_STM32_BOARD/board.c b/keyboards/ergodox_stm32/boards/ERGODOX_STM32_BOARD/board.c
index d953d6a13..48844e34a 100644
--- a/keyboards/ergodox_stm32/boards/ERGODOX_STM32_BOARD/board.c
+++ b/keyboards/ergodox_stm32/boards/ERGODOX_STM32_BOARD/board.c
@@ -14,7 +14,7 @@
     limitations under the License.
 */
 
-#include "hal.h"
+#include <hal.h>
 
 /**
  * @brief   PAL setup.
diff --git a/keyboards/ergodox_stm32/ergodox_stm32.h b/keyboards/ergodox_stm32/ergodox_stm32.h
index be1c2e9c3..b84b101f3 100644
--- a/keyboards/ergodox_stm32/ergodox_stm32.h
+++ b/keyboards/ergodox_stm32/ergodox_stm32.h
@@ -4,7 +4,7 @@
 #include "action_layer.h"
 #include <stdint.h>
 #include <stdbool.h>
-#include "hal.h"
+#include <hal.h>
 
 // #define I2C_ADDR 0b01000000
 #define I2C_ADDR 0b01000000
diff --git a/keyboards/geekboards/macropad_v2/keymaps/via/keymap.c b/keyboards/geekboards/macropad_v2/keymaps/via/keymap.c
index 6ca3402c3..b0e5b9327 100644
--- a/keyboards/geekboards/macropad_v2/keymaps/via/keymap.c
+++ b/keyboards/geekboards/macropad_v2/keymaps/via/keymap.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include QMK_KEYBOARD_H
-#include "string.h"
+#include <string.h>
 
 bool is_alt_tab_active = false;
 uint16_t alt_tab_timer = 0;
diff --git a/keyboards/hadron/ver2/keymaps/default/keymap.c b/keyboards/hadron/ver2/keymaps/default/keymap.c
index 3b3dd58e2..8e3d50d3d 100644
--- a/keyboards/hadron/ver2/keymaps/default/keymap.c
+++ b/keyboards/hadron/ver2/keymaps/default/keymap.c
@@ -309,7 +309,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 //Functions for ver2
 #ifdef KEYBOARD_hadron_ver2
-#include "LUFA/Drivers/Peripheral/TWI.h"
+#include <LUFA/Drivers/Peripheral/TWI.h>
 void matrix_init_user(void) {
   #ifdef USE_I2C
     i2c_master_init();
diff --git a/keyboards/hadron/ver2/keymaps/side_numpad/keymap.c b/keyboards/hadron/ver2/keymaps/side_numpad/keymap.c
index 0e5ab7453..c63ae9385 100644
--- a/keyboards/hadron/ver2/keymaps/side_numpad/keymap.c
+++ b/keyboards/hadron/ver2/keymaps/side_numpad/keymap.c
@@ -1,5 +1,5 @@
 #include QMK_KEYBOARD_H
-#include "LUFA/Drivers/Peripheral/TWI.h"
+#include <LUFA/Drivers/Peripheral/TWI.h>
 #ifdef AUDIO_ENABLE
   #include "audio.h"
 #endif
diff --git a/keyboards/handwired/bluepill/bluepill70/led.c b/keyboards/handwired/bluepill/bluepill70/led.c
index 5c557bbee..81437fb5e 100644
--- a/keyboards/handwired/bluepill/bluepill70/led.c
+++ b/keyboards/handwired/bluepill/bluepill70/led.c
@@ -15,7 +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/>.
 */
 
-#include "hal.h"
+#include <hal.h>
 #include "led.h"
 
 
diff --git a/keyboards/handwired/bluepill/bluepill70/matrix.c b/keyboards/handwired/bluepill/bluepill70/matrix.c
index b2c38e522..4d281fe21 100644
--- a/keyboards/handwired/bluepill/bluepill70/matrix.c
+++ b/keyboards/handwired/bluepill/bluepill70/matrix.c
@@ -15,8 +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/>.
 */
 
-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>
 
 /*
  * scan matrix
diff --git a/keyboards/handwired/bluepill/boards/GENERIC_STM32_F103/board.c b/keyboards/handwired/bluepill/boards/GENERIC_STM32_F103/board.c
index 2809c9d18..64da24214 100644
--- a/keyboards/handwired/bluepill/boards/GENERIC_STM32_F103/board.c
+++ b/keyboards/handwired/bluepill/boards/GENERIC_STM32_F103/board.c
@@ -14,7 +14,7 @@
     limitations under the License.
 */
 
-#include "hal.h"
+#include <hal.h>
 
 /**
  * @brief   PAL setup.
diff --git a/keyboards/handwired/dactyl/twimaster.c b/keyboards/handwired/dactyl/twimaster.c
index 2557f7e22..41684d3a6 100644
--- a/keyboards/handwired/dactyl/twimaster.c
+++ b/keyboards/handwired/dactyl/twimaster.c
@@ -9,7 +9,7 @@
 #include <inttypes.h>
 #include <compat/twi.h>
 
-#include <i2cmaster.h>
+#include "i2cmaster.h"
 
 /* define CPU frequency in Hz here if not defined in Makefile */
 #ifndef F_CPU
diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/dmote/62key/keymaps/default/keymap.c
index 3770a6d68..25bd7da39 100644
--- a/keyboards/handwired/dactyl_manuform/dmote/62key/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/dmote/62key/keymaps/default/keymap.c
@@ -1,7 +1,7 @@
 #include "62key.h"
 #include "rgblight.h"
-#include <keymap_colemak.h>
-#include <sendstring_colemak.h>
+#include "keymap_colemak.h"
+#include "sendstring_colemak.h"
 
 
 // Automatic Layer ID:
diff --git a/keyboards/handwired/promethium/promethium.h b/keyboards/handwired/promethium/promethium.h
index b8d635220..f35e5429b 100644
--- a/keyboards/handwired/promethium/promethium.h
+++ b/keyboards/handwired/promethium/promethium.h
@@ -1,7 +1,7 @@
 #ifndef PROMETHIUM_H
 #define PROMETHIUM_H
 
-#include "stdint.h"
+#include <stdint.h>
 
 void battery_poll(uint8_t level);
 void led_set_kb(uint8_t usb_led);
diff --git a/keyboards/helix/local_drivers/ssd1306.c b/keyboards/helix/local_drivers/ssd1306.c
index c6fc4b785..1cfb38037 100644
--- a/keyboards/helix/local_drivers/ssd1306.c
+++ b/keyboards/helix/local_drivers/ssd1306.c
@@ -8,7 +8,7 @@
 #ifndef LOCAL_GLCDFONT
 #include "common/glcdfont.c"
 #else
-#include <helixfont.h>
+#include "helixfont.h"
 #endif
 #ifdef PROTOCOL_LUFA
 #include "lufa.h"
diff --git a/keyboards/helix/rev1/config.h b/keyboards/helix/rev1/config.h
index 6c6ebea68..7e9616ba1 100644
--- a/keyboards/helix/rev1/config.h
+++ b/keyboards/helix/rev1/config.h
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define PRODUCT         Helix Alpha
 #define DESCRIPTION     A split keyboard for the cheap makers
 
-#include <serial_config.h>
+#include "serial_config.h"
 
 #define HELIX_ROWS 5
 
diff --git a/keyboards/helix/rev1/keymaps/OLED_sample/keymap.c b/keyboards/helix/rev1/keymaps/OLED_sample/keymap.c
index cc73e36fb..6838b90e5 100644
--- a/keyboards/helix/rev1/keymaps/OLED_sample/keymap.c
+++ b/keyboards/helix/rev1/keymaps/OLED_sample/keymap.c
@@ -1,6 +1,6 @@
 #include QMK_KEYBOARD_H
 #include "bootloader.h"
-#include "LUFA/Drivers/Peripheral/TWI.h"
+#include <LUFA/Drivers/Peripheral/TWI.h>
 #ifdef AUDIO_ENABLE
   #include "audio.h"
 #endif
diff --git a/keyboards/helix/rev2/keymaps/five_rows/oled_display.c b/keyboards/helix/rev2/keymaps/five_rows/oled_display.c
index c1f039e5b..127d80cc7 100644
--- a/keyboards/helix/rev2/keymaps/five_rows/oled_display.c
+++ b/keyboards/helix/rev2/keymaps/five_rows/oled_display.c
@@ -17,12 +17,12 @@
 #include QMK_KEYBOARD_H
 #include <stdio.h>
 #ifdef CONSOLE_ENABLE
-  #include <print.h>
+  #include "print.h"
 #endif
 #ifdef SSD1306OLED
   #include "ssd1306.h"
 #endif
-#include "string.h"
+#include <string.h>
 #include "layer_number.h"
 
 extern int current_default_layer;
diff --git a/keyboards/helix/rev2/split_scomm.c b/keyboards/helix/rev2/split_scomm.c
index ada786796..378781b98 100644
--- a/keyboards/helix/rev2/split_scomm.c
+++ b/keyboards/helix/rev2/split_scomm.c
@@ -5,10 +5,10 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stddef.h>
-#include <split_scomm.h>
+#include "split_scomm.h"
 #include "serial.h"
 #ifdef CONSOLE_ENABLE
-  #include <print.h>
+  #include "print.h"
 #endif
 
 uint8_t volatile serial_slave_buffer[SERIAL_SLAVE_BUFFER_LENGTH] = {0};
diff --git a/keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c b/keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c
index c1f039e5b..127d80cc7 100644
--- a/keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c
+++ b/keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c
@@ -17,12 +17,12 @@
 #include QMK_KEYBOARD_H
 #include <stdio.h>
 #ifdef CONSOLE_ENABLE
-  #include <print.h>
+  #include "print.h"
 #endif
 #ifdef SSD1306OLED
   #include "ssd1306.h"
 #endif
-#include "string.h"
+#include <string.h>
 #include "layer_number.h"
 
 extern int current_default_layer;
diff --git a/keyboards/infinity60/led.c b/keyboards/infinity60/led.c
index bef1f8623..8effcea81 100644
--- a/keyboards/infinity60/led.c
+++ b/keyboards/infinity60/led.c
@@ -16,7 +16,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/>.
 */
 
-#include "hal.h"
+#include <hal.h>
 
 #include "led.h"
 
diff --git a/keyboards/infinity60/led_controller.c b/keyboards/infinity60/led_controller.c
index bc2457455..cf3edf20d 100644
--- a/keyboards/infinity60/led_controller.c
+++ b/keyboards/infinity60/led_controller.c
@@ -22,8 +22,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * datasheet: http://www.issi.com/WW/pdf/31FL3731C.pdf
  */
 
-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>
 #include "print.h"
 #include "led.h"
 #include "host.h"
diff --git a/keyboards/infinity60/matrix.c b/keyboards/infinity60/matrix.c
index ba16e6900..c147ceecb 100644
--- a/keyboards/infinity60/matrix.c
+++ b/keyboards/infinity60/matrix.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <string.h>
-#include "hal.h"
+#include <hal.h>
 #include "timer.h"
 #include "wait.h"
 #include "print.h"
diff --git a/keyboards/jm60/boards/JM60_BOARD/board.c b/keyboards/jm60/boards/JM60_BOARD/board.c
index d953d6a13..48844e34a 100644
--- a/keyboards/jm60/boards/JM60_BOARD/board.c
+++ b/keyboards/jm60/boards/JM60_BOARD/board.c
@@ -14,7 +14,7 @@
     limitations under the License.
 */
 
-#include "hal.h"
+#include <hal.h>
 
 /**
  * @brief   PAL setup.
diff --git a/keyboards/jm60/led.c b/keyboards/jm60/led.c
index aed66c7c0..4ce0b3e26 100644
--- a/keyboards/jm60/led.c
+++ b/keyboards/jm60/led.c
@@ -15,7 +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/>.
 */
 
-#include "hal.h"
+#include <hal.h>
 
 #include "led.h"
 
diff --git a/keyboards/jm60/matrix.c b/keyboards/jm60/matrix.c
index 01bb4a80d..e19d4f02b 100644
--- a/keyboards/jm60/matrix.c
+++ b/keyboards/jm60/matrix.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <string.h>
-#include "hal.h"
+#include <hal.h>
 #include "timer.h"
 #include "wait.h"
 #include "print.h"
diff --git a/keyboards/keyboardio/model01/config.h b/keyboards/keyboardio/model01/config.h
index c2160979c..043e21cfa 100644
--- a/keyboards/keyboardio/model01/config.h
+++ b/keyboards/keyboardio/model01/config.h
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include <config_common.h>
+#include "config_common.h"
 
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0x1209
diff --git a/keyboards/keyboardio/model01/leds.c b/keyboards/keyboardio/model01/leds.c
index b21c1a5c8..0308887d3 100644
--- a/keyboards/keyboardio/model01/leds.c
+++ b/keyboards/keyboardio/model01/leds.c
@@ -13,10 +13,10 @@
  * 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 <quantum.h>
-#include <i2c_master.h>
-#include <led_tables.h>
-#include <rgb_matrix.h>
+#include "quantum.h"
+#include "i2c_master.h"
+#include "led_tables.h"
+#include "rgb_matrix.h"
 #include <string.h>
 #include "model01.h"
 
diff --git a/keyboards/keyboardio/model01/leds.h b/keyboards/keyboardio/model01/leds.h
index 405bdf328..4d185919b 100644
--- a/keyboards/keyboardio/model01/leds.h
+++ b/keyboards/keyboardio/model01/leds.h
@@ -15,8 +15,8 @@
  */
 #pragma once
 
-#include <quantum.h>
-#include <rgb_matrix.h>
+#include "quantum.h"
+#include "rgb_matrix.h"
 
 void set_all_leds_to(uint8_t r, uint8_t g, uint8_t b);
 void set_led_to(int led, uint8_t r, uint8_t g, uint8_t b);
diff --git a/keyboards/keyboardio/model01/matrix.c b/keyboards/keyboardio/model01/matrix.c
index f1f9024c7..92cca9913 100644
--- a/keyboards/keyboardio/model01/matrix.c
+++ b/keyboards/keyboardio/model01/matrix.c
@@ -13,8 +13,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/>.
  */
-#include <quantum.h>
-#include <i2c_master.h>
+#include "quantum.h"
+#include "i2c_master.h"
 #include <string.h>
 #include "model01.h"
 
diff --git a/keyboards/keyboardio/model01/model01.c b/keyboards/keyboardio/model01/model01.c
index 29615ca86..d9fac1cf0 100644
--- a/keyboards/keyboardio/model01/model01.c
+++ b/keyboards/keyboardio/model01/model01.c
@@ -13,8 +13,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/>.
  */
-#include <quantum.h>
-#include <i2c_master.h>
+#include "quantum.h"
+#include "i2c_master.h"
 #include <string.h>
 #include "model01.h"
 
diff --git a/keyboards/keyboardio/model01/model01.h b/keyboards/keyboardio/model01/model01.h
index a83e33cd8..870cb441f 100644
--- a/keyboards/keyboardio/model01/model01.h
+++ b/keyboards/keyboardio/model01/model01.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include <quantum.h>
+#include "quantum.h"
 
 #define LAYOUT( \
   L07, L06, L05, L04, L03, L02,                    R05, R04, R03, R02, R01, R00, \
diff --git a/keyboards/lets_split/keymaps/OLED_sample/keymap.c b/keyboards/lets_split/keymaps/OLED_sample/keymap.c
index 0cf3503e4..a34d5a32b 100644
--- a/keyboards/lets_split/keymaps/OLED_sample/keymap.c
+++ b/keyboards/lets_split/keymaps/OLED_sample/keymap.c
@@ -1,5 +1,5 @@
 #include QMK_KEYBOARD_H
-#include "LUFA/Drivers/Peripheral/TWI.h"
+#include <LUFA/Drivers/Peripheral/TWI.h>
 #ifdef SSD1306OLED
   #include "ssd1306.h"
 #endif
diff --git a/keyboards/lfkeyboards/TWIlib.c b/keyboards/lfkeyboards/TWIlib.c
index dc4fbf016..d50ce7289 100644
--- a/keyboards/lfkeyboards/TWIlib.c
+++ b/keyboards/lfkeyboards/TWIlib.c
@@ -8,7 +8,7 @@
 #include <avr/io.h>
 #include <avr/interrupt.h>
 #include "TWIlib.h"
-#include "util/delay.h"
+#include <util/delay.h>
 #include "print.h"
 
 // Global transmit buffer
diff --git a/keyboards/lfkeyboards/lfk78/lfk78.c b/keyboards/lfkeyboards/lfk78/lfk78.c
index cf49a5cfd..5b283f979 100644
--- a/keyboards/lfkeyboards/lfk78/lfk78.c
+++ b/keyboards/lfkeyboards/lfk78/lfk78.c
@@ -2,7 +2,7 @@
 
 #include <avr/timer_avr.h>
 #include <avr/wdt.h>
-#include <audio/audio.h>
+#include "audio.h"
 #include "issi.h"
 #include "TWIlib.h"
 #include "lighting.h"
diff --git a/keyboards/lfkeyboards/lighting.c b/keyboards/lfkeyboards/lighting.c
index 2a6eac929..dcc5c4023 100644
--- a/keyboards/lfkeyboards/lighting.c
+++ b/keyboards/lfkeyboards/lighting.c
@@ -11,7 +11,7 @@
 #include "lighting.h"
 #include "debug.h"
 #include "rgblight.h"
-#include "audio/audio.h"
+#include "audio.h"
 
 
 extern rgblight_config_t rgblight_config; // Declared in rgblight.c
diff --git a/keyboards/matrix/m20add/boards/m20add_bd/board.c b/keyboards/matrix/m20add/boards/m20add_bd/board.c
index 68cf23cdd..95d9045a0 100644
--- a/keyboards/matrix/m20add/boards/m20add_bd/board.c
+++ b/keyboards/matrix/m20add/boards/m20add_bd/board.c
@@ -19,8 +19,8 @@
  * generator plugin. Do not edit manually.
  */
 
-#include "hal.h"
-#include "stm32_gpio.h"
+#include <hal.h>
+#include <stm32_gpio.h>
 
 /*===========================================================================*/
 /* Driver local definitions.                                                 */
diff --git a/keyboards/matrix/noah/boards/noah_bd/board.c b/keyboards/matrix/noah/boards/noah_bd/board.c
index 68cf23cdd..95d9045a0 100644
--- a/keyboards/matrix/noah/boards/noah_bd/board.c
+++ b/keyboards/matrix/noah/boards/noah_bd/board.c
@@ -19,8 +19,8 @@
  * generator plugin. Do not edit manually.
  */
 
-#include "hal.h"
-#include "stm32_gpio.h"
+#include <hal.h>
+#include <stm32_gpio.h>
 
 /*===========================================================================*/
 /* Driver local definitions.                                                 */
diff --git a/keyboards/matrix/noah/matrix.c b/keyboards/matrix/noah/matrix.c
index 737f570c1..211520436 100644
--- a/keyboards/matrix/noah/matrix.c
+++ b/keyboards/matrix/noah/matrix.c
@@ -5,11 +5,11 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <string.h>
-#include "hal.h"
+#include <hal.h>
 #include "quantum.h"
 #include "timer.h"
 #include "wait.h"
-#include "printf.h"
+#include "print.h"
 #include "matrix.h"
 
 /**
diff --git a/keyboards/meira/TWIlib.c b/keyboards/meira/TWIlib.c
index 4091429b4..8f5658fcd 100755
--- a/keyboards/meira/TWIlib.c
+++ b/keyboards/meira/TWIlib.c
@@ -8,7 +8,7 @@
 #include <avr/io.h>
 #include <avr/interrupt.h>
 #include "TWIlib.h"
-#include "util/delay.h"
+#include <util/delay.h>
 #include "print.h"
 
 // Global transmit buffer
diff --git a/keyboards/meira/lighting.c b/keyboards/meira/lighting.c
index 37bb45aec..a02487f69 100755
--- a/keyboards/meira/lighting.c
+++ b/keyboards/meira/lighting.c
@@ -9,7 +9,7 @@
 #include "TWIlib.h"
 #include "lighting.h"
 #include "debug.h"
-#include "audio/audio.h"
+#include "audio.h"
 
 
 const uint8_t backlight_pwm_map[BACKLIGHT_LEVELS] = BACKLIGHT_PWM_MAP;
diff --git a/keyboards/moonlander/matrix.c b/keyboards/moonlander/matrix.c
index 872643f61..f5c49b4d5 100644
--- a/keyboards/moonlander/matrix.c
+++ b/keyboards/moonlander/matrix.c
@@ -21,10 +21,10 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <string.h>
-#include "hal.h"
+#include <hal.h>
 #include "timer.h"
 #include "wait.h"
-#include "printf.h"
+#include "print.h"
 #include "matrix.h"
 #include "action.h"
 #include "keycode.h"
diff --git a/keyboards/mxss/rgblight.c b/keyboards/mxss/rgblight.c
index 130945857..2e9352c55 100644
--- a/keyboards/mxss/rgblight.c
+++ b/keyboards/mxss/rgblight.c
@@ -20,7 +20,7 @@
 #    include <avr/interrupt.h>
 #endif
 #ifdef STM32_EEPROM_ENABLE
-#    include "hal.h"
+#    include <hal.h>
 #    include "eeprom.h"
 #    include "eeprom_stm32.h"
 #endif
@@ -31,7 +31,7 @@
 #include "color.h"
 #include "debug.h"
 #include "led_tables.h"
-#include "lib/lib8tion/lib8tion.h"
+#include <lib/lib8tion/lib8tion.h>
 #ifdef VELOCIKEY_ENABLE
 #    include "velocikey.h"
 #endif
diff --git a/keyboards/nek_type_a/mcp23017.c b/keyboards/nek_type_a/mcp23017.c
index e24231680..1434fa56c 100644
--- a/keyboards/nek_type_a/mcp23017.c
+++ b/keyboards/nek_type_a/mcp23017.c
@@ -15,8 +15,8 @@
  */
 #include <stdbool.h>
 #include "action.h"
-#include "lib/lufa/LUFA/Drivers/Peripheral/TWI.h"
-#include "lib/lufa/LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.c"
+#include <LUFA/Drivers/Peripheral/TWI.h>
+#include <LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.c>
 #include "mcp23017.h"
 #include "debug.h"
 #include "wait.h"
diff --git a/keyboards/oddball/adns.c b/keyboards/oddball/adns.c
index 35225f042..4582be1f2 100644
--- a/keyboards/oddball/adns.c
+++ b/keyboards/oddball/adns.c
@@ -3,7 +3,7 @@
 #include "quantum.h"
 #include "pointing_device.h"
 #include "adns9800_srom_A4.h"
-#include "../../lib/lufa/LUFA/Drivers/Peripheral/SPI.h"
+#include <LUFA/Drivers/Peripheral/SPI.h>
 
 // registers
 #define REG_Product_ID                           0x00
diff --git a/keyboards/phoenix/phoenix.c b/keyboards/phoenix/phoenix.c
index e79b35b15..a8e9a42a0 100644
--- a/keyboards/phoenix/phoenix.c
+++ b/keyboards/phoenix/phoenix.c
@@ -1,4 +1,4 @@
-#include "hal.h"
+#include <hal.h>
 #include "usb_main.h"
 #include "phoenix.h"
 
diff --git a/keyboards/planck/ez/ez.c b/keyboards/planck/ez/ez.c
index 5371c7853..8c498a552 100644
--- a/keyboards/planck/ez/ez.c
+++ b/keyboards/planck/ez/ez.c
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "ez.h"
-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>
 
 keyboard_config_t keyboard_config;
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/terrazzo/terrazzo.c b/keyboards/terrazzo/terrazzo.c
index 2fe94f860..e8a4e03fc 100644
--- a/keyboards/terrazzo/terrazzo.c
+++ b/keyboards/terrazzo/terrazzo.c
@@ -19,7 +19,7 @@
 #ifdef LED_MATRIX_ENABLE
     #include "is31fl3731-simple.h"
     #include <math.h>
-    #include <print.h>
+    #include "print.h"
     #include "quantum.h"
 
 const is31_led g_is31_leds[LED_DRIVER_LED_COUNT] = {
diff --git a/keyboards/wilba_tech/wt_rgb_backlight.c b/keyboards/wilba_tech/wt_rgb_backlight.c
index 0a75dd4a6..306f8186e 100644
--- a/keyboards/wilba_tech/wt_rgb_backlight.c
+++ b/keyboards/wilba_tech/wt_rgb_backlight.c
@@ -55,8 +55,8 @@
 #include <avr/interrupt.h>
 #include "drivers/avr/i2c_master.h"
 #else
-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>
 #include "drivers/chibios/i2c_master.h"
 #endif
 
diff --git a/keyboards/yosino58/config.h b/keyboards/yosino58/config.h
index fb1cdf396..0c308480e 100644
--- a/keyboards/yosino58/config.h
+++ b/keyboards/yosino58/config.h
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #include "config_common.h"
-#include <serial_config.h>
+#include "serial_config.h"
 
 #define USE_I2C
 #define USE_SERIAL
diff --git a/keyboards/yosino58/rev1/split_scomm.c b/keyboards/yosino58/rev1/split_scomm.c
index a1fe6ba5b..82b53d7e7 100644
--- a/keyboards/yosino58/rev1/split_scomm.c
+++ b/keyboards/yosino58/rev1/split_scomm.c
@@ -5,10 +5,10 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stddef.h>
-#include <split_scomm.h>
+#include "split_scomm.h"
 #include "serial.h"
 #ifdef CONSOLE_ENABLE
-  #include <print.h>
+  #include "print.h"
 #endif
 
 uint8_t volatile serial_slave_buffer[SERIAL_SLAVE_BUFFER_LENGTH] = {0};
diff --git a/quantum/audio/voices.c b/quantum/audio/voices.c
index 53a65e4e3..1592618be 100644
--- a/quantum/audio/voices.c
+++ b/quantum/audio/voices.c
@@ -15,7 +15,7 @@
  */
 #include "voices.h"
 #include "audio.h"
-#include "stdlib.h"
+#include <stdlib.h>
 
 // these are imported from audio.c
 extern uint16_t envelope_index;
diff --git a/tmk_core/common/led.h b/tmk_core/common/led.h
index 81c664d60..0fe38ea03 100644
--- a/tmk_core/common/led.h
+++ b/tmk_core/common/led.h
@@ -17,8 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "stdint.h"
-#include "stdbool.h"
+#include <stdint.h>
+#include <stdbool.h>
 
 /* FIXME: Add doxygen comments here. */
 
diff --git a/tmk_core/protocol/chibios/lufa_utils/LUFA/Drivers/USB/USB.h b/tmk_core/protocol/chibios/lufa_utils/LUFA/Drivers/USB/USB.h
index f59c8d1dd..22f882cbb 100644
--- a/tmk_core/protocol/chibios/lufa_utils/LUFA/Drivers/USB/USB.h
+++ b/tmk_core/protocol/chibios/lufa_utils/LUFA/Drivers/USB/USB.h
@@ -1,6 +1,6 @@
 #include "progmem.h"
-#include "stddef.h"
-#include "inttypes.h"
+#include <stddef.h>
+#include <inttypes.h>
 
 #define ATTR_PACKED __attribute__((packed))
 /** Concatenates the given input into a single token, via the C Preprocessor.
diff --git a/tmk_core/protocol/chibios/main.c b/tmk_core/protocol/chibios/main.c
index b99a40f1e..e07c181fc 100644
--- a/tmk_core/protocol/chibios/main.c
+++ b/tmk_core/protocol/chibios/main.c
@@ -31,7 +31,7 @@
 #include "led.h"
 #include "sendchar.h"
 #include "debug.h"
-#include "printf.h"
+#include "print.h"
 
 #ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP
 // Change this to be TRUE once we've migrated keyboards to the new init system