diff --git a/libs/global/KisZug.h b/libs/global/KisZug.h
index dc0c0a1b972..3e648425fb7 100644
--- a/libs/global/KisZug.h
+++ b/libs/global/KisZug.h
@@ -6,6 +6,7 @@
 #ifndef KISZUG_H
 #define KISZUG_H
 
+#include <QtGlobal>
 #include "KisMpl.h"
 #include <zug/transducer/map.hpp>
 #include <zug/reducing/last.hpp>
diff --git a/libs/ui/kis_paintop_options_model.h b/libs/ui/kis_paintop_options_model.h
index e7ea8a8034d..6c546eb2734 100644
--- a/libs/ui/kis_paintop_options_model.h
+++ b/libs/ui/kis_paintop_options_model.h
@@ -13,6 +13,7 @@
 #include <kritaui_export.h>
 
 #include <QString>
+#include <QSignalMapper>
 
 struct KRITAUI_EXPORT KisOptionInfo
 {
diff --git a/libs/ui/widgets/KisCompositeOpListConnectionHelper.cpp b/libs/ui/widgets/KisCompositeOpListConnectionHelper.cpp
index 9b9c62b0e3f..cc4f5956b64 100644
--- a/libs/ui/widgets/KisCompositeOpListConnectionHelper.cpp
+++ b/libs/ui/widgets/KisCompositeOpListConnectionHelper.cpp
@@ -5,7 +5,10 @@
  */
 #include "KisCompositeOpListConnectionHelper.h"
 
-#include "KoCompositeOpRegistry.h"
+#include <QMetaObject>
+#include <QMetaProperty>
+#include <KoCompositeOpRegistry.h>
+#include <kis_assert.h>
 #include "kis_cmb_composite.h"
 
 namespace KisWidgetConnectionUtils
diff --git a/libs/ui/widgets/KisLodAvailabilityData.h b/libs/ui/widgets/KisLodAvailabilityData.h
index e413e98ace7..93bb733dd61 100644
--- a/libs/ui/widgets/KisLodAvailabilityData.h
+++ b/libs/ui/widgets/KisLodAvailabilityData.h
@@ -6,9 +6,12 @@
 #ifndef KISLODAVAILABILITYDATA_H
 #define KISLODAVAILABILITYDATA_H
 
+#include <QtGlobal>
 #include <boost/operators.hpp>
 #include <kritaui_export.h>
 
+class KisPropertiesConfiguration;
+
 class KRITAUI_EXPORT KisLodAvailabilityData : boost::equality_comparable<KisLodAvailabilityData>
 {
 public:
diff --git a/plugins/paintops/libpaintop/KisAirbrushOptionData.h b/plugins/paintops/libpaintop/KisAirbrushOptionData.h
index 4c8709d3ca3..be25ccf6051 100644
--- a/plugins/paintops/libpaintop/KisAirbrushOptionData.h
+++ b/plugins/paintops/libpaintop/KisAirbrushOptionData.h
@@ -6,9 +6,13 @@
 #ifndef KISAIRBRUSHOPTIONDATA_H
 #define KISAIRBRUSHOPTIONDATA_H
 
+#include <QtGlobal>
 #include <boost/operators.hpp>
 #include <kritapaintop_export.h>
 
+class KisPropertiesConfiguration;
+
+
 class PAINTOP_EXPORT KisAirbrushOptionData : boost::equality_comparable<KisAirbrushOptionData>
 {
 public:
diff --git a/plugins/paintops/libpaintop/KisAirbrushOptionModel.h b/plugins/paintops/libpaintop/KisAirbrushOptionModel.h
index 610626cbcda..57ca7245f48 100644
--- a/plugins/paintops/libpaintop/KisAirbrushOptionModel.h
+++ b/plugins/paintops/libpaintop/KisAirbrushOptionModel.h
@@ -6,6 +6,7 @@
 #ifndef KISAIRBRUSHOPTIONMODEL_H
 #define KISAIRBRUSHOPTIONMODEL_H
 
+#include <QObject>
 #include <lager/cursor.hpp>
 #include <lager/extra/qt.hpp>
 
diff --git a/plugins/paintops/libpaintop/KisColorSourceOptionData.h b/plugins/paintops/libpaintop/KisColorSourceOptionData.h
index e69c4d2a0f1..8e6981aa084 100644
--- a/plugins/paintops/libpaintop/KisColorSourceOptionData.h
+++ b/plugins/paintops/libpaintop/KisColorSourceOptionData.h
@@ -7,9 +7,12 @@
 #define KISCOLORSOURCEOPTIONDATA_H
 
 
+#include "kis_types.h"
 #include <boost/operators.hpp>
 #include <kritapaintop_export.h>
 
+class KisPropertiesConfiguration;
+
 class PAINTOP_EXPORT KisColorSourceOptionData : boost::equality_comparable<KisColorSourceOptionData>
 {
 public:
diff --git a/plugins/paintops/libpaintop/KisCompositeOpOptionData.h b/plugins/paintops/libpaintop/KisCompositeOpOptionData.h
index 25bc618e283..cfc6c2d4514 100644
--- a/plugins/paintops/libpaintop/KisCompositeOpOptionData.h
+++ b/plugins/paintops/libpaintop/KisCompositeOpOptionData.h
@@ -6,9 +6,12 @@
 #ifndef KISCOMPOSITEOPOPTIONDATA_H
 #define KISCOMPOSITEOPOPTIONDATA_H
 
+#include "kis_types.h"
 #include <boost/operators.hpp>
 #include <kritapaintop_export.h>
 
+class KisPropertiesConfiguration;
+
 class PAINTOP_EXPORT KisCompositeOpOptionData : boost::equality_comparable<KisCompositeOpOptionData>
 {
 public:
diff --git a/plugins/paintops/libpaintop/KisEmbeddedTextureData.cpp b/plugins/paintops/libpaintop/KisEmbeddedTextureData.cpp
index 0ea61ec04ec..cb70d4d9116 100644
--- a/plugins/paintops/libpaintop/KisEmbeddedTextureData.cpp
+++ b/plugins/paintops/libpaintop/KisEmbeddedTextureData.cpp
@@ -5,6 +5,7 @@
  */
 #include "KisEmbeddedTextureData.h"
 
+#include <QFileInfo>
 #include <kis_properties_configuration.h>
 #include <KoResourceLoadResult.h>
 #include <KisResourcesInterface.h>
diff --git a/plugins/paintops/libpaintop/KisEmbeddedTextureData.h b/plugins/paintops/libpaintop/KisEmbeddedTextureData.h
index 90e1c553763..dd3718b1b5b 100644
--- a/plugins/paintops/libpaintop/KisEmbeddedTextureData.h
+++ b/plugins/paintops/libpaintop/KisEmbeddedTextureData.h
@@ -6,10 +6,13 @@
 #ifndef KISEMBEDDEDTEXTUREDATA_H
 #define KISEMBEDDEDTEXTUREDATA_H
 
+#include "kis_types.h"
 #include <boost/operators.hpp>
 #include <kritapaintop_export.h>
 #include <KoPattern.h>
 
+class KisPropertiesConfiguration;
+
 
 class PAINTOP_EXPORT KisEmbeddedTextureData : boost::equality_comparable<KisEmbeddedTextureData>
 {
diff --git a/plugins/paintops/libpaintop/KisMirrorProperties.h b/plugins/paintops/libpaintop/KisMirrorProperties.h
index 4733608b85e..2f031c26796 100644
--- a/plugins/paintops/libpaintop/KisMirrorProperties.h
+++ b/plugins/paintops/libpaintop/KisMirrorProperties.h
@@ -6,7 +6,8 @@
 #ifndef KISMIRRORPROPERTIES_H
 #define KISMIRRORPROPERTIES_H
 
-struct MirrorProperties {
+class MirrorProperties {
+public:
     MirrorProperties()
         : horizontalMirror(false),
           verticalMirror(false),
diff --git a/plugins/paintops/libpaintop/KisPaintingModeOptionData.h b/plugins/paintops/libpaintop/KisPaintingModeOptionData.h
index 491275d46c3..571d5b54d1b 100644
--- a/plugins/paintops/libpaintop/KisPaintingModeOptionData.h
+++ b/plugins/paintops/libpaintop/KisPaintingModeOptionData.h
@@ -7,9 +7,12 @@
 #define KISPAINTINGMODEOPTIONDATA_H
 
 
+#include "kis_types.h"
 #include <boost/operators.hpp>
 #include <kritapaintop_export.h>
 
+class KisPropertiesConfiguration;
+
 enum class enumPaintingMode {
     BUILDUP,
     WASH
diff --git a/plugins/paintops/libpaintop/KisTextureOptionModel.cpp b/plugins/paintops/libpaintop/KisTextureOptionModel.cpp
index b48b3384f92..51206df1947 100644
--- a/plugins/paintops/libpaintop/KisTextureOptionModel.cpp
+++ b/plugins/paintops/libpaintop/KisTextureOptionModel.cpp
@@ -5,6 +5,7 @@
  */
 #include "KisTextureOptionModel.h"
 
+#include <kis_assert.h>
 #include <KisZug.h>
 
 #include <KoResourceLoadResult.h>
diff --git a/plugins/paintops/libpaintop/kis_color_source_option.h b/plugins/paintops/libpaintop/kis_color_source_option.h
index c2ec5bb2260..9120fbef508 100644
--- a/plugins/paintops/libpaintop/kis_color_source_option.h
+++ b/plugins/paintops/libpaintop/kis_color_source_option.h
@@ -10,6 +10,7 @@
 #include <kritapaintop_export.h>
 
 #include <QList>
+#include <QScopedPointer>
 
 class KisColorSource;
 class KoID;
diff --git a/plugins/paintops/libpaintop/sensors2/KisDynamicSensor2.h b/plugins/paintops/libpaintop/sensors2/KisDynamicSensor2.h
index 0c94b47761b..5984b7ae4e8 100644
--- a/plugins/paintops/libpaintop/sensors2/KisDynamicSensor2.h
+++ b/plugins/paintops/libpaintop/sensors2/KisDynamicSensor2.h
@@ -11,7 +11,7 @@
 #include <KoID.h>
 
 class KisPaintInformation;
-class KisSensorData;
+struct KisSensorData;
 
 class KisDynamicSensor2
 {
diff --git a/plugins/paintops/libpaintop/sensors2/KisDynamicSensorFade2.h b/plugins/paintops/libpaintop/sensors2/KisDynamicSensorFade2.h
index 3a478ab85d9..f6a71a86e0d 100644
--- a/plugins/paintops/libpaintop/sensors2/KisDynamicSensorFade2.h
+++ b/plugins/paintops/libpaintop/sensors2/KisDynamicSensorFade2.h
@@ -8,7 +8,7 @@
 
 #include "KisDynamicSensor2.h"
 
-class KisSensorWithLengthData;
+struct KisSensorWithLengthData;
 
 class KisDynamicSensorFade2 : public KisDynamicSensor2
 {