Remove #include "config.h" wherever possible

22 files changed, 16 insertions, 59 deletions

diff --git a/src/display/cairo-templates.h b/src/display/cairo-templates.h
index 8241f7cb0..1d3277113 100644
--- a/src/display/cairo-templates.h
+++ b/src/display/cairo-templates.h
@@ -12,6 +12,10 @@
 #ifndef SEEN_INKSCAPE_DISPLAY_CAIRO_TEMPLATES_H
 #define SEEN_INKSCAPE_DISPLAY_CAIRO_TEMPLATES_H
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"  // only include where actually required!
+#endif
+
 #include <glib.h>
 
 #ifdef HAVE_OPENMP
diff --git a/src/display/cairo-utils.cpp b/src/display/cairo-utils.cpp
index 965645b15..e4cef786d 100644
--- a/src/display/cairo-utils.cpp
+++ b/src/display/cairo-utils.cpp
@@ -8,10 +8,6 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include "display/cairo-utils.h"
 
 #include <stdexcept>
diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp
index 8d9cb7d0a..2bbc8bc37 100644
--- a/src/display/canvas-axonomgrid.cpp
+++ b/src/display/canvas-axonomgrid.cpp
@@ -13,10 +13,6 @@
   * to the right). The x-axis will always have an angle between 0 and 90 degrees.
   */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <gtkmm/box.h>
 #include <gtkmm/label.h>
 #include <gtkmm/grid.h>
diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp
index db765820f..c474bea50 100644
--- a/src/display/canvas-grid.cpp
+++ b/src/display/canvas-grid.cpp
@@ -14,10 +14,6 @@
  * Don't be shy to correct things.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <gtkmm/box.h>
 #include <gtkmm/label.h>
 #include <gtkmm/grid.h>
diff --git a/src/display/nr-filter-blend.cpp b/src/display/nr-filter-blend.cpp
index 8ee05dda4..fb9d2471a 100644
--- a/src/display/nr-filter-blend.cpp
+++ b/src/display/nr-filter-blend.cpp
@@ -16,10 +16,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <glibmm.h>
 #include "display/cairo-templates.h"
 #include "display/cairo-utils.h"
diff --git a/src/display/nr-filter-colormatrix.cpp b/src/display/nr-filter-colormatrix.cpp
index 6f9c6c2b0..d27e6104a 100644
--- a/src/display/nr-filter-colormatrix.cpp
+++ b/src/display/nr-filter-colormatrix.cpp
@@ -10,10 +10,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <cmath>
 #include <algorithm>
 #include "display/cairo-templates.h"
diff --git a/src/display/nr-filter-component-transfer.cpp b/src/display/nr-filter-component-transfer.cpp
index 9e9c753fa..38b66e230 100644
--- a/src/display/nr-filter-component-transfer.cpp
+++ b/src/display/nr-filter-component-transfer.cpp
@@ -10,10 +10,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <cmath>
 #include "display/cairo-templates.h"
 #include "display/cairo-utils.h"
diff --git a/src/display/nr-filter-composite.cpp b/src/display/nr-filter-composite.cpp
index 22a888c6d..0eabde3ae 100644
--- a/src/display/nr-filter-composite.cpp
+++ b/src/display/nr-filter-composite.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 <cmath>
 
 #include "display/cairo-templates.h"
diff --git a/src/display/nr-filter-convolve-matrix.cpp b/src/display/nr-filter-convolve-matrix.cpp
index 2b6413c19..3ab5f74f7 100644
--- a/src/display/nr-filter-convolve-matrix.cpp
+++ b/src/display/nr-filter-convolve-matrix.cpp
@@ -10,10 +10,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vector>
 #include "display/cairo-templates.h"
 #include "display/cairo-utils.h"
diff --git a/src/display/nr-filter-diffuselighting.cpp b/src/display/nr-filter-diffuselighting.cpp
index 657f04304..95e83a5c2 100644
--- a/src/display/nr-filter-diffuselighting.cpp
+++ b/src/display/nr-filter-diffuselighting.cpp
@@ -12,7 +12,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include "config.h"  // only include where actually required!
 #endif
 
 #include <glib.h>
diff --git a/src/display/nr-filter-displacement-map.cpp b/src/display/nr-filter-displacement-map.cpp
index e6f0cdee4..18b6c2810 100644
--- a/src/display/nr-filter-displacement-map.cpp
+++ b/src/display/nr-filter-displacement-map.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 "display/cairo-templates.h"
 #include "display/cairo-utils.h"
 #include "display/nr-filter-displacement-map.h"
