diff --git a/krita/benchmarks/kis_bcontrast_benchmark.h b/krita/benchmarks/kis_bcontrast_benchmark.h
--- a/krita/benchmarks/kis_bcontrast_benchmark.h
+++ b/krita/benchmarks/kis_bcontrast_benchmark.h
@@ -25,8 +25,6 @@
 #include <QtTest>
 #include <kis_paint_device.h>
 
-class KisPaintDevice;
-class KoColorSpace;
 class KoColor;
 
 class KisBContrastBenchmark : public QObject
diff --git a/krita/benchmarks/kis_bcontrast_benchmark.cpp b/krita/benchmarks/kis_bcontrast_benchmark.cpp
--- a/krita/benchmarks/kis_bcontrast_benchmark.cpp
+++ b/krita/benchmarks/kis_bcontrast_benchmark.cpp
@@ -21,7 +21,6 @@
 #include "kis_bcontrast_benchmark.h"
 #include "kis_benchmark_values.h"
 
-#include "kis_paint_device.h"
 
 #include <KoColorSpace.h>
 #include <KoColorSpaceRegistry.h>
diff --git a/krita/benchmarks/kis_blur_benchmark.h b/krita/benchmarks/kis_blur_benchmark.h
--- a/krita/benchmarks/kis_blur_benchmark.h
+++ b/krita/benchmarks/kis_blur_benchmark.h
@@ -24,8 +24,6 @@
 #include <KoColor.h>
 #include <kis_paint_device.h>
 
-class KisPaintDevice;
-class KoColorSpace;
 class KoColor;
 
 class KisBlurBenchmark : public QObject
diff --git a/krita/benchmarks/kis_blur_benchmark.cpp b/krita/benchmarks/kis_blur_benchmark.cpp
--- a/krita/benchmarks/kis_blur_benchmark.cpp
+++ b/krita/benchmarks/kis_blur_benchmark.cpp
@@ -21,7 +21,6 @@
 #include "kis_blur_benchmark.h"
 #include "kis_benchmark_values.h"
 
-#include "kis_paint_device.h"
 
 #include <KoColorSpace.h>
 #include <KoColorSpaceRegistry.h>
diff --git a/krita/benchmarks/kis_filter_selections_benchmark.cpp b/krita/benchmarks/kis_filter_selections_benchmark.cpp
--- a/krita/benchmarks/kis_filter_selections_benchmark.cpp
+++ b/krita/benchmarks/kis_filter_selections_benchmark.cpp
@@ -22,7 +22,6 @@
 
 #include <QTest>
 #include "testutil.h"
-#include "kis_selection.h"
 #include "kis_transaction.h"
 #include <KoCompositeOpRegistry.h>
 #include "kis_datamanager.h"
diff --git a/krita/benchmarks/kis_floodfill_benchmark.h b/krita/benchmarks/kis_floodfill_benchmark.h
--- a/krita/benchmarks/kis_floodfill_benchmark.h
+++ b/krita/benchmarks/kis_floodfill_benchmark.h
@@ -25,8 +25,6 @@
 #include <QtTest>
 #include <kis_paint_device.h>
 
-class KisPaintDevice;
-class KoColorSpace;
 class KoColor;
 
 class KisFloodFillBenchmark : public QObject
diff --git a/krita/benchmarks/kis_floodfill_benchmark.cpp b/krita/benchmarks/kis_floodfill_benchmark.cpp
--- a/krita/benchmarks/kis_floodfill_benchmark.cpp
+++ b/krita/benchmarks/kis_floodfill_benchmark.cpp
@@ -21,7 +21,6 @@
 #include <kundo2command.h>
 #include "kis_benchmark_values.h"
 
-#include "kis_paint_device.h"
 #include "kis_random_accessor_ng.h"
 
 #include <KoColorSpace.h>
diff --git a/krita/benchmarks/kis_gradient_benchmark.h b/krita/benchmarks/kis_gradient_benchmark.h
--- a/krita/benchmarks/kis_gradient_benchmark.h
+++ b/krita/benchmarks/kis_gradient_benchmark.h
@@ -25,8 +25,6 @@
 #include <QtTest>
 #include <kis_paint_device.h>
 
-class KisPaintDevice;
-class KoColorSpace;
 class KoColor;
 
 class KisGradientBenchmark : public QObject
diff --git a/krita/benchmarks/kis_gradient_benchmark.cpp b/krita/benchmarks/kis_gradient_benchmark.cpp
--- a/krita/benchmarks/kis_gradient_benchmark.cpp
+++ b/krita/benchmarks/kis_gradient_benchmark.cpp
@@ -22,7 +22,6 @@
 
 #include "kis_benchmark_values.h"
 
-#include "kis_paint_device.h"
 #include "kis_random_accessor_ng.h"
 
 #include <KoColorSpace.h>
diff --git a/krita/benchmarks/kis_hline_iterator_benchmark.h b/krita/benchmarks/kis_hline_iterator_benchmark.h
--- a/krita/benchmarks/kis_hline_iterator_benchmark.h
+++ b/krita/benchmarks/kis_hline_iterator_benchmark.h
@@ -22,8 +22,8 @@
 #include <QtTest>
 
 class KisPaintDevice;
-class KoColorSpace;
 class KoColor;
+class KoColorSpace;
 
 
 class KisHLineIteratorBenchmark : public QObject
diff --git a/krita/benchmarks/kis_level_filter_benchmark.h b/krita/benchmarks/kis_level_filter_benchmark.h
--- a/krita/benchmarks/kis_level_filter_benchmark.h
+++ b/krita/benchmarks/kis_level_filter_benchmark.h
@@ -24,8 +24,6 @@
 #include <KoColor.h>
 #include <kis_paint_device.h>
 
-class KisPaintDevice;
-class KoColorSpace;
 class KoColor;
 
 class KisLevelFilterBenchmark : public QObject
diff --git a/krita/benchmarks/kis_painter_benchmark.h b/krita/benchmarks/kis_painter_benchmark.h
--- a/krita/benchmarks/kis_painter_benchmark.h
+++ b/krita/benchmarks/kis_painter_benchmark.h
@@ -26,7 +26,6 @@
 #include <kis_types.h>
 
 
