Fix build

(bzr r13510)

5 files changed, 38 insertions, 33 deletions

diff --git a/src/libnrtype/font-lister.cpp b/src/libnrtype/font-lister.cpp
index 43c3045b1..3c21e62e4 100644
--- a/src/libnrtype/font-lister.cpp
+++ b/src/libnrtype/font-lister.cpp
@@ -268,6 +268,12 @@ namespace Inkscape
       font_list_store->thaw_notify();
     }
 
+Inkscape::FontLister* FontLister::get_instance ()
+{
+    static Inkscape::FontLister* instance = new Inkscape::FontLister(); 
+    return instance;
+}
+
     void
     FontLister::update_font_list_recursive( SPObject *r, std::list<Glib::ustring> *l ) {
 
diff --git a/src/libnrtype/font-lister.h b/src/libnrtype/font-lister.h
index c89dab550..09be16f24 100644
--- a/src/libnrtype/font-lister.h
+++ b/src/libnrtype/font-lister.h
@@ -149,12 +149,7 @@ namespace Inkscape
                         update_font_list_recursive( SPObject *r, std::list<Glib::ustring> *l );
 
                     public:
-                        static Inkscape::FontLister*
-                        get_instance ()
-                        {
-                            static Inkscape::FontLister* instance = new Inkscape::FontLister(); 
-                            return instance;
-                        }
+                        static Inkscape::FontLister* get_instance ();
 
                         /** Takes a hand written font spec and returns a Pango generated one in
                          *  standard form.
diff --git a/src/ui/dialog/print.cpp b/src/ui/dialog/print.cpp
index 4d8d512df..ed39ebb32 100644
--- a/src/ui/dialog/print.cpp
+++ b/src/ui/dialog/print.cpp
@@ -13,14 +13,16 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
 #ifdef WIN32
 #include <io.h>
 #include <windows.h>
 #endif
 
+#include <gtkmm.h>
+
 #include "preferences.h"
 #include "print.h"
-#include <gtkmm/stock.h>
 
 #include "extension/internal/cairo-render-context.h"
 #include "extension/internal/cairo-renderer.h"
diff --git a/src/ui/widget/rendering-options.cpp b/src/ui/widget/rendering-options.cpp
index 511b0375c..837387f7b 100644
--- a/src/ui/widget/rendering-options.cpp
+++ b/src/ui/widget/rendering-options.cpp
@@ -12,6 +12,8 @@
 # include <config.h>
 #endif
 
+#include <gtkmm.h>
+
 #include "preferences.h"
 #include "rendering-options.h"
 #include "util/units.h"
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 939546f78..c7d72f0b8 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -39,35 +39,35 @@
 #include <gtkmm/toolitem.h>
 #include <glibmm/i18n.h>
 
-#include "../desktop.h"
-#include "../desktop-handles.h"
-#include "../desktop-style.h"
+#include "desktop.h"
+#include "desktop-handles.h"
+#include "desktop-style.h"
 #include "document-undo.h"
-#include "../ege-adjustment-action.h"
-#include "../ege-output-action.h"
-#include "../ege-select-one-action.h"
-#include "../graphlayout.h"
-#include "../helper/action.h"
-#include "../helper/action-context.h"
+#include "ege-adjustment-action.h"
+#include "ege-output-action.h"
+#include "ege-select-one-action.h"
+#include "graphlayout.h"
+#include "helper/action.h"
+#include "helper/action-context.h"
 #include "icon.h"
-#include "../ink-action.h"
-#include "../ink-comboboxentry-action.h"
-#include "../inkscape.h"
-#include "../interface.h"
-#include "../shortcuts.h"
-#include "../sp-namedview.h"
-#include "../tools-switch.h"
-#include "../ui/icon-names.h"
-#include "../ui/widget/style-swatch.h"
-#include "../verbs.h"
-#include "../widgets/button.h"
-#include "../widgets/spinbutton-events.h"
+#include "ink-action.h"
+#include "ink-comboboxentry-action.h"
+#include "inkscape.h"
+#include "interface.h"
+#include "shortcuts.h"
+#include "sp-namedview.h"
+#include "tools-switch.h"
+#include "ui/icon-names.h"
+#include "ui/widget/style-swatch.h"
+#include "verbs.h"
+#include "widgets/button.h"
+#include "widgets/spinbutton-events.h"
 #include "ui/widget/spinbutton.h"
-#include "../widgets/spw-utilities.h"
-#include "../widgets/widget-sizes.h"
-#include "../xml/attribute-record.h"
-#include "../xml/node-event-vector.h"
-#include "../xml/repr.h"
+#include "widgets/spw-utilities.h"
+#include "widgets/widget-sizes.h"
+#include "xml/attribute-record.h"
+#include "xml/node-event-vector.h"
+#include "xml/repr.h"
 #include "ui/uxmanager.h"