diff --git a/components/esp32/cpu_start.c b/components/esp32/cpu_start.c
index 7f0e1573d8..0454e3ac2d 100644
--- a/components/esp32/cpu_start.c
+++ b/components/esp32/cpu_start.c
@@ -38,8 +38,6 @@
 #include "freertos/queue.h"
 #include "freertos/portmacro.h"
 
-#include "tcpip_adapter.h"
-
 #include "esp_heap_caps_init.h"
 #include "sdkconfig.h"
 #include "esp_system.h"
@@ -55,6 +53,7 @@
 #include "esp_newlib.h"
 #include "esp_brownout.h"
 #include "esp_int_wdt.h"
+#include "esp_task.h"
 #include "esp_task_wdt.h"
 #include "esp_phy_init.h"
 #include "esp_cache_err_int.h"
diff --git a/components/smartconfig/component.mk b/components/smartconfig/component.mk
new file mode 100644
index 0000000000..58eac9a550
--- /dev/null
+++ b/components/smartconfig/component.mk
@@ -0,0 +1,2 @@
+#
+# Component Makefile
diff --git a/components/esp32/smartconfig.h b/components/smartconfig/include/smartconfig.h
similarity index 100%
rename from components/esp32/smartconfig.h
rename to components/smartconfig/include/smartconfig.h
diff --git a/components/esp32/smartconfig.c b/components/smartconfig/smartconfig.c
similarity index 100%
rename from components/esp32/smartconfig.c
rename to components/smartconfig/smartconfig.c
diff --git a/components/wpa_supplicant/port/include/os.h b/components/wpa_supplicant/port/include/os.h
index e6da894e92..468d54ffe8 100644
--- a/components/wpa_supplicant/port/include/os.h
+++ b/components/wpa_supplicant/port/include/os.h
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "rom/ets_sys.h"
-#include "lwip/mem.h"
+
 typedef long os_time_t;
 
 /**