diff --git a/quantum/keymap.h b/quantum/keymap.h
index edff484129..67e35c4e2f 100644
--- a/quantum/keymap.h
+++ b/quantum/keymap.h
@@ -19,38 +19,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <stdint.h>
 #include <stdbool.h>
+#include "platform_deps.h"
 #include "action.h"
-#if defined(__AVR__)
-#    include <avr/pgmspace.h>
-#elif defined PROTOCOL_CHIBIOS
-// We need to ensure that chibios is include before redefining reset
-#    include <ch.h>
-#endif
 #include "keycode.h"
 #include "report.h"
 #include "host.h"
-// #include "print.h"
 #include "debug.h"
 #include "keycode_config.h"
 #include "gpio.h" // for pin_t
 
-// ChibiOS uses RESET in its FlagStatus enumeration
-// Therefore define it as QK_BOOTLOADER here, to avoid name collision
-#if defined(PROTOCOL_CHIBIOS)
-#    define RESET QK_BOOTLOADER
-#endif
-// Gross hack, remove me and change RESET keycode to QK_BOOT
-#if defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1287__)
-#    undef RESET
-#endif
-
 #include "quantum_keycodes.h"
 
-// Gross hack, remove me and change RESET keycode to QK_BOOT
-#if defined(MCU_RP)
-#    undef RESET
-#endif
-
 // translates key to keycode
 uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key);
 
diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h
index 51380d9c50..1de81b4c0f 100644
--- a/quantum/quantum_keycodes_legacy.h
+++ b/quantum/quantum_keycodes_legacy.h
@@ -4,7 +4,6 @@
 
 // Deprecated Quantum keycodes
 
-#define RESET        QK_BOOTLOADER
 #define DEBUG        QK_DEBUG_TOGGLE
 #define GRAVE_ESC    QK_GRAVE_ESCAPE
 #define EEPROM_RESET QK_CLEAR_EEPROM
@@ -13,4 +12,5 @@
 #define EEP_RST QK_CLEAR_EEPROM
 
 #define TERM_ON _Static_assert(false, "The Terminal feature has been removed from QMK. Please remove use of TERM_ON/TERM_OFF from your keymap.")
-#define TERM_OFF _Static_assert(false, "The Terminal feature has been removed from QMK.. Please remove use of TERM_ON/TERM_OFF from your keymap.")
\ No newline at end of file
+#define TERM_OFF _Static_assert(false, "The Terminal feature has been removed from QMK.. Please remove use of TERM_ON/TERM_OFF from your keymap.")
+// #define RESET _Static_assert(false, "The RESET keycode has been removed from QMK.. Please remove use from your keymap.")