diff --git a/src/soc/qualcomm/ipq806x/Makefile.inc b/src/soc/qualcomm/ipq806x/Makefile.inc
index 0ea29969a0..35ff932765 100644
--- a/src/soc/qualcomm/ipq806x/Makefile.inc
+++ b/src/soc/qualcomm/ipq806x/Makefile.inc
@@ -26,3 +26,5 @@ $(objcbfs)/bootblock.bin: ./$(call strip_quotes,$(CONFIG_SBL_BLOB)) \
 	@mv $@.tmp $@
 
 endif
+
+INCLUDES += -Isrc/soc/qualcomm/ipq806x/include
diff --git a/src/soc/qualcomm/ipq806x/cdp.h b/src/soc/qualcomm/ipq806x/include/cdp.h
similarity index 100%
rename from src/soc/qualcomm/ipq806x/cdp.h
rename to src/soc/qualcomm/ipq806x/include/cdp.h
diff --git a/src/soc/qualcomm/ipq806x/clock.h b/src/soc/qualcomm/ipq806x/include/clock.h
similarity index 100%
rename from src/soc/qualcomm/ipq806x/clock.h
rename to src/soc/qualcomm/ipq806x/include/clock.h
diff --git a/src/soc/qualcomm/ipq806x/gpio.h b/src/soc/qualcomm/ipq806x/include/gpio.h
similarity index 100%
rename from src/soc/qualcomm/ipq806x/gpio.h
rename to src/soc/qualcomm/ipq806x/include/gpio.h
diff --git a/src/soc/qualcomm/ipq806x/gsbi.h b/src/soc/qualcomm/ipq806x/include/gsbi.h
similarity index 100%
rename from src/soc/qualcomm/ipq806x/gsbi.h
rename to src/soc/qualcomm/ipq806x/include/gsbi.h
diff --git a/src/soc/qualcomm/ipq806x/iomap.h b/src/soc/qualcomm/ipq806x/include/iomap.h
similarity index 100%
rename from src/soc/qualcomm/ipq806x/iomap.h
rename to src/soc/qualcomm/ipq806x/include/iomap.h
diff --git a/src/soc/qualcomm/ipq806x/timer.h b/src/soc/qualcomm/ipq806x/include/timer.h
similarity index 100%
rename from src/soc/qualcomm/ipq806x/timer.h
rename to src/soc/qualcomm/ipq806x/include/timer.h
diff --git a/src/soc/qualcomm/ipq806x/uart.h b/src/soc/qualcomm/ipq806x/include/uart.h
similarity index 100%
rename from src/soc/qualcomm/ipq806x/uart.h
rename to src/soc/qualcomm/ipq806x/include/uart.h