diff --git a/Makefile b/Makefile
index ea34a2f..5bc2e0e 100644
--- a/Makefile
+++ b/Makefile
@@ -17,14 +17,14 @@ clean:
 # Include common source
 COMMON_DIR=src/common
 SRC=$(wildcard $(COMMON_DIR)/*.c)
-INCLUDE=$(wildcard $(COMMON_DIR)/include/common/*.h)
+INCLUDE=$(wildcard $(COMMON_DIR)/include/common/*.h) $(COMMON_DIR)/common.mk
 CFLAGS=-I$(COMMON_DIR)/include
 include $(COMMON_DIR)/common.mk
 
 # Include the board's source
 BOARD_DIR=src/board/$(BOARD)
 SRC+=$(wildcard $(BOARD_DIR)/*.c)
-INCLUDE+=$(wildcard $(BOARD_DIR)/include/board/*.h)
+INCLUDE+=$(wildcard $(BOARD_DIR)/include/board/*.h) $(BOARD_DIR)/board.mk
 CFLAGS+=-I$(BOARD_DIR)/include -D__BOARD__=$(BOARD)
 include $(BOARD_DIR)/board.mk
 
@@ -32,7 +32,7 @@ include $(BOARD_DIR)/board.mk
 # Include the embedded controller's source
 EC_DIR=src/ec/$(EC)
 SRC+=$(wildcard $(EC_DIR)/*.c)
-INCLUDE+=$(wildcard $(EC_DIR)/include/ec/*.h)
+INCLUDE+=$(wildcard $(EC_DIR)/include/ec/*.h) $(EC_DIR)/ec.mk
 CFLAGS+=-I$(EC_DIR)/include -D__EC__=$(EC)
 include $(EC_DIR)/ec.mk
 
@@ -40,7 +40,7 @@ include $(EC_DIR)/ec.mk
 # Include the architecture's source
 ARCH_DIR=src/arch/$(ARCH)
 SRC+=$(wildcard $(ARCH_DIR)/*.c)
-INCLUDE+=$(wildcard $(ARCH_DIR)/include/arch/*.h)
+INCLUDE+=$(wildcard $(ARCH_DIR)/include/arch/*.h) $(ARCH_DIR)/arch.mk
 CFLAGS+=-I$(ARCH_DIR)/include -D__ARCH__=$(ARCH)
 include $(ARCH_DIR)/arch.mk
 
diff --git a/src/board/system76/galp3-c/board.mk b/src/board/system76/galp3-c/board.mk
index 1080432..1e946d6 100644
--- a/src/board/system76/galp3-c/board.mk
+++ b/src/board/system76/galp3-c/board.mk
@@ -18,7 +18,7 @@ CFLAGS+=-DLEVEL=2
 # Add scratch ROM source
 SCRATCH_DIR=$(BOARD_DIR)/scratch
 SCRATCH_SRC=$(wildcard $(SCRATCH_DIR)/*.c)
-SCRATCH_INCLUDE=$(wildcard $(SCRATCH_DIR)/include/scratch/*.h)
+SCRATCH_INCLUDE=$(wildcard $(SCRATCH_DIR)/include/scratch/*.h) $(SCRATCH_DIR)/scratch.mk
 SCRATCH_CFLAGS=-I$(SCRATCH_DIR)/include
 include $(SCRATCH_DIR)/scratch.mk