diff --git a/krita/image/brushengine/kis_locked_properties.h b/krita/image/brushengine/kis_locked_properties.h
--- a/krita/image/brushengine/kis_locked_properties.h
+++ b/krita/image/brushengine/kis_locked_properties.h
@@ -20,7 +20,6 @@
 #define KISLOCKEDPROPERTIES_H
 
 #include "kis_properties_configuration.h"
-#include "kis_paintop_settings.h"
 
 /**
  * This class maintains a list of all the PaintOp Options that are supposed to be
diff --git a/krita/image/brushengine/kis_locked_properties_proxy.h b/krita/image/brushengine/kis_locked_properties_proxy.h
--- a/krita/image/brushengine/kis_locked_properties_proxy.h
+++ b/krita/image/brushengine/kis_locked_properties_proxy.h
@@ -19,11 +19,8 @@
 #ifndef KIS_LOCKED_PROPERTIES_PROXY_H
 #define KIS_LOCKED_PROPERTIES_PROXY_H
 
-#include "kis_locked_properties.h"
 #include "kis_properties_configuration.h"
-#include "kis_locked_properties_server.h"
-#include "kis_paintop_preset.h"
-#include "kis_paintop_settings.h"
+
 
 /**
  * This class acts as a proxy for all transfers between KisLockedPropertiesServer
@@ -38,6 +35,7 @@
  * suffix are destroyed.
  */
 class KisLockedPropertiesServer;
