Minor pass of header cleanup

(bzr r13341.1.189)

4 files changed, 5 insertions, 15 deletions

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;