diff --git a/CMakeLists.txt b/CMakeLists.txt
index 02a2bcc0e6..bced6c0932 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3766,6 +3766,8 @@ set(SHARK_PUBLIC_HEADERS
 
 install(FILES ${SHARK_PUBLIC_HEADERS}
 	DESTINATION ${PROJECT_INSTALL_INCLUDEDIR}
+	COMPONENT "Development"
+	EXCLUDE_FROM_ALL
 )
 
 # Install icons and other desktop files for Freedesktop.org-compliant desktops.
@@ -3824,6 +3826,9 @@ install(
 		"${CMAKE_BINARY_DIR}/wireshark.pc"
 	DESTINATION
 		${CMAKE_INSTALL_LIBDIR}/pkgconfig
+	COMPONENT
+		"Development"
+	EXCLUDE_FROM_ALL
 )
 
 install(
@@ -3875,10 +3880,15 @@ install(
 		${CMAKE_BINARY_DIR}/WiresharkConfigVersion.cmake
 	DESTINATION
 		${WIRESHARK_INSTALL_CMAKEDIR}
+	COMPONENT
+		"Development"
+	EXCLUDE_FROM_ALL
 )
 
 install(EXPORT WiresharkTargets
 	DESTINATION ${WIRESHARK_INSTALL_CMAKEDIR}
+	COMPONENT "Development"
+	EXCLUDE_FROM_ALL
 )
 
 if (DOXYGEN_EXECUTABLE)
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 1521795538..122b271b6c 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -390,6 +390,8 @@ install(TARGETS epan
 
 install(FILES ${LIBWIRESHARK_PUBLIC_HEADERS}
 	DESTINATION "${PROJECT_INSTALL_INCLUDEDIR}/epan"
+	COMPONENT "Development"
+	EXCLUDE_FROM_ALL
 )
 
 add_executable(exntest EXCLUDE_FROM_ALL exntest.c except.c)
diff --git a/epan/dfilter/CMakeLists.txt b/epan/dfilter/CMakeLists.txt
index 8b3e1bd052..c21129f5f4 100644
--- a/epan/dfilter/CMakeLists.txt
+++ b/epan/dfilter/CMakeLists.txt
@@ -93,6 +93,8 @@ set_target_properties(dfilter PROPERTIES
 
 install(FILES ${DFILTER_PUBLIC_HEADERS}
 	DESTINATION "${PROJECT_INSTALL_INCLUDEDIR}/epan/dfilter"
+	COMPONENT "Development"
+	EXCLUDE_FROM_ALL
 )
 
 CHECKAPI(
diff --git a/epan/dissectors/CMakeLists.txt b/epan/dissectors/CMakeLists.txt
index 37c51b9721..b6e3e3c89f 100644
--- a/epan/dissectors/CMakeLists.txt
+++ b/epan/dissectors/CMakeLists.txt
@@ -2188,6 +2188,8 @@ set_target_properties(dissectors PROPERTIES
 
 install(FILES ${DISSECTOR_PUBLIC_HEADERS}
 	DESTINATION "${PROJECT_INSTALL_INCLUDEDIR}/epan/dissectors"
+	COMPONENT "Development"
+	EXCLUDE_FROM_ALL
 )
 
 set(CHECKAPI_FILE_LIST "${CMAKE_CURRENT_BINARY_DIR}/files.txt")
diff --git a/epan/ftypes/CMakeLists.txt b/epan/ftypes/CMakeLists.txt
index 0346c1ccf2..b63b55e97d 100644
--- a/epan/ftypes/CMakeLists.txt
+++ b/epan/ftypes/CMakeLists.txt
@@ -59,6 +59,8 @@ set_target_properties(ftypes PROPERTIES
 
 install(FILES ${FTYPE_PUBLIC_HEADERS}
 	DESTINATION "${PROJECT_INSTALL_INCLUDEDIR}/epan/ftypes"
+	COMPONENT "Development"
+	EXCLUDE_FROM_ALL
 )
 
 CHECKAPI(
diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt
index 024ad4b784..1d1da81f53 100644
--- a/wiretap/CMakeLists.txt
+++ b/wiretap/CMakeLists.txt
@@ -211,6 +211,8 @@ install(TARGETS wiretap
 
 install(FILES ${WIRETAP_PUBLIC_HEADERS}
 	DESTINATION "${PROJECT_INSTALL_INCLUDEDIR}/wiretap"
+	COMPONENT "Development"
+	EXCLUDE_FROM_ALL
 )
 
 CHECKAPI(
diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
index 420ae5c179..53002eaa4d 100644
--- a/wsutil/CMakeLists.txt
+++ b/wsutil/CMakeLists.txt
@@ -342,6 +342,8 @@ set_target_properties(test_wsutil PROPERTIES
 
 install(FILES ${WSUTIL_PUBLIC_HEADERS}
 	DESTINATION "${PROJECT_INSTALL_INCLUDEDIR}/wsutil"
+	COMPONENT "Development"
+	EXCLUDE_FROM_ALL
 )
 
 CHECKAPI(
diff --git a/wsutil/wmem/CMakeLists.txt b/wsutil/wmem/CMakeLists.txt
index 7393b39f17..25909a4fa2 100644
--- a/wsutil/wmem/CMakeLists.txt
+++ b/wsutil/wmem/CMakeLists.txt
@@ -94,6 +94,8 @@ set_target_properties(wmem_test PROPERTIES
 
 install(FILES ${WMEM_PUBLIC_HEADERS}
 	DESTINATION "${PROJECT_INSTALL_INCLUDEDIR}/wsutil/wmem"
+	COMPONENT "Development"
+	EXCLUDE_FROM_ALL
 )
 
 CHECKAPI(