diff --git a/components/fatfs/test_fatfs_host/Makefile.files b/components/fatfs/test_fatfs_host/Makefile.files
index de17e81210..7e7da5bd95 100644
--- a/components/fatfs/test_fatfs_host/Makefile.files
+++ b/components/fatfs/test_fatfs_host/Makefile.files
@@ -30,6 +30,7 @@ INCLUDE_DIRS := \
 		xtensa/include \
 		xtensa/esp32/include \
 		soc/esp32/include \
+                heap/include \
 		soc/include \
 		esp32/include \
 		esp_common/include \
diff --git a/components/spi_flash/sim/Makefile.files b/components/spi_flash/sim/Makefile.files
index 57cefe0ebe..037dd6eefd 100644
--- a/components/spi_flash/sim/Makefile.files
+++ b/components/spi_flash/sim/Makefile.files
@@ -32,6 +32,7 @@ INCLUDE_DIRS := \
 	xtensa/include \
 	xtensa/esp32/include \
 	soc/esp32/include \
+       	heap/include \
 	soc/include \
 	esp32/include \
 	esp_timer/include \
diff --git a/components/spi_flash/sim/stubs/Makefile.files b/components/spi_flash/sim/stubs/Makefile.files
index dfa0f2a64b..82ff75c1e2 100644
--- a/components/spi_flash/sim/stubs/Makefile.files
+++ b/components/spi_flash/sim/stubs/Makefile.files
@@ -24,6 +24,7 @@ INCLUDE_DIRS := \
 	esp_hw_support/include/soc \
 	esp_system/include \
 	soc/esp32/include \
+        heap/include \
 	soc/include \
 	xtensa/include \
 	xtensa/esp32/include \
diff --git a/components/spiffs/test_spiffs_host/Makefile.files b/components/spiffs/test_spiffs_host/Makefile.files
index a066e02d46..8104f58312 100644
--- a/components/spiffs/test_spiffs_host/Makefile.files
+++ b/components/spiffs/test_spiffs_host/Makefile.files
@@ -31,6 +31,7 @@ INCLUDE_DIRS := \
 	xtensa/include \
 	xtensa/esp32/include \
 	soc/esp32/include \
+      	heap/include \
 	soc/include \
 	esp32/include \
 	bootloader_support/include \
diff --git a/components/wear_levelling/test_wl_host/Makefile b/components/wear_levelling/test_wl_host/Makefile
index 4b48d492af..1c6468d629 100644
--- a/components/wear_levelling/test_wl_host/Makefile
+++ b/components/wear_levelling/test_wl_host/Makefile
@@ -25,7 +25,7 @@ else
 SDKCONFIG_DIR := $(dir $(realpath $(SDKCONFIG)))
 endif
 
-INCLUDE_FLAGS := $(addprefix -I, $(INCLUDE_DIRS) $(SDKCONFIG_DIR) ../../../tools/catch)
+INCLUDE_FLAGS := $(addprefix -I, $(INCLUDE_DIRS) -I../../../heap/include/soc $(SDKCONFIG_DIR) ../../../tools/catch)
 
 CPPFLAGS += $(INCLUDE_FLAGS) -g -m32
 CXXFLAGS += $(INCLUDE_FLAGS) -std=c++11 -g -m32
diff --git a/components/wear_levelling/test_wl_host/Makefile.files b/components/wear_levelling/test_wl_host/Makefile.files
index 1cd58a8cc2..d31308b41a 100644
--- a/components/wear_levelling/test_wl_host/Makefile.files
+++ b/components/wear_levelling/test_wl_host/Makefile.files
@@ -22,6 +22,7 @@ INCLUDE_DIRS := \
 	vfs/include \
 	) \
 	$(addprefix ../../../components/, \
+	heap/include \
 	esp_rom/include \
 	esp_system/include \
 	esp_common/include \
@@ -30,6 +31,7 @@ INCLUDE_DIRS := \
 	xtensa/include \
 	xtensa/esp32/include \
 	soc/esp32/include \
+      	heap/include \
 	soc/include \
 	esp32/include \
 	bootloader_support/include \