diff --git a/components/mosquitto/CMakeLists.txt b/components/mosquitto/CMakeLists.txt
index 1db843ec19..47e5d551d9 100644
--- a/components/mosquitto/CMakeLists.txt
+++ b/components/mosquitto/CMakeLists.txt
@@ -81,7 +81,8 @@ idf_component_register(SRCS ${m_srcs}
                     PRIV_INCLUDE_DIRS port/priv_include port/priv_include/sys ${m_dir} ${m_src_dir}
                                       ${m_incl_dir} ${m_lib_dir} ${m_deps_dir}
                     INCLUDE_DIRS ${m_incl_dir} port/include
-                    PRIV_REQUIRES newlib esp-tls
+                    REQUIRES esp-tls
+                    PRIV_REQUIRES newlib
         )
 
 target_compile_definitions(${COMPONENT_LIB} PRIVATE "WITH_BROKER")
diff --git a/components/mosquitto/examples/serverless_mqtt/main/CMakeLists.txt b/components/mosquitto/examples/serverless_mqtt/main/CMakeLists.txt
index 2c0b16ca5f..b757b72863 100644
--- a/components/mosquitto/examples/serverless_mqtt/main/CMakeLists.txt
+++ b/components/mosquitto/examples/serverless_mqtt/main/CMakeLists.txt
@@ -2,11 +2,3 @@ idf_component_register(SRCS "serverless_mqtt.c"
                             "wifi_connect.c"
                     INCLUDE_DIRS "."
                     REQUIRES libjuice nvs_flash mqtt json esp_wifi)
-
-if(PEER1)
-    target_compile_definitions(${COMPONENT_LIB} PRIVATE "PEER1")
-elseif(PEER2)
-    target_compile_definitions(${COMPONENT_LIB} PRIVATE "PEER2")
-else()
-    message(FATAL_ERROR "Please define either PEER1 or PEER2")
-endif()