14 files changed, 9 insertions, 28 deletions
diff --git a/src/filters/blend.cpp b/src/filters/blend.cpp
index d3f031257..0c7f87542 100644
--- a/src/filters/blend.cpp
+++ b/src/filters/blend.cpp
@@ -18,13 +18,9 @@
 #include "sp-filter.h"
 #include "filters/blend.h"
 #include "attributes.h"
-#include "svg/svg.h"
 #include "xml/repr.h"
 
 #include "display/nr-filter.h"
-#include "display/nr-filter-primitive.h"
-#include "display/nr-filter-blend.h"
-#include "display/nr-filter-types.h"
 
 SPFeBlend::SPFeBlend()
     : SPFilterPrimitive(), blend_mode(Inkscape::Filters::BLEND_NORMAL),
diff --git a/src/filters/colormatrix.cpp b/src/filters/colormatrix.cpp
index a7f0296c2..0e8398ace 100644
--- a/src/filters/colormatrix.cpp
+++ b/src/filters/colormatrix.cpp
@@ -23,7 +23,6 @@
 #include "helper-fns.h"
 
 #include "display/nr-filter.h"
-#include "display/nr-filter-colormatrix.h"
 
 SPFeColorMatrix::SPFeColorMatrix() 
     : SPFilterPrimitive(), type(Inkscape::Filters::COLORMATRIX_MATRIX), value(0)
diff --git a/src/filters/componenttransfer-funcnode.cpp b/src/filters/componenttransfer-funcnode.cpp
index 76e99a648..23c8dbd96 100644
--- a/src/filters/componenttransfer-funcnode.cpp
+++ b/src/filters/componenttransfer-funcnode.cpp
@@ -19,12 +19,10 @@
 #include "document.h"
 #include "componenttransfer.h"
 #include "componenttransfer-funcnode.h"
-#include "display/nr-filter-component-transfer.h"
 #include "xml/repr.h"
 #include "helper-fns.h"
 
 #define SP_MACROS_SILENT
-#include "macros.h"
 
 
 /* FeFuncNode class */
diff --git a/src/filters/componenttransfer.cpp b/src/filters/componenttransfer.cpp
index bc91e58a7..19843eebd 100644
--- a/src/filters/componenttransfer.cpp
+++ b/src/filters/componenttransfer.cpp
@@ -12,16 +12,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <string.h>
-
 #include "document.h"
 #include "attributes.h"
-#include "svg/svg.h"
 #include "filters/componenttransfer.h"
 #include "filters/componenttransfer-funcnode.h"
 #include "xml/repr.h"
 #include "display/nr-filter.h"
-#include "display/nr-filter-component-transfer.h"
 
 SPFeComponentTransfer::SPFeComponentTransfer()
     : SPFilterPrimitive(), renderer(NULL)
diff --git a/src/filters/convolvematrix.cpp b/src/filters/convolvematrix.cpp
index 3a443bebc..1b1e58407 100644
--- a/src/filters/convolvematrix.cpp
+++ b/src/filters/convolvematrix.cpp
@@ -17,12 +17,10 @@
 #include <math.h>
 #include <vector>
 #include "attributes.h"
-#include "svg/svg.h"
 #include "filters/convolvematrix.h"
 #include "helper-fns.h"
 #include "xml/repr.h"
 #include "display/nr-filter.h"