-class KoColorSpace;
 
 class KisPainterBenchmark : public QObject
 {
diff --git a/krita/benchmarks/kis_random_iterator_benchmark.h b/krita/benchmarks/kis_random_iterator_benchmark.h
--- a/krita/benchmarks/kis_random_iterator_benchmark.h
+++ b/krita/benchmarks/kis_random_iterator_benchmark.h
@@ -22,8 +22,8 @@
 #include <QtTest>
 
 class KisPaintDevice;
-class KoColorSpace;
 class KoColor;
+class KoColorSpace;
 
 
 class KisRandomIteratorBenchmark : public QObject
diff --git a/krita/benchmarks/kis_stroke_benchmark.h b/krita/benchmarks/kis_stroke_benchmark.h
--- a/krita/benchmarks/kis_stroke_benchmark.h
+++ b/krita/benchmarks/kis_stroke_benchmark.h
@@ -27,7 +27,6 @@
 #include <kis_image.h>
 #include <kis_layer.h>
 
-class KoColorSpace;
 
 const QString PRESET_FILE_NAME = "hairy-benchmark1.kpp";
 
diff --git a/krita/benchmarks/kis_vline_iterator_benchmark.h b/krita/benchmarks/kis_vline_iterator_benchmark.h
--- a/krita/benchmarks/kis_vline_iterator_benchmark.h
+++ b/krita/benchmarks/kis_vline_iterator_benchmark.h
@@ -22,8 +22,8 @@
 #include <QtTest>
 
 class KisPaintDevice;
-class KoColorSpace;
 class KoColor;
+class KoColorSpace;
 
 
 class KisVLineIteratorBenchmark : public QObject
diff --git a/krita/libbrush/abr_struct_parser.cpp b/krita/libbrush/abr_struct_parser.cpp
--- a/krita/libbrush/abr_struct_parser.cpp
+++ b/krita/libbrush/abr_struct_parser.cpp
@@ -25,7 +25,6 @@
 #include <QDomDocument>
 
 #include "abr_struct_parser.h"
-#include "kis_abr_translator.h"
 
 
 AbrStructParser::AbrStructParser()
diff --git a/krita/libbrush/kis_abr_brush.h b/krita/libbrush/kis_abr_brush.h
--- a/krita/libbrush/kis_abr_brush.h
+++ b/krita/libbrush/kis_abr_brush.h
@@ -27,10 +27,10 @@
 #include "kis_types.h"
 #include "kis_shared.h"
 #include "kis_paint_information.h"
-#include "kis_abr_brush_collection.h"
 #include "kritabrush_export.h"
 
 class KisQImagemask;
+class KisAbrBrushCollection;
 typedef KisSharedPtr<KisQImagemask> KisQImagemaskSP;
 
 class QString;
diff --git a/krita/libbrush/kis_abr_brush.cpp b/krita/libbrush/kis_abr_brush.cpp
--- a/krita/libbrush/kis_abr_brush.cpp
+++ b/krita/libbrush/kis_abr_brush.cpp
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 #include "kis_abr_brush.h"
-#include "kis_brush.h"
+#include "kis_abr_brush_collection.h"
 
 #include <QDomElement>
 #include <QFile>
diff --git a/krita/libbrush/kis_brush.h b/krita/libbrush/kis_brush.h
--- a/krita/libbrush/kis_brush.h
+++ b/krita/libbrush/kis_brush.h
@@ -32,7 +32,6 @@
 typedef KisSharedPtr<KisQImagemask> KisQImagemaskSP;
 
 class QString;
-class QPoint;
 class KoColor;
 class KoColorSpace;
 
diff --git a/krita/libbrush/kis_brush_registry.cpp b/krita/libbrush/kis_brush_registry.cpp
--- a/krita/libbrush/kis_brush_registry.cpp
+++ b/krita/libbrush/kis_brush_registry.cpp
@@ -27,7 +27,6 @@
 #include <kis_debug.h>
 
 #include "kis_brush_server.h"
-#include "kis_brush_factory.h"
 #include "kis_auto_brush_factory.h"
 #include "kis_text_brush_factory.h"
 #include "kis_predefined_brush_factory.h"
diff --git a/krita/libbrush/kis_brush_server.h b/krita/libbrush/kis_brush_server.h
--- a/krita/libbrush/kis_brush_server.h
+++ b/krita/libbrush/kis_brush_server.h
@@ -28,7 +28,6 @@
 #include "kritabrush_export.h"
 #include "kis_brush.h"
 
-class KoResource;
 class KoResourceLoaderThread;
 
 typedef KoResourceServer<KisBrush, SharedPointerStoragePolicy<KisBrushSP> > KisBrushResourceServer;
diff --git a/krita/libbrush/kis_gbr_brush.cpp b/krita/libbrush/kis_gbr_brush.cpp
--- a/krita/libbrush/kis_gbr_brush.cpp
+++ b/krita/libbrush/kis_gbr_brush.cpp
@@ -26,8 +26,6 @@
 
 #include "kis_gbr_brush.h"
 
-#include "kis_brush.h"
-
 #include <QDomElement>
 #include <QFile>
 #include <QImage>
diff --git a/krita/libbrush/kis_imagepipe_brush_p.h b/krita/libbrush/kis_imagepipe_brush_p.h
--- a/krita/libbrush/kis_imagepipe_brush_p.h
+++ b/krita/libbrush/kis_imagepipe_brush_p.h
@@ -38,9 +38,8 @@
 
 #include "kis_global.h"
 #include "kis_paint_device.h"
-#include "kis_brush.h"
 #include "kis_layer.h"
-#include "kis_boundary.h"
+
 
 /**
  * The parasite info that gets loaded from the terribly documented gimp pipe brush parasite.
diff --git a/krita/libbrush/kis_text_brush.h b/krita/libbrush/kis_text_brush.h
--- a/krita/libbrush/kis_text_brush.h
+++ b/krita/libbrush/kis_text_brush.h
@@ -24,7 +24,6 @@
 
 #include "kis_brush.h"
 #include "kritabrush_export.h"
-#include "kis_gbr_brush.h"
 
 class KisTextBrushesPipe;
 
diff --git a/krita/libglobal/kis_icon_utils.h b/krita/libglobal/kis_icon_utils.h
--- a/krita/libglobal/kis_icon_utils.h
+++ b/krita/libglobal/kis_icon_utils.h
@@ -21,7 +21,6 @@
 
 #include "kritaglobal_export.h"
 
-class QIcon;
 class QAbstractButton;
 class QComboBox;
 class QAction;
diff --git a/krita/libpsd/asl/kis_asl_writer_utils.cpp b/krita/libpsd/asl/kis_asl_writer_utils.cpp
--- a/krita/libpsd/asl/kis_asl_writer_utils.cpp
+++ b/krita/libpsd/asl/kis_asl_writer_utils.cpp
@@ -20,7 +20,6 @@
 
 #include <QUuid>
 #include "KoPattern.h"
-#include "kis_debug.h"
 
 
 namespace KisAslWriterUtils {
diff --git a/krita/libpsd/asl/kis_asl_xml_parser.h b/krita/libpsd/asl/kis_asl_xml_parser.h
--- a/krita/libpsd/asl/kis_asl_xml_parser.h
+++ b/krita/libpsd/asl/kis_asl_xml_parser.h
@@ -22,7 +22,6 @@
 #include "kritapsd_export.h"
 
 class QDomDocument;
-class QIODevice;
 class KisAslObjectCatcher;
 
 
diff --git a/krita/plugins/extensions/dockers/defaultdockers/kis_layer_box.h b/krita/plugins/extensions/dockers/defaultdockers/kis_layer_box.h
--- a/krita/plugins/extensions/dockers/defaultdockers/kis_layer_box.h
+++ b/krita/plugins/extensions/dockers/defaultdockers/kis_layer_box.h
@@ -36,6 +36,7 @@
 
 #include <kis_types.h>
 
+#include "kis_action.h"
 #include "KisViewManager.h"
 #include "kis_mainwindow_observer.h"
 
diff --git a/krita/plugins/extensions/layersplit/layersplit.cpp b/krita/plugins/extensions/layersplit/layersplit.cpp
--- a/krita/plugins/extensions/layersplit/layersplit.cpp
+++ b/krita/plugins/extensions/layersplit/layersplit.cpp
@@ -28,6 +28,7 @@
 
 #include <KoColorSpace.h>
 #include <KoChannelInfo.h>
+#include <KoColor.h>
 
 #include <kis_debug.h>
 #include <kis_types.h>
diff --git a/krita/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc b/krita/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc
--- a/krita/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc
+++ b/krita/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc
@@ -35,6 +35,7 @@
 #include "kis_paintop_registry.h"
 #include "kis_brush_based_paintop_settings.h"
 #include "kis_brush_server.h"
+#include "kis_duplicateop_settings_widget.h"
 
 K_PLUGIN_FACTORY_WITH_JSON(DefaultPaintOpsPluginFactory, "kritadefaultpaintops.json", registerPlugin<DefaultPaintOpsPlugin>();)
 
diff --git a/krita/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_settings.h b/krita/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_settings.h
--- a/krita/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_settings.h
+++ b/krita/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop_settings.h
@@ -27,8 +27,6 @@
 #include <kis_types.h>
 #include <QPointF>
 
-#include "kis_duplicateop_settings_widget.h"
-
 class QDomElement;
 class KisDuplicateOpSettings : public KisBrushBasedPaintOpSettings
 {
diff --git a/krita/plugins/paintops/deform/kis_deform_paintop.cpp b/krita/plugins/paintops/deform/kis_deform_paintop.cpp
--- a/krita/plugins/paintops/deform/kis_deform_paintop.cpp
+++ b/krita/plugins/paintops/deform/kis_deform_paintop.cpp
@@ -30,8 +30,6 @@
 #include "kis_global.h"
 #include "kis_paint_device.h"
 #include "kis_painter.h"
-#include "kis_types.h"
-#include "kis_paintop.h"
 #include "kis_selection.h"
 #include "kis_random_accessor_ng.h"
 
diff --git a/krita/plugins/paintops/dynadraw/kis_dyna_paintop.h b/krita/plugins/paintops/dynadraw/kis_dyna_paintop.h
--- a/krita/plugins/paintops/dynadraw/kis_dyna_paintop.h
+++ b/krita/plugins/paintops/dynadraw/kis_dyna_paintop.h
@@ -25,9 +25,9 @@
 
 #include "dyna_brush.h"
 
-#include "kis_dyna_paintop_settings.h"
 
 class KisPainter;
+class KisDynaPaintOpSettings;
 
 class KisDynaPaintOp : public KisPaintOp
 {
diff --git a/krita/plugins/paintops/filterop/kis_filterop_settings.cpp b/krita/plugins/paintops/filterop/kis_filterop_settings.cpp
--- a/krita/plugins/paintops/filterop/kis_filterop_settings.cpp
+++ b/krita/plugins/paintops/filterop/kis_filterop_settings.cpp
@@ -24,7 +24,6 @@
 
 #include <QDomDocument>
 
-#include "kis_filterop_settings_widget.h"
 
 #include <kis_filter_option.h>
 #include <filter/kis_filter.h>
diff --git a/krita/plugins/paintops/hairy/hairy_brush.cpp b/krita/plugins/paintops/hairy/hairy_brush.cpp
--- a/krita/plugins/paintops/hairy/hairy_brush.cpp
+++ b/krita/plugins/paintops/hairy/hairy_brush.cpp
@@ -26,7 +26,6 @@
 #endif
 
 #include "hairy_brush.h"
-#include "trajectory.h"
 
 #include <KoColor.h>
 #include <KoColorSpace.h>
diff --git a/krita/plugins/paintops/hairy/kis_hairy_paintop_settings.h b/krita/plugins/paintops/hairy/kis_hairy_paintop_settings.h
--- a/krita/plugins/paintops/hairy/kis_hairy_paintop_settings.h
+++ b/krita/plugins/paintops/hairy/kis_hairy_paintop_settings.h
@@ -25,7 +25,6 @@
 #include <kis_brush_based_paintop_settings.h>
 #include <kis_types.h>
 
-class QPainter;
 
 class KisHairyPaintOpSettings : public KisBrushBasedPaintOpSettings
 {
diff --git a/krita/plugins/paintops/libpaintop/kis_brush_based_paintop.h b/krita/plugins/paintops/libpaintop/kis_brush_based_paintop.h
--- a/krita/plugins/paintops/libpaintop/kis_brush_based_paintop.h
+++ b/krita/plugins/paintops/libpaintop/kis_brush_based_paintop.h
@@ -30,6 +30,7 @@
 
 class KisPropertiesConfiguration;
 class KisPressureSpacingOption;
+class KisDabCache;
 
 /// Internal
 class TextBrushInitializationWorkaround
diff --git a/krita/plugins/paintops/libpaintop/kis_brush_based_paintop.cpp b/krita/plugins/paintops/libpaintop/kis_brush_based_paintop.cpp
--- a/krita/plugins/paintops/libpaintop/kis_brush_based_paintop.cpp
+++ b/krita/plugins/paintops/libpaintop/kis_brush_based_paintop.cpp
@@ -16,7 +16,6 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 #include "kis_brush_based_paintop.h"
-#include "kis_brush.h"
 #include "kis_properties_configuration.h"
 #include "kis_brush_option.h"
 #include <kis_pressure_spacing_option.h>
diff --git a/krita/plugins/paintops/spray/kis_spray_paintop.cpp b/krita/plugins/paintops/spray/kis_spray_paintop.cpp
--- a/krita/plugins/paintops/spray/kis_spray_paintop.cpp
+++ b/krita/plugins/paintops/spray/kis_spray_paintop.cpp
@@ -27,6 +27,7 @@
 #include <kis_painter.h>
 #include <kis_types.h>
 #include <kis_paintop.h>
+#include <kis_node.h>
 
 #include <kis_pressure_rotation_option.h>
 #include <kis_pressure_opacity_option.h>
diff --git a/krita/plugins/paintops/spray/spray_brush.h b/krita/plugins/paintops/spray/spray_brush.h
--- a/krita/plugins/paintops/spray/spray_brush.h
+++ b/krita/plugins/paintops/spray/spray_brush.h
@@ -30,13 +30,11 @@
 #include "kis_sprayop_option.h"
 
 
-#include "random_gauss.h"
-
 #include <QImage>
 #include <kis_brush.h>
 
 class KisPaintInformation;
-class KisBrush;
+class RandomGauss;
 
 class SprayBrush
 {
diff --git a/krita/plugins/paintops/tangentnormal/kis_tangent_tilt_option.h b/krita/plugins/paintops/tangentnormal/kis_tangent_tilt_option.h
--- a/krita/plugins/paintops/tangentnormal/kis_tangent_tilt_option.h
+++ b/krita/plugins/paintops/tangentnormal/kis_tangent_tilt_option.h
@@ -36,7 +36,6 @@
 //const QString TANGENT_DIR_MAX = "Tangent/directionMaximum";
 
 class KisPropertiesConfiguration;
-class KisPainter;
 class KisTangentTiltOptionWidget;
 
 class KisTangentTiltOption: public KisPaintOpOption//not really//
diff --git a/krita/plugins/tools/defaulttools/kis_tool_brush.cc b/krita/plugins/tools/defaulttools/kis_tool_brush.cc
--- a/krita/plugins/tools/defaulttools/kis_tool_brush.cc
+++ b/krita/plugins/tools/defaulttools/kis_tool_brush.cc
@@ -26,6 +26,7 @@
 
 #include <klocalizedstring.h>
 #include <QAction>
+#include <QLabel>
 #include <kactioncollection.h>
 
 
@@ -35,6 +36,7 @@
 #include "kis_cursor.h"
 #include "kis_config.h"
 #include "kis_slider_spin_box.h"
+#include "kundo2magicstring.h"
 
 #define MAXIMUM_SMOOTHNESS_DISTANCE 1000.0 // 0..1000.0 == weight in gui
 #define MAXIMUM_MAGNETISM 1000
diff --git a/krita/plugins/tools/defaulttools/kis_tool_multihand.cpp b/krita/plugins/tools/defaulttools/kis_tool_multihand.cpp
--- a/krita/plugins/tools/defaulttools/kis_tool_multihand.cpp
+++ b/krita/plugins/tools/defaulttools/kis_tool_multihand.cpp
@@ -26,6 +26,7 @@
 #include <QFormLayout>
 #include <QStackedWidget>
 #include <kis_slider_spin_box.h>
+#include <QLabel>
 
 #include "kis_canvas2.h"
 #include "kis_cursor.h"
diff --git a/krita/plugins/tools/tool_dyna/kis_tool_dyna.cpp b/krita/plugins/tools/tool_dyna/kis_tool_dyna.cpp
--- a/krita/plugins/tools/tool_dyna/kis_tool_dyna.cpp
+++ b/krita/plugins/tools/tool_dyna/kis_tool_dyna.cpp
@@ -22,11 +22,13 @@
 
 #include <QCheckBox>
 #include <QDoubleSpinBox>
+#include <QLabel>
 
 #include <klocalizedstring.h>
 #include <ksharedconfig.h>
 
 #include "KoPointerEvent.h"
+#include "kundo2magicstring.h"
 
 #include "kis_cursor.h"
 #include <kis_slider_spin_box.h>
diff --git a/krita/plugins/tools/tool_grid/kis_tool_grid.cc b/krita/plugins/tools/tool_grid/kis_tool_grid.cc
--- a/krita/plugins/tools/tool_grid/kis_tool_grid.cc
+++ b/krita/plugins/tools/tool_grid/kis_tool_grid.cc
@@ -30,6 +30,7 @@
 #include <kis_config.h>
 #include <kis_cursor.h>
 #include <KisViewManager.h>
+#include "kis_canvas_decoration.h"
 
 
 KisToolGrid::KisToolGrid(KoCanvasBase * canvas)
diff --git a/krita/ui/KisApplication.h b/krita/ui/KisApplication.h
--- a/krita/ui/KisApplication.h
+++ b/krita/ui/KisApplication.h
@@ -25,10 +25,7 @@
 
 class KisMainWindow;
 class KisApplicationPrivate;
-class KCmdLineArgs;
 class QWidget;
-class QStringList;
-class QCommandLineParser;
 class KisApplicationArguments;
 
 #include <KisImportExportManager.h>
diff --git a/krita/ui/KisDocument.cpp b/krita/ui/KisDocument.cpp
--- a/krita/ui/KisDocument.cpp
+++ b/krita/ui/KisDocument.cpp
@@ -63,7 +63,6 @@
 #include <kfileitem.h>
 #include <kdirnotify.h>
 #include <QTemporaryFile>
-#include "kundo2stack.h"
 #include <kbackup.h>
 
 #include <QApplication>
diff --git a/krita/ui/KisDocumentEntry.h b/krita/ui/KisDocumentEntry.h
--- a/krita/ui/KisDocumentEntry.h
+++ b/krita/ui/KisDocumentEntry.h
@@ -26,7 +26,6 @@
 #include "kritaui_export.h"
 
 class QStringList;
-class KisDocument;
 class QPluginLoader;
 
 /**
diff --git a/krita/ui/KisFilterChain.cpp b/krita/ui/KisFilterChain.cpp
--- a/krita/ui/KisFilterChain.cpp
+++ b/krita/ui/KisFilterChain.cpp
@@ -21,7 +21,6 @@
 
 #include "KisImportExportManager.h"  // KisImportExportManager::filterAvailable, private API
 #include "KisDocumentEntry.h"
-#include "KisFilterEntry.h"
 #include "KisDocument.h"
 #include "KisPart.h"
 
diff --git a/krita/ui/KisFilterChainLink.h b/krita/ui/KisFilterChainLink.h
--- a/krita/ui/KisFilterChainLink.h
+++ b/krita/ui/KisFilterChainLink.h
@@ -22,7 +22,6 @@
 #include <KisFilterChain.h>
 
 class QByteArray;
-class KoUpdater;
 
 namespace CalligraFilter {
 
diff --git a/krita/ui/KisFilterGraph.h b/krita/ui/KisFilterGraph.h
--- a/krita/ui/KisFilterGraph.h
+++ b/krita/ui/KisFilterGraph.h
@@ -21,7 +21,6 @@
 
 #include "kritaui_export.h"
 #include "KisFilterChain.h"
-#include "KisFilterVertex.h"
 #include <QByteArray>
 #include <QHash>
 
diff --git a/krita/ui/KisImportExportManager.h b/krita/ui/KisImportExportManager.h
--- a/krita/ui/KisImportExportManager.h
+++ b/krita/ui/KisImportExportManager.h
@@ -27,10 +27,10 @@
 #include <QByteArray>
 #include <QUrl>
 
-#include "KisFilterChain.h"
 #include "KisFilterGraph.h"
 
 #include "kritaui_export.h"
+class KisFilterChain;
 class KisDocument;
 class KoProgressUpdater;
 
diff --git a/krita/ui/KisMainWindow.cpp b/krita/ui/KisMainWindow.cpp
--- a/krita/ui/KisMainWindow.cpp
+++ b/krita/ui/KisMainWindow.cpp
@@ -103,7 +103,6 @@
 #include "kis_canvas2.h"
 #include "KisViewManager.h"
 #include "KisDocument.h"
-#include "KisView.h"
 #include "dialogs/kis_dlg_preferences.h"
 #include "kis_config_notifier.h"
 #include "kis_canvas_resource_provider.h"
diff --git a/krita/ui/KisOpenPane.h b/krita/ui/KisOpenPane.h
--- a/krita/ui/KisOpenPane.h
+++ b/krita/ui/KisOpenPane.h
@@ -24,7 +24,6 @@
 #include <QPixmap>
 #include <QList>
 
-class KConfig;
 class KisOpenPanePrivate;
 class QPixmap;
 class KisTemplatesPane;
diff --git a/krita/ui/KisPart.cpp b/krita/ui/KisPart.cpp
--- a/krita/ui/KisPart.cpp
+++ b/krita/ui/KisPart.cpp
@@ -34,7 +34,6 @@
 #include <kis_icon_utils.h>
 
 #include "KisApplication.h"
-#include "KisMainWindow.h"
 #include "KisDocument.h"
 #include "KisView.h"
 #include "KisViewManager.h"
@@ -48,7 +47,6 @@
 #include <KoDialog.h>
 #include <kdesktopfile.h>
 #include <QMessageBox>
-
 #include <klocalizedstring.h>
 #include <kactioncollection.h>
 #include <kconfig.h>
diff --git a/krita/ui/KisPrintJob.h b/krita/ui/KisPrintJob.h
--- a/krita/ui/KisPrintJob.h
+++ b/krita/ui/KisPrintJob.h
@@ -29,8 +29,6 @@
 
 #include <kis_types.h>
 
-class QWidget;
-
 /**
  * A print job is an interface that the KisView uses to create an application-specific
  * class that can take care of printing.
diff --git a/krita/ui/KisViewManager.h b/krita/ui/KisViewManager.h
--- a/krita/ui/KisViewManager.h
+++ b/krita/ui/KisViewManager.h
@@ -24,26 +24,22 @@
 #include <QPointer>
 
 #include <KisMainWindow.h>
-#include <KisView.h>
 #include <KoProgressUpdater.h>
 #include <KoToolManager.h>
 
 #include <kritaui_export.h>
 #include <kis_types.h>
 
 #include "kis_floating_message.h"
-#include "KisView.h"
 
-class KisAction;
 class QPoint;
-
+class KisView;
 
 class KisCanvas2;
 class KisCanvasResourceProvider;
 class KisDocument;
 class KisFilterManager;
 class KisGridManager;
-class KisImage;
 class KisImageManager;
 class KisNodeManager;
 class KisPaintingAssistantsManager;
diff --git a/krita/ui/KisViewManager.cpp b/krita/ui/KisViewManager.cpp
--- a/krita/ui/KisViewManager.cpp
+++ b/krita/ui/KisViewManager.cpp
@@ -98,7 +98,6 @@
 #include <kis_image.h>
 #include "kis_image_manager.h"
 #include <kis_layer.h>
-#include "KisMainWindow.h"
 #include "kis_mainwindow_observer.h"
 #include "kis_mask_manager.h"
 #include "kis_mimedata.h"
diff --git a/krita/ui/actions/kis_selection_action_factories.cpp b/krita/ui/actions/kis_selection_action_factories.cpp
--- a/krita/ui/actions/kis_selection_action_factories.cpp
+++ b/krita/ui/actions/kis_selection_action_factories.cpp
@@ -23,6 +23,7 @@
 
 #include <KisMainWindow.h>
 #include <KisDocumentEntry.h>
+#include <KisDocument.h>
 #include <KisPart.h>
 #include <KoPathShape.h>
 #include <KoShapeController.h>
diff --git a/krita/ui/canvas/kis_abstract_canvas_widget.h b/krita/ui/canvas/kis_abstract_canvas_widget.h
--- a/krita/ui/canvas/kis_abstract_canvas_widget.h
+++ b/krita/ui/canvas/kis_abstract_canvas_widget.h
@@ -26,7 +26,6 @@
 
 class KoToolProxy;
 
-class KisCanvas2;
 class KisCanvasDecoration;
 class KisDisplayFilter;
 class KisDisplayColorConverter;
diff --git a/krita/ui/canvas/kis_canvas_decoration.h b/krita/ui/canvas/kis_canvas_decoration.h
--- a/krita/ui/canvas/kis_canvas_decoration.h
+++ b/krita/ui/canvas/kis_canvas_decoration.h
@@ -27,8 +27,6 @@
 #include <kis_canvas2.h>
 #include <KisView.h>
 
-class QPoint;
-class QRect;
 class QRectF;
 class QPainter;
 class KisCoordinatesConverter;
diff --git a/krita/ui/canvas/kis_canvas_decoration.cc b/krita/ui/canvas/kis_canvas_decoration.cc
--- a/krita/ui/canvas/kis_canvas_decoration.cc
+++ b/krita/ui/canvas/kis_canvas_decoration.cc
@@ -18,8 +18,6 @@
 
 #include "kis_canvas_decoration.h"
 
-#include "KisView.h"
-#include "kis_canvas2.h"
 #include "kis_debug.h"
 
 struct KisCanvasDecoration::Private {
diff --git a/krita/ui/canvas/kis_canvas_widget_base.h b/krita/ui/canvas/kis_canvas_widget_base.h
--- a/krita/ui/canvas/kis_canvas_widget_base.h
+++ b/krita/ui/canvas/kis_canvas_widget_base.h
@@ -31,6 +31,7 @@
 
 class KisCoordinatesConverter;
 class KisDisplayFilter;
+class KisCanvas2;
 
 #include "kritaui_export.h"
 
diff --git a/krita/ui/canvas/kis_canvas_widget_base.cpp b/krita/ui/canvas/kis_canvas_widget_base.cpp
--- a/krita/ui/canvas/kis_canvas_widget_base.cpp
+++ b/krita/ui/canvas/kis_canvas_widget_base.cpp
@@ -38,6 +38,7 @@
 #include "kis_canvas2.h"
 #include "../KisViewManager.h"
 #include "../kis_selection_manager.h"
+#include "../KisDocument.h"
 
 struct KisCanvasWidgetBase::Private
 {
diff --git a/krita/ui/canvas/kis_display_filter.h b/krita/ui/canvas/kis_display_filter.h
--- a/krita/ui/canvas/kis_display_filter.h
+++ b/krita/ui/canvas/kis_display_filter.h
@@ -25,9 +25,8 @@
 
 #include <opengl/kis_opengl.h>
 #include <kritaui_export.h>
-#include "kis_exposure_gamma_correction_interface.h"
-
 
+class KisExposureGammaCorrectionInterface;
 
 /**
  * @brief The KisDisplayFilter class is the base class for filters that
diff --git a/krita/ui/canvas/kis_grid_manager.h b/krita/ui/canvas/kis_grid_manager.h
--- a/krita/ui/canvas/kis_grid_manager.h
+++ b/krita/ui/canvas/kis_grid_manager.h
@@ -21,7 +21,6 @@
 #ifndef KIS_GRID_MANAGER_H
 #define KIS_GRID_MANAGER_H
 
-#include "kis_canvas_decoration.h"
 #include <QPainter>
 
 #include "kis_types.h"
diff --git a/krita/ui/canvas/kis_grid_manager.cpp b/krita/ui/canvas/kis_grid_manager.cpp
--- a/krita/ui/canvas/kis_grid_manager.cpp
+++ b/krita/ui/canvas/kis_grid_manager.cpp
@@ -35,7 +35,6 @@
 #include "KisViewManager.h"
 #include "KisDocument.h"
 #include "KisView.h"
-#include "kis_action.h"
 
 KisGridManager::KisGridManager(KisViewManager * parent) : QObject(parent)
 {
diff --git a/krita/ui/canvas/kis_perspective_grid_manager.h b/krita/ui/canvas/kis_perspective_grid_manager.h
--- a/krita/ui/canvas/kis_perspective_grid_manager.h
+++ b/krita/ui/canvas/kis_perspective_grid_manager.h
@@ -21,8 +21,9 @@
 #ifndef KIS_PERSPECTIVE_GRID_MANAGER_H
 #define KIS_PERSPECTIVE_GRID_MANAGER_H
 
-#include "kis_canvas_decoration.h"
 #include <QPainter>
+#include <QPointer>
+#include "KisView.h"
 
 #include <kritaui_export.h>
 
diff --git a/krita/ui/canvas/kis_prescaled_projection.h b/krita/ui/canvas/kis_prescaled_projection.h
--- a/krita/ui/canvas/kis_prescaled_projection.h
+++ b/krita/ui/canvas/kis_prescaled_projection.h
@@ -23,10 +23,8 @@
 #include <kritaui_export.h>
 #include <kis_shared.h>
 
-#include "kis_update_info.h"
 #include "KoColorConversionTransformation.h"
 class QImage;
-class QPoint;
 class QRect;
 class QSize;
 class QPainter;
diff --git a/krita/ui/canvas/kis_qpainter_canvas.h b/krita/ui/canvas/kis_qpainter_canvas.h
--- a/krita/ui/canvas/kis_qpainter_canvas.h
+++ b/krita/ui/canvas/kis_qpainter_canvas.h
@@ -22,12 +22,10 @@
 #include <QWidget>
 
 #include "kis_canvas_widget_base.h"
-#include "kis_prescaled_projection.h"
 #include "kis_ui_types.h"
 
 class QImage;
 class QPaintEvent;
-class QPainter;
 class KisCanvas2;
 class KisDisplayColorConverter;
 
diff --git a/krita/ui/dialogs/kis_dlg_adjustment_layer.h b/krita/ui/dialogs/kis_dlg_adjustment_layer.h
--- a/krita/ui/dialogs/kis_dlg_adjustment_layer.h
+++ b/krita/ui/dialogs/kis_dlg_adjustment_layer.h
@@ -22,8 +22,6 @@
 #include <KoDialog.h>
 #include <QLabel>
 
-class KisFilter;
-class QLabel;
 class KisFilterConfiguration;
 class KisNodeFilterInterface;
 class KisViewManager;
diff --git a/krita/ui/dialogs/kis_dlg_filter.h b/krita/ui/dialogs/kis_dlg_filter.h
--- a/krita/ui/dialogs/kis_dlg_filter.h
+++ b/krita/ui/dialogs/kis_dlg_filter.h
@@ -24,7 +24,6 @@
 
 #include <kis_types.h>
 
-class KisFilter;
 class KisViewManager;
 class KisFilterManager;
 
diff --git a/krita/ui/dialogs/kis_dlg_generator_layer.h b/krita/ui/dialogs/kis_dlg_generator_layer.h
--- a/krita/ui/dialogs/kis_dlg_generator_layer.h
+++ b/krita/ui/dialogs/kis_dlg_generator_layer.h
@@ -22,7 +22,6 @@
 #include <KoDialog.h>
 #include <QString>
 
-class KisFilter;
 class KisFilterConfiguration;
 class KisViewManager;
 
diff --git a/krita/ui/dialogs/kis_dlg_image_properties.h b/krita/ui/dialogs/kis_dlg_image_properties.h
--- a/krita/ui/dialogs/kis_dlg_image_properties.h
+++ b/krita/ui/dialogs/kis_dlg_image_properties.h
@@ -24,7 +24,6 @@
 #include "ui_wdgimageproperties.h"
 
 class KoColorSpace;
-class KoColor;
 class KoColorPopupAction;
 
 class WdgImageProperties : public QWidget, public Ui::WdgImageProperties
diff --git a/krita/ui/dialogs/kis_dlg_image_properties.cc b/krita/ui/dialogs/kis_dlg_image_properties.cc
--- a/krita/ui/dialogs/kis_dlg_image_properties.cc
+++ b/krita/ui/dialogs/kis_dlg_image_properties.cc
@@ -37,7 +37,6 @@
 #include "KoColorPopupAction.h"
 #include "kis_icon_utils.h"
 #include "KoID.h"
-#include "kis_types.h"
 #include "kis_image.h"
 #include "kis_annotation.h"
 #include "kis_config.h"
diff --git a/krita/ui/input/config/kis_input_button.cpp b/krita/ui/input/config/kis_input_button.cpp
--- a/krita/ui/input/config/kis_input_button.cpp
+++ b/krita/ui/input/config/kis_input_button.cpp
@@ -27,7 +27,6 @@
 
 #include "kis_icon_utils.h"
 
-#include "input/kis_shortcut_configuration.h"
 
 class KisInputButton::Private
 {
diff --git a/krita/ui/input/kis_alternate_invocation_action.cpp b/krita/ui/input/kis_alternate_invocation_action.cpp
--- a/krita/ui/input/kis_alternate_invocation_action.cpp
+++ b/krita/ui/input/kis_alternate_invocation_action.cpp
@@ -25,7 +25,6 @@
 #include <kis_canvas2.h>
 
 #include "kis_input_manager.h"
-#include "kis_tool.h"
 #include "kis_cursor.h"
 
 struct KisAlternateInvocationAction::Private
diff --git a/krita/ui/input/kis_input_manager.h b/krita/ui/input/kis_input_manager.h
--- a/krita/ui/input/kis_input_manager.h
+++ b/krita/ui/input/kis_input_manager.h
@@ -23,7 +23,6 @@
 #include <kritaui_export.h>
 
 class QPointF;
-class QTabletEvent;
 class QTouchEvent;
 class KisToolProxy;
 class KisCanvas2;
diff --git a/krita/ui/input/kis_input_manager_p.h b/krita/ui/input/kis_input_manager_p.h
--- a/krita/ui/input/kis_input_manager_p.h
+++ b/krita/ui/input/kis_input_manager_p.h
@@ -26,15 +26,13 @@
 
 #include "kis_input_manager.h"
 #include "kis_shortcut_matcher.h"
-#include "kis_tool_invocation_action.h"
-#include "kis_alternate_invocation_action.h"
 #include "kis_shortcut_configuration.h"
 #include "kis_canvas2.h"
 #include "kis_tool_proxy.h"
 #include "kis_signal_compressor.h"
 #include "input/kis_tablet_debugger.h"
 
-#include "kis_abstract_input_action.h"
+class KisToolInvocationAction;
 
 
 class KisInputManager::Private
diff --git a/krita/ui/input/kis_input_manager_p.cpp b/krita/ui/input/kis_input_manager_p.cpp
--- a/krita/ui/input/kis_input_manager_p.cpp
+++ b/krita/ui/input/kis_input_manager_p.cpp
@@ -23,12 +23,13 @@
 #include <QScopedPointer>
 #include <QtGlobal>
 
+#include "kis_input_manager.h"
 #include "kis_config.h"
 #include "kis_abstract_input_action.h"
+#include "kis_tool_invocation_action.h"
 #include "kis_stroke_shortcut.h"
 #include "kis_touch_shortcut.h"
 #include "kis_input_profile_manager.h"
-#include "input/kis_tablet_debugger.h"
 
 
 
diff --git a/krita/ui/input/kis_shortcut_matcher.h b/krita/ui/input/kis_shortcut_matcher.h
--- a/krita/ui/input/kis_shortcut_matcher.h
+++ b/krita/ui/input/kis_shortcut_matcher.h
@@ -19,14 +19,11 @@
 #ifndef __KIS_SHORTCUT_MATCHER_H
 #define __KIS_SHORTCUT_MATCHER_H
 
-#include "kis_abstract_shortcut.h"
 
 #include <QList>
 #include "kis_single_action_shortcut.h"
 
 class QEvent;
-class QMouseEvent;
-class QKeyEvent;
 class QWheelEvent;
 class QTouchEvent;
 class QString;
diff --git a/krita/ui/kis_asl_layer_style_serializer.cpp b/krita/ui/kis_asl_layer_style_serializer.cpp
--- a/krita/ui/kis_asl_layer_style_serializer.cpp
+++ b/krita/ui/kis_asl_layer_style_serializer.cpp
@@ -34,11 +34,9 @@
 
 #include "psd.h"
 #include "kis_global.h"
-#include "kis_psd_layer_style.h"
 
 #include "asl/kis_asl_reader.h"
 #include "asl/kis_asl_xml_parser.h"
-#include "asl/kis_asl_callback_object_catcher.h"
 #include "asl/kis_asl_writer_utils.h"
 
 #include "asl/kis_asl_xml_writer.h"
diff --git a/krita/ui/kis_autogradient.h b/krita/ui/kis_autogradient.h
--- a/krita/ui/kis_autogradient.h
+++ b/krita/ui/kis_autogradient.h
@@ -22,7 +22,6 @@
 
 #include "ui_wdgautogradient.h"
 
-class KoResource;
 class KoGradientSegment;
 class KoSegmentGradient;
 
diff --git a/krita/ui/kis_clipboard.h b/krita/ui/kis_clipboard.h
--- a/krita/ui/kis_clipboard.h
+++ b/krita/ui/kis_clipboard.h
@@ -25,7 +25,6 @@
 #include "kis_types.h"
 #include <kritaui_export.h>
 
-class QImage;
 class QRect;
 
 enum enumPasteBehaviour {
diff --git a/krita/ui/kis_config.cc b/krita/ui/kis_config.cc
--- a/krita/ui/kis_config.cc
+++ b/krita/ui/kis_config.cc
@@ -39,7 +39,6 @@
 #include <kis_debug.h>
 
 #include "kis_canvas_resource_provider.h"
-#include "kis_global.h"
 #include "kis_config_notifier.h"
 
 #include <config-ocio.h>
diff --git a/krita/ui/kis_histogram_view.cc b/krita/ui/kis_histogram_view.cc
--- a/krita/ui/kis_histogram_view.cc
+++ b/krita/ui/kis_histogram_view.cc
@@ -38,9 +38,7 @@
 #include "KoBasicHistogramProducers.h"
 #include "KoColorSpace.h"
 
-#include "kis_histogram.h"
 #include "kis_global.h"
-#include "kis_types.h"
 #include "kis_layer.h"
 
 #include "kis_paint_device.h"
diff --git a/krita/ui/kis_import_catcher.cc b/krita/ui/kis_import_catcher.cc
--- a/krita/ui/kis_import_catcher.cc
+++ b/krita/ui/kis_import_catcher.cc
@@ -26,7 +26,6 @@
 #include <KisImportExportManager.h>
 
 #include "kis_node_manager.h"
-#include "kis_types.h"
 #include "kis_count_visitor.h"
 #include "KisViewManager.h"
 #include "KisDocument.h"
diff --git a/krita/ui/kis_layer_manager.h b/krita/ui/kis_layer_manager.h
--- a/krita/ui/kis_layer_manager.h
+++ b/krita/ui/kis_layer_manager.h
@@ -26,7 +26,6 @@
 #include "kis_types.h"
 #include "KisView.h"
 
-class QAction;
 
 class KisViewManager;
 class KisFilterConfiguration;
diff --git a/krita/ui/kis_layer_manager.cc b/krita/ui/kis_layer_manager.cc
--- a/krita/ui/kis_layer_manager.cc
+++ b/krita/ui/kis_layer_manager.cc
@@ -69,7 +69,6 @@
 #include <QMimeDatabase>
 #include <QMimeType>
 
-#include "KisView.h"
 #include "kis_config.h"
 #include "kis_cursor.h"
 #include "dialogs/kis_dlg_adj_layer_props.h"
diff --git a/krita/ui/kis_mask_manager.h b/krita/ui/kis_mask_manager.h
--- a/krita/ui/kis_mask_manager.h
+++ b/krita/ui/kis_mask_manager.h
@@ -26,8 +26,6 @@
 
 class KisViewManager;
 class KActionCollection;
-class KisAction;
-class QAction;
 class KisNodeCommandsAdapter;
 class KisActionManager;
 
diff --git a/krita/ui/kis_mask_manager.cc b/krita/ui/kis_mask_manager.cc
--- a/krita/ui/kis_mask_manager.cc
+++ b/krita/ui/kis_mask_manager.cc
@@ -50,7 +50,6 @@
 #include "kis_node_commands_adapter.h"
 #include "commands/kis_selection_commands.h"
 #include "kis_iterator_ng.h"
-#include "KisView.h"
 
 KisMaskManager::KisMaskManager(KisViewManager * view)
     : m_view(view)
diff --git a/krita/ui/kis_mirror_manager.cpp b/krita/ui/kis_mirror_manager.cpp
--- a/krita/ui/kis_mirror_manager.cpp
+++ b/krita/ui/kis_mirror_manager.cpp
@@ -18,7 +18,6 @@
  */
 
 #include "kis_mirror_manager.h"
-#include "KisView.h"
 #include "KisViewManager.h"
 #include <kis_canvas_controller.h>
 
diff --git a/krita/ui/kis_painting_assistant.h b/krita/ui/kis_painting_assistant.h
--- a/krita/ui/kis_painting_assistant.h
+++ b/krita/ui/kis_painting_assistant.h
@@ -35,7 +35,6 @@
 class QRectF;
 class KoStore;
 class KisCoordinatesConverter;
-class KisDocument;
 
 #include <kis_shared_ptr.h>
 #include <KoGenericRegistry.h>
diff --git a/krita/ui/kis_painting_assistants_decoration.cpp b/krita/ui/kis_painting_assistants_decoration.cpp
--- a/krita/ui/kis_painting_assistants_decoration.cpp
+++ b/krita/ui/kis_painting_assistants_decoration.cpp
@@ -27,7 +27,6 @@
 #include <ktoggleaction.h>
 #include "kis_debug.h"
 
-#include "kis_painting_assistant.h"
 #include <QPainter>
 
 struct KisPaintingAssistantsDecoration::Private {
diff --git a/krita/ui/kis_painting_assistants_manager.h b/krita/ui/kis_painting_assistants_manager.h
--- a/krita/ui/kis_painting_assistants_manager.h
+++ b/krita/ui/kis_painting_assistants_manager.h
@@ -24,10 +24,11 @@
 #include <QPointer>
 
 #include "KisView.h"
-#include "kis_action.h"
 
 class KisViewManager;
 class KisPaintingAssistantsDecoration;
+class KisAction;
+class KisActionManager;
 
 
 class KisPaintingAssistantsManager : public QObject
diff --git a/krita/ui/kis_painting_assistants_manager.cpp b/krita/ui/kis_painting_assistants_manager.cpp
--- a/krita/ui/kis_painting_assistants_manager.cpp
+++ b/krita/ui/kis_painting_assistants_manager.cpp
@@ -19,9 +19,9 @@
 
 #include "kis_painting_assistants_manager.h"
 #include "kis_painting_assistants_decoration.h"
-#include "KisView.h"
 #include "KisViewManager.h"
 #include "kis_action_manager.h"
+#include "kis_action.h"
 
 #include <klocalizedstring.h>
 #include <kguiitem.h>
diff --git a/krita/ui/kis_paintop_box.h b/krita/ui/kis_paintop_box.h
--- a/krita/ui/kis_paintop_box.h
+++ b/krita/ui/kis_paintop_box.h
@@ -36,7 +36,6 @@
 #include "kis_locked_properties_proxy.h"
 #include "kis_locked_properties_server.h"
 #include "kis_locked_properties.h"
-#include "kis_config.h"
 #include "kritaui_export.h"
 
 
@@ -58,7 +57,6 @@
 class KisCompositeOpComboBox;
 class KisWidgetChooser;
 class KisFavoriteResourceManager;
-class KisLockedProperties;
 class KisAction;
 
 /**
diff --git a/krita/ui/kis_paintop_option.h b/krita/ui/kis_paintop_option.h
--- a/krita/ui/kis_paintop_option.h
+++ b/krita/ui/kis_paintop_option.h
@@ -26,7 +26,6 @@
 #include <kis_locked_properties_proxy.h>
 
 class QWidget;
-class QString;
 
 /**
  * Base interface for paintop options. A paintop option
diff --git a/krita/ui/kis_paintop_options_model.cpp b/krita/ui/kis_paintop_options_model.cpp
--- a/krita/ui/kis_paintop_options_model.cpp
+++ b/krita/ui/kis_paintop_options_model.cpp
@@ -19,7 +19,6 @@
  */
 
 #include "kis_paintop_options_model.h"
-#include "kis_paintop_option.h"
 
 KisPaintOpOptionListModel::KisPaintOpOptionListModel(QObject *parent)
     : BaseOptionCategorizedListModel(parent)
diff --git a/krita/ui/kis_selection_manager.h b/krita/ui/kis_selection_manager.h
--- a/krita/ui/kis_selection_manager.h
+++ b/krita/ui/kis_selection_manager.h
@@ -20,20 +20,20 @@
 
 #include <QObject>
 #include <QList>
+#include <QPointer>
 
 #include <kis_image.h>
-#
-#include "KisDocument.h"
+#include "KisView.h"
 
 #include <kritaui_export.h>
 
 class KisActionManager;
 class KisAction;
 class QAction;
 class KoViewConverter;
+class KisDocument;
 
 class KisViewManager;
-class KisDoc;
 class KisClipboard;
 class KisNodeCommandsAdapter;
 class KisView;
diff --git a/krita/ui/kis_selection_manager.cc b/krita/ui/kis_selection_manager.cc
--- a/krita/ui/kis_selection_manager.cc
+++ b/krita/ui/kis_selection_manager.cc
@@ -57,7 +57,6 @@
 #include "KisDocument.h"
 #include "kis_fill_painter.h"
 #include "kis_group_layer.h"
-#include "kis_image.h"
 #include "kis_layer.h"
 #include "kis_statusbar.h"
 #include "kis_paint_device.h"
diff --git a/krita/ui/kis_view_plugin.h b/krita/ui/kis_view_plugin.h
--- a/krita/ui/kis_view_plugin.h
+++ b/krita/ui/kis_view_plugin.h
@@ -21,9 +21,10 @@
 #define KIS_VIEW_PLUGIN_H
 
 #include <kritaui_export.h>
-#include "operations/kis_operation_ui_factory.h"
+#include <QObject>
 
 class KisOperation;
+class KisOperationUIFactory;
 class KisAction;
 class KisViewManager;
 
diff --git a/krita/ui/kis_zoom_manager.h b/krita/ui/kis_zoom_manager.h
--- a/krita/ui/kis_zoom_manager.h
+++ b/krita/ui/kis_zoom_manager.h
@@ -31,7 +31,6 @@
 #include "KisView.h"
 
 class KoZoomHandler;
-class QAction;
 class KoZoomAction;
 class KoRuler;
 class KoUnit;
diff --git a/krita/ui/kis_zoom_manager.cc b/krita/ui/kis_zoom_manager.cc
--- a/krita/ui/kis_zoom_manager.cc
+++ b/krita/ui/kis_zoom_manager.cc
@@ -39,7 +39,6 @@
 
 #include "KisDocument.h"
 #include "KisViewManager.h"
-#include "KisView.h"
 #include "canvas/kis_canvas2.h"
 #include "kis_coordinates_converter.h"
 #include "kis_image.h"
diff --git a/krita/ui/kra/kis_kra_loader.h b/krita/ui/kra/kis_kra_loader.h
--- a/krita/ui/kra/kis_kra_loader.h
+++ b/krita/ui/kra/kis_kra_loader.h
@@ -26,7 +26,6 @@
 class KoStore;
 
 class KisDocument;
-class KisNode;
 class KoColorSpace;
 class KisPaintingAssistant;
 
diff --git a/krita/ui/opengl/kis_opengl_canvas2.h b/krita/ui/opengl/kis_opengl_canvas2.h
--- a/krita/ui/opengl/kis_opengl_canvas2.h
+++ b/krita/ui/opengl/kis_opengl_canvas2.h
@@ -36,7 +36,6 @@
 #include "kis_ui_types.h"
 
 class QWidget;
-class QPaintEvent;
 class KisCanvas2;
 class KisDisplayColorConverter;
 class QOpenGLShaderProgram;
diff --git a/krita/ui/opengl/kis_texture_tile.h b/krita/ui/opengl/kis_texture_tile.h
--- a/krita/ui/opengl/kis_texture_tile.h
+++ b/krita/ui/opengl/kis_texture_tile.h
@@ -22,7 +22,7 @@
 
 #ifdef HAVE_OPENGL
 
-#include "kis_texture_tile_update_info.h"
+class KisTextureTileUpdateInfo;
 
 #include <QRect>
 #include <QRectF>
diff --git a/krita/ui/opengl/kis_texture_tile.cpp b/krita/ui/opengl/kis_texture_tile.cpp
--- a/krita/ui/opengl/kis_texture_tile.cpp
+++ b/krita/ui/opengl/kis_texture_tile.cpp
@@ -18,11 +18,13 @@
 
 #define GL_GLEXT_PROTOTYPES
 #include "kis_texture_tile.h"
+#include "kis_texture_tile_update_info.h"
 
 #ifdef HAVE_OPENGL
 #include <kis_debug.h>
 #include <QOpenGLFunctions>
 
+
 #ifndef GL_BGRA
 #define GL_BGRA 0x814F
 #endif
diff --git a/krita/ui/operations/kis_operation_ui_factory.h b/krita/ui/operations/kis_operation_ui_factory.h
--- a/krita/ui/operations/kis_operation_ui_factory.h
+++ b/krita/ui/operations/kis_operation_ui_factory.h
@@ -19,8 +19,11 @@
 #ifndef KIS_OPERATION_UI_FACTORY_H
 #define KIS_OPERATION_UI_FACTORY_H
 
-#include "kis_operation_configuration.h"
+#include "kritaui_export.h"
+#include <QString>
+
 class KisViewManager;
+class KisOperationConfiguration;
 
 class KRITAUI_EXPORT KisOperationUIFactory
 {
diff --git a/krita/ui/ora/kis_open_raster_stack_load_visitor.h b/krita/ui/ora/kis_open_raster_stack_load_visitor.h
--- a/krita/ui/ora/kis_open_raster_stack_load_visitor.h
+++ b/krita/ui/ora/kis_open_raster_stack_load_visitor.h
@@ -26,11 +26,8 @@
 class QDomElement;
 
 
-class KisAdjustmentLayer;
 class KisUndoStore;
-class KisGroupLayer;
 class KisOpenRasterLoadContext;
-class KisPaintLayer;
 
 class KRITAUI_EXPORT KisOpenRasterStackLoadVisitor
 {
diff --git a/krita/ui/recorder/kis_recorded_action_creator_factory_registry.h b/krita/ui/recorder/kis_recorded_action_creator_factory_registry.h
--- a/krita/ui/recorder/kis_recorded_action_creator_factory_registry.h
+++ b/krita/ui/recorder/kis_recorded_action_creator_factory_registry.h
@@ -22,7 +22,6 @@
 #include <kritaui_export.h>
 #include <KoID.h>
 
-class KisRecordedAction;
 class KisRecordedActionCreatorFactory;
 
 /**
diff --git a/krita/ui/tests/kis_shape_controller_test.h b/krita/ui/tests/kis_shape_controller_test.h
--- a/krita/ui/tests/kis_shape_controller_test.h
+++ b/krita/ui/tests/kis_shape_controller_test.h
@@ -23,7 +23,6 @@
 
 class KisDocument;
 class KisNameServer;
-class KisShapeController;
 
 
 class KisShapeControllerTest : public KisDummiesFacadeBaseTest
diff --git a/krita/ui/thememanager.h b/krita/ui/thememanager.h
--- a/krita/ui/thememanager.h
+++ b/krita/ui/thememanager.h
@@ -40,7 +40,6 @@
 namespace Digikam
 {
 
-class Theme;
 
 class ThemeManager : public QObject
 {
diff --git a/krita/ui/tool/kis_painting_information_builder.h b/krita/ui/tool/kis_painting_information_builder.h
--- a/krita/ui/tool/kis_painting_information_builder.h
+++ b/krita/ui/tool/kis_painting_information_builder.h
@@ -27,7 +27,6 @@
 #include "kis_paint_information.h"
 
 class KoPointerEvent;
-class KisTool;
 class KisToolFreehand;
 class KisCoordinatesConverter;
 class KisSpeedSmoother;
diff --git a/krita/ui/tool/kis_rectangle_constraint_widget.h b/krita/ui/tool/kis_rectangle_constraint_widget.h
--- a/krita/ui/tool/kis_rectangle_constraint_widget.h
+++ b/krita/ui/tool/kis_rectangle_constraint_widget.h
@@ -18,7 +18,9 @@
 #define KISRECTANGLECONSTRAINTWIDGET_H
 
 #include "ui_wdgrectangleconstraints.h"
-#include "kis_tool_rectangle_base.h"
+#include <kritaui_export.h>
+
+class KisToolRectangleBase;
 
 class KRITAUI_EXPORT KisRectangleConstraintWidget : public QWidget, public Ui::WdgRectangleConstraints
 {
@@ -39,4 +41,4 @@
   Ui_WdgRectangleConstraints *m_widget;
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/krita/ui/tool/kis_rectangle_constraint_widget.cpp b/krita/ui/tool/kis_rectangle_constraint_widget.cpp
--- a/krita/ui/tool/kis_rectangle_constraint_widget.cpp
+++ b/krita/ui/tool/kis_rectangle_constraint_widget.cpp
@@ -15,6 +15,7 @@
  */
 
 #include "kis_rectangle_constraint_widget.h"
+#include "kis_tool_rectangle_base.h"
 
 #include <kis_icon_utils.h>
 
diff --git a/krita/ui/tool/kis_resources_snapshot.cpp b/krita/ui/tool/kis_resources_snapshot.cpp
--- a/krita/ui/tool/kis_resources_snapshot.cpp
+++ b/krita/ui/tool/kis_resources_snapshot.cpp
@@ -32,7 +32,6 @@
 #include "kis_paint_device.h"
 #include "kis_paint_layer.h"
 #include "recorder/kis_recorded_paint_action.h"
-#include "kis_default_bounds.h"
 #include "kis_selection.h"
 #include "kis_selection_mask.h"
 
diff --git a/krita/ui/tool/kis_tool_freehand.h b/krita/ui/tool/kis_tool_freehand.h
--- a/krita/ui/tool/kis_tool_freehand.h
+++ b/krita/ui/tool/kis_tool_freehand.h
@@ -22,7 +22,6 @@
 #include "kis_types.h"
 #include "kis_tool_paint.h"
 #include "kis_paint_information.h"
-#include "kis_resources_snapshot.h"
 #include "kis_paintop_settings.h"
 #include "kis_distance_information.h"
 #include "kis_smoothing_options.h"
diff --git a/krita/ui/tool/kis_tool_freehand_helper.h b/krita/ui/tool/kis_tool_freehand_helper.h
--- a/krita/ui/tool/kis_tool_freehand_helper.h
+++ b/krita/ui/tool/kis_tool_freehand_helper.h
@@ -24,10 +24,10 @@
 #include "kis_types.h"
 #include "kritaui_export.h"
 #include "kis_paint_information.h"
-#include "strokes/freehand_stroke.h"
 #include "kis_default_bounds.h"
 #include "kis_paintop_settings.h"
 #include "kis_smoothing_options.h"
+#include "strokes/freehand_stroke.h"
 
 class KoPointerEvent;
 class KoCanvasResourceManager;
diff --git a/krita/ui/tool/kis_tool_freehand_helper.cpp b/krita/ui/tool/kis_tool_freehand_helper.cpp
--- a/krita/ui/tool/kis_tool_freehand_helper.cpp
+++ b/krita/ui/tool/kis_tool_freehand_helper.cpp
@@ -31,7 +31,6 @@
 #include "kis_recording_adapter.h"
 #include "kis_image.h"
 #include "kis_painter.h"
-#include "kis_smoothing_options.h"
 #include "kis_paintop_preset.h"
 #include "kis_paintop_utils.h"
 
diff --git a/krita/ui/tool/kis_tool_paint.h b/krita/ui/tool/kis_tool_paint.h
--- a/krita/ui/tool/kis_tool_paint.h
+++ b/krita/ui/tool/kis_tool_paint.h
@@ -23,11 +23,7 @@
 
 #include <QCursor>
 #include <QLayout>
-#include <QLabel>
 #include <QGridLayout>
-#include <QKeyEvent>
-#include <QEvent>
-#include <QPaintEvent>
 #include <QVariant>
 #include <QTimer>
 
@@ -46,12 +42,7 @@
 #include "kis_tool.h"
 #include <QCheckBox>
 
-class QEvent;
-class QKeyEvent;
-class QPaintEvent;
 class QGridLayout;
-class QLabel;
-class QPoint;
 class KoCompositeOp;
 
 
diff --git a/krita/ui/tool/strokes/freehand_stroke.h b/krita/ui/tool/strokes/freehand_stroke.h
--- a/krita/ui/tool/strokes/freehand_stroke.h
+++ b/krita/ui/tool/strokes/freehand_stroke.h
@@ -26,7 +26,6 @@
 #include "kis_distance_information.h"
 #include "kis_paint_information.h"
 
-class KisPainter;
 
 
 class KRITAUI_EXPORT FreehandStrokeStrategy : public KisPainterBasedStrokeStrategy
diff --git a/krita/ui/tool/strokes/kis_painter_based_stroke_strategy.cpp b/krita/ui/tool/strokes/kis_painter_based_stroke_strategy.cpp
--- a/krita/ui/tool/strokes/kis_painter_based_stroke_strategy.cpp
+++ b/krita/ui/tool/strokes/kis_painter_based_stroke_strategy.cpp
@@ -23,7 +23,6 @@
 #include "kis_painter.h"
 #include "kis_paint_device.h"
 #include "kis_paint_layer.h"
-#include "kis_selection.h"
 #include "kis_transaction.h"
 #include "kis_image.h"
 #include "kis_distance_information.h"
diff --git a/krita/ui/widgets/kis_color_space_selector.h b/krita/ui/widgets/kis_color_space_selector.h
--- a/krita/ui/widgets/kis_color_space_selector.h
+++ b/krita/ui/widgets/kis_color_space_selector.h
@@ -21,7 +21,6 @@
 #define _KIS_COLOR_SPACE_SELECTOR_H_
 
 #include <QWidget>
-#include "kis_advanced_color_space_selector.h"
 #include <kritaui_export.h>
 
 class KoID;
diff --git a/krita/ui/widgets/kis_color_space_selector.cc b/krita/ui/widgets/kis_color_space_selector.cc
--- a/krita/ui/widgets/kis_color_space_selector.cc
+++ b/krita/ui/widgets/kis_color_space_selector.cc
@@ -19,6 +19,7 @@
  */
 
 #include "kis_color_space_selector.h"
+#include "kis_advanced_color_space_selector.h"
 
 
 #include <QUrl>
diff --git a/krita/ui/widgets/kis_gradient_chooser.h b/krita/ui/widgets/kis_gradient_chooser.h
--- a/krita/ui/widgets/kis_gradient_chooser.h
+++ b/krita/ui/widgets/kis_gradient_chooser.h
@@ -26,7 +26,6 @@
 class KisViewManager;
 class QLabel;
 class QPushButton;
-class KisViewManager;
 class KisAutogradient;
 class KoResource;
 class KoResourceItemChooser;
diff --git a/krita/ui/widgets/kis_multipliers_double_slider_spinbox.h b/krita/ui/widgets/kis_multipliers_double_slider_spinbox.h
--- a/krita/ui/widgets/kis_multipliers_double_slider_spinbox.h
+++ b/krita/ui/widgets/kis_multipliers_double_slider_spinbox.h
@@ -24,7 +24,6 @@
 
 #include <kritaui_export.h>
 
-class KisDoubleSliderSpinBox;
 
 /**
  * This class add a combobox to a \ref KisDoubleSliderSpinBox which
diff --git a/krita/ui/widgets/kis_multipliers_double_slider_spinbox_p.h b/krita/ui/widgets/kis_multipliers_double_slider_spinbox_p.h
--- a/krita/ui/widgets/kis_multipliers_double_slider_spinbox_p.h
+++ b/krita/ui/widgets/kis_multipliers_double_slider_spinbox_p.h
@@ -19,7 +19,6 @@
 #ifndef kis_multipliers_double_slider_spinbox_p_h
 #define kis_multipliers_double_slider_spinbox_p_h
 
-#include "kis_multipliers_double_slider_spinbox.h"
 
 #include "ui_wdgmultipliersdoublesliderspinbox.h"
 
diff --git a/krita/ui/widgets/kis_paintop_presets_popup.h b/krita/ui/widgets/kis_paintop_presets_popup.h
--- a/krita/ui/widgets/kis_paintop_presets_popup.h
+++ b/krita/ui/widgets/kis_paintop_presets_popup.h
@@ -28,7 +28,6 @@
 #include <kis_paintop_factory.h>
 
 class QString;
-class KisPaintOpPreset;
 class KisCanvasResourceProvider;
 class KoResource;
 
diff --git a/krita/ui/widgets/squeezedcombobox.h b/krita/ui/widgets/squeezedcombobox.h
--- a/krita/ui/widgets/squeezedcombobox.h
+++ b/krita/ui/widgets/squeezedcombobox.h
@@ -33,7 +33,6 @@
 
 #include <kritaui_export.h>
 
-class SqueezedComboBox;
 
 
 /** @class SqueezedComboBox