5 files changed, 65 insertions, 61 deletions
diff --git a/sources/pyside6/libpyside/CMakeLists.txt b/sources/pyside6/libpyside/CMakeLists.txt
index 56982ec0a..78bf24c80 100644
--- a/sources/pyside6/libpyside/CMakeLists.txt
+++ b/sources/pyside6/libpyside/CMakeLists.txt
@@ -5,6 +5,42 @@ project(libpyside)
 
 set(libpyside_libraries Qt::Core Qt::CorePrivate)
 
+set(libpyside_HEADERS # installed below
+    class_property.h
+    dynamicqmetaobject.h
+    feature_select.h
+    globalreceiverv2.h
+    pysideclassdecorator_p.h
+    pysideclassinfo.h
+    pysideclassinfo_p.h
+    pysidecleanup.h
+    pyside.h
+    pysideinit.h
+    pysidelogging_p.h
+    pysidemacros.h
+    pysidemetafunction.h
+    pysidemetafunction_p.h
+    pysidemetatype.h
+    pyside_numpy.h
+    pyside_p.h
+    pysideproperty.h
+    pysideproperty_p.h
+    pysideqapp.h
+    pysideqenum.h
+    pysideqflags.h
+    pysideqhash.h
+    pysideqmetatype.h
+    pysideqobject.h
+    pysidesignal.h
+    pysidesignal_p.h
+    pysideslot_p.h
+    pysidestaticstrings.h
+    pysideutils.h
+    pysideweakref.h
+    qobjectconnect.h
+    signalmanager.h
+)
+
 set(libpyside_SRC
     class_property.cpp
     dynamicqmetaobject.cpp
@@ -24,6 +60,7 @@ set(libpyside_SRC
     pyside_numpy.cpp
     pysidestaticstrings.cpp
     qobjectconnect.cpp
+    ${libpyside_HEADERS}
 )
 
 qt6_add_resources(libpyside_SRC libpyside.qrc)
@@ -85,42 +122,6 @@ endif()
 # install stuff
 #
 
-set(libpyside_HEADERS
-    class_property.h
-    dynamicqmetaobject.h
-    feature_select.h
-    globalreceiverv2.h
-    pysideclassdecorator_p.h
-    pysideclassinfo.h
-    pysideclassinfo_p.h
-    pysidecleanup.h
-    pyside.h
-    pysideinit.h
-    pysidelogging_p.h
-    pysidemacros.h
-    pysidemetafunction.h
-    pysidemetafunction_p.h
-    pysidemetatype.h
-    pyside_numpy.h
-    pyside_p.h
-    pysideproperty.h
-    pysideproperty_p.h
-    pysideqapp.h
-    pysideqenum.h
-    pysideqflags.h
-    pysideqhash.h
-    pysideqmetatype.h
-    pysideqobject.h
-    pysidesignal.h
-    pysidesignal_p.h
-    pysideslot_p.h
-    pysidestaticstrings.h
-    pysideutils.h
-    pysideweakref.h
-    qobjectconnect.h
-    signalmanager.h
-)
-
 if (CMAKE_BUILD_TYPE STREQUAL "Debug")
     set(LIBRARY_OUTPUT_SUFFIX ${CMAKE_DEBUG_POSTFIX})
 else()
diff --git a/sources/pyside6/libpysideqml/CMakeLists.txt b/sources/pyside6/libpysideqml/CMakeLists.txt
index e13b81171..d3844f043 100644
--- a/sources/pyside6/libpysideqml/CMakeLists.txt
+++ b/sources/pyside6/libpysideqml/CMakeLists.txt
@@ -3,6 +3,22 @@
 
 set(libpysideqml_libraries Qt::Core Qt::CorePrivate Qt::Qml Qt::QmlPrivate)
 
+set(libpysideqml_HEADERS # installed below
+    pysideqmlattached.h
+    pysideqmlattached_p.h
+    pysideqmlextended_p.h
+    pysideqmlforeign_p.h
+    pysideqml.h
+    pysideqmllistproperty_p.h
+    pysideqmlmacros.h
+    pysideqmlmetacallerror_p.h
+    pysideqmlnamedelement_p.h
+    pysideqmlregistertype.h
+    pysideqmlregistertype_p.h
+    pysideqmltypeinfo_p.h
+    pysideqmluncreatable.h
+)
+
 set(libpysideqml_SRC
     pysideqml.cpp
     pysideqmlattached.cpp
@@ -14,6 +30,7 @@ set(libpysideqml_SRC
     pysideqmlnamedelement.cpp
     pysideqmluncreatable.cpp
     pysideqmltypeinfo.cpp
+    ${libpysideqml_HEADERS}
 )
 
 # Hack for // https://github.com/python/cpython/issues/86286 causes issues
@@ -55,22 +72,6 @@ endif()
 # install stuff
 #
 
-set(libpysideqml_HEADERS
-    pysideqmlattached.h
-    pysideqmlattached_p.h
-    pysideqmlextended_p.h
-    pysideqmlforeign_p.h
-    pysideqml.h
-    pysideqmllistproperty_p.h
-    pysideqmlmacros.h
-    pysideqmlmetacallerror_p.h
-    pysideqmlnamedelement_p.h
-    pysideqmlregistertype.h
-    pysideqmlregistertype_p.h
-    pysideqmltypeinfo_p.h
-    pysideqmluncreatable.h
-)
-
 if (CMAKE_BUILD_TYPE STREQUAL "Debug")
     set(LIBRARY_OUTPUT_SUFFIX ${CMAKE_DEBUG_POSTFIX})
 else()
diff --git a/sources/pyside6/plugins/designer/CMakeLists.txt b/sources/pyside6/plugins/designer/CMakeLists.txt
index d5dd5d90d..570fee1fe 100644
--- a/sources/pyside6/plugins/designer/CMakeLists.txt
+++ b/sources/pyside6/plugins/designer/CMakeLists.txt
@@ -15,7 +15,7 @@ find_package(Qt6 COMPONENTS Core Gui Widgets UiPlugin)
 qt_add_plugin(PySidePlugin)
 
 target_sources(PySidePlugin PRIVATE
-    designercustomwidgets.cpp
+    designercustomwidgets.cpp designercustomwidgets.h
 )
 
 # See libshiboken/CMakeLists.txt
diff --git a/sources/pyside6/plugins/uitools/CMakeLists.txt b/sources/pyside6/plugins/uitools/CMakeLists.txt
index 9854dc586..06d0ae900 100644
--- a/sources/pyside6/plugins/uitools/CMakeLists.txt
+++ b/sources/pyside6/plugins/uitools/CMakeLists.txt
@@ -10,8 +10,8 @@ set(CMAKE_AUTOMOC ON)
 find_package(Qt6 COMPONENTS Core Gui Widgets UiPlugin)
 
 set(ui_plugin_src
-    customwidgets.cpp
-    customwidget.cpp
+    customwidgets.cpp customwidgets.h
+    customwidget.cpp customwidget.h
 )
 
 add_library(uiplugin STATIC ${ui_plugin_src})
diff --git a/sources/pyside6/tests/pysidetest/CMakeLists.txt b/sources/pyside6/tests/pysidetest/CMakeLists.txt
index 6d584831b..797b72c45 100644
--- a/sources/pyside6/tests/pysidetest/CMakeLists.txt
+++ b/sources/pyside6/tests/pysidetest/CMakeLists.txt
@@ -20,12 +20,14 @@ add_definitions(-DRXX_ALLOCATOR_INIT_0)
 find_package(Qt6 REQUIRED COMPONENTS Widgets)
 
 set(pysidetest_SRC
-containertest.cpp
-flagstest.cpp
-testobject.cpp
-testview.cpp
-hiddenobject.cpp
-sharedpointertestbench.cpp
+containertest.cpp containertest.h
+flagstest.cpp flagstest.h
+hiddenobject.cpp hiddenobject.h
+pysidetest_global.h
+pysidetest_macros.h
+sharedpointertestbench.cpp sharedpointertestbench.h
+testobject.cpp testobject.h
+testview.cpp testview.h
 )
 
 set(testbinding_SRC