diff --git a/quantum/dip_switch.c b/quantum/dip_switch.c
index e180cfccdf..6e254578d1 100644
--- a/quantum/dip_switch.c
+++ b/quantum/dip_switch.c
@@ -16,14 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <string.h> // for memcpy
+
 #include "dip_switch.h"
+#include "gpio.h"
+#include "util.h"
+
 #ifdef SPLIT_KEYBOARD
 #    include "split_common/split_util.h"
 #endif
 
-// for memcpy
-#include <string.h>
-
 #if !defined(DIP_SWITCH_PINS) && !defined(DIP_SWITCH_MATRIX_GRID)
 #    error "Either DIP_SWITCH_PINS or DIP_SWITCH_MATRIX_GRID must be defined."
 #endif
diff --git a/quantum/dip_switch.h b/quantum/dip_switch.h
index 058a10f41f..6e79dcb0bf 100644
--- a/quantum/dip_switch.h
+++ b/quantum/dip_switch.h
@@ -18,7 +18,8 @@
 
 #pragma once
 
-#include "quantum.h"
+#include <stdbool.h>
+#include <stdint.h>
 
 bool dip_switch_update_kb(uint8_t index, bool active);
 bool dip_switch_update_user(uint8_t index, bool active);