diff --git a/apps/mosquitto_ctrl/CMakeLists.txt b/apps/mosquitto_ctrl/CMakeLists.txt
index d3629a79..19d55714 100644
--- a/apps/mosquitto_ctrl/CMakeLists.txt
+++ b/apps/mosquitto_ctrl/CMakeLists.txt
@@ -17,16 +17,11 @@ if(WITH_TLS AND CJSON_FOUND)
 	)
 
 	target_include_directories(mosquitto_ctrl PRIVATE
-		"${STDBOOL_H_PATH}"
-		"${STDINT_H_PATH}"
 		"${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/apps/mosquitto_passwd/CMakeLists.txt b/apps/mosquitto_passwd/CMakeLists.txt
index baa0bc4c..70432e9c 100644
--- a/apps/mosquitto_passwd/CMakeLists.txt
+++ b/apps/mosquitto_passwd/CMakeLists.txt
@@ -10,8 +10,6 @@ if(WITH_TLS)
 	)
 
 	target_include_directories(mosquitto_passwd PRIVATE
-		"${STDBOOL_H_PATH}"
-		"${STDINT_H_PATH}"
 		"${mosquitto_SOURCE_DIR}"
 		"${mosquitto_SOURCE_DIR}/common"
 		"${mosquitto_SOURCE_DIR}/include"
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 113fe66e..a7bce15e 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -1,16 +1,11 @@
 set(shared_src client_shared.c client_shared.h client_props.c)
 
-set(CLIENT_INC
-	"${OPENSSL_INCLUDE_DIR}"
-	"${STDBOOL_H_PATH}"
-	"${STDINT_H_PATH}"
-	"${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_include_directories(client-common INTERFACE
+	"${OPENSSL_INCLUDE_DIR}"
+	"${mosquitto_SOURCE_DIR}"
+)
 target_sources(client-common INTERFACE ${shared_src})
 
 if(WITH_SRV)
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index a33fbaa4..5f81d2ea 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -108,12 +108,10 @@ endif()
 target_include_directories(libmosquitto
 	PUBLIC
 		"${mosquitto_SOURCE_DIR}/include"
+		"${mosquitto_SOURCE_DIR}/lib"
 	PRIVATE
-		"${STDBOOL_H_PATH}"
-		"${STDINT_H_PATH}"
 		"${mosquitto_SOURCE_DIR}"
 		"${mosquitto_SOURCE_DIR}/common"
-		"${mosquitto_SOURCE_DIR}/lib"
 )
 
 if(WITH_BUNDLED_DEPS)
@@ -155,8 +153,6 @@ if(WITH_STATIC_LIBRARIES)
 	target_link_libraries(libmosquitto_static PRIVATE ${LIBRARIES})
 
 	target_include_directories(libmosquitto_static PRIVATE
-		"${STDBOOL_H_PATH}"
-		"${STDINT_H_PATH}"
 		"${mosquitto_SOURCE_DIR}"
 		"${mosquitto_SOURCE_DIR}/include"
 		"${mosquitto_SOURCE_DIR}/lib"
diff --git a/lib/cpp/CMakeLists.txt b/lib/cpp/CMakeLists.txt
index 51359ed2..4b404588 100644
--- a/lib/cpp/CMakeLists.txt
+++ b/lib/cpp/CMakeLists.txt
@@ -10,15 +10,13 @@ set_target_properties(mosquittopp PROPERTIES
 
 target_include_directories(mosquittopp
 	PUBLIC
-		"${mosquitto_SOURCE_DIR}/include"
-	PRIVATE
-		"${STDBOOL_H_PATH}"
-		"${STDINT_H_PATH}"
-		"${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)
@@ -49,8 +47,6 @@ if(WITH_STATIC_LIBRARIES)
 	endif()
 
 	target_include_directories(mosquittopp_static PRIVATE
-		"${STDBOOL_H_PATH}"
-		"${STDINT_H_PATH}"
 		"${mosquitto_SOURCE_DIR}/include"
 		"${mosquitto_SOURCE_DIR}/lib"
 		"${mosquitto_SOURCE_DIR}/lib/cpp"
diff --git a/plugins/dynamic-security/CMakeLists.txt b/plugins/dynamic-security/CMakeLists.txt
index 163e48b4..ef40fd11 100644
--- a/plugins/dynamic-security/CMakeLists.txt
+++ b/plugins/dynamic-security/CMakeLists.txt
@@ -1,8 +1,6 @@
 if(CJSON_FOUND AND WITH_TLS)
 	set(CLIENT_INC
 		"${CJSON_INCLUDE_DIRS}"
-		"${STDBOOL_H_PATH}"
-		"${STDINT_H_PATH}"
 		"${mosquitto_SOURCE_DIR}"
 		"${mosquitto_SOURCE_DIR}/common"
 		"${mosquitto_SOURCE_DIR}/deps"
diff --git a/plugins/examples/add-properties/CMakeLists.txt b/plugins/examples/add-properties/CMakeLists.txt
index 3f6c689b..78a11d1a 100644
--- a/plugins/examples/add-properties/CMakeLists.txt
+++ b/plugins/examples/add-properties/CMakeLists.txt
@@ -5,8 +5,6 @@ add_library(${PLUGIN_NAME} MODULE
 )
 
 target_include_directories(${PLUGIN_NAME} PRIVATE
-	"${STDBOOL_H_PATH}"
-	"${STDINT_H_PATH}"
 	"${mosquitto_SOURCE_DIR}/include"
 )
 
diff --git a/plugins/examples/auth-by-ip/CMakeLists.txt b/plugins/examples/auth-by-ip/CMakeLists.txt
index 340c2429..f0f6d22e 100644
--- a/plugins/examples/auth-by-ip/CMakeLists.txt
+++ b/plugins/examples/auth-by-ip/CMakeLists.txt
@@ -6,7 +6,6 @@ add_library(${PLUGIN_NAME} MODULE
 
 target_include_directories(${PLUGIN_NAME} PRIVATE
 	"${OPENSSL_INCLUDE_DIR}"
-	"${STDBOOL_H_PATH} ${STDINT_H_PATH}"
 	"${mosquitto_SOURCE_DIR}"
 	"${mosquitto_SOURCE_DIR}/include"
 )
diff --git a/plugins/examples/client-lifetime-stats/CMakeLists.txt b/plugins/examples/client-lifetime-stats/CMakeLists.txt
index bfd43fef..663cb6e1 100644
--- a/plugins/examples/client-lifetime-stats/CMakeLists.txt
+++ b/plugins/examples/client-lifetime-stats/CMakeLists.txt
@@ -5,8 +5,6 @@ add_library(${PLUGIN_NAME} MODULE
 )
 
 target_include_directories(${PLUGIN_NAME} PRIVATE
-	"${STDBOOL_H_PATH}"
-	"${STDINT_H_PATH}"
 	"${mosquitto_SOURCE_DIR}/deps"
 	"${mosquitto_SOURCE_DIR}/include"
 )
diff --git a/plugins/examples/client-properties/CMakeLists.txt b/plugins/examples/client-properties/CMakeLists.txt
index 7b262bff..b58cb806 100644
--- a/plugins/examples/client-properties/CMakeLists.txt
+++ b/plugins/examples/client-properties/CMakeLists.txt
@@ -5,8 +5,6 @@ add_library(${PLUGIN_NAME} MODULE
 )
 
 target_include_directories(${PLUGIN_NAME} PRIVATE
-	"${STDBOOL_H_PATH}"
-	"${STDINT_H_PATH}"
 	"${mosquitto_SOURCE_DIR}"
 	"${mosquitto_SOURCE_DIR}/include"
 )
diff --git a/plugins/examples/connection-state/CMakeLists.txt b/plugins/examples/connection-state/CMakeLists.txt
index 3a6f4996..c1e98b0e 100644
--- a/plugins/examples/connection-state/CMakeLists.txt
+++ b/plugins/examples/connection-state/CMakeLists.txt
@@ -5,8 +5,6 @@ add_library(${PLUGIN_NAME} MODULE
 )
 
 target_include_directories(${PLUGIN_NAME} PRIVATE
-	"${STDBOOL_H_PATH}"
-	"${STDINT_H_PATH}"
 	"${mosquitto_SOURCE_DIR}"
 	"${mosquitto_SOURCE_DIR}/include"
 )
diff --git a/plugins/examples/delayed-auth/CMakeLists.txt b/plugins/examples/delayed-auth/CMakeLists.txt
index 903db900..03773a36 100644
--- a/plugins/examples/delayed-auth/CMakeLists.txt
+++ b/plugins/examples/delayed-auth/CMakeLists.txt
@@ -5,8 +5,6 @@ add_library(${PLUGIN_NAME} MODULE
 )
 
 target_include_directories(${PLUGIN_NAME} PRIVATE
-	"${STDBOOL_H_PATH}"
-	"${STDINT_H_PATH}"
 	"${mosquitto_SOURCE_DIR}"
 	"${mosquitto_SOURCE_DIR}/include"
 )
diff --git a/plugins/examples/force-retain/CMakeLists.txt b/plugins/examples/force-retain/CMakeLists.txt
index d4d872ef..13c4826e 100644
--- a/plugins/examples/force-retain/CMakeLists.txt
+++ b/plugins/examples/force-retain/CMakeLists.txt
@@ -6,8 +6,6 @@ add_library(${PLUGIN_NAME} MODULE
 
 target_include_directories(${PLUGIN_NAME} PRIVATE
 	"${OPENSSL_INCLUDE_DIR}"
-	"${STDBOOL_H_PATH}"
-	"${STDINT_H_PATH}"
 	"${mosquitto_SOURCE_DIR}"
 	"${mosquitto_SOURCE_DIR}/include"
 )
diff --git a/plugins/examples/message-timestamp/CMakeLists.txt b/plugins/examples/message-timestamp/CMakeLists.txt
index ad74d786..a212fd11 100644
--- a/plugins/examples/message-timestamp/CMakeLists.txt
+++ b/plugins/examples/message-timestamp/CMakeLists.txt
@@ -5,8 +5,6 @@ add_library(${PLUGIN_NAME} MODULE
 )
 
 target_include_directories(${PLUGIN_NAME} PRIVATE
-	"${STDBOOL_H_PATH}"
-	"${STDINT_H_PATH}"
 	"${mosquitto_SOURCE_DIR}/include"
 )
 
diff --git a/plugins/examples/payload-modification/CMakeLists.txt b/plugins/examples/payload-modification/CMakeLists.txt
index 0c9ad1c1..2530cf47 100644
--- a/plugins/examples/payload-modification/CMakeLists.txt
+++ b/plugins/examples/payload-modification/CMakeLists.txt
@@ -5,8 +5,6 @@ add_library(${PLUGIN_NAME} MODULE
 )
 
 target_include_directories(${PLUGIN_NAME} PRIVATE
-	"${STDBOOL_H_PATH}"
-	"${STDINT_H_PATH}"
 	"${mosquitto_SOURCE_DIR}"
 	"${mosquitto_SOURCE_DIR}/include"
 )
diff --git a/plugins/examples/payload-size-stats/CMakeLists.txt b/plugins/examples/payload-size-stats/CMakeLists.txt
index 32dd35da..49a07b1a 100644
--- a/plugins/examples/payload-size-stats/CMakeLists.txt
+++ b/plugins/examples/payload-size-stats/CMakeLists.txt
@@ -5,8 +5,6 @@ add_library(${PLUGIN_NAME} MODULE
 )
 
 target_include_directories(${PLUGIN_NAME} PRIVATE
-	"${STDBOOL_H_PATH}"
-	"${STDINT_H_PATH}"
 	"${mosquitto_SOURCE_DIR}/include"
 )
 
diff --git a/plugins/examples/plugin-event-stats/CMakeLists.txt b/plugins/examples/plugin-event-stats/CMakeLists.txt
index 316fde29..32c1c0e0 100644
--- a/plugins/examples/plugin-event-stats/CMakeLists.txt
+++ b/plugins/examples/plugin-event-stats/CMakeLists.txt
@@ -5,8 +5,6 @@ add_library(${PLUGIN_NAME} MODULE
 )
 
 target_include_directories(${PLUGIN_NAME} PRIVATE
-	"${STDBOOL_H_PATH}"
-	"${STDINT_H_PATH}"
 	"${mosquitto_SOURCE_DIR}/include"
 )
 
diff --git a/plugins/examples/print-ip-on-publish/CMakeLists.txt b/plugins/examples/print-ip-on-publish/CMakeLists.txt
index 2b01eb3e..23175017 100644
--- a/plugins/examples/print-ip-on-publish/CMakeLists.txt
+++ b/plugins/examples/print-ip-on-publish/CMakeLists.txt
@@ -5,8 +5,6 @@ add_library(${PLUGIN_NAME} MODULE
 )
 
 target_include_directories(${PLUGIN_NAME} PRIVATE
-	"${STDBOOL_H_PATH}"
-	"${STDINT_H_PATH}"
 	"${mosquitto_SOURCE_DIR}/include"
 )
 
diff --git a/plugins/examples/topic-modification/CMakeLists.txt b/plugins/examples/topic-modification/CMakeLists.txt
index 1063ddee..a95b1d45 100644
--- a/plugins/examples/topic-modification/CMakeLists.txt
+++ b/plugins/examples/topic-modification/CMakeLists.txt
@@ -5,8 +5,6 @@ add_library(${PLUGIN_NAME} MODULE
 )
 
 target_include_directories(${PLUGIN_NAME} PRIVATE
-	"${STDBOOL_H_PATH}"
-	"${STDINT_H_PATH}"
 	"${mosquitto_SOURCE_DIR}"
 	"${mosquitto_SOURCE_DIR}/include"
 )
diff --git a/plugins/examples/wildcard-temp/CMakeLists.txt b/plugins/examples/wildcard-temp/CMakeLists.txt
index ff41a8a8..447e2583 100644
--- a/plugins/examples/wildcard-temp/CMakeLists.txt
+++ b/plugins/examples/wildcard-temp/CMakeLists.txt
@@ -5,8 +5,6 @@ add_library(${PLUGIN_NAME} MODULE
 )
 
 target_include_directories(${PLUGIN_NAME} PRIVATE
-	"${STDBOOL_H_PATH}"
-	"${STDINT_H_PATH}"
 	"${mosquitto_SOURCE_DIR}"
 	"${mosquitto_SOURCE_DIR}/deps"
 	"${mosquitto_SOURCE_DIR}/include"
diff --git a/plugins/persist-sqlite/CMakeLists.txt b/plugins/persist-sqlite/CMakeLists.txt
index 7e0adb22..043bde32 100644
--- a/plugins/persist-sqlite/CMakeLists.txt
+++ b/plugins/persist-sqlite/CMakeLists.txt
@@ -1,7 +1,5 @@
 if(SQLITE3_FOUND AND CJSON_FOUND)
 	set(CLIENT_INC
-		"${STDBOOL_H_PATH}"
-		"${STDINT_H_PATH}"
 		"${mosquitto_SOURCE_DIR}/deps"
 		"${mosquitto_SOURCE_DIR}/include"
 		"${mosquitto_SOURCE_DIR}/src"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0138dc5a..ec44fbbf 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -228,8 +228,6 @@ target_include_directories(mosquitto
 	PUBLIC
 		"${mosquitto_SOURCE_DIR}/include"
 	PRIVATE
-		"${STDBOOL_H_PATH}"
-		"${STDINT_H_PATH}"
 		"${mosquitto_SOURCE_DIR}/common"
 		"${mosquitto_SOURCE_DIR}/lib"
 		"${mosquitto_SOURCE_DIR}/src"