diff --git a/components/esp32/test/component.mk b/components/esp32/test/component.mk
index 5e7d11ddf8..745f8cb796 100644
--- a/components/esp32/test/component.mk
+++ b/components/esp32/test/component.mk
@@ -8,8 +8,6 @@ COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-a
 
 COMPONENT_SRCDIRS := . test_vectors
 
-include $(IDF_PATH)/make/component_common.mk
-
 test_tjpgd.o: test_tjpgd_logo.h
 
 test_tjpgd_logo.h: $(COMPONENT_PATH)/logo.jpg
diff --git a/components/nghttp/Makefile b/components/nghttp/Makefile
deleted file mode 100644
index ec2514477b..0000000000
--- a/components/nghttp/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Component Makefile
-#
-# This Makefile should, at the very least, just include $(SDK_PATH)/Makefile. By default, 
-# this will take the sources in this directory, compile them and link them into 
-# lib(subdirectory_name).a in the build directory. This behaviour is entirely configurable,
-# please read the SDK documents if you need to do this.
-#
-COMPONENT_ADD_INCLUDEDIRS := port/include include
-
-COMPONENT_SRCDIRS := library port
-
-#EXTRA_CFLAGS += -DMBEDTLS_CONFIG_FILE='"mbedtls/esp_config.h"'
-
-EXTRA_CFLAGS := -Wno-error=address -Waddress -DHAVE_CONFIG_H
-
-include $(IDF_PATH)/make/component.mk
\ No newline at end of file
diff --git a/examples/bluetooth/blufi/main/component.mk b/examples/bluetooth/blufi/main/component.mk
index 79edf031d3..a98f634eae 100644
--- a/examples/bluetooth/blufi/main/component.mk
+++ b/examples/bluetooth/blufi/main/component.mk
@@ -1,8 +1,4 @@
 #
-# Main Makefile. This is basically the same as a component makefile.
-#
-# This Makefile should, at the very least, just include $(SDK_PATH)/make/component_common.mk. By default, 
-# this will take the sources in the src/ directory, compile them and link them into 
-# lib(subdirectory_name).a in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
+# "main" pseudo-component makefile.
 #
+# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/gatt_client/main/component.mk b/examples/bluetooth/gatt_client/main/component.mk
index afcb917c60..a98f634eae 100644
--- a/examples/bluetooth/gatt_client/main/component.mk
+++ b/examples/bluetooth/gatt_client/main/component.mk
@@ -1,10 +1,4 @@
 #
-# Main Makefile. This is basically the same as a component makefile.
+# "main" pseudo-component makefile.
 #
-# This Makefile should, at the very least, just include $(SDK_PATH)/make/component_common.mk. By default, 
-# this will take the sources in the src/ directory, compile them and link them into 
-# lib(subdirectory_name).a in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
-#
-
-#include $(IDF_PATH)/make/component_common.mk
+# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/gatt_server/main/component.mk b/examples/bluetooth/gatt_server/main/component.mk
index 79edf031d3..a98f634eae 100644
--- a/examples/bluetooth/gatt_server/main/component.mk
+++ b/examples/bluetooth/gatt_server/main/component.mk
@@ -1,8 +1,4 @@
 #
-# Main Makefile. This is basically the same as a component makefile.
-#
-# This Makefile should, at the very least, just include $(SDK_PATH)/make/component_common.mk. By default, 
-# this will take the sources in the src/ directory, compile them and link them into 
-# lib(subdirectory_name).a in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
+# "main" pseudo-component makefile.
 #
+# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/gatt_server_service_table/main/component.mk b/examples/bluetooth/gatt_server_service_table/main/component.mk
index 79edf031d3..a98f634eae 100644
--- a/examples/bluetooth/gatt_server_service_table/main/component.mk
+++ b/examples/bluetooth/gatt_server_service_table/main/component.mk
@@ -1,8 +1,4 @@
 #
-# Main Makefile. This is basically the same as a component makefile.
-#
-# This Makefile should, at the very least, just include $(SDK_PATH)/make/component_common.mk. By default, 
-# this will take the sources in the src/ directory, compile them and link them into 
-# lib(subdirectory_name).a in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
+# "main" pseudo-component makefile.
 #
+# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/peripherals/i2s/main/component.mk b/examples/peripherals/i2s/main/component.mk
index dbc5a7a9e7..9706df8e67 100644
--- a/examples/peripherals/i2s/main/component.mk
+++ b/examples/peripherals/i2s/main/component.mk
@@ -1,10 +1,6 @@
 #
-# Main Makefile. This is basically the same as a component makefile.
-#
-# This Makefile should, at the very least, just include $(SDK_PATH)/make/component.mk. By default,
-# this will take the sources in the src/ directory, compile them and link them into
-# lib(subdirectory_name).a in the build directory. This behaviour is entirely configurable,
-# please read the SDK documents if you need to do this.
+# "main" pseudo-component makefile.
 #
+# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
 
 COMPONENT_ADD_INCLUDEDIRS := .