diff --git a/apps/mosquitto_ctrl/CMakeLists.txt b/apps/mosquitto_ctrl/CMakeLists.txt
index c44f53bb..19d55714 100644
--- a/apps/mosquitto_ctrl/CMakeLists.txt
+++ b/apps/mosquitto_ctrl/CMakeLists.txt
@@ -20,11 +20,8 @@ if(WITH_TLS AND CJSON_FOUND)
 		"${mosquitto_SOURCE_DIR}"
 		"${mosquitto_SOURCE_DIR}/apps/mosquitto_passwd"
 		"${mosquitto_SOURCE_DIR}/common"
-		"${mosquitto_SOURCE_DIR}/include"
-		"${mosquitto_SOURCE_DIR}/lib"
 		"${mosquitto_SOURCE_DIR}/plugins/common"
 		"${mosquitto_SOURCE_DIR}/plugins/dynamic-security"
-		"${mosquitto_SOURCE_DIR}/src"
 	)
 	if(WITH_BUNDLED_DEPS)
 		target_include_directories(mosquitto_ctrl PRIVATE
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 35930a20..a7bce15e 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -1,14 +1,11 @@
 set(shared_src client_shared.c client_shared.h client_props.c)
 
-set(CLIENT_INC
+add_library(client-common INTERFACE)
+target_link_libraries(client-common INTERFACE common-options)
+target_include_directories(client-common INTERFACE
 	"${OPENSSL_INCLUDE_DIR}"
 	"${mosquitto_SOURCE_DIR}"
-	"${mosquitto_SOURCE_DIR}/include"
 )
-
-add_library(client-common INTERFACE)
-target_link_libraries(client-common INTERFACE common-options)
-target_include_directories(client-common INTERFACE ${CLIENT_INC})
 target_sources(client-common INTERFACE ${shared_src})
 
 if(WITH_SRV)
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 0ee40291..5f81d2ea 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -108,10 +108,10 @@ endif()
 target_include_directories(libmosquitto
 	PUBLIC
 		"${mosquitto_SOURCE_DIR}/include"
+		"${mosquitto_SOURCE_DIR}/lib"
 	PRIVATE
 		"${mosquitto_SOURCE_DIR}"
 		"${mosquitto_SOURCE_DIR}/common"
-		"${mosquitto_SOURCE_DIR}/lib"
 )
 
 if(WITH_BUNDLED_DEPS)
diff --git a/lib/cpp/CMakeLists.txt b/lib/cpp/CMakeLists.txt
index e8a59f0e..4b404588 100644
--- a/lib/cpp/CMakeLists.txt
+++ b/lib/cpp/CMakeLists.txt
@@ -10,13 +10,13 @@ set_target_properties(mosquittopp PROPERTIES
 
 target_include_directories(mosquittopp
 	PUBLIC
-		"${mosquitto_SOURCE_DIR}/include"
-	PRIVATE
-		"${mosquitto_SOURCE_DIR}/lib"
 		"${mosquitto_SOURCE_DIR}/lib/cpp"
 )
 
-target_link_libraries(mosquittopp PRIVATE libmosquitto common-options)
+target_link_libraries(mosquittopp
+	PUBLIC libmosquitto
+	PRIVATE common-options
+)
 
 if (WITH_THREADING AND NOT WIN32)
 	set(THREADS_PREFER_PTHREAD_FLAG ON)