diff --git a/components/mqtt/component.mk b/components/mqtt/component.mk
deleted file mode 100644
index 19e4980..0000000
--- a/components/mqtt/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-COMPONENT_SUBMODULES += esp-mqtt
-COMPONENT_ADD_INCLUDEDIRS := esp-mqtt/include
-COMPONENT_SRCDIRS :=  esp-mqtt esp-mqtt/lib
-COMPONENT_PRIV_INCLUDEDIRS := esp-mqtt/lib/include
diff --git a/components/mqtt/test/component.mk b/components/mqtt/test/component.mk
deleted file mode 100644
index 8c6eb51..0000000
--- a/components/mqtt/test/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-#Component Makefile
-#
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/examples/protocols/mqtt/ssl/Makefile b/examples/protocols/mqtt/ssl/Makefile
deleted file mode 100644
index efe7f7d..0000000
--- a/examples/protocols/mqtt/ssl/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-PROJECT_NAME := mqtt_ssl
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/mqtt/ssl/main/component.mk b/examples/protocols/mqtt/ssl/main/component.mk
deleted file mode 100644
index c0c0f87..0000000
--- a/examples/protocols/mqtt/ssl/main/component.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMPONENT_EMBED_TXTFILES := mqtt_eclipseprojects_io.pem
diff --git a/examples/protocols/mqtt/ssl_mutual_auth/Makefile b/examples/protocols/mqtt/ssl_mutual_auth/Makefile
deleted file mode 100644
index 1394f99..0000000
--- a/examples/protocols/mqtt/ssl_mutual_auth/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-PROJECT_NAME := mqtt_ssl_mutual_auth
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/mqtt/ssl_mutual_auth/main/component.mk b/examples/protocols/mqtt/ssl_mutual_auth/main/component.mk
deleted file mode 100644
index aaed44c..0000000
--- a/examples/protocols/mqtt/ssl_mutual_auth/main/component.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMPONENT_EMBED_TXTFILES := client.crt client.key mosquitto.org.crt
diff --git a/examples/protocols/mqtt/ssl_psk/Makefile b/examples/protocols/mqtt/ssl_psk/Makefile
deleted file mode 100644
index 24bec17..0000000
--- a/examples/protocols/mqtt/ssl_psk/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-PROJECT_NAME := mqtt_ssl_psk
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/mqtt/ssl_psk/main/component.mk b/examples/protocols/mqtt/ssl_psk/main/component.mk
deleted file mode 100644
index e69de29..0000000
diff --git a/examples/protocols/mqtt/tcp/Makefile b/examples/protocols/mqtt/tcp/Makefile
deleted file mode 100644
index 5302765..0000000
--- a/examples/protocols/mqtt/tcp/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-PROJECT_NAME := mqtt_tcp
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/mqtt/tcp/main/component.mk b/examples/protocols/mqtt/tcp/main/component.mk
deleted file mode 100644
index e69de29..0000000
diff --git a/examples/protocols/mqtt/ws/Makefile b/examples/protocols/mqtt/ws/Makefile
deleted file mode 100644
index 2b97fa4..0000000
--- a/examples/protocols/mqtt/ws/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-PROJECT_NAME := mqtt_websocket
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/mqtt/ws/main/component.mk b/examples/protocols/mqtt/ws/main/component.mk
deleted file mode 100644
index e69de29..0000000
diff --git a/examples/protocols/mqtt/wss/Makefile b/examples/protocols/mqtt/wss/Makefile
deleted file mode 100644
index 50ed13d..0000000
--- a/examples/protocols/mqtt/wss/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-PROJECT_NAME := mqtt_websocket_secure
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/mqtt/wss/main/component.mk b/examples/protocols/mqtt/wss/main/component.mk
deleted file mode 100644
index c0c0f87..0000000
--- a/examples/protocols/mqtt/wss/main/component.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMPONENT_EMBED_TXTFILES := mqtt_eclipseprojects_io.pem
diff --git a/tools/test_apps/protocols/mqtt/publish_connect_test/Makefile b/tools/test_apps/protocols/mqtt/publish_connect_test/Makefile
deleted file mode 100644
index 49c193d..0000000
--- a/tools/test_apps/protocols/mqtt/publish_connect_test/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-PROJECT_NAME := mqtt_publish_connect_test
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/tools/test_apps/protocols/mqtt/publish_connect_test/main/component.mk b/tools/test_apps/protocols/mqtt/publish_connect_test/main/component.mk
deleted file mode 100644
index ba6d986..0000000
--- a/tools/test_apps/protocols/mqtt/publish_connect_test/main/component.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMPONENT_EMBED_TXTFILES := mqtt_eclipse_org.pem ../ca.crt ../ca.der ../client_pwd.key ../client_pwd.crt ../client_no_pwd.key ../client_inv.crt