Remove #include "config.h" wherever possible

25 files changed, 10 insertions, 83 deletions

diff --git a/src/object/color-profile.cpp b/src/object/color-profile.cpp
index f010efe33..1540b7fa6 100644
--- a/src/object/color-profile.cpp
+++ b/src/object/color-profile.cpp
@@ -1,5 +1,5 @@
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include "config.h"  // only include where actually required!
 #endif
 
 #define noDEBUG_LCMS
diff --git a/src/object/color-profile.h b/src/object/color-profile.h
index e8cc859d2..4e687b9b6 100644
--- a/src/object/color-profile.h
+++ b/src/object/color-profile.h
@@ -1,6 +1,10 @@
 #ifndef SEEN_COLOR_PROFILE_H
 #define SEEN_COLOR_PROFILE_H
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"  // only include where actually required!
+#endif
+
 #include <set>
 #include <vector>
 
diff --git a/src/object/filters/gaussian-blur.cpp b/src/object/filters/gaussian-blur.cpp
index 19eb532b4..d5a49e7ca 100644
--- a/src/object/filters/gaussian-blur.cpp
+++ b/src/object/filters/gaussian-blur.cpp
@@ -13,10 +13,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "gaussian-blur.h"
 
 #include "attributes.h"
diff --git a/src/object/filters/sp-filter-primitive.cpp b/src/object/filters/sp-filter-primitive.cpp
index 1f314c827..e71b8929c 100644
--- a/src/object/filters/sp-filter-primitive.cpp
+++ b/src/object/filters/sp-filter-primitive.cpp
@@ -13,10 +13,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <cstring>
 
 #include "sp-filter-primitive.h"
diff --git a/src/object/sp-dimensions.cpp b/src/object/sp-dimensions.cpp
index f39b98945..60e6b6dfd 100644
--- a/src/object/sp-dimensions.cpp
+++ b/src/object/sp-dimensions.cpp
@@ -13,9 +13,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
 #include "sp-dimensions.h"
 #include "sp-item.h"
 
diff --git a/src/object/sp-filter.cpp b/src/object/sp-filter.cpp
index eaddfdcbf..3c6533892 100644
--- a/src/object/sp-filter.cpp
+++ b/src/object/sp-filter.cpp
@@ -13,10 +13,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "sp-filter.h"
 
 #include <map>
