diff --git a/config/hillside52.keymap b/config/hillside52.keymap
index 0525147c..97a17097 100644
--- a/config/hillside52.keymap
+++ b/config/hillside52.keymap
@@ -3,11 +3,15 @@
  *
  * SPDX-License-Identifier: MIT
  */
+
 #include <behaviors.dtsi>
 #include <dt-bindings/zmk/bt.h>
 #include <dt-bindings/zmk/ext_power.h>
 #include <dt-bindings/zmk/keys.h>
 #include <dt-bindings/zmk/outputs.h>
+#include "includes/mouse_keys.dtsi"
+#include "includes/mouse_tp.dtsi"
+
 #define QWERTY_L 0
 #define DVORAK_L 1
 #define COLEMK_L 2
@@ -127,15 +131,4 @@
     };
 };
 
-#ifdef HAS_MOUSE_KEYS
-
-#include "includes/mouse_keys.dtsi"
-
-#endif
-
-#ifdef HAS_MOUSE_TP
-
-#include "includes/mouse_tp.dtsi"
-
 
-#endif