Remove deprecated QUANTUM_DIR code blocks from makefiles (#4754)

* Remove QUANTUM_DIR code blocks from keyboard rules This commit removes the deprecated "QUANTUM_DIR" code block from rules.mk files that affect entire keyboards. * remove QUANTUM_DIR code blocks from rules for default keymaps This commit removes the deprecated "QUANTUM_DIR" code block from rules.mk files that affect default keymaps. * remove QUANTUM_DIR code blocks from rules for user keymaps This commit removes the deprecated "QUANTUM_DIR" code block from rules.mk files that affect "user" keymaps. (It's actually any keymap that isn't named `default`.) * remove QUANTUM_DIR code blocks from rules for community layouts This commit removes the deprecated "QUANTUM_DIR" code block from rules.mk files for community layouts. * remove QUANTUM_DIR code blocks from rules for userspaces This commit removes the deprecated "QUANTUM_DIR" code block from rules.mk files for userspaces.
author: noroadsleft <18669334+noroadsleft@users.noreply.github.com> 2019-01-04 07:25:48 -0800
committer: MechMerlin <30334081+mechmerlin@users.noreply.github.com> 2019-01-04 07:25:48 -0800
commit: 7f4f0f7685cef421df4c07b0982c1905fb57a736 (patch)
tree: a19f33691cb3f293ac732a4179e10339b4f24f1a
parent: b1ed85587161e8352d136fcc4876a52b33328b01 (diff)
download: qmk_firmware-7f4f0f7685cef421df4c07b0982c1905fb57a736.tar.gz
qmk_firmware-7f4f0f7685cef421df4c07b0982c1905fb57a736.zip
293 files changed, 27 insertions, 911 deletions
diff --git a/keyboards/6ball/keymaps/default/rules.mk b/keyboards/6ball/keymaps/default/rules.mk
index 457a3d01d..e69de29bb 100644
--- a/keyboards/6ball/keymaps/default/rules.mk
+++ b/keyboards/6ball/keymaps/default/rules.mk
@@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/9key/keymaps/default/rules.mk b/keyboards/9key/keymaps/default/rules.mk
index 457a3d01d..e69de29bb 100644
--- a/keyboards/9key/keymaps/default/rules.mk
+++ b/keyboards/9key/keymaps/default/rules.mk
@@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/alu84/keymaps/turbomech/rules.mk b/keyboards/alu84/keymaps/turbomech/rules.mk
index ff8b4b2e6..c8b74bfc9 100644
--- a/keyboards/alu84/keymaps/turbomech/rules.mk
+++ b/keyboards/alu84/keymaps/turbomech/rules.mk
@@ -10,6 +10,3 @@ AUDIO_ENABLE ?= no
 RGBLIGHT_ENABLE ?= yes
 UNICODE_ENABLE ?= yes
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/amj40/keymaps/default/rules.mk b/keyboards/amj40/keymaps/default/rules.mk
index fe9867220..cbfa35e63 100644
--- a/keyboards/amj40/keymaps/default/rules.mk
+++ b/keyboards/amj40/keymaps/default/rules.mk
@@ -18,7 +18,3 @@ RGBLIGHT_ENABLE  = yes  # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/amj60/keymaps/iso_split_rshift/rules.mk b/keyboards/amj60/keymaps/iso_split_rshift/rules.mk
index 931affcd5..1b34f4f60 100644
--- a/keyboards/amj60/keymaps/iso_split_rshift/rules.mk
+++ b/keyboards/amj60/keymaps/iso_split_rshift/rules.mk
@@ -18,6 +18,3 @@ RGBLIGHT_ENABLE  = no  # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/atreus/keymaps/xk/rules.mk b/keyboards/atreus/keymaps/xk/rules.mk
index 2e76f9da5..5b69426ac 100644
--- a/keyboards/atreus/keymaps/xk/rules.mk
+++ b/keyboards/atreus/keymaps/xk/rules.mk
@@ -13,6 +13,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/bpiphany/tiger_lily/keymaps/default/rules.mk b/keyboards/bpiphany/tiger_lily/keymaps/default/rules.mk
index 93f927c7d..7a331cd53 100644
--- a/keyboards/bpiphany/tiger_lily/keymaps/default/rules.mk
+++ b/keyboards/bpiphany/tiger_lily/keymaps/default/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/bpiphany/tiger_lily/keymaps/default_ansi/rules.mk b/keyboards/bpiphany/tiger_lily/keymaps/default_ansi/rules.mk
index 93f927c7d..7a331cd53 100644
--- a/keyboards/bpiphany/tiger_lily/keymaps/default_ansi/rules.mk
+++ b/keyboards/bpiphany/tiger_lily/keymaps/default_ansi/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/chocopad/keymaps/default/rules.mk b/keyboards/chocopad/keymaps/default/rules.mk
index 1e5761278..a81250cdf 100644
--- a/keyboards/chocopad/keymaps/default/rules.mk
+++ b/keyboards/chocopad/keymaps/default/rules.mk
@@ -1,5 +1,2 @@
 RGBLIGHT_ENABLE = yes
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/chocopad/keymaps/khord/rules.mk b/keyboards/chocopad/keymaps/khord/rules.mk
index 1e5761278..a81250cdf 100644
--- a/keyboards/chocopad/keymaps/khord/rules.mk
+++ b/keyboards/chocopad/keymaps/khord/rules.mk
@@ -1,5 +1,2 @@
 RGBLIGHT_ENABLE = yes
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/christmas_tree/keymaps/default/rules.mk b/keyboards/christmas_tree/keymaps/default/rules.mk
index 457a3d01d..e69de29bb 100644
--- a/keyboards/christmas_tree/keymaps/default/rules.mk
+++ b/keyboards/christmas_tree/keymaps/default/rules.mk
@@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/clueboard/66/keymaps/xyverz/rules.mk b/keyboards/clueboard/66/keymaps/xyverz/rules.mk
index fc02ecb7e..6fa110a7b 100644
--- a/keyboards/clueboard/66/keymaps/xyverz/rules.mk
+++ b/keyboards/clueboard/66/keymaps/xyverz/rules.mk
@@ -44,6 +44,3 @@
 #
 RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/clueboard/card/keymaps/default/rules.mk b/keyboards/clueboard/card/keymaps/default/rules.mk
index 8ee841da0..ed7eceea0 100644
--- a/keyboards/clueboard/card/keymaps/default/rules.mk
+++ b/keyboards/clueboard/card/keymaps/default/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/clueboard/card/keymaps/rgb_effects/rules.mk b/keyboards/clueboard/card/keymaps/rgb_effects/rules.mk
index 00670c0cf..1418ba1bf 100644
--- a/keyboards/clueboard/card/keymaps/rgb_effects/rules.mk
+++ b/keyboards/clueboard/card/keymaps/rgb_effects/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/comet46/keymaps/satt/rules.mk b/keyboards/comet46/keymaps/satt/rules.mk
index 5839b778b..91609dd4f 100644
--- a/keyboards/comet46/keymaps/satt/rules.mk
+++ b/keyboards/comet46/keymaps/satt/rules.mk
@@ -5,3 +5,4 @@ SRC +=  ./lib/glcdfont.c \
                ./lib/keylogger.c \
        ./lib/modifier_state_reader.c \
        ./lib/host_led_state_reader.c
diff --git a/keyboards/contra/keymaps/dana/rules.mk b/keyboards/contra/keymaps/dana/rules.mk
index 1198f378a..cf891fad3 100644
--- a/keyboards/contra/keymaps/dana/rules.mk
+++ b/keyboards/contra/keymaps/dana/rules.mk
@@ -20,6 +20,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/contra/keymaps/losinggeneration/rules.mk b/keyboards/contra/keymaps/losinggeneration/rules.mk
index ea2b7165d..17ef68483 100644
--- a/keyboards/contra/keymaps/losinggeneration/rules.mk
+++ b/keyboards/contra/keymaps/losinggeneration/rules.mk
@@ -12,6 +12,3 @@ MIDI_ENABLE      = no    # MIDI controls
 NKRO_ENABLE      = no    # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 RGBLIGHT_ENABLE  = no    # Enable WS2812 RGB underlight. 
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/contra/keymaps/maxr1998/rules.mk b/keyboards/contra/keymaps/maxr1998/rules.mk
index 75a476114..e1ba07429 100644
--- a/keyboards/contra/keymaps/maxr1998/rules.mk
+++ b/keyboards/contra/keymaps/maxr1998/rules.mk
@@ -9,6 +9,3 @@ MOUSEKEY_ENABLE = no
 CONSOLE_ENABLE  = no # yes
 COMMAND_ENABLE  = no
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/cu75/keymaps/default/rules.mk b/keyboards/cu75/keymaps/default/rules.mk
index 39f6eca8b..fd26d69fb 100644
--- a/keyboards/cu75/keymaps/default/rules.mk
+++ b/keyboards/cu75/keymaps/default/rules.mk
@@ -23,10 +23,6 @@ ISSI_ENABLE = yes               # If the I2C pullup resistors aren't install thi
 WATCHDOG_ENABLE = no           # Resets keyboard if matrix_scan isn't run every 250ms
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
 ifeq ($(strip $(ISSI_ENABLE)), yes)
    TMK_COMMON_DEFS += -DISSI_ENABLE
 endif
diff --git a/keyboards/cu75/keymaps/iso/rules.mk b/keyboards/cu75/keymaps/iso/rules.mk
index f8b4d5568..9407f1103 100644
--- a/keyboards/cu75/keymaps/iso/rules.mk
+++ b/keyboards/cu75/keymaps/iso/rules.mk
@@ -23,10 +23,6 @@ ISSI_ENABLE = no               # If the I2C pullup resistors aren't install this
 WATCHDOG_ENABLE = yes           # Resets keyboard if matrix_scan isn't run every 250ms
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
 ifeq ($(strip $(ISSI_ENABLE)), yes)
    TMK_COMMON_DEFS += -DISSI_ENABLE
 endif
diff --git a/keyboards/deltasplit75/keymaps/itsaferbie/rules.mk b/keyboards/deltasplit75/keymaps/itsaferbie/rules.mk
index 75db99ebe..92f24224c 100644
--- a/keyboards/deltasplit75/keymaps/itsaferbie/rules.mk
+++ b/keyboards/deltasplit75/keymaps/itsaferbie/rules.mk
@@ -2,6 +2,3 @@ RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight.
 AUDIO_ENABLE = no            # Audio disabled while using RGB underlight.
 EXTRAKEY_ENABLE = yes
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/eco/keymaps/default/rules.mk b/keyboards/eco/keymaps/default/rules.mk
index 099660232..83d1175db 100644
--- a/keyboards/eco/keymaps/default/rules.mk
+++ b/keyboards/eco/keymaps/default/rules.mk
@@ -20,6 +20,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/eco/keymaps/hexwire/rules.mk b/keyboards/eco/keymaps/hexwire/rules.mk
index 099660232..83d1175db 100644
--- a/keyboards/eco/keymaps/hexwire/rules.mk
+++ b/keyboards/eco/keymaps/hexwire/rules.mk
@@ -20,6 +20,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/eco/keymaps/that_canadian/rules.mk b/keyboards/eco/keymaps/that_canadian/rules.mk
index 099660232..83d1175db 100644
--- a/keyboards/eco/keymaps/that_canadian/rules.mk
+++ b/keyboards/eco/keymaps/that_canadian/rules.mk
@@ -20,6 +20,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/ergodox_ez/keymaps/heartrobotninja/rules.mk b/keyboards/ergodox_ez/keymaps/heartrobotninja/rules.mk
index db5e5d155..6f40259b6 100644
--- a/keyboards/ergodox_ez/keymaps/heartrobotninja/rules.mk
+++ b/keyboards/ergodox_ez/keymaps/heartrobotninja/rules.mk
@@ -30,6 +30,3 @@ KEYMAP_BRANCH = $(shell \
 OPT_DEFS += -DKEYMAP_VERSION=\"$(KEYMAP_VERSION)\\\#$(KEYMAP_BRANCH)\"
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/fourier/keymaps/valgrahf/rules.mk b/keyboards/fourier/keymaps/valgrahf/rules.mk
index 457a3d01d..e69de29bb 100644
--- a/keyboards/fourier/keymaps/valgrahf/rules.mk
+++ b/keyboards/fourier/keymaps/valgrahf/rules.mk
@@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/gh60/keymaps/dbroqua/rules.mk b/keyboards/gh60/keymaps/dbroqua/rules.mk
index 31c63ffd8..5c6afa226 100644
--- a/keyboards/gh60/keymaps/dbroqua/rules.mk
+++ b/keyboards/gh60/keymaps/dbroqua/rules.mk
@@ -106,7 +106,3 @@ NKRO_ENABLE = yes		    # USB Nkey Rollover - if this doesn't work, see here: htt
 # BLUETOOTH_ENABLE = yes        # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes    # Enable RGB Underglow
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/gh60/keymaps/dbroqua_7U/rules.mk b/keyboards/gh60/keymaps/dbroqua_7U/rules.mk
index e54601969..e4269566d 100644
--- a/keyboards/gh60/keymaps/dbroqua_7U/rules.mk
+++ b/keyboards/gh60/keymaps/dbroqua_7U/rules.mk
@@ -106,6 +106,3 @@ NKRO_ENABLE = yes		    # USB Nkey Rollover - if this doesn't work, see here: htt
 # BLUETOOTH_ENABLE = yes        # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no    # Enable RGB Underglow
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/gh60/keymaps/robotmaxtron/rules.mk b/keyboards/gh60/keymaps/robotmaxtron/rules.mk
index 2b80ea00e..6e5d6e1ec 100644
--- a/keyboards/gh60/keymaps/robotmaxtron/rules.mk
+++ b/keyboards/gh60/keymaps/robotmaxtron/rules.mk
@@ -106,7 +106,3 @@ NKRO_ENABLE = yes		# USB Nkey Rollover - if this doesn't work, see here: https:/
 # BLUETOOTH_ENABLE = yes        # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes          # Enable RGB Underglow
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/gh60/keymaps/sethbc/rules.mk b/keyboards/gh60/keymaps/sethbc/rules.mk
index 457a3d01d..e69de29bb 100644
--- a/keyboards/gh60/keymaps/sethbc/rules.mk
+++ b/keyboards/gh60/keymaps/sethbc/rules.mk
@@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/gonnerd/keymaps/default/rules.mk b/keyboards/gonnerd/keymaps/default/rules.mk
index e34aba692..6de64fcf8 100644
--- a/keyboards/gonnerd/keymaps/default/rules.mk
+++ b/keyboards/gonnerd/keymaps/default/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/gonnerd/keymaps/gam3cat/rules.mk b/keyboards/gonnerd/keymaps/gam3cat/rules.mk
index 6eab033cc..55e681efb 100644
--- a/keyboards/gonnerd/keymaps/gam3cat/rules.mk
+++ b/keyboards/gonnerd/keymaps/gam3cat/rules.mk
@@ -22,3 +22,4 @@ FAUXCLICKY_ENABLE = no      # Uses buzzer to emulate clicky switches.  By defaul
 API_SYSEX_ENABLE = no       # This enables using the Quantum SYSEX API to send strings(+5390)
 KEY_LOCK_ENABLE = no        # This enables key lock(+260)
 SPLIT_KEYBOARD = no         # This enables split keyboard support and includes all necessary files located at quantum/split_common
diff --git a/keyboards/gonnerd/keymaps/mauin/rules.mk b/keyboards/gonnerd/keymaps/mauin/rules.mk
index e34aba692..6de64fcf8 100644
--- a/keyboards/gonnerd/keymaps/mauin/rules.mk
+++ b/keyboards/gonnerd/keymaps/mauin/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/gonnerd/keymaps/tkl/rules.mk b/keyboards/gonnerd/keymaps/tkl/rules.mk
index b96663efe..09b51e5a0 100644
--- a/keyboards/gonnerd/keymaps/tkl/rules.mk
+++ b/keyboards/gonnerd/keymaps/tkl/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/hadron/ver2/keymaps/side_numpad/rules.mk b/keyboards/hadron/ver2/keymaps/side_numpad/rules.mk
index 687c285bd..79be3bb87 100644
--- a/keyboards/hadron/ver2/keymaps/side_numpad/rules.mk
+++ b/keyboards/hadron/ver2/keymaps/side_numpad/rules.mk
@@ -21,6 +21,3 @@ SWAP_HANDS_ENABLE = no        # Enable one-hand typing
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/handwired/atreus50/keymaps/ajp10304/rules.mk b/keyboards/handwired/atreus50/keymaps/ajp10304/rules.mk
index f2a91de89..fc5d9ba1a 100644
--- a/keyboards/handwired/atreus50/keymaps/ajp10304/rules.mk
+++ b/keyboards/handwired/atreus50/keymaps/ajp10304/rules.mk
@@ -1,7 +1,3 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
 AUDIO_ENABLE = no
 MOUSEKEY_ENABLE = yes
diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/rules.mk b/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/rules.mk
index 457a3d01d..e69de29bb 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/rules.mk
@@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/rules.mk b/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/rules.mk
index 457a3d01d..e69de29bb 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/rules.mk
@@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/handwired/frenchdev/rules.mk b/keyboards/handwired/frenchdev/rules.mk
index 2b70ae564..c82bf4a38 100644
--- a/keyboards/handwired/frenchdev/rules.mk
+++ b/keyboards/handwired/frenchdev/rules.mk
@@ -87,6 +87,3 @@ AUDIO_ENABLE = no           # Audio output on port C6
 RGBLIGHT_ENABLE = no
 API_SYSEX_ENABLE = no
-#ifndef QUANTUM_DIR
-#       include ../../../Makefile
-#endif
diff --git a/keyboards/handwired/woodpad/keymaps/default/rules.mk b/keyboards/handwired/woodpad/keymaps/default/rules.mk
index f060db79c..fce19bfaa 100644
--- a/keyboards/handwired/woodpad/keymaps/default/rules.mk
+++ b/keyboards/handwired/woodpad/keymaps/default/rules.mk
@@ -32,6 +32,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/handwired/woodpad/keymaps/drashna/rules.mk b/keyboards/handwired/woodpad/keymaps/drashna/rules.mk
index ed7d2e7c6..7f7f30e2a 100644
--- a/keyboards/handwired/woodpad/keymaps/drashna/rules.mk
+++ b/keyboards/handwired/woodpad/keymaps/drashna/rules.mk
@@ -8,6 +8,3 @@ MOUSEKEY_ENABLE   = no
 EXTRAFLAGS        = -flto
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/helix/pico/keymaps/default/rules.mk b/keyboards/helix/pico/keymaps/default/rules.mk
index c5ee8acb2..3b518ff88 100644
--- a/keyboards/helix/pico/keymaps/default/rules.mk
+++ b/keyboards/helix/pico/keymaps/default/rules.mk
@@ -119,10 +119,6 @@ endif
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
 # Uncomment these for debugging
 # $(info -- RGBLIGHT_ENABLE=$(RGBLIGHT_ENABLE))
 # $(info -- OPT_DEFS=$(OPT_DEFS))
diff --git a/keyboards/helix/pico/keymaps/mtei/rules.mk b/keyboards/helix/pico/keymaps/mtei/rules.mk
index c5ee8acb2..3b518ff88 100644
--- a/keyboards/helix/pico/keymaps/mtei/rules.mk
+++ b/keyboards/helix/pico/keymaps/mtei/rules.mk
@@ -119,10 +119,6 @@ endif
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
 # Uncomment these for debugging
 # $(info -- RGBLIGHT_ENABLE=$(RGBLIGHT_ENABLE))
 # $(info -- OPT_DEFS=$(OPT_DEFS))
diff --git a/keyboards/helix/rev1/keymaps/default/rules.mk b/keyboards/helix/rev1/keymaps/default/rules.mk
index 457a3d01d..e69de29bb 100644
--- a/keyboards/helix/rev1/keymaps/default/rules.mk
+++ b/keyboards/helix/rev1/keymaps/default/rules.mk
@@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/helix/rev2/keymaps/default/rules.mk b/keyboards/helix/rev2/keymaps/default/rules.mk
index 3f84b895a..37ef8632d 100644
--- a/keyboards/helix/rev2/keymaps/default/rules.mk
+++ b/keyboards/helix/rev2/keymaps/default/rules.mk
@@ -118,10 +118,6 @@ endif
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
 # Uncomment these for debugging
 # $(info -- RGBLIGHT_ENABLE=$(RGBLIGHT_ENABLE))
 # $(info -- OPT_DEFS=$(OPT_DEFS))
diff --git a/keyboards/helix/rev2/keymaps/edvorakjp/rules.mk b/keyboards/helix/rev2/keymaps/edvorakjp/rules.mk
index 4257d004d..9d3743995 100644
--- a/keyboards/helix/rev2/keymaps/edvorakjp/rules.mk
+++ b/keyboards/helix/rev2/keymaps/edvorakjp/rules.mk
@@ -121,10 +121,6 @@ endif
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-  include ../../../../Makefile
-endif
 # Uncomment these for debugging
 # $(info -- RGBLIGHT_ENABLE=$(RGBLIGHT_ENABLE))
 # $(info -- OPT_DEFS=$(OPT_DEFS))
diff --git a/keyboards/helix/rev2/keymaps/five_rows/rules.mk b/keyboards/helix/rev2/keymaps/five_rows/rules.mk
index bd7130cfc..a0bf21917 100644
--- a/keyboards/helix/rev2/keymaps/five_rows/rules.mk
+++ b/keyboards/helix/rev2/keymaps/five_rows/rules.mk
@@ -125,10 +125,6 @@ endif
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
 # Uncomment these for debugging
 # $(info -- RGBLIGHT_ENABLE=$(RGBLIGHT_ENABLE))
 # $(info -- OPT_DEFS=$(OPT_DEFS))
diff --git a/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk b/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk
index 3f84b895a..37ef8632d 100644
--- a/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk
+++ b/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk
@@ -118,10 +118,6 @@ endif
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
 # Uncomment these for debugging
 # $(info -- RGBLIGHT_ENABLE=$(RGBLIGHT_ENABLE))
 # $(info -- OPT_DEFS=$(OPT_DEFS))
diff --git a/keyboards/helix/rev2/keymaps/froggy/rules.mk b/keyboards/helix/rev2/keymaps/froggy/rules.mk
index f46017071..8cd0efdd4 100644
--- a/keyboards/helix/rev2/keymaps/froggy/rules.mk
+++ b/keyboards/helix/rev2/keymaps/froggy/rules.mk
@@ -118,10 +118,6 @@ endif
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
 # Uncomment these for debugging
 # $(info -- RGBLIGHT_ENABLE=$(RGBLIGHT_ENABLE))
 # $(info -- OPT_DEFS=$(OPT_DEFS))
diff --git a/keyboards/helix/rev2/keymaps/led_test/rules.mk b/keyboards/helix/rev2/keymaps/led_test/rules.mk
index a9cd251bc..2062d348d 100644
--- a/keyboards/helix/rev2/keymaps/led_test/rules.mk
+++ b/keyboards/helix/rev2/keymaps/led_test/rules.mk
@@ -120,10 +120,6 @@ SRC += led_test_init.c
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
 # Uncomment these for debugging
 # $(info -- RGBLIGHT_ENABLE=$(RGBLIGHT_ENABLE))
 # $(info -- OPT_DEFS=$(OPT_DEFS))
diff --git a/keyboards/hhkb/keymaps/cinaeco/rules.mk b/keyboards/hhkb/keymaps/cinaeco/rules.mk
index efed95492..a85669aa2 100644
--- a/keyboards/hhkb/keymaps/cinaeco/rules.mk
+++ b/keyboards/hhkb/keymaps/cinaeco/rules.mk
@@ -18,6 +18,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/iris/keymaps/davidrambo/rules.mk b/keyboards/iris/keymaps/davidrambo/rules.mk
index 0b7e7b905..1e3473a1a 100644
--- a/keyboards/iris/keymaps/davidrambo/rules.mk
+++ b/keyboards/iris/keymaps/davidrambo/rules.mk
@@ -2,6 +2,3 @@ RGBLIGHT_ENABLE = no
 BACKLIGHT_ENABLE = no
 TAP_DANCE_ENABLE = yes
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/iris/keymaps/dvp-zjpxshade/rules.mk b/keyboards/iris/keymaps/dvp-zjpxshade/rules.mk
index 22b6ec476..73142a168 100644
--- a/keyboards/iris/keymaps/dvp-zjpxshade/rules.mk
+++ b/keyboards/iris/keymaps/dvp-zjpxshade/rules.mk
@@ -1,6 +1,3 @@
 RGBLIGHT_ENABLE = yes
 BACKLIGHT_ENABLE = yes
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/iris/keymaps/hag/rules.mk b/keyboards/iris/keymaps/hag/rules.mk
index 22b6ec476..73142a168 100644
--- a/keyboards/iris/keymaps/hag/rules.mk
+++ b/keyboards/iris/keymaps/hag/rules.mk
@@ -1,6 +1,3 @@
 RGBLIGHT_ENABLE = yes
 BACKLIGHT_ENABLE = yes
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/iris/keymaps/hexwire/rules.mk b/keyboards/iris/keymaps/hexwire/rules.mk
index 22b6ec476..73142a168 100644
--- a/keyboards/iris/keymaps/hexwire/rules.mk
+++ b/keyboards/iris/keymaps/hexwire/rules.mk
@@ -1,6 +1,3 @@
 RGBLIGHT_ENABLE = yes
 BACKLIGHT_ENABLE = yes
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/iris/keymaps/impstyle/rules.mk b/keyboards/iris/keymaps/impstyle/rules.mk
index 4db5ef00d..ef4a383d3 100644
--- a/keyboards/iris/keymaps/impstyle/rules.mk
+++ b/keyboards/iris/keymaps/impstyle/rules.mk
@@ -3,6 +3,3 @@ BACKLIGHT_ENABLE = no
 TAP_DANCE_ENABLE = no
 MOUSEKEY_ENABLE = yes
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/iris/keymaps/krusli/rules.mk b/keyboards/iris/keymaps/krusli/rules.mk
index c5e16f136..b0e37ec2f 100644
--- a/keyboards/iris/keymaps/krusli/rules.mk
+++ b/keyboards/iris/keymaps/krusli/rules.mk
@@ -1,6 +1,3 @@
 RGBLIGHT_ENABLE = no
 BACKLIGHT_ENABLE = no
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/iris/keymaps/lewisridden/rules.mk b/keyboards/iris/keymaps/lewisridden/rules.mk
index 22b6ec476..73142a168 100644
--- a/keyboards/iris/keymaps/lewisridden/rules.mk
+++ b/keyboards/iris/keymaps/lewisridden/rules.mk
@@ -1,6 +1,3 @@
 RGBLIGHT_ENABLE = yes
 BACKLIGHT_ENABLE = yes
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/iris/keymaps/mtdjr/rules.mk b/keyboards/iris/keymaps/mtdjr/rules.mk
index a1b884e4d..7f8c630d8 100644
--- a/keyboards/iris/keymaps/mtdjr/rules.mk
+++ b/keyboards/iris/keymaps/mtdjr/rules.mk
@@ -1,6 +1,4 @@
 RGBLIGHT_ENABLE = no
 BACKLIGHT_ENABLE = no
 #AUDIO_ENABLE = yes 
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/iris/keymaps/rdhaene/rules.mk b/keyboards/iris/keymaps/rdhaene/rules.mk
index d87ba7913..4bfbfb2ae 100644
--- a/keyboards/iris/keymaps/rdhaene/rules.mk
+++ b/keyboards/iris/keymaps/rdhaene/rules.mk
@@ -1,6 +1,3 @@
 RGBLIGHT_ENABLE = no
 BACKLIGHT_ENABLE = yes
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/iris/keymaps/swedish/rules.mk b/keyboards/iris/keymaps/swedish/rules.mk
index 22b6ec476..73142a168 100644
--- a/keyboards/iris/keymaps/swedish/rules.mk
+++ b/keyboards/iris/keymaps/swedish/rules.mk
@@ -1,6 +1,3 @@
 RGBLIGHT_ENABLE = yes
 BACKLIGHT_ENABLE = yes
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/iris/keymaps/transmogrified/rules.mk b/keyboards/iris/keymaps/transmogrified/rules.mk
index c248822b2..444fa38a9 100644
--- a/keyboards/iris/keymaps/transmogrified/rules.mk
+++ b/keyboards/iris/keymaps/transmogrified/rules.mk
@@ -1,6 +1,3 @@
 BACKLIGHT_ENABLE = yes
 TAP_DANCE_ENABLE = yes
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/iris/keymaps/yanfali/rules.mk b/keyboards/iris/keymaps/yanfali/rules.mk
index 22b6ec476..73142a168 100644
--- a/keyboards/iris/keymaps/yanfali/rules.mk
+++ b/keyboards/iris/keymaps/yanfali/rules.mk
@@ -1,6 +1,3 @@
 RGBLIGHT_ENABLE = yes
 BACKLIGHT_ENABLE = yes
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/jc65/v32u4/keymaps/gam3cat/rules.mk b/keyboards/jc65/v32u4/keymaps/gam3cat/rules.mk
index 85b2b41a6..4086c15d4 100644
--- a/keyboards/jc65/v32u4/keymaps/gam3cat/rules.mk
+++ b/keyboards/jc65/v32u4/keymaps/gam3cat/rules.mk
@@ -22,3 +22,4 @@ FAUXCLICKY_ENABLE = no      # Uses buzzer to emulate clicky switches.  By defaul
 API_SYSEX_ENABLE = no       # This enables using the Quantum SYSEX API to send strings(+5390)
 KEY_LOCK_ENABLE = no        # This enables key lock(+260)
 SPLIT_KEYBOARD = no         # This enables split keyboard support and includes all necessary files located at quantum/split_common
diff --git a/keyboards/jd40/keymaps/vanagon/rules.mk b/keyboards/jd40/keymaps/vanagon/rules.mk
index 63aac4e59..e69de29bb 100644
--- a/keyboards/jd40/keymaps/vanagon/rules.mk
+++ b/keyboards/jd40/keymaps/vanagon/rules.mk
@@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/jd45/keymaps/mjt6u/rules.mk b/keyboards/jd45/keymaps/mjt6u/rules.mk
index 1df8b9754..2cf0221ed 100644
--- a/keyboards/jd45/keymaps/mjt6u/rules.mk
+++ b/keyboards/jd45/keymaps/mjt6u/rules.mk
@@ -18,6 +18,3 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 DEBUG_ENABLE = yes
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/jj40/keymaps/ajp10304/rules.mk b/keyboards/jj40/keymaps/ajp10304/rules.mk
index dc6ab13e8..4dee01cd5 100644
--- a/keyboards/jj40/keymaps/ajp10304/rules.mk
+++ b/keyboards/jj40/keymaps/ajp10304/rules.mk
@@ -1,6 +1,3 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
 AUDIO_ENABLE = no
 MOUSEKEY_ENABLE = yes
diff --git a/keyboards/jj40/keymaps/fun40/rules.mk b/keyboards/jj40/keymaps/fun40/rules.mk
index 6fe3b0515..92f168a16 100644
--- a/keyboards/jj40/keymaps/fun40/rules.mk
+++ b/keyboards/jj40/keymaps/fun40/rules.mk
@@ -19,6 +19,3 @@ DISABLE_WS2812 = yes
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/jj50/rules.mk b/keyboards/jj50/rules.mk
index 4cc901859..1a18ec4fe 100644
--- a/keyboards/jj50/rules.mk
+++ b/keyboards/jj50/rules.mk
@@ -57,10 +57,6 @@ SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 CUSTOM_MATRIX = yes
 SRC = matrix.c i2c.c backlight.c
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
 # programming options
 PROGRAM_CMD = ./keyboards/ps2avrGB/program $(TARGET).hex
diff --git a/keyboards/kc60/keymaps/stanleylai/rules.mk b/keyboards/kc60/keymaps/stanleylai/rules.mk
index 9a381d2e7..a826c2bf2 100644
--- a/keyboards/kc60/keymaps/stanleylai/rules.mk
+++ b/keyboards/kc60/keymaps/stanleylai/rules.mk
@@ -20,6 +20,3 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 NKRO_ENABLE = yes           # USB Nkey Rollover
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/kc60/keymaps/wigguno/rules.mk b/keyboards/kc60/keymaps/wigguno/rules.mk
index 1f8d1506f..db084a76a 100644
--- a/keyboards/kc60/keymaps/wigguno/rules.mk
+++ b/keyboards/kc60/keymaps/wigguno/rules.mk
@@ -19,6 +19,3 @@ UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/kc60/keymaps/ws2812/rules.mk b/keyboards/kc60/keymaps/ws2812/rules.mk
index a8c93bcf5..5d5a6f8ab 100644
--- a/keyboards/kc60/keymaps/ws2812/rules.mk
+++ b/keyboards/kc60/keymaps/ws2812/rules.mk
@@ -20,6 +20,3 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 NKRO_ENABLE = no            # USB Nkey Rollover
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/kinesis/keymaps/carpalx/rules.mk b/keyboards/kinesis/keymaps/carpalx/rules.mk
index c7753fae0..63f52ac18 100644
--- a/keyboards/kinesis/keymaps/carpalx/rules.mk
+++ b/keyboards/kinesis/keymaps/carpalx/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/kinesis/keymaps/default/rules.mk b/keyboards/kinesis/keymaps/default/rules.mk
index 93f927c7d..7a331cd53 100644
--- a/keyboards/kinesis/keymaps/default/rules.mk
+++ b/keyboards/kinesis/keymaps/default/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/kinesis/keymaps/default_pretty/rules.mk b/keyboards/kinesis/keymaps/default_pretty/rules.mk
index 93f927c7d..7a331cd53 100644
--- a/keyboards/kinesis/keymaps/default_pretty/rules.mk
+++ b/keyboards/kinesis/keymaps/default_pretty/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/kinesis/keymaps/dvorak/rules.mk b/keyboards/kinesis/keymaps/dvorak/rules.mk
index 93f927c7d..7a331cd53 100644
--- a/keyboards/kinesis/keymaps/dvorak/rules.mk
+++ b/keyboards/kinesis/keymaps/dvorak/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/kinesis/keymaps/insertsnideremarks/rules.mk b/keyboards/kinesis/keymaps/insertsnideremarks/rules.mk
index 24b16ba9b..d2e362886 100644
--- a/keyboards/kinesis/keymaps/insertsnideremarks/rules.mk
+++ b/keyboards/kinesis/keymaps/insertsnideremarks/rules.mk
@@ -19,6 +19,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 TAP_DANCE_ENABLE = yes      # Enable Tap Dancing function
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/kinesis/keymaps/milestogo/rules.mk b/keyboards/kinesis/keymaps/milestogo/rules.mk
index 93f927c7d..7a331cd53 100644
--- a/keyboards/kinesis/keymaps/milestogo/rules.mk
+++ b/keyboards/kinesis/keymaps/milestogo/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/kinesis/keymaps/xyverz/rules.mk b/keyboards/kinesis/keymaps/xyverz/rules.mk
index 94dc4cdfe..f21a27fea 100644
--- a/keyboards/kinesis/keymaps/xyverz/rules.mk
+++ b/keyboards/kinesis/keymaps/xyverz/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/kmac/keymaps/default/rules.mk b/keyboards/kmac/keymaps/default/rules.mk
index 8e2d011b3..128487947 100644
--- a/keyboards/kmac/keymaps/default/rules.mk
+++ b/keyboards/kmac/keymaps/default/rules.mk
@@ -32,6 +32,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-    include ../../../../Makefile
-endif
diff --git a/keyboards/kmac/keymaps/winkeyless/rules.mk b/keyboards/kmac/keymaps/winkeyless/rules.mk
index 8e2d011b3..128487947 100644
--- a/keyboards/kmac/keymaps/winkeyless/rules.mk
+++ b/keyboards/kmac/keymaps/winkeyless/rules.mk
@@ -32,6 +32,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-    include ../../../../Makefile
-endif
diff --git a/keyboards/kona_classic/keymaps/ansi/rules.mk b/keyboards/kona_classic/keymaps/ansi/rules.mk
index 38c23a1b8..2892bb424 100644
--- a/keyboards/kona_classic/keymaps/ansi/rules.mk
+++ b/keyboards/kona_classic/keymaps/ansi/rules.mk
@@ -32,6 +32,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/kona_classic/keymaps/ansi_arrows/rules.mk b/keyboards/kona_classic/keymaps/ansi_arrows/rules.mk
index 38c23a1b8..2892bb424 100644
--- a/keyboards/kona_classic/keymaps/ansi_arrows/rules.mk
+++ b/keyboards/kona_classic/keymaps/ansi_arrows/rules.mk
@@ -32,6 +32,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/kona_classic/keymaps/ansi_arrows_lcap/rules.mk b/keyboards/kona_classic/keymaps/ansi_arrows_lcap/rules.mk
index 38c23a1b8..2892bb424 100644
--- a/keyboards/kona_classic/keymaps/ansi_arrows_lcap/rules.mk
+++ b/keyboards/kona_classic/keymaps/ansi_arrows_lcap/rules.mk
@@ -32,6 +32,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/kona_classic/keymaps/ansi_split/rules.mk b/keyboards/kona_classic/keymaps/ansi_split/rules.mk
index 38c23a1b8..2892bb424 100644
--- a/keyboards/kona_classic/keymaps/ansi_split/rules.mk
+++ b/keyboards/kona_classic/keymaps/ansi_split/rules.mk
@@ -32,6 +32,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/kona_classic/keymaps/ansi_split_arrows/rules.mk b/keyboards/kona_classic/keymaps/ansi_split_arrows/rules.mk
index 38c23a1b8..2892bb424 100644
--- a/keyboards/kona_classic/keymaps/ansi_split_arrows/rules.mk
+++ b/keyboards/kona_classic/keymaps/ansi_split_arrows/rules.mk
@@ -32,6 +32,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/kona_classic/keymaps/default/rules.mk b/keyboards/kona_classic/keymaps/default/rules.mk
index 38c23a1b8..2892bb424 100644
--- a/keyboards/kona_classic/keymaps/default/rules.mk
+++ b/keyboards/kona_classic/keymaps/default/rules.mk
@@ -32,6 +32,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/kona_classic/keymaps/iso/rules.mk b/keyboards/kona_classic/keymaps/iso/rules.mk
index 38c23a1b8..2892bb424 100644
--- a/keyboards/kona_classic/keymaps/iso/rules.mk
+++ b/keyboards/kona_classic/keymaps/iso/rules.mk
@@ -32,6 +32,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/kona_classic/keymaps/iso_arrows/rules.mk b/keyboards/kona_classic/keymaps/iso_arrows/rules.mk
index 38c23a1b8..2892bb424 100644
--- a/keyboards/kona_classic/keymaps/iso_arrows/rules.mk
+++ b/keyboards/kona_classic/keymaps/iso_arrows/rules.mk
@@ -32,6 +32,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/kona_classic/keymaps/iso_split/rules.mk b/keyboards/kona_classic/keymaps/iso_split/rules.mk
index 38c23a1b8..2892bb424 100644
--- a/keyboards/kona_classic/keymaps/iso_split/rules.mk
+++ b/keyboards/kona_classic/keymaps/iso_split/rules.mk
@@ -32,6 +32,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/kona_classic/keymaps/iso_split_arrows/rules.mk b/keyboards/kona_classic/keymaps/iso_split_arrows/rules.mk
index 38c23a1b8..2892bb424 100644
--- a/keyboards/kona_classic/keymaps/iso_split_arrows/rules.mk
+++ b/keyboards/kona_classic/keymaps/iso_split_arrows/rules.mk
@@ -32,6 +32,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/laplace/keymaps/bakingpy/rules.mk b/keyboards/laplace/keymaps/bakingpy/rules.mk
index 457a3d01d..e69de29bb 100644
--- a/keyboards/laplace/keymaps/bakingpy/rules.mk
+++ b/keyboards/laplace/keymaps/bakingpy/rules.mk
@@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/laplace/keymaps/default/rules.mk b/keyboards/laplace/keymaps/default/rules.mk
index 457a3d01d..e69de29bb 100644
--- a/keyboards/laplace/keymaps/default/rules.mk
+++ b/keyboards/laplace/keymaps/default/rules.mk
@@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/launchpad/keymaps/default/rules.mk b/keyboards/launchpad/keymaps/default/rules.mk
index 9bf35a59d..d1fa27f41 100644
--- a/keyboards/launchpad/keymaps/default/rules.mk
+++ b/keyboards/launchpad/keymaps/default/rules.mk
@@ -20,6 +20,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/lets_split/keymaps/bbaserdem/rules.mk b/keyboards/lets_split/keymaps/bbaserdem/rules.mk
index 4159db3fe..7a37e989d 100755
--- a/keyboards/lets_split/keymaps/bbaserdem/rules.mk
+++ b/keyboards/lets_split/keymaps/bbaserdem/rules.mk
@@ -6,6 +6,3 @@ RGBLIGHT_ENABLE = yes 		# LED strips
 TAP_DANCE_ENABLE = no           # Use multi-tap features
 AUDIO_ENABLE = no                       # Audio stuff
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/lets_split/keymaps/bbaserdem_right/rules.mk b/keyboards/lets_split/keymaps/bbaserdem_right/rules.mk
index 36b4b8fc2..d0b692061 100755
--- a/keyboards/lets_split/keymaps/bbaserdem_right/rules.mk
+++ b/keyboards/lets_split/keymaps/bbaserdem_right/rules.mk
@@ -21,6 +21,3 @@ KEY_LOCK_ENABLE = no 		# Allows locking any key. Not used
 UNICODE_ENABLE = no                     # Used for unicode character emulation
 EXTRAKEY_ENABLE = no            # OS signals like volume control
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/lets_split/keymaps/cpeters1982/rules.mk b/keyboards/lets_split/keymaps/cpeters1982/rules.mk
index f2fde785d..87136eef0 100644
--- a/keyboards/lets_split/keymaps/cpeters1982/rules.mk
+++ b/keyboards/lets_split/keymaps/cpeters1982/rules.mk
@@ -1,8 +1,3 @@
+AUTO_SHIFT_ENABLE = yes
+RGBLIGHT_ENABLE = yes
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-  AUTO_SHIFT_ENABLE = yes
-  RGBLIGHT_ENABLE = yes
-endif
diff --git a/keyboards/lets_split/keymaps/fabian/rules.mk b/keyboards/lets_split/keymaps/fabian/rules.mk
index b8c82cb99..316a4b9cb 100644
--- a/keyboards/lets_split/keymaps/fabian/rules.mk
+++ b/keyboards/lets_split/keymaps/fabian/rules.mk
@@ -4,6 +4,3 @@
 #
 # UNICODE_ENABLE = yes
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/lets_split/keymaps/heartrobotninja/rules.mk b/keyboards/lets_split/keymaps/heartrobotninja/rules.mk
index 36f5e5b6d..21aae31db 100644
--- a/keyboards/lets_split/keymaps/heartrobotninja/rules.mk
+++ b/keyboards/lets_split/keymaps/heartrobotninja/rules.mk
@@ -20,6 +20,3 @@ SWAP_HANDS_ENABLE = no        # Enable one-hand typing
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/lets_split/keymaps/khord/rules.mk b/keyboards/lets_split/keymaps/khord/rules.mk
index c90523e5d..32b6edc12 100644
--- a/keyboards/lets_split/keymaps/khord/rules.mk
+++ b/keyboards/lets_split/keymaps/khord/rules.mk
@@ -2,6 +2,3 @@ TAP_DANCE_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 USE_I2C = no
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/lets_split/keymaps/mbsurfer/rules.mk b/keyboards/lets_split/keymaps/mbsurfer/rules.mk
index c90523e5d..32b6edc12 100644
--- a/keyboards/lets_split/keymaps/mbsurfer/rules.mk
+++ b/keyboards/lets_split/keymaps/mbsurfer/rules.mk
@@ -2,6 +2,3 @@ TAP_DANCE_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 USE_I2C = no
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/lets_split/keymaps/mjt/rules.mk b/keyboards/lets_split/keymaps/mjt/rules.mk
index a14e84d4e..a43a9a1da 100644
--- a/keyboards/lets_split/keymaps/mjt/rules.mk
+++ b/keyboards/lets_split/keymaps/mjt/rules.mk
@@ -20,6 +20,3 @@ SWAP_HANDS_ENABLE = no        # Enable one-hand typing
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/lets_split/keymaps/mtdjr/rules.mk b/keyboards/lets_split/keymaps/mtdjr/rules.mk
index 75e9c6503..a81250cdf 100644
--- a/keyboards/lets_split/keymaps/mtdjr/rules.mk
+++ b/keyboards/lets_split/keymaps/mtdjr/rules.mk
@@ -1,5 +1,2 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
 RGBLIGHT_ENABLE = yes
diff --git a/keyboards/lets_split/keymaps/pitty/rules.mk b/keyboards/lets_split/keymaps/pitty/rules.mk
index 8ebc85a44..53a426157 100644
--- a/keyboards/lets_split/keymaps/pitty/rules.mk
+++ b/keyboards/lets_split/keymaps/pitty/rules.mk
@@ -1,6 +1,3 @@
 RGBLIGHT_ENABLE = yes
 NKRO_ENABLE = yes
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/lets_split/keymaps/poker/rules.mk b/keyboards/lets_split/keymaps/poker/rules.mk
index 457a3d01d..e69de29bb 100644
--- a/keyboards/lets_split/keymaps/poker/rules.mk
+++ b/keyboards/lets_split/keymaps/poker/rules.mk
@@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/lets_split/keymaps/waples/rules.mk b/keyboards/lets_split/keymaps/waples/rules.mk
index 457a3d01d..e69de29bb 100644
--- a/keyboards/lets_split/keymaps/waples/rules.mk
+++ b/keyboards/lets_split/keymaps/waples/rules.mk
@@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/lets_split/keymaps/xk/rules.mk b/keyboards/lets_split/keymaps/xk/rules.mk
index 195f01577..8aafefa64 100644
--- a/keyboards/lets_split/keymaps/xk/rules.mk
+++ b/keyboards/lets_split/keymaps/xk/rules.mk
@@ -14,6 +14,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/lets_split/keymaps/zer09/rules.mk b/keyboards/lets_split/keymaps/zer09/rules.mk
index d8adc7088..d2259fe9d 100644
--- a/keyboards/lets_split/keymaps/zer09/rules.mk
+++ b/keyboards/lets_split/keymaps/zer09/rules.mk
@@ -1,6 +1,3 @@
 RGBLIGHT_ENABLE = yes
 TAP_DANCE_ENABLE = yes
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/lets_split_eh/keymaps/bbaserdem/rules.mk b/keyboards/lets_split_eh/keymaps/bbaserdem/rules.mk
index 4159db3fe..7a37e989d 100755
--- a/keyboards/lets_split_eh/keymaps/bbaserdem/rules.mk
+++ b/keyboards/lets_split_eh/keymaps/bbaserdem/rules.mk
@@ -6,6 +6,3 @@ RGBLIGHT_ENABLE = yes 		# LED strips
 TAP_DANCE_ENABLE = no           # Use multi-tap features
 AUDIO_ENABLE = no                       # Audio stuff
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/lets_split_eh/keymaps/that_canadian/rules.mk b/keyboards/lets_split_eh/keymaps/that_canadian/rules.mk
index 457a3d01d..e69de29bb 100644
--- a/keyboards/lets_split_eh/keymaps/that_canadian/rules.mk
+++ b/keyboards/lets_split_eh/keymaps/that_canadian/rules.mk
@@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/levinson/keymaps/drogglbecher/rules.mk b/keyboards/levinson/keymaps/drogglbecher/rules.mk
index b223b71ab..b2a5451c8 100644
--- a/keyboards/levinson/keymaps/drogglbecher/rules.mk
+++ b/keyboards/levinson/keymaps/drogglbecher/rules.mk
@@ -5,6 +5,3 @@ BACKLIGHT_ENABLE = no
 UNICODE_ENABLE = yes
 DEFAULT_FOLDER = levinson/rev2
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/levinson/keymaps/losinggeneration/rules.mk b/keyboards/levinson/keymaps/losinggeneration/rules.mk
index c8eef2cb3..ee3ea67f7 100644
--- a/keyboards/levinson/keymaps/losinggeneration/rules.mk
+++ b/keyboards/levinson/keymaps/losinggeneration/rules.mk
@@ -12,6 +12,3 @@ MIDI_ENABLE      = no    # MIDI controls
 NKRO_ENABLE      = no    # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 RGBLIGHT_ENABLE  = yes   # Enable WS2812 RGB underlight. 
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/lfkeyboards/mini1800/rules.mk b/keyboards/lfkeyboards/mini1800/rules.mk
index 022b21924..be670b9b4 100644
--- a/keyboards/lfkeyboards/mini1800/rules.mk
+++ b/keyboards/lfkeyboards/mini1800/rules.mk
@@ -52,10 +52,6 @@ F_USB = $(F_CPU)
 # Interrupt driven control endpoint task(+60)
 OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
-# ifndef QUANTUM_DIR
-#       include ../../Makefile
-# endif
 ifeq ($(strip $(ISSI_ENABLE)), yes)
    # TMK_COMMON_DEFS += -DISSI_ENABLE
diff --git a/keyboards/lfkeyboards/smk65/keymaps/default/rules.mk b/keyboards/lfkeyboards/smk65/keymaps/default/rules.mk
index 14ceebb77..b5310da58 100644
--- a/keyboards/lfkeyboards/smk65/keymaps/default/rules.mk
+++ b/keyboards/lfkeyboards/smk65/keymaps/default/rules.mk
@@ -23,10 +23,6 @@ ISSI_ENABLE = yes               # If the I2C pullup resistors aren't install thi
 WATCHDOG_ENABLE = no            # Resets keyboard if matrix_scan isn't run every 250ms
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
 ifeq ($(strip $(ISSI_ENABLE)), yes)
    TMK_COMMON_DEFS += -DISSI_ENABLE
 endif
@@ -34,3 +30,4 @@ endif
 ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
    TMK_COMMON_DEFS += -DWATCHDOG_ENABLE
 endif
diff --git a/keyboards/lfkeyboards/smk65/keymaps/iso/rules.mk b/keyboards/lfkeyboards/smk65/keymaps/iso/rules.mk
index f8b4d5568..f1814cf48 100644
--- a/keyboards/lfkeyboards/smk65/keymaps/iso/rules.mk
+++ b/keyboards/lfkeyboards/smk65/keymaps/iso/rules.mk
@@ -23,10 +23,6 @@ ISSI_ENABLE = no               # If the I2C pullup resistors aren't install this
 WATCHDOG_ENABLE = yes           # Resets keyboard if matrix_scan isn't run every 250ms
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
 ifeq ($(strip $(ISSI_ENABLE)), yes)
    TMK_COMMON_DEFS += -DISSI_ENABLE
 endif
@@ -51,3 +47,4 @@ endif
 # endif
 # OPT_DEFS += -DLFK_REV_$(LFK_REV)
 # OPT_DEFS += -DUSB_PRODUCT=\"LFK_Rev$(LFK_REV)\"
diff --git a/keyboards/m10a/keymaps/default/rules.mk b/keyboards/m10a/keymaps/default/rules.mk
index 457a3d01d..e69de29bb 100644
--- a/keyboards/m10a/keymaps/default/rules.mk
+++ b/keyboards/m10a/keymaps/default/rules.mk
@@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/m10a/keymaps/gam3cat/rules.mk b/keyboards/m10a/keymaps/gam3cat/rules.mk
index 00515a31e..b09c2904f 100644
--- a/keyboards/m10a/keymaps/gam3cat/rules.mk
+++ b/keyboards/m10a/keymaps/gam3cat/rules.mk
@@ -22,3 +22,4 @@ FAUXCLICKY_ENABLE = no      # Uses buzzer to emulate clicky switches.  By defaul
 API_SYSEX_ENABLE = no       # This enables using the Quantum SYSEX API to send strings(+5390)
 KEY_LOCK_ENABLE = no        # This enables key lock(+260)
 SPLIT_KEYBOARD = no         # This enables split keyboard support and includes all necessary files located at quantum/split_common
diff --git a/keyboards/minidox/keymaps/that_canadian/rules.mk b/keyboards/minidox/keymaps/that_canadian/rules.mk
index 7637dfc09..f1ef68387 100644
--- a/keyboards/minidox/keymaps/that_canadian/rules.mk
+++ b/keyboards/minidox/keymaps/that_canadian/rules.mk
@@ -1,5 +1,2 @@
 RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/mitosis/keymaps/mjt/rules.mk b/keyboards/mitosis/keymaps/mjt/rules.mk
index a4137ad00..025965767 100644
--- a/keyboards/mitosis/keymaps/mjt/rules.mk
+++ b/keyboards/mitosis/keymaps/mjt/rules.mk
@@ -12,6 +12,3 @@ BLUETOOTH_ENABLE = no        # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no         # Enable WS2812 RGB underlight.
 API_SYSEX_ENABLE = no
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/miuni32/keymaps/adam-lee/rules.mk b/keyboards/miuni32/keymaps/adam-lee/rules.mk
index 3138ab57f..3a741d20a 100644
--- a/keyboards/miuni32/keymaps/adam-lee/rules.mk
+++ b/keyboards/miuni32/keymaps/adam-lee/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/miuni32/keymaps/default/rules.mk b/keyboards/miuni32/keymaps/default/rules.mk
index 3138ab57f..3a741d20a 100644
--- a/keyboards/miuni32/keymaps/default/rules.mk
+++ b/keyboards/miuni32/keymaps/default/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/miuni32/keymaps/ht_156/rules.mk b/keyboards/miuni32/keymaps/ht_156/rules.mk
index 3138ab57f..3a741d20a 100644
--- a/keyboards/miuni32/keymaps/ht_156/rules.mk
+++ b/keyboards/miuni32/keymaps/ht_156/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/miuni32/keymaps/ki/rules.mk b/keyboards/miuni32/keymaps/ki/rules.mk
index 7639c2b3f..15d3cfff2 100644
--- a/keyboards/miuni32/keymaps/ki/rules.mk
+++ b/keyboards/miuni32/keymaps/ki/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/niu_mini/keymaps/planck/rules.mk b/keyboards/niu_mini/keymaps/planck/rules.mk
index 457a3d01d..e69de29bb 100644
--- a/keyboards/niu_mini/keymaps/planck/rules.mk
+++ b/keyboards/niu_mini/keymaps/planck/rules.mk
@@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/niu_mini/keymaps/xtonhasvim/rules.mk b/keyboards/niu_mini/keymaps/xtonhasvim/rules.mk
index 359f94f1e..00946ff22 100644
--- a/keyboards/niu_mini/keymaps/xtonhasvim/rules.mk
+++ b/keyboards/niu_mini/keymaps/xtonhasvim/rules.mk
@@ -1,8 +1,5 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
 MOUSEKEY_ENABLE = yes
 BACKLIGHT_ENABLE = no
 AUDIO_ENABLE = no
 CONSOLE_ENABLE = no         # Console for debug(+400)
diff --git a/keyboards/nyquist/keymaps/jojiichan/rules.mk b/keyboards/nyquist/keymaps/jojiichan/rules.mk
index 1e5761278..a81250cdf 100644
--- a/keyboards/nyquist/keymaps/jojiichan/rules.mk
+++ b/keyboards/nyquist/keymaps/jojiichan/rules.mk
@@ -1,5 +1,2 @@
 RGBLIGHT_ENABLE = yes
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/nyquist/keymaps/kim-kim/rules.mk b/keyboards/nyquist/keymaps/kim-kim/rules.mk
index 1e5761278..a81250cdf 100644
--- a/keyboards/nyquist/keymaps/kim-kim/rules.mk
+++ b/keyboards/nyquist/keymaps/kim-kim/rules.mk
@@ -1,5 +1,2 @@
 RGBLIGHT_ENABLE = yes
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/nyquist/keymaps/losinggeneration/rules.mk b/keyboards/nyquist/keymaps/losinggeneration/rules.mk
index ea2b7165d..17ef68483 100644
--- a/keyboards/nyquist/keymaps/losinggeneration/rules.mk
+++ b/keyboards/nyquist/keymaps/losinggeneration/rules.mk
@@ -12,6 +12,3 @@ MIDI_ENABLE      = no    # MIDI controls
 NKRO_ENABLE      = no    # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 RGBLIGHT_ENABLE  = no    # Enable WS2812 RGB underlight. 
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/nyquist/keymaps/pitty/rules.mk b/keyboards/nyquist/keymaps/pitty/rules.mk
index 8ebc85a44..53a426157 100644
--- a/keyboards/nyquist/keymaps/pitty/rules.mk
+++ b/keyboards/nyquist/keymaps/pitty/rules.mk
@@ -1,6 +1,3 @@
 RGBLIGHT_ENABLE = yes
 NKRO_ENABLE = yes
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/org60/keymaps/boardy/rules.mk b/keyboards/org60/keymaps/boardy/rules.mk
index 0755d5009..88ac79eca 100644
--- a/keyboards/org60/keymaps/boardy/rules.mk
+++ b/keyboards/org60/keymaps/boardy/rules.mk
@@ -8,8 +8,3 @@ COMMAND_ENABLE = no         # Commands for debug and configuration
 TAP_DANCE_ENABLE = no           # Tap Dance skills
 UNICODE_ENABLE = no         # Unicode
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/phantom/keymaps/default/rules.mk b/keyboards/phantom/keymaps/default/rules.mk
index 555ac79fa..597d4046a 100644
--- a/keyboards/phantom/keymaps/default/rules.mk
+++ b/keyboards/phantom/keymaps/default/rules.mk
@@ -32,6 +32,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/phantom/keymaps/rgbmod/rules.mk b/keyboards/phantom/keymaps/rgbmod/rules.mk
index 38c23a1b8..2892bb424 100644
--- a/keyboards/phantom/keymaps/rgbmod/rules.mk
+++ b/keyboards/phantom/keymaps/rgbmod/rules.mk
@@ -32,6 +32,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/ab/rules.mk b/keyboards/planck/keymaps/ab/rules.mk
index 0b025a231..c4dc26dc2 100644
--- a/keyboards/planck/keymaps/ab/rules.mk
+++ b/keyboards/planck/keymaps/ab/rules.mk
@@ -58,6 +58,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/ajp10304/rules.mk b/keyboards/planck/keymaps/ajp10304/rules.mk
index dc6ab13e8..4dee01cd5 100644
--- a/keyboards/planck/keymaps/ajp10304/rules.mk
+++ b/keyboards/planck/keymaps/ajp10304/rules.mk
@@ -1,6 +1,3 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
 AUDIO_ENABLE = no
 MOUSEKEY_ENABLE = yes
diff --git a/keyboards/planck/keymaps/alexey/rules.mk b/keyboards/planck/keymaps/alexey/rules.mk
index caff043c5..5dda6ad67 100644
--- a/keyboards/planck/keymaps/alexey/rules.mk
+++ b/keyboards/planck/keymaps/alexey/rules.mk
@@ -20,6 +20,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/planck/keymaps/altgr/rules.mk b/keyboards/planck/keymaps/altgr/rules.mk
index 40f153844..a72276629 100644
--- a/keyboards/planck/keymaps/altgr/rules.mk
+++ b/keyboards/planck/keymaps/altgr/rules.mk
@@ -21,6 +21,3 @@ SLEEP_LED_ENABLE = no   # breathing sleep LED during USB suspend
 TAP_DANCE_ENABLE = yes  # enable double tap completion of (),[],{}
-ifndef QUANTUM_DIR
-include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/angerthosenear/rules.mk b/keyboards/planck/keymaps/angerthosenear/rules.mk
index caff043c5..5dda6ad67 100644
--- a/keyboards/planck/keymaps/angerthosenear/rules.mk
+++ b/keyboards/planck/keymaps/angerthosenear/rules.mk
@@ -20,6 +20,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/planck/keymaps/austin/rules.mk b/keyboards/planck/keymaps/austin/rules.mk
index caff043c5..5dda6ad67 100644
--- a/keyboards/planck/keymaps/austin/rules.mk
+++ b/keyboards/planck/keymaps/austin/rules.mk
@@ -20,6 +20,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/planck/keymaps/basic/rules.mk b/keyboards/planck/keymaps/basic/rules.mk
index 6f88a28d5..a31025bc3 100644
--- a/keyboards/planck/keymaps/basic/rules.mk
+++ b/keyboards/planck/keymaps/basic/rules.mk
@@ -20,6 +20,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/planck/keymaps/bone2planck/rules.mk b/keyboards/planck/keymaps/bone2planck/rules.mk
index 699726948..fc0bbe9e7 100644
--- a/keyboards/planck/keymaps/bone2planck/rules.mk
+++ b/keyboards/planck/keymaps/bone2planck/rules.mk
@@ -18,6 +18,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/planck/keymaps/brandon/rules.mk b/keyboards/planck/keymaps/brandon/rules.mk
index 6df206578..30275cf1f 100644
--- a/keyboards/planck/keymaps/brandon/rules.mk
+++ b/keyboards/planck/keymaps/brandon/rules.mk
@@ -10,6 +10,3 @@ MOUSEKEY_ENABLE  = yes
 CONSOLE_ENABLE = no
 BACKLIGHT_ENABLE = yes
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/callum/rules.mk b/keyboards/planck/keymaps/callum/rules.mk
index 67fe8d284..25d398f08 100644
--- a/keyboards/planck/keymaps/callum/rules.mk
+++ b/keyboards/planck/keymaps/callum/rules.mk
@@ -18,6 +18,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/cbbrowne/rules.mk b/keyboards/planck/keymaps/cbbrowne/rules.mk
index c7cef55a9..45d683739 100644
--- a/keyboards/planck/keymaps/cbbrowne/rules.mk
+++ b/keyboards/planck/keymaps/cbbrowne/rules.mk
@@ -19,6 +19,3 @@ API_SYSEX_ENABLE = no      # Enable SYSEX API (+5390)
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/chance/rules.mk b/keyboards/planck/keymaps/chance/rules.mk
index 5c9798a57..2febfd969 100644
--- a/keyboards/planck/keymaps/chance/rules.mk
+++ b/keyboards/planck/keymaps/chance/rules.mk
@@ -1,6 +1,3 @@
 RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
 AUDIO_ENABLE = no
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/charlie/rules.mk b/keyboards/planck/keymaps/charlie/rules.mk
index caff043c5..5dda6ad67 100644
--- a/keyboards/planck/keymaps/charlie/rules.mk
+++ b/keyboards/planck/keymaps/charlie/rules.mk
@@ -20,6 +20,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/planck/keymaps/circuit/rules.mk b/keyboards/planck/keymaps/circuit/rules.mk
index e9a02e31e..b527d8297 100644
--- a/keyboards/planck/keymaps/circuit/rules.mk
+++ b/keyboards/planck/keymaps/circuit/rules.mk
@@ -20,6 +20,3 @@ TAP_DANCE_ENABLE = yes      # Enables the double-tap functionality of keys
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/coloneljesus/rules.mk b/keyboards/planck/keymaps/coloneljesus/rules.mk
index 457a3d01d..e69de29bb 100644
--- a/keyboards/planck/keymaps/coloneljesus/rules.mk
+++ b/keyboards/planck/keymaps/coloneljesus/rules.mk
@@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/daniel/rules.mk b/keyboards/planck/keymaps/daniel/rules.mk
index caff043c5..5dda6ad67 100644
--- a/keyboards/planck/keymaps/daniel/rules.mk
+++ b/keyboards/planck/keymaps/daniel/rules.mk
@@ -20,6 +20,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/planck/keymaps/david/rules.mk b/keyboards/planck/keymaps/david/rules.mk
index caff043c5..5dda6ad67 100644
--- a/keyboards/planck/keymaps/david/rules.mk
+++ b/keyboards/planck/keymaps/david/rules.mk
@@ -20,6 +20,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/planck/keymaps/davidrambo/rules.mk b/keyboards/planck/keymaps/davidrambo/rules.mk
index ffa9b870a..5e5ab3845 100644
--- a/keyboards/planck/keymaps/davidrambo/rules.mk
+++ b/keyboards/planck/keymaps/davidrambo/rules.mk
@@ -1,6 +1,3 @@
 TAP_DANCE_ENABLE = yes
 MOUSEKEY_ENABLE = yes
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/planck/keymaps/dc/rules.mk b/keyboards/planck/keymaps/dc/rules.mk
index ea4341b4f..07da5f194 100644
--- a/keyboards/planck/keymaps/dc/rules.mk
+++ b/keyboards/planck/keymaps/dc/rules.mk
@@ -1,7 +1,3 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
 # Build Options
 #   change to "no" to disable the options, or define them in the Makefile in 
 #   the appropriate keymap folder that will get included automatically
@@ -21,4 +17,5 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 TAP_DANCE_ENABLE = yes
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-\ No newline at end of file
+SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
diff --git a/keyboards/planck/keymaps/dcompact/rules.mk b/keyboards/planck/keymaps/dcompact/rules.mk
index d7eff1adc..12b4e44c2 100644
--- a/keyboards/planck/keymaps/dcompact/rules.mk
+++ b/keyboards/planck/keymaps/dcompact/rules.mk
@@ -1,7 +1,3 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
 # https://beta.docs.qmk.fm/reference/config-options#feature-options
 # Features Specifically Wanted
 EXTRAKEY_ENABLE = yes
@@ -13,3 +9,4 @@ AUDIO_ENABLE = yes
 MOUSEKEY_ENABLE = no
 MIDI_ENABLE = no
 CONSOLE_ENABLE = no
diff --git a/keyboards/planck/keymaps/dlaroe/rules.mk b/keyboards/planck/keymaps/dlaroe/rules.mk
index 0064f622b..7ff90237a 100644
--- a/keyboards/planck/keymaps/dlaroe/rules.mk
+++ b/keyboards/planck/keymaps/dlaroe/rules.mk
@@ -20,6 +20,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/dr_notsokind/rules.mk b/keyboards/planck/keymaps/dr_notsokind/rules.mk
index eea90f8e6..91156b6b4 100644
--- a/keyboards/planck/keymaps/dr_notsokind/rules.mk
+++ b/keyboards/planck/keymaps/dr_notsokind/rules.mk
@@ -20,6 +20,3 @@ TAP_DANCE_ENABLE = yes      # Enables the double-tap functionality of keys
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/dshields/rules.mk b/keyboards/planck/keymaps/dshields/rules.mk
index a526c5a31..a2bec4335 100644
--- a/keyboards/planck/keymaps/dshields/rules.mk
+++ b/keyboards/planck/keymaps/dshields/rules.mk
@@ -1,7 +1,3 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
 MOUSEKEY_ENABLE  = yes # Mouse keys(+4700)
 COMMAND_ENABLE   = no  # Commands for debug and configuration
 CONSOLE_ENABLE   = no  # Console for debug(+400)
diff --git a/keyboards/planck/keymaps/dudeofawesome/rules.mk b/keyboards/planck/keymaps/dudeofawesome/rules.mk
index edeab1643..eeee270d5 100644
--- a/keyboards/planck/keymaps/dudeofawesome/rules.mk
+++ b/keyboards/planck/keymaps/dudeofawesome/rules.mk
@@ -1,10 +1,7 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
 AUDIO_ENABLE = yes         # Audio output on port C6
 CONSOLE_ENABLE = no        # Console for debug(+400)
 MIDI_ENABLE = no           # MIDI controls
 MOUSEKEY_ENABLE = no       # Mouse keys(+4700)
 NKRO_ENABLE = no           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.
diff --git a/keyboards/planck/keymaps/dzobert/rules.mk b/keyboards/planck/keymaps/dzobert/rules.mk
index caff043c5..5dda6ad67 100644
--- a/keyboards/planck/keymaps/dzobert/rules.mk
+++ b/keyboards/planck/keymaps/dzobert/rules.mk
@@ -20,6 +20,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/planck/keymaps/espynn/rules.mk b/keyboards/planck/keymaps/espynn/rules.mk
index 0b025a231..c4dc26dc2 100644
--- a/keyboards/planck/keymaps/espynn/rules.mk
+++ b/keyboards/planck/keymaps/espynn/rules.mk
@@ -58,6 +58,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/experimental/rules.mk b/keyboards/planck/keymaps/experimental/rules.mk
index 721e887b9..e5db05543 100644
--- a/keyboards/planck/keymaps/experimental/rules.mk
+++ b/keyboards/planck/keymaps/experimental/rules.mk
@@ -23,6 +23,3 @@ LEADER_ENABLE = yes
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/gabriel/rules.mk b/keyboards/planck/keymaps/gabriel/rules.mk
index caff043c5..5dda6ad67 100644
--- a/keyboards/planck/keymaps/gabriel/rules.mk
+++ b/keyboards/planck/keymaps/gabriel/rules.mk
@@ -20,6 +20,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/planck/keymaps/grahampheath/rules.mk b/keyboards/planck/keymaps/grahampheath/rules.mk
index 2ff606255..e84f6d5e6 100644
--- a/keyboards/planck/keymaps/grahampheath/rules.mk
+++ b/keyboards/planck/keymaps/grahampheath/rules.mk
@@ -1,9 +1,7 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 NKRO_ENABLE      = yes          # N-Key rollover.
 # MOUSEKEY_ENABLE  = yes          # Mouse mode.
 TAP_DANCE_ENABLE = no           # Tap dance enabled.
 UNICODEMAP_ENABLE = no          # Unicode keymap (sucks on osx).
 AUDIO_ENABLE = yes           # Audio output on port C6
diff --git a/keyboards/planck/keymaps/gunp/rules.mk b/keyboards/planck/keymaps/gunp/rules.mk
index 7d03482ab..ec69d6e78 100644
--- a/keyboards/planck/keymaps/gunp/rules.mk
+++ b/keyboards/planck/keymaps/gunp/rules.mk
@@ -18,6 +18,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/handwired_binaryplease/rules.mk b/keyboards/planck/keymaps/handwired_binaryplease/rules.mk
index 248fe2bb7..efe0c7a5d 100644
--- a/keyboards/planck/keymaps/handwired_binaryplease/rules.mk
+++ b/keyboards/planck/keymaps/handwired_binaryplease/rules.mk
@@ -1,9 +1,3 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
 # MCU name
 #MCU = at90usb1287
 MCU = atmega32u4
@@ -72,3 +66,4 @@ API_SYSEX_ENABLE = no
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
diff --git a/keyboards/planck/keymaps/hiea/rules.mk b/keyboards/planck/keymaps/hiea/rules.mk
index 40f153844..a72276629 100644
--- a/keyboards/planck/keymaps/hiea/rules.mk
+++ b/keyboards/planck/keymaps/hiea/rules.mk
@@ -21,6 +21,3 @@ SLEEP_LED_ENABLE = no   # breathing sleep LED during USB suspend
 TAP_DANCE_ENABLE = yes  # enable double tap completion of (),[],{}
-ifndef QUANTUM_DIR
-include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/hieax/rules.mk b/keyboards/planck/keymaps/hieax/rules.mk
index 40f153844..a72276629 100644
--- a/keyboards/planck/keymaps/hieax/rules.mk
+++ b/keyboards/planck/keymaps/hieax/rules.mk
@@ -21,6 +21,3 @@ SLEEP_LED_ENABLE = no   # breathing sleep LED during USB suspend
 TAP_DANCE_ENABLE = yes  # enable double tap completion of (),[],{}
-ifndef QUANTUM_DIR
-include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/ishtob/rule.mk b/keyboards/planck/keymaps/ishtob/rule.mk
index c0d38aaa1..0f71be62b 100755
--- a/keyboards/planck/keymaps/ishtob/rule.mk
+++ b/keyboards/planck/keymaps/ishtob/rule.mk
@@ -18,6 +18,3 @@ ENCODER_ENABLE = yes
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/planck/keymaps/jacob/rules.mk b/keyboards/planck/keymaps/jacob/rules.mk
index caff043c5..5dda6ad67 100644
--- a/keyboards/planck/keymaps/jacob/rules.mk
+++ b/keyboards/planck/keymaps/jacob/rules.mk
@@ -20,6 +20,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/planck/keymaps/jirgn/rules.mk b/keyboards/planck/keymaps/jirgn/rules.mk
index 457a3d01d..e69de29bb 100644
--- a/keyboards/planck/keymaps/jirgn/rules.mk
+++ b/keyboards/planck/keymaps/jirgn/rules.mk
@@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/johannes/rules.mk b/keyboards/planck/keymaps/johannes/rules.mk
index 6f88a28d5..a31025bc3 100644
--- a/keyboards/planck/keymaps/johannes/rules.mk
+++ b/keyboards/planck/keymaps/johannes/rules.mk
@@ -20,6 +20,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/planck/keymaps/khord/rules.mk b/keyboards/planck/keymaps/khord/rules.mk
index c248822b2..444fa38a9 100644
--- a/keyboards/planck/keymaps/khord/rules.mk
+++ b/keyboards/planck/keymaps/khord/rules.mk
@@ -1,6 +1,3 @@
 BACKLIGHT_ENABLE = yes
 TAP_DANCE_ENABLE = yes
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/kmontag42/rules.mk b/keyboards/planck/keymaps/kmontag42/rules.mk
index 0c100076b..5712a735d 100644
--- a/keyboards/planck/keymaps/kmontag42/rules.mk
+++ b/keyboards/planck/keymaps/kmontag42/rules.mk
@@ -1,6 +1,3 @@
 UNICODE_ENABLE = yes
 LEADER_ENABLE = yes
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/kyle/rules.mk b/keyboards/planck/keymaps/kyle/rules.mk
index caff043c5..5dda6ad67 100644
--- a/keyboards/planck/keymaps/kyle/rules.mk
+++ b/keyboards/planck/keymaps/kyle/rules.mk
@@ -20,6 +20,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/planck/keymaps/lae3/rules.mk b/keyboards/planck/keymaps/lae3/rules.mk
index 89b147f81..4d91a120c 100644
--- a/keyboards/planck/keymaps/lae3/rules.mk
+++ b/keyboards/planck/keymaps/lae3/rules.mk
@@ -18,6 +18,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/lukas/rules.mk b/keyboards/planck/keymaps/lukas/rules.mk
index caff043c5..5dda6ad67 100644
--- a/keyboards/planck/keymaps/lukas/rules.mk
+++ b/keyboards/planck/keymaps/lukas/rules.mk
@@ -20,6 +20,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/planck/keymaps/luke/rules.mk b/keyboards/planck/keymaps/luke/rules.mk
index 76ed281c1..e04815e2c 100644
--- a/keyboards/planck/keymaps/luke/rules.mk
+++ b/keyboards/planck/keymaps/luke/rules.mk
@@ -20,6 +20,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/max/rules.mk b/keyboards/planck/keymaps/max/rules.mk
index caff043c5..5dda6ad67 100644
--- a/keyboards/planck/keymaps/max/rules.mk
+++ b/keyboards/planck/keymaps/max/rules.mk
@@ -20,6 +20,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/planck/keymaps/mitch/rules.mk b/keyboards/planck/keymaps/mitch/rules.mk
index 7955003d4..32dc2acc6 100644
--- a/keyboards/planck/keymaps/mitch/rules.mk
+++ b/keyboards/planck/keymaps/mitch/rules.mk
@@ -1,5 +1,2 @@
 SUBPROJECT = rev3
-ifndef QUANTUM_DIR
-  include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/mjt/rules.mk b/keyboards/planck/keymaps/mjt/rules.mk
index 457a3d01d..e69de29bb 100644
--- a/keyboards/planck/keymaps/mjt/rules.mk
+++ b/keyboards/planck/keymaps/mjt/rules.mk
@@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/mjtnumsym/rules.mk b/keyboards/planck/keymaps/mjtnumsym/rules.mk
index 457a3d01d..e69de29bb 100644
--- a/keyboards/planck/keymaps/mjtnumsym/rules.mk
+++ b/keyboards/planck/keymaps/mjtnumsym/rules.mk
@@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/myoung34/rules.mk b/keyboards/planck/keymaps/myoung34/rules.mk
index b1aaafd3a..0560de1dc 100644
--- a/keyboards/planck/keymaps/myoung34/rules.mk
+++ b/keyboards/planck/keymaps/myoung34/rules.mk
@@ -1,7 +1,3 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
 AUDIO_ENABLE = yes         # Audio output on port C6
 CONSOLE_ENABLE = no        # Console for debug(+400)
 MIDI_ENABLE = no           # MIDI controls
@@ -9,3 +5,4 @@ MOUSEKEY_ENABLE = no       # Mouse keys(+4700)
 NKRO_ENABLE = no           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight. 
 BACKLIGHT_ENABLE = yes
diff --git a/keyboards/planck/keymaps/neo2planck/rules.mk b/keyboards/planck/keymaps/neo2planck/rules.mk
index cedf3095e..6846e9c16 100644
--- a/keyboards/planck/keymaps/neo2planck/rules.mk
+++ b/keyboards/planck/keymaps/neo2planck/rules.mk
@@ -18,6 +18,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/not-quite-neo/rules.mk b/keyboards/planck/keymaps/not-quite-neo/rules.mk
index 90e6353f6..5ba0cefb4 100644
--- a/keyboards/planck/keymaps/not-quite-neo/rules.mk
+++ b/keyboards/planck/keymaps/not-quite-neo/rules.mk
@@ -24,6 +24,3 @@ RGBLIGHT_ENABLE     = no    # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE    = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/originerd/rules.mk b/keyboards/planck/keymaps/originerd/rules.mk
index 457a3d01d..e69de29bb 100644
--- a/keyboards/planck/keymaps/originerd/rules.mk
+++ b/keyboards/planck/keymaps/originerd/rules.mk
@@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/paget/rules.mk b/keyboards/planck/keymaps/paget/rules.mk
index 457a3d01d..e69de29bb 100755
--- a/keyboards/planck/keymaps/paget/rules.mk
+++ b/keyboards/planck/keymaps/paget/rules.mk
@@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/pete/rules.mk b/keyboards/planck/keymaps/pete/rules.mk
index 20bba3f49..8a328f6b6 100644
--- a/keyboards/planck/keymaps/pete/rules.mk
+++ b/keyboards/planck/keymaps/pete/rules.mk
@@ -10,6 +10,3 @@ NKRO_ENABLE = yes
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/planck/keymaps/phreed/rules.mk b/keyboards/planck/keymaps/phreed/rules.mk
index 457a3d01d..e69de29bb 100644
--- a/keyboards/planck/keymaps/phreed/rules.mk
+++ b/keyboards/planck/keymaps/phreed/rules.mk
@@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/piemod/rules.mk b/keyboards/planck/keymaps/piemod/rules.mk
index 84cb02bd7..0eabfdfc1 100644
--- a/keyboards/planck/keymaps/piemod/rules.mk
+++ b/keyboards/planck/keymaps/piemod/rules.mk
@@ -13,6 +13,3 @@ else
 BLUETOOTH_ENABLE = yes
 endif
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/priyadi/rules.mk b/keyboards/planck/keymaps/priyadi/rules.mk
index 282c047ee..a999eb00f 100644
--- a/keyboards/planck/keymaps/priyadi/rules.mk
+++ b/keyboards/planck/keymaps/priyadi/rules.mk
@@ -21,6 +21,3 @@ FAUXCLICKY_ENABLE = yes
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/rai-suta/rules.mk b/keyboards/planck/keymaps/rai-suta/rules.mk
index ce13befd9..88915dcd3 100644
--- a/keyboards/planck/keymaps/rai-suta/rules.mk
+++ b/keyboards/planck/keymaps/rai-suta/rules.mk
@@ -20,6 +20,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/planck/keymaps/sdothum/rules.mk b/keyboards/planck/keymaps/sdothum/rules.mk
index 40f153844..a72276629 100644
--- a/keyboards/planck/keymaps/sdothum/rules.mk
+++ b/keyboards/planck/keymaps/sdothum/rules.mk
@@ -21,6 +21,3 @@ SLEEP_LED_ENABLE = no   # breathing sleep LED during USB suspend
 TAP_DANCE_ENABLE = yes  # enable double tap completion of (),[],{}
-ifndef QUANTUM_DIR
-include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/smt/rules.mk b/keyboards/planck/keymaps/smt/rules.mk
index 457a3d01d..e69de29bb 100644
--- a/keyboards/planck/keymaps/smt/rules.mk
+++ b/keyboards/planck/keymaps/smt/rules.mk
@@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/steno/rules.mk b/keyboards/planck/keymaps/steno/rules.mk
index 634a1c887..b2fd63a89 100644
--- a/keyboards/planck/keymaps/steno/rules.mk
+++ b/keyboards/planck/keymaps/steno/rules.mk
@@ -1,9 +1,6 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
 EXTRAKEY_ENABLE = no
 MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
 STENO_ENABLE = yes          # Additional protocols for Stenography(+1700), requires VIRTSER
 AUDIO_ENABLE = no           # Audio output on port C6
 MIDI_ENABLE = no            # MIDI controls
diff --git a/keyboards/planck/keymaps/tehwalris/rules.mk b/keyboards/planck/keymaps/tehwalris/rules.mk
index 457a3d01d..e69de29bb 100644
--- a/keyboards/planck/keymaps/tehwalris/rules.mk
+++ b/keyboards/planck/keymaps/tehwalris/rules.mk
@@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/tong92/rules.mk b/keyboards/planck/keymaps/tong92/rules.mk
index df9e7918c..88ad1e982 100644
--- a/keyboards/planck/keymaps/tong92/rules.mk
+++ b/keyboards/planck/keymaps/tong92/rules.mk
@@ -57,6 +57,3 @@ RGBLIGHT_ENABLE  = no  # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/planck/keymaps/unicode/rules.mk b/keyboards/planck/keymaps/unicode/rules.mk
index 110af7501..70866cb8b 100644
--- a/keyboards/planck/keymaps/unicode/rules.mk
+++ b/keyboards/planck/keymaps/unicode/rules.mk
@@ -6,6 +6,3 @@
 #
 UNICODE_ENABLE   = yes  # Unicode
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/planck/keymaps/vifon/rules.mk b/keyboards/planck/keymaps/vifon/rules.mk
index 5caec1afa..527e63d38 100644
--- a/keyboards/planck/keymaps/vifon/rules.mk
+++ b/keyboards/planck/keymaps/vifon/rules.mk
@@ -22,6 +22,3 @@ KEY_LOCK_ENABLE = yes
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/yale/rules.mk b/keyboards/planck/keymaps/yale/rules.mk
index caff043c5..5dda6ad67 100644
--- a/keyboards/planck/keymaps/yale/rules.mk
+++ b/keyboards/planck/keymaps/yale/rules.mk
@@ -20,6 +20,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/planck/keymaps/yang/rules.mk b/keyboards/planck/keymaps/yang/rules.mk
index 173fe2989..05f0fb04a 100644
--- a/keyboards/planck/keymaps/yang/rules.mk
+++ b/keyboards/planck/keymaps/yang/rules.mk
@@ -5,6 +5,3 @@
 RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
 AUDIO_ENABLE = no
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/planck/keymaps/zach/rules.mk b/keyboards/planck/keymaps/zach/rules.mk
index ca24b4792..b3dfb88d7 100644
--- a/keyboards/planck/keymaps/zach/rules.mk
+++ b/keyboards/planck/keymaps/zach/rules.mk
@@ -24,6 +24,3 @@ RGBLIGHT_ENABLE     = no    # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE    = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/planck/keymaps/zrichard/rules.mk b/keyboards/planck/keymaps/zrichard/rules.mk
index 7b17f58ce..0475875a3 100755
--- a/keyboards/planck/keymaps/zrichard/rules.mk
+++ b/keyboards/planck/keymaps/zrichard/rules.mk
@@ -25,6 +25,3 @@ TAP_DANCE_ENABLE = no	# Enable double or n tap macros
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/preonic/keymaps/0xdec/rules.mk b/keyboards/preonic/keymaps/0xdec/rules.mk
index 6600e3689..0c8a6dc41 100644
--- a/keyboards/preonic/keymaps/0xdec/rules.mk
+++ b/keyboards/preonic/keymaps/0xdec/rules.mk
@@ -16,6 +16,3 @@ RGBLIGHT_ENABLE   = no  # Enable WS2812 RGB underlight. Do not enable this with
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE  = no  # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-  include ../../../../Makefile
-endif
diff --git a/keyboards/preonic/keymaps/bucktooth/rules.mk b/keyboards/preonic/keymaps/bucktooth/rules.mk
index 9dbdfcbd3..8f226afd9 100644
--- a/keyboards/preonic/keymaps/bucktooth/rules.mk
+++ b/keyboards/preonic/keymaps/bucktooth/rules.mk
@@ -15,6 +15,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/preonic/keymaps/dlaroe/rules.mk b/keyboards/preonic/keymaps/dlaroe/rules.mk
index eea316849..68f78de6e 100644
--- a/keyboards/preonic/keymaps/dlaroe/rules.mk
+++ b/keyboards/preonic/keymaps/dlaroe/rules.mk
@@ -20,6 +20,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/preonic/keymaps/jacwib/rules.mk b/keyboards/preonic/keymaps/jacwib/rules.mk
index 9dbdfcbd3..8f226afd9 100644
--- a/keyboards/preonic/keymaps/jacwib/rules.mk
+++ b/keyboards/preonic/keymaps/jacwib/rules.mk
@@ -15,6 +15,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/preonic/keymaps/kinesis/rules.mk b/keyboards/preonic/keymaps/kinesis/rules.mk
index f37fe4338..94d02c8b7 100644
--- a/keyboards/preonic/keymaps/kinesis/rules.mk
+++ b/keyboards/preonic/keymaps/kinesis/rules.mk
@@ -22,6 +22,3 @@ SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 TAP_DANCE_ENABLE = yes
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/preonic/keymaps/nikchi/rules.mk b/keyboards/preonic/keymaps/nikchi/rules.mk
index 3d4659ceb..e69de29bb 100644
--- a/keyboards/preonic/keymaps/nikchi/rules.mk
+++ b/keyboards/preonic/keymaps/nikchi/rules.mk
@@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/smt/rules.mk b/keyboards/preonic/keymaps/smt/rules.mk
index 3d4659ceb..e69de29bb 100644
--- a/keyboards/preonic/keymaps/smt/rules.mk
+++ b/keyboards/preonic/keymaps/smt/rules.mk
@@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/that_canadian/Makefile b/keyboards/preonic/keymaps/that_canadian/Makefile
index 507bd77d2..773e5c45d 100644
--- a/keyboards/preonic/keymaps/that_canadian/Makefile
+++ b/keyboards/preonic/keymaps/that_canadian/Makefile
@@ -20,6 +20,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.  Do not enable this
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/zach/rules.mk b/keyboards/preonic/keymaps/zach/rules.mk
index f00af4396..77efcf383 100644
--- a/keyboards/preonic/keymaps/zach/rules.mk
+++ b/keyboards/preonic/keymaps/zach/rules.mk
@@ -24,6 +24,3 @@ RGBLIGHT_ENABLE     = no    # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE    = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/redox/keymaps/default/rules.mk b/keyboards/redox/keymaps/default/rules.mk
index 1e5761278..a81250cdf 100644
--- a/keyboards/redox/keymaps/default/rules.mk
+++ b/keyboards/redox/keymaps/default/rules.mk
@@ -1,5 +1,2 @@
 RGBLIGHT_ENABLE = yes
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/redox/keymaps/italian/rules.mk b/keyboards/redox/keymaps/italian/rules.mk
index 1e5761278..a81250cdf 100644
--- a/keyboards/redox/keymaps/italian/rules.mk
+++ b/keyboards/redox/keymaps/italian/rules.mk
@@ -1,5 +1,2 @@
 RGBLIGHT_ENABLE = yes
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/s60_x/keymaps/ansi_qwertz/rules.mk b/keyboards/s60_x/keymaps/ansi_qwertz/rules.mk
index cf5012252..1bcd7ea7f 100644
--- a/keyboards/s60_x/keymaps/ansi_qwertz/rules.mk
+++ b/keyboards/s60_x/keymaps/ansi_qwertz/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/satan/keymaps/admiralStrokers/rules.mk b/keyboards/satan/keymaps/admiralStrokers/rules.mk
index 22908296c..7c3f5bd90 100644
--- a/keyboards/satan/keymaps/admiralStrokers/rules.mk
+++ b/keyboards/satan/keymaps/admiralStrokers/rules.mk
@@ -19,6 +19,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no# Breathing sleep LED during USB suspend
 API_SYSEX_ENABLE = no # This enables using the Quantum SYSEX API to send strings
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/satan/keymaps/ben_iso/rules.mk b/keyboards/satan/keymaps/ben_iso/rules.mk
index bb535beb3..53644093d 100644
--- a/keyboards/satan/keymaps/ben_iso/rules.mk
+++ b/keyboards/satan/keymaps/ben_iso/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/satan/keymaps/chaser/rules.mk b/keyboards/satan/keymaps/chaser/rules.mk
index bb535beb3..53644093d 100644
--- a/keyboards/satan/keymaps/chaser/rules.mk
+++ b/keyboards/satan/keymaps/chaser/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/satan/keymaps/colemak/rules.mk b/keyboards/satan/keymaps/colemak/rules.mk
index bb535beb3..53644093d 100644
--- a/keyboards/satan/keymaps/colemak/rules.mk
+++ b/keyboards/satan/keymaps/colemak/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/satan/keymaps/default/rules.mk b/keyboards/satan/keymaps/default/rules.mk
index bb535beb3..53644093d 100644
--- a/keyboards/satan/keymaps/default/rules.mk
+++ b/keyboards/satan/keymaps/default/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/satan/keymaps/dende_iso/rules.mk b/keyboards/satan/keymaps/dende_iso/rules.mk
index bb535beb3..53644093d 100644
--- a/keyboards/satan/keymaps/dende_iso/rules.mk
+++ b/keyboards/satan/keymaps/dende_iso/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/satan/keymaps/denolfe/rules.mk b/keyboards/satan/keymaps/denolfe/rules.mk
index 04d274306..5a8745b68 100644
--- a/keyboards/satan/keymaps/denolfe/rules.mk
+++ b/keyboards/satan/keymaps/denolfe/rules.mk
@@ -15,6 +15,3 @@ AUDIO_ENABLE = no
 UNICODE_ENABLE = no             # Unicode
 BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/satan/keymaps/dkrieger/rules.mk b/keyboards/satan/keymaps/dkrieger/rules.mk
index f2434d30e..d91b0edbf 100644
--- a/keyboards/satan/keymaps/dkrieger/rules.mk
+++ b/keyboards/satan/keymaps/dkrieger/rules.mk
@@ -17,6 +17,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 TAP_DANCE_ENABLE = yes
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/satan/keymaps/fakb/rules.mk b/keyboards/satan/keymaps/fakb/rules.mk
index c2b5df6cd..a0d244799 100644
--- a/keyboards/satan/keymaps/fakb/rules.mk
+++ b/keyboards/satan/keymaps/fakb/rules.mk
@@ -11,6 +11,3 @@ AUDIO_ENABLE     = no
 UNICODE_ENABLE   = no  # Unicode
 BLUETOOTH_ENABLE = no  # Enable Bluetooth with the Adafruit EZ-Key HID
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/satan/keymaps/isoHHKB/rules.mk b/keyboards/satan/keymaps/isoHHKB/rules.mk
index 80ce56058..08e77f9eb 100644
--- a/keyboards/satan/keymaps/isoHHKB/rules.mk
+++ b/keyboards/satan/keymaps/isoHHKB/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/satan/keymaps/iso_split_rshift/rules.mk b/keyboards/satan/keymaps/iso_split_rshift/rules.mk
index d1e07da3f..15cabfcd8 100644
--- a/keyboards/satan/keymaps/iso_split_rshift/rules.mk
+++ b/keyboards/satan/keymaps/iso_split_rshift/rules.mk
@@ -11,6 +11,3 @@ AUDIO_ENABLE     = no
 UNICODE_ENABLE   = no  # Unicode
 BLUETOOTH_ENABLE = no  # Enable Bluetooth with the Adafruit EZ-Key HID
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/satan/keymaps/lepa/rules.mk b/keyboards/satan/keymaps/lepa/rules.mk
index 72ca00646..74a42b647 100644
--- a/keyboards/satan/keymaps/lepa/rules.mk
+++ b/keyboards/satan/keymaps/lepa/rules.mk
@@ -17,6 +17,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 TAP_DANCE_ENABLE = yes
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/satan/keymaps/midi/rules.mk b/keyboards/satan/keymaps/midi/rules.mk
index d144314de..87025ed6f 100644
--- a/keyboards/satan/keymaps/midi/rules.mk
+++ b/keyboards/satan/keymaps/midi/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/satan/keymaps/sethbc/rules.mk b/keyboards/satan/keymaps/sethbc/rules.mk
index bb535beb3..53644093d 100644
--- a/keyboards/satan/keymaps/sethbc/rules.mk
+++ b/keyboards/satan/keymaps/sethbc/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/satan/keymaps/smt/rules.mk b/keyboards/satan/keymaps/smt/rules.mk
index 806c2cb84..3fe140adc 100644
--- a/keyboards/satan/keymaps/smt/rules.mk
+++ b/keyboards/satan/keymaps/smt/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/satan/keymaps/unxmaal/rules.mk b/keyboards/satan/keymaps/unxmaal/rules.mk
index 470d621b1..e72478251 100644
--- a/keyboards/satan/keymaps/unxmaal/rules.mk
+++ b/keyboards/satan/keymaps/unxmaal/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/tada68/keymaps/ardakilic/rules.mk b/keyboards/tada68/keymaps/ardakilic/rules.mk
index bb535beb3..53644093d 100644
--- a/keyboards/tada68/keymaps/ardakilic/rules.mk
+++ b/keyboards/tada68/keymaps/ardakilic/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/tada68/keymaps/default/rules.mk b/keyboards/tada68/keymaps/default/rules.mk
index bb535beb3..53644093d 100644
--- a/keyboards/tada68/keymaps/default/rules.mk
+++ b/keyboards/tada68/keymaps/default/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/tada68/keymaps/fakb/rules.mk b/keyboards/tada68/keymaps/fakb/rules.mk
index 642e16de5..47fd29663 100644
--- a/keyboards/tada68/keymaps/fakb/rules.mk
+++ b/keyboards/tada68/keymaps/fakb/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/tada68/keymaps/fezzant/rules.mk b/keyboards/tada68/keymaps/fezzant/rules.mk
index 8df84ae95..7b32f0a66 100644
--- a/keyboards/tada68/keymaps/fezzant/rules.mk
+++ b/keyboards/tada68/keymaps/fezzant/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/tada68/keymaps/iso-nor/rules.mk b/keyboards/tada68/keymaps/iso-nor/rules.mk
index baaca071c..53644093d 100644
--- a/keyboards/tada68/keymaps/iso-nor/rules.mk
+++ b/keyboards/tada68/keymaps/iso-nor/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/tada68/keymaps/iso-uk/rules.mk b/keyboards/tada68/keymaps/iso-uk/rules.mk
index baaca071c..53644093d 100644
--- a/keyboards/tada68/keymaps/iso-uk/rules.mk
+++ b/keyboards/tada68/keymaps/iso-uk/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/tada68/keymaps/isoish/rules.mk b/keyboards/tada68/keymaps/isoish/rules.mk
index baaca071c..53644093d 100644
--- a/keyboards/tada68/keymaps/isoish/rules.mk
+++ b/keyboards/tada68/keymaps/isoish/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/tada68/keymaps/mattdicarlo/rules.mk b/keyboards/tada68/keymaps/mattdicarlo/rules.mk
index ac92f99f4..739b73997 100644
--- a/keyboards/tada68/keymaps/mattdicarlo/rules.mk
+++ b/keyboards/tada68/keymaps/mattdicarlo/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/tada68/keymaps/mlechner/rules.mk b/keyboards/tada68/keymaps/mlechner/rules.mk
index bb535beb3..53644093d 100644
--- a/keyboards/tada68/keymaps/mlechner/rules.mk
+++ b/keyboards/tada68/keymaps/mlechner/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/tada68/keymaps/mtdjr/rules.mk b/keyboards/tada68/keymaps/mtdjr/rules.mk
index bb535beb3..53644093d 100644
--- a/keyboards/tada68/keymaps/mtdjr/rules.mk
+++ b/keyboards/tada68/keymaps/mtdjr/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/tada68/keymaps/pascamel/rules.mk b/keyboards/tada68/keymaps/pascamel/rules.mk
index bb535beb3..53644093d 100644
--- a/keyboards/tada68/keymaps/pascamel/rules.mk
+++ b/keyboards/tada68/keymaps/pascamel/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/tada68/keymaps/raylas/rules.mk b/keyboards/tada68/keymaps/raylas/rules.mk
index bb535beb3..53644093d 100644
--- a/keyboards/tada68/keymaps/raylas/rules.mk
+++ b/keyboards/tada68/keymaps/raylas/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/tada68/keymaps/rgb/rules.mk b/keyboards/tada68/keymaps/rgb/rules.mk
index 470d621b1..e72478251 100644
--- a/keyboards/tada68/keymaps/rgb/rules.mk
+++ b/keyboards/tada68/keymaps/rgb/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/tada68/keymaps/stephengrier/rules.mk b/keyboards/tada68/keymaps/stephengrier/rules.mk
index bb535beb3..53644093d 100644
--- a/keyboards/tada68/keymaps/stephengrier/rules.mk
+++ b/keyboards/tada68/keymaps/stephengrier/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/tada68/keymaps/trashcat/rules.mk b/keyboards/tada68/keymaps/trashcat/rules.mk
index 6fb496919..488111732 100644
--- a/keyboards/tada68/keymaps/trashcat/rules.mk
+++ b/keyboards/tada68/keymaps/trashcat/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = yes       # Breathing sleep LED during USB suspend
 TAP_DANCE_ENABLE = yes      # Tappa Dance Bitch
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/tada68/keymaps/tshack/rules.mk b/keyboards/tada68/keymaps/tshack/rules.mk
index 86d22dd3f..1a3bda460 100644
--- a/keyboards/tada68/keymaps/tshack/rules.mk
+++ b/keyboards/tada68/keymaps/tshack/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/tada68/keymaps/unix/rules.mk b/keyboards/tada68/keymaps/unix/rules.mk
index aade51459..316106c03 100644
--- a/keyboards/tada68/keymaps/unix/rules.mk
+++ b/keyboards/tada68/keymaps/unix/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = yes      # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/tada68/keymaps/wamsm_tada/rules.mk b/keyboards/tada68/keymaps/wamsm_tada/rules.mk
index bb535beb3..53644093d 100644
--- a/keyboards/tada68/keymaps/wamsm_tada/rules.mk
+++ b/keyboards/tada68/keymaps/wamsm_tada/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/tanuki/rules.mk b/keyboards/tanuki/rules.mk
index cc3734152..fd3c05830 100644
--- a/keyboards/tanuki/rules.mk
+++ b/keyboards/tanuki/rules.mk
@@ -65,6 +65,3 @@ UNICODE_ENABLE = no 		# Unicode
 BLUETOOTH_ENABLE = no  # Enable Bluetooth with the Adafruit EZ-Key HID
 TAP_DANCE_ENABLE = no
-ifndef QUANTUM_DIR
-        include ../../Makefile
-endif
diff --git a/keyboards/the_ruler/keymaps/default/rules.mk b/keyboards/the_ruler/keymaps/default/rules.mk
index b491f5b3f..2791cc105 100644
--- a/keyboards/the_ruler/keymaps/default/rules.mk
+++ b/keyboards/the_ruler/keymaps/default/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/0010/rules.mk b/keyboards/thevankeyboards/bananasplit/keymaps/0010/rules.mk
index 159fd7dc6..9da4bf91a 100644
--- a/keyboards/thevankeyboards/bananasplit/keymaps/0010/rules.mk
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/0010/rules.mk
@@ -32,6 +32,3 @@
 # RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 # SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/rules.mk b/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/rules.mk
index 159fd7dc6..9da4bf91a 100644
--- a/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/rules.mk
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/coloneljesus/rules.mk
@@ -32,6 +32,3 @@
 # RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 # SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/default/rules.mk b/keyboards/thevankeyboards/bananasplit/keymaps/default/rules.mk
index 159fd7dc6..9da4bf91a 100644
--- a/keyboards/thevankeyboards/bananasplit/keymaps/default/rules.mk
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/default/rules.mk
@@ -32,6 +32,3 @@
 # RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 # SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/thevankeyboards/bananasplit/keymaps/kamon/rules.mk b/keyboards/thevankeyboards/bananasplit/keymaps/kamon/rules.mk
index 159fd7dc6..9da4bf91a 100644
--- a/keyboards/thevankeyboards/bananasplit/keymaps/kamon/rules.mk
+++ b/keyboards/thevankeyboards/bananasplit/keymaps/kamon/rules.mk
@@ -32,6 +32,3 @@
 # RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 # SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/thevankeyboards/minivan/keymaps/belak/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/belak/rules.mk
index 611241124..f9d8b0eb0 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/belak/rules.mk
+++ b/keyboards/thevankeyboards/minivan/keymaps/belak/rules.mk
@@ -7,6 +7,3 @@ MOUSEKEY_ENABLE = no       # Mouse keys(+4700)
 NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 TAP_DANCE_ENABLE = yes
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/thevankeyboards/minivan/keymaps/core/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/core/rules.mk
index 457a3d01d..e69de29bb 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/core/rules.mk
+++ b/keyboards/thevankeyboards/minivan/keymaps/core/rules.mk
@@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/thevankeyboards/minivan/keymaps/default/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/default/rules.mk
index 3ff147725..7a331cd53 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/default/rules.mk
+++ b/keyboards/thevankeyboards/minivan/keymaps/default/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/thevankeyboards/minivan/keymaps/jeebak/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/jeebak/rules.mk
index 3ff147725..7a331cd53 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/jeebak/rules.mk
+++ b/keyboards/thevankeyboards/minivan/keymaps/jeebak/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/thevankeyboards/minivan/keymaps/mjt/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/mjt/rules.mk
index b2c421c4d..8e22f3051 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/mjt/rules.mk
+++ b/keyboards/thevankeyboards/minivan/keymaps/mjt/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/thevankeyboards/minivan/keymaps/smt/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/smt/rules.mk
index 3ff147725..7a331cd53 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/smt/rules.mk
+++ b/keyboards/thevankeyboards/minivan/keymaps/smt/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/thevankeyboards/minivan/keymaps/tong92/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/tong92/rules.mk
index 1e006e947..f5556c8fc 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/tong92/rules.mk
+++ b/keyboards/thevankeyboards/minivan/keymaps/tong92/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/thevankeyboards/minivan/keymaps/xyverz/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/xyverz/rules.mk
index 3ff147725..7a331cd53 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/xyverz/rules.mk
+++ b/keyboards/thevankeyboards/minivan/keymaps/xyverz/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/default/rules.mk b/keyboards/thevankeyboards/roadkit/keymaps/default/rules.mk
index 3ff147725..7a331cd53 100644
--- a/keyboards/thevankeyboards/roadkit/keymaps/default/rules.mk
+++ b/keyboards/thevankeyboards/roadkit/keymaps/default/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/flipphone/rules.mk b/keyboards/thevankeyboards/roadkit/keymaps/flipphone/rules.mk
index 3ff147725..7a331cd53 100644
--- a/keyboards/thevankeyboards/roadkit/keymaps/flipphone/rules.mk
+++ b/keyboards/thevankeyboards/roadkit/keymaps/flipphone/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/khord/rules.mk b/keyboards/thevankeyboards/roadkit/keymaps/khord/rules.mk
index ba4b4fec0..676e9a6e0 100644
--- a/keyboards/thevankeyboards/roadkit/keymaps/khord/rules.mk
+++ b/keyboards/thevankeyboards/roadkit/keymaps/khord/rules.mk
@@ -17,6 +17,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 TAP_DANCE_ENABLE = no      # Enable Tap Dance functionality
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/mjt/rules.mk b/keyboards/thevankeyboards/roadkit/keymaps/mjt/rules.mk
index 3ff147725..7a331cd53 100644
--- a/keyboards/thevankeyboards/roadkit/keymaps/mjt/rules.mk
+++ b/keyboards/thevankeyboards/roadkit/keymaps/mjt/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/singles/rules.mk b/keyboards/thevankeyboards/roadkit/keymaps/singles/rules.mk
index 3ff147725..7a331cd53 100644
--- a/keyboards/thevankeyboards/roadkit/keymaps/singles/rules.mk
+++ b/keyboards/thevankeyboards/roadkit/keymaps/singles/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/rules.mk b/keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/rules.mk
index 030d27f2a..38fa7790b 100644
--- a/keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/rules.mk
+++ b/keyboards/thevankeyboards/roadkit/keymaps/singlesBrent/rules.mk
@@ -17,6 +17,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 TAP_DANCE_ENABLE = yes      # Enable Tap Dance functionality
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/vision_division/keymaps/default/rules.mk b/keyboards/vision_division/keymaps/default/rules.mk
index 342f37453..69a3b2cd2 100644
--- a/keyboards/vision_division/keymaps/default/rules.mk
+++ b/keyboards/vision_division/keymaps/default/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE   = no   # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE    = no   # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE   = no   # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/whitefox/keymaps/jetpacktuxedo/rules.mk b/keyboards/whitefox/keymaps/jetpacktuxedo/rules.mk
index 8eb483103..c9c8cbea5 100644
--- a/keyboards/whitefox/keymaps/jetpacktuxedo/rules.mk
+++ b/keyboards/whitefox/keymaps/jetpacktuxedo/rules.mk
@@ -1,5 +1,2 @@
-ifndef QUANTUM_DIR
-        include ../../../Makefile
-endif
 BACKLIGHT_ENABLE = yes
diff --git a/keyboards/xd75/keymaps/adi/rules.mk b/keyboards/xd75/keymaps/adi/rules.mk
index d4e08cfb2..52a8f38d4 100644
--- a/keyboards/xd75/keymaps/adi/rules.mk
+++ b/keyboards/xd75/keymaps/adi/rules.mk
@@ -13,6 +13,3 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/xd75/keymaps/atomic_style/rules.mk b/keyboards/xd75/keymaps/atomic_style/rules.mk
index d4e08cfb2..52a8f38d4 100644
--- a/keyboards/xd75/keymaps/atomic_style/rules.mk
+++ b/keyboards/xd75/keymaps/atomic_style/rules.mk
@@ -13,6 +13,3 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/xd75/keymaps/bbaserdem/rules.mk b/keyboards/xd75/keymaps/bbaserdem/rules.mk
index 4839c644f..3e501cd00 100644
--- a/keyboards/xd75/keymaps/bbaserdem/rules.mk
+++ b/keyboards/xd75/keymaps/bbaserdem/rules.mk
@@ -5,6 +5,3 @@ RGBLIGHT_ENABLE = no 		# LED strips
 TAP_DANCE_ENABLE = no           # Use multi-tap features
 AUDIO_ENABLE = no                       # Audio stuff
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/xd75/keymaps/default/rules.mk b/keyboards/xd75/keymaps/default/rules.mk
index d4e08cfb2..52a8f38d4 100644
--- a/keyboards/xd75/keymaps/default/rules.mk
+++ b/keyboards/xd75/keymaps/default/rules.mk
@@ -13,6 +13,3 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/xd75/keymaps/dyn_macro_tap_dance/rules.mk b/keyboards/xd75/keymaps/dyn_macro_tap_dance/rules.mk
index 64484d3ee..7708eba6a 100644
--- a/keyboards/xd75/keymaps/dyn_macro_tap_dance/rules.mk
+++ b/keyboards/xd75/keymaps/dyn_macro_tap_dance/rules.mk
@@ -13,8 +13,5 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
 TAP_DANCE_ENABLE = yes
diff --git a/keyboards/xd75/keymaps/emilyh/rules.mk b/keyboards/xd75/keymaps/emilyh/rules.mk
index d4e08cfb2..52a8f38d4 100644
--- a/keyboards/xd75/keymaps/emilyh/rules.mk
+++ b/keyboards/xd75/keymaps/emilyh/rules.mk
@@ -13,6 +13,3 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/xd75/keymaps/fabian/rules.mk b/keyboards/xd75/keymaps/fabian/rules.mk
index f1ae8d44a..8831f2d62 100644
--- a/keyboards/xd75/keymaps/fabian/rules.mk
+++ b/keyboards/xd75/keymaps/fabian/rules.mk
@@ -32,6 +32,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/xd75/keymaps/french/rules.mk b/keyboards/xd75/keymaps/french/rules.mk
index dfd79792f..324d9ebd0 100644
--- a/keyboards/xd75/keymaps/french/rules.mk
+++ b/keyboards/xd75/keymaps/french/rules.mk
@@ -15,6 +15,3 @@
 RGBLIGHT_ENABLE = no
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/xd75/keymaps/germanized/rules.mk b/keyboards/xd75/keymaps/germanized/rules.mk
index f57fb8c54..ab81a5360 100644
--- a/keyboards/xd75/keymaps/germanized/rules.mk
+++ b/keyboards/xd75/keymaps/germanized/rules.mk
@@ -33,6 +33,3 @@ RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 TAP_DANCE_ENABLE = yes      # Enable Tap Dancing
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/xd75/keymaps/kim-kim-xd73/rules.mk b/keyboards/xd75/keymaps/kim-kim-xd73/rules.mk
index 7e4ed0837..4c894d797 100644
--- a/keyboards/xd75/keymaps/kim-kim-xd73/rules.mk
+++ b/keyboards/xd75/keymaps/kim-kim-xd73/rules.mk
@@ -20,6 +20,3 @@
 #
 BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/xd75/keymaps/kim-kim/rules.mk b/keyboards/xd75/keymaps/kim-kim/rules.mk
index 7e4ed0837..4c894d797 100644
--- a/keyboards/xd75/keymaps/kim-kim/rules.mk
+++ b/keyboards/xd75/keymaps/kim-kim/rules.mk
@@ -20,6 +20,3 @@
 #
 BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/xd75/keymaps/kloki/rules.mk b/keyboards/xd75/keymaps/kloki/rules.mk
index d4e08cfb2..52a8f38d4 100644
--- a/keyboards/xd75/keymaps/kloki/rules.mk
+++ b/keyboards/xd75/keymaps/kloki/rules.mk
@@ -13,6 +13,3 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/xd75/keymaps/markus/rules.mk b/keyboards/xd75/keymaps/markus/rules.mk
index febb446f8..d0ed9a73a 100644
--- a/keyboards/xd75/keymaps/markus/rules.mk
+++ b/keyboards/xd75/keymaps/markus/rules.mk
@@ -21,6 +21,3 @@ API_SYSEX_ENABLE = no
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-    include ../../../../Makefile
-endif
diff --git a/keyboards/xd75/keymaps/mtdjr/rules.mk b/keyboards/xd75/keymaps/mtdjr/rules.mk
index 28462ff16..6b7d69d4f 100644
--- a/keyboards/xd75/keymaps/mtdjr/rules.mk
+++ b/keyboards/xd75/keymaps/mtdjr/rules.mk
@@ -13,10 +13,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/>.
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
 BACKLIGHT_ENABLE = yes
 TAP_DANCE_ENABLE = yes
 RGBLIGHT_ENABLE = yes
diff --git a/keyboards/xd75/keymaps/skewwhiffy/rules.mk b/keyboards/xd75/keymaps/skewwhiffy/rules.mk
index d4e08cfb2..52a8f38d4 100644
--- a/keyboards/xd75/keymaps/skewwhiffy/rules.mk
+++ b/keyboards/xd75/keymaps/skewwhiffy/rules.mk
@@ -13,6 +13,3 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/xd75/keymaps/tdl-jturner/rules.mk b/keyboards/xd75/keymaps/tdl-jturner/rules.mk
index 186b452fc..996d77045 100644
--- a/keyboards/xd75/keymaps/tdl-jturner/rules.mk
+++ b/keyboards/xd75/keymaps/tdl-jturner/rules.mk
@@ -13,11 +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/>.
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
 TAP_DANCE_ENABLE = yes
 MOUSEKEY_ENABLE = yes
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
diff --git a/keyboards/ymd75/rules.mk b/keyboards/ymd75/rules.mk
index c9baf1316..9697a76f1 100644
--- a/keyboards/ymd75/rules.mk
+++ b/keyboards/ymd75/rules.mk
@@ -57,10 +57,6 @@ SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 CUSTOM_MATRIX = yes
 SRC = matrix.c i2c.c backlight.c
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
 # programming options
 PROGRAM_CMD = ./keyboards/ps2avrGB/program $(TARGET).hex
diff --git a/keyboards/zen/keymaps/default/rules.mk b/keyboards/zen/keymaps/default/rules.mk
index 22b6ec476..73142a168 100644
--- a/keyboards/zen/keymaps/default/rules.mk
+++ b/keyboards/zen/keymaps/default/rules.mk
@@ -1,6 +1,3 @@
 RGBLIGHT_ENABLE = yes
 BACKLIGHT_ENABLE = yes
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/zen/keymaps/jwlawrence/rules.mk b/keyboards/zen/keymaps/jwlawrence/rules.mk
index 22b6ec476..73142a168 100644
--- a/keyboards/zen/keymaps/jwlawrence/rules.mk
+++ b/keyboards/zen/keymaps/jwlawrence/rules.mk
@@ -1,6 +1,3 @@
 RGBLIGHT_ENABLE = yes
 BACKLIGHT_ENABLE = yes
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/zen/keymaps/xyverz/rules.mk b/keyboards/zen/keymaps/xyverz/rules.mk
index 22b6ec476..73142a168 100644
--- a/keyboards/zen/keymaps/xyverz/rules.mk
+++ b/keyboards/zen/keymaps/xyverz/rules.mk
@@ -1,6 +1,3 @@
 RGBLIGHT_ENABLE = yes
 BACKLIGHT_ENABLE = yes
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/keyboards/zinc/keymaps/monks/rules.mk b/keyboards/zinc/keymaps/monks/rules.mk
index a5335def8..eeabc004c 100644
--- a/keyboards/zinc/keymaps/monks/rules.mk
+++ b/keyboards/zinc/keymaps/monks/rules.mk
@@ -90,11 +90,8 @@ endif
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
 # Uncomment these for debugging
 # $(info -- RGBLIGHT_ENABLE=$(RGBLIGHT_ENABLE))
 # $(info -- OPT_DEFS=$(OPT_DEFS))
 # $(info )
diff --git a/layouts/community/ergodox/berfarah/rules.mk b/layouts/community/ergodox/berfarah/rules.mk
index a87325037..abd95b500 100644
--- a/layouts/community/ergodox/berfarah/rules.mk
+++ b/layouts/community/ergodox/berfarah/rules.mk
@@ -14,6 +14,3 @@ ifeq (${FORCE_NKRO},yes)
 OPT_DEFS += -DFORCE_NKRO
 endif
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/layouts/community/ortho_4x12/grahampheath/rules.mk b/layouts/community/ortho_4x12/grahampheath/rules.mk
index 457a3d01d..e69de29bb 100644
--- a/layouts/community/ortho_4x12/grahampheath/rules.mk
+++ b/layouts/community/ortho_4x12/grahampheath/rules.mk
@@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/layouts/community/ortho_4x12/xyverz/rules.mk b/layouts/community/ortho_4x12/xyverz/rules.mk
index c181e1107..f52fe1754 100644
--- a/layouts/community/ortho_4x12/xyverz/rules.mk
+++ b/layouts/community/ortho_4x12/xyverz/rules.mk
@@ -9,6 +9,3 @@ else
  RGBLIGHT_ENABLE = yes
 endif
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
diff --git a/users/losinggeneration/rules.mk b/users/losinggeneration/rules.mk
index 75277116b..295367fbc 100644
--- a/users/losinggeneration/rules.mk
+++ b/users/losinggeneration/rules.mk
@@ -11,6 +11,3 @@ MOUSEKEY_ENABLE  = yes   # Mouse keys(+4700)
 TAP_DANCE_ENABLE = yes   # Enable tap dancing
 #UNICODE_ENABLE   = no    # Unicode
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
author	noroadsleft <18669334+noroadsleft@users.noreply.github.com>	2019-01-04 07:25:48 -0800
committer	MechMerlin <30334081+mechmerlin@users.noreply.github.com>	2019-01-04 07:25:48 -0800
commit	7f4f0f7685cef421df4c07b0982c1905fb57a736 (patch)
tree	a19f33691cb3f293ac732a4179e10339b4f24f1a
parent	b1ed85587161e8352d136fcc4876a52b33328b01 (diff)
download	qmk_firmware-7f4f0f7685cef421df4c07b0982c1905fb57a736.tar.gz qmk_firmware-7f4f0f7685cef421df4c07b0982c1905fb57a736.zip