diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
index 0f39020e..6a5fc805 100644
--- a/.settings/language.settings.xml
+++ b/.settings/language.settings.xml
@@ -5,7 +5,7 @@
         		
         <extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
             			
-            <provider class="org.eclipse.cdt.core.language.settings.providers.LanguageSettingsGenericProvider" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider" name="CDT User Setting Entries" prefer-non-shared="true"/>
+            <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
             			
             <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
             			
@@ -29,7 +29,7 @@
         		
         <extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
             			
-            <provider class="org.eclipse.cdt.core.language.settings.providers.LanguageSettingsGenericProvider" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider" name="CDT User Setting Entries" prefer-non-shared="true"/>
+            <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
             			
             <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
             			
@@ -53,7 +53,7 @@
         		
         <extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
             			
-            <provider class="org.eclipse.cdt.core.language.settings.providers.LanguageSettingsGenericProvider" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider" name="CDT User Setting Entries" prefer-non-shared="true"/>
+            <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
             			
             <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
             			
@@ -77,7 +77,7 @@
         		
         <extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
             			
-            <provider class="org.eclipse.cdt.core.language.settings.providers.LanguageSettingsGenericProvider" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider" name="CDT User Setting Entries" prefer-non-shared="true"/>
+            <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
             			
             <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
             			
diff --git a/Makefile b/Makefile
index bfbb0778..5650443a 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@
 #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
+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/
 #/-Wno-error=maybe-uninitialized 
 include $(IDF_PATH)/make/project.mk 
 
diff --git a/components/wifi-manager/_esp_httpd_main.c b/components/wifi-manager/_esp_httpd_main.c
index af6faefa..255f6d78 100644
--- a/components/wifi-manager/_esp_httpd_main.c
+++ b/components/wifi-manager/_esp_httpd_main.c
@@ -22,8 +22,8 @@
 
 #include <esp_http_server.h>
 #include <_esp_http_server.h>
-#include "../src/esp_httpd_priv.h"
-#include "../src/util/ctrl_sock.h"
+#include "esp_httpd_priv.h"
+#include "ctrl_sock.h"
 
 static const char *TAG = "_httpd";