10 files changed, 17 insertions, 15 deletions
diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp
index 1c13c27f1..5ee226ccf 100644
--- a/src/extension/implementation/script.cpp
+++ b/src/extension/implementation/script.cpp
@@ -26,7 +26,7 @@
 
 #include "desktop-handles.h"
 #include "desktop.h"
-#include "dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include "extension/effect.h"
 #include "extension/output.h"
 #include "extension/input.h"
diff --git a/src/extension/internal/bitmap/crop.cpp b/src/extension/internal/bitmap/crop.cpp
index 0e633afd6..02d92668b 100644
--- a/src/extension/internal/bitmap/crop.cpp
+++ b/src/extension/internal/bitmap/crop.cpp
@@ -74,7 +74,7 @@ Crop::init(void)
             "<effects-menu>\n"
               "<submenu name=\"" N_("Raster") "\" />\n"
             "</effects-menu>\n"
-            "<menu-tip>" N_("Crop selected bitmap(s).") "</menu-tip>\n"
+            "<menu-tip>" N_("Crop selected bitmap(s)") "</menu-tip>\n"
           "</effect>\n"
         "</inkscape-extension>\n", new Crop());
 }
diff --git a/src/extension/internal/bitmap/opacity.cpp b/src/extension/internal/bitmap/opacity.cpp
index 742cb7019..f9b4bbc27 100644
--- a/src/extension/internal/bitmap/opacity.cpp
+++ b/src/extension/internal/bitmap/opacity.cpp
@@ -43,7 +43,7 @@ Opacity::init(void)
 				"<effects-menu>\n"
 					"<submenu name=\"" N_("Raster") "\" />\n"
 				"</effects-menu>\n"
-				"<menu-tip>" N_("Modify opacity channel(s) of selected bitmap(s).") "</menu-tip>\n"
+				"<menu-tip>" N_("Modify opacity channel(s) of selected bitmap(s)") "</menu-tip>\n"
 			"</effect>\n"
 		"</inkscape-extension>\n", new Opacity());
 }
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/extension/internal/cdr-input.cpp b/src/extension/internal/cdr-input.cpp
index fa5cb70f9..1de3f304b 100644
--- a/src/extension/internal/cdr-input.cpp
+++ b/src/extension/internal/cdr-input.cpp
@@ -40,7 +40,7 @@
 #include "document-undo.h"
 #include "inkscape.h"
 
-#include "dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include <gtk/gtk.h>
 #include "ui/widget/spinbutton.h"
 #include "ui/widget/frame.h"
diff --git a/src/extension/internal/gdkpixbuf-input.cpp b/src/extension/internal/gdkpixbuf-input.cpp
index da179bee0..28e44c461 100644
--- a/src/extension/internal/gdkpixbuf-input.cpp
+++ b/src/extension/internal/gdkpixbuf-input.cpp
@@ -1,21 +1,20 @@
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include <boost/scoped_ptr.hpp>
 #include <glib/gprintf.h>
 #include <glibmm/i18n.h>
+#include "dir-util.h"
+#include "display/cairo-utils.h"
 #include "document-private.h"
-#include <dir-util.h>
+#include "document-undo.h"
 #include "extension/input.h"
 #include "extension/system.h"
+#include "image-resolution.h"
 #include "gdkpixbuf-input.h"
 #include "preferences.h"
 #include "selection-chemistry.h"
 #include "sp-image.h"
-#include "document-undo.h"
 #include "util/units.h"
-#include "image-resolution.h"
-#include "display/cairo-utils.h"
 #include <set>
 
 namespace Inkscape {
diff --git a/src/extension/internal/gdkpixbuf-input.h b/src/extension/internal/gdkpixbuf-input.h
index 597e7246b..2e03a96db 100644
--- a/src/extension/internal/gdkpixbuf-input.h
+++ b/src/extension/internal/gdkpixbuf-input.h
@@ -10,7 +10,7 @@ namespace Internal {
 class GdkpixbufInput : Inkscape::Extension::Implementation::Implementation {
 public:
     SPDocument *open(Inkscape::Extension::Input *mod,
-                     gchar const *uri);
+                     char const *uri);
     static void init();
 };
 
diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
index bcaa8712f..e18d898f5 100644
--- a/src/extension/internal/pdfinput/pdf-input.cpp
+++ b/src/extension/internal/pdfinput/pdf-input.cpp
@@ -48,7 +48,7 @@
 #include "inkscape.h"
 #include "util/units.h"
 
-#include "dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include <gtk/gtk.h>
 #include "ui/widget/spinbutton.h"
 #include "ui/widget/frame.h"
diff --git a/src/extension/internal/vsd-input.cpp b/src/extension/internal/vsd-input.cpp
index 0830ae2dd..2623d1ca7 100644
--- a/src/extension/internal/vsd-input.cpp
+++ b/src/extension/internal/vsd-input.cpp
@@ -41,7 +41,7 @@
 #include "inkscape.h"
 #include "util/units.h"
 
-#include "dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include <gtk/gtk.h>
 #include "ui/widget/spinbutton.h"
 #include "ui/widget/frame.h"
diff --git a/src/extension/prefdialog.cpp b/src/extension/prefdialog.cpp
index d1f83701f..af31f32b6 100644
--- a/src/extension/prefdialog.cpp
+++ b/src/extension/prefdialog.cpp
@@ -13,7 +13,7 @@
 #include <gtkmm/separator.h>
 #include <glibmm/i18n.h>
 
-#include "../dialogs/dialog-events.h"
+#include "ui/dialog-events.h"
 #include "xml/repr.h"
 
 // Used to get SP_ACTIVE_DESKTOP