diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 618393433e..99c0173a7e 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -13,24 +13,6 @@ if (HAVE_HFI_SECTION_INIT)
 	)
 endif()
 
-include_directories(
-		${BROTLI_INCLUDE_DIRS}
-		${GLIB2_INCLUDE_DIRS}
-		${CARES_INCLUDE_DIRS}
-		${GCRYPT_INCLUDE_DIRS}
-		${GTHREAD2_INCLUDE_DIRS}
-		${GNUTLS_INCLUDE_DIRS}
-		${KERBEROS_INCLUDE_DIRS}
-		${LUA_INCLUDE_DIRS}
-		${LZ4_INCLUDE_DIRS}
-		${NGHTTP2_INCLUDE_DIRS}
-		${SMI_INCLUDE_DIRS}
-		${SNAPPY_INCLUDE_DIRS}
-		${ZLIB_INCLUDE_DIRS}
-		${ZSTD_INCLUDE_DIRS}
-		${LIBXML2_INCLUDE_DIRS}
-)
-
 add_definitions(
 		${LIBXML2_DEFINITIONS}
 		${KERBEROS_DEFINITIONS}
@@ -41,6 +23,7 @@ add_subdirectory(dfilter)
 add_subdirectory(dissectors)
 add_subdirectory(ftypes)
 add_subdirectory(wmem)
+
 if(LUA_FOUND)
 	add_subdirectory(wslua)
 endif()
@@ -365,6 +348,20 @@ target_include_directories(epan
 
 target_include_directories(epan SYSTEM PUBLIC ${GLIB2_INCLUDE_DIRS})
 
+target_include_directories(epan
+	SYSTEM PRIVATE
+		${BROTLI_INCLUDE_DIRS}
+		${CARES_INCLUDE_DIRS}
+		${GLIB2_INCLUDE_DIRS}
+		${GNUTLS_INCLUDE_DIRS}
+		${GTHREAD2_INCLUDE_DIRS}
+		${LIBXML2_INCLUDE_DIRS}
+		${LUA_INCLUDE_DIRS}
+		${NGHTTP2_INCLUDE_DIRS}
+		${SMI_INCLUDE_DIRS}
+		${ZLIB_INCLUDE_DIRS}
+)
+
 add_dependencies(epan lemon)
 
 install(TARGETS epan
diff --git a/epan/crypt/CMakeLists.txt b/epan/crypt/CMakeLists.txt
index fdc9400022..23e36a89f8 100644
--- a/epan/crypt/CMakeLists.txt
+++ b/epan/crypt/CMakeLists.txt
@@ -60,6 +60,11 @@ add_library(crypt OBJECT
 	${CRYPT_FILES}
 )
 
+target_include_directories(crypt
+	SYSTEM PRIVATE
+		${GCRYPT_INCLUDE_DIRS}
+)
+
 set_target_properties(crypt PROPERTIES
 	FOLDER "Libs/epan/crypt"
 	COMPILE_DEFINITIONS "WS_BUILD_DLL"
diff --git a/epan/dissectors/CMakeLists.txt b/epan/dissectors/CMakeLists.txt
index 2479bb7936..c359167b9b 100644
--- a/epan/dissectors/CMakeLists.txt
+++ b/epan/dissectors/CMakeLists.txt
@@ -2052,6 +2052,20 @@ add_library(dissectors OBJECT
 	${DISSECTOR_SUPPORT_SRC}
 )
 
+target_include_directories(dissectors
+	SYSTEM PRIVATE
+		${GCRYPT_INCLUDE_DIRS}
+		${GNUTLS_INCLUDE_DIRS}
+		${KERBEROS_INCLUDE_DIRS}
+		${LIBXML2_INCLUDE_DIRS}
+		${LZ4_INCLUDE_DIRS}
+		${NGHTTP2_INCLUDE_DIRS}
+		${SMI_INCLUDE_DIRS}
+		${SNAPPY_INCLUDE_DIRS}
+		${ZLIB_INCLUDE_DIRS}
+		${ZSTD_INCLUDE_DIRS}
+)
+
 set_target_properties(dissectors PROPERTIES
 	FOLDER "Libs/epan/dissectors"
 	COMPILE_DEFINITIONS "WS_BUILD_DLL"
diff --git a/epan/wslua/CMakeLists.txt b/epan/wslua/CMakeLists.txt
index 2e7402fe74..7e365ad77f 100644
--- a/epan/wslua/CMakeLists.txt
+++ b/epan/wslua/CMakeLists.txt
@@ -146,6 +146,11 @@ add_library(wslua OBJECT
 	${WSLUA_FILES}
 )
 
+target_include_directories(wslua
+	SYSTEM PRIVATE
+		${LUA_INCLUDE_DIRS}
+)
+
 set_target_properties(wslua PROPERTIES
 	FOLDER "Libs/epan/wslua"
 	COMPILE_DEFINITIONS "WS_BUILD_DLL"
diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt
index fe1aa5cb16..d15cef5542 100644
--- a/ui/qt/CMakeLists.txt
+++ b/ui/qt/CMakeLists.txt
@@ -9,10 +9,6 @@
 
 ADD_CUSTOM_CMAKE_INCLUDE()
 
-include_directories(
-		${GCRYPT_INCLUDE_DIRS}
-)
-
 set(WIRESHARK_WIDGET_HEADERS
 	widgets/additional_toolbar.h
 	widgets/apply_line_edit.h
@@ -713,15 +709,16 @@ add_library(qtui OBJECT
 	wireshark-tap-register.c
 )
 
-target_include_directories(qtui SYSTEM
-	PUBLIC
+target_include_directories(qtui
+	SYSTEM PUBLIC
 		${QT_INCLUDE_DIRS}
 		${WINSPARKLE_INCLUDE_DIRS}
 		${SPEEXDSP_INCLUDE_DIRS}
-	PRIVATE
+	SYSTEM PRIVATE
 		# Can't use imported target, linking object libraries for usage requirements
 		# requires CMake 3.12
 		${PCAP_INCLUDE_DIRS}
+		${GCRYPT_INCLUDE_DIRS}
 )
 
 target_compile_definitions(qtui