8 files changed, 14 insertions(+), 26 deletions(-)

M quantum/action.c
M quantum/action_layer.c
M quantum/keyboard.c
M quantum/keymap.h
M quantum/keymap_common.c
M quantum/keymap_common.h
M quantum/process_keycode/process_combo.c
M quantum/quantum.h

@@ 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"

@@ 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"
 

@@ 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"

@@ 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!")

@@ 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"

@@ 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);

@@ 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"

@@ 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>