Header cleanup.

19 files changed, 19 insertions, 27 deletions

diff --git a/src/desktop.cpp b/src/desktop.cpp
index ff40e5934..aa58ee332 100644
--- a/src/desktop.cpp
+++ b/src/desktop.cpp
@@ -62,7 +62,7 @@
 #include "object/sp-root.h"
 
 #include "ui/dialog/dialog-manager.h"
-#include "ui/interface.h"
+#include "ui/interface.h"  // Only for getLayoutPrefPath
 #include "ui/tool-factory.h"
 #include "ui/tools/box3d-tool.h"
 #include "ui/tools/select-tool.h"
diff --git a/src/file-update.cpp b/src/file-update.cpp
index 0aa40ab62..764ba8b03 100644
--- a/src/file-update.cpp
+++ b/src/file-update.cpp
@@ -60,7 +60,6 @@
 #include "object/sp-tspan.h"
 #include "style.h"
 
-#include "ui/interface.h"
 #include "ui/shape-editor.h"
 
  
diff --git a/src/helper/pixbuf-ops.cpp b/src/helper/pixbuf-ops.cpp
index cfb6f8836..e29234c24 100644
--- a/src/helper/pixbuf-ops.cpp
+++ b/src/helper/pixbuf-ops.cpp
@@ -14,7 +14,6 @@
 
 #include <2geom/transforms.h>
 
-#include "ui/interface.h"
 #include "helper/png-write.h"
 #include "display/cairo-utils.h"
 #include "display/drawing.h"
diff --git a/src/helper/png-write.cpp b/src/helper/png-write.cpp
index 6af505278..1f1b89625 100644
--- a/src/helper/png-write.cpp
+++ b/src/helper/png-write.cpp
@@ -14,25 +14,30 @@
  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
-#include <png.h>
-#include "ui/interface.h"
+
 #include <2geom/rect.h>
 #include <2geom/transforms.h>
-#include "png-write.h"
-#include "io/sys.h"
-#include "display/drawing.h"
-#include "display/drawing-context.h"
-#include "display/cairo-utils.h"
+
+#include <png.h>
+
 #include "document.h"
+#include "inkscape.h"
+#include "png-write.h"
 #include "preferences.h"
 #include "rdf.h"
-#include "util/units.h"
 
-#include "inkscape.h"
+#include "display/cairo-utils.h"
+#include "display/drawing-context.h"
+#include "display/drawing.h"
+
+#include "io/sys.h"
 
+#include "object/sp-defs.h"
 #include "object/sp-item.h"
 #include "object/sp-root.h"
