diff --git a/components/driver/test/adc_dma_test/test_esp32s2.c b/components/driver/test/adc_dma_test/test_esp32s2.c
index dba69ecde6..cd1d231d95 100644
--- a/components/driver/test/adc_dma_test/test_esp32s2.c
+++ b/components/driver/test/adc_dma_test/test_esp32s2.c
@@ -39,6 +39,8 @@
 #if !DISABLED_FOR_TARGETS(ESP8266, ESP32, ESP32S3) // This testcase for ESP32S2
 
 #include "soc/system_reg.h"
+#include "soc/spi_reg.h"
+#include "soc/soc.h"
 #include "soc/lldesc.h"
 #include "test/test_adc_dac_dma.h"
 
diff --git a/components/driver/test/dac_dma_test/test_esp32s2.c b/components/driver/test/dac_dma_test/test_esp32s2.c
index 3d6ea169d5..a30297aa4d 100644
--- a/components/driver/test/dac_dma_test/test_esp32s2.c
+++ b/components/driver/test/dac_dma_test/test_esp32s2.c
@@ -32,9 +32,11 @@
 #include "esp_log.h"
 #include "nvs_flash.h"
 #include "test_utils.h"
+#include "soc/soc.h"
 #include "soc/spi_reg.h"
 #include "soc/adc_periph.h"
 #include "soc/dac_periph.h"
+#include "soc/spi_periph.h"
 #include "test/test_common_adc.h"
 
 #if !DISABLED_FOR_TARGETS(ESP8266, ESP32, ESP32S3) // This testcase for ESP32S2
diff --git a/components/esp_common/include/esp_task.h b/components/esp_common/include/esp_task.h
index 57e41d333e..06ddd606cc 100644
--- a/components/esp_common/include/esp_task.h
+++ b/components/esp_common/include/esp_task.h
@@ -27,6 +27,7 @@
 #define _ESP_TASK_H_
 
 #include "sdkconfig.h"
+#include "freertos/FreeRTOS.h"
 #include "freertos/FreeRTOSConfig.h"
 
 #define ESP_TASK_PRIO_MAX (configMAX_PRIORITIES)
diff --git a/components/mdns/test_afl_fuzz_host/Makefile b/components/mdns/test_afl_fuzz_host/Makefile
index 4d2afd6143..96bfc991e8 100644
--- a/components/mdns/test_afl_fuzz_host/Makefile
+++ b/components/mdns/test_afl_fuzz_host/Makefile
@@ -67,7 +67,7 @@ all: $(TEST_NAME)
 
 mdns.o: ../mdns.c
 	@echo "[CC] $<"
-	@$(CC) $(CFLAGS) --include mdns_mock.h $(MDNS_C_DEPENDENCY_INJECTION) -c $< -o $@
+	@$(CC) $(CFLAGS) -include mdns_mock.h $(MDNS_C_DEPENDENCY_INJECTION) -c $< -o $@
 
 $(TEST_NAME): $(OBJECTS)
 	@echo "[LD] $@"