diff --git a/tmk_core/tool/chibios/chibios.mk b/tmk_core/tool/chibios/chibios.mk
index 0f6af53d..a67e067a 100644
--- a/tmk_core/tool/chibios/chibios.mk
+++ b/tmk_core/tool/chibios/chibios.mk
@@ -152,7 +152,7 @@ INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
          $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
          $(CHIBIOS)/os/hal/lib/streams $(CHIBIOS)/os/various \
          $(TMK_DIR) $(COMMON_DIR) $(TMK_DIR)/protocol/chibios \
-         $(TARGET_DIR)
+         $(TMK_DIR)/protocol $(TARGET_DIR)
 
 #
 # Project, sources and paths
diff --git a/tmk_core/tool/chibios/common.mk b/tmk_core/tool/chibios/common.mk
index 883054a4..7e3cccc9 100644
--- a/tmk_core/tool/chibios/common.mk
+++ b/tmk_core/tool/chibios/common.mk
@@ -83,6 +83,3 @@ OPT_DEFS += -DVERSION=$(shell (git describe --always --dirty || echo 'unknown')
 ifdef BOOTLOADER_ADDRESS
     OPT_DEFS += -DBOOTLOADER_ADDRESS=$(BOOTLOADER_ADDRESS)
 endif
-
-# Search Path
-VPATH += $(TMK_DIR)/common