diff --git a/krita/image/filter/kis_filter_registry.h b/krita/image/filter/kis_filter_registry.h
index ba594be091d..845a47d44f5 100644
--- a/krita/image/filter/kis_filter_registry.h
+++ b/krita/image/filter/kis_filter_registry.h
@@ -1,59 +1,60 @@
 /*
  *  Copyright (c) 2003 Patrick Julien  <freak@codepimps.org>
  *  Copyright (c) 2004 Cyrille Berger <cberger@cberger.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  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.
  */
 
 #ifndef KIS_FILTER_REGISTRY_H_
 #define KIS_FILTER_REGISTRY_H_
 
 #include <QObject>
 
+#include "kis_filter.h"
 #include "kis_types.h"
 #include "KoGenericRegistry.h"
 
 #include <kritaimage_export.h>
 
 class QString;
 class KisFilterConfiguration;
 
 class KRITAIMAGE_EXPORT KisFilterRegistry : public QObject, public KoGenericRegistry<KisFilterSP>
 {
 
     Q_OBJECT
 
 public:
 
     virtual ~KisFilterRegistry();
 
     static KisFilterRegistry* instance();
     void add(KisFilterSP item);
     void add(const QString &id, KisFilterSP item);
 
     KisFilterConfiguration* cloneConfiguration(KisFilterConfiguration*);
 Q_SIGNALS:
 
     void filterAdded(QString id);
 
 private:
 
     KisFilterRegistry(QObject *parent);
     KisFilterRegistry(const KisFilterRegistry&);
     KisFilterRegistry operator=(const KisFilterRegistry&);
 
 };
 
 #endif // KIS_FILTERSPACE_REGISTRY_H_
diff --git a/krita/image/generator/kis_generator_registry.h b/krita/image/generator/kis_generator_registry.h
index d3fdf1b78d8..80e6c39820e 100644
--- a/krita/image/generator/kis_generator_registry.h
+++ b/krita/image/generator/kis_generator_registry.h
@@ -1,59 +1,60 @@
 /*
  *  Copyright (c) 2008 Boudewijn Rempt <boud@valdyas.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  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.
  */
 
 #ifndef KIS_GENERATOR_REGISTRY_H_
 #define KIS_GENERATOR_REGISTRY_H_
 
 #include <QObject>
 
+#include "kis_generator.h"
 #include "kis_types.h"
 #include "KoGenericRegistry.h"
 
 #include <kritaimage_export.h>
 
 class QString;
 class KisFilterConfiguration;
 
 /**
  * XXX_DOCS
  */
 class KRITAIMAGE_EXPORT KisGeneratorRegistry : public QObject, public KoGenericRegistry<KisGeneratorSP>
 {
 
     Q_OBJECT
 
 public:
     virtual ~KisGeneratorRegistry();
 
     static KisGeneratorRegistry* instance();
     void add(KisGeneratorSP item);
     void add(const QString &id, KisGeneratorSP item);
     KisFilterConfiguration* cloneConfiguration(KisFilterConfiguration* kfc);
 
 Q_SIGNALS:
 
     void generatorAdded(QString id);
 
 private:
 
     KisGeneratorRegistry(QObject *parent);
     KisGeneratorRegistry(const KisGeneratorRegistry&);
     KisGeneratorRegistry operator=(const KisGeneratorRegistry&);
 };
 
 #endif // KIS_GENERATOR_REGISTRY_H_
diff --git a/krita/libcolor/CMakeLists.txt b/krita/libcolor/CMakeLists.txt
index e1761b2aaa4..4988f2c9fcf 100644
--- a/krita/libcolor/CMakeLists.txt
+++ b/krita/libcolor/CMakeLists.txt
@@ -1,20 +1,20 @@
 if (UNIX AND NOT APPLE) 
     add_subdirectory(colord)
     set(kritacolor_LIB_SRCS kis_color_manager.h linux/kis_color_manager.cpp)
     set(kritacolor_EXTRA_LIBRARIES kritacolord)
 else ()
     set(kritacolor_LIB_SRCS dummy/kis_color_manager.cpp)
 endif () 
 
 kde4_add_library(kritacolor SHARED ${kritacolor_LIB_SRCS} )
 
-target_link_libraries(kritacolor ${QT_QTCORE_LIBRARY} ${kritacolor_EXTRA_LIBRARIES})
+target_link_libraries(kritacolor ${QT_QTCORE_LIBRARY} KF5::KDELibs4Support ${kritacolor_EXTRA_LIBRARIES})
 
 target_link_libraries(kritacolor LINK_INTERFACE_LIBRARIES ${QT_QTCORE_LIBRARY}) 
 
 set_target_properties(kritacolor PROPERTIES
     VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION}
 )
 
 install(TARGETS kritacolor  ${INSTALL_TARGETS_DEFAULT_ARGS})