diff --git a/src/object/sp-flowregion.cpp b/src/object/sp-flowregion.cpp
index 9829cf828..621eb541e 100644
--- a/src/object/sp-flowregion.cpp
+++ b/src/object/sp-flowregion.cpp
@@ -1,9 +1,6 @@
 /*
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
 #include <glibmm/i18n.h>
 
 #include <xml/repr.h>
diff --git a/src/object/sp-flowtext.cpp b/src/object/sp-flowtext.cpp
index c0e23ee97..c24b7689b 100644
--- a/src/object/sp-flowtext.cpp
+++ b/src/object/sp-flowtext.cpp
@@ -1,9 +1,6 @@
 /*
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
 #include <glibmm/i18n.h>
 #include <cstring>
 #include <string>
diff --git a/src/object/sp-font-face.cpp b/src/object/sp-font-face.cpp
index a60dd6110..5fd7fd99d 100644
--- a/src/object/sp-font-face.cpp
+++ b/src/object/sp-font-face.cpp
@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 /*
  * SVG <font-face> element implementation
  *
diff --git a/src/object/sp-font.cpp b/src/object/sp-font.cpp
index 6736da200..8caac2612 100644
--- a/src/object/sp-font.cpp
+++ b/src/object/sp-font.cpp
@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 /*
  * SVG <font> element implementation
  *
diff --git a/src/object/sp-guide.cpp b/src/object/sp-guide.cpp
index a89af4533..a9367192c 100644
--- a/src/object/sp-guide.cpp
+++ b/src/object/sp-guide.cpp
@@ -15,10 +15,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <algorithm>
 #include <cstring>
 #include <string>
diff --git a/src/object/sp-image.cpp b/src/object/sp-image.cpp
index 65643c701..95b6ace11 100644
--- a/src/object/sp-image.cpp
+++ b/src/object/sp-image.cpp
@@ -14,7 +14,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include "config.h"  // only include where actually required!
 #endif
 
 #include <cstring>
diff --git a/src/object/sp-image.h b/src/object/sp-image.h
index 7d62e756a..cb61622ce 100644
--- a/src/object/sp-image.h
+++ b/src/object/sp-image.h
@@ -14,6 +14,10 @@
 #ifndef SEEN_INKSCAPE_SP_IMAGE_H
 #define SEEN_INKSCAPE_SP_IMAGE_H
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"  // only include where actually required!
+#endif
+
 #include <glibmm/ustring.h>
 #include "svg/svg-length.h"
 #include "display/curve.h"
diff --git a/src/object/sp-item-group.cpp b/src/object/sp-item-group.cpp
index f0ff9e4fc..8e78da04d 100644
--- a/src/object/sp-item-group.cpp
+++ b/src/object/sp-item-group.cpp
@@ -14,10 +14,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <glibmm/i18n.h>
 #include <cstring>
 #include <string>
diff --git a/src/object/sp-item.cpp b/src/object/sp-item.cpp
index b7cd69c7f..c09116e97 100644
--- a/src/object/sp-item.cpp
+++ b/src/object/sp-item.cpp
@@ -12,10 +12,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "sp-item.h"
 
 #include <glibmm/i18n.h>
diff --git a/src/object/sp-metadata.cpp b/src/object/sp-metadata.cpp
index 39f42d3ff..ad50295d0 100644
--- a/src/object/sp-metadata.cpp
+++ b/src/object/sp-metadata.cpp
@@ -9,10 +9,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "sp-metadata.h"
 #include "xml/node-iterators.h"
 #include "document.h"
diff --git a/src/object/sp-missing-glyph.cpp b/src/object/sp-missing-glyph.cpp
index d3da6ccff..62102e292 100644
--- a/src/object/sp-missing-glyph.cpp
+++ b/src/object/sp-missing-glyph.cpp
@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 /*
  * SVG <missing-glyph> element implementation
  *
diff --git a/src/object/sp-offset.cpp b/src/object/sp-offset.cpp
index 7d2997185..1657c9edc 100644
--- a/src/object/sp-offset.cpp
+++ b/src/object/sp-offset.cpp
@@ -14,10 +14,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "sp-offset.h"
 
 #include <cstring>
diff --git a/src/object/sp-path.cpp b/src/object/sp-path.cpp
index 558b3b72e..189f8c2c6 100644
--- a/src/object/sp-path.cpp
+++ b/src/object/sp-path.cpp
@@ -15,10 +15,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <glibmm/i18n.h>
 
 #include "live_effects/effect.h"
diff --git a/src/object/sp-pattern.cpp b/src/object/sp-pattern.cpp
index d2167c297..6b1ffeb44 100644
--- a/src/object/sp-pattern.cpp
+++ b/src/object/sp-pattern.cpp
@@ -12,10 +12,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "sp-pattern.h"
 
 #include <cstring>
diff --git a/src/object/sp-rect.cpp b/src/object/sp-rect.cpp
index 0a3447f81..ac56577d7 100644
--- a/src/object/sp-rect.cpp
+++ b/src/object/sp-rect.cpp
@@ -11,10 +11,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "display/curve.h"
 
 #include "inkscape.h"
diff --git a/src/object/sp-shape.cpp b/src/object/sp-shape.cpp
index dd9c7e488..c5ecd5294 100644
--- a/src/object/sp-shape.cpp
+++ b/src/object/sp-shape.cpp
@@ -14,10 +14,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <2geom/rect.h>
 #include <2geom/transforms.h>
 #include <2geom/pathvector.h>
diff --git a/src/object/sp-star.cpp b/src/object/sp-star.cpp
index b0c9a8197..26a1b69bc 100644
--- a/src/object/sp-star.cpp
+++ b/src/object/sp-star.cpp
@@ -13,10 +13,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <cstring>
 #include <string>
 #include <glib.h>
diff --git a/src/object/sp-symbol.cpp b/src/object/sp-symbol.cpp
index feb3ed097..db18b5a70 100644
--- a/src/object/sp-symbol.cpp
+++ b/src/object/sp-symbol.cpp
@@ -11,10 +11,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <string>
 
 #include <2geom/transforms.h>
diff --git a/src/object/sp-tspan.cpp b/src/object/sp-tspan.cpp
index 25f9e6764..860c30c84 100644
--- a/src/object/sp-tspan.cpp
+++ b/src/object/sp-tspan.cpp
@@ -23,10 +23,6 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <cstring>
 #include <string>
 #include <glibmm/i18n.h>