diff --git a/src/display/nr-filter-flood.cpp b/src/display/nr-filter-flood.cpp
index 463b7e0c3..861772352 100644
--- a/src/display/nr-filter-flood.cpp
+++ b/src/display/nr-filter-flood.cpp
@@ -11,7 +11,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include "config.h"  // only include where actually required!
 #endif
 
 #include "display/cairo-utils.h"
diff --git a/src/display/nr-filter-gaussian.cpp b/src/display/nr-filter-gaussian.cpp
index 5cc8f74fd..0bebd6da8 100644
--- a/src/display/nr-filter-gaussian.cpp
+++ b/src/display/nr-filter-gaussian.cpp
@@ -11,7 +11,9 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "config.h" // Needed for HAVE_OPENMP
+#ifdef HAVE_CONFIG_H
+# include "config.h"  // only include where actually required!
+#endif
 
 #include <algorithm>
 #include <cmath>
diff --git a/src/display/nr-filter-morphology.cpp b/src/display/nr-filter-morphology.cpp
index f97ab1bd6..260479699 100644
--- a/src/display/nr-filter-morphology.cpp
+++ b/src/display/nr-filter-morphology.cpp
@@ -10,7 +10,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include "config.h"  // only include where actually required!
 #endif
 
 #include <cmath>
diff --git a/src/display/nr-filter-specularlighting.cpp b/src/display/nr-filter-specularlighting.cpp
index 0cdd441e9..55076c745 100644
--- a/src/display/nr-filter-specularlighting.cpp
+++ b/src/display/nr-filter-specularlighting.cpp
@@ -11,7 +11,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include "config.h"  // only include where actually required!
 #endif
 
 #include <glib.h>
diff --git a/src/display/nr-filter-turbulence.cpp b/src/display/nr-filter-turbulence.cpp
index db0abbb54..2c7668631 100644
--- a/src/display/nr-filter-turbulence.cpp
+++ b/src/display/nr-filter-turbulence.cpp
@@ -17,10 +17,6 @@
  * Released under GNU GPL version 2 (or later), read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include "display/cairo-templates.h"
 #include "display/cairo-utils.h"
 #include "display/nr-filter.h"
diff --git a/src/display/nr-svgfonts.cpp b/src/display/nr-svgfonts.cpp
index e2b112c1b..2c17a7ada 100644
--- a/src/display/nr-svgfonts.cpp
+++ b/src/display/nr-svgfonts.cpp
@@ -1,4 +1,3 @@
-#include "config.h"
 /*
  * SVGFonts rendering implementation
  *
diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp
index e0da6f7a0..bc22f1a5a 100644
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@ -18,7 +18,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"  // only include where actually required!
 #endif
 
 #include <gdkmm/devicemanager.h>
diff --git a/src/display/sp-canvas.h b/src/display/sp-canvas.h
index cf29acce8..ef2df2292 100644
--- a/src/display/sp-canvas.h
+++ b/src/display/sp-canvas.h
@@ -20,6 +20,10 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"  // only include where actually required!
+#endif
+
 #include <gtk/gtk.h>
 #include <cstdint>
 #include <glibmm/ustring.h>
diff --git a/src/display/sp-ctrlcurve.cpp b/src/display/sp-ctrlcurve.cpp
index 26a3c2055..961ccec0b 100644
--- a/src/display/sp-ctrlcurve.cpp
+++ b/src/display/sp-ctrlcurve.cpp
@@ -11,10 +11,6 @@
  * Released under GNU GPL
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include "display/sp-ctrlcurve.h"
 #include "display/sp-canvas-util.h"
 #include "display/cairo-utils.h"
diff --git a/src/display/sp-ctrlline.cpp b/src/display/sp-ctrlline.cpp
index 709f85e54..0f0868f10 100644
--- a/src/display/sp-ctrlline.cpp
+++ b/src/display/sp-ctrlline.cpp
@@ -18,10 +18,6 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include "display/sp-ctrlline.h"
 #include "display/sp-canvas-util.h"
 #include "display/cairo-utils.h"
diff --git a/src/display/sp-ctrlquadr.cpp b/src/display/sp-ctrlquadr.cpp
index 40c011e26..a7ac72087 100644
--- a/src/display/sp-ctrlquadr.cpp
+++ b/src/display/sp-ctrlquadr.cpp
@@ -10,10 +10,6 @@
  * Released under GNU GPL
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include "sp-canvas-item.h"
 #include "sp-canvas.h"
 #include "sp-canvas-util.h"