diff --git a/components/base_nodemcu/component.mk b/components/base_nodemcu/component.mk
index 9768464b..f563c84b 100644
--- a/components/base_nodemcu/component.mk
+++ b/components/base_nodemcu/component.mk
@@ -1,6 +1,4 @@
 COMPONENT_ADD_INCLUDEDIRS:=include
 # Note: It appears this component must come lexicographically before esp32
 # in order to get the -T arguments in the right order.
-COMPONENT_ADD_LDFLAGS:=-L $(abspath ld) -T nodemcu_core.ld -lbase_nodemcu
-
-include $(IDF_PATH)/make/component_common.mk
+COMPONENT_ADD_LDFLAGS:=-L $(COMPONENT_PATH)/ld -T nodemcu_core.ld -lbase_nodemcu
diff --git a/components/driver_console/component.mk b/components/driver_console/component.mk
index e5fac866..291db28d 100644
--- a/components/driver_console/component.mk
+++ b/components/driver_console/component.mk
@@ -1,3 +1 @@
 COMPONENT_ADD_INCLUDEDIRS:=include
-
-include $(IDF_PATH)/make/component_common.mk
diff --git a/components/fatfs/component.mk b/components/fatfs/component.mk
index 15f4160b..dfa02650 100644
--- a/components/fatfs/component.mk
+++ b/components/fatfs/component.mk
@@ -4,5 +4,3 @@ COMPONENT_OBJS:=diskio.o ff.o myfatfs.o option/unicode.o
 COMPONENT_ADD_INCLUDEDIRS:=.
 
 EXTRA_CFLAGS:=-imacros fatfs_prefix_lib.h
-
-include $(IDF_PATH)/make/component_common.mk
diff --git a/components/lua/component.mk b/components/lua/component.mk
index d6563b29..f50bec1f 100644
--- a/components/lua/component.mk
+++ b/components/lua/component.mk
@@ -1,3 +1 @@
 COMPONENT_ADD_INCLUDEDIRS:=.
-
-include $(IDF_PATH)/make/component_common.mk
diff --git a/components/modules/component.mk b/components/modules/component.mk
index f816862b..50f15b44 100644
--- a/components/modules/component.mk
+++ b/components/modules/component.mk
@@ -15,5 +15,3 @@ CFLAGS += \
 	-Werror=unused-function \
 	-Werror=unused-but-set-variable \
 	-Werror=unused-variable \
-
-include $(IDF_PATH)/make/component_common.mk
diff --git a/components/platform/component.mk b/components/platform/component.mk
index e5fac866..291db28d 100644
--- a/components/platform/component.mk
+++ b/components/platform/component.mk
@@ -1,3 +1 @@
 COMPONENT_ADD_INCLUDEDIRS:=include
-
-include $(IDF_PATH)/make/component_common.mk
diff --git a/components/platform/flash_api.c b/components/platform/flash_api.c
index c9814308..8c2cb16b 100644
--- a/components/platform/flash_api.c
+++ b/components/platform/flash_api.c
@@ -9,7 +9,7 @@
 #include <stdlib.h>
 #include "rom/spi_flash.h"
 
-#include "esp_flash_data_types.h"
+#include "esp_image_format.h"
 
 #define FLASH_HDR_ADDR 0x1000
 
diff --git a/components/rtos_dbg/component.mk b/components/rtos_dbg/component.mk
index 44fde756..291db28d 100644
--- a/components/rtos_dbg/component.mk
+++ b/components/rtos_dbg/component.mk
@@ -1,2 +1 @@
 COMPONENT_ADD_INCLUDEDIRS:=include
-include $(IDF_PATH)/make/component_common.mk
diff --git a/components/spiffs/component.mk b/components/spiffs/component.mk
index 8ca59af4..b5823242 100644
--- a/components/spiffs/component.mk
+++ b/components/spiffs/component.mk
@@ -2,5 +2,3 @@ COMPONENT_ADD_INCLUDEDIRS:=.
 
 # TODO: clean up codebase to be sign clean...
 EXTRA_CFLAGS+=-Wno-error=pointer-sign
-
-include $(IDF_PATH)/make/component_common.mk
diff --git a/components/task/component.mk b/components/task/component.mk
index e5fac866..291db28d 100644
--- a/components/task/component.mk
+++ b/components/task/component.mk
@@ -1,3 +1 @@
 COMPONENT_ADD_INCLUDEDIRS:=include
-
-include $(IDF_PATH)/make/component_common.mk
diff --git a/sdk/esp32-esp-idf b/sdk/esp32-esp-idf
index eb067ce9..1b25795f 160000
--- a/sdk/esp32-esp-idf
+++ b/sdk/esp32-esp-idf
@@ -1 +1 @@
-Subproject commit eb067ce90827a31a1b01eac531767a17c55048c1
+Subproject commit 1b25795f5ddaadf5ae37e566645e019a5bcc3686