-#include "display/nr-filter-convolve-matrix.h"
 
 SPFeConvolveMatrix::SPFeConvolveMatrix() : SPFilterPrimitive() {
 	this->bias = 0;
diff --git a/src/filters/distantlight.cpp b/src/filters/distantlight.cpp
index fb7380174..617f53121 100644
--- a/src/filters/distantlight.cpp
+++ b/src/filters/distantlight.cpp
@@ -23,7 +23,6 @@
 #include "xml/repr.h"
 
 #define SP_MACROS_SILENT
-#include "macros.h"
 
 
 SPFeDistantLight::SPFeDistantLight()
diff --git a/src/filters/flood.cpp b/src/filters/flood.cpp
index 94ca61b98..cbcaa83eb 100644
--- a/src/filters/flood.cpp
+++ b/src/filters/flood.cpp
@@ -19,7 +19,6 @@
 #include "svg/svg-color.h"
 #include "filters/flood.h"
 #include "xml/repr.h"
-#include "helper-fns.h"
 #include "display/nr-filter.h"
 #include "display/nr-filter-flood.h"
 
diff --git a/src/filters/gaussian-blur.cpp b/src/filters/gaussian-blur.cpp
index 43a1f6dfb..814224ab1 100644
--- a/src/filters/gaussian-blur.cpp
+++ b/src/filters/gaussian-blur.cpp
@@ -14,7 +14,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+#include <config.h>
 #endif
 
 #include "attributes.h"
@@ -23,9 +23,7 @@
 #include "xml/repr.h"
 
 #include "display/nr-filter.h"
-#include "display/nr-filter-primitive.h"
 #include "display/nr-filter-gaussian.h"
-#include "display/nr-filter-types.h"
 
 SPGaussianBlur::SPGaussianBlur() : SPFilterPrimitive() {
 }
diff --git a/src/filters/image.cpp b/src/filters/image.cpp
index 62e8b76b9..887201eb3 100644
--- a/src/filters/image.cpp
+++ b/src/filters/image.cpp
@@ -18,12 +18,9 @@
 #include "display/nr-filter-image.h"
 #include "uri.h"
 #include "uri-references.h"
-#include "enums.h"
 #include "attributes.h"
-#include "svg/svg.h"
 #include "image.h"
 #include "xml/repr.h"
-#include <string.h>
 
 #include "display/nr-filter.h"
 
diff --git a/src/filters/morphology.cpp b/src/filters/morphology.cpp
index 326c9b7a6..b3cfa0697 100644
--- a/src/filters/morphology.cpp
+++ b/src/filters/morphology.cpp
@@ -20,7 +20,6 @@
 #include "morphology.h"
 #include "xml/repr.h"
 #include "display/nr-filter.h"
-#include "display/nr-filter-morphology.h"
 
 SPFeMorphology::SPFeMorphology() : SPFilterPrimitive() {
 	this->Operator = Inkscape::Filters::MORPHOLOGY_OPERATOR_ERODE;
diff --git a/src/filters/pointlight.cpp b/src/filters/pointlight.cpp
index dd3a78f4c..39c4a700a 100644
--- a/src/filters/pointlight.cpp
+++ b/src/filters/pointlight.cpp
@@ -20,10 +20,8 @@
 #include "filters/pointlight.h"
 #include "filters/diffuselighting.h"
 #include "filters/specularlighting.h"
-#include "xml/repr.h"
 
 #define SP_MACROS_SILENT
-#include "macros.h"
 
 SPFePointLight::SPFePointLight() 
     : SPObject(), x(0), x_set(FALSE), y(0), y_set(FALSE), z(0), z_set(FALSE) {
diff --git a/src/filters/pointlight.h b/src/filters/pointlight.h
index 1e26d45e7..8df6c0c7c 100644
--- a/src/filters/pointlight.h
+++ b/src/filters/pointlight.h
@@ -1,4 +1,11 @@
-#ifndef SP_FEPOINTLIGHT_H_SEEN
+#ifndef SP_FEPOI"attributes.h"
+#include "svg/svg.h"
+#include "xml/repr.h"
+
+#include "merge.h"
+#include "mergenode.h"
+#include "display/nr-filter.h"
+#include "display/nr-filter-merge.h"NTLIGHT_H_SEEN
 #define SP_FEPOINTLIGHT_H_SEEN
 
 /** \file
diff --git a/src/filters/spotlight.cpp b/src/filters/spotlight.cpp
index 2e55d39d0..a1e7207f3 100644
--- a/src/filters/spotlight.cpp
+++ b/src/filters/spotlight.cpp
@@ -23,7 +23,6 @@
 #include "xml/repr.h"
 
 #define SP_MACROS_SILENT
-#include "macros.h"
 
 SPFeSpotLight::SPFeSpotLight()
     : SPObject(), x(0), x_set(FALSE), y(0), y_set(FALSE), z(0), z_set(FALSE), pointsAtX(0), pointsAtX_set(FALSE),
diff --git a/src/filters/turbulence.cpp b/src/filters/turbulence.cpp
index 7541175ed..9af51892e 100644
--- a/src/filters/turbulence.cpp
+++ b/src/filters/turbulence.cpp
@@ -19,10 +19,8 @@
 #include "turbulence.h"
 #include "helper-fns.h"
 #include "xml/repr.h"
-#include <string.h>
 
 #include "display/nr-filter.h"
-#include "display/nr-filter-turbulence.h"
 
 SPFeTurbulence::SPFeTurbulence() : SPFilterPrimitive() {
 	this->stitchTiles = 0;