Fix build (not pretty).

(bzr r13341.1.146)

27 files changed, 57 insertions, 41 deletions

diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp
index f6347e5c0..91359983b 100644
--- a/src/desktop-style.cpp
+++ b/src/desktop-style.cpp
@@ -14,6 +14,7 @@
 
 #include <string>
 #include <cstring>
+#include <glibmm.h>
 
 #include "desktop.h"
 #include "color-rgba.h"
diff --git a/src/display/cairo-templates.h b/src/display/cairo-templates.h
index 57ec98f81..a49f925c3 100644
--- a/src/display/cairo-templates.h
+++ b/src/display/cairo-templates.h
@@ -16,6 +16,8 @@
 #include "config.h"
 #endif
 
+#include <glib.h>
+
 #ifdef HAVE_OPENMP
 #include <omp.h>
 #include "preferences.h"
@@ -25,7 +27,6 @@ static const int OPENMP_THRESHOLD = 2048;
 
 #include <algorithm>
 #include <cairo.h>
-#include <glib.h>
 #include <math.h>
 #include "display/nr-3dutils.h"
 #include "display/cairo-utils.h"
diff --git a/src/display/cairo-utils.h b/src/display/cairo-utils.h
index 505e2ca77..f252c4a44 100644
--- a/src/display/cairo-utils.h
+++ b/src/display/cairo-utils.h
@@ -14,7 +14,7 @@
 
 #include <boost/noncopyable.hpp>
 //#include <glibmm/threads.h> // workaround
-#include <glib.h>
+//#include <glib.h>
 #include <cairomm/cairomm.h>
 //#include <gdkmm/pixbuf.h>
 #include <2geom/forward.h>
diff --git a/src/display/canvas-arena.cpp b/src/display/canvas-arena.cpp
index 25d35fc6b..e82b1b1c7 100644
--- a/src/display/canvas-arena.cpp
+++ b/src/display/canvas-arena.cpp
@@ -11,7 +11,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtk/gtk.h>
+#include <gtkmm.h>
 
 #include "display/sp-canvas-util.h"
 #include "helper/sp-marshal.h"
diff --git a/src/display/drawing-group.cpp b/src/display/drawing-group.cpp
index 38ace001f..bce89d70e 100644
--- a/src/display/drawing-group.cpp
+++ b/src/display/drawing-group.cpp
@@ -9,13 +9,14 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "display/cairo-utils.h"
 #include "display/drawing.h"
 #include "display/drawing-context.h"
 #include "display/drawing-item.h"
 #include "display/drawing-group.h"
 #include "style.h"
 