+class KisLockedProperties;
 
 class KisLockedPropertiesProxy: public KisPropertiesConfiguration
 {
diff --git a/krita/image/brushengine/kis_locked_properties_proxy.cpp b/krita/image/brushengine/kis_locked_properties_proxy.cpp
--- a/krita/image/brushengine/kis_locked_properties_proxy.cpp
+++ b/krita/image/brushengine/kis_locked_properties_proxy.cpp
@@ -17,6 +17,10 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 #include "kis_locked_properties_proxy.h"
+#include "kis_locked_properties.h"
+#include "kis_locked_properties_server.h"
+#include "kis_paintop_settings.h"
+#include "kis_paintop_preset.h"
 
 KisLockedPropertiesProxy ::KisLockedPropertiesProxy()
     : m_lockedProperties(0)
diff --git a/krita/image/brushengine/kis_locked_properties_server.h b/krita/image/brushengine/kis_locked_properties_server.h
--- a/krita/image/brushengine/kis_locked_properties_server.h
+++ b/krita/image/brushengine/kis_locked_properties_server.h
@@ -20,11 +20,11 @@
 #ifndef KIS_LOCKED_PROPERTIES_SERVER_H
 #define KIS_LOCKED_PROPERTIES_SERVER_H
 
-#include "kis_locked_properties.h"
 #include "kis_locked_properties_proxy.h"
 #include "kis_properties_configuration.h"
 
 class KisLockedPropertiesProxy;
+class KisLockedProperties;
 
 /**
  * The KisLockedPropertiesServer class
diff --git a/krita/image/brushengine/kis_locked_properties_server.cpp b/krita/image/brushengine/kis_locked_properties_server.cpp
--- a/krita/image/brushengine/kis_locked_properties_server.cpp
+++ b/krita/image/brushengine/kis_locked_properties_server.cpp
@@ -17,6 +17,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 #include "kis_locked_properties_server.h"
+#include "kis_locked_properties.h"
 
 #include <QGlobalStatic>
 
diff --git a/krita/image/brushengine/kis_paint_information.cc b/krita/image/brushengine/kis_paint_information.cc
--- a/krita/image/brushengine/kis_paint_information.cc
+++ b/krita/image/brushengine/kis_paint_information.cc
@@ -22,7 +22,6 @@
 #include <QScopedPointer>
 
 #include "kis_paintop.h"
-#include "kis_distance_information.h"
 #include "kis_algebra_2d.h"
 
 
diff --git a/krita/image/brushengine/kis_paintop.h b/krita/image/brushengine/kis_paintop.h
--- a/krita/image/brushengine/kis_paintop.h
+++ b/krita/image/brushengine/kis_paintop.h
@@ -26,7 +26,6 @@
 #include "kis_distance_information.h"
 #include "kis_shared.h"
 #include "kis_types.h"
-#include "kis_paintop_settings.h"
 
 #include <kritaimage_export.h>
 
diff --git a/krita/image/brushengine/kis_paintop.cc b/krita/image/brushengine/kis_paintop.cc
--- a/krita/image/brushengine/kis_paintop.cc
+++ b/krita/image/brushengine/kis_paintop.cc
@@ -30,13 +30,11 @@
 
 #include "kis_painter.h"
 #include "kis_layer.h"
-#include "kis_types.h"
 
 #include "kis_image.h"
 #include "kis_paint_device.h"
 #include "kis_global.h"
 #include "kis_datamanager.h"
-#include "kis_paintop_settings.h"
 #include "kis_paintop_preset.h"
 #include "kis_paint_information.h"
 #include "kis_vec.h"
diff --git a/krita/image/brushengine/kis_paintop_preset.cpp b/krita/image/brushengine/kis_paintop_preset.cpp
--- a/krita/image/brushengine/kis_paintop_preset.cpp
+++ b/krita/image/brushengine/kis_paintop_preset.cpp
@@ -29,7 +29,6 @@
 
 #include <KoInputDevice.h>
 
-#include "kis_types.h"
 #include "kis_paintop_settings.h"
 #include "kis_paintop_registry.h"
 #include "kis_painter.h"
diff --git a/krita/image/brushengine/kis_paintop_registry.cc b/krita/image/brushengine/kis_paintop_registry.cc
--- a/krita/image/brushengine/kis_paintop_registry.cc
+++ b/krita/image/brushengine/kis_paintop_registry.cc
@@ -29,10 +29,8 @@
 #include <KoCompositeOp.h>
 #include <KoID.h>
 
-#include "kis_types.h"
 
 #include "kis_paint_device.h"
-#include "kis_paintop.h"
 #include "kis_painter.h"
 #include "kis_debug.h"
 #include "kis_layer.h"
diff --git a/krita/image/commands/kis_change_filter_command.h b/krita/image/commands/kis_change_filter_command.h
--- a/krita/image/commands/kis_change_filter_command.h
+++ b/krita/image/commands/kis_change_filter_command.h
@@ -32,8 +32,6 @@
 #include "generator/kis_generator.h"
 
 
-class KisNode;
-
 class KisChangeFilterCmd : public KUndo2Command
 {
 
diff --git a/krita/image/commands/kis_node_compositeop_command.cpp b/krita/image/commands/kis_node_compositeop_command.cpp
--- a/krita/image/commands/kis_node_compositeop_command.cpp
+++ b/krita/image/commands/kis_node_compositeop_command.cpp
@@ -21,6 +21,7 @@
 #include <KoCompositeOp.h>
 #include "kis_node.h"
 #include "commands/kis_node_commands.h"
+#include "kis_paint_device.h"
 
 
 KisNodeCompositeOpCommand::KisNodeCompositeOpCommand(KisNodeSP node, const QString& oldCompositeOp,
diff --git a/krita/image/floodfill/kis_scanline_fill.cpp b/krita/image/floodfill/kis_scanline_fill.cpp
--- a/krita/image/floodfill/kis_scanline_fill.cpp
+++ b/krita/image/floodfill/kis_scanline_fill.cpp
@@ -25,7 +25,6 @@
 #include <KoColorSpace.h>
 #include <KoCompositeOpRegistry.h>
 #include "kis_fill_interval_map.h"
-#include "kis_paint_device.h"
 #include "kis_pixel_selection.h"
 #include "kis_random_accessor_ng.h"
 #include "kis_fill_sanity_checks.h"
diff --git a/krita/image/kis_antialiasing_fade_maker.h b/krita/image/kis_antialiasing_fade_maker.h
--- a/krita/image/kis_antialiasing_fade_maker.h
+++ b/krita/image/kis_antialiasing_fade_maker.h
@@ -19,6 +19,7 @@
 #ifndef __KIS_ANTIALIASING_FADE_MAKER_H
 #define __KIS_ANTIALIASING_FADE_MAKER_H
 
+#include "kis_global.h"
 
 template <class BaseFade>
 class KisAntialiasingFadeMaker1D
diff --git a/krita/image/kis_async_merger.h b/krita/image/kis_async_merger.h
--- a/krita/image/kis_async_merger.h
+++ b/krita/image/kis_async_merger.h
@@ -21,7 +21,6 @@
 
 #include "kritaimage_export.h"
 #include "kis_types.h"
-#include "kis_paint_device.h"
 
 class QRect;
 class KisBaseRectsWalker;
diff --git a/krita/image/kis_async_merger.cpp b/krita/image/kis_async_merger.cpp
--- a/krita/image/kis_async_merger.cpp
+++ b/krita/image/kis_async_merger.cpp
@@ -25,7 +25,6 @@
 #include <KoChannelInfo.h>
 #include <KoCompositeOpRegistry.h>
 
-#include "kis_paint_device.h"
 #include "kis_node_visitor.h"
 #include "kis_painter.h"
 #include "kis_layer.h"
diff --git a/krita/image/kis_base_mask_generator.h b/krita/image/kis_base_mask_generator.h
--- a/krita/image/kis_base_mask_generator.h
+++ b/krita/image/kis_base_mask_generator.h
@@ -20,14 +20,15 @@
 #ifndef _KIS_MASK_GENERATOR_H_
 #define _KIS_MASK_GENERATOR_H_
 
-#include "kis_brush_mask_applicator_base.h" // vc.h must come first
+#include <KoVcMultiArchBuildSupport.h> //MSVC requires that Vc come first
 #include <KoID.h>
 #include <klocalizedstring.h>
 
 #include "kritaimage_export.h"
 
 class QDomElement;
 class QDomDocument;
+class KisBrushMaskApplicatorBase;
 
 const KoID DefaultId("default", ki18n("Default")); ///< generate Krita default mask generator
 const KoID SoftId("soft", ki18n("Soft")); ///< generate brush mask from former softbrush paintop, where softness is based on curve
diff --git a/krita/image/kis_base_mask_generator.cpp b/krita/image/kis_base_mask_generator.cpp
--- a/krita/image/kis_base_mask_generator.cpp
+++ b/krita/image/kis_base_mask_generator.cpp
@@ -20,6 +20,7 @@
 
 #include "kis_brush_mask_applicator_factories.h"  // vc.h must come first
 #include "kis_mask_generator.h"
+#include "kis_brush_mask_applicator_base.h"
 
 #include <cmath>
 
diff --git a/krita/image/kis_base_node.cpp b/krita/image/kis_base_node.cpp
--- a/krita/image/kis_base_node.cpp
+++ b/krita/image/kis_base_node.cpp
@@ -23,7 +23,6 @@
 #include <KoProperties.h>
 #include <KoColorSpace.h>
 #include <KoCompositeOpRegistry.h>
-#include "kis_paint_device.h"
 
 struct Q_DECL_HIDDEN KisBaseNode::Private
 {
diff --git a/krita/image/kis_base_processor.cpp b/krita/image/kis_base_processor.cpp
--- a/krita/image/kis_base_processor.cpp
+++ b/krita/image/kis_base_processor.cpp
@@ -24,7 +24,6 @@
 #include "filter/kis_filter_configuration.h"
 #include "kis_paint_device.h"
 #include "kis_selection.h"
-#include "kis_types.h"
 
 
 class KisBaseProcessorConfigurationFactory : public KisSerializableConfigurationFactory
diff --git a/krita/image/kis_base_rects_walker.h b/krita/image/kis_base_rects_walker.h
--- a/krita/image/kis_base_rects_walker.h
+++ b/krita/image/kis_base_rects_walker.h
@@ -22,7 +22,6 @@
 #include <QStack>
 
 #include "kis_layer.h"
-#include "kis_mask.h"
 
 #include "kis_abstract_projection_plane.h"
 #include "kis_projection_leaf.h"
diff --git a/krita/image/kis_brush_mask_applicator_factories.h b/krita/image/kis_brush_mask_applicator_factories.h
--- a/krita/image/kis_brush_mask_applicator_factories.h
+++ b/krita/image/kis_brush_mask_applicator_factories.h
@@ -21,8 +21,7 @@
 
 #include "KoVcMultiArchBuildSupport.h"
 
-#include "kis_brush_mask_applicator_base.h"
-
+class KisBrushMaskApplicatorBase;
 
 template<class MaskGenerator, Vc::Implementation _impl>
 struct KisBrushMaskScalarApplicator;
diff --git a/krita/image/kis_brush_mask_applicator_factories.cpp b/krita/image/kis_brush_mask_applicator_factories.cpp
--- a/krita/image/kis_brush_mask_applicator_factories.cpp
+++ b/krita/image/kis_brush_mask_applicator_factories.cpp
@@ -21,7 +21,7 @@
 #include "kis_circle_mask_generator.h"
 #include "kis_circle_mask_generator_p.h"
 #include "kis_brush_mask_applicators.h"
-
+#include "kis_brush_mask_applicator_base.h"
 
 #define a(_s) #_s
 #define b(_s) a(_s)
diff --git a/krita/image/kis_brush_mask_applicators.h b/krita/image/kis_brush_mask_applicators.h
--- a/krita/image/kis_brush_mask_applicators.h
+++ b/krita/image/kis_brush_mask_applicators.h
@@ -21,6 +21,7 @@
 #define __KIS_BRUSH_MASK_APPLICATORS_H
 
 #include "kis_brush_mask_applicator_base.h"
+#include "kis_global.h"
 
 // 3x3 supersampling
 #define SUPERSAMPLING 3
diff --git a/krita/image/kis_change_profile_visitor.h b/krita/image/kis_change_profile_visitor.h
--- a/krita/image/kis_change_profile_visitor.h
+++ b/krita/image/kis_change_profile_visitor.h
@@ -20,15 +20,15 @@
 
 #include "KoColorSpace.h"
 
-#include "kis_global.h"
 #include "kis_types.h"
 #include "kis_node_visitor.h"
 #include "kis_paint_layer.h"
-#include "kis_paint_device.h"
 #include "kis_adjustment_layer.h"
 #include "generator/kis_generator_layer.h"
 #include "kis_group_layer.h"
-#include "kis_external_layer_iface.h"
+
+class KisExternalLayer;
+// #include "kis_external_layer_iface.h"
 
 /**
  * The Change Profile visitor walks over all layers and if the current
diff --git a/krita/image/kis_circle_mask_generator.cpp b/krita/image/kis_circle_mask_generator.cpp
--- a/krita/image/kis_circle_mask_generator.cpp
+++ b/krita/image/kis_circle_mask_generator.cpp
@@ -37,6 +37,7 @@
 #include "kis_circle_mask_generator_p.h"
 #include "kis_base_mask_generator.h"
 #include "kis_brush_mask_applicator_factories.h"
+#include "kis_brush_mask_applicator_base.h"
 
 
 KisCircleMaskGenerator::KisCircleMaskGenerator(qreal diameter, qreal ratio, qreal fh, qreal fv, int spikes, bool antialiasEdges)
diff --git a/krita/image/kis_clone_info.h b/krita/image/kis_clone_info.h
--- a/krita/image/kis_clone_info.h
+++ b/krita/image/kis_clone_info.h
@@ -22,6 +22,7 @@
 
 #include <QUuid>
 #include <QString>
+#include "kritaimage_export.h"
 #include "kis_node.h"
 
 class KRITAIMAGE_EXPORT KisCloneInfo
diff --git a/krita/image/kis_clone_layer.h b/krita/image/kis_clone_layer.h
--- a/krita/image/kis_clone_layer.h
+++ b/krita/image/kis_clone_layer.h
@@ -21,7 +21,6 @@
 #include <QObject>
 #include "kis_types.h"
 #include "kis_layer.h"
-#include "kis_indirect_painting_support.h"
 
 #include <kritaimage_export.h>
 #include "kis_clone_info.h"
diff --git a/krita/image/kis_clone_layer.cpp b/krita/image/kis_clone_layer.cpp
--- a/krita/image/kis_clone_layer.cpp
+++ b/krita/image/kis_clone_layer.cpp
@@ -32,7 +32,6 @@
 #include "kis_painter.h"
 #include "kis_node_visitor.h"
 #include "kis_processing_visitor.h"
-#include "kis_clone_info.h"
 #include "kis_paint_layer.h"
 
 #include <QStack>
diff --git a/krita/image/kis_colorspace_convert_visitor.h b/krita/image/kis_colorspace_convert_visitor.h
--- a/krita/image/kis_colorspace_convert_visitor.h
+++ b/krita/image/kis_colorspace_convert_visitor.h
@@ -23,7 +23,6 @@
 #include <KoColorSpace.h>
 
 #include <kritaimage_export.h>
-#include "kis_global.h"
 #include "kis_types.h"
 #include "kis_node_visitor.h"
 
diff --git a/krita/image/kis_convolution_painter.h b/krita/image/kis_convolution_painter.h
--- a/krita/image/kis_convolution_painter.h
+++ b/krita/image/kis_convolution_painter.h
@@ -18,8 +18,6 @@
 #ifndef KIS_CONVOLUTION_PAINTER_H_
 #define KIS_CONVOLUTION_PAINTER_H_
 
-#include "kis_shared.h"
-#include "kis_shared_ptr.h"
 #include "kis_types.h"
 #include "kis_painter.h"
 #include "kis_image.h"
diff --git a/krita/image/kis_convolution_worker.h b/krita/image/kis_convolution_worker.h
--- a/krita/image/kis_convolution_worker.h
+++ b/krita/image/kis_convolution_worker.h
@@ -22,7 +22,6 @@
 
 #include <KoUpdater.h>
 
-#include "kis_paint_device.h"
 #include "kis_iterator_ng.h"
 #include "kis_repeat_iterators_pixel.h"
 #include "kis_painter.h"
diff --git a/krita/image/kis_count_visitor.h b/krita/image/kis_count_visitor.h
--- a/krita/image/kis_count_visitor.h
+++ b/krita/image/kis_count_visitor.h
@@ -26,7 +26,6 @@
 
 #include "kis_node.h"
 #include "kis_paint_layer.h"
-#include "kis_paint_device.h"
 #include "kis_group_layer.h"
 #include "kis_adjustment_layer.h"
 #include "kis_external_layer_iface.h"
diff --git a/krita/image/kis_cross_device_color_picker.h b/krita/image/kis_cross_device_color_picker.h
--- a/krita/image/kis_cross_device_color_picker.h
+++ b/krita/image/kis_cross_device_color_picker.h
@@ -19,8 +19,7 @@
 #ifndef __KIS_CROSS_DEVICE_COLOR_PICKER_H
 #define __KIS_CROSS_DEVICE_COLOR_PICKER_H
 
-#include "kis_paint_device.h"
-#include "kis_fixed_paint_device.h"
+#include "KoColorSpace.h"
 #include "kis_random_sub_accessor.h"
 
 
diff --git a/krita/image/kis_curve_circle_mask_generator.h b/krita/image/kis_curve_circle_mask_generator.h
--- a/krita/image/kis_curve_circle_mask_generator.h
+++ b/krita/image/kis_curve_circle_mask_generator.h
@@ -21,7 +21,6 @@
 
 #include "kritaimage_export.h"
 
-#include "kis_mask_generator.h"
 #include <QList>
 #include <QVector>
 
diff --git a/krita/image/kis_default_bounds.h b/krita/image/kis_default_bounds.h
--- a/krita/image/kis_default_bounds.h
+++ b/krita/image/kis_default_bounds.h
@@ -21,7 +21,6 @@
 
 #include <QRect>
 #include "kis_types.h"
-#include "kis_image.h"
 #include "kis_default_bounds_base.h"
 
 class KisDefaultBounds;
diff --git a/krita/image/kis_default_bounds.cpp b/krita/image/kis_default_bounds.cpp
--- a/krita/image/kis_default_bounds.cpp
+++ b/krita/image/kis_default_bounds.cpp
@@ -21,6 +21,7 @@
 #include "kis_global.h"
 #include "kis_default_bounds.h"
 #include "kis_paint_device.h"
+#include "kis_image.h"
 
 const QRect KisDefaultBounds::infiniteRect =
     QRect(qint32_MIN/2, qint32_MIN/2, qint32_MAX, qint32_MAX);
diff --git a/krita/image/kis_dom_utils.cpp b/krita/image/kis_dom_utils.cpp
--- a/krita/image/kis_dom_utils.cpp
+++ b/krita/image/kis_dom_utils.cpp
@@ -21,7 +21,6 @@
 #include <QTransform>
 #include <kis_debug.h>
 
-#include "kis_debug.h"
 
 namespace KisDomUtils {
 
diff --git a/krita/image/kis_effect_mask.h b/krita/image/kis_effect_mask.h
--- a/krita/image/kis_effect_mask.h
+++ b/krita/image/kis_effect_mask.h
@@ -19,7 +19,6 @@
 #ifndef _KIS_EFFECT_MASK_
 #define _KIS_EFFECT_MASK_
 
-#include "kis_types.h"
 #include "kis_mask.h"
 /**
  * An effect mask is a single channel mask that applies a particular
diff --git a/krita/image/kis_fill_painter.cc b/krita/image/kis_fill_painter.cc
--- a/krita/image/kis_fill_painter.cc
+++ b/krita/image/kis_fill_painter.cc
@@ -47,21 +47,17 @@
 #include "kis_image.h"
 #include "kis_layer.h"
 #include "kis_paint_device.h"
-#include "kis_painter.h"
 #include "KoPattern.h"
 #include "KoColorSpace.h"
 #include "kis_transaction.h"
-#include "kis_types.h"
 
 #include "kis_pixel_selection.h"
 
 #include <KoCompositeOpRegistry.h>
 #include <floodfill/kis_scanline_fill.h>
 
 #include "kis_random_accessor_ng.h"
 
-#include "KoColor.h"
-#include "kis_selection.h"
 
 #include "kis_selection_filters.h"
 
diff --git a/krita/image/kis_filter_strategy.h b/krita/image/kis_filter_strategy.h
--- a/krita/image/kis_filter_strategy.h
+++ b/krita/image/kis_filter_strategy.h
@@ -23,7 +23,6 @@
 
 #include <klocalizedstring.h>
 
-#include "kis_types.h"
 #include "KoGenericRegistry.h"
 #include "KoID.h"
 #include "kritaimage_export.h"
diff --git a/krita/image/kis_filter_weights_applicator.h b/krita/image/kis_filter_weights_applicator.h
--- a/krita/image/kis_filter_weights_applicator.h
+++ b/krita/image/kis_filter_weights_applicator.h
@@ -21,10 +21,8 @@
 
 #include "kis_fixed_point_maths.h"
 #include "kis_filter_weights_buffer.h"
-
 #include "kis_iterator_ng.h"
-#include "kis_random_accessor_ng.h"
-#include "kis_paint_device.h"
+
 
 #include <KoColorSpace.h>
 #include <KoMixColorsOp.h>
diff --git a/krita/image/kis_filter_weights_buffer.h b/krita/image/kis_filter_weights_buffer.h
--- a/krita/image/kis_filter_weights_buffer.h
+++ b/krita/image/kis_filter_weights_buffer.h
@@ -21,6 +21,7 @@
 
 #include "kis_fixed_point_maths.h"
 #include "kis_filter_strategy.h"
+#include "kis_debug.h"
 
 #ifdef SANITY_CHECKS_ENABLED
 static bool checkForAsymmetricZeros = false;
diff --git a/krita/image/kis_fixed_paint_device.h b/krita/image/kis_fixed_paint_device.h
--- a/krita/image/kis_fixed_paint_device.h
+++ b/krita/image/kis_fixed_paint_device.h
@@ -20,7 +20,6 @@
 
 #include <kritaimage_export.h>
 #include <KoColorSpace.h>
-#include "kis_global.h"
 #include "kis_shared.h"
 #include <kis_shared_ptr.h>
 
diff --git a/krita/image/kis_gauss_circle_mask_generator.h b/krita/image/kis_gauss_circle_mask_generator.h
--- a/krita/image/kis_gauss_circle_mask_generator.h
+++ b/krita/image/kis_gauss_circle_mask_generator.h
@@ -22,7 +22,6 @@
 
 #include "kritaimage_export.h"
 
-#include "kis_mask_generator.h"
 
 
 /**
diff --git a/krita/image/kis_gauss_rect_mask_generator.h b/krita/image/kis_gauss_rect_mask_generator.h
--- a/krita/image/kis_gauss_rect_mask_generator.h
+++ b/krita/image/kis_gauss_rect_mask_generator.h
@@ -22,7 +22,6 @@
 
 #include "kritaimage_export.h"
 
-#include "kis_mask_generator.h"
 
 
 /**
diff --git a/krita/image/kis_gaussian_kernel.cpp b/krita/image/kis_gaussian_kernel.cpp
--- a/krita/image/kis_gaussian_kernel.cpp
+++ b/krita/image/kis_gaussian_kernel.cpp
@@ -20,6 +20,7 @@
 
 #include "kis_convolution_kernel.h"
 #include <kis_convolution_painter.h>
+#include <QRect>
 
 
 qreal KisGaussianKernel::sigmaFromRadius(qreal radius)
diff --git a/krita/image/kis_gradient_painter.h b/krita/image/kis_gradient_painter.h
--- a/krita/image/kis_gradient_painter.h
+++ b/krita/image/kis_gradient_painter.h
@@ -22,7 +22,6 @@
 
 #include <KoColor.h>
 
-#include "kis_global.h"
 #include "kis_types.h"
 #include "kis_painter.h"
 
diff --git a/krita/image/kis_gradient_painter.cc b/krita/image/kis_gradient_painter.cc
--- a/krita/image/kis_gradient_painter.cc
+++ b/krita/image/kis_gradient_painter.cc
@@ -24,9 +24,9 @@
 #include <KoAbstractGradient.h>
 #include <KoUpdater.h>
 
+#include "kis_global.h"
 #include "kis_paint_device.h"
 #include "KoPattern.h"
-#include "kis_types.h"
 #include "kis_selection.h"
 
 #include "kis_iterator_ng.h"
diff --git a/krita/image/kis_group_layer.cc b/krita/image/kis_group_layer.cc
--- a/krita/image/kis_group_layer.cc
+++ b/krita/image/kis_group_layer.cc
@@ -27,7 +27,6 @@
 #include <KoColor.h>
 
 
-#include "kis_types.h"
 #include "kis_node_visitor.h"
 #include "kis_processing_visitor.h"
 #include "kis_debug.h"
diff --git a/krita/image/kis_histogram.cc b/krita/image/kis_histogram.cc
--- a/krita/image/kis_histogram.cc
+++ b/krita/image/kis_histogram.cc
@@ -21,7 +21,6 @@
 
 #include <QVector>
 
-#include "kis_types.h"
 #include "kis_image.h"
 #include "kis_paint_layer.h"
 #include "kis_paint_device.h"
diff --git a/krita/image/kis_image.h b/krita/image/kis_image.h
--- a/krita/image/kis_image.h
+++ b/krita/image/kis_image.h
@@ -33,7 +33,6 @@
 #include "kis_shared.h"
 #include "kis_node_graph_listener.h"
 #include "kis_node_facade.h"
-#include "kis_default_bounds.h"
 #include "kis_image_interfaces.h"
 
 #include <kritaimage_export.h>
@@ -53,6 +52,7 @@
 class KisPerspectiveGrid;
 class KisLayerComposition;
 class KisSpontaneousJob;
+class KUndo2MagicString;
 
 namespace KisMetaData
 {
diff --git a/krita/image/kis_image.cc b/krita/image/kis_image.cc
--- a/krita/image/kis_image.cc
+++ b/krita/image/kis_image.cc
@@ -36,7 +36,6 @@
 
 #include "KoColorSpaceRegistry.h"
 #include "KoColor.h"
-#include "KoColorConversionTransformation.h"
 #include "KoColorProfile.h"
 #include <KoCompositeOpRegistry.h>
 
@@ -52,13 +51,11 @@
 #include "kis_layer.h"
 #include "kis_meta_data_merge_strategy_registry.h"
 #include "kis_name_server.h"
-#include "kis_paint_device.h"
 #include "kis_paint_layer.h"
 #include "kis_painter.h"
 #include "kis_perspective_grid.h"
 #include "kis_selection.h"
 #include "kis_transaction.h"
-#include "kis_types.h"
 #include "kis_meta_data_merge_strategy.h"
 #include "kis_memory_statistics_server.h"
 
diff --git a/krita/image/kis_image_barrier_locker.h b/krita/image/kis_image_barrier_locker.h
--- a/krita/image/kis_image_barrier_locker.h
+++ b/krita/image/kis_image_barrier_locker.h
@@ -19,7 +19,6 @@
 #ifndef __KIS_IMAGE_BARRIER_LOCKER_H
 #define __KIS_IMAGE_BARRIER_LOCKER_H
 
-#include "kis_image.h"
 
 
 class KisImageBarrierLocker {
diff --git a/krita/image/kis_image_signal_router.h b/krita/image/kis_image_signal_router.h
--- a/krita/image/kis_image_signal_router.h
+++ b/krita/image/kis_image_signal_router.h
@@ -21,9 +21,9 @@
 
 #include <QObject>
 #include <QVector>
+#include <QRectF>
 #include "kritaimage_export.h"
 #include "kis_types.h"
-#include "kis_group_layer.h"
 
 
 class KoColorSpace;
diff --git a/krita/image/kis_indirect_painting_support.h b/krita/image/kis_indirect_painting_support.h
--- a/krita/image/kis_indirect_painting_support.h
+++ b/krita/image/kis_indirect_painting_support.h
@@ -22,13 +22,13 @@
 
 #include "kritaimage_export.h"
 #include "kis_types.h"
-#include "kis_node.h"
 
 class QBitArray;
 class KisUndoAdapter;
 class KisPostExecutionUndoAdapter;
 class KisPainter;
 class KUndo2MagicString;
+class KoCompositeOp;
 
 /**
  * For classes that support indirect painting.
diff --git a/krita/image/kis_legacy_undo_adapter.h b/krita/image/kis_legacy_undo_adapter.h
--- a/krita/image/kis_legacy_undo_adapter.h
+++ b/krita/image/kis_legacy_undo_adapter.h
@@ -20,6 +20,7 @@
 #define __KIS_LEGACY_UNDO_ADAPTER_H
 
 #include "kis_undo_adapter.h"
+#include "kis_types.h"
 
 
 /**
diff --git a/krita/image/kis_locked_settings.h b/krita/image/kis_locked_settings.h
--- a/krita/image/kis_locked_settings.h
+++ b/krita/image/kis_locked_settings.h
@@ -3,7 +3,6 @@
 
 #include "kis_paintop_preset.h"
 #include "kis_paintop_settings.h"
-#include "kis_properties_configuration.h"
 
 
 
diff --git a/krita/image/kis_mask.h b/krita/image/kis_mask.h
--- a/krita/image/kis_mask.h
+++ b/krita/image/kis_mask.h
@@ -15,16 +15,16 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.b
  */
 #ifndef _KIS_MASK_
 #define _KIS_MASK_
 
 #include <QRect>
 
 #include "kis_types.h"
-#include "kis_node.h"
 #include "kis_global.h"
+#include "kis_node.h"
 #include "kis_indirect_painting_support.h"
 
 #include <kritaimage_export.h>
diff --git a/krita/image/kis_math_toolbox.h b/krita/image/kis_math_toolbox.h
--- a/krita/image/kis_math_toolbox.h
+++ b/krita/image/kis_math_toolbox.h
@@ -28,8 +28,8 @@
 #include <KoColorSpace.h>
 
 #include "kis_types.h"
-#include "kis_paint_device.h"
 #include <new>
+#include "kis_paint_device.h"
 
 #ifdef _MSC_VER
 #pragma warning(disable: 4290) // disable "C++ exception specification ignored" warning
diff --git a/krita/image/kis_merge_walker.h b/krita/image/kis_merge_walker.h
--- a/krita/image/kis_merge_walker.h
+++ b/krita/image/kis_merge_walker.h
@@ -19,7 +19,6 @@
 #ifndef __KIS_MERGE_WALKER_H
 #define __KIS_MERGE_WALKER_H
 
-#include "kis_node.h"
 #include "kis_types.h"
 #include "kis_base_rects_walker.h"
 
diff --git a/krita/image/kis_node.h b/krita/image/kis_node.h
--- a/krita/image/kis_node.h
+++ b/krita/image/kis_node.h
@@ -20,7 +20,6 @@
 
 #include "kis_types.h"
 
-#include "kis_undo_adapter.h"
 #include "kis_base_node.h"
 
 #include "kritaimage_export.h"
@@ -38,6 +37,7 @@
 class KisBusyProgressIndicator;
 class KisAbstractProjectionPlane;
 class KisProjectionLeaf;
+class KisUndoAdapter;
 
 /**
  * A KisNode is a KisBaseNode that knows about its direct peers, parent
diff --git a/krita/image/kis_node.cpp b/krita/image/kis_node.cpp
--- a/krita/image/kis_node.cpp
+++ b/krita/image/kis_node.cpp
@@ -41,6 +41,7 @@
 
 #include "kis_abstract_projection_plane.h"
 #include "kis_projection_leaf.h"
+#include "kis_undo_adapter.h"
 
 
 /**
diff --git a/krita/image/kis_node_facade.cpp b/krita/image/kis_node_facade.cpp
--- a/krita/image/kis_node_facade.cpp
+++ b/krita/image/kis_node_facade.cpp
@@ -18,7 +18,6 @@
 
 #include "kis_node_facade.h"
 #include "kis_node_graph_listener.h"
-#include "kis_node.h"
 #include <kis_debug.h>
 
 struct Q_DECL_HIDDEN KisNodeFacade::Private
diff --git a/krita/image/kis_node_filter_interface.h b/krita/image/kis_node_filter_interface.h
--- a/krita/image/kis_node_filter_interface.h
+++ b/krita/image/kis_node_filter_interface.h
@@ -21,7 +21,8 @@
 
 #include <kritaimage_export.h>
 #include <kis_types.h>
-#include "filter/kis_filter_configuration.h"
+
+class KisFilterConfiguration;
 
 /**
  * Define an interface for nodes that are associated with a filter.
diff --git a/krita/image/kis_node_visitor.h b/krita/image/kis_node_visitor.h
--- a/krita/image/kis_node_visitor.h
+++ b/krita/image/kis_node_visitor.h
@@ -19,17 +19,19 @@
 #ifndef KIS_NODE_VISITOR_H_
 #define KIS_NODE_VISITOR_H_
 
-#include "kis_node.h"
 #include "kritaimage_export.h"
 
+class KisNode;
 class KisPaintLayer;
 class KisGroupLayer;
 class KisAdjustmentLayer;
 class KisExternalLayer;
 class KisCloneLayer;
 class KisFilterMask;
 class KisTransparencyMask;
 class KisSelectionMask;
+class KisGeneratorLayer;
+class KisTransformMask;
 
 class KRITAIMAGE_EXPORT KisNodeVisitor
 {
diff --git a/krita/image/kis_node_visitor.cpp b/krita/image/kis_node_visitor.cpp
--- a/krita/image/kis_node_visitor.cpp
+++ b/krita/image/kis_node_visitor.cpp
@@ -18,6 +18,7 @@
  */
 
 #include "kis_node_visitor.h"
+#include "kis_node.h"
 
 bool KisNodeVisitor::visitAll(KisNode * node, bool breakOnFail)
 {
diff --git a/krita/image/kis_paint_device.h b/krita/image/kis_paint_device.h
--- a/krita/image/kis_paint_device.h
+++ b/krita/image/kis_paint_device.h
@@ -28,7 +28,6 @@
 #include <KoColorConversionTransformation.h>
 
 #include "kis_types.h"
-#include "kis_global.h"
 #include "kis_shared.h"
 #include "kis_default_bounds_base.h"
 
diff --git a/krita/image/kis_paint_device.cc b/krita/image/kis_paint_device.cc
--- a/krita/image/kis_paint_device.cc
+++ b/krita/image/kis_paint_device.cc
@@ -36,8 +36,7 @@
 #include <KoColorModelStandardIds.h>
 #include <KoIntegerMaths.h>
 
-#include "kis_global.h"
-#include "kis_types.h"
+#include "kis_image.h"
 #include "kis_random_sub_accessor.h"
 #include "kis_selection.h"
 #include "kis_node.h"
diff --git a/krita/image/kis_painter.h b/krita/image/kis_painter.h
--- a/krita/image/kis_painter.h
+++ b/krita/image/kis_painter.h
@@ -30,8 +30,6 @@
 #include <KoColorConversionTransformation.h>
 
 #include "kundo2magicstring.h"
-#include "kis_distance_information.h"
-#include "kis_global.h"
 #include "kis_types.h"
 #include <kritaimage_export.h>
 
@@ -54,6 +52,8 @@
 class KisFilterConfiguration;
 class KisPaintInformation;
 class KisPaintOp;
+class KisDistanceInformation;
+
 /**
  * KisPainter contains the graphics primitives necessary to draw on a
  * KisPaintDevice. This is the same kind of abstraction as used in Qt
diff --git a/krita/image/kis_painter.cc b/krita/image/kis_painter.cc
--- a/krita/image/kis_painter.cc
+++ b/krita/image/kis_painter.cc
@@ -52,7 +52,6 @@
 #include "kis_paint_device.h"
 #include "kis_fixed_paint_device.h"
 #include "kis_transaction.h"
-#include "kis_types.h"
 #include "kis_vec.h"
 #include "kis_iterator_ng.h"
 #include "kis_random_accessor_ng.h"
@@ -65,6 +64,7 @@
 #include "kis_paintop_registry.h"
 #include "kis_perspective_math.h"
 #include "tiles3/kis_random_accessor.h"
+#include "kis_distance_information.h"
 
 // Maximum distance from a Bezier control point to the line through the start
 // and end points for the curve to be considered flat.
diff --git a/krita/image/kis_perspective_grid.cpp b/krita/image/kis_perspective_grid.cpp
--- a/krita/image/kis_perspective_grid.cpp
+++ b/krita/image/kis_perspective_grid.cpp
@@ -19,7 +19,9 @@
  */
 
 #include "kis_perspective_grid.h"
-#include <kis_debug.h>//--------------------------------------------//
+#include <kis_debug.h>
+
+//--------------------------------------------//
 //---------- KisPerspectiveGridNode ----------//
 //--------------------------------------------//
 
diff --git a/krita/image/kis_pixel_selection.h b/krita/image/kis_pixel_selection.h
--- a/krita/image/kis_pixel_selection.h
+++ b/krita/image/kis_pixel_selection.h
@@ -22,6 +22,7 @@
 #include <QPainterPath>
 
 #include "kis_types.h"
+#include "kis_global.h"
 #include "kis_paint_device.h"
 #include "kis_selection_component.h"
 #include "kis_selection.h"
diff --git a/krita/image/kis_pixel_selection.cpp b/krita/image/kis_pixel_selection.cpp
--- a/krita/image/kis_pixel_selection.cpp
+++ b/krita/image/kis_pixel_selection.cpp
@@ -35,7 +35,6 @@
 
 #include "kis_layer.h"
 #include "kis_debug.h"
-#include "kis_types.h"
 #include "kis_image.h"
 #include "kis_fill_painter.h"
 #include "kis_outline_generator.h"
diff --git a/krita/image/kis_processing_applicator.cpp b/krita/image/kis_processing_applicator.cpp
--- a/krita/image/kis_processing_applicator.cpp
+++ b/krita/image/kis_processing_applicator.cpp
@@ -19,7 +19,6 @@
 #include "kis_processing_applicator.h"
 
 #include "kis_image.h"
-#include "kis_image_signal_router.h"
 #include "kis_node.h"
 #include "kis_clone_layer.h"
 #include "kis_processing_visitor.h"
diff --git a/krita/image/kis_refresh_subtree_walker.h b/krita/image/kis_refresh_subtree_walker.h
--- a/krita/image/kis_refresh_subtree_walker.h
+++ b/krita/image/kis_refresh_subtree_walker.h
@@ -19,7 +19,6 @@
 #ifndef __KIS_REFRESH_SUBTREE_WALKER_H
 #define __KIS_REFRESH_SUBTREE_WALKER_H
 
-#include "kis_node.h"
 #include "kis_types.h"
 #include "kis_base_rects_walker.h"
 
diff --git a/krita/image/kis_selection.h b/krita/image/kis_selection.h
--- a/krita/image/kis_selection.h
+++ b/krita/image/kis_selection.h
@@ -22,7 +22,7 @@
 
 #include "kis_types.h"
 #include "kritaimage_export.h"
-#include "kis_paint_device.h"
+#include "kis_default_bounds.h"
 
 enum SelectionMode {
     PIXEL_SELECTION,
@@ -41,6 +41,7 @@
 
 
 class KisSelectionComponent;
+class QPainterPath;
 
 /**
  * KisSelection is a composite object. It may contain an instance
diff --git a/krita/image/kis_selection.cc b/krita/image/kis_selection.cc
--- a/krita/image/kis_selection.cc
+++ b/krita/image/kis_selection.cc
@@ -24,6 +24,9 @@
 
 #include "kis_selection_component.h"
 #include "kis_pixel_selection.h"
+#include "kis_node_graph_listener.h"
+#include "kis_node.h"
+#include "kis_image.h"
 
 #include "kis_default_bounds.h"
 #include "kis_iterator_ng.h"
diff --git a/krita/image/kis_simple_stroke_strategy.h b/krita/image/kis_simple_stroke_strategy.h
--- a/krita/image/kis_simple_stroke_strategy.h
+++ b/krita/image/kis_simple_stroke_strategy.h
@@ -21,6 +21,7 @@
 
 #include <QVector>
 #include "kis_stroke_strategy.h"
+#include "kis_stroke_job_strategy.h"
 
 
 class KRITAIMAGE_EXPORT KisSimpleStrokeStrategy : public KisStrokeStrategy
diff --git a/krita/image/kis_stroke_strategy.h b/krita/image/kis_stroke_strategy.h
--- a/krita/image/kis_stroke_strategy.h
+++ b/krita/image/kis_stroke_strategy.h
@@ -20,12 +20,11 @@
 #define __KIS_STROKE_STRATEGY_H
 
 #include <QString>
-#include "kis_stroke_job_strategy.h"
 #include "kis_types.h"
 #include "kundo2magicstring.h"
 
-class KisStrokeStrategy;
-
+class KisStrokeJobStrategy;
+class KisStrokeJobData;
 
 class KRITAIMAGE_EXPORT KisStrokeStrategy
 {
diff --git a/krita/image/kis_stroke_strategy.cpp b/krita/image/kis_stroke_strategy.cpp
--- a/krita/image/kis_stroke_strategy.cpp
+++ b/krita/image/kis_stroke_strategy.cpp
@@ -18,6 +18,7 @@
 
 #include "kis_stroke_strategy.h"
 #include <KoCompositeOpRegistry.h>
+#include "kis_stroke_job_strategy.h"
 
 
 KisStrokeStrategy::KisStrokeStrategy(QString id, const KUndo2MagicString &name)
diff --git a/krita/image/kis_stroke_strategy_undo_command_based.h b/krita/image/kis_stroke_strategy_undo_command_based.h
--- a/krita/image/kis_stroke_strategy_undo_command_based.h
+++ b/krita/image/kis_stroke_strategy_undo_command_based.h
@@ -25,12 +25,11 @@
 
 #include "kis_types.h"
 #include "kis_simple_stroke_strategy.h"
-#include "commands_new/kis_saved_commands.h"
 
 
 class KisStrokeJob;
 class KisPostExecutionUndoAdapter;
-
+class KisSavedMacroCommand;
 
 class KRITAIMAGE_EXPORT KisStrokeStrategyUndoCommandBased : public KisSimpleStrokeStrategy
 {
diff --git a/krita/image/kis_strokes_queue.h b/krita/image/kis_strokes_queue.h
--- a/krita/image/kis_strokes_queue.h
+++ b/krita/image/kis_strokes_queue.h
@@ -21,11 +21,13 @@
 
 #include "kritaimage_export.h"
 #include "kis_types.h"
-#include "kis_stroke_job_strategy.h"
-#include "kis_stroke_strategy.h"
+#include "kundo2magicstring.h"
 
 class KisUpdaterContext;
 class KisStroke;
+class KisStrokeStrategy;
+class KisStrokeJobData;
+
 
 class KRITAIMAGE_EXPORT KisStrokesQueue
 {
diff --git a/krita/image/kis_strokes_queue.cpp b/krita/image/kis_strokes_queue.cpp
--- a/krita/image/kis_strokes_queue.cpp
+++ b/krita/image/kis_strokes_queue.cpp
@@ -23,6 +23,8 @@
 #include <QMutexLocker>
 #include "kis_stroke.h"
 #include "kis_updater_context.h"
+#include "kis_stroke_job_strategy.h"
+#include "kis_stroke_strategy.h"
 
 struct Q_DECL_HIDDEN KisStrokesQueue::Private {
     Private()
diff --git a/krita/image/kis_system_locker.h b/krita/image/kis_system_locker.h
--- a/krita/image/kis_system_locker.h
+++ b/krita/image/kis_system_locker.h
@@ -19,7 +19,6 @@
 #ifndef _KIS_SYSTEM_LOCKER_H_
 #define _KIS_SYSTEM_LOCKER_H_
 
-#include "kis_base_node.h"
 
 /**
  * This class will lock a \ref KisBaseNode upon construction, and unlock it
diff --git a/krita/image/kis_transform_worker.cc b/krita/image/kis_transform_worker.cc
--- a/krita/image/kis_transform_worker.cc
+++ b/krita/image/kis_transform_worker.cc
@@ -40,6 +40,7 @@
 #include "kis_painter.h"
 #include "kis_filter_weights_applicator.h"
 #include "kis_progress_update_helper.h"
+#include "kis_pixel_selection.h"
 
 
 KisTransformWorker::KisTransformWorker(KisPaintDeviceSP dev,
diff --git a/krita/image/kis_transparency_mask.h b/krita/image/kis_transparency_mask.h
--- a/krita/image/kis_transparency_mask.h
+++ b/krita/image/kis_transparency_mask.h
@@ -20,7 +20,6 @@
 #define _KIS_TRANSPARENCY_MASK_
 
 #include "kis_types.h"
-#include "kis_mask.h"
 #include "kis_effect_mask.h"
 
 class QRect;
diff --git a/krita/image/kis_undo_adapter.h b/krita/image/kis_undo_adapter.h
--- a/krita/image/kis_undo_adapter.h
+++ b/krita/image/kis_undo_adapter.h
@@ -22,7 +22,6 @@
 #include <QObject>
 
 #include <kritaimage_export.h>
-#include "kis_types.h"
 #include "kis_undo_store.h"
 
 
diff --git a/krita/image/kis_undo_store.h b/krita/image/kis_undo_store.h
--- a/krita/image/kis_undo_store.h
+++ b/krita/image/kis_undo_store.h
@@ -23,7 +23,6 @@
 #include <QVector>
 
 #include <kritaimage_export.h>
-#include "kis_types.h"
 
 class KUndo2Command;
 class KUndo2MagicString;
diff --git a/krita/image/kis_updater_context.h b/krita/image/kis_updater_context.h
--- a/krita/image/kis_updater_context.h
+++ b/krita/image/kis_updater_context.h
@@ -24,12 +24,11 @@
 #include <QReadWriteLock>
 #include <QThreadPool>
 
-#include "kis_stroke_job.h"
 #include "kis_base_rects_walker.h"
-#include "kis_async_merger.h"
 
 class KisUpdateJobItem;
 class KisSpontaneousJob;
+class KisStrokeJob;
 
 class KRITAIMAGE_EXPORT KisUpdaterContext : public QObject
 {
diff --git a/krita/image/kis_updater_context.cpp b/krita/image/kis_updater_context.cpp
--- a/krita/image/kis_updater_context.cpp
+++ b/krita/image/kis_updater_context.cpp
@@ -22,6 +22,7 @@
 #include <QThreadPool>
 
 #include "kis_update_job_item.h"
+#include "kis_stroke_job.h"
 
 
 KisUpdaterContext::KisUpdaterContext(qint32 threadCount)
diff --git a/krita/image/kis_warptransform_worker.h b/krita/image/kis_warptransform_worker.h
--- a/krita/image/kis_warptransform_worker.h
+++ b/krita/image/kis_warptransform_worker.h
@@ -23,7 +23,6 @@
 
 #include "kis_types.h"
 #include "kritaimage_export.h"
-#include "kis_paint_device.h"
 
 #include <QImage>
 #include <QPolygon>
diff --git a/krita/image/layerstyles/kis_layer_style_filter.h b/krita/image/layerstyles/kis_layer_style_filter.h
--- a/krita/image/layerstyles/kis_layer_style_filter.h
+++ b/krita/image/layerstyles/kis_layer_style_filter.h
@@ -25,7 +25,6 @@
 
 #include <QScopedPointer>
 
-class KisPSDLayerStyle;
 class KisLayerStyleFilterEnvironment;
 
 
diff --git a/krita/image/layerstyles/kis_layer_style_projection_plane.cpp b/krita/image/layerstyles/kis_layer_style_projection_plane.cpp
--- a/krita/image/layerstyles/kis_layer_style_projection_plane.cpp
+++ b/krita/image/layerstyles/kis_layer_style_projection_plane.cpp
@@ -18,6 +18,7 @@
 
 #include "kis_layer_style_projection_plane.h"
 
+#include "kis_global.h"
 #include "kis_layer_style_filter_projection_plane.h"
 #include "kis_psd_layer_style.h"
 
diff --git a/krita/image/layerstyles/kis_ls_bevel_emboss_filter.h b/krita/image/layerstyles/kis_ls_bevel_emboss_filter.h
--- a/krita/image/layerstyles/kis_ls_bevel_emboss_filter.h
+++ b/krita/image/layerstyles/kis_ls_bevel_emboss_filter.h
@@ -25,7 +25,6 @@
 #include <kritaimage_export.h>
 
 struct psd_layer_effects_bevel_emboss;
-struct psd_layer_effects_context;
 
 
 class KRITAIMAGE_EXPORT KisLsBevelEmbossFilter : public KisLayerStyleFilter
diff --git a/krita/image/layerstyles/kis_ls_overlay_filter.h b/krita/image/layerstyles/kis_ls_overlay_filter.h
--- a/krita/image/layerstyles/kis_ls_overlay_filter.h
+++ b/krita/image/layerstyles/kis_ls_overlay_filter.h
@@ -25,7 +25,6 @@
 #include <kritaimage_export.h>
 
 struct psd_layer_effects_overlay_base;
-struct psd_layer_effects_context;
 
 
 class KRITAIMAGE_EXPORT KisLsOverlayFilter : public KisLayerStyleFilter
diff --git a/krita/image/layerstyles/kis_ls_satin_filter.h b/krita/image/layerstyles/kis_ls_satin_filter.h
--- a/krita/image/layerstyles/kis_ls_satin_filter.h
+++ b/krita/image/layerstyles/kis_ls_satin_filter.h
@@ -24,7 +24,6 @@
 #include "kis_layer_style_filter.h"
 #include <kritaimage_export.h>
 
-class psd_layer_effects_shadow_base;
 
 
 class KRITAIMAGE_EXPORT KisLsSatinFilter : public KisLayerStyleFilter
diff --git a/krita/image/layerstyles/kis_ls_stroke_filter.h b/krita/image/layerstyles/kis_ls_stroke_filter.h
--- a/krita/image/layerstyles/kis_ls_stroke_filter.h
+++ b/krita/image/layerstyles/kis_ls_stroke_filter.h
@@ -25,7 +25,6 @@
 #include "kis_layer_style_filter.h"
 
 struct psd_layer_effects_stroke;
-struct psd_layer_effects_context;
 
 
 class KRITAIMAGE_EXPORT KisLsStrokeFilter : public KisLayerStyleFilter
diff --git a/krita/image/metadata/kis_meta_data_schema.cc b/krita/image/metadata/kis_meta_data_schema.cc
--- a/krita/image/metadata/kis_meta_data_schema.cc
+++ b/krita/image/metadata/kis_meta_data_schema.cc
@@ -24,7 +24,6 @@
 #include <QString>
 #include <QVariant>
 
-#include "kis_debug.h"
 #include "kis_meta_data_type_info_p.h"
 #include "kis_meta_data_schema_p.h"
 #include "kis_meta_data_value.h"
diff --git a/krita/image/processing/kis_crop_processing_visitor.cpp b/krita/image/processing/kis_crop_processing_visitor.cpp
--- a/krita/image/processing/kis_crop_processing_visitor.cpp
+++ b/krita/image/processing/kis_crop_processing_visitor.cpp
@@ -25,6 +25,7 @@
 #include "kis_external_layer_iface.h"
 
 #include "kis_paint_device.h"
+#include "kis_image.h"
 #include "kis_transaction.h"
 #include "kis_undo_adapter.h"
 #include "kis_transform_mask.h"
diff --git a/krita/image/processing/kis_simple_processing_visitor.cpp b/krita/image/processing/kis_simple_processing_visitor.cpp
--- a/krita/image/processing/kis_simple_processing_visitor.cpp
+++ b/krita/image/processing/kis_simple_processing_visitor.cpp
@@ -31,6 +31,7 @@
 #include "kis_selection.h"
 
 #include "kis_do_something_command.h"
+#include "kis_undo_adapter.h"
 
 
 KisSimpleProcessingVisitor::~KisSimpleProcessingVisitor()
diff --git a/krita/image/recorder/kis_recorded_action.h b/krita/image/recorder/kis_recorded_action.h
--- a/krita/image/recorder/kis_recorded_action.h
+++ b/krita/image/recorder/kis_recorded_action.h
@@ -22,8 +22,6 @@
 class QDomDocument;
 class QDomElement;
 class QString;
-class KisUndoAdapter;
-class KisNodeQueryPath;
 class KisPlayInfo;
 class KisRecordedActionLoadContext;
 class KisRecordedActionSaveContext;
diff --git a/krita/image/recorder/kis_recorded_node_action.h b/krita/image/recorder/kis_recorded_node_action.h
--- a/krita/image/recorder/kis_recorded_node_action.h
+++ b/krita/image/recorder/kis_recorded_node_action.h
@@ -20,6 +20,7 @@
 #define _KIS_RECORDED_NODE_ACTION_H_
 
 #include "kis_recorded_action.h"
+class KisNodeQueryPath;
 
 /**
  * Used for action that applys on nodes that are 
diff --git a/krita/image/tests/kis_convolution_painter_test.cpp b/krita/image/tests/kis_convolution_painter_test.cpp
--- a/krita/image/tests/kis_convolution_painter_test.cpp
+++ b/krita/image/tests/kis_convolution_painter_test.cpp
@@ -27,7 +27,6 @@
 #include <KoColorSpaceRegistry.h>
 #include <KoColorSpaceTraits.h>
 
-#include "kis_types.h"
 #include "kis_paint_device.h"
 #include "kis_convolution_painter.h"
 #include "kis_convolution_kernel.h"
diff --git a/krita/image/tests/kis_crop_processing_visitor_test.cpp b/krita/image/tests/kis_crop_processing_visitor_test.cpp
--- a/krita/image/tests/kis_crop_processing_visitor_test.cpp
+++ b/krita/image/tests/kis_crop_processing_visitor_test.cpp
@@ -29,6 +29,7 @@
 #include "testutil.h"
 #include "kis_surrogate_undo_adapter.h"
 #include "kis_image.h"
+#include "kis_pixel_selection.h"
 
 void KisCropProcessingVisitorTest::testUndo()
 {
diff --git a/krita/image/tests/kis_filter_weights_applicator_test.cpp b/krita/image/tests/kis_filter_weights_applicator_test.cpp
--- a/krita/image/tests/kis_filter_weights_applicator_test.cpp
+++ b/krita/image/tests/kis_filter_weights_applicator_test.cpp
@@ -23,6 +23,7 @@
 #include <KoColor.h>
 #include <KoColorSpace.h>
 #include <KoColorSpaceRegistry.h>
+#include "kis_paint_device.h"
 
 //#define DEBUG_ENABLED
 #include "kis_filter_weights_applicator.h"
diff --git a/krita/image/tests/kis_image_signal_router_test.cpp b/krita/image/tests/kis_image_signal_router_test.cpp
--- a/krita/image/tests/kis_image_signal_router_test.cpp
+++ b/krita/image/tests/kis_image_signal_router_test.cpp
@@ -19,7 +19,6 @@
 #include "kis_image_signal_router_test.h"
 
 #include <QTest>
-#include "kis_image_signal_router.h"
 
 
 inline void KisImageSignalRouterTest::checkNotification(KisImageSignalType notification, const char *signal)
diff --git a/krita/image/tests/kis_iterators_ng_test.cpp b/krita/image/tests/kis_iterators_ng_test.cpp
--- a/krita/image/tests/kis_iterators_ng_test.cpp
+++ b/krita/image/tests/kis_iterators_ng_test.cpp
@@ -31,6 +31,7 @@
 
 #include "kis_paint_device.h"
 #include <kis_iterator_ng.h>
+#include "kis_global.h"
 
 
 void KisIteratorTest::allCsApplicator(void (KisIteratorTest::* funcPtr)(const KoColorSpace*cs))
diff --git a/krita/image/tests/kis_layer_test.cpp b/krita/image/tests/kis_layer_test.cpp
--- a/krita/image/tests/kis_layer_test.cpp
+++ b/krita/image/tests/kis_layer_test.cpp
@@ -31,9 +31,6 @@
 #include "kis_filter_mask.h"
 #include "kis_transparency_mask.h"
 
-#include "kis_types.h"
-#include "kis_layer.h"
-#include "kis_image.h"
 #include "kis_group_layer.h"
 #include "kis_paint_layer.h"
 
diff --git a/krita/image/tests/kis_node_facade_test.cpp b/krita/image/tests/kis_node_facade_test.cpp
--- a/krita/image/tests/kis_node_facade_test.cpp
+++ b/krita/image/tests/kis_node_facade_test.cpp
@@ -24,7 +24,6 @@
 #include "kis_node_facade.h"
 #include "kis_types.h"
 #include "kis_global.h"
-#include "kis_node.h"
 #include "testutil.h"
 
 void KisNodeFacadeTest::testCreation()
diff --git a/krita/image/tests/kis_node_test.cpp b/krita/image/tests/kis_node_test.cpp
--- a/krita/image/tests/kis_node_test.cpp
+++ b/krita/image/tests/kis_node_test.cpp
@@ -21,7 +21,6 @@
 #include <limits.h>
 #include "kis_types.h"
 #include "kis_global.h"
-#include "kis_node.h"
 #include "kis_node_graph_listener.h"
 #include <KoProperties.h>
 #include "testutil.h"
diff --git a/krita/image/tests/kis_walkers_test.cpp b/krita/image/tests/kis_walkers_test.cpp
--- a/krita/image/tests/kis_walkers_test.cpp
+++ b/krita/image/tests/kis_walkers_test.cpp
@@ -19,14 +19,12 @@
 #include "kis_walkers_test.h"
 
 #include "kis_base_rects_walker.h"
-#include "kis_merge_walker.h"
 #include "kis_refresh_subtree_walker.h"
 #include "kis_full_refresh_walker.h"
 
 #include <QTest>
 #include <KoColorSpaceRegistry.h>
 #include <KoColorSpace.h>
-#include "kis_image.h"
 #include "kis_paint_layer.h"
 #include "kis_group_layer.h"
 #include "kis_clone_layer.h"
diff --git a/krita/image/tiles3/kis_memento.h b/krita/image/tiles3/kis_memento.h
--- a/krita/image/tiles3/kis_memento.h
+++ b/krita/image/tiles3/kis_memento.h
@@ -28,9 +28,8 @@
 #include <kis_shared.h>
 #include <kis_shared_ptr.h>
 
-#include "kis_memento_manager.h"
 
-class KisTile;
+class KisMementoManager;
 
 class KisMemento;
 typedef KisSharedPtr<KisMemento> KisMementoSP;
diff --git a/krita/image/tiles3/kis_memento_item.h b/krita/image/tiles3/kis_memento_item.h
--- a/krita/image/tiles3/kis_memento_item.h
+++ b/krita/image/tiles3/kis_memento_item.h
@@ -21,7 +21,6 @@
 
 #include <kis_shared.h>
 #include <kis_shared_ptr.h>
-#include "kis_tile_data_store.h"
 #include "kis_tile.h"
 
 
diff --git a/krita/image/tiles3/kis_random_accessor.h b/krita/image/tiles3/kis_random_accessor.h
--- a/krita/image/tiles3/kis_random_accessor.h
+++ b/krita/image/tiles3/kis_random_accessor.h
@@ -25,7 +25,6 @@
 #include "kis_tiled_data_manager.h"
 #include "kis_random_accessor_ng.h"
 
-class KisTile;
 
 class KisRandomAccessor2 : public KisRandomAccessorNG
 {
diff --git a/krita/image/tiles3/kis_tile_data_interface.h b/krita/image/tiles3/kis_tile_data_interface.h
--- a/krita/image/tiles3/kis_tile_data_interface.h
+++ b/krita/image/tiles3/kis_tile_data_interface.h
@@ -22,7 +22,6 @@
 #include <QAtomicInt>
 
 #include "kis_lockless_stack.h"
-#include "kis_memory_pool.h"
 #include "swap/kis_chunk_allocator.h"
 
 class KisTileData;
diff --git a/krita/libbrush/kis_auto_brush.cpp b/krita/libbrush/kis_auto_brush.cpp
--- a/krita/libbrush/kis_auto_brush.cpp
+++ b/krita/libbrush/kis_auto_brush.cpp
@@ -41,6 +41,7 @@
 #include "kis_paint_information.h"
 #include "kis_mask_generator.h"
 #include "kis_boundary.h"
+#include "kis_brush_mask_applicator_base.h"
 
 #if defined(_WIN32) || defined(_WIN64)
 #include <stdlib.h>
diff --git a/krita/plugins/formats/psd/psd_pixel_utils.cpp b/krita/plugins/formats/psd/psd_pixel_utils.cpp
--- a/krita/plugins/formats/psd/psd_pixel_utils.cpp
+++ b/krita/plugins/formats/psd/psd_pixel_utils.cpp
@@ -30,6 +30,7 @@
 
 #include <netinet/in.h> // htonl
 
+#include "kis_global.h"
 #include <asl/kis_asl_writer_utils.h>
 #include <asl/kis_asl_reader_utils.h>
 
diff --git a/krita/plugins/formats/tiff/kis_tiff_writer_visitor.h b/krita/plugins/formats/tiff/kis_tiff_writer_visitor.h
--- a/krita/plugins/formats/tiff/kis_tiff_writer_visitor.h
+++ b/krita/plugins/formats/tiff/kis_tiff_writer_visitor.h
@@ -21,6 +21,7 @@
 #define KIS_TIFF_WRITER_VISITOR_H
 
 #include <kis_node_visitor.h>
+#include "kis_types.h"
 
 #include <tiffio.h>
 
diff --git a/krita/plugins/paintops/dynadraw/kis_dyna_paintop_settings_widget.cpp b/krita/plugins/paintops/dynadraw/kis_dyna_paintop_settings_widget.cpp
--- a/krita/plugins/paintops/dynadraw/kis_dyna_paintop_settings_widget.cpp
+++ b/krita/plugins/paintops/dynadraw/kis_dyna_paintop_settings_widget.cpp
@@ -24,6 +24,7 @@
 #include <kis_paint_action_type_option.h>
 #include <kis_airbrush_option.h>
 #include <kis_compositeop_option.h>
+#include <klocale.h>
 
 KisDynaPaintOpSettingsWidget:: KisDynaPaintOpSettingsWidget(QWidget* parent)
     : KisPaintOpSettingsWidget(parent)
diff --git a/krita/plugins/paintops/gridbrush/kis_grid_paintop_settings_widget.cpp b/krita/plugins/paintops/gridbrush/kis_grid_paintop_settings_widget.cpp
--- a/krita/plugins/paintops/gridbrush/kis_grid_paintop_settings_widget.cpp
+++ b/krita/plugins/paintops/gridbrush/kis_grid_paintop_settings_widget.cpp
@@ -26,6 +26,7 @@
 #include <kis_paintop_settings_widget.h>
 #include <kis_paint_action_type_option.h>
 #include <kis_compositeop_option.h>
+#include <klocale.h>
 
 KisGridPaintOpSettingsWidget:: KisGridPaintOpSettingsWidget(QWidget* parent)
     : KisPaintOpSettingsWidget(parent)
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
@@ -17,6 +17,7 @@
  */
 #include "kis_brush_based_paintop.h"
 #include "kis_properties_configuration.h"
+#include "kis_paintop_settings.h"
 #include "kis_brush_option.h"
 #include <kis_pressure_spacing_option.h>
 
diff --git a/krita/plugins/paintops/libpaintop/kis_brush_based_paintop_options_widget.cpp b/krita/plugins/paintops/libpaintop/kis_brush_based_paintop_options_widget.cpp
--- a/krita/plugins/paintops/libpaintop/kis_brush_based_paintop_options_widget.cpp
+++ b/krita/plugins/paintops/libpaintop/kis_brush_based_paintop_options_widget.cpp
@@ -18,6 +18,7 @@
 
 #include "kis_brush_based_paintop_options_widget.h"
 #include "kis_brush_option_widget.h"
+#include <klocale.h>
 
 KisBrushBasedPaintopOptionWidget::KisBrushBasedPaintopOptionWidget(QWidget* parent)
     : KisPaintOpSettingsWidget(parent)
diff --git a/krita/plugins/paintops/libpaintop/kis_color_source.cpp b/krita/plugins/paintops/libpaintop/kis_color_source.cpp
--- a/krita/plugins/paintops/libpaintop/kis_color_source.cpp
+++ b/krita/plugins/paintops/libpaintop/kis_color_source.cpp
@@ -25,6 +25,7 @@
 #include <kis_datamanager.h>
 #include <kis_fill_painter.h>
 #include "kis_iterator_ng.h"
+#include "kis_selection.h"
 
 KisColorSource::~KisColorSource() { }
 
diff --git a/krita/plugins/paintops/libpaintop/kis_texture_option.cpp b/krita/plugins/paintops/libpaintop/kis_texture_option.cpp
--- a/krita/plugins/paintops/libpaintop/kis_texture_option.cpp
+++ b/krita/plugins/paintops/libpaintop/kis_texture_option.cpp
@@ -49,6 +49,7 @@
 #include <kis_gradient_slider.h>
 #include "kis_embedded_pattern_manager.h"
 #include "kis_algebra_2d.h"
+#include "kis_selection.h"
 
 #include <time.h>
 
diff --git a/krita/plugins/tools/defaulttools/kis_tool_line_helper.cpp b/krita/plugins/tools/defaulttools/kis_tool_line_helper.cpp
--- a/krita/plugins/tools/defaulttools/kis_tool_line_helper.cpp
+++ b/krita/plugins/tools/defaulttools/kis_tool_line_helper.cpp
@@ -19,6 +19,7 @@
 #include "kis_tool_line_helper.h"
 
 #include "kis_painting_information_builder.h"
+#include "kis_image.h"
 
 struct KisToolLineHelper::Private
 {
diff --git a/krita/plugins/tools/tool_transform2/kis_transform_utils.cpp b/krita/plugins/tools/tool_transform2/kis_transform_utils.cpp
--- a/krita/plugins/tools/tool_transform2/kis_transform_utils.cpp
+++ b/krita/plugins/tools/tool_transform2/kis_transform_utils.cpp
@@ -22,6 +22,7 @@
 #include <QTransform>
 #include <KoUnit.h>
 #include "tool_transform_args.h"
+#include "kis_paint_device.h"
 
 
 const int KisTransformUtils::rotationHandleVisualRadius = 12;
diff --git a/krita/plugins/tools/tool_transform2/tool_transform_args.h b/krita/plugins/tools/tool_transform2/tool_transform_args.h
--- a/krita/plugins/tools/tool_transform2/tool_transform_args.h
+++ b/krita/plugins/tools/tool_transform2/tool_transform_args.h
@@ -27,6 +27,7 @@
 #include <kis_filter_strategy.h>
 #include "kis_liquify_properties.h"
 #include "kritatooltransform_export.h"
+#include "kis_global.h"
 
 
 #include <QScopedPointer>
diff --git a/krita/ui/KisApplication.cpp b/krita/ui/KisApplication.cpp
--- a/krita/ui/KisApplication.cpp
+++ b/krita/ui/KisApplication.cpp
@@ -69,6 +69,7 @@
 #include "flake/kis_shape_selection.h"
 #include <filter/kis_filter.h>
 #include <filter/kis_filter_registry.h>
+#include <filter/kis_filter_configuration.h>
 #include <generator/kis_generator_registry.h>
 #include <generator/kis_generator.h>
 #include <kis_paintop_registry.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
@@ -51,6 +51,7 @@
 #include "kis_transaction.h"
 #include "kis_iterator_ng.h"
 #include "kis_processing_applicator.h"
+#include "kis_group_layer.h"
 #include "commands/kis_selection_commands.h"
 #include "commands/kis_image_layer_add_command.h"
 #include "kis_tool_proxy.h"
diff --git a/krita/ui/kis_file_layer.cpp b/krita/ui/kis_file_layer.cpp
--- a/krita/ui/kis_file_layer.cpp
+++ b/krita/ui/kis_file_layer.cpp
@@ -25,7 +25,9 @@
 #include "kis_node_progress_proxy.h"
 #include "kis_node_visitor.h"
 #include "kis_image.h"
+#include "kis_types.h"
 #include "commands_new/kis_node_move_command2.h"
+#include "kis_default_bounds.h"
 
 
 KisFileLayer::KisFileLayer(KisImageWSP image, const QString &basePath, const QString &filename, ScalingMethod scaleToImageResolution, const QString &name, quint8 opacity)
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
@@ -25,10 +25,9 @@
 #include "kis_adjustment_layer.h"
 #include "kis_types.h"
 #include "KisView.h"
-
+#include <filter/kis_filter_configuration.h>
 
 class KisViewManager;
-class KisFilterConfiguration;
 class KisNodeCommandsAdapter;
 class KisAction;
 class KisActionManager;
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,6 +19,8 @@
  */
 
 #include "kis_paintop_options_model.h"
+#include <klocale.h>
+
 
 KisPaintOpOptionListModel::KisPaintOpOptionListModel(QObject *parent)
     : BaseOptionCategorizedListModel(parent)
diff --git a/krita/ui/kra/kis_kra_saver.cpp b/krita/ui/kra/kis_kra_saver.cpp
--- a/krita/ui/kra/kis_kra_saver.cpp
+++ b/krita/ui/kra/kis_kra_saver.cpp
@@ -33,6 +33,7 @@
 #include <KoColorSpaceRegistry.h>
 #include <KoColorSpace.h>
 #include <KoColorProfile.h>
+#include <KoColor.h>
 #include <KoStore.h>
 #include <KoStoreDevice.h>
 
diff --git a/krita/ui/widgets/kis_filter_selector_widget.cc b/krita/ui/widgets/kis_filter_selector_widget.cc
--- a/krita/ui/widgets/kis_filter_selector_widget.cc
+++ b/krita/ui/widgets/kis_filter_selector_widget.cc
@@ -35,6 +35,7 @@
 #include <filter/kis_filter.h>
 #include <kis_config_widget.h>
 #include <filter/kis_filter_configuration.h>
+#include "kis_default_bounds.h"
 
 // From krita/ui
 #include "kis_bookmarked_configurations_editor.h"
diff --git a/krita/ui/widgets/kis_scratch_pad.cpp b/krita/ui/widgets/kis_scratch_pad.cpp
--- a/krita/ui/widgets/kis_scratch_pad.cpp
+++ b/krita/ui/widgets/kis_scratch_pad.cpp
@@ -38,6 +38,7 @@
 #include <kis_canvas_resource_provider.h>
 
 #include "kis_config.h"
+#include "kis_image.h"
 #include "kis_undo_stores.h"
 #include "kis_update_scheduler.h"
 #include "kis_post_execution_undo_adapter.h"
@@ -47,6 +48,7 @@
 #include "kis_image_patch.h"
 #include "kis_canvas_widget_base.h"
 #include "kis_layer_projection_plane.h"
+#include "kis_node_graph_listener.h"
 
 
 class KisScratchPadNodeListener : public KisNodeGraphListener