From c485d1cf2652bfb47afbb68f128a64f1bc518aa3 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Mon, 27 Mar 2023 20:08:17 +0100
Subject: [PATCH] Remove use of keymap.h (#20004)

---
 quantum/action.c                        |  2 +-
 quantum/action_layer.c                  |  2 +-
 quantum/keyboard.c                      |  2 +-
 quantum/keymap.h                        | 22 +---------------------
 quantum/keymap_common.c                 |  3 ++-
 quantum/keymap_common.h                 |  1 +
 quantum/process_keycode/process_combo.c |  1 +
 quantum/quantum.h                       |  7 ++++++-
 8 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/quantum/action.c b/quantum/action.c
index 7d3f40a9508..a6017373769 100644
--- a/quantum/action.c
+++ b/quantum/action.c
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "host.h"
 #include "keycode.h"
 #include "keyboard.h"
-#include "keymap.h"
 #include "mousekey.h"
 #include "programmable_button.h"
 #include "command.h"
@@ -30,6 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "action.h"
 #include "wait.h"
 #include "keycode_config.h"
+#include "debug.h"
 
 #ifdef BACKLIGHT_ENABLE
 #    include "backlight.h"
diff --git a/quantum/action_layer.c b/quantum/action_layer.c
index 789a7fddeb0..7c09a5bd1e5 100644
--- a/quantum/action_layer.c
+++ b/quantum/action_layer.c
@@ -2,8 +2,8 @@
 #include <stdint.h>
 
 #include "keyboard.h"
-#include "keymap.h"
 #include "action.h"
+#include "encoder.h"
 #include "util.h"
 #include "action_layer.h"
 
diff --git a/quantum/keyboard.c b/quantum/keyboard.c
index 6e7d40ddc74..3f030d88451 100644
--- a/quantum/keyboard.c
+++ b/quantum/keyboard.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "quantum.h"
 #include "keyboard.h"
 #include "matrix.h"
-#include "keymap.h"
+#include "keymap_introspection.h"
 #include "magic.h"
 #include "host.h"
 #include "led.h"
diff --git a/quantum/keymap.h b/quantum/keymap.h
index 1263ef188bb..a067e1aa368 100644
--- a/quantum/keymap.h
+++ b/quantum/keymap.h
@@ -17,24 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include <stdint.h>
-#include <stdbool.h>
-#include "platform_deps.h"
-#include "action.h"
-#include "keycode.h"
-#include "report.h"
-#include "host.h"
-#include "debug.h"
-#include "keycode_config.h"
-#include "gpio.h" // for pin_t
-
-#include "quantum_keycodes.h"
-
-#include "keymap_common.h"
-
-#ifdef ENCODER_MAP_ENABLE
-// Ensure we have a forward declaration for the encoder map
-#    include "encoder.h"
-#endif
-
-#include "keymap_introspection.h"
+#pragma message("'keymap.h' should no longer be included!")
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c
index 6fcebc3242f..0492e6fd1c3 100644
--- a/quantum/keymap_common.c
+++ b/quantum/keymap_common.c
@@ -15,7 +15,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "keymap.h"
+#include "keymap_common.h"
+#include "keymap_introspection.h"
 #include "report.h"
 #include "keycode.h"
 #include "action_layer.h"
diff --git a/quantum/keymap_common.h b/quantum/keymap_common.h
index 20e70263f34..fca4fc9ba33 100644
--- a/quantum/keymap_common.h
+++ b/quantum/keymap_common.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <stdint.h>
+#include "keyboard.h"
 
 // translates key to keycode
 uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key);
diff --git a/quantum/process_keycode/process_combo.c b/quantum/process_keycode/process_combo.c
index 8597649c929..ce6725c402f 100644
--- a/quantum/process_keycode/process_combo.c
+++ b/quantum/process_keycode/process_combo.c
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "keymap_common.h"
 #include "print.h"
 #include "process_combo.h"
 #include "action_tapping.h"
diff --git a/quantum/quantum.h b/quantum/quantum.h
index 315fa255688..38186a48a35 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -18,7 +18,7 @@
 #include "platform_deps.h"
 #include "wait.h"
 #include "matrix.h"
-#include "keymap.h"
+#include "keyboard.h"
 
 #ifdef BACKLIGHT_ENABLE
 #    include "backlight.h"
@@ -36,6 +36,9 @@
 #    include "rgb_matrix.h"
 #endif
 
+#include "keymap_common.h"
+#include "quantum_keycodes.h"
+#include "keycode_config.h"
 #include "action_layer.h"
 #include "eeconfig.h"
 #include "bootloader.h"
@@ -44,10 +47,12 @@
 #include "sync_timer.h"
 #include "gpio.h"
 #include "atomic_util.h"
+#include "host.h"
 #include "led.h"
 #include "action_util.h"
 #include "action_tapping.h"
 #include "print.h"
+#include "debug.h"
 #include "suspend.h"
 #include <stddef.h>
 #include <stdlib.h>