Minor pass of header cleanup

(bzr r13341.1.189)

23 files changed, 126 insertions, 129 deletions

diff --git a/src/attribute-rel-util.h b/src/attribute-rel-util.h
index 3a6661965..604987779 100644
--- a/src/attribute-rel-util.h
+++ b/src/attribute-rel-util.h
@@ -8,7 +8,7 @@
  *      Author: tavmjong
  */
 
-#include "glibmm/ustring.h"
+#include <glibmm/ustring.h>
 #include "xml/sp-css-attr.h"
 
 using Inkscape::XML::Node;
diff --git a/src/axis-manip.cpp b/src/axis-manip.cpp
index 1240d99e6..8955202c8 100644
--- a/src/axis-manip.cpp
+++ b/src/axis-manip.cpp
@@ -9,6 +9,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <glib.h>
 #include "axis-manip.h"
 
 namespace Proj {
@@ -31,6 +32,14 @@ get_remaining_axes (Axis axis) {
     return std::make_pair (extract_first_axis_direction (plane), extract_second_axis_direction (plane));
 }
 
+char * string_from_axes (Box3D::Axis axis) {
+    GString *pstring = g_string_new("");
+    if (axis & Box3D::X) g_string_append_printf (pstring, "X");
+    if (axis & Box3D::Y) g_string_append_printf (pstring, "Y");
+    if (axis & Box3D::Z) g_string_append_printf (pstring, "Z");
+    return pstring->str;
+}
+
 } // namespace Box3D 
  
 /*
diff --git a/src/axis-manip.h b/src/axis-manip.h
index 7842b4135..619b9089c 100644
--- a/src/axis-manip.h
+++ b/src/axis-manip.h
@@ -12,8 +12,9 @@
 #ifndef SEEN_AXIS_MANIP_H
 #define SEEN_AXIS_MANIP_H
 
+#include <cassert>
+#include <string>
 #include <utility>
-#include <glib.h>
 
 namespace Proj {
 
@@ -34,7 +35,7 @@ enum Axis {
 
 extern Axis axes[4];
 
-inline gchar const *
+inline char const*
 string_from_axis(Proj::Axis axis) {
     switch (axis) {
     case X: return "X"; break;
@@ -88,7 +89,7 @@ inline int axis_to_int(Box3D::Axis axis) {
         return -1;
         break;
     default:
-        g_assert_not_reached();
+        assert(false);
     }
 }
 
@@ -103,7 +104,7 @@ inline Proj::Axis toProj(Box3D::Axis axis) {
     case Box3D::NONE:
         return Proj::NONE;
     default:
-        g_assert_not_reached();
+        assert(false);
     }
 }
 
@@ -126,7 +127,7 @@ inline Box3D::Axis toAffine(Proj::Axis axis) {
     case Proj::NONE:
         return Box3D::NONE;
     default:
-        g_assert_not_reached();
+        assert(false);
     }
 }
 
@@ -144,7 +145,7 @@ namespace Box3D {
 // (which is normally used to index an array). Return -1 if the bit sequence
 // does not specify a face. A face can either be given by its plane (e.g, XY)
 // or by the axis that is orthogonal to it (e.g., Z).
-inline gint face_to_int (guint face_id) {
+inline int face_to_int (unsigned int face_id) {
     switch (face_id) {
       case 1:  return 0;
       case 2:  return 1;
@@ -164,7 +165,7 @@ inline gint face_to_int (guint face_id) {
     }
 }
 
-inline gint int_to_face (guint id) {
+inline int int_to_face (unsigned id) {
     switch (id) {
     case 0: return Box3D::YZ ^ Box3D::FRONT;
     case 1: return Box3D::XZ ^ Box3D::FRONT;
@@ -176,7 +177,7 @@ inline gint int_to_face (guint id) {
     return Box3D::NONE; // should not be reached
 }
 
-inline bool is_face_id (guint face_id) {
+inline bool is_face_id (unsigned int face_id) {
     return !((face_id & 0x7) == 0x7);
 }
 
@@ -186,8 +187,8 @@ inline gint opposite_face (guint face_id) {
 }
 **/
 
