Header tidying, suppress all gdk deprecation errors in gtkmm

(bzr r11030)

3 files changed, 11 insertions, 5 deletions

diff --git a/src/helper/stock-items.cpp b/src/helper/stock-items.cpp
index 96454cf3a..1de282ba2 100644
--- a/src/helper/stock-items.cpp
+++ b/src/helper/stock-items.cpp
@@ -19,8 +19,10 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-#include "path-prefix.h"
 
+#include <cstring>
+
+#include "path-prefix.h"
 
 #include <xml/repr.h>
 #include "sp-gradient.h"
diff --git a/src/helper/window.cpp b/src/helper/window.cpp
index f4640203d..444e1d8b0 100644
--- a/src/helper/window.cpp
+++ b/src/helper/window.cpp
@@ -12,7 +12,6 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include <gtk/gtk.h>
 #include <gtkmm/window.h>
 
 #include "inkscape.h"
@@ -20,6 +19,7 @@
 #include "desktop.h"
 #include "event-context.h"
 #include "window.h"
+#include <gtk/gtk.h>
 
 static bool on_window_key_press(GdkEventKey* event)
 {
diff --git a/src/helper/window.h b/src/helper/window.h
index dc2c48bc0..c6807f9e5 100644
--- a/src/helper/window.h
+++ b/src/helper/window.h
@@ -10,11 +10,15 @@
  * This code is in public domain
  */
 
-#include <gtk/gtk.h>
-#include <gtkmm/window.h>
+struct _GtkWidget;
+typedef _GtkWidget GtkWidget;
+
+namespace Gtk {
+class Window;
+}
 
 /*
- * This function is depreciated. Use Inkscape::UI::window_new instead.
+ * This function is deprecated. Use Inkscape::UI::window_new instead.
  */
 GtkWidget *sp_window_new (const gchar *title, unsigned int resizeable);