merge from trunk (r11737)

(bzr r11668.1.23)

4 files changed, 4 insertions, 1 deletions

diff --git a/src/xml/node-fns.cpp b/src/xml/node-fns.cpp
index 20e9fbc38..eb3870978 100644
--- a/src/xml/node-fns.cpp
+++ b/src/xml/node-fns.cpp
@@ -9,6 +9,7 @@
 
 #include "xml/node-iterators.h"
 #include "util/find-if-before.h"
+#include "node-fns.h"
 
 namespace Inkscape {
 namespace XML {
diff --git a/src/xml/quote.cpp b/src/xml/quote.cpp
index 51f9ffb97..030a6c764 100644
--- a/src/xml/quote.cpp
+++ b/src/xml/quote.cpp
@@ -13,6 +13,7 @@
 
 #include <cstring>
 #include <glib.h>
+#include "quote.h"
 
 
 /** \return strlen(xml_quote_strdup(\a val)) (without doing the malloc).
diff --git a/src/xml/repr-sorting.cpp b/src/xml/repr-sorting.cpp
index fd485925b..09a39acb2 100644
--- a/src/xml/repr-sorting.cpp
+++ b/src/xml/repr-sorting.cpp
@@ -2,6 +2,7 @@
 #include "util/longest-common-suffix.h"
 #include "xml/repr.h"
 #include "xml/node-iterators.h"
+#include "repr-sorting.h"
 
 static bool same_repr(Inkscape::XML::Node const &a, Inkscape::XML::Node const &b)
 {
diff --git a/src/xml/repr-util.cpp b/src/xml/repr-util.cpp
index 5b8ab12ae..7e9f9c484 100644
--- a/src/xml/repr-util.cpp
+++ b/src/xml/repr-util.cpp
@@ -75,7 +75,7 @@ static char *sp_xml_ns_auto_prefix(char const *uri);
 /**
  * Locale-independent double to string conversion
  */
-unsigned int sp_xml_dtoa(gchar *buf, double val, unsigned int tprec, unsigned int fprec, unsigned int padf)
+static unsigned int sp_xml_dtoa(gchar *buf, double val, unsigned int tprec, unsigned int fprec, unsigned int padf)
 {
     double dival, fval, epsilon;
     int idigits, ival, i;