Header tidying, suppress all gdk deprecation errors in gtkmm

(bzr r11030)

5 files changed, 5 insertions, 20 deletions

diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp
index b455bd2b2..8b1b3fbfd 100644
--- a/src/extension/internal/cairo-ps-out.cpp
+++ b/src/extension/internal/cairo-ps-out.cpp
@@ -20,6 +20,7 @@
 
 #ifdef HAVE_CAIRO_PDF
 
+#include "cairo-ps.h"
 #include "cairo-ps-out.h"
 #include "cairo-render-context.h"
 #include "cairo-renderer.h"
diff --git a/src/extension/internal/emf-win32-inout.cpp b/src/extension/internal/emf-win32-inout.cpp
index ceebc2727..e321f67f1 100644
--- a/src/extension/internal/emf-win32-inout.cpp
+++ b/src/extension/internal/emf-win32-inout.cpp
@@ -27,7 +27,6 @@
 # include "config.h"
 #endif
 
-//#include "inkscape.h"
 #include "sp-root.h"
 #include "sp-path.h"
 #include "style.h"
@@ -40,6 +39,7 @@
 #include "display/drawing-item.h"
 #include "unit-constants.h"
 #include "clear-n_.h"
+#include "document.h"
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
diff --git a/src/extension/internal/emf-win32-print.cpp b/src/extension/internal/emf-win32-print.cpp
index d24761c53..d5e44e702 100644
--- a/src/extension/internal/emf-win32-print.cpp
+++ b/src/extension/internal/emf-win32-print.cpp
@@ -28,9 +28,6 @@
 # include "config.h"
 #endif
 
-//#include <string.h>
-//#include <signal.h>
-//#include <errno.h>
 
 #include <2geom/pathvector.h>
 #include <2geom/rect.h>
@@ -38,35 +35,20 @@
 #include <2geom/hvlinesegment.h>
 #include "helper/geom.h"
 #include "helper/geom-curves.h"
-//#include "display/canvas-bpath.h"
 #include "sp-item.h"
 
-//#include "glib.h"
-//#include "gtk/gtk.h"
-
-//#include "glibmm/i18n.h"
-//#include "enums.h"
-//#include "document.h"
 #include "style.h"
-//#include "sp-paint-server.h"
 #include "inkscape-version.h"
 #include "sp-root.h"
 
-//#include "libnrtype/FontFactory.h"
-//#include "libnrtype/font-instance.h"
-//#include "libnrtype/font-style-to-pos.h"
-
 #include "emf-win32-print.h"
 
 #include "unit-constants.h"
 
-//#include "extension/extension.h"
 #include "extension/system.h"
 #include "extension/print.h"
+#include "document.h"
 
-//#include "io/sys.h"
-
-//#include "macros.h"
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/latex-pstricks.cpp b/src/extension/internal/latex-pstricks.cpp
index d1b784251..bdf95f941 100644
--- a/src/extension/internal/latex-pstricks.cpp
+++ b/src/extension/internal/latex-pstricks.cpp
@@ -31,6 +31,7 @@
 #include "sp-item.h"
 #include "style.h"
 #include "document.h"
+#include <cstring>
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/internal/wpg-input.cpp b/src/extension/internal/wpg-input.cpp
index 0f2857570..8862c1d4a 100644
--- a/src/extension/internal/wpg-input.cpp
+++ b/src/extension/internal/wpg-input.cpp
@@ -48,6 +48,7 @@
 #include "extension/system.h"
 #include "extension/input.h"
 #include "document.h"
+#include <cstring>
 
 // Take a guess and fallback to 0.1.x if no configure has run
 #if !defined(WITH_LIBWPG01) && !defined(WITH_LIBWPG02)