-inline guint number_of_axis_directions (Box3D::Axis axis) {
-    guint num = 0;
+inline unsigned int number_of_axis_directions (Box3D::Axis axis) {
+    unsigned int num = 0;
     if (axis & Box3D::X) num++;
     if (axis & Box3D::Y) num++;
     if (axis & Box3D::Z) num++;
@@ -238,14 +239,7 @@ inline Box3D::Axis get_perpendicular_axis_direction (Box3D::Axis dirs) {
     return Box3D::NONE;
 }
 
-inline gchar * string_from_axes (Box3D::Axis axis) {
-    GString *pstring = g_string_new("");
-    if (axis & Box3D::X) g_string_append_printf (pstring, "X");
-    if (axis & Box3D::Y) g_string_append_printf (pstring, "Y");
-    if (axis & Box3D::Z) g_string_append_printf (pstring, "Z");
-    return pstring->str;
-}
-
+char * string_from_axes (Box3D::Axis axis);
 std::pair <Axis, Axis> get_remaining_axes (Axis axis);
 
 } // namespace Box3D
diff --git a/src/cms-color-types.h b/src/cms-color-types.h
index 47157c243..b94c96029 100644
--- a/src/cms-color-types.h
+++ b/src/cms-color-types.h
@@ -10,15 +10,14 @@
 # include "config.h"
 #endif // HAVE_CONFIG_H
 
-#include <glib.h>
-
 #if HAVE_LIBLCMS1
 # include <icc34.h>
 #endif
 
 #if HAVE_STDINT_H
-# include <stdint.h>
+# include <stdint.h> // uint8_t, etc
 #endif
+typedef unsigned int guint32;
 
 typedef void * cmsHPROFILE;
 typedef void * cmsHTRANSFORM;
diff --git a/src/cms-system.h b/src/cms-system.h
index c528deb94..73d1a89c4 100644
--- a/src/cms-system.h
+++ b/src/cms-system.h
@@ -5,8 +5,6 @@
  * Macros and fn declarations related to linear gradients.
  */
 
-#include <glib-object.h>
-#include <glib.h>
 #include <vector>
 #include <glibmm/ustring.h>
 #include "cms-color-types.h"
@@ -19,13 +17,13 @@ class ColorProfile;
 
 class CMSSystem {
 public:
-    static cmsHPROFILE getHandle( SPDocument* document, guint* intent, gchar const* name );
+    static cmsHPROFILE getHandle( SPDocument* document, unsigned int* intent, char const* name );
 
     static cmsHTRANSFORM getDisplayTransform();
 
     static Glib::ustring getDisplayId( int screen, int monitor );
 
-    static Glib::ustring setDisplayPer( gpointer buf, guint bufLen, int screen, int monitor );
+    static Glib::ustring setDisplayPer( void* buf, unsigned int bufLen, int screen, int monitor );
 
     static cmsHTRANSFORM getDisplayPer( Glib::ustring const& id );
 
@@ -39,7 +37,7 @@ public:
 
     static bool isPrintColorSpace(ColorProfile const *profile);
 
-    static gint getChannelCount(ColorProfile const *profile);
+    static int getChannelCount(ColorProfile const *profile);
 };
 
 
diff --git a/src/color-profile.h b/src/color-profile.h
index 2da757b91..cb6b25945 100644
--- a/src/color-profile.h
+++ b/src/color-profile.h
@@ -2,7 +2,6 @@
 #define SEEN_COLOR_PROFILE_H
 
 #include <vector>
-#include <glib.h>
 #include <sp-object.h>
 #include <glibmm/ustring.h>
 #include "cms-color-types.h"
@@ -31,7 +30,7 @@ public:
 	ColorProfile();
 	virtual ~ColorProfile();
 
-    friend cmsHPROFILE colorprofile_get_handle( SPDocument*, guint*, gchar const* );
+    friend cmsHPROFILE colorprofile_get_handle( SPDocument*, unsigned int*, char const* );
     friend class CMSSystem;
 
     static std::vector<Glib::ustring> getBaseProfileDirs();
@@ -49,21 +48,21 @@ public:
 
 #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
 
-    gchar* href;
-    gchar* local;
-    gchar* name;
-    gchar* intentStr;
-    guint rendering_intent;
+    char* href;
+    char* local;
+    char* name;
+    char* intentStr;
+    unsigned int rendering_intent; // FIXME: type the enum and hold that instead
 
 protected:
     ColorProfileImpl *impl;
 
-	virtual void build(SPDocument* doc, Inkscape::XML::Node* repr);
-	virtual void release();
+    virtual void build(SPDocument* doc, Inkscape::XML::Node* repr);
+    virtual void release();
 
-	virtual void set(unsigned int key, const gchar* value);
+    virtual void set(unsigned int key, char const* value);
 
-	virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
+    virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags);
 };
 
 } // namespace Inkscape