-#include "object/sp-defs.h"
+
+#include "ui/interface.h"
+#include "util/units.h"
 
 /* This is an example of how to use libpng to read and write PNG files.
  * The file libpng.txt is much more verbose then this.  If you have not
diff --git a/src/helper/png-write.h b/src/helper/png-write.h
index 8d1aa97e9..c11ee7725 100644
--- a/src/helper/png-write.h
+++ b/src/helper/png-write.h
@@ -15,6 +15,8 @@
  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
+#include <glib.h> // Only for gchar.
+
 #include <2geom/forward.h>
 
 class SPDocument;
diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp
index 8aacf6c13..1d5321531 100644
--- a/src/ui/dialog/clonetiler.cpp
+++ b/src/ui/dialog/clonetiler.cpp
@@ -48,7 +48,6 @@
 #include "object/sp-use.h"
 
 #include "ui/icon-names.h"
-#include "ui/interface.h"
 #include "ui/widget/spinbutton.h"
 #include "ui/widget/unit-menu.h"
 
diff --git a/src/ui/dialog/dock-behavior.cpp b/src/ui/dialog/dock-behavior.cpp
index a3681a19c..87f312a94 100644
--- a/src/ui/dialog/dock-behavior.cpp
+++ b/src/ui/dialog/dock-behavior.cpp
@@ -14,7 +14,6 @@
 #include "dock-behavior.h"
 #include "inkscape.h"
 #include "desktop.h"
-#include "ui/interface.h"
 #include "ui/widget/dock.h"
 #include "verbs.h"
 #include "dialog.h"
diff --git a/src/ui/dialog/filedialogimpl-gtkmm.cpp b/src/ui/dialog/filedialogimpl-gtkmm.cpp
index 7b2867458..e37eed793 100644
--- a/src/ui/dialog/filedialogimpl-gtkmm.cpp
+++ b/src/ui/dialog/filedialogimpl-gtkmm.cpp
@@ -42,7 +42,6 @@
 #include "io/sys.h"
 
 #include "ui/dialog-events.h"
-#include "ui/interface.h"
 #include "ui/view/svg-view-widget.h"
 
 // Routines from file.cpp
diff --git a/src/ui/dialog/find.cpp b/src/ui/dialog/find.cpp
index 370b7e8f8..3a019e87e 100644
--- a/src/ui/dialog/find.cpp
+++ b/src/ui/dialog/find.cpp
@@ -45,7 +45,6 @@
 #include "object/sp-use.h"
 
 #include "ui/dialog-events.h"
-#include "ui/interface.h"
 
 #include "xml/attribute-record.h"
 #include "xml/node-iterators.h"
diff --git a/src/ui/dialog/floating-behavior.cpp b/src/ui/dialog/floating-behavior.cpp
index 90b02c4c7..5c05603ca 100644
--- a/src/ui/dialog/floating-behavior.cpp
+++ b/src/ui/dialog/floating-behavior.cpp
@@ -20,7 +20,6 @@
 #include "inkscape.h"
 #include "desktop.h"
 #include "ui/dialog-events.h"
-#include "ui/interface.h"
 #include "verbs.h"
 
 namespace Inkscape {
diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp
index 52692999a..32bcb88c1 100644
--- a/src/ui/dialog/ocaldialogs.cpp
+++ b/src/ui/dialog/ocaldialogs.cpp
@@ -20,7 +20,6 @@
 #include "path-prefix.h"
 #include "preferences.h"
 #include "ui/icon-loader.h"
-#include "ui/interface.h"
 
 #include <gtkmm/notebook.h>
 #include <gtkmm/spinner.h>
diff --git a/src/ui/dialog/save-template-dialog.cpp b/src/ui/dialog/save-template-dialog.cpp
index 74e156eaa..0eca28dfd 100644
--- a/src/ui/dialog/save-template-dialog.cpp
+++ b/src/ui/dialog/save-template-dialog.cpp
@@ -11,7 +11,6 @@
 #include "save-template-dialog.h"
 #include "file.h"
 #include "io/resource.h"
-#include "ui/interface.h"
 
 #include <glibmm/i18n.h>
 
diff --git a/src/ui/dialog/spellcheck.cpp b/src/ui/dialog/spellcheck.cpp
index 83b7dbef6..9d0bb8c67 100644
--- a/src/ui/dialog/spellcheck.cpp
+++ b/src/ui/dialog/spellcheck.cpp
@@ -26,7 +26,7 @@
 
 #include "ui/tools-switch.h"
 #include "ui/tools/text-tool.h"
-#include "ui/interface.h"
+
 #include "text-editing.h"
 #include "selection-chemistry.h"
 #include "display/curve.h"
diff --git a/src/ui/dialog/template-load-tab.cpp b/src/ui/dialog/template-load-tab.cpp
index ed38c27cd..6c17a9a96 100644
--- a/src/ui/dialog/template-load-tab.cpp
+++ b/src/ui/dialog/template-load-tab.cpp
@@ -21,7 +21,6 @@
 
 #include "extension/db.h"
 #include "inkscape.h"
-#include "ui/interface.h"
 #include "file.h"
 #include "path-prefix.h"
 
diff --git a/src/ui/dialog/text-edit.cpp b/src/ui/dialog/text-edit.cpp
index 8812a8d9f..4f2f04ec6 100644
--- a/src/ui/dialog/text-edit.cpp
+++ b/src/ui/dialog/text-edit.cpp
@@ -50,7 +50,6 @@ extern "C" {
 #include "svg/css-ostringstream.h"
 
 #include "ui/icon-names.h"
-#include "ui/interface.h"
 #include "ui/widget/font-selector.h"
 
 #include "util/units.h"
diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp
index 7d8f0a296..88fab8f18 100644
--- a/src/ui/dialog/xml-tree.cpp
+++ b/src/ui/dialog/xml-tree.cpp
@@ -38,7 +38,6 @@
 #include "ui/dialog-events.h"
 #include "ui/icon-loader.h"
 #include "ui/icon-names.h"
-#include "ui/interface.h"
 #include "ui/tools/tool-base.h"
 
 #include "widgets/sp-xmlview-tree.h"
diff --git a/src/ui/widget/button.cpp b/src/ui/widget/button.cpp
index c2bdcfd44..a149f28a8 100644
--- a/src/ui/widget/button.cpp
+++ b/src/ui/widget/button.cpp
@@ -20,7 +20,6 @@
 #include "helper/action.h"
 #include "shortcuts.h"
 #include "ui/icon-loader.h"
-#include "ui/interface.h"
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 489582ca8..5ebe0c0f3 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -56,7 +56,6 @@
 #include "ui/dialog/swatches.h"
 #include "ui/icon-loader.h"
 #include "ui/icon-names.h"
-#include "ui/interface.h"
 #include "ui/tools/box3d-tool.h"
 #include "ui/uxmanager.h"
 #include "ui/widget/button.h"
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 38e8df8c0..140f87dc7 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -53,7 +53,6 @@
 #include "object/sp-namedview.h"
 
 #include "ui/icon-names.h"
-#include "ui/interface.h"
 #include "ui/tools-switch.h"
 #include "ui/uxmanager.h"
 #include "ui/widget/button.h"