+#include "display/cairo-utils.h"
+
 namespace Inkscape {
 
 DrawingGroup::DrawingGroup(Drawing &drawing)
diff --git a/src/display/drawing-image.cpp b/src/display/drawing-image.cpp
index 00caef525..e56f3e58b 100644
--- a/src/display/drawing-image.cpp
+++ b/src/display/drawing-image.cpp
@@ -10,13 +10,15 @@
  */
 
 #include <2geom/bezier-curve.h>
-#include "display/cairo-utils.h"
+
 #include "display/drawing.h"
 #include "display/drawing-context.h"
 #include "display/drawing-image.h"
 #include "preferences.h"
 #include "style.h"
 
+#include "display/cairo-utils.h"
+
 namespace Inkscape {
 
 DrawingImage::DrawingImage(Drawing &drawing)
diff --git a/src/display/drawing-item.cpp b/src/display/drawing-item.cpp
index 80eb69546..bd6fb41d8 100644
--- a/src/display/drawing-item.cpp
+++ b/src/display/drawing-item.cpp
@@ -10,8 +10,7 @@
  */
 
 #include <climits>
-#include "display/cairo-utils.h"
-#include "display/cairo-templates.h"
+
 #include "display/drawing.h"
 #include "display/drawing-context.h"
 #include "display/drawing-item.h"
@@ -21,6 +20,9 @@
 #include "preferences.h"
 #include "style.h"
 
+#include "display/cairo-utils.h"
+#include "display/cairo-templates.h"
+
 namespace Inkscape {
 
 void set_cairo_blend_operator( DrawingContext &dc, unsigned blend_mode ) {
diff --git a/src/display/drawing-shape.cpp b/src/display/drawing-shape.cpp
index 1a41bdb3a..88506f2b9 100644
--- a/src/display/drawing-shape.cpp
+++ b/src/display/drawing-shape.cpp
@@ -9,7 +9,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib.h>
+#include <glibmm.h>
 #include <2geom/curves.h>
 #include <2geom/pathvector.h>
 #include <2geom/path-sink.h>
diff --git a/src/display/drawing-text.cpp b/src/display/drawing-text.cpp
index 9f3b447df..97a8c23d3 100644
--- a/src/display/drawing-text.cpp
+++ b/src/display/drawing-text.cpp
@@ -9,8 +9,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "display/cairo-utils.h"
-#include "display/canvas-bpath.h" // for SPWindRule (WTF!)
+//#include "display/cairo-utils.h"
+//#include "display/canvas-bpath.h" // for SPWindRule (WTF!)
 #include "display/drawing.h"
 #include "display/drawing-context.h"
 #include "display/drawing-surface.h"
@@ -20,6 +20,9 @@
 #include "style.h"
 #include "2geom/pathvector.h"
 
+#include "display/cairo-utils.h"
+#include "display/canvas-bpath.h"
+
 namespace Inkscape {
 
 
diff --git a/src/display/nr-filter-blend.cpp b/src/display/nr-filter-blend.cpp
index 25aea6f13..d0db6b42e 100644
--- a/src/display/nr-filter-blend.cpp
+++ b/src/display/nr-filter-blend.cpp
@@ -20,6 +20,7 @@
 #include "config.h"
 #endif
 
+#include <glibmm.h>
 #include "display/cairo-templates.h"
 #include "display/cairo-utils.h"
 #include "display/nr-filter-blend.h"
diff --git a/src/display/nr-filter-primitive.h b/src/display/nr-filter-primitive.h
index 214b2cfc5..62f350844 100644
--- a/src/display/nr-filter-primitive.h
+++ b/src/display/nr-filter-primitive.h
@@ -11,6 +11,7 @@
 #ifndef SEEN_NR_FILTER_PRIMITIVE_H
 #define SEEN_NR_FILTER_PRIMITIVE_H
 
+#include <glib.h>
 #include <2geom/forward.h>
 #include <2geom/rect.h>
 #include "display/nr-filter-types.h"
diff --git a/src/display/nr-filter.cpp b/src/display/nr-filter.cpp
index 90b233fbc..dec5b1f57 100644
--- a/src/display/nr-filter.cpp
+++ b/src/display/nr-filter.cpp
@@ -9,7 +9,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "display/nr-filter-image.h"
 #include <glib.h>
 #include <cmath>
 #include <cstring>
@@ -29,6 +28,7 @@
 #include "display/nr-filter-component-transfer.h"
 #include "display/nr-filter-diffuselighting.h"
 #include "display/nr-filter-displacement-map.h"
+#include "display/nr-filter-image.h"
 #include "display/nr-filter-flood.h"
 #include "display/nr-filter-gaussian.h"
 #include "display/nr-filter-merge.h"
diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp
index e7d6e64ce..70a2ca672 100644
--- a/src/extension/implementation/script.cpp
+++ b/src/extension/implementation/script.cpp
@@ -22,7 +22,7 @@
 #include <unistd.h>
 
 #include <errno.h>
-#include <glib.h>
+#include <glib/gstdio.h>
 
 #include "desktop-handles.h"
 #include "desktop.h"
@@ -37,7 +37,7 @@
 #include "script.h"
 #include "selection.h"
 #include "sp-namedview.h"
-#include "system.h"
+#include "extension/system.h"
 #include "ui/view/view.h"
 #include "xml/node.h"
 #include "xml/attribute-record.h"
diff --git a/src/filter-chemistry.cpp b/src/filter-chemistry.cpp
index 151480177..9298a1ffc 100644
--- a/src/filter-chemistry.cpp
+++ b/src/filter-chemistry.cpp
@@ -15,6 +15,8 @@
 
 
 #include <cstring>
+#include <glibmm.h>
+
 #include "style.h"
 #include "document-private.h"
 #include "desktop-style.h"
diff --git a/src/filter-enums.cpp b/src/filter-enums.cpp
index 09a1a7614..037c66922 100644
--- a/src/filter-enums.cpp
+++ b/src/filter-enums.cpp
@@ -9,6 +9,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <glibmm.h>
 #include <glibmm/i18n.h>
 
 #include "filter-enums.h"
diff --git a/src/filter-enums.h b/src/filter-enums.h
index 3ced5ab94..e6d656f8a 100644
--- a/src/filter-enums.h
+++ b/src/filter-enums.h
@@ -12,6 +12,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <glibmm.h>
+
 #include "display/nr-filter-blend.h"
 #include "display/nr-filter-colormatrix.h"
 #include "display/nr-filter-component-transfer.h"
diff --git a/src/help.cpp b/src/help.cpp
index 60e57abfc..643945a69 100644
--- a/src/help.cpp
+++ b/src/help.cpp
@@ -11,7 +11,11 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <glibmm.h>
 
 #include "file.h"
 #include "help.h"
diff --git a/src/sp-filter-primitive.cpp b/src/sp-filter-primitive.cpp
index ceb91c984..1f85c8193 100644
--- a/src/sp-filter-primitive.cpp
+++ b/src/sp-filter-primitive.cpp
@@ -19,14 +19,15 @@
 
 #include <string.h>
 
+#include "display/nr-filter-primitive.h"
+#include "display/nr-filter-types.h"
+
 #include "attributes.h"
 #include "style.h"
 #include "sp-filter-primitive.h"
 #include "xml/repr.h"
 #include "sp-filter.h"
 #include "sp-item.h"
-#include "display/nr-filter-primitive.h"
-#include "display/nr-filter-types.h"
 
 
 // CPPIFY: Make pure virtual.
diff --git a/src/sp-filter.cpp b/src/sp-filter.cpp
index e8319baca..9a184952c 100644
--- a/src/sp-filter.cpp
+++ b/src/sp-filter.cpp
@@ -22,8 +22,9 @@
 using std::map;
 using std::pair;
 
-#include <glibmm/stringutils.h>
+#include <glibmm.h>
 #include "attributes.h"
+#include "display/nr-filter.h"
 #include "document.h"
 #include "sp-filter.h"
 #include "sp-filter-reference.h"
@@ -37,8 +38,6 @@ using std::pair;
 #define SP_MACROS_SILENT
 #include "macros.h"
 
-#include "display/nr-filter.h"
-
 static void filter_ref_changed(SPObject *old_ref, SPObject *ref, SPFilter *filter);
 static void filter_ref_modified(SPObject *href, guint flags, SPFilter *filter);
 
diff --git a/src/sp-image.cpp b/src/sp-image.cpp
index cb8ede2b2..b6177fae6 100644
--- a/src/sp-image.cpp
+++ b/src/sp-image.cpp
@@ -20,6 +20,7 @@
 #include <cstring>
 #include <algorithm>
 #include <string>
+#include <glibmm.h>
 #include <glib/gstdio.h>
 #include <2geom/rect.h>
 #include <2geom/transforms.h>
diff --git a/src/sp-mesh-array.cpp b/src/sp-mesh-array.cpp
index ab14e75d2..300f2ad19 100644
--- a/src/sp-mesh-array.cpp
+++ b/src/sp-mesh-array.cpp
@@ -37,6 +37,13 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+// For color picking
+#include "display/drawing.h"
+#include "display/drawing-context.h"
+#include "display/cairo-utils.h"
+#include "document.h"
+#include "sp-root.h"
+
 #include "sp-mesh-array.h"
 #include "sp-mesh-gradient.h"
 #include "sp-mesh-row.h"
@@ -51,13 +58,6 @@
 // For writing color/opacity to style
 #include "svg/css-ostringstream.h"
 
-// For color picking
-#include "display/drawing.h"
-#include "display/drawing-context.h"
-#include "display/cairo-utils.h"
-#include "document.h"
-#include "sp-root.h"
-
 // For default color
 #include "style.h"
 #include "svg/svg-color.h"
diff --git a/src/sp-mesh-gradient.cpp b/src/sp-mesh-gradient.cpp
index eb5ed1bd0..1b04a6f8e 100644
--- a/src/sp-mesh-gradient.cpp
+++ b/src/sp-mesh-gradient.cpp
@@ -1,8 +1,8 @@
-#include "sp-mesh-gradient.h"
-
 #include "attributes.h"
-#include "xml/repr.h"
 #include "display/cairo-utils.h"
+#include "xml/repr.h"
+
+#include "sp-mesh-gradient.h"
 
 #include "sp-factory.h"
 
diff --git a/src/sp-pattern.cpp b/src/sp-pattern.cpp
index 9b7330a24..961ab0f84 100644
--- a/src/sp-pattern.cpp
+++ b/src/sp-pattern.cpp
@@ -18,7 +18,9 @@
 
 #include <cstring>
 #include <string>
+#include <glibmm.h>
 #include <2geom/transforms.h>
+
 #include "macros.h"
 #include "svg/svg.h"
 #include "display/cairo-utils.h"
diff --git a/src/svg-view-widget.cpp b/src/svg-view-widget.cpp
index 567156fec..9174d1083 100644
--- a/src/svg-view-widget.cpp
+++ b/src/svg-view-widget.cpp
@@ -14,7 +14,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gtk/gtk.h>
+#include <gtkmm.h>
 #include "display/sp-canvas.h"
 #include "display/sp-canvas-group.h"
 #include "display/canvas-arena.h"
diff --git a/src/widgets/button.cpp b/src/widgets/button.cpp
index 04426e734..63bb390fb 100644
--- a/src/widgets/button.cpp
+++ b/src/widgets/button.cpp
@@ -11,10 +11,10 @@
  * This code is in public domain
  */
 
-#include "button.h"
+#include "icon.h"
 
+#include "button.h"
 #include "helper/action-context.h"
-#include "icon.h"
 #include "interface.h"
 #include "shortcuts.h"
 
diff --git a/src/widgets/gradient-image.cpp b/src/widgets/gradient-image.cpp
index 2e2c5423b..1b7d4f8a1 100644
--- a/src/widgets/gradient-image.cpp
+++ b/src/widgets/gradient-image.cpp
@@ -10,7 +10,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <sigc++/signal.h>
+#include <sigc++/sigc++.h>
 
 #include "display/cairo-utils.h"
 #include "gradient-image.h"
diff --git a/src/widgets/icon.h b/src/widgets/icon.h
index e1dae0d6a..5838d8de4 100644
--- a/src/widgets/icon.h
+++ b/src/widgets/icon.h
@@ -14,14 +14,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
-#include <glibmm/threads.h>
-#endif
-
 #include <gtkmm/widget.h>
 #include "icon-size.h"