diff --git a/src/color-rgba.h b/src/color-rgba.h
index ef7d9aee1..55cf68877 100644
--- a/src/color-rgba.h
+++ b/src/color-rgba.h
@@ -9,8 +9,9 @@
 #ifndef SEEN_COLOR_RGBA_H
 #define SEEN_COLOR_RGBA_H
 
-#include <glib.h> // g_assert()
+#include <cassert>
 #include "decimal-round.h"
+typedef unsigned int guint32;
 
 /**
  * A class to contain a floating point RGBA color as one unit.
@@ -96,7 +97,7 @@ public:
      * @return The requested value.
      */
     float operator[](unsigned int const i) const {
-        g_assert( unsigned(i) < 4 );
+        assert( unsigned(i) < 4 );
         return _c[i];
     }
 
diff --git a/src/color.cpp b/src/color.cpp
index dccd603b0..da4406748 100644
--- a/src/color.cpp
+++ b/src/color.cpp
@@ -160,7 +160,7 @@ void SPColor::set( guint32 value )
  * Convert SPColor with integer alpha value to 32bit RGBA value.
  * \pre alpha < 256
  */
-guint32 SPColor::toRGBA32( gint alpha ) const
+guint32 SPColor::toRGBA32( int alpha ) const
 {
     g_return_val_if_fail (alpha <= 0xff, 0x0);
 
@@ -175,12 +175,12 @@ guint32 SPColor::toRGBA32( gint alpha ) const
  * Convert SPColor with float alpha value to 32bit RGBA value.
  * \pre color != NULL && 0 <= alpha <= 1
  */
-guint32 SPColor::toRGBA32( gdouble alpha ) const
+guint32 SPColor::toRGBA32( double alpha ) const
 {
     g_return_val_if_fail(alpha >= 0.0, 0x0);
     g_return_val_if_fail(alpha <= 1.0, 0x0);
 
-    return toRGBA32( static_cast<gint>(SP_COLOR_F_TO_U(alpha)) );
+    return toRGBA32( static_cast<int>(SP_COLOR_F_TO_U(alpha)) );
 }
 
 std::string SPColor::toString() const
@@ -284,7 +284,7 @@ sp_color_rgb_to_hsv_floatv (float *hsv, float r, float g, float b)
 void
 sp_color_hsv_to_rgb_floatv (float *rgb, float h, float s, float v)
 {
-    gdouble f, w, q, t, d;
+    double f, w, q, t, d;
 
     d = h * 5.99999999;
     f = d - floor (d);
diff --git a/src/color.h b/src/color.h
index 604dff0e3..887daf66b 100644
--- a/src/color.h
+++ b/src/color.h
@@ -13,8 +13,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <gdk/gdk.h>
 #include <string>
+typedef unsigned int guint32; // uint is guaranteed to hold up to 2^32 − 1
 
 /* Useful composition macros */
 
@@ -52,8 +52,8 @@ struct SPColor {
     void set( float r, float g, float b );
     void set( guint32 value );
 
-    guint32 toRGBA32( gint alpha ) const;
-    guint32 toRGBA32( gdouble alpha ) const;
+    guint32 toRGBA32( int alpha ) const;
+    guint32 toRGBA32( double alpha ) const;
 
     std::string toString() const;
 
diff --git a/src/conn-avoid-ref.h b/src/conn-avoid-ref.h
index ce364abf1..e9e12118f 100644
--- a/src/conn-avoid-ref.h
+++ b/src/conn-avoid-ref.h
@@ -14,13 +14,13 @@
  */
 
 #include <2geom/point.h>
-#include <glib.h>
 #include <stddef.h>
 #include <sigc++/connection.h>
 
 class  SPDesktop;
 class SPObject;
 class  SPItem;
+typedef struct _GSList GSList;
 namespace Avoid { class ShapeRef; }
 
 class SPAvoidRef {
diff --git a/src/display/cairo-utils.h b/src/display/cairo-utils.h
index f252c4a44..9c46ef359 100644
--- a/src/display/cairo-utils.h
+++ b/src/display/cairo-utils.h
@@ -12,15 +12,13 @@
 #ifndef SEEN_INKSCAPE_DISPLAY_CAIRO_UTILS_H
 #define SEEN_INKSCAPE_DISPLAY_CAIRO_UTILS_H
 
+#include <2geom/forward.h>
 #include <boost/noncopyable.hpp>
-//#include <glibmm/threads.h> // workaround
-//#include <glib.h>
 #include <cairomm/cairomm.h>
-//#include <gdkmm/pixbuf.h>
-#include <2geom/forward.h>
 #include "style.h"
 
 struct SPColor;
+typedef struct _GdkPixbuf GdkPixbuf;
 
 namespace Inkscape {
 
diff --git a/src/display/canvas-bpath.cpp b/src/display/canvas-bpath.cpp
index 328409e12..46b59d25a 100644
--- a/src/display/canvas-bpath.cpp
+++ b/src/display/canvas-bpath.cpp
@@ -11,9 +11,6 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
 #include <sstream>
 #include <string.h>
 #include "desktop.h"
diff --git a/src/display/canvas-text.cpp b/src/display/canvas-text.cpp
index 88812af0a..5ad87b4ef 100644
--- a/src/display/canvas-text.cpp
+++ b/src/display/canvas-text.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 <sstream>
 #include <string.h>
 
diff --git a/src/display/drawing.h b/src/display/drawing.h
index cc74833ba..88e35b03b 100644
--- a/src/display/drawing.h
+++ b/src/display/drawing.h
@@ -13,7 +13,6 @@
 #define SEEN_INKSCAPE_DISPLAY_DRAWING_H
 
 #include <set>
-#include <glib.h>
 #include <boost/operators.hpp>
 #include <boost/utility.hpp>
 #include <sigc++/sigc++.h>
@@ -23,7 +22,7 @@
 #include "nr-filter-colormatrix.h"
 
 typedef struct _SPCanvasArena SPCanvasArena;
-
+typedef unsigned int guint32;
 
 namespace Inkscape {
 
@@ -65,7 +64,7 @@ public:
 
     OutlineColors const &colors() const { return _colors; }
 
-    void setGrayscaleMatrix(gdouble value_matrix[20]);
+    void setGrayscaleMatrix(double value_matrix[20]);
 
     void update(Geom::IntRect const &area = Geom::IntRect::infinite(), UpdateContext const &ctx = UpdateContext(), unsigned flags = DrawingItem::STATE_ALL, unsigned reset = 0);
     void render(DrawingContext &dc, Geom::IntRect const &area, unsigned flags = 0);
@@ -100,7 +99,7 @@ private:
 
     OutlineColors _colors;
     Filters::FilterColorMatrix::ColorMatrixMatrix _grayscale_colormatrix;
-    SPCanvasArena *_canvasarena; // may be NULL is this arena is not the screen
+    SPCanvasArena *_canvasarena; // may be NULL if this arena is not the screen
                                  // but used for export etc.
 
     friend class DrawingItem;
diff --git a/src/extension/internal/cairo-render-context.h b/src/extension/internal/cairo-render-context.h
index 8d3e63775..8071cae36 100644
--- a/src/extension/internal/cairo-render-context.h
+++ b/src/extension/internal/cairo-render-context.h
@@ -31,6 +31,9 @@
 class SPClipPath;
 class SPMask;
 
+typedef struct _PangoFont PangoFont;
+typedef struct _PangoLayout PangoLayout;
+
 namespace Inkscape {
 class Pixbuf;
 
diff --git a/src/satisfied-guide-cns.h b/src/satisfied-guide-cns.h
index 73e1e7e7f..25e5919d0 100644
--- a/src/satisfied-guide-cns.h
+++ b/src/satisfied-guide-cns.h
@@ -3,7 +3,7 @@
 
 #include <2geom/forward.h>
 #include <vector>
-#include <sp-item.h>
+#include "sp-item.h"
 
 class SPDesktop;
 class SPGuideConstraint;
diff --git a/src/sp-gradient.cpp b/src/sp-gradient.cpp
index 70c54451a..b3e885560 100644
--- a/src/sp-gradient.cpp
+++ b/src/sp-gradient.cpp
@@ -54,9 +54,6 @@
 #include "style.h"
 #include "display/grayscale.h"
 
-#define SP_MACROS_SILENT
-#include "macros.h"
-
 /// Has to be power of 2   Seems to be unused.
 //#define NCOLORS NR_GRADIENT_VECTOR_LENGTH
 
@@ -107,11 +104,11 @@ void SPGradient::setSwatch( bool swatch )
  * Equivalent meaning they have the same stop count, same stop colors and same stop opacity
  * @param that - A gradient to compare this to
  */
-gboolean SPGradient::isEquivalent(SPGradient *that)
+bool SPGradient::isEquivalent(SPGradient *that)
 {
     //TODO Make this work for mesh gradients
 
-    bool status = FALSE;
+    bool status = false;
     
     while(1){ // not really a loop, used to avoid deep nesting or multiple exit points from function
         if (this->getStopCount() != that->getStopCount()) { break; }
@@ -132,11 +129,11 @@ gboolean SPGradient::isEquivalent(SPGradient *that)
         SPStop *as = this->getVector()->getFirstStop();
         SPStop *bs = that->getVector()->getFirstStop();
 
-        bool effective = TRUE;
+        bool effective = true;
         while (effective && (as && bs)) {
             if (!as->getEffectiveColor().isClose(bs->getEffectiveColor(), 0.001) ||
                     as->offset != bs->offset) {
-                effective = FALSE;
+                effective = false;
                 break;
             } 
             else {
@@ -144,9 +141,9 @@ gboolean SPGradient::isEquivalent(SPGradient *that)
                 bs = bs->getNextStop();
             }
         }
-        if(!effective)break;
+        if (!effective) break;
 
-        status = TRUE;
+        status = true;
         break;
     }
     return status;
@@ -157,9 +154,9 @@ gboolean SPGradient::isEquivalent(SPGradient *that)
  * Aligned means that they have exactly the same coordinates and transform.
  * @param that - A gradient to compare this to
  */
-gboolean SPGradient::isAligned(SPGradient *that)
+bool SPGradient::isAligned(SPGradient *that)
 {
-    bool status = FALSE;
+    bool status = false;
     
    /*  Some gradients have coordinates/other values specified, some don't.  
            yes/yes check the coordinates/other values
@@ -223,7 +220,7 @@ gboolean SPGradient::isAligned(SPGradient *that)
          } else {
             break;
         }
-        status = TRUE;
+        status = true;
         break;
     }
     return status;
diff --git a/src/sp-gradient.h b/src/sp-gradient.h
index 1dfff22ee..a14dcc09e 100644
--- a/src/sp-gradient.h
+++ b/src/sp-gradient.h
@@ -15,7 +15,6 @@
  */
 
 #include <vector>
-#include <gdk/gdk.h>
 #include <glibmm/ustring.h>
 #include <2geom/affine.h>
 #include "sp-paint-server.h"
@@ -109,30 +108,30 @@ public:
 private:
     /** gradientUnits attribute */
     SPGradientUnits units;
-    guint units_set : 1;
+    unsigned int units_set : 1;
 public:
 
     /** gradientTransform attribute */
     Geom::Affine gradientTransform;
-    guint gradientTransform_set : 1;
+    unsigned int gradientTransform_set : 1;
 
 private:
     /** spreadMethod attribute */
     SPGradientSpread spread;
-    guint spread_set : 1;
+    unsigned int spread_set : 1;
 
     /** Gradient stops */
-    guint has_stops : 1;
+    unsigned int has_stops : 1;
 
     /** Gradient patches */
-    guint has_patches : 1;
+    unsigned int has_patches : 1;
 
 public:
     /** Reference (href) */
     SPGradientReference *ref;
 
     /** State in Inkscape gradient system */
-    guint state;
+    unsigned int state;
     
     /** Linear and Radial Gradients */
 
@@ -146,8 +145,8 @@ public:
     SPStop* getFirstStop();
     int getStopCount() const;
 
-    gboolean isEquivalent(SPGradient *b);
-    gboolean isAligned(SPGradient *b);
+    bool isEquivalent(SPGradient *b);
+    bool isAligned(SPGradient *b);
 
     /** Mesh Gradients **************/
 
@@ -175,7 +174,7 @@ public:
  */
     SPGradient *getVector(bool force_private = false);
 
-    static GType getType();
+    //static GType getType();
 
     /** Forces vector to be built, if not present (i.e. changed) */
     void ensureVector();
@@ -196,7 +195,7 @@ public:
 
     void setSwatch(bool swatch = true);
 
-    static void gradientRefModified(SPObject *href, guint flags, SPGradient *gradient);
+    static void gradientRefModified(SPObject *href, unsigned int flags, SPGradient *gradient);
     static void gradientRefChanged(SPObject *old_ref, SPObject *ref, SPGradient *gr);
 
 private:
@@ -208,13 +207,13 @@ private:
 protected:
     virtual void build(SPDocument *document, Inkscape::XML::Node *repr);
     virtual void release();
-    virtual void modified(guint flags);
-    virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags);
+    virtual void modified(unsigned int flags);
+    virtual Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags);
 
     virtual void child_added(Inkscape::XML::Node *child, Inkscape::XML::Node *ref);
     virtual void remove_child(Inkscape::XML::Node *child);
 
-    virtual void set(unsigned key, gchar const *value);
+    virtual void set(unsigned key, char const *value);
 };
 
 void
diff --git a/src/sp-guide.cpp b/src/sp-guide.cpp
index 60f15a79d..0e83c2acf 100644
--- a/src/sp-guide.cpp
+++ b/src/sp-guide.cpp
@@ -341,7 +341,7 @@ void SPGuide::hideSPGuide(SPCanvas *canvas)
     g_assert_not_reached();
 }
 
-void SPGuide::sensitize(SPCanvas *canvas, gboolean sensitive)
+void SPGuide::sensitize(SPCanvas *canvas, bool sensitive)
 {
     g_assert(canvas != NULL);
     g_assert(SP_IS_CANVAS(canvas));
diff --git a/src/sp-guide.h b/src/sp-guide.h
index fa4f0033b..9f5d7ba03 100644
--- a/src/sp-guide.h
+++ b/src/sp-guide.h
@@ -19,6 +19,9 @@
 #include "sp-object.h"
 #include "sp-guide-attachment.h"
 
+typedef unsigned int guint32;
+typedef void (*GCallback) (void);
+
 struct SPCanvas;
 struct SPCanvasGroup;
 class SPDesktop;
@@ -52,14 +55,14 @@ public:
     static SPGuide *createSPGuide(SPDocument *doc, Geom::Point const &pt1, Geom::Point const &pt2);
     void showSPGuide(SPCanvasGroup *group, GCallback handler);
     void hideSPGuide(SPCanvas *canvas);
-    void sensitize(SPCanvas *canvas, gboolean sensitive);
+    void sensitize(SPCanvas *canvas, bool sensitive);
     Geom::Point getPositionFrom(Geom::Point const &pt) const;
     double getDistanceFrom(Geom::Point const &pt) const;
 
 protected:
 	virtual void build(SPDocument* doc, Inkscape::XML::Node* repr);
 	virtual void release();
-	virtual void set(unsigned int key, const gchar* value);
+	virtual void set(unsigned int key, const char* value);
 };
 
 void sp_guide_pt_pairs_to_guides(SPDocument *doc, std::list<std::pair<Geom::Point, Geom::Point> > &pts);
diff --git a/src/sp-mesh-array.cpp b/src/sp-mesh-array.cpp
index 300f2ad19..8bfe23656 100644
--- a/src/sp-mesh-array.cpp
+++ b/src/sp-mesh-array.cpp
@@ -37,6 +37,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <glibmm.h>
+
 // For color picking
 #include "display/drawing.h"
 #include "display/drawing-context.h"
diff --git a/src/sp-mesh-gradient.cpp b/src/sp-mesh-gradient.cpp
index 1b04a6f8e..bf28164a9 100644
--- a/src/sp-mesh-gradient.cpp
+++ b/src/sp-mesh-gradient.cpp
@@ -1,3 +1,5 @@
+#include <glibmm.h>
+
 #include "attributes.h"
 #include "display/cairo-utils.h"
 #include "xml/repr.h"
diff --git a/src/sp-object.h b/src/sp-object.h
index e58f161d6..21926ad90 100644
--- a/src/sp-object.h
+++ b/src/sp-object.h
@@ -46,7 +46,7 @@ class SPObject;
 #define SP_OBJECT_WRITE_EXT (1 << 1)
 #define SP_OBJECT_WRITE_ALL (1 << 2)
 
-#include <glib-object.h>
+#include <cassert>
 #include <stddef.h>
 #include <sigc++/connection.h>
 #include <sigc++/functors/slot.h>
@@ -57,6 +57,7 @@ class SPObject;
 
 class SPCSSAttr;
 class SPStyle;
+typedef struct _GSList GSList;
 
 namespace Inkscape {
 namespace XML {
@@ -109,8 +110,8 @@ class SPDocument;
 class SPIXmlSpace {
 public:    
     SPIXmlSpace(): set(0), value(SP_XML_SPACE_DEFAULT) {};
-    guint set : 1;
-    guint value : 1;
+    unsigned int set : 1;
+    unsigned int value : 1;
 };
 
 /*
@@ -183,7 +184,7 @@ SPObject *sp_object_hunref(SPObject *object, gpointer owner);
  * provides document level functionality such as the undo stack,
  * dictionary and so on. Source: doc/architecture.txt
  */
-class SPObject { // : public GObject {
+class SPObject {
 public:
     enum CollectionPolicy {
         COLLECT_WITH_PARENT,
@@ -209,7 +210,7 @@ private:
     SPObject(const SPObject&);
     SPObject& operator=(const SPObject&);
 
-    gchar *id; /* Our very own unique id */
+    char *id; /* Our very own unique id */
     Inkscape::XML::Node *repr; /* Our xml representation */
 public:
     int refCount;
@@ -217,7 +218,7 @@ public:
     /**
      * Returns the objects current ID string.
      */
-    gchar const* getId() const;
+    char const* getId() const;
 
     /**
      * Returns the XML representation of tree
@@ -281,7 +282,7 @@ public:
     typedef Inkscape::Util::ForwardPointerIterator<SPObject const, SiblingIteratorStrategy> ConstSiblingIterator;
 
     bool isSiblingOf(SPObject const *object) const {
-        g_return_val_if_fail(object != NULL, false);
+        if (object == NULL) return false;
         return this->parent && this->parent == object->parent;
     }
 
@@ -332,26 +333,26 @@ public:
      * Gets the author-visible label property for the object or a default if
      * no label is defined.
      */
-    gchar const *label() const;
+    char const *label() const;
 
     /**
      * Returns a default label property for this object.
      */
-    gchar const *defaultLabel() const;
+    char const *defaultLabel() const;
 
     /**
      * Sets the author-visible label for this object.
      *
      * @param label the new label.
      */
-    void setLabel(gchar const *label);
+    void setLabel(char const *label);
 
     /**
      * Returns the title of this object, or NULL if there is none.
      * The caller must free the returned string using g_free() - see comment
      * for getTitleOrDesc() below.
      */
-    gchar *title() const;
+    char *title() const;
 
     /**
      * Sets the title of this object.
@@ -359,14 +360,14 @@ public:
      * (if any) should be deleted.
      * The second argument is optional - @see setTitleOrDesc() below for details.
      */
-    bool setTitle(gchar const *title, bool verbatim = false);
+    bool setTitle(char const *title, bool verbatim = false);
 
     /**
      * Returns the description of this object, or NULL if there is none.
      * The caller must free the returned string using g_free() - see comment
      * for getTitleOrDesc() below.
      */
-    gchar *desc() const;
+    char *desc() const;
 
     /**
      * Sets the description of this object.
@@ -374,7 +375,7 @@ public:
      * description (if any) should be deleted.
      * The second argument is optional - @see setTitleOrDesc() below for details.
      */
-    bool setDesc(gchar const *desc, bool verbatim=false);
+    bool setDesc(char const *desc, bool verbatim=false);
 
     /**
      * Set the policy under which this object will be orphan-collected.
@@ -501,9 +502,9 @@ public:
      * Indicates that another object supercedes this one.
      */
     void setSuccessor(SPObject *successor) {
-        g_assert(successor != NULL);
-        g_assert(_successor == NULL);
-        g_assert(successor->_successor == NULL);
+        assert(successor != NULL);
+        assert(_successor == NULL);
+        assert(successor->_successor == NULL);
         sp_object_ref(successor, NULL);
         _successor = successor;
     }
@@ -655,8 +656,8 @@ public:
     sigc::signal<void, SPObject *, unsigned int> _modified_signal;
     SPObject *_successor;
     CollectionPolicy _collection_policy;
-    gchar *_label;
-    mutable gchar *_default_label;
+    char *_label;
+    mutable char *_default_label;
 
     // WARNING:
     // Methods below should not be used outside of the SP tree,
@@ -690,7 +691,7 @@ public:
 
     unsigned getPosition();
 
-    gchar const * getAttribute(gchar const *name,SPException *ex=NULL) const;
+    char const * getAttribute(char const *name,SPException *ex=NULL) const;
 
     void appendChild(Inkscape::XML::Node *child);
 
@@ -699,18 +700,18 @@ public:
     /**
      * Call virtual set() function of object.
      */
-    void setKeyValue(unsigned int key, gchar const *value);
+    void setKeyValue(unsigned int key, char const *value);
 
-    void setAttribute(gchar const *key, gchar const *value, SPException *ex=NULL);
+    void setAttribute(char const *key, char const *value, SPException *ex=NULL);
 
     /**
      * Read value of key attribute from XML node into object.
      */
-    void readAttr(gchar const *key);
+    void readAttr(char const *key);
 
-    gchar const *getTagName(SPException *ex) const;
+    char const *getTagName(SPException *ex) const;
 
-    void removeAttribute(gchar const *key, SPException *ex=NULL);
+    void removeAttribute(char const *key, SPException *ex=NULL);
 
     /**
      * Returns an object style property.
@@ -740,13 +741,13 @@ public:
      * <use> element instead), we should probably make the caller
      * responsible for ascending the repr tree as necessary.
      */
-    gchar const *getStyleProperty(gchar const *key, gchar const *def) const;
+    char const *getStyleProperty(char const *key, char const *def) const;
 
-    void setCSS(SPCSSAttr *css, gchar const *attr);
+    void setCSS(SPCSSAttr *css, char const *attr);
 
-    void changeCSS(SPCSSAttr *css, gchar const *attr);
+    void changeCSS(SPCSSAttr *css, char const *attr);
 
-    bool storeAsDouble( gchar const *key, double *val ) const;
+    bool storeAsDouble( char const *key, double *val ) const;
 
 private:
     // Private member functions used in the definitions of setTitle(),
@@ -769,7 +770,7 @@ private:
      * The return value is true if a change was made to the title/description,
      * and usually false otherwise.
      */
-    bool setTitleOrDesc(gchar const *value, gchar const *svg_tagname, bool verbatim);
+    bool setTitleOrDesc(char const *value, char const *svg_tagname, bool verbatim);
 
     /**
      * Returns the title or description of this object, or NULL if there is none.
@@ -781,13 +782,13 @@ private:
      * Consequently, the return value is a newly allocated string (or NULL), and
      * must be freed (using g_free()) by the caller.
      */
-    gchar * getTitleOrDesc(gchar const *svg_tagname) const;
+    char * getTitleOrDesc(char const *svg_tagname) const;
 
     /**
      * Find the first child of this object with a given tag name,
      * and return it.  Returns NULL if there is no matching child.
      */
-    SPObject * findFirstChild(gchar const *tagname) const;
+    SPObject * findFirstChild(char const *tagname) const;
 
     /**
      * Return the full textual content of an element (typically all the
@@ -802,12 +803,12 @@ public:
     /**
      * Callback for attr_changed node event.
      */
-    static void repr_attr_changed(Inkscape::XML::Node *repr, gchar const *key, gchar const *oldval, gchar const *newval, bool is_interactive, gpointer data);
+    static void repr_attr_changed(Inkscape::XML::Node *repr, char const *key, char const *oldval, char const *newval, bool is_interactive, gpointer data);
 
     /**
      * Callback for content_changed node event.
      */
-    static void repr_content_changed(Inkscape::XML::Node *repr, gchar const *oldcontent, gchar const *newcontent, gpointer data);
+    static void repr_content_changed(Inkscape::XML::Node *repr, char const *oldcontent, char const *newcontent, gpointer data);
 
     /**
      * Callback for child_added node event.
@@ -838,12 +839,12 @@ protected:
 
 	virtual void order_changed(Inkscape::XML::Node* child, Inkscape::XML::Node* old_repr, Inkscape::XML::Node* new_repr);
 
-	virtual void set(unsigned int key, const gchar* value);
+	virtual void set(unsigned int key, const char* value);
 
 	virtual void update(SPCtx* ctx, unsigned int flags);
 	virtual void modified(unsigned int flags);
 
-	virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, guint flags);
+	virtual Inkscape::XML::Node* write(Inkscape::XML::Document* doc, Inkscape::XML::Node* repr, unsigned int flags);
 
 public:
 	virtual void read_content();