diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 8de478fa06..8c516f08b3 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -8,23 +8,40 @@
 #
 
 set(gammaray_clientlib_srcs
+    classesiconsrepositoryclient.cpp
+    classesiconsrepositoryclient.h
     client.cpp
-    remotemodel.cpp
-    selectionmodelclient.cpp
+    client.h
     clientconnectionmanager.cpp
-    propertycontrollerclient.cpp
-    probecontrollerclient.cpp
-    processtracker.cpp
-    toolmanagerclient.cpp
+    clientconnectionmanager.h
     clientdevice.cpp
-    tcpclientdevice.cpp
+    clientdevice.h
+    enumrepositoryclient.cpp
+    enumrepositoryclient.h
+    favoriteobjectclient.cpp
+    favoriteobjectclient.h
     localclientdevice.cpp
+    localclientdevice.h
     messagestatisticsmodel.cpp
+    messagestatisticsmodel.h
     paintanalyzerclient.cpp
+    paintanalyzerclient.h
+    probecontrollerclient.cpp
+    probecontrollerclient.h
+    processtracker.cpp
+    processtracker.h
+    propertycontrollerclient.cpp
+    propertycontrollerclient.h
+    remotemodel.cpp
+    remotemodel.h
     remoteviewclient.cpp
-    enumrepositoryclient.cpp
-    classesiconsrepositoryclient.cpp
-    favoriteobjectclient.cpp
+    remoteviewclient.h
+    selectionmodelclient.cpp
+    selectionmodelclient.h
+    tcpclientdevice.cpp
+    tcpclientdevice.h
+    toolmanagerclient.cpp
+    toolmanagerclient.h
     ${CMAKE_SOURCE_DIR}/resources/gammaray.qrc
 )
 
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 4bb9f23a37..e942cd02f0 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -31,28 +31,50 @@ set_target_properties(gammaray_lz4 PROPERTIES POSITION_INDEPENDENT_CODE ON)
 # Shared non-UI code between probe and client
 #
 set(gammaray_common_srcs
-    methodargument.cpp
-    objectbroker.cpp
-    protocol.cpp
-    message.cpp
+    classesiconsrepository.cpp
+    classesiconsrepository.h
+    commonutils.cpp
+    commonutils.h
     endpoint.cpp
-    paths.cpp
-    propertysyncer.cpp
+    endpoint.h
+    enumdefinition.cpp
+    enumdefinition.h
+    enumrepository.cpp
+    enumrepository.h
+    enumvalue.cpp
+    enumvalue.h
+    message.cpp
+    message.h
+    methodargument.cpp
+    methodargument.h
     modelevent.cpp
+    modelevent.h
     modelutils.cpp
+    modelutils.h
+    objectbroker.cpp
+    objectbroker.h
     objectidfilterproxymodel.cpp
+    objectidfilterproxymodel.h
     paintanalyzerinterface.cpp
+    paintanalyzerinterface.h
+    paths.cpp
+    paths.h
+    propertysyncer.cpp
+    propertysyncer.h
+    protocol.cpp
+    protocol.h
+    remoteviewframe.cpp
+    remoteviewframe.h
+    remoteviewinterface.cpp
+    remoteviewinterface.h
     selflocator.cpp
+    selflocator.h
     sourcelocation.cpp
-    translator.cpp
-    enumdefinition.cpp
-    enumrepository.cpp
-    enumvalue.cpp
-    classesiconsrepository.cpp
-    remoteviewinterface.cpp
-    remoteviewframe.cpp
+    sourcelocation.h
     transferimage.cpp
-    commonutils.cpp
+    transferimage.h
+    translator.cpp
+    translator.h
 )
 
 add_library(
@@ -86,22 +108,38 @@ if(GAMMARAY_USE_PCH)
 endif()
 
 set(gammaray_common_internal_srcs
+    favoriteobjectinterface.cpp
+    favoriteobjectinterface.h
+    networkselectionmodel.cpp
+    networkselectionmodel.h
     plugininfo.cpp
+    plugininfo.h
     pluginmanager.cpp
-    proxyfactorybase.cpp
-    propertycontrollerinterface.cpp
+    pluginmanager.h
     probecontrollerinterface.cpp
-    toolmanagerinterface.cpp
-    networkselectionmodel.cpp
+    probecontrollerinterface.h
+    propertycontrollerinterface.cpp
+    propertycontrollerinterface.h
+    proxyfactorybase.cpp
+    proxyfactorybase.h
     streamoperators.cpp
-    favoriteobjectinterface.cpp
-    tools/objectinspector/propertiesextensioninterface.cpp
-    tools/objectinspector/methodsextensioninterface.cpp
-    tools/objectinspector/connectionsextensioninterface.cpp
+    streamoperators.h
+    toolmanagerinterface.cpp
+    toolmanagerinterface.h
     tools/messagehandler/messagehandlerinterface.cpp
+    tools/messagehandler/messagehandlerinterface.h
     tools/metatypebrowser/metatypebrowserinterface.cpp
+    tools/metatypebrowser/metatypebrowserinterface.h
+    tools/objectinspector/connectionsextensioninterface.cpp
+    tools/objectinspector/connectionsextensioninterface.h
+    tools/objectinspector/methodsextensioninterface.cpp
+    tools/objectinspector/methodsextensioninterface.h
+    tools/objectinspector/propertiesextensioninterface.cpp
+    tools/objectinspector/propertiesextensioninterface.h
     tools/problemreporter/problemreporterinterface.cpp
+    tools/problemreporter/problemreporterinterface.h
     tools/resourcebrowser/resourcebrowserinterface.cpp
+    tools/resourcebrowser/resourcebrowserinterface.h
 )
 
 add_library(
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index eefa4ce792..b1d7ea850c 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -10,94 +10,183 @@
 set(gammaray_srcs
     ${CMAKE_SOURCE_DIR}/3rdparty/qt/resourcemodel.cpp
     abstractbindingprovider.cpp
+    abstractbindingprovider.h
     aggregatedpropertymodel.cpp
+    aggregatedpropertymodel.h
+    associativepropertyadaptor.cpp
+    associativepropertyadaptor.h
+    attributemodel.cpp
+    attributemodel.h
     bindingaggregator.cpp
+    bindingaggregator.h
     bindingnode.cpp
+    bindingnode.h
+    classesiconsrepositoryserver.cpp
+    classesiconsrepositoryserver.h
+    dynamicpropertyadaptor.cpp
+    dynamicpropertyadaptor.h
+    enumrepositoryserver.cpp
+    enumrepositoryserver.h
+    enumutil.cpp
+    enumutil.h
+    execution.cpp
+    execution.h
+    favoriteobject.cpp
+    favoriteobject.h
+    jsonpropertyadaptor.cpp
+    jsonpropertyadaptor.h
     metaobject.cpp
+    metaobject.h
     metaobjectregistry.cpp
+    metaobjectregistry.h
     metaobjectrepository.cpp
+    metaobjectrepository.h
     metaproperty.cpp
-    probe.cpp
-    probeguard.cpp
-    probesettings.cpp
-    probecontroller.cpp
-    objectlistmodel.cpp
+    metaproperty.h
+    metapropertyadaptor.cpp
+    metapropertyadaptor.h
+    methodargumentmodel.cpp
+    methodargumentmodel.h
+    multisignalmapper.cpp
+    multisignalmapper.h
     objectclassinfomodel.cpp
-    objectmethodmodel.cpp
+    objectclassinfomodel.h
+    objectdataprovider.cpp
+    objectdataprovider.h
     objectenummodel.cpp
+    objectenummodel.h
+    objectinstance.cpp
+    objectinstance.h
+    objectlistmodel.cpp
+    objectlistmodel.h
+    objectmethodmodel.cpp
+    objectmethodmodel.h
     objecttreemodel.cpp
+    objecttreemodel.h
     objecttypefilterproxymodel.cpp
+    objecttypefilterproxymodel.h
+    paintanalyzer.cpp
+    paintanalyzer.h
+    paintbuffer.cpp
+    paintbuffer.h
+    paintbuffermodel.cpp
+    paintbuffermodel.h
+    painterprofilingreplayer.cpp
+    painterprofilingreplayer.h
+    probe.cpp
+    probe.h
+    probecontroller.cpp
+    probecontroller.h
+    probeguard.cpp
+    probeguard.h
+    probesettings.cpp
+    probesettings.h
     problemcollector.cpp
-    methodargumentmodel.cpp
-    multisignalmapper.cpp
-    signalspycallbackset.cpp
-    singlecolumnobjectproxymodel.cpp
-    stacktracemodel.cpp
-    toolfactory.cpp
-    toolmanager.cpp
-    toolpluginmodel.cpp
-    toolpluginerrormodel.cpp
-    propertycontroller.cpp
-    propertycontrollerextension.cpp
-    proxytoolfactory.cpp
-    util.cpp
-    varianthandler.cpp
-    objectdataprovider.cpp
-    attributemodel.cpp
-    qmetaobjectvalidator.cpp
-    enumrepositoryserver.cpp
-    enumutil.cpp
-    execution.cpp
-    classesiconsrepositoryserver.cpp
-    favoriteobject.cpp
+    problemcollector.h
     propertyadaptor.cpp
+    propertyadaptor.h
+    propertyadaptorfactory.cpp
+    propertyadaptorfactory.h
     propertyaggregator.cpp
+    propertyaggregator.h
+    propertycontroller.cpp
+    propertycontroller.h
+    propertycontrollerextension.cpp
+    propertycontrollerextension.h
     propertydata.cpp
+    propertydata.h
     propertyfilter.cpp
-    dynamicpropertyadaptor.cpp
+    propertyfilter.h
+    proxytoolfactory.cpp
+    proxytoolfactory.h
+    qmetaobjectvalidator.cpp
+    qmetaobjectvalidator.h
     qmetapropertyadaptor.cpp
-    metapropertyadaptor.cpp
-    associativepropertyadaptor.cpp
-    sequentialpropertyadaptor.cpp
-    objectinstance.cpp
-    propertyadaptorfactory.cpp
-    jsonpropertyadaptor.cpp
-    paintbuffer.cpp
-    paintbuffermodel.cpp
-    paintanalyzer.cpp
-    painterprofilingreplayer.cpp
+    qmetapropertyadaptor.h
+    remote/localserverdevice.cpp
+    remote/localserverdevice.h
+    remote/remotemodelserver.cpp
+    remote/remotemodelserver.h
+    remote/selectionmodelserver.cpp
+    remote/selectionmodelserver.h
+    remote/server.cpp
+    remote/server.h
+    remote/serverdevice.cpp
+    remote/serverdevice.h
+    remote/serverproxymodel.cpp
+    remote/serverproxymodel.h
+    remote/tcpserverdevice.cpp
+    remote/tcpserverdevice.h
     remoteviewserver.cpp
-    tools/metatypebrowser/metatypesmodel.cpp
+    remoteviewserver.h
+    sequentialpropertyadaptor.cpp
+    sequentialpropertyadaptor.h
+    signalspycallbackset.cpp
+    signalspycallbackset.h
+    singlecolumnobjectproxymodel.cpp
+    singlecolumnobjectproxymodel.h
+    stacktracemodel.cpp
+    stacktracemodel.h
+    toolfactory.cpp
+    toolfactory.h
+    toolmanager.cpp
+    toolmanager.h
+    toolpluginerrormodel.cpp
+    toolpluginerrormodel.h
+    toolpluginmodel.cpp
+    toolpluginmodel.h
     tools/messagehandler/messagehandler.cpp
+    tools/messagehandler/messagehandler.h
     tools/messagehandler/messagemodel.cpp
+    tools/messagehandler/messagemodel.h
     tools/metaobjectbrowser/metaobjectbrowser.cpp
+    tools/metaobjectbrowser/metaobjectbrowser.h
     tools/metaobjectbrowser/metaobjecttreemodel.cpp
+    tools/metaobjectbrowser/metaobjecttreemodel.h
     tools/metatypebrowser/metatypebrowser.cpp
-    tools/objectinspector/objectinspector.cpp
-    tools/objectinspector/propertiesextension.cpp
-    tools/objectinspector/methodsextension.cpp
-    tools/objectinspector/connectionsextension.cpp
+    tools/metatypebrowser/metatypebrowser.h
+    tools/metatypebrowser/metatypesmodel.cpp
+    tools/metatypebrowser/metatypesmodel.h
     tools/objectinspector/abstractconnectionsmodel.cpp
-    tools/objectinspector/inboundconnectionsmodel.cpp
-    tools/objectinspector/outboundconnectionsmodel.cpp
-    tools/objectinspector/enumsextension.cpp
-    tools/objectinspector/classinfoextension.cpp
+    tools/objectinspector/abstractconnectionsmodel.h
     tools/objectinspector/applicationattributeextension.cpp
+    tools/objectinspector/applicationattributeextension.h
     tools/objectinspector/bindingextension.cpp
+    tools/objectinspector/bindingextension.h
     tools/objectinspector/bindingmodel.cpp
+    tools/objectinspector/bindingmodel.h
+    tools/objectinspector/classinfoextension.cpp
+    tools/objectinspector/classinfoextension.h
+    tools/objectinspector/connectionsextension.cpp
+    tools/objectinspector/connectionsextension.h
+    tools/objectinspector/enumsextension.cpp
+    tools/objectinspector/enumsextension.h
+    tools/objectinspector/inboundconnectionsmodel.cpp
+    tools/objectinspector/inboundconnectionsmodel.h
+    tools/objectinspector/methodsextension.cpp
+    tools/objectinspector/methodsextension.h
+    tools/objectinspector/objectinspector.cpp
+    tools/objectinspector/objectinspector.h
+    tools/objectinspector/outboundconnectionsmodel.cpp
+    tools/objectinspector/outboundconnectionsmodel.h
+    tools/objectinspector/propertiesextension.cpp
+    tools/objectinspector/propertiesextension.h
     tools/objectinspector/stacktraceextension.cpp
+    tools/objectinspector/stacktraceextension.h
     tools/problemreporter/availablecheckersmodel.cpp
+    tools/problemreporter/availablecheckersmodel.h
     tools/problemreporter/problemmodel.cpp
+    tools/problemreporter/problemmodel.h
     tools/problemreporter/problemreporter.cpp
+    tools/problemreporter/problemreporter.h
     tools/resourcebrowser/resourcebrowser.cpp
+    tools/resourcebrowser/resourcebrowser.h
     tools/resourcebrowser/resourcefiltermodel.cpp
-    remote/server.cpp
-    remote/remotemodelserver.cpp
-    remote/selectionmodelserver.cpp
-    remote/serverdevice.cpp
-    remote/tcpserverdevice.cpp
-    remote/localserverdevice.cpp
-    remote/serverproxymodel.cpp
+    tools/resourcebrowser/resourcefiltermodel.h
+    util.cpp
+    util.h
+    varianthandler.cpp
+    varianthandler.h
     ${CMAKE_SOURCE_DIR}/resources/gammaray.qrc
 )
 
diff --git a/launcher/core/CMakeLists.txt b/launcher/core/CMakeLists.txt
index 80aee822d5..5c1178bce2 100644
--- a/launcher/core/CMakeLists.txt
+++ b/launcher/core/CMakeLists.txt
@@ -10,39 +10,60 @@
 add_subdirectory(injector)
 
 set(gammaray_launcher_shared_srcs
+    clientlauncher.cpp
+    clientlauncher.h
     injector/abstractinjector.cpp
-    injector/processinjector.cpp
+    injector/abstractinjector.h
     injector/injectorfactory.cpp
+    injector/injectorfactory.h
+    injector/processinjector.cpp
+    injector/processinjector.h
     injector/styleinjector.cpp
+    injector/styleinjector.h
+    launcher.cpp
+    launcher.h
+    launcherfinder.cpp
+    launcherfinder.h
+    launchoptions.cpp
+    launchoptions.h
     libraryutil.cpp
+    libraryutil.h
+    networkdiscoverymodel.cpp
+    networkdiscoverymodel.h
     probeabi.cpp
+    probeabi.h
     probeabidetector.cpp
+    probeabidetector.h
     probefinder.cpp
-    launchoptions.cpp
-    networkdiscoverymodel.cpp
-    clientlauncher.cpp
-    launcherfinder.cpp
-    launcher.cpp
+    probefinder.h
     selftest.cpp
+    selftest.h
 )
 
 if(WIN32)
     list(
         APPEND
         gammaray_launcher_shared_srcs
-        probeabidetector_win.cpp
-        pefile.cpp
         injector/basicwindllinjector.cpp
+        injector/basicwindllinjector.h
         injector/windllinjector.cpp
+        injector/windllinjector.h
+        pefile.cpp
+        pefile.h
+        probeabidetector_win.cpp
     )
 else()
     list(
         APPEND
         gammaray_launcher_shared_srcs
         injector/debuggerinjector.cpp
+        injector/debuggerinjector.h
         injector/gdbinjector.cpp
+        injector/gdbinjector.h
         injector/lldbinjector.cpp
+        injector/lldbinjector.h
         injector/preloadinjector.cpp
+        injector/preloadinjector.h
     )
     if(APPLE)
         list(APPEND gammaray_launcher_shared_srcs probeabidetector_mac.cpp)
diff --git a/launcher/ui/CMakeLists.txt b/launcher/ui/CMakeLists.txt
index 3bf32d5fac..dcfbed7490 100644
--- a/launcher/ui/CMakeLists.txt
+++ b/launcher/ui/CMakeLists.txt
@@ -8,15 +8,24 @@
 #
 
 set(gammaray_launcher_ui_srcs
-    promolabel.cpp
+    attachdialog.cpp
+    attachdialog.h
+    connectpage.cpp
+    connectpage.h
     launcherwindow.cpp
+    launcherwindow.h
     launchpage.cpp
-    selftestpage.cpp
-    connectpage.cpp
-    attachdialog.cpp
-    processmodel.cpp
-    processfiltermodel.cpp
+    launchpage.h
     probeabimodel.cpp
+    probeabimodel.h
+    processfiltermodel.cpp
+    processfiltermodel.h
+    processmodel.cpp
+    processmodel.h
+    promolabel.cpp
+    promolabel.h
+    selftestpage.cpp
+    selftestpage.h
     resources/ui.qrc
 )
 if(NOT WIN32)
diff --git a/plugins/actioninspector/CMakeLists.txt b/plugins/actioninspector/CMakeLists.txt
index c13f7efc84..456c3f8f42 100644
--- a/plugins/actioninspector/CMakeLists.txt
+++ b/plugins/actioninspector/CMakeLists.txt
@@ -9,7 +9,14 @@
 
 # probe part
 if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
-    set(gammaray_actioninspector_plugin_srcs actioninspector.cpp actionvalidator.cpp actionmodel.cpp)
+    set(gammaray_actioninspector_plugin_srcs
+        actioninspector.cpp
+        actioninspector.h
+        actionmodel.cpp
+        actionmodel.h
+        actionvalidator.cpp
+        actionvalidator.h
+    )
 
     gammaray_add_plugin(
         gammaray_actioninspector_plugin
@@ -24,7 +31,9 @@ endif()
 
 # ui part
 if(GAMMARAY_BUILD_UI)
-    set(gammaray_actioninspector_ui_plugin_srcs actioninspectorwidget.cpp clientactionmodel.cpp)
+    set(gammaray_actioninspector_ui_plugin_srcs actioninspectorwidget.cpp actioninspectorwidget.h clientactionmodel.cpp
+                                                clientactionmodel.h
+    )
 
     gammaray_add_plugin(
         gammaray_actioninspector_ui_plugin
diff --git a/plugins/bluetooth/CMakeLists.txt b/plugins/bluetooth/CMakeLists.txt
index a15058e873..cde4e994d5 100644
--- a/plugins/bluetooth/CMakeLists.txt
+++ b/plugins/bluetooth/CMakeLists.txt
@@ -15,6 +15,7 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
         gammaray_bluetooth.json
         SOURCES
         bluetooth.cpp
+        bluetooth.h
     )
     target_link_libraries(gammaray_bluetooth gammaray_core Qt::Bluetooth)
     set_target_properties(gammaray_bluetooth PROPERTIES DISABLE_PRECOMPILE_HEADERS ON)
diff --git a/plugins/eventmonitor/CMakeLists.txt b/plugins/eventmonitor/CMakeLists.txt
index 95dab16c3f..747d6b04a0 100644
--- a/plugins/eventmonitor/CMakeLists.txt
+++ b/plugins/eventmonitor/CMakeLists.txt
@@ -11,11 +11,16 @@
 if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
 
     set(gammaray_eventmonitor_plugin_srcs
-        eventmonitor.cpp
         eventmodel.cpp
+        eventmodel.h
+        eventmonitor.cpp
+        eventmonitor.h
         eventmonitorinterface.cpp
-        eventtypemodel.cpp
+        eventmonitorinterface.h
         eventtypefilter.cpp
+        eventtypefilter.h
+        eventtypemodel.cpp
+        eventtypemodel.h
     )
 
     gammaray_add_plugin(
@@ -31,8 +36,15 @@ endif()
 
 # ui part
 if(GAMMARAY_BUILD_UI)
-    set(gammaray_eventmonitor_ui_plugin_srcs eventmonitorwidget.cpp eventmonitorinterface.cpp eventmonitorclient.cpp
-                                             eventtypeclientproxymodel.cpp
+    set(gammaray_eventmonitor_ui_plugin_srcs
+        eventmonitorclient.cpp
+        eventmonitorclient.h
+        eventmonitorinterface.cpp
+        eventmonitorinterface.h
+        eventmonitorwidget.cpp
+        eventmonitorwidget.h
+        eventtypeclientproxymodel.cpp
+        eventtypeclientproxymodel.h
     )
 
     gammaray_add_plugin(
diff --git a/plugins/fontbrowser/CMakeLists.txt b/plugins/fontbrowser/CMakeLists.txt
index b99e043272..845ee8fa94 100644
--- a/plugins/fontbrowser/CMakeLists.txt
+++ b/plugins/fontbrowser/CMakeLists.txt
@@ -11,10 +11,15 @@
 if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
     set(gammaray_fontbrowser_plugin_srcs
         fontbrowser.cpp
+        fontbrowser.h
         fontbrowserinterface.cpp
-        fontmodel.cpp
-        fontdatabasemodel.cpp
+        fontbrowserinterface.h
         fontbrowserserver.cpp
+        fontbrowserserver.h
+        fontdatabasemodel.cpp
+        fontdatabasemodel.h
+        fontmodel.cpp
+        fontmodel.h
     )
 
     gammaray_add_plugin(
@@ -32,7 +37,14 @@ endif()
 # ui part
 if(GAMMARAY_BUILD_UI)
 
-    set(gammaray_fontbrowser_plugin_ui_srcs fontbrowserwidget.cpp fontbrowserinterface.cpp fontbrowserclient.cpp)
+    set(gammaray_fontbrowser_plugin_ui_srcs
+        fontbrowserclient.cpp
+        fontbrowserclient.h
+        fontbrowserinterface.cpp
+        fontbrowserinterface.h
+        fontbrowserwidget.cpp
+        fontbrowserwidget.h
+    )
 
     gammaray_add_plugin(
         gammaray_fontbrowser_ui_plugin
diff --git a/plugins/guisupport/CMakeLists.txt b/plugins/guisupport/CMakeLists.txt
index 7ca207ac70..f7b31b34ae 100644
--- a/plugins/guisupport/CMakeLists.txt
+++ b/plugins/guisupport/CMakeLists.txt
@@ -9,7 +9,7 @@
 
 # probe plugin
 if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
-    set(gammaray_guisupport_srcs guisupport.cpp ui.qrc)
+    set(gammaray_guisupport_srcs guisupport.cpp guisupport.h ui.qrc)
     gammaray_add_plugin(
         gammaray_guisupport
         JSON
@@ -22,7 +22,9 @@ endif()
 
 # ui plugin
 if(GAMMARAY_BUILD_UI)
-    set(gammaray_guisupport_ui_srcs guisupportuifactory.cpp paintanalyzertab.cpp)
+    set(gammaray_guisupport_ui_srcs guisupportuifactory.cpp guisupportuifactory.h paintanalyzertab.cpp
+                                    paintanalyzertab.h
+    )
     gammaray_add_plugin(
         gammaray_guisupport_ui
         JSON
diff --git a/plugins/kjobtracker/CMakeLists.txt b/plugins/kjobtracker/CMakeLists.txt
index b34b38b7e5..b9bfaab84f 100644
--- a/plugins/kjobtracker/CMakeLists.txt
+++ b/plugins/kjobtracker/CMakeLists.txt
@@ -19,7 +19,7 @@ set_package_properties(
 # probe part
 if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
     if(TARGET KF${QtCore_VERSION_MAJOR}::CoreAddons)
-        set(gammaray_kjob_plugin_srcs kjobtracker.cpp kjobmodel.cpp)
+        set(gammaray_kjob_plugin_srcs kjobmodel.cpp kjobmodel.h kjobtracker.cpp kjobtracker.h)
 
         gammaray_add_plugin(
             gammaray_kjobtracker_plugin
@@ -35,7 +35,7 @@ endif()
 
 # ui part
 if(GAMMARAY_BUILD_UI)
-    set(gammaray_kjob_ui_plugin_srcs kjobtrackerwidget.cpp)
+    set(gammaray_kjob_ui_plugin_srcs kjobtrackerwidget.cpp kjobtrackerwidget.h)
 
     gammaray_add_plugin(
         gammaray_kjobtracker_ui_plugin
diff --git a/plugins/localeinspector/CMakeLists.txt b/plugins/localeinspector/CMakeLists.txt
index 52efc8d512..c4b8554fe1 100644
--- a/plugins/localeinspector/CMakeLists.txt
+++ b/plugins/localeinspector/CMakeLists.txt
@@ -9,10 +9,24 @@
 
 # probe part
 if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
-    set(gammaray_localeinspector_plugin_srcs localeinspector.cpp localemodel.cpp localedataaccessor.cpp
-                                             localeaccessormodel.cpp
+    set(gammaray_localeinspector_plugin_srcs
+        localeaccessormodel.cpp
+        localeaccessormodel.h
+        localedataaccessor.cpp
+        localedataaccessor.h
+        localeinspector.cpp
+        localeinspector.h
+        localemodel.cpp
+        localemodel.h
+    )
+    list(
+        APPEND
+        gammaray_localeinspector_plugin_srcs
+        timezonemodel.cpp
+        timezonemodel.h
+        timezoneoffsetdatamodel.cpp
+        timezoneoffsetdatamodel.h
     )
-    list(APPEND gammaray_localeinspector_plugin_srcs timezonemodel.cpp timezoneoffsetdatamodel.cpp)
 
     gammaray_add_plugin(
         gammaray_localeinspector_plugin
@@ -30,10 +44,15 @@ endif()
 if(GAMMARAY_BUILD_UI)
     set(gammaray_localeinspector_plugin_ui_srcs
         localeinspectorwidget.cpp
+        localeinspectorwidget.h
         localetab.cpp
-        timezonetab.cpp
+        localetab.h
         timezoneclientmodel.cpp
+        timezoneclientmodel.h
         timezoneoffsetdataclientmodel.cpp
+        timezoneoffsetdataclientmodel.h
+        timezonetab.cpp
+        timezonetab.h
     )
 
     gammaray_add_plugin(
diff --git a/plugins/mimetypes/CMakeLists.txt b/plugins/mimetypes/CMakeLists.txt
index a388582a3f..cfc820f008 100644
--- a/plugins/mimetypes/CMakeLists.txt
+++ b/plugins/mimetypes/CMakeLists.txt
@@ -9,7 +9,7 @@
 
 # probe plugin
 if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
-    set(gammaray_mimetypes_srcs mimetypes.cpp mimetypesmodel.cpp)
+    set(gammaray_mimetypes_srcs mimetypes.cpp mimetypes.h mimetypesmodel.cpp mimetypesmodel.h)
     gammaray_add_plugin(
         gammaray_mimetypes
         JSON
@@ -22,7 +22,7 @@ endif()
 
 # ui plugin
 if(GAMMARAY_BUILD_UI)
-    set(gammaray_mimetypes_ui_srcs mimetypeswidget.cpp)
+    set(gammaray_mimetypes_ui_srcs mimetypeswidget.cpp mimetypeswidget.h)
     gammaray_add_plugin(
         gammaray_mimetypes_ui
         JSON
diff --git a/plugins/modelinspector/CMakeLists.txt b/plugins/modelinspector/CMakeLists.txt
index a3cc148b4c..1aaa2c58c4 100644
--- a/plugins/modelinspector/CMakeLists.txt
+++ b/plugins/modelinspector/CMakeLists.txt
@@ -16,6 +16,12 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
         modelcellmodel.cpp
         modelcontentproxymodel.cpp
         selectionmodelmodel.cpp
+        modelinspector.h
+        modelinspectorinterface.h
+        modelmodel.h
+        modelcellmodel.h
+        modelcontentproxymodel.h
+        selectionmodelmodel.h
     )
 
     gammaray_add_plugin(
@@ -33,8 +39,15 @@ endif()
 # ui part
 if(GAMMARAY_BUILD_UI)
 
-    set(gammaray_models_ui_srcs modelinspectorwidget.cpp modelinspectorinterface.cpp modelinspectorclient.cpp
-                                modelcontentdelegate.cpp
+    set(gammaray_models_ui_srcs
+        modelcontentdelegate.cpp
+        modelcontentdelegate.h
+        modelinspectorclient.cpp
+        modelinspectorclient.h
+        modelinspectorinterface.cpp
+        modelinspectorinterface.h
+        modelinspectorwidget.cpp
+        modelinspectorwidget.h
     )
 
     gammaray_add_plugin(
diff --git a/plugins/network/CMakeLists.txt b/plugins/network/CMakeLists.txt
index bc36a3c3c9..2e0e7690c4 100644
--- a/plugins/network/CMakeLists.txt
+++ b/plugins/network/CMakeLists.txt
@@ -10,15 +10,21 @@
 # probe plugin
 if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
     set(gammaray_network_srcs
-        networksupport.cpp
-        networksupportinterface.cpp
-        networkinterfacemodel.cpp
-        networkreplymodel.cpp
         cookies/cookieextension.cpp
+        cookies/cookieextension.h
         cookies/cookiejarmodel.cpp
+        cookies/cookiejarmodel.h
+        networkinterfacemodel.cpp
+        networkinterfacemodel.h
+        networkreplymodel.cpp
+        networkreplymodel.h
+        networksupport.cpp
+        networksupport.h
+        networksupportinterface.cpp
+        networksupportinterface.h
     )
     if(TARGET Qt5::Network)
-        list(APPEND gammaray_network_srcs networkconfigurationmodel.cpp)
+        list(APPEND gammaray_network_srcs networkconfigurationmodel.cpp networkconfigurationmodel.h)
     endif()
     gammaray_add_plugin(
         gammaray_network
@@ -34,15 +40,24 @@ endif()
 # ui plugin
 if(GAMMARAY_BUILD_UI)
     set(gammaray_network_ui_srcs
-        networkwidget.cpp
-        networkinterfacewidget.cpp
-        networkconfigurationwidget.cpp
         clientnetworkconfigurationmodel.cpp
-        networkreplywidget.cpp
+        clientnetworkconfigurationmodel.h
         clientnetworkreplymodel.cpp
-        networksupportinterface.cpp
-        networksupportclient.cpp
+        clientnetworkreplymodel.h
         cookies/cookietab.cpp
+        cookies/cookietab.h
+        networkconfigurationwidget.cpp
+        networkconfigurationwidget.h
+        networkinterfacewidget.cpp
+        networkinterfacewidget.h
+        networkreplywidget.cpp
+        networkreplywidget.h
+        networksupportclient.cpp
+        networksupportclient.h
+        networksupportinterface.cpp
+        networksupportinterface.h
+        networkwidget.cpp
+        networkwidget.h
     )
     gammaray_add_plugin(
         gammaray_network_ui
diff --git a/plugins/openglsupport/CMakeLists.txt b/plugins/openglsupport/CMakeLists.txt
index da141556f0..257e5cf63b 100644
--- a/plugins/openglsupport/CMakeLists.txt
+++ b/plugins/openglsupport/CMakeLists.txt
@@ -15,6 +15,7 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
         gammaray_openglsupport.json
         SOURCES
         openglsupport.cpp
+        openglsupport.h
     )
     target_link_libraries(gammaray_openglsupport gammaray_core Qt::Gui)
     if(TARGET Qt6::OpenGL)
diff --git a/plugins/positioning/CMakeLists.txt b/plugins/positioning/CMakeLists.txt
index 9ae116f964..83ff2a04ef 100644
--- a/plugins/positioning/CMakeLists.txt
+++ b/plugins/positioning/CMakeLists.txt
@@ -9,7 +9,20 @@
 
 # probe plugin
 if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
-    set(gammaray_positioning_srcs positioning.cpp positioninginterface.cpp positioninfopropertyadaptor.cpp)
+    set(gammaray_positioning_srcs
+        positioninfopropertyadaptor.cpp
+        positioninfopropertyadaptor.cpp
+        positioninfopropertyadaptor.h
+        positioninfopropertyadaptor.h
+        positioning.cpp
+        positioning.cpp
+        positioning.h
+        positioning.h
+        positioninginterface.cpp
+        positioninginterface.cpp
+        positioninginterface.h
+        positioninginterface.h
+    )
     gammaray_add_plugin(
         gammaray_positioning
         JSON
@@ -21,8 +34,13 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
     set_target_properties(gammaray_positioning PROPERTIES DISABLE_PRECOMPILE_HEADERS ON)
 
     # proxy geo position info source factory
-    set(gammaray_geopositioninfosource_srcs geopositioninfosourcefactory.cpp geopositioninfosource.cpp
-                                            positioninginterface.cpp
+    set(gammaray_geopositioninfosource_srcs
+        geopositioninfosource.cpp
+        geopositioninfosource.h
+        geopositioninfosourcefactory.cpp
+        geopositioninfosourcefactory.h
+        positioninginterface.cpp
+        positioninginterface.h
     )
 
     add_library(gammaray_geopositioninfosource MODULE ${gammaray_geopositioninfosource_srcs})
@@ -37,10 +55,14 @@ if(GAMMARAY_BUILD_UI
    AND TARGET Qt::QuickWidgets
 )
     set(gammaray_positioning_ui_srcs
-        positioningwidget.cpp
-        positioninginterface.cpp
-        positioningclient.cpp
         mapcontroller.cpp
+        mapcontroller.h
+        positioningclient.cpp
+        positioningclient.h
+        positioninginterface.cpp
+        positioninginterface.h
+        positioningwidget.cpp
+        positioningwidget.h
         positioningwidget.qrc
     )
 
diff --git a/plugins/qtivi/CMakeLists.txt b/plugins/qtivi/CMakeLists.txt
index a31711db30..7266e3ab68 100644
--- a/plugins/qtivi/CMakeLists.txt
+++ b/plugins/qtivi/CMakeLists.txt
@@ -13,9 +13,15 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
         set(plugin_files qtivisupport.cpp)
         if(QtIviCore_VERSION VERSION_GREATER 1.1)
             add_definitions(-DQTIVI_DISABLE_IVIPROPERTIES)
-            set(plugin_files ${plugin_files} qtiviobjectmodel.cpp)
+            set(plugin_files ${plugin_files} qtiviobjectmodel.cpp qtiviobjectmodel.h)
         else()
-            set(plugin_files ${plugin_files} qtivipropertymodel.cpp qtivipropertyoverrider.cpp)
+            set(plugin_files
+                ${plugin_files}
+                qtivipropertymodel.cpp
+                qtivipropertymodel.h
+                qtivipropertyoverrider.cpp
+                qtivipropertyoverrider.h
+            )
         endif()
         gammaray_add_plugin(
             gammaray_qtivi
@@ -41,9 +47,12 @@ if(GAMMARAY_BUILD_UI)
         JSON
         gammaray_qtivi.json
         SOURCES
-        qtivisupportwidget.cpp
         qtiviconstrainedvaluedelegate.cpp
+        qtiviconstrainedvaluedelegate.h
         qtivipropertyclientmodel.cpp
+        qtivipropertyclientmodel.h
+        qtivisupportwidget.cpp
+        qtivisupportwidget.h
     )
     target_link_libraries(gammaray_qtivi_ui gammaray_ui)
 endif()
diff --git a/plugins/quickinspector/CMakeLists.txt b/plugins/quickinspector/CMakeLists.txt
index 5fa152453b..19103e467d 100644
--- a/plugins/quickinspector/CMakeLists.txt
+++ b/plugins/quickinspector/CMakeLists.txt
@@ -30,25 +30,38 @@ target_compile_features(gammaray_quickinspector_shared PUBLIC ${GAMMARAY_REQUIRE
 
 if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
     set(gammaray_quickinspector_srcs
-        quickinspector.cpp
         quickanchorspropertyadaptor.cpp
+        quickanchorspropertyadaptor.h
+        quickinspector.cpp
+        quickinspector.h
         quickitemmodel.cpp
-        quickscenegraphmodel.cpp
+        quickitemmodel.h
         quickpaintanalyzerextension.cpp
+        quickpaintanalyzerextension.h
+        quickscenegraphmodel.cpp
+        quickscenegraphmodel.h
         quickscreengrabber.cpp
+        quickscreengrabber.h
     )
 
     if(NOT QT_NO_OPENGL)
         list(
             APPEND
             gammaray_quickinspector_srcs
+            geometryextension/sggeometryextension.cpp
+            geometryextension/sggeometryextension.h
+            geometryextension/sggeometrymodel.cpp
+            geometryextension/sggeometrymodel.h
             materialextension/materialextension.cpp
+            materialextension/materialextension.h
             materialextension/materialshadermodel.cpp
+            materialextension/materialshadermodel.h
             materialextension/qquickopenglshadereffectmaterialadaptor.cpp
-            geometryextension/sggeometryextension.cpp
-            geometryextension/sggeometrymodel.cpp
-            textureextension/textureextension.cpp
+            materialextension/qquickopenglshadereffectmaterialadaptor.h
             textureextension/qsgtexturegrabber.cpp
+            textureextension/qsgtexturegrabber.h
+            textureextension/textureextension.cpp
+            textureextension/textureextension.h
         )
     endif()
 
@@ -94,25 +107,43 @@ endif()
 if(GAMMARAY_BUILD_UI)
     # ui plugin
     set(gammaray_quickinspector_ui_srcs
-        quickinspectorwidget.cpp
-        quickinspectorclient.cpp
+        gridsettingswidget.cpp
+        gridsettingswidget.h
+        materialextension/materialextensionclient.cpp
+        materialextension/materialextensionclient.h
+        materialextension/materialtab.cpp
+        materialextension/materialtab.h
         quickclientitemmodel.cpp
+        quickclientitemmodel.h
+        quickinspectorclient.cpp
+        quickinspectorclient.h
+        quickinspectorwidget.cpp
+        quickinspectorwidget.h
         quickitemdelegate.cpp
+        quickitemdelegate.h
         quickitemtreewatcher.cpp
-        quickscenepreviewwidget.cpp
-        quickscenecontrolwidget.cpp
+        quickitemtreewatcher.h
         quickoverlaylegend.cpp
-        gridsettingswidget.cpp
-        materialextension/materialextensionclient.cpp
-        materialextension/materialtab.cpp
+        quickoverlaylegend.h
+        quickscenecontrolwidget.cpp
+        quickscenecontrolwidget.h
+        quickscenepreviewwidget.cpp
+        quickscenepreviewwidget.h
         textureextension/texturetab.cpp
+        textureextension/texturetab.h
         textureextension/textureviewwidget.cpp
+        textureextension/textureviewwidget.h
         textureextension/resources.qrc
     )
 
     if(NOT QT_NO_OPENGL)
-        list(APPEND gammaray_quickinspector_ui_srcs geometryextension/sggeometrytab.cpp
-             geometryextension/sgwireframewidget.cpp
+        list(
+            APPEND
+            gammaray_quickinspector_ui_srcs
+            geometryextension/sggeometrytab.cpp
+            geometryextension/sggeometrytab.h
+            geometryextension/sgwireframewidget.cpp
+            geometryextension/sgwireframewidget.h
         )
     endif()
 
diff --git a/plugins/quickwidgetsupport/CMakeLists.txt b/plugins/quickwidgetsupport/CMakeLists.txt
index 287408be7c..ad270108fe 100644
--- a/plugins/quickwidgetsupport/CMakeLists.txt
+++ b/plugins/quickwidgetsupport/CMakeLists.txt
@@ -9,7 +9,7 @@
 
 # probe plugin
 if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
-    set(gammaray_quickwidgetsupport_srcs quickwidgetsupport.cpp)
+    set(gammaray_quickwidgetsupport_srcs quickwidgetsupport.cpp quickwidgetsupport.h)
     gammaray_add_plugin(
         gammaray_quickwidgetsupport
         JSON
diff --git a/plugins/sceneinspector/CMakeLists.txt b/plugins/sceneinspector/CMakeLists.txt
index d8c13f0cb7..4e36daf63d 100644
--- a/plugins/sceneinspector/CMakeLists.txt
+++ b/plugins/sceneinspector/CMakeLists.txt
@@ -9,8 +9,15 @@
 
 # probe part
 if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
-    set(gammaray_sceneinspector_plugin_srcs sceneinspector.cpp scenemodel.cpp sceneinspectorinterface.cpp
-                                            paintanalyzerextension.cpp
+    set(gammaray_sceneinspector_plugin_srcs
+        paintanalyzerextension.cpp
+        paintanalyzerextension.h
+        sceneinspector.cpp
+        sceneinspector.h
+        sceneinspectorinterface.cpp
+        sceneinspectorinterface.h
+        scenemodel.cpp
+        scenemodel.h
     )
 
     gammaray_add_plugin(
@@ -33,11 +40,16 @@ endif()
 # ui part
 if(GAMMARAY_BUILD_UI)
     set(gammaray_sceneinspector_ui_plugin_srcs
-        sceneinspectorwidget.cpp
-        graphicsview.cpp
         graphicssceneview.cpp
-        sceneinspectorinterface.cpp
+        graphicssceneview.h
+        graphicsview.cpp
+        graphicsview.h
         sceneinspectorclient.cpp
+        sceneinspectorclient.h
+        sceneinspectorinterface.cpp
+        sceneinspectorinterface.h
+        sceneinspectorwidget.cpp
+        sceneinspectorwidget.h
     )
 
     gammaray_add_plugin(
diff --git a/plugins/signalmonitor/CMakeLists.txt b/plugins/signalmonitor/CMakeLists.txt
index a51e8d21d5..f89a47d295 100644
--- a/plugins/signalmonitor/CMakeLists.txt
+++ b/plugins/signalmonitor/CMakeLists.txt
@@ -8,7 +8,9 @@
 #
 
 # shared part
-set(gammaray_signalmonitor_shared_srcs signalmonitorinterface.cpp signalmonitorcommon.cpp)
+set(gammaray_signalmonitor_shared_srcs signalmonitorcommon.cpp signalmonitorcommon.h signalmonitorinterface.cpp
+                                       signalmonitorinterface.h
+)
 add_library(
     gammaray_signalmonitor_shared STATIC
     ${gammaray_signalmonitor_shared_srcs}
@@ -22,7 +24,14 @@ target_compile_features(gammaray_signalmonitor_shared PUBLIC ${GAMMARAY_REQUIRED
 
 # probe plugin
 if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
-    set(gammaray_signalmonitor_srcs signalmonitor.cpp signalhistorymodel.cpp relativeclock.cpp)
+    set(gammaray_signalmonitor_srcs
+        relativeclock.cpp
+        relativeclock.h
+        signalhistorymodel.cpp
+        signalhistorymodel.h
+        signalmonitor.cpp
+        signalmonitor.h
+    )
 
     gammaray_add_plugin(
         gammaray_signalmonitor
@@ -38,8 +47,15 @@ endif()
 
 if(GAMMARAY_BUILD_UI)
     # ui plugin
-    set(gammaray_signalmonitor_ui_srcs signalmonitorwidget.cpp signalhistorydelegate.cpp signalhistoryview.cpp
-                                       signalmonitorclient.cpp
+    set(gammaray_signalmonitor_ui_srcs
+        signalhistorydelegate.cpp
+        signalhistorydelegate.h
+        signalhistoryview.cpp
+        signalhistoryview.h
+        signalmonitorclient.cpp
+        signalmonitorclient.h
+        signalmonitorwidget.cpp
+        signalmonitorwidget.h
     )
 
     gammaray_add_plugin(
diff --git a/plugins/statemachineviewer/CMakeLists.txt b/plugins/statemachineviewer/CMakeLists.txt
index 59d7494aad..9a654edd27 100644
--- a/plugins/statemachineviewer/CMakeLists.txt
+++ b/plugins/statemachineviewer/CMakeLists.txt
@@ -13,16 +13,24 @@ set(gammaray_statemachineviewer_shared_srcs statemachineviewerinterface.cpp)
 # probe part
 if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
     set(gammaray_statemachineviewer_plugin_srcs
+        qsmstatemachinedebuginterface.cpp
+        qsmstatemachinedebuginterface.h
+        statemachinedebuginterface.cpp
+        statemachinedebuginterface.h
         statemachineviewerserver.cpp
-        transitionmodel.cpp
-        statemodel.cpp
+        statemachineviewerserver.h
         statemachinewatcher.cpp
-        statemachinedebuginterface.cpp
-        qsmstatemachinedebuginterface.cpp
+        statemachinewatcher.h
+        statemodel.cpp
+        statemodel.h
+        transitionmodel.cpp
+        transitionmodel.h
     )
 
     if(TARGET Qt::Scxml)
-        list(APPEND gammaray_statemachineviewer_plugin_srcs qscxmlstatemachinedebuginterface.cpp)
+        list(APPEND gammaray_statemachineviewer_plugin_srcs qscxmlstatemachinedebuginterface.cpp
+             qscxmlstatemachinedebuginterface.h
+        )
     endif()
 
     gammaray_add_plugin(
@@ -63,8 +71,13 @@ find_package(${KDSME_PACKAGE_NAME} 1.2 CONFIG QUIET)
 # UI part
 if(GAMMARAY_BUILD_UI AND ${KDSME_PACKAGE_NAME}_FOUND)
 
-    set(gammaray_statemachineviewer_ui_plugin_srcs statemachineviewerwidget.cpp statemachineviewerclient.cpp
-                                                   statemodeldelegate.cpp
+    set(gammaray_statemachineviewer_ui_plugin_srcs
+        statemachineviewerclient.cpp
+        statemachineviewerclient.h
+        statemachineviewerwidget.cpp
+        statemachineviewerwidget.h
+        statemodeldelegate.cpp
+        statemodeldelegate.h
     )
 
     gammaray_add_plugin(
diff --git a/plugins/styleinspector/CMakeLists.txt b/plugins/styleinspector/CMakeLists.txt
index b9c11323df..882d85f9fb 100644
--- a/plugins/styleinspector/CMakeLists.txt
+++ b/plugins/styleinspector/CMakeLists.txt
@@ -10,19 +10,32 @@
 # probe part
 if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
     set(gammaray_styleinspector_plugin_srcs
-        styleinspector.cpp
-        pixelmetricmodel.cpp
-        standardiconmodel.cpp
-        primitivemodel.cpp
-        controlmodel.cpp
-        styleoption.cpp
+        ${CMAKE_SOURCE_DIR}/ui/palettemodel.cpp
+        ${CMAKE_SOURCE_DIR}/ui/palettemodel.h
         abstractstyleelementmodel.cpp
+        abstractstyleelementmodel.h
         abstractstyleelementstatetable.cpp
+        abstractstyleelementstatetable.h
         complexcontrolmodel.cpp
+        complexcontrolmodel.h
+        controlmodel.cpp
+        controlmodel.h
         dynamicproxystyle.cpp
-        styleinspectorinterface.cpp
+        dynamicproxystyle.h
+        pixelmetricmodel.cpp
+        pixelmetricmodel.h
+        primitivemodel.cpp
+        primitivemodel.h
+        standardiconmodel.cpp
+        standardiconmodel.h
         stylehintmodel.cpp
-        ${CMAKE_SOURCE_DIR}/ui/palettemodel.cpp
+        stylehintmodel.h
+        styleinspector.cpp
+        styleinspector.h
+        styleinspectorinterface.cpp
+        styleinspectorinterface.h
+        styleoption.cpp
+        styleoption.h
     )
 
     gammaray_add_plugin(
@@ -38,8 +51,15 @@ endif()
 
 # ui part
 if(GAMMARAY_BUILD_UI)
-    set(gammaray_styleinspector_ui_plugin_srcs styleinspectorwidget.cpp styleelementstatetablepage.cpp
-                                               styleinspectorinterface.cpp styleinspectorclient.cpp
+    set(gammaray_styleinspector_ui_plugin_srcs
+        styleelementstatetablepage.cpp
+        styleelementstatetablepage.h
+        styleinspectorclient.cpp
+        styleinspectorclient.h
+        styleinspectorinterface.cpp
+        styleinspectorinterface.h
+        styleinspectorwidget.cpp
+        styleinspectorwidget.h
     )
 
     gammaray_add_plugin(
diff --git a/plugins/sysinfo/CMakeLists.txt b/plugins/sysinfo/CMakeLists.txt
index fef5b42616..f7cce7f0d3 100644
--- a/plugins/sysinfo/CMakeLists.txt
+++ b/plugins/sysinfo/CMakeLists.txt
@@ -10,11 +10,16 @@
 # probe part
 if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
     set(sysinfo_probe_srcs
-        sysinfo.cpp
         environmentmodel.cpp
+        environmentmodel.h
         libraryinfomodel.cpp
+        libraryinfomodel.h
         standardpathsmodel.cpp
+        standardpathsmodel.h
+        sysinfo.cpp
+        sysinfo.h
         sysinfomodel.cpp
+        sysinfomodel.h
     )
 
     gammaray_add_plugin(
@@ -30,7 +35,7 @@ endif()
 
 # ui part
 if(GAMMARAY_BUILD_UI)
-    set(sysinfo_ui_srcs sysinfowidget.cpp standardpathswidget.cpp)
+    set(sysinfo_ui_srcs standardpathswidget.cpp standardpathswidget.h sysinfowidget.cpp sysinfowidget.h)
 
     gammaray_add_plugin(
         gammaray_sysinfo_ui_plugin
diff --git a/plugins/textdocumentinspector/CMakeLists.txt b/plugins/textdocumentinspector/CMakeLists.txt
index eeb3ead44b..01e6c036ba 100644
--- a/plugins/textdocumentinspector/CMakeLists.txt
+++ b/plugins/textdocumentinspector/CMakeLists.txt
@@ -9,7 +9,14 @@
 
 # probe plugin
 if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
-    set(gammaray_textdocumentinspector_srcs textdocumentinspector.cpp textdocumentformatmodel.cpp textdocumentmodel.cpp)
+    set(gammaray_textdocumentinspector_srcs
+        textdocumentformatmodel.cpp
+        textdocumentformatmodel.h
+        textdocumentinspector.cpp
+        textdocumentinspector.h
+        textdocumentmodel.cpp
+        textdocumentmodel.h
+    )
     gammaray_add_plugin(
         gammaray_textdocumentinspector
         JSON
@@ -23,7 +30,9 @@ endif()
 
 # ui plugin
 if(GAMMARAY_BUILD_UI)
-    set(gammaray_textdocumentinspector_ui_srcs textdocumentinspectorwidget.cpp textdocumentcontentview.cpp)
+    set(gammaray_textdocumentinspector_ui_srcs textdocumentcontentview.cpp textdocumentcontentview.h
+                                               textdocumentinspectorwidget.cpp textdocumentinspectorwidget.h
+    )
 
     gammaray_add_plugin(
         gammaray_textdocumentinspector_ui
diff --git a/plugins/timertop/CMakeLists.txt b/plugins/timertop/CMakeLists.txt
index 72dee12bb0..71e009f653 100644
--- a/plugins/timertop/CMakeLists.txt
+++ b/plugins/timertop/CMakeLists.txt
@@ -9,7 +9,16 @@
 
 # probe part
 if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
-    set(gammaray_timertop_plugin_srcs timertop.cpp timertopinterface.cpp timermodel.cpp timerinfo.cpp)
+    set(gammaray_timertop_plugin_srcs
+        timerinfo.cpp
+        timerinfo.h
+        timermodel.cpp
+        timermodel.h
+        timertop.cpp
+        timertop.h
+        timertopinterface.cpp
+        timertopinterface.h
+    )
 
     gammaray_add_plugin(
         gammaray_timertop_plugin
@@ -26,8 +35,15 @@ endif()
 # ui part
 if(GAMMARAY_BUILD_UI)
 
-    set(gammaray_timertop_plugin_ui_srcs timertopwidget.cpp timertopinterface.cpp timertopclient.cpp
-                                         clienttimermodel.cpp
+    set(gammaray_timertop_plugin_ui_srcs
+        clienttimermodel.cpp
+        clienttimermodel.h
+        timertopclient.cpp
+        timertopclient.h
+        timertopinterface.cpp
+        timertopinterface.h
+        timertopwidget.cpp
+        timertopwidget.h
     )
 
     gammaray_add_plugin(
diff --git a/plugins/translatorinspector/CMakeLists.txt b/plugins/translatorinspector/CMakeLists.txt
index 9294783b6f..dd5120a41f 100644
--- a/plugins/translatorinspector/CMakeLists.txt
+++ b/plugins/translatorinspector/CMakeLists.txt
@@ -15,9 +15,13 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
         gammaray_translatorinspector.json
         SOURCES
         translatorinspector.cpp
+        translatorinspector.h
         translatorinspectorinterface.cpp
-        translatorwrapper.cpp
+        translatorinspectorinterface.h
         translatorsmodel.cpp
+        translatorsmodel.h
+        translatorwrapper.cpp
+        translatorwrapper.h
     )
     target_link_libraries(gammaray_translatorinspector gammaray_core Qt::Core Qt::CorePrivate)
     set_target_properties(gammaray_translatorinspector PROPERTIES DISABLE_PRECOMPILE_HEADERS ON)
@@ -30,9 +34,12 @@ if(GAMMARAY_BUILD_UI)
         JSON
         gammaray_translatorinspector.json
         SOURCES
-        translatorinspectorwidget.cpp
         translatorinspectorinterface.cpp
+        translatorinspectorinterface.h
+        translatorinspectorwidget.cpp
+        translatorinspectorwidget.h
         translatorwrapperproxy.cpp
+        translatorwrapperproxy.h
     )
     target_link_libraries(gammaray_translatorinspector_ui gammaray_ui)
 endif()
diff --git a/plugins/webinspector/CMakeLists.txt b/plugins/webinspector/CMakeLists.txt
index 42fd111690..1deb5f212b 100644
--- a/plugins/webinspector/CMakeLists.txt
+++ b/plugins/webinspector/CMakeLists.txt
@@ -9,7 +9,7 @@
 
 # probe part
 if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
-    set(gammaray_webinspector_plugin_srcs webinspector.cpp webviewmodel.cpp)
+    set(gammaray_webinspector_plugin_srcs webinspector.cpp webinspector.h webviewmodel.cpp webviewmodel.h)
 
     gammaray_add_plugin(
         gammaray_webinspector_plugin
@@ -26,7 +26,7 @@ endif()
 
 # ui part
 if(GAMMARAY_BUILD_UI AND TARGET Qt::WebEngineWidgets)
-    set(gammaray_webinspector_ui_plugin_srcs webinspectorwidget.cpp)
+    set(gammaray_webinspector_ui_plugin_srcs webinspectorwidget.cpp webinspectorwidget.h)
 
     gammaray_add_plugin(
         gammaray_webinspector_ui_plugin
diff --git a/plugins/widgetinspector/CMakeLists.txt b/plugins/widgetinspector/CMakeLists.txt
index 56c34d0e79..2802f86ce7 100644
--- a/plugins/widgetinspector/CMakeLists.txt
+++ b/plugins/widgetinspector/CMakeLists.txt
@@ -12,14 +12,22 @@
 # probe plugin
 if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
     set(gammaray_widgetinspector_plugin_srcs
+        overlaywidget.cpp
+        overlaywidget.h
+        waextension/widgetattributeextension.cpp
+        waextension/widgetattributeextension.h
+        widget3dmodel.cpp
+        widget3dmodel.h
         widgetinspector.cpp
+        widgetinspector.h
         widgetinspectorinterface.cpp
+        widgetinspectorinterface.h
         widgetinspectorserver.cpp
-        overlaywidget.cpp
-        widgettreemodel.cpp
+        widgetinspectorserver.h
         widgetpaintanalyzerextension.cpp
-        widget3dmodel.cpp
-        waextension/widgetattributeextension.cpp
+        widgetpaintanalyzerextension.h
+        widgettreemodel.cpp
+        widgettreemodel.h
     )
 
     gammaray_add_plugin(
@@ -42,7 +50,7 @@ endif()
 # probe export actions
 add_library(
     gammaray_widget_export_actions SHARED
-    uiextractor.cpp widgetinspector_export_actions.cpp
+    uiextractor.cpp uiextractor.h widgetinspector_export_actions.cpp
 )
 
 set_target_properties(
diff --git a/plugins/wlcompositorinspector/CMakeLists.txt b/plugins/wlcompositorinspector/CMakeLists.txt
index a5e7f9514e..f0b0bc0af9 100644
--- a/plugins/wlcompositorinspector/CMakeLists.txt
+++ b/plugins/wlcompositorinspector/CMakeLists.txt
@@ -16,8 +16,15 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
     )
 
     if(TARGET Qt::WaylandCompositor AND Wayland_FOUND)
-        set(gammaray_wlcompositorinspector_srcs wlcompositorinspector.cpp wlcompositorinterface.cpp clientsmodel.cpp
-                                                resourceinfo.cpp
+        set(gammaray_wlcompositorinspector_srcs
+            clientsmodel.cpp
+            clientsmodel.h
+            resourceinfo.cpp
+            resourceinfo.h
+            wlcompositorinspector.cpp
+            wlcompositorinspector.h
+            wlcompositorinterface.cpp
+            wlcompositorinterface.h
         )
         gammaray_add_plugin(
             gammaray_wlcompositorinspector
@@ -40,8 +47,15 @@ endif()
 # ui part
 if(GAMMARAY_BUILD_UI AND (NOT MSVC OR NOT MSVC_VERSION LESS 1800)) # at least MSVC 2013
 
-    set(gammaray_wlcompositorinspector_ui_srcs inspectorwidget.cpp wlcompositorinterface.cpp wlcompositorclient.cpp
-                                               logview.cpp
+    set(gammaray_wlcompositorinspector_ui_srcs
+        inspectorwidget.cpp
+        inspectorwidget.h
+        logview.cpp
+        logview.h
+        wlcompositorclient.cpp
+        wlcompositorclient.h
+        wlcompositorinterface.cpp
+        wlcompositorinterface.h
     )
 
     gammaray_add_plugin(
diff --git a/probe/CMakeLists.txt b/probe/CMakeLists.txt
index 0dca63f26b..88e2015b12 100644
--- a/probe/CMakeLists.txt
+++ b/probe/CMakeLists.txt
@@ -8,7 +8,7 @@
 #
 
 if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
-    set(gammaray_probe_srcs probecreator.cpp hooks.cpp)
+    set(gammaray_probe_srcs hooks.cpp hooks.h probecreator.cpp probecreator.h)
 
     list(APPEND gammaray_probe_srcs entry_unix.cpp)
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index d380b39c44..5772e94cd7 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -146,7 +146,7 @@ endif()
 
 add_executable(
     attachhelper
-    attachhelper.cpp
+    attachhelper.cpp attachhelper.h
 )
 gammaray_set_rpath(attachhelper ${BIN_INSTALL_DIR})
 
diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
index 4c25c8c718..a031f91feb 100644
--- a/ui/CMakeLists.txt
+++ b/ui/CMakeLists.txt
@@ -11,85 +11,165 @@
 #
 set(gammaray_ui_srcs
     aboutdata.cpp
+    aboutdata.h
     aboutwidget.cpp
-    themedimagelabel.cpp
+    aboutwidget.h
     clientdecorationidentityproxymodel.cpp
+    clientdecorationidentityproxymodel.h
     clientpropertymodel.cpp
+    clientpropertymodel.h
     clienttoolmanager.cpp
+    clienttoolmanager.h
     clienttoolmodel.cpp
+    clienttoolmodel.h
+    codeeditor/codeeditor.cpp
+    codeeditor/codeeditor.h
+    codeeditor/codeeditorsidebar.cpp
+    codeeditor/codeeditorsidebar.h
     contextmenuextension.cpp
+    contextmenuextension.h
     deferredtreeview.cpp
+    deferredtreeview.h
     editabletypesmodel.cpp
+    editabletypesmodel.h
+    favoritesitemview.cpp
+    favoritesitemview.h
+    helpcontroller.cpp
+    helpcontroller.h
     itemdelegate.cpp
+    itemdelegate.h
     methodinvocationdialog.cpp
+    methodinvocationdialog.h
     modelpickerdialog.cpp
-    palettemodel.cpp
-    propertybinder.cpp
-    propertywidget.cpp
-    propertywidgettab.cpp
-    proxytooluifactory.cpp
-    visibilityfilterproxymodel.cpp
-    splashscreen.cpp
-    searchlinecontroller.cpp
-    tooluifactory.cpp
-    uiintegration.cpp
-    uistatemanager.cpp
-    uiresources.cpp
-    remoteviewwidget.cpp
-    trailingcolorlabel.cpp
-    helpcontroller.cpp
-    favoritesitemview.cpp
-    paintanalyzerwidget.cpp
+    modelpickerdialog.h
     paintanalyzerreplayview.cpp
+    paintanalyzerreplayview.h
+    paintanalyzerwidget.cpp
+    paintanalyzerwidget.h
     paintbufferclientmodel.cpp
+    paintbufferclientmodel.h
     paintbufferviewer.cpp
+    paintbufferviewer.h
+    palettemodel.cpp
+    palettemodel.h
+    propertybinder.cpp
+    propertybinder.h
+    propertyeditor/palettedialog.cpp
+    propertyeditor/palettedialog.h
     propertyeditor/propertycoloreditor.cpp
+    propertyeditor/propertycoloreditor.h
     propertyeditor/propertydoublepaireditor.cpp
+    propertyeditor/propertydoublepaireditor.h
+    propertyeditor/propertyeditordelegate.cpp
+    propertyeditor/propertyeditordelegate.h
     propertyeditor/propertyeditorfactory.cpp
+    propertyeditor/propertyeditorfactory.h
+    propertyeditor/propertyenumeditor.cpp
+    propertyeditor/propertyenumeditor.h
     propertyeditor/propertyextendededitor.cpp
+    propertyeditor/propertyextendededitor.h
     propertyeditor/propertyfonteditor.cpp
+    propertyeditor/propertyfonteditor.h
     propertyeditor/propertyintpaireditor.cpp
-    propertyeditor/propertypaletteeditor.cpp
-    propertyeditor/palettedialog.cpp
-    propertyeditor/propertyeditordelegate.cpp
-    propertyeditor/propertyenumeditor.cpp
+    propertyeditor/propertyintpaireditor.h
+    propertyeditor/propertymargineditor.cpp
+    propertyeditor/propertymargineditor.h
     propertyeditor/propertymatrixdialog.cpp
+    propertyeditor/propertymatrixdialog.h
     propertyeditor/propertymatrixeditor.cpp
+    propertyeditor/propertymatrixeditor.h
     propertyeditor/propertymatrixmodel.cpp
-    propertyeditor/propertytexteditor.cpp
+    propertyeditor/propertymatrixmodel.h
+    propertyeditor/propertypaletteeditor.cpp
+    propertyeditor/propertypaletteeditor.h
     propertyeditor/propertyrecteditor.cpp
-    propertyeditor/propertymargineditor.cpp
-    codeeditor/codeeditor.cpp
-    codeeditor/codeeditorsidebar.cpp
+    propertyeditor/propertyrecteditor.h
+    propertyeditor/propertytexteditor.cpp
+    propertyeditor/propertytexteditor.h
+    propertywidget.cpp
+    propertywidget.h
+    propertywidgettab.cpp
+    propertywidgettab.h
+    proxytooluifactory.cpp
+    proxytooluifactory.h
+    remoteviewwidget.cpp
+    remoteviewwidget.h
+    searchlinecontroller.cpp
+    searchlinecontroller.h
+    splashscreen.cpp
+    splashscreen.h
+    themedimagelabel.cpp
+    themedimagelabel.h
     tools/messagehandler/messagedisplaymodel.cpp
-    tools/messagehandler/messagehandlerwidget.cpp
+    tools/messagehandler/messagedisplaymodel.h
     tools/messagehandler/messagehandlerclient.cpp
+    tools/messagehandler/messagehandlerclient.h
+    tools/messagehandler/messagehandlerwidget.cpp
+    tools/messagehandler/messagehandlerwidget.h
     tools/metaobjectbrowser/metaobjectbrowserwidget.cpp
+    tools/metaobjectbrowser/metaobjectbrowserwidget.h
     tools/metaobjectbrowser/metaobjecttreeclientproxymodel.cpp
+    tools/metaobjectbrowser/metaobjecttreeclientproxymodel.h
+    tools/metatypebrowser/metatypebrowserclient.cpp
+    tools/metatypebrowser/metatypebrowserclient.h
     tools/metatypebrowser/metatypebrowserwidget.cpp
+    tools/metatypebrowser/metatypebrowserwidget.h
     tools/metatypebrowser/metatypesclientmodel.cpp
-    tools/metatypebrowser/metatypebrowserclient.cpp
-    tools/objectinspector/objectinspectorwidget.cpp
-    tools/objectinspector/propertiestab.cpp
-    tools/objectinspector/propertiesextensionclient.cpp
+    tools/metatypebrowser/metatypesclientmodel.h
+    tools/objectinspector/applicationattributetab.cpp
+    tools/objectinspector/applicationattributetab.h
+    tools/objectinspector/bindingtab.cpp
+    tools/objectinspector/bindingtab.h
+    tools/objectinspector/classinfotab.cpp
+    tools/objectinspector/classinfotab.h
     tools/objectinspector/clientmethodmodel.cpp
-    tools/objectinspector/methodsextensionclient.cpp
-    tools/objectinspector/methodstab.cpp
-    tools/objectinspector/connectionstab.cpp
+    tools/objectinspector/clientmethodmodel.h
     tools/objectinspector/connectionsclientproxymodel.cpp
+    tools/objectinspector/connectionsclientproxymodel.h
     tools/objectinspector/connectionsextensionclient.cpp
+    tools/objectinspector/connectionsextensionclient.h
+    tools/objectinspector/connectionstab.cpp
+    tools/objectinspector/connectionstab.h
     tools/objectinspector/enumstab.cpp
-    tools/objectinspector/classinfotab.cpp
+    tools/objectinspector/enumstab.h
+    tools/objectinspector/methodsextensionclient.cpp
+    tools/objectinspector/methodsextensionclient.h
     tools/objectinspector/methodstab.cpp
-    tools/objectinspector/applicationattributetab.cpp
-    tools/objectinspector/bindingtab.cpp
+    tools/objectinspector/methodstab.cpp
+    tools/objectinspector/methodstab.h
+    tools/objectinspector/methodstab.h
+    tools/objectinspector/objectinspectorwidget.cpp
+    tools/objectinspector/objectinspectorwidget.h
+    tools/objectinspector/propertiesextensionclient.cpp
+    tools/objectinspector/propertiesextensionclient.h
+    tools/objectinspector/propertiestab.cpp
+    tools/objectinspector/propertiestab.h
     tools/objectinspector/stacktracetab.cpp
-    tools/problemreporter/problemreporterwidget.cpp
-    tools/problemreporter/problemreporterclient.cpp
+    tools/objectinspector/stacktracetab.h
     tools/problemreporter/problemclientmodel.cpp
+    tools/problemreporter/problemclientmodel.h
+    tools/problemreporter/problemreporterclient.cpp
+    tools/problemreporter/problemreporterclient.h
+    tools/problemreporter/problemreporterwidget.cpp
+    tools/problemreporter/problemreporterwidget.h
     tools/resourcebrowser/clientresourcemodel.cpp
-    tools/resourcebrowser/resourcebrowserwidget.cpp
+    tools/resourcebrowser/clientresourcemodel.h
     tools/resourcebrowser/resourcebrowserclient.cpp
+    tools/resourcebrowser/resourcebrowserclient.h
+    tools/resourcebrowser/resourcebrowserwidget.cpp
+    tools/resourcebrowser/resourcebrowserwidget.h
+    tooluifactory.cpp
+    tooluifactory.h
+    trailingcolorlabel.cpp
+    trailingcolorlabel.h
+    uiintegration.cpp
+    uiintegration.h
+    uiresources.cpp
+    uiresources.h
+    uistatemanager.cpp
+    uistatemanager.h
+    visibilityfilterproxymodel.cpp
+    visibilityfilterproxymodel.h
     resources/ui.qrc
     ${CMAKE_CURRENT_BINARY_DIR}/resources/classicons.qrc
 )
@@ -122,11 +202,16 @@ if(TARGET KF${QtCore_VERSION_MAJOR}::SyntaxHighlighting)
 endif()
 
 set(gammaray_ui_internal_srcs
-    sidepane.cpp
+    aboutdialog.cpp
+    aboutdialog.h
     aboutpluginsdialog.cpp
-    mainwindow.cpp
+    aboutpluginsdialog.h
     clienttoolfilterproxymodel.cpp
-    aboutdialog.cpp
+    clienttoolfilterproxymodel.h
+    mainwindow.cpp
+    mainwindow.h
+    sidepane.cpp
+    sidepane.h
 )
 
 add_library(