6 files changed, 13 insertions, 18 deletions
diff --git a/src/dir-util.h b/src/dir-util.h
index 90d7b3a54..327e1ad5f 100644
--- a/src/dir-util.h
+++ b/src/dir-util.h
@@ -1,4 +1,4 @@
-#ifndef SEEN_DIR_UTIL_H#include <config.h>
+#ifndef SEEN_DIR_UTIL_H
 #define SEEN_DIR_UTIL_H
 
 /*
diff --git a/src/extension/loader.cpp b/src/extension/loader.cpp
index 3bea0e1e6..164a5cecf 100644
--- a/src/extension/loader.cpp
+++ b/src/extension/loader.cpp
@@ -10,6 +10,9 @@
  */
 
 #include "loader.h"
+
+#include <gmodule.h>
+
 #include "system.h"
 #include <string.h>
 #include "dependency.h"
diff --git a/src/extension/loader.h b/src/extension/loader.h
index cd362f87b..0eecc02b9 100644
--- a/src/extension/loader.h
+++ b/src/extension/loader.h
@@ -1,5 +1,4 @@
-/** @file#include <config.h>
-
+/** @file
  * Loader for external plug-ins.
  *//*
  *
@@ -15,8 +14,6 @@
 #define INKSCAPE_EXTENSION_LOADER_H_
 
 #include "extension.h"
-#include "implementation/implementation.h"
-#include <gmodule.h>
 
 
 namespace Inkscape {
diff --git a/src/filters/pointlight.cpp b/src/filters/pointlight.cpp
index 39c4a700a..e42d21999 100644
--- a/src/filters/pointlight.cpp
+++ b/src/filters/pointlight.cpp
@@ -13,13 +13,16 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "filters/pointlight.h"
+
 #include <glib.h>
 
 #include "attributes.h"
 #include "document.h"
-#include "filters/pointlight.h"
 #include "filters/diffuselighting.h"
 #include "filters/specularlighting.h"
+#include "xml/node.h"
+#include "xml/repr.h"
 
 #define SP_MACROS_SILENT
 
diff --git a/src/filters/pointlight.h b/src/filters/pointlight.h
index 8df6c0c7c..1d60895c4 100644
--- a/src/filters/pointlight.h
+++ b/src/filters/pointlight.h
@@ -1,16 +1,9 @@
-#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
  * SVG <filter> implementation, see sp-filter.cpp.
  */
+#ifndef SP_FEPOINTLIGHT_H_SEEN
+#define SP_FEPOINTLIGHT_H_SEEN
+
 /*
  * Authors:
  *   Hugo Rodrigues <haa.rodrigues@gmail.com>
diff --git a/src/sp-line.h b/src/sp-line.h
index 177555c77..6c720d403 100644
--- a/src/sp-line.h
+++ b/src/sp-line.h
@@ -1,5 +1,4 @@
-#ifndef SEEN_SP_LINE_H * SPGradient, SPStop, SPLinearGradient, SPRadialGradient,
-
+#ifndef SEEN_SP_LINE_H 
 #define SEEN_SP_LINE_H
 
 /*