Remove #include "config.h" wherever possible

38 files changed, 10 insertions, 145 deletions

diff --git a/src/ui/widget/button.cpp b/src/ui/widget/button.cpp
index 6c2d419cf..2a491e17c 100644
--- a/src/ui/widget/button.cpp
+++ b/src/ui/widget/button.cpp
@@ -7,10 +7,6 @@
  * Released under GNU GPL.  Read the file 'COPYING' for more information.
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include "button.h"
 
 namespace Inkscape {
diff --git a/src/ui/widget/clipmaskicon.cpp b/src/ui/widget/clipmaskicon.cpp
index 704b5c653..281e60886 100644
--- a/src/ui/widget/clipmaskicon.cpp
+++ b/src/ui/widget/clipmaskicon.cpp
@@ -7,10 +7,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "ui/widget/clipmaskicon.h"
 
 #include "helper/icon-loader.h"
diff --git a/src/ui/widget/color-icc-selector.cpp b/src/ui/widget/color-icc-selector.cpp
index bddbb60e8..877a6d011 100644
--- a/src/ui/widget/color-icc-selector.cpp
+++ b/src/ui/widget/color-icc-selector.cpp
@@ -1,5 +1,5 @@
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"  // only include where actually required!
 #endif
 
 #include <set>
diff --git a/src/ui/widget/color-notebook.cpp b/src/ui/widget/color-notebook.cpp
index 788ede294..6f5423de4 100644
--- a/src/ui/widget/color-notebook.cpp
+++ b/src/ui/widget/color-notebook.cpp
@@ -12,13 +12,13 @@
  * This code is in public domain
  */
 
-#undef SPCS_PREVIEW
-#define noDUMP_CHANGE_INFO
-
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"  // only include where actually required!
 #endif
 
+#undef SPCS_PREVIEW
+#define noDUMP_CHANGE_INFO
+
 #include <glibmm/i18n.h>
 #include <gtkmm/label.h>
 #include <gtkmm/notebook.h>
diff --git a/src/ui/widget/color-notebook.h b/src/ui/widget/color-notebook.h
index c34c4faf3..e5ac78939 100644
--- a/src/ui/widget/color-notebook.h
+++ b/src/ui/widget/color-notebook.h
@@ -15,7 +15,7 @@
 #define SEEN_SP_COLOR_NOTEBOOK_H
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include "config.h"  // only include where actually required!
 #endif
 
 #include <boost/ptr_container/ptr_vector.hpp>
diff --git a/src/ui/widget/color-scales.cpp b/src/ui/widget/color-scales.cpp
index 162634a42..f5334821a 100644
--- a/src/ui/widget/color-scales.cpp
+++ b/src/ui/widget/color-scales.cpp
@@ -2,10 +2,6 @@
  *   bulia byak <buliabyak@users.sf.net>
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <gtkmm/adjustment.h>
 #include <glibmm/i18n.h>
 
diff --git a/src/ui/widget/color-slider.cpp b/src/ui/widget/color-slider.cpp
index 58a236e92..e3b06f09c 100644
--- a/src/ui/widget/color-slider.cpp
+++ b/src/ui/widget/color-slider.cpp
@@ -11,10 +11,6 @@
  * This code is in public domain
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <gdkmm/cursor.h>
 #include <gdkmm/general.h>
 #include <gtkmm/adjustment.h>
diff --git a/src/ui/widget/color-wheel-selector.cpp b/src/ui/widget/color-wheel-selector.cpp
index 8a74c8d7f..0e0d39ab3 100644
--- a/src/ui/widget/color-wheel-selector.cpp
+++ b/src/ui/widget/color-wheel-selector.cpp
@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "color-wheel-selector.h"
 
 #include <glibmm/i18n.h>
diff --git a/src/ui/widget/dock.cpp b/src/ui/widget/dock.cpp
index 7e90017e8..1e5be3505 100644
--- a/src/ui/widget/dock.cpp
+++ b/src/ui/widget/dock.cpp
@@ -10,6 +10,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 "dock.h"
 #include "inkscape.h"
 #include "preferences.h"
diff --git a/src/ui/widget/entity-entry.cpp b/src/ui/widget/entity-entry.cpp
index 48597842b..5bd0a7700 100644
--- a/src/ui/widget/entity-entry.cpp
+++ b/src/ui/widget/entity-entry.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 "entity-entry.h"
 
 #include <gtkmm/scrolledwindow.h>
diff --git a/src/ui/widget/entry.cpp b/src/ui/widget/entry.cpp
index b1dd9ae8e..9ee6c9a08 100644
--- a/src/ui/widget/entry.cpp
+++ b/src/ui/widget/entry.cpp
@@ -7,10 +7,6 @@
  * Released under GNU GPL.  Read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "entry.h"
 
 #include <gtkmm/entry.h>
diff --git a/src/ui/widget/font-button.cpp b/src/ui/widget/font-button.cpp
index 1137c2d95..b9adedb2c 100644
--- a/src/ui/widget/font-button.cpp
+++ b/src/ui/widget/font-button.cpp
@@ -3,10 +3,6 @@
  * Released under GNU GPL.  Read the file 'COPYING' for more information.
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include "font-button.h"
 
 #include <glibmm/i18n.h>
diff --git a/src/ui/widget/font-selector-toolbar.cpp b/src/ui/widget/font-selector-toolbar.cpp
index 276b05cd8..0d057f2df 100644
--- a/src/ui/widget/font-selector-toolbar.cpp
+++ b/src/ui/widget/font-selector-toolbar.cpp
@@ -7,10 +7,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 <glibmm/regex.h>
 #include <gdkmm/display.h>
diff --git a/src/ui/widget/font-selector.cpp b/src/ui/widget/font-selector.cpp
index 132e9bfdf..3def3eb2b 100644
--- a/src/ui/widget/font-selector.cpp
+++ b/src/ui/widget/font-selector.cpp
@@ -7,10 +7,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 <glibmm/markup.h>
 
diff --git a/src/ui/widget/font-variants.cpp b/src/ui/widget/font-variants.cpp
index b9b83bc55..06729eb26 100644
--- a/src/ui/widget/font-variants.cpp
+++ b/src/ui/widget/font-variants.cpp
@@ -7,10 +7,6 @@
  * Released under GNU GPL.  Read the file 'COPYING' for more information.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <gtkmm.h>
 #include <glibmm/i18n.h>
 
diff --git a/src/ui/widget/font-variations.cpp b/src/ui/widget/font-variations.cpp
index 9a8317a79..3a2a7b137 100644
--- a/src/ui/widget/font-variations.cpp
+++ b/src/ui/widget/font-variations.cpp
@@ -8,10 +8,6 @@
  * Released under GNU GPL.  Read the file 'COPYING' for more information.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <iostream>
 #include <iomanip>
 
diff --git a/src/ui/widget/frame.cpp b/src/ui/widget/frame.cpp
index 5371e56d2..231cc28ee 100644
--- a/src/ui/widget/frame.cpp
+++ b/src/ui/widget/frame.cpp
@@ -7,10 +7,6 @@
  * Released under GNU GPL.  Read the file 'COPYING' for more information.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "frame.h"
 
 
diff --git a/src/ui/widget/iconrenderer.cpp b/src/ui/widget/iconrenderer.cpp
index 4db870454..f84b6ffd5 100644
--- a/src/ui/widget/iconrenderer.cpp
+++ b/src/ui/widget/iconrenderer.cpp
@@ -8,11 +8,6 @@
  * Released under GNU GPLv2+, read the file 'COPYING' for more information
  */
 
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "ui/widget/iconrenderer.h"
 
 #include "helper/icon-loader.h"
diff --git a/src/ui/widget/labelled.cpp b/src/ui/widget/labelled.cpp
index 3480a2b6a..a38391590 100644
--- a/src/ui/widget/labelled.cpp
+++ b/src/ui/widget/labelled.cpp
@@ -8,10 +8,6 @@
  * Released under GNU GPL.  Read the file 'COPYING' for more information.
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include "helper/icon-loader.h"
 #include "labelled.h"
 #include <gtkmm/image.h>
diff --git a/src/ui/widget/layer-selector.cpp b/src/ui/widget/layer-selector.cpp
index 4e8e9813b..2f8e1220a 100644
--- a/src/ui/widget/layer-selector.cpp
+++ b/src/ui/widget/layer-selector.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 <cstring>
 #include <string>
 
diff --git a/src/ui/widget/layertypeicon.cpp b/src/ui/widget/layertypeicon.cpp
index 356531620..9dac64c32 100644
--- a/src/ui/widget/layertypeicon.cpp
+++ b/src/ui/widget/layertypeicon.cpp
@@ -7,10 +7,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "ui/widget/layertypeicon.h"
 
 #include "helper/icon-loader.h"
diff --git a/src/ui/widget/licensor.cpp b/src/ui/widget/licensor.cpp
index a8325525b..63c95cc3a 100644
--- a/src/ui/widget/licensor.cpp
+++ b/src/ui/widget/licensor.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 "licensor.h"
 
 #include <gtkmm/entry.h>
diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index aede866b1..f1a253efc 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -17,10 +17,6 @@
  * Released under GNU GPL.  Read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "page-sizer.h"
 #include <glibmm/i18n.h>
 #include "verbs.h"
diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp
index 73897aeb5..255dc2206 100644
--- a/src/ui/widget/panel.cpp
+++ b/src/ui/widget/panel.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 <gtkmm/dialog.h> // for Gtk::RESPONSE_*
 
 #include <glibmm/i18n.h>
diff --git a/src/ui/widget/point.cpp b/src/ui/widget/point.cpp
index 6b31b1856..3a12e87e4 100644
--- a/src/ui/widget/point.cpp
+++ b/src/ui/widget/point.cpp
@@ -11,11 +11,6 @@
  * Released under GNU GPL.  Read the file 'COPYING' for more information.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
 #include "ui/widget/point.h"
 
 namespace Inkscape {
diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp
index e55bbe2af..d712c17ae 100644
--- a/src/ui/widget/preferences-widget.cpp
+++ b/src/ui/widget/preferences-widget.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 <glibmm/i18n.h>
 #include <glibmm/convert.h>
 #include <glibmm/regex.h>
diff --git a/src/ui/widget/random.cpp b/src/ui/widget/random.cpp
index 3bda641d7..27c2f8f6f 100644
--- a/src/ui/widget/random.cpp
+++ b/src/ui/widget/random.cpp
@@ -9,11 +9,6 @@
  * Released under GNU GPL.  Read the file 'COPYING' for more information.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
 #include "helper/icon-loader.h"
 #include "random.h"
 #include <glibmm/i18n.h>
diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp
index b4c114cff..23376ae38 100644
--- a/src/ui/widget/registered-widget.cpp
+++ b/src/ui/widget/registered-widget.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 "registered-widget.h"
 
 #include <gtkmm/radiobutton.h>
diff --git a/src/ui/widget/registry.cpp b/src/ui/widget/registry.cpp
index 9972e1acd..b8260a694 100644
--- a/src/ui/widget/registry.cpp
+++ b/src/ui/widget/registry.cpp
@@ -7,10 +7,6 @@
  * Released under GNU GPL.  Read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include "registry.h"
 
 namespace Inkscape {
diff --git a/src/ui/widget/rendering-options.cpp b/src/ui/widget/rendering-options.cpp
index 220731b7e..79c2573cb 100644
--- a/src/ui/widget/rendering-options.cpp
+++ b/src/ui/widget/rendering-options.cpp
@@ -8,10 +8,6 @@
  * Released under GNU GPL.  Read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <gtkmm.h>
 
 #include "preferences.h"
diff --git a/src/ui/widget/rotateable.cpp b/src/ui/widget/rotateable.cpp
index 6c2056da1..207145411 100644
--- a/src/ui/widget/rotateable.cpp
+++ b/src/ui/widget/rotateable.cpp
@@ -7,10 +7,6 @@
  * Released under GNU GPL.  Read the file 'COPYING' for more information.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <gtkmm/box.h>
 #include <gtkmm/eventbox.h>
 #include <2geom/point.h>
diff --git a/src/ui/widget/scalar-unit.cpp b/src/ui/widget/scalar-unit.cpp
index fc8c92142..203f4e4a4 100644
--- a/src/ui/widget/scalar-unit.cpp
+++ b/src/ui/widget/scalar-unit.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 "scalar-unit.h"
 #include "spinbutton.h"
 
diff --git a/src/ui/widget/scalar.cpp b/src/ui/widget/scalar.cpp
index 441366341..3281d340c 100644
--- a/src/ui/widget/scalar.cpp
+++ b/src/ui/widget/scalar.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 "scalar.h"
 #include "spinbutton.h"
 #include <gtkmm/scale.h>
diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index b3efe9c61..e4f5437f5 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.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 "selected-style.h"
 
 #include <gtkmm/separatormenuitem.h>
diff --git a/src/ui/widget/spinbutton.cpp b/src/ui/widget/spinbutton.cpp
index 777a6edf4..4271936a1 100644
--- a/src/ui/widget/spinbutton.cpp
+++ b/src/ui/widget/spinbutton.cpp
@@ -7,10 +7,6 @@
  * Released under GNU GPL.  Read the file 'COPYING' for more information.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "spinbutton.h"
 
 #include "unit-menu.h"
diff --git a/src/ui/widget/text.cpp b/src/ui/widget/text.cpp
index 5b6b7468d..7b0df45ad 100644
--- a/src/ui/widget/text.cpp
+++ b/src/ui/widget/text.cpp
@@ -8,10 +8,6 @@
  * Released under GNU GPL.  Read the file 'COPYING' for more information.
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include "text.h"
 #include <gtkmm/entry.h>
 
diff --git a/src/ui/widget/tolerance-slider.cpp b/src/ui/widget/tolerance-slider.cpp
index 447efdfe0..002681204 100644
--- a/src/ui/widget/tolerance-slider.cpp
+++ b/src/ui/widget/tolerance-slider.cpp
@@ -8,10 +8,6 @@
  * Released under GNU GPL.  Read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "tolerance-slider.h"
 
 #include "registry.h"
diff --git a/src/ui/widget/unit-menu.cpp b/src/ui/widget/unit-menu.cpp
index fd10b567e..e6453a03b 100644
--- a/src/ui/widget/unit-menu.cpp
+++ b/src/ui/widget/unit-menu.cpp
@@ -7,10 +7,6 @@
  * Released under GNU GPL.  Read the file 'COPYING' for more information.
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
 #include <cmath>
 
 #include "unit-menu.h"