diff --git a/components/esp8266/component.mk b/components/esp8266/component.mk
index fe067684..77d721ab 100644
--- a/components/esp8266/component.mk
+++ b/components/esp8266/component.mk
@@ -1,8 +1,10 @@
 #
 # Component Makefile
 #
-COMPONENT_ADD_INCLUDEDIRS += include/espressif include/driver
+COMPONENT_ADD_INCLUDEDIRS += include
+COMPONENT_PRIV_INCLUDEDIRS := include/driver
 COMPONENT_SRCDIRS := driver
+
 LIBS ?=
 ifndef CONFIG_NO_BLOBS
 LIBS += airkiss cirom crypto espnow gcc hal core minic mirom net80211 \
diff --git a/components/esp8266/driver/gpio.c b/components/esp8266/driver/gpio.c
index e55f2a07..fc5e60a1 100644
--- a/components/esp8266/driver/gpio.c
+++ b/components/esp8266/driver/gpio.c
@@ -22,7 +22,7 @@
  *
  */
 
-#include "espressif/esp_common.h"
+#include "esp_common.h"
 #include "freertos/portmacro.h"
 
 #include "gpio.h"
diff --git a/components/esp8266/include/espressif/airkiss.h b/components/esp8266/include/airkiss.h
similarity index 100%
rename from components/esp8266/include/espressif/airkiss.h
rename to components/esp8266/include/airkiss.h
diff --git a/components/esp8266/include/espressif/c_types.h b/components/esp8266/include/c_types.h
similarity index 100%
rename from components/esp8266/include/espressif/c_types.h
rename to components/esp8266/include/c_types.h
diff --git a/components/esp8266/include/espressif/esp8266/eagle_soc.h b/components/esp8266/include/esp8266/eagle_soc.h
similarity index 100%
rename from components/esp8266/include/espressif/esp8266/eagle_soc.h
rename to components/esp8266/include/esp8266/eagle_soc.h
diff --git a/components/esp8266/include/espressif/esp8266/esp8266.h b/components/esp8266/include/esp8266/esp8266.h
similarity index 100%
rename from components/esp8266/include/espressif/esp8266/esp8266.h
rename to components/esp8266/include/esp8266/esp8266.h
diff --git a/components/esp8266/include/espressif/esp8266/ets_sys.h b/components/esp8266/include/esp8266/ets_sys.h
similarity index 100%
rename from components/esp8266/include/espressif/esp8266/ets_sys.h
rename to components/esp8266/include/esp8266/ets_sys.h
diff --git a/components/esp8266/include/espressif/esp8266/gpio_register.h b/components/esp8266/include/esp8266/gpio_register.h
similarity index 100%
rename from components/esp8266/include/espressif/esp8266/gpio_register.h
rename to components/esp8266/include/esp8266/gpio_register.h
diff --git a/components/esp8266/include/espressif/esp8266/pin_mux_register.h b/components/esp8266/include/esp8266/pin_mux_register.h
similarity index 100%
rename from components/esp8266/include/espressif/esp8266/pin_mux_register.h
rename to components/esp8266/include/esp8266/pin_mux_register.h
diff --git a/components/esp8266/include/espressif/esp8266/spi_register.h b/components/esp8266/include/esp8266/spi_register.h
similarity index 100%
rename from components/esp8266/include/espressif/esp8266/spi_register.h
rename to components/esp8266/include/esp8266/spi_register.h
diff --git a/components/esp8266/include/espressif/esp8266/timer_register.h b/components/esp8266/include/esp8266/timer_register.h
similarity index 100%
rename from components/esp8266/include/espressif/esp8266/timer_register.h
rename to components/esp8266/include/esp8266/timer_register.h
diff --git a/components/esp8266/include/espressif/esp8266/uart_register.h b/components/esp8266/include/esp8266/uart_register.h
similarity index 100%
rename from components/esp8266/include/espressif/esp8266/uart_register.h
rename to components/esp8266/include/esp8266/uart_register.h
diff --git a/components/esp8266/include/espressif/esp_common.h b/components/esp8266/include/esp_common.h
similarity index 100%
rename from components/esp8266/include/espressif/esp_common.h
rename to components/esp8266/include/esp_common.h
diff --git a/components/esp8266/include/espressif/esp_libc.h b/components/esp8266/include/esp_libc.h
similarity index 100%
rename from components/esp8266/include/espressif/esp_libc.h
rename to components/esp8266/include/esp_libc.h
diff --git a/components/esp8266/include/espressif/esp_misc.h b/components/esp8266/include/esp_misc.h
similarity index 100%
rename from components/esp8266/include/espressif/esp_misc.h
rename to components/esp8266/include/esp_misc.h
diff --git a/components/esp8266/include/espressif/esp_softap.h b/components/esp8266/include/esp_softap.h
similarity index 100%
rename from components/esp8266/include/espressif/esp_softap.h
rename to components/esp8266/include/esp_softap.h
diff --git a/components/esp8266/include/espressif/esp_ssc.h b/components/esp8266/include/esp_ssc.h
similarity index 100%
rename from components/esp8266/include/espressif/esp_ssc.h
rename to components/esp8266/include/esp_ssc.h
diff --git a/components/esp8266/include/espressif/esp_sta.h b/components/esp8266/include/esp_sta.h
similarity index 100%
rename from components/esp8266/include/espressif/esp_sta.h
rename to components/esp8266/include/esp_sta.h
diff --git a/components/esp8266/include/espressif/esp_system.h b/components/esp8266/include/esp_system.h
similarity index 100%
rename from components/esp8266/include/espressif/esp_system.h
rename to components/esp8266/include/esp_system.h
diff --git a/components/esp8266/include/espressif/esp_timer.h b/components/esp8266/include/esp_timer.h
similarity index 100%
rename from components/esp8266/include/espressif/esp_timer.h
rename to components/esp8266/include/esp_timer.h
diff --git a/components/esp8266/include/espressif/esp_wifi.h b/components/esp8266/include/esp_wifi.h
similarity index 100%
rename from components/esp8266/include/espressif/esp_wifi.h
rename to components/esp8266/include/esp_wifi.h
diff --git a/components/esp8266/include/espressif/esp_wps.h b/components/esp8266/include/esp_wps.h
similarity index 100%
rename from components/esp8266/include/espressif/esp_wps.h
rename to components/esp8266/include/esp_wps.h
diff --git a/components/esp8266/include/espressif/espconn.h b/components/esp8266/include/espconn.h
similarity index 100%
rename from components/esp8266/include/espressif/espconn.h
rename to components/esp8266/include/espconn.h
diff --git a/components/esp8266/include/espressif/espnow.h b/components/esp8266/include/espnow.h
similarity index 100%
rename from components/esp8266/include/espressif/espnow.h
rename to components/esp8266/include/espnow.h
diff --git a/components/esp8266/include/espressif/pwm.h b/components/esp8266/include/pwm.h
similarity index 100%
rename from components/esp8266/include/espressif/pwm.h
rename to components/esp8266/include/pwm.h
diff --git a/components/esp8266/include/espressif/queue.h b/components/esp8266/include/queue.h
similarity index 100%
rename from components/esp8266/include/espressif/queue.h
rename to components/esp8266/include/queue.h
diff --git a/components/esp8266/include/espressif/smartconfig.h b/components/esp8266/include/smartconfig.h
similarity index 100%
rename from components/esp8266/include/espressif/smartconfig.h
rename to components/esp8266/include/smartconfig.h
diff --git a/components/esp8266/include/espressif/spi_flash.h b/components/esp8266/include/spi_flash.h
similarity index 100%
rename from components/esp8266/include/espressif/spi_flash.h
rename to components/esp8266/include/spi_flash.h
diff --git a/components/esp8266/include/espressif/upgrade.h b/components/esp8266/include/upgrade.h
similarity index 100%
rename from components/esp8266/include/espressif/upgrade.h
rename to components/esp8266/include/upgrade.h
diff --git a/components/freertos/include/freertos/portmacro.h b/components/freertos/include/freertos/portmacro.h
index 3d693b9c..cf2f6e06 100644
--- a/components/freertos/include/freertos/portmacro.h
+++ b/components/freertos/include/freertos/portmacro.h
@@ -71,7 +71,7 @@ extern "C" {
 #endif
 
 #include "c_types.h"
-#include "espressif/esp_libc.h"
+#include "esp_libc.h"
 #include "esp8266/ets_sys.h"
 
 #include    <xtensa/xtruntime.h>
diff --git a/components/freertos/library/heap_5.c b/components/freertos/library/heap_5.c
index 55fc652c..74a9b72a 100644
--- a/components/freertos/library/heap_5.c
+++ b/components/freertos/library/heap_5.c
@@ -115,7 +115,7 @@ task.h is included from an application file. */
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 
-#include "espressif/esp8266/ets_sys.h"
+#include "esp8266/ets_sys.h"
 
 #undef MPU_WRAPPERS_INCLUDED_FROM_API_FILE