diff --git a/.cproject b/.cproject
index 22fe7e14..0db5e150 100644
--- a/.cproject
+++ b/.cproject
@@ -233,7 +233,7 @@
-
+
@@ -399,6 +399,8 @@
+
+
diff --git a/Makefile b/Makefile
index 5650443a..51ac175c 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,8 @@
#recovery: EXTRA_CPPFLAGS+=-DRECOVERY_APPLICATION=1
PROJECT_NAME?=squeezelite
-EXTRA_CPPFLAGS+= -I$(PROJECT_PATH)/main -I$(IDF_PATH)/components/esp_http_server/src -I$(IDF_PATH)/components/esp_http_server/src/port/esp32 -I$(IDF_PATH)/components/esp_http_server/src/util -I$(IDF_PATH)/components/esp_http_server/src/
+EXTRA_CPPFLAGS+= -I$(PROJECT_PATH)/main
+
#/-Wno-error=maybe-uninitialized
include $(IDF_PATH)/make/project.mk
diff --git a/components/wifi-manager/component.mk b/components/wifi-manager/component.mk
index 4a5d5006..491db5eb 100644
--- a/components/wifi-manager/component.mk
+++ b/components/wifi-manager/component.mk
@@ -7,7 +7,8 @@
# please read the SDK documents if you need to do this.
#
COMPONENT_EMBED_FILES := style.css code.js index.html bootstrap.min.css.gz jquery.min.js.gz popper.min.js.gz bootstrap.min.js.gz
-COMPONENT_ADD_INCLUDEDIRS := . $(IDF_PATH)/components/esp_http_server/src $(IDF_PATH)/components/esp_http_server/src/port/esp32 $(IDF_PATH)/components/esp_http_server/src/util
+COMPONENT_ADD_INCLUDEDIRS := .
+COMPONENT_EXTRA_INCLUDES += $(IDF_PATH)/components/esp_http_server/src $(IDF_PATH)/components/esp_http_server/src/port/esp32 $(IDF_PATH)/components/esp_http_server/src/util $(IDF_PATH)/components/esp_http_server/src/
CFLAGS += -D LOG_LOCAL_LEVEL=ESP_LOG_INFO