diff -Naur inkscape-0.45.1/src/#arc.txt# inkscape-0.45.1-mp/src/#arc.txt#
--- inkscape-0.45.1/src/#arc.txt#	1970-01-01 01:00:00.000000000 +0100
+++ inkscape-0.45.1-mp/src/#arc.txt#	2007-11-10 10:13:21.000000000 +0100
@@ -0,0 +1,7 @@
+streq.h:    return std::strcmp(a, b) == 0;
+style.cpp:            && (!base->set || strcmp(val->value, base->value))))
+text-chemistry.cpp:        if (!strcmp(copy->name(), "svg:tspan")) {
+text-editing.cpp:        if ((this_attr == NULL || strcmp(attrs->value, this_attr)) && this_node_attrs->attribute(key) == NULL)
+tools-switch.cpp:        return (!strcmp(dt->event_context->prefs_repr->attribute("id"), tool_ids[num]));
+uri-references.cpp:			if ( len < 3 || strcmp(id+len-2, "))") ) {
+verbs.h:                return strcmp(s1, s2) < 0;
diff -Naur inkscape-0.45.1/src/color-profile.cpp inkscape-0.45.1-mp/src/color-profile.cpp
--- inkscape-0.45.1/src/color-profile.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/color-profile.cpp	2007-11-10 09:45:40.000000000 +0100
@@ -1,5 +1,6 @@
 
-
+#include <cstring>
+#include <string>
 #include "xml/repr.h"
 #include "color-profile.h"
 #include "color-profile-fns.h"
diff -Naur inkscape-0.45.1/src/composite-undo-stack-observer.cpp inkscape-0.45.1-mp/src/composite-undo-stack-observer.cpp
--- inkscape-0.45.1/src/composite-undo-stack-observer.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/composite-undo-stack-observer.cpp	2007-11-10 11:12:40.000000000 +0100
@@ -12,6 +12,7 @@
  */
 
 
+#include <algorithm>
 #include "composite-undo-stack-observer.h"
 #include "xml/event.h"
 
diff -Naur inkscape-0.45.1/src/conn-avoid-ref.cpp inkscape-0.45.1-mp/src/conn-avoid-ref.cpp
--- inkscape-0.45.1/src/conn-avoid-ref.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/conn-avoid-ref.cpp	2007-11-10 09:46:10.000000000 +0100
@@ -10,7 +10,8 @@
  */
 
 
-
+#include <cstring>
+#include <string>
 #include "sp-item.h"
 #include "conn-avoid-ref.h"
 #include "libnr/nr-rect-ops.h"
diff -Naur inkscape-0.45.1/src/connector-context.cpp inkscape-0.45.1-mp/src/connector-context.cpp
--- inkscape-0.45.1/src/connector-context.cpp	2007-02-03 14:24:35.000000000 +0100
+++ inkscape-0.45.1-mp/src/connector-context.cpp	2007-11-10 09:46:36.000000000 +0100
@@ -42,6 +42,8 @@
  */
 
 #include <gdk/gdkkeysyms.h>
+#include <string>
+#include <cstring>
 
 #include "connector-context.h"
 #include "pixmaps/cursor-connector.xpm"
diff -Naur inkscape-0.45.1/src/desktop-style.cpp inkscape-0.45.1-mp/src/desktop-style.cpp
--- inkscape-0.45.1/src/desktop-style.cpp	2007-03-17 00:26:16.000000000 +0100
+++ inkscape-0.45.1-mp/src/desktop-style.cpp	2007-11-10 09:47:04.000000000 +0100
@@ -12,6 +12,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <string>
+#include <cstring>
 #include "desktop.h"
 #include "color-rgba.h"
 #include "svg/css-ostringstream.h"
diff -Naur inkscape-0.45.1/src/dialogs/object-attributes.cpp inkscape-0.45.1-mp/src/dialogs/object-attributes.cpp
--- inkscape-0.45.1/src/dialogs/object-attributes.cpp	2007-01-16 03:45:42.000000000 +0100
+++ inkscape-0.45.1-mp/src/dialogs/object-attributes.cpp	2007-11-09 00:08:56.000000000 +0100
@@ -25,6 +25,9 @@
 #include <sigc++/functors/ptr_fun.h>
 #include <sigc++/adaptors/bind.h>
 
+#include <string>
+#include <cstring> 
+
 struct SPAttrDesc {
     gchar const *label;
     gchar const *attribute;
diff -Naur inkscape-0.45.1/src/dialogs/unclump.cpp inkscape-0.45.1-mp/src/dialogs/unclump.cpp
--- inkscape-0.45.1/src/dialogs/unclump.cpp	2007-01-16 03:45:42.000000000 +0100
+++ inkscape-0.45.1-mp/src/dialogs/unclump.cpp	2007-11-10 11:07:31.000000000 +0100
@@ -11,6 +11,7 @@
  */
 
 
+#include <algorithm>
 #include <map>
 #include "libnr/nr-matrix-ops.h"
 #include "sp-item.h"
diff -Naur inkscape-0.45.1/src/dir-util.cpp inkscape-0.45.1-mp/src/dir-util.cpp
--- inkscape-0.45.1/src/dir-util.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/dir-util.cpp	2007-11-10 09:47:48.000000000 +0100
@@ -3,7 +3,8 @@
 #define DIR_UTIL_C
 
 #include <errno.h>
-#include <string.h>
+#include <cstring>
+#include <string>
 #include <glib/gutils.h>
 #include <glib/gmem.h>
 #include <glib/gerror.h>
diff -Naur inkscape-0.45.1/src/display/curve.cpp inkscape-0.45.1-mp/src/display/curve.cpp
--- inkscape-0.45.1/src/display/curve.cpp	2007-01-16 03:45:15.000000000 +0100
+++ inkscape-0.45.1-mp/src/display/curve.cpp	2007-11-09 01:21:18.000000000 +0100
@@ -21,6 +21,8 @@
 #include <libnr/n-art-bpath.h>
 #include <libnr/nr-point-matrix-ops.h>
 #include <libnr/nr-translate-ops.h>
+#include <cstring>
+#include <string>
 
 #define SP_CURVE_LENSTEP 32
 
diff -Naur inkscape-0.45.1/src/display/nr-arena-item.cpp inkscape-0.45.1-mp/src/display/nr-arena-item.cpp
--- inkscape-0.45.1/src/display/nr-arena-item.cpp	2007-02-04 19:43:09.000000000 +0100
+++ inkscape-0.45.1-mp/src/display/nr-arena-item.cpp	2007-11-09 01:05:08.000000000 +0100
@@ -15,6 +15,8 @@
 #define noNR_ARENA_ITEM_VERBOSE
 #define noNR_ARENA_ITEM_DEBUG_CASCADE
 
+#include <cstring>
+#include <string>
 
 #include <libnr/nr-blit.h>
 #include <libnr/nr-pixops.h>
diff -Naur inkscape-0.45.1/src/display/nr-filter.cpp inkscape-0.45.1-mp/src/display/nr-filter.cpp
--- inkscape-0.45.1/src/display/nr-filter.cpp	2007-02-04 19:43:09.000000000 +0100
+++ inkscape-0.45.1-mp/src/display/nr-filter.cpp	2007-11-09 01:47:22.000000000 +0100
@@ -13,6 +13,8 @@
 
 #include <glib.h>
 #include <cmath>
+#include <cstring>
+#include <string>
 
 #include "display/nr-filter.h"
 #include "display/nr-filter-primitive.h"
diff -Naur inkscape-0.45.1/src/display/nr-filter-gaussian.cpp inkscape-0.45.1-mp/src/display/nr-filter-gaussian.cpp
--- inkscape-0.45.1/src/display/nr-filter-gaussian.cpp	2007-02-04 19:43:09.000000000 +0100
+++ inkscape-0.45.1-mp/src/display/nr-filter-gaussian.cpp	2007-11-09 03:06:06.000000000 +0100
@@ -15,6 +15,7 @@
 
 #include <cmath>
 #include <glib.h>
+#include <cstdlib>
 
 using std::isnormal;
 
diff -Naur inkscape-0.45.1/src/document.cpp inkscape-0.45.1-mp/src/document.cpp
--- inkscape-0.45.1/src/document.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/document.cpp	2007-11-10 09:49:09.000000000 +0100
@@ -38,6 +38,8 @@
 # include "config.h"
 #endif
 #include <gtk/gtkmain.h>
+#include <string>
+#include <cstring>
 #include "application/application.h"
 #include "application/editor.h"
 #include "libnr/nr-matrix-fns.h"
diff -Naur inkscape-0.45.1/src/document-undo.cpp inkscape-0.45.1-mp/src/document-undo.cpp
--- inkscape-0.45.1/src/document-undo.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/document-undo.cpp	2007-11-10 09:49:46.000000000 +0100
@@ -57,6 +57,8 @@
 #if HAVE_STDLIB_H
 #endif
 
+#include <string>
+#include <cstring>
 #include "xml/repr.h"
 #include "document-private.h"
 #include "inkscape.h"
diff -Naur inkscape-0.45.1/src/dyna-draw-context.cpp inkscape-0.45.1-mp/src/dyna-draw-context.cpp
--- inkscape-0.45.1/src/dyna-draw-context.cpp	2007-02-04 01:29:44.000000000 +0100
+++ inkscape-0.45.1-mp/src/dyna-draw-context.cpp	2007-11-10 09:50:11.000000000 +0100
@@ -28,6 +28,8 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
+#include <string>
+#include <cstring>
 
 #include "svg/svg.h"
 #include "display/canvas-bpath.h"
diff -Naur inkscape-0.45.1/src/event-context.cpp inkscape-0.45.1-mp/src/event-context.cpp
--- inkscape-0.45.1/src/event-context.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/event-context.cpp	2007-11-10 09:50:43.000000000 +0100
@@ -30,6 +30,8 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkmenu.h>
+#include <cstring>
+#include <string>
 
 #include "display/sp-canvas.h"
 #include "xml/node-event-vector.h"
diff -Naur inkscape-0.45.1/src/extension/internal/libwpg/WPGOLEStream.cpp inkscape-0.45.1-mp/src/extension/internal/libwpg/WPGOLEStream.cpp
--- inkscape-0.45.1/src/extension/internal/libwpg/WPGOLEStream.cpp	2007-01-16 03:45:20.000000000 +0100
+++ inkscape-0.45.1-mp/src/extension/internal/libwpg/WPGOLEStream.cpp	2007-11-09 03:26:31.000000000 +0100
@@ -31,6 +31,7 @@
 #include <list>
 #include <string>
 #include <vector>
+#include <cstring>
 
 #include "WPGOLEStream.h"
 #include "libwpg_utils.h"
diff -Naur inkscape-0.45.1/src/gc.cpp inkscape-0.45.1-mp/src/gc.cpp
--- inkscape-0.45.1/src/gc.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/gc.cpp	2007-11-10 09:41:08.000000000 +0100
@@ -11,6 +11,8 @@
 
 #include "gc-core.h"
 #include <stdexcept>
+#include <cstring>
+#include <string>
 #include <glib/gmessages.h>
 #include <sigc++/functors/ptr_fun.h>
 #include <glibmm/main.h>
diff -Naur inkscape-0.45.1/src/gradient-drag.cpp inkscape-0.45.1-mp/src/gradient-drag.cpp
--- inkscape-0.45.1/src/gradient-drag.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/gradient-drag.cpp	2007-11-10 09:51:26.000000000 +0100
@@ -16,6 +16,8 @@
 #endif
 
 #include <glibmm/i18n.h>
+#include <string>
+#include <cstring>
 
 #include "desktop-handles.h"
 #include "selection.h"
diff -Naur inkscape-0.45.1/src/graphlayout/graphlayout.cpp inkscape-0.45.1-mp/src/graphlayout/graphlayout.cpp
--- inkscape-0.45.1/src/graphlayout/graphlayout.cpp	2007-02-03 14:24:01.000000000 +0100
+++ inkscape-0.45.1-mp/src/graphlayout/graphlayout.cpp	2007-11-10 05:24:41.000000000 +0100
@@ -10,6 +10,8 @@
 * Released under GNU GPL.  Read the file 'COPYING' for more information.
 */
 #include <iostream>
+#include <cstring>
+#include <cstdlib>
 #include <config.h>
 #include <map>
 #include <vector>
diff -Naur inkscape-0.45.1/src/inkjar/jar.cpp inkscape-0.45.1-mp/src/inkjar/jar.cpp
--- inkscape-0.45.1/src/inkjar/jar.cpp	2007-01-16 03:46:06.000000000 +0100
+++ inkscape-0.45.1-mp/src/inkjar/jar.cpp	2007-11-09 22:51:00.000000000 +0100
@@ -42,7 +42,9 @@
 #include <fcntl.h>
 //#endif
 
-
+#include <cstring>
+#include <string>
+#include <cstdlib>
 #include <glib.h>
 
 #include "jar.h"
diff -Naur inkscape-0.45.1/src/inkscape.cpp inkscape-0.45.1-mp/src/inkscape.cpp
--- inkscape-0.45.1/src/inkscape.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/inkscape.cpp	2007-11-10 09:51:59.000000000 +0100
@@ -42,6 +42,8 @@
 #include <gtk/gtkmessagedialog.h>
 
 #include <glibmm/i18n.h>
+#include <string>
+#include <cstring>
 #include "helper/sp-marshal.h"
 #include "dialogs/debugdialog.h"
 #include "application/application.h"
diff -Naur inkscape-0.45.1/src/interface.cpp inkscape-0.45.1-mp/src/interface.cpp
--- inkscape-0.45.1/src/interface.cpp	2007-03-13 19:06:22.000000000 +0100
+++ inkscape-0.45.1-mp/src/interface.cpp	2007-11-10 09:52:24.000000000 +0100
@@ -20,6 +20,8 @@
 #endif
 
 #include <gtk/gtk.h>
+#include <string>
+#include <cstring>
 #include "inkscape-private.h"
 #include "extension/effect.h"
 #include "widgets/icon.h"
diff -Naur inkscape-0.45.1/src/io/gzipstream.cpp inkscape-0.45.1-mp/src/io/gzipstream.cpp
--- inkscape-0.45.1/src/io/gzipstream.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/io/gzipstream.cpp	2007-11-09 18:19:08.000000000 +0100
@@ -14,7 +14,8 @@
  */
 
 #include "gzipstream.h"
-
+#include <cstring>
+#include <string> 
 
 namespace Inkscape
 {
diff -Naur inkscape-0.45.1/src/io/simple-sax.cpp inkscape-0.45.1-mp/src/io/simple-sax.cpp
--- inkscape-0.45.1/src/io/simple-sax.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/io/simple-sax.cpp	2007-11-09 19:09:53.000000000 +0100
@@ -9,7 +9,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-
+#include <string>
+#include <cstring>
 #include "simple-sax.h"
 
 namespace Inkscape {
diff -Naur inkscape-0.45.1/src/io/uristream.cpp inkscape-0.45.1-mp/src/io/uristream.cpp
--- inkscape-0.45.1/src/io/uristream.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/io/uristream.cpp	2007-11-09 20:15:32.000000000 +0100
@@ -13,6 +13,8 @@
 
 #include "uristream.h"
 #include "sys.h"
+#include <string> 
+#include <cstring> 
 
 #ifdef WIN32
 // For now to get at is_os_wide().
diff -Naur inkscape-0.45.1/src/libavoid/connector.cpp inkscape-0.45.1-mp/src/libavoid/connector.cpp
--- inkscape-0.45.1/src/libavoid/connector.cpp	2007-01-16 03:45:49.000000000 +0100
+++ inkscape-0.45.1-mp/src/libavoid/connector.cpp	2007-11-10 01:02:12.000000000 +0100
@@ -20,6 +20,7 @@
  * 
 */
 
+#include <cstdlib>
 #include "libavoid/graph.h"
 #include "libavoid/connector.h"
 #include "libavoid/makepath.h"
diff -Naur inkscape-0.45.1/src/libavoid/makepath.cpp inkscape-0.45.1-mp/src/libavoid/makepath.cpp
--- inkscape-0.45.1/src/libavoid/makepath.cpp	2007-01-16 03:45:49.000000000 +0100
+++ inkscape-0.45.1-mp/src/libavoid/makepath.cpp	2007-11-10 11:10:43.000000000 +0100
@@ -33,6 +33,8 @@
 #include "libavoid/router.h"
 #include <vector>
 #include <math.h>
+#include <climits>
+#include <algorithm>
 
 namespace Avoid {
 
diff -Naur inkscape-0.45.1/src/libavoid/router.cpp inkscape-0.45.1-mp/src/libavoid/router.cpp
--- inkscape-0.45.1/src/libavoid/router.cpp	2007-01-16 03:45:49.000000000 +0100
+++ inkscape-0.45.1-mp/src/libavoid/router.cpp	2007-11-10 02:03:16.000000000 +0100
@@ -20,6 +20,7 @@
  * 
 */
 
+#include <cstdlib>
 #include "libavoid/shape.h"
 #include "libavoid/router.h"
 #include "libavoid/visibility.h"
@@ -619,7 +620,7 @@
                 if (((int) r_p2.y) != 0)
                 {
                     printf("r_p2.y: %f != 0\n", r_p2.y);
-                    abort();
+		    std::abort();
                 }
                 // This might be slightly off.
                 r_p2.y = 0;
diff -Naur inkscape-0.45.1/src/libavoid/visibility.cpp inkscape-0.45.1-mp/src/libavoid/visibility.cpp
--- inkscape-0.45.1/src/libavoid/visibility.cpp	2007-01-16 03:45:49.000000000 +0100
+++ inkscape-0.45.1-mp/src/libavoid/visibility.cpp	2007-11-10 11:11:12.000000000 +0100
@@ -21,6 +21,7 @@
 */
 
 
+#include <algorithm>
 #include <cfloat>
 
 #include "libavoid/shape.h"
diff -Naur inkscape-0.45.1/src/libcola/straightener.cpp inkscape-0.45.1-mp/src/libcola/straightener.cpp
--- inkscape-0.45.1/src/libcola/straightener.cpp	2007-01-16 03:45:34.000000000 +0100
+++ inkscape-0.45.1-mp/src/libcola/straightener.cpp	2007-11-10 03:41:35.000000000 +0100
@@ -20,6 +20,7 @@
 #include "straightener.h"
 #include <iostream>
 #include <cmath>
+#include <cstdlib>
 
 using std::set;
 using std::vector;
diff -Naur inkscape-0.45.1/src/libnr/n-art-bpath.h inkscape-0.45.1-mp/src/libnr/n-art-bpath.h
--- inkscape-0.45.1/src/libnr/n-art-bpath.h	2007-01-16 03:46:04.000000000 +0100
+++ inkscape-0.45.1-mp/src/libnr/n-art-bpath.h	2007-11-08 21:00:40.000000000 +0100
@@ -7,6 +7,7 @@
 
 #include "libnr/nr-point.h"
 #include "libnr/nr-path-code.h"
+#include <cstdlib>
 
 /**
  * Old-style path segment.
@@ -29,7 +30,7 @@
             case 1: return NR::Point(x1, y1);
             case 2: return NR::Point(x2, y2);
             case 3: return NR::Point(x3, y3);
-            default: abort();
+            default: std::abort();
         }
     }
 
@@ -41,7 +42,7 @@
             case 1: x1 = p[X]; y1 = p[Y]; break;
             case 2: x2 = p[X]; y2 = p[Y]; break;
             case 3: x3 = p[X]; y3 = p[Y]; break;
-            default: abort();
+            default: std::abort();
         }
     }
 };
diff -Naur inkscape-0.45.1/src/libnr/nr-matrix.cpp inkscape-0.45.1-mp/src/libnr/nr-matrix.cpp
--- inkscape-0.45.1/src/libnr/nr-matrix.cpp	2007-01-16 03:46:04.000000000 +0100
+++ inkscape-0.45.1-mp/src/libnr/nr-matrix.cpp	2007-11-09 23:20:19.000000000 +0100
@@ -11,6 +11,7 @@
  * This code is in public domain
  */
 
+#include <cstdlib>
 #include "nr-matrix.h"
 
 
@@ -605,7 +606,7 @@
                 a[0], a[1], b[0], b[1],
                 a[2], a[3], b[2], b[3],
                 a[4], a[5], b[4], b[5]);
-        abort();
+	std::abort();
     }
 }
 
diff -Naur inkscape-0.45.1/src/libnr/nr-pixblock.cpp inkscape-0.45.1-mp/src/libnr/nr-pixblock.cpp
--- inkscape-0.45.1/src/libnr/nr-pixblock.cpp	2007-01-16 03:46:04.000000000 +0100
+++ inkscape-0.45.1-mp/src/libnr/nr-pixblock.cpp	2007-11-10 00:20:38.000000000 +0100
@@ -9,6 +9,9 @@
  * This code is in the Public Domain
  */
 
+#include <string>
+#include <cstring>
+#include <string.h>
 #include <glib/gmem.h>
 #include "nr-pixblock.h"
 
diff -Naur inkscape-0.45.1/src/libnr/nr-pixops.h inkscape-0.45.1-mp/src/libnr/nr-pixops.h
--- inkscape-0.45.1/src/libnr/nr-pixops.h	2007-01-16 03:46:04.000000000 +0100
+++ inkscape-0.45.1-mp/src/libnr/nr-pixops.h	2007-11-08 19:07:23.000000000 +0100
@@ -19,8 +19,8 @@
 // FAST_DIVIDE assumes that 0<=num<=256*denom
 //   (this covers the case that num=255*denom+denom/2, which is used by DIV_ROUND)
 template<unsigned int divisor> static inline unsigned int FAST_DIVIDE(unsigned int v) { return v/divisor; }
-template<> static inline unsigned int FAST_DIVIDE<255>(unsigned int v) { return ((v+1)*0x101) >> 16; }
-template<> static inline unsigned int FAST_DIVIDE<255*255>(unsigned int v) { v=(v+1)<<1; v=v+(v>>7)+((v*0x3)>>16)+(v>>22); return (v>>16)>>1; }
+template<> inline unsigned int FAST_DIVIDE<255>(unsigned int v) { return ((v+1)*0x101) >> 16; }
+template<> inline unsigned int FAST_DIVIDE<255*255>(unsigned int v) { v=(v+1)<<1; v=v+(v>>7)+((v*0x3)>>16)+(v>>22); return (v>>16)>>1; }
 // FAST_DIV_ROUND assumes that 0<=num<=255*denom (DIV_ROUND should work upto num=2^32-1-(denom/2),
 // but FAST_DIVIDE_BY_255 already fails at num=65790=258*255, which is not too far above 255.5*255)
 template<unsigned int divisor> static inline unsigned int FAST_DIV_ROUND(unsigned int v) { return FAST_DIVIDE<divisor>(v+(divisor)/2); }
diff -Naur inkscape-0.45.1/src/libvpsc/csolve_VPSC.cpp inkscape-0.45.1-mp/src/libvpsc/csolve_VPSC.cpp
--- inkscape-0.45.1/src/libvpsc/csolve_VPSC.cpp	2007-01-16 03:45:43.000000000 +0100
+++ inkscape-0.45.1-mp/src/libvpsc/csolve_VPSC.cpp	2007-11-10 03:10:34.000000000 +0100
@@ -10,6 +10,7 @@
  */
 #include <iostream>
 #include <cassert>
+#include <cstdlib>
 #include "variable.h"
 #include "constraint.h"
 #include "generate-constraints.h"
@@ -73,7 +74,7 @@
 		vpsc->satisfy();
 	} catch(const char *e) {
 		std::cerr << e << std::endl;
-		exit(1);
+		std::exit(1);
 	}
 }
 int getSplitCnt(IncSolver *vpsc) {
diff -Naur inkscape-0.45.1/src/libvpsc/generate-constraints.cpp inkscape-0.45.1-mp/src/libvpsc/generate-constraints.cpp
--- inkscape-0.45.1/src/libvpsc/generate-constraints.cpp	2007-01-16 03:45:43.000000000 +0100
+++ inkscape-0.45.1-mp/src/libvpsc/generate-constraints.cpp	2007-11-10 02:36:04.000000000 +0100
@@ -12,6 +12,7 @@
 
 #include <set>
 #include <cassert>
+#include <cstdlib>
 #include "generate-constraints.h"
 #include "constraint.h"
 
diff -Naur inkscape-0.45.1/src/livarot/BitLigne.cpp inkscape-0.45.1-mp/src/livarot/BitLigne.cpp
--- inkscape-0.45.1/src/livarot/BitLigne.cpp	2007-01-16 03:45:48.000000000 +0100
+++ inkscape-0.45.1-mp/src/livarot/BitLigne.cpp	2007-11-10 04:48:57.000000000 +0100
@@ -10,8 +10,11 @@
 #include "BitLigne.h"
 
 #include <math.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstring>
+#include <cstdlib>
+#include <string>
+#include <cmath>
+#include <cstdio>
 #include <glib/gmem.h>
 
 BitLigne::BitLigne(int ist,int ien,float iScale)
diff -Naur inkscape-0.45.1/src/livarot/float-line.cpp inkscape-0.45.1-mp/src/livarot/float-line.cpp
--- inkscape-0.45.1/src/livarot/float-line.cpp	2007-01-16 03:45:48.000000000 +0100
+++ inkscape-0.45.1-mp/src/livarot/float-line.cpp	2007-11-10 04:13:48.000000000 +0100
@@ -14,6 +14,7 @@
 #endif
 #include "livarot/float-line.h"
 #include "livarot/int-line.h"
+#include <cstdio>
 
 FloatLigne::FloatLigne()
 {
diff -Naur inkscape-0.45.1/src/livarot/int-line.cpp inkscape-0.45.1-mp/src/livarot/int-line.cpp
--- inkscape-0.45.1/src/livarot/int-line.cpp	2007-01-16 03:45:48.000000000 +0100
+++ inkscape-0.45.1-mp/src/livarot/int-line.cpp	2007-11-10 04:49:33.000000000 +0100
@@ -11,6 +11,10 @@
 
 #include <glib/gmem.h>
 #include <cmath>
+#include <cstring>
+#include <string>
+#include <cstdlib>
+#include <cstdio>
 #include "livarot/int-line.h"
 #include "livarot/float-line.h"
 #include "livarot/BitLigne.h"
diff -Naur inkscape-0.45.1/src/livarot/PathCutting.cpp inkscape-0.45.1-mp/src/livarot/PathCutting.cpp
--- inkscape-0.45.1/src/livarot/PathCutting.cpp	2007-01-16 03:45:48.000000000 +0100
+++ inkscape-0.45.1-mp/src/livarot/PathCutting.cpp	2007-11-10 04:50:33.000000000 +0100
@@ -13,6 +13,9 @@
  *  Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <cstdio>
+#include <string>
+#include <cstring>
 #include "Path.h"
 #include "style.h"
 #include "livarot/path-description.h"
diff -Naur inkscape-0.45.1/src/livarot/Shape.cpp inkscape-0.45.1-mp/src/livarot/Shape.cpp
--- inkscape-0.45.1/src/livarot/Shape.cpp	2007-01-16 03:45:48.000000000 +0100
+++ inkscape-0.45.1-mp/src/livarot/Shape.cpp	2007-11-10 04:51:14.000000000 +0100
@@ -6,6 +6,8 @@
  *
  */
 
+#include <cstdio>
+#include <cstdlib>
 #include <glib/gmem.h>
 #include "Shape.h"
 #include "livarot/sweep-event-queue.h"
diff -Naur inkscape-0.45.1/src/livarot/ShapeDraw.cpp inkscape-0.45.1-mp/src/livarot/ShapeDraw.cpp
--- inkscape-0.45.1/src/livarot/ShapeDraw.cpp	2007-01-16 03:45:48.000000000 +0100
+++ inkscape-0.45.1-mp/src/livarot/ShapeDraw.cpp	2007-11-10 04:51:49.000000000 +0100
@@ -6,6 +6,9 @@
  *
  */
 
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "Shape.h"
 //#include <ApplicationServices/ApplicationServices.h>
 
diff -Naur inkscape-0.45.1/src/livarot/ShapeMisc.cpp inkscape-0.45.1-mp/src/livarot/ShapeMisc.cpp
--- inkscape-0.45.1/src/livarot/ShapeMisc.cpp	2007-01-16 03:45:48.000000000 +0100
+++ inkscape-0.45.1-mp/src/livarot/ShapeMisc.cpp	2007-11-10 04:52:18.000000000 +0100
@@ -11,6 +11,9 @@
 #include "livarot/Path.h"
 #include "livarot/path-description.h"
 #include <glib.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 /*
  * polygon offset and polyline to path reassembling (when using back data)
diff -Naur inkscape-0.45.1/src/livarot/ShapeSweep.cpp inkscape-0.45.1-mp/src/livarot/ShapeSweep.cpp
--- inkscape-0.45.1/src/livarot/ShapeSweep.cpp	2007-01-16 03:45:48.000000000 +0100
+++ inkscape-0.45.1-mp/src/livarot/ShapeSweep.cpp	2007-11-10 04:52:47.000000000 +0100
@@ -6,6 +6,9 @@
  *
  */
 
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
 #include <glib/gmem.h>
 #include "Shape.h"
 #include "livarot/sweep-event-queue.h"
diff -Naur inkscape-0.45.1/src/main.cpp inkscape-0.45.1-mp/src/main.cpp
--- inkscape-0.45.1/src/main.cpp	2007-02-20 05:06:35.000000000 +0100
+++ inkscape-0.45.1-mp/src/main.cpp	2007-11-10 09:52:59.000000000 +0100
@@ -33,7 +33,8 @@
 #ifdef HAVE_IEEEFP_H
 #include <ieeefp.h>
 #endif
-#include <string.h>
+#include <cstring>
+#include <string>
 #include <locale.h>
 
 #include <popt.h>
diff -Naur inkscape-0.45.1/src/marker.cpp inkscape-0.45.1-mp/src/marker.cpp
--- inkscape-0.45.1/src/marker.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/marker.cpp	2007-11-10 09:53:34.000000000 +0100
@@ -13,6 +13,9 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <string>
+#include <cstring>
+
 #include "config.h"
 
 
diff -Naur inkscape-0.45.1/src/message-stack.cpp inkscape-0.45.1-mp/src/message-stack.cpp
--- inkscape-0.45.1/src/message-stack.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/message-stack.cpp	2007-11-08 20:31:41.000000000 +0100
@@ -10,6 +10,8 @@
  */
 
 #include <glib/gstrfuncs.h>
+#include <string>
+#include <cstring>
 #include "message-stack.h"
 
 namespace Inkscape {
diff -Naur inkscape-0.45.1/src/node-context.cpp inkscape-0.45.1-mp/src/node-context.cpp
--- inkscape-0.45.1/src/node-context.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/node-context.cpp	2007-11-10 09:53:53.000000000 +0100
@@ -14,6 +14,8 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#include <cstring> 
+#include <string>
 #include <gdk/gdkkeysyms.h>
 #include "macros.h"
 #include <glibmm/i18n.h>
diff -Naur inkscape-0.45.1/src/nodepath.cpp inkscape-0.45.1-mp/src/nodepath.cpp
--- inkscape-0.45.1/src/nodepath.cpp	2007-01-26 03:05:31.000000000 +0100
+++ inkscape-0.45.1-mp/src/nodepath.cpp	2007-11-10 09:54:36.000000000 +0100
@@ -1,5 +1,4 @@
 #define __SP_NODEPATH_C__
-
 /** \file
  * Path handler in node edit mode
  *
@@ -44,6 +43,8 @@
 #include "display/bezier-utils.h"
 #include <vector>
 #include <algorithm>
+#include <string>
+#include <cstring>
 
 class NR::Matrix;
 
diff -Naur inkscape-0.45.1/src/path-chemistry.cpp inkscape-0.45.1-mp/src/path-chemistry.cpp
--- inkscape-0.45.1/src/path-chemistry.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/path-chemistry.cpp	2007-11-10 09:55:07.000000000 +0100
@@ -16,6 +16,8 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+#include <string>
+#include <cstring>
 #include "xml/repr.h"
 #include "svg/svg.h"
 #include "display/curve.h"
diff -Naur inkscape-0.45.1/src/pedro/pedroconfig.cpp inkscape-0.45.1-mp/src/pedro/pedroconfig.cpp
--- inkscape-0.45.1/src/pedro/pedroconfig.cpp	2007-01-16 03:45:45.000000000 +0100
+++ inkscape-0.45.1-mp/src/pedro/pedroconfig.cpp	2007-11-09 00:41:15.000000000 +0100
@@ -49,6 +49,9 @@
 #include "pedrodom.h"
 
 #include <stdio.h>
+#include <cstring>
+#include <string>
+#include <cstdlib>
 
 namespace Pedro
 {
diff -Naur inkscape-0.45.1/src/pedro/pedroxmpp.cpp inkscape-0.45.1-mp/src/pedro/pedroxmpp.cpp
--- inkscape-0.45.1/src/pedro/pedroxmpp.cpp	2007-03-13 19:06:21.000000000 +0100
+++ inkscape-0.45.1-mp/src/pedro/pedroxmpp.cpp	2007-11-10 11:08:42.000000000 +0100
@@ -21,8 +21,8 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-
-#include <stdio.h>
+#include <algorithm>
+#include <cstdio>
 #include <stdarg.h>
 
 #include <sys/stat.h>
diff -Naur inkscape-0.45.1/src/pen-context.cpp inkscape-0.45.1-mp/src/pen-context.cpp
--- inkscape-0.45.1/src/pen-context.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/pen-context.cpp	2007-11-10 09:55:43.000000000 +0100
@@ -16,7 +16,8 @@
  */
 
 #include <gdk/gdkkeysyms.h>
-
+#include <cstring> 
+#include <string>
 #include "pen-context.h"
 #include "sp-namedview.h"
 #include "sp-metrics.h"
diff -Naur inkscape-0.45.1/src/prefix.cpp inkscape-0.45.1-mp/src/prefix.cpp
--- inkscape-0.45.1/src/prefix.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/prefix.cpp	2007-11-10 09:56:12.000000000 +0100
@@ -39,10 +39,10 @@
     #include <glib.h> //for GThreads
 #endif /* BR_THREADS */
 
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
 #include <limits.h>
-#include <string.h>
+#include <cstring>
 #include "prefix.h"
 
 #ifdef __cplusplus
diff -Naur inkscape-0.45.1/src/rect-context.cpp inkscape-0.45.1-mp/src/rect-context.cpp
--- inkscape-0.45.1/src/rect-context.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/rect-context.cpp	2007-11-10 09:56:54.000000000 +0100
@@ -17,6 +17,8 @@
 #include "config.h"
 
 #include <gdk/gdkkeysyms.h>
+#include <string>
+#include <cstring>
 
 #include "macros.h"
 #include "display/sp-canvas.h"
diff -Naur inkscape-0.45.1/src/select-context.cpp inkscape-0.45.1-mp/src/select-context.cpp
--- inkscape-0.45.1/src/select-context.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/select-context.cpp	2007-11-10 09:57:30.000000000 +0100
@@ -16,6 +16,8 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#include <string>
+#include <cstring>
 #include <gdk/gdkkeysyms.h>
 #include "macros.h"
 #include "rubberband.h"
diff -Naur inkscape-0.45.1/src/selection-chemistry.cpp inkscape-0.45.1-mp/src/selection-chemistry.cpp
--- inkscape-0.45.1/src/selection-chemistry.cpp	2007-01-26 21:47:48.000000000 +0100
+++ inkscape-0.45.1-mp/src/selection-chemistry.cpp	2007-11-10 09:58:04.000000000 +0100
@@ -72,6 +72,9 @@
 #include "helper/units.h"
 #include "sp-item.h"
 #include "unit-constants.h"
+#include <string>
+#include <cstring>
+
 using NR::X;
 using NR::Y;
 
diff -Naur inkscape-0.45.1/src/seltrans.cpp inkscape-0.45.1-mp/src/seltrans.cpp
--- inkscape-0.45.1/src/seltrans.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/seltrans.cpp	2007-11-10 09:58:33.000000000 +0100
@@ -44,6 +44,8 @@
 #include "display/sp-ctrlline.h"
 #include "prefs-utils.h"
 #include "xml/repr.h"
+#include <string>
+#include <cstring>
 
 #include "isnan.h" //temp fix.  make sure included last
 
diff -Naur inkscape-0.45.1/src/shortcuts.cpp inkscape-0.45.1-mp/src/shortcuts.cpp
--- inkscape-0.45.1/src/shortcuts.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/shortcuts.cpp	2007-11-10 10:01:09.000000000 +0100
@@ -23,6 +23,8 @@
 #endif
 
 #include <vector>
+#include <string>
+#include <cstring>
 
 #include <gdk/gdkkeys.h>
 #include <gdk/gdkkeysyms.h>
diff -Naur inkscape-0.45.1/src/sp-clippath.cpp inkscape-0.45.1-mp/src/sp-clippath.cpp
--- inkscape-0.45.1/src/sp-clippath.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/sp-clippath.cpp	2007-11-10 10:02:15.000000000 +0100
@@ -13,7 +13,8 @@
  */
 
 
-
+#include <string>
+#include <cstring>
 #include "display/nr-arena.h"
 #include "display/nr-arena-group.h"
 #include "xml/repr.h"
diff -Naur inkscape-0.45.1/src/sp-conn-end.cpp inkscape-0.45.1-mp/src/sp-conn-end.cpp
--- inkscape-0.45.1/src/sp-conn-end.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/sp-conn-end.cpp	2007-11-10 10:15:07.000000000 +0100
@@ -7,7 +7,8 @@
 #include "sp-path.h"
 #include "uri.h"
 #include "document.h"
-
+#include <string>
+#include <cstring>
 
 static void change_endpts(SPCurve *const curve, NR::Point const h2endPt[2]);
 static NR::Point calc_bbox_conn_pt(NR::Rect const &bbox, NR::Point const &p);
diff -Naur inkscape-0.45.1/src/sp-conn-end-pair.cpp inkscape-0.45.1-mp/src/sp-conn-end-pair.cpp
--- inkscape-0.45.1/src/sp-conn-end-pair.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/sp-conn-end-pair.cpp	2007-11-10 10:02:52.000000000 +0100
@@ -10,6 +10,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <string>
+#include <cstring>
 #include "attributes.h"
 #include "sp-conn-end.h"
 #include "uri.h"
diff -Naur inkscape-0.45.1/src/sp-cursor.cpp inkscape-0.45.1-mp/src/sp-cursor.cpp
--- inkscape-0.45.1/src/sp-cursor.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/sp-cursor.cpp	2007-11-10 10:03:20.000000000 +0100
@@ -13,7 +13,8 @@
  */
 
 #include <cstdio>
-#include <string.h>
+#include <cstring>
+#include <string>
 #include <ctype.h>
 #include "sp-cursor.h"
 
diff -Naur inkscape-0.45.1/src/sp-filter.cpp inkscape-0.45.1-mp/src/sp-filter.cpp
--- inkscape-0.45.1/src/sp-filter.cpp	2007-02-28 04:21:17.000000000 +0100
+++ inkscape-0.45.1-mp/src/sp-filter.cpp	2007-11-10 10:03:36.000000000 +0100
@@ -22,6 +22,8 @@
 #include "sp-filter-reference.h"
 #include "uri.h"
 #include "xml/repr.h"
+#include <string>
+#include <cstring>
 
 #define SP_MACROS_SILENT
 #include "macros.h"
diff -Naur inkscape-0.45.1/src/sp-flowtext.cpp inkscape-0.45.1-mp/src/sp-flowtext.cpp
--- inkscape-0.45.1/src/sp-flowtext.cpp	2007-03-11 18:24:00.000000000 +0100
+++ inkscape-0.45.1-mp/src/sp-flowtext.cpp	2007-11-10 10:03:58.000000000 +0100
@@ -31,7 +31,8 @@
 #include "livarot/Shape.h"
 
 #include "display/nr-arena-glyphs.h"
-
+#include <string>
+#include <cstring>
 
 static void sp_flowtext_class_init(SPFlowtextClass *klass);
 static void sp_flowtext_init(SPFlowtext *group);
diff -Naur inkscape-0.45.1/src/sp-gradient.cpp inkscape-0.45.1-mp/src/sp-gradient.cpp
--- inkscape-0.45.1/src/sp-gradient.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/sp-gradient.cpp	2007-11-10 10:04:25.000000000 +0100
@@ -18,7 +18,8 @@
 
 #define noSP_GRADIENT_VERBOSE
 
-
+#include <string>
+#include <cstring>
 #include <libnr/nr-matrix-div.h>
 #include <libnr/nr-matrix-fns.h>
 #include <libnr/nr-matrix-ops.h>
diff -Naur inkscape-0.45.1/src/sp-guide.cpp inkscape-0.45.1-mp/src/sp-guide.cpp
--- inkscape-0.45.1/src/sp-guide.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/sp-guide.cpp	2007-11-10 11:05:29.000000000 +0100
@@ -16,6 +16,8 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#include <algorithm>
 #include "display/guideline.h"
 #include "svg/svg.h"
 #include "attributes.h"
@@ -26,6 +28,9 @@
 #include <glibmm/i18n.h>
 #include <xml/repr.h>
 #include <remove-last.h>
+#include <string>
+#include <cstring>
+
 using std::vector;
 
 enum {
diff -Naur inkscape-0.45.1/src/sp-image.cpp inkscape-0.45.1-mp/src/sp-image.cpp
--- inkscape-0.45.1/src/sp-image.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/sp-image.cpp	2007-11-10 10:07:52.000000000 +0100
@@ -26,6 +26,9 @@
 #include "enums.h"
 #include "attributes.h"
 
+#include <string>
+#include <cstring>
+
 #include "print.h"
 #include "brokenimage.xpm"
 #include "document.h"
diff -Naur inkscape-0.45.1/src/spiral-context.cpp inkscape-0.45.1-mp/src/spiral-context.cpp
--- inkscape-0.45.1/src/spiral-context.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/spiral-context.cpp	2007-11-10 10:08:08.000000000 +0100
@@ -39,6 +39,8 @@
 #include "xml/node-event-vector.h"
 #include "prefs-utils.h"
 #include "context-fns.h"
+#include <string>
+#include <cstring>
 
 static void sp_spiral_context_class_init(SPSpiralContextClass * klass);
 static void sp_spiral_context_init(SPSpiralContext *spiral_context);
diff -Naur inkscape-0.45.1/src/sp-item-group.cpp inkscape-0.45.1-mp/src/sp-item-group.cpp
--- inkscape-0.45.1/src/sp-item-group.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/sp-item-group.cpp	2007-11-10 10:08:28.000000000 +0100
@@ -18,6 +18,8 @@
 # include "config.h"
 #endif
 
+#include <string>
+#include <cstring>
 #include <glibmm/i18n.h>
 
 #include "display/nr-arena-group.h"
diff -Naur inkscape-0.45.1/src/sp-item-rm-unsatisfied-cns.cpp inkscape-0.45.1-mp/src/sp-item-rm-unsatisfied-cns.cpp
--- inkscape-0.45.1/src/sp-item-rm-unsatisfied-cns.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/sp-item-rm-unsatisfied-cns.cpp	2007-11-10 11:06:18.000000000 +0100
@@ -4,6 +4,8 @@
 #include <sp-guide.h>
 #include <sp-guide-constraint.h>
 #include <sp-item.h>
+#include <algorithm>
+
 using std::vector;
 
 void sp_item_rm_unsatisfied_cns(SPItem &item)
diff -Naur inkscape-0.45.1/src/splivarot.cpp inkscape-0.45.1-mp/src/splivarot.cpp
--- inkscape-0.45.1/src/splivarot.cpp	2007-03-13 22:41:04.000000000 +0100
+++ inkscape-0.45.1-mp/src/splivarot.cpp	2007-11-10 10:08:53.000000000 +0100
@@ -17,6 +17,8 @@
 # include <config.h>
 #endif
 
+#include <string>
+#include <cstring>
 #include <vector>
 #include <glib/gmem.h>
 #include "xml/repr.h"
diff -Naur inkscape-0.45.1/src/sp-mask.cpp inkscape-0.45.1-mp/src/sp-mask.cpp
--- inkscape-0.45.1/src/sp-mask.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/sp-mask.cpp	2007-11-10 10:09:06.000000000 +0100
@@ -15,6 +15,8 @@
 #include "display/nr-arena.h"
 #include "display/nr-arena-group.h"
 #include <xml/repr.h>
+#include <string>
+#include <cstring>
 
 #include "enums.h"
 #include "attributes.h"
diff -Naur inkscape-0.45.1/src/sp-namedview.cpp inkscape-0.45.1-mp/src/sp-namedview.cpp
--- inkscape-0.45.1/src/sp-namedview.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/sp-namedview.cpp	2007-11-10 10:09:26.000000000 +0100
@@ -14,6 +14,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <string>
+#include <cstring>
 #include "config.h"
 
 #include "display/canvas-grid.h"
diff -Naur inkscape-0.45.1/src/sp-object.cpp inkscape-0.45.1-mp/src/sp-object.cpp
--- inkscape-0.45.1/src/sp-object.cpp	2007-02-20 05:03:45.000000000 +0100
+++ inkscape-0.45.1-mp/src/sp-object.cpp	2007-11-10 10:09:56.000000000 +0100
@@ -31,7 +31,8 @@
  * dictionary and so on. Source: doc/architecture.txt
  */
 
-
+#include <string>
+#include <cstring>
 #include "helper/sp-marshal.h"
 #include "xml/node-event-vector.h"
 #include "attributes.h"
diff -Naur inkscape-0.45.1/src/sp-offset.cpp inkscape-0.45.1-mp/src/sp-offset.cpp
--- inkscape-0.45.1/src/sp-offset.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/sp-offset.cpp	2007-11-10 10:10:14.000000000 +0100
@@ -19,7 +19,8 @@
 # include "config.h"
 #endif
 
-
+#include <string>
+#include <cstring>
 #include "svg/svg.h"
 #include "attributes.h"
 #include "display/curve.h"
diff -Naur inkscape-0.45.1/src/sp-pattern.cpp inkscape-0.45.1-mp/src/sp-pattern.cpp
--- inkscape-0.45.1/src/sp-pattern.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/sp-pattern.cpp	2007-11-10 10:10:35.000000000 +0100
@@ -14,6 +14,8 @@
 
 #include "config.h"
 
+#include <string>
+#include <cstring>
 #include <libnr/nr-matrix-ops.h>
 #include "libnr/nr-matrix-fns.h"
 #include <libnr/nr-translate-matrix-ops.h>
diff -Naur inkscape-0.45.1/src/sp-root.cpp inkscape-0.45.1-mp/src/sp-root.cpp
--- inkscape-0.45.1/src/sp-root.cpp	2007-02-20 05:03:45.000000000 +0100
+++ inkscape-0.45.1-mp/src/sp-root.cpp	2007-11-10 10:10:57.000000000 +0100
@@ -14,6 +14,8 @@
  */
 
 #include "config.h"
+#include <string>
+#include <cstring>
 
 #include "svg/svg.h"
 #include "display/nr-arena-group.h"
diff -Naur inkscape-0.45.1/src/sp-star.cpp inkscape-0.45.1-mp/src/sp-star.cpp
--- inkscape-0.45.1/src/sp-star.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/sp-star.cpp	2007-11-10 10:11:10.000000000 +0100
@@ -17,6 +17,8 @@
 #include "config.h"
 
 #include <glibmm/i18n.h>
+#include <string>
+#include <cstring>
 
 #include "svg/svg.h"
 #include "attributes.h"
diff -Naur inkscape-0.45.1/src/sp-symbol.cpp inkscape-0.45.1-mp/src/sp-symbol.cpp
--- inkscape-0.45.1/src/sp-symbol.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/sp-symbol.cpp	2007-11-08 22:52:01.000000000 +0100
@@ -12,6 +12,8 @@
  */
 
 #include "config.h"
+#include <cstring>
+#include <string>
 
 #include "libnr/nr-matrix-fns.h"
 #include "libnr/nr-matrix-ops.h"
diff -Naur inkscape-0.45.1/src/sp-tspan.cpp inkscape-0.45.1-mp/src/sp-tspan.cpp
--- inkscape-0.45.1/src/sp-tspan.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/sp-tspan.cpp	2007-11-08 23:06:15.000000000 +0100
@@ -37,7 +37,8 @@
 #include "style.h"
 #include "libnr/nr-matrix-fns.h"
 #include "xml/repr.h"
-
+#include <cstring>
+#include <string>
 
 /*#####################################################
 #  SPTSPAN
diff -Naur inkscape-0.45.1/src/sp-use.cpp inkscape-0.45.1-mp/src/sp-use.cpp
--- inkscape-0.45.1/src/sp-use.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/sp-use.cpp	2007-11-10 10:11:59.000000000 +0100
@@ -33,6 +33,8 @@
 #include "sp-symbol.h"
 #include "sp-use.h"
 #include "sp-use-reference.h"
+#include <string>
+#include <cstring>
 
 /* fixme: */
 
diff -Naur inkscape-0.45.1/src/sp-use-reference.cpp inkscape-0.45.1-mp/src/sp-use-reference.cpp
--- inkscape-0.45.1/src/sp-use-reference.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/sp-use-reference.cpp	2007-11-08 23:17:35.000000000 +0100
@@ -7,6 +7,9 @@
  * Released under GNU GPL, read the file 'COPYING' for more information.
  */
 
+#include <cstring>
+#include <string>
+
 #include "enums.h"
 #include "sp-use-reference.h"
 
diff -Naur inkscape-0.45.1/src/star-context.cpp inkscape-0.45.1-mp/src/star-context.cpp
--- inkscape-0.45.1/src/star-context.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/star-context.cpp	2007-11-10 10:12:30.000000000 +0100
@@ -38,6 +38,8 @@
 #include "xml/node-event-vector.h"
 #include "object-edit.h"
 #include "context-fns.h"
+#include <string>
+#include <cstring>
 
 #include "star-context.h"
 
diff -Naur inkscape-0.45.1/src/streams-gzip.cpp inkscape-0.45.1-mp/src/streams-gzip.cpp
--- inkscape-0.45.1/src/streams-gzip.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/streams-gzip.cpp	2007-11-08 23:29:29.000000000 +0100
@@ -10,6 +10,8 @@
  */
 
 #include "streams-gzip.h"
+#include <cstring>
+#include <string>
 
 namespace Inkscape {
 
diff -Naur inkscape-0.45.1/src/streams-zlib.cpp inkscape-0.45.1-mp/src/streams-zlib.cpp
--- inkscape-0.45.1/src/streams-zlib.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/streams-zlib.cpp	2007-11-08 23:40:30.000000000 +0100
@@ -9,6 +9,8 @@
  * Released under GNU LGPL, read the file 'COPYING.LIB' for more information
  */
 
+#include <cstring>
+#include <string>
 #include <vector>
 #include "streams-zlib.h"
 
diff -Naur inkscape-0.45.1/src/streq.h inkscape-0.45.1-mp/src/streq.h
--- inkscape-0.45.1/src/streq.h	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/streq.h	2007-11-10 10:12:59.000000000 +0100
@@ -1,6 +1,7 @@
 #ifndef INKSCAPE_STREQ_H
 #define INKSCAPE_STREQ_H
 
+#include <string>
 #include <cstring>
 
 /** Convenience/readability wrapper for strcmp(a,b)==0. */
diff -Naur inkscape-0.45.1/src/style.cpp inkscape-0.45.1-mp/src/style.cpp
--- inkscape-0.45.1/src/style.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/style.cpp	2007-11-10 10:13:43.000000000 +0100
@@ -40,6 +40,8 @@
 #include "unit-constants.h"
 #include "isnan.h"
 
+#include <string>
+#include <cstring>
 #include <sigc++/functors/ptr_fun.h>
 #include <sigc++/adaptors/bind.h>
 
diff -Naur inkscape-0.45.1/src/svg/gnome-canvas-bpath-util.cpp inkscape-0.45.1-mp/src/svg/gnome-canvas-bpath-util.cpp
--- inkscape-0.45.1/src/svg/gnome-canvas-bpath-util.cpp	2007-01-16 03:45:33.000000000 +0100
+++ inkscape-0.45.1-mp/src/svg/gnome-canvas-bpath-util.cpp	2007-11-10 05:56:52.000000000 +0100
@@ -10,6 +10,10 @@
  *          Raph Levien <raph@acm.org>
  */
 
+#include <cstring>
+#include <string>
+#include <cstdlib>
+#include <cstdio>
 #include <glib/gmem.h>
 #include <glib/gmessages.h>
 
diff -Naur inkscape-0.45.1/src/svg/itos.cpp inkscape-0.45.1-mp/src/svg/itos.cpp
--- inkscape-0.45.1/src/svg/itos.cpp	2007-01-16 03:45:33.000000000 +0100
+++ inkscape-0.45.1-mp/src/svg/itos.cpp	2007-11-10 05:57:14.000000000 +0100
@@ -15,6 +15,7 @@
 
 // Standard include files
 #include <string>		// for string
+#include <cstring>
 
 using namespace std;
 
diff -Naur inkscape-0.45.1/src/svg/strip-trailing-zeros.cpp inkscape-0.45.1-mp/src/svg/strip-trailing-zeros.cpp
--- inkscape-0.45.1/src/svg/strip-trailing-zeros.cpp	2007-01-16 03:45:33.000000000 +0100
+++ inkscape-0.45.1-mp/src/svg/strip-trailing-zeros.cpp	2007-11-10 05:58:08.000000000 +0100
@@ -1,3 +1,5 @@
+#include <cstring>
+#include <string>
 #include "svg/strip-trailing-zeros.h"
 #include <glib/gmessages.h>
 using std::string;
diff -Naur inkscape-0.45.1/src/svg/svg-affine.cpp inkscape-0.45.1-mp/src/svg/svg-affine.cpp
--- inkscape-0.45.1/src/svg/svg-affine.cpp	2007-01-16 03:45:33.000000000 +0100
+++ inkscape-0.45.1-mp/src/svg/svg-affine.cpp	2007-11-10 05:58:51.000000000 +0100
@@ -17,6 +17,10 @@
 # include "config.h"
 #endif
 
+#include <cstring>
+#include <string>
+#include <cstdlib>
+#include <cstdio>
 #include <glib/gstrfuncs.h>
 #include <libnr/nr-matrix-fns.h>
 #include <libnr/nr-matrix-ops.h>
diff -Naur inkscape-0.45.1/src/svg/svg-color.cpp inkscape-0.45.1-mp/src/svg/svg-color.cpp
--- inkscape-0.45.1/src/svg/svg-color.cpp	2007-01-16 03:45:33.000000000 +0100
+++ inkscape-0.45.1-mp/src/svg/svg-color.cpp	2007-11-10 05:59:19.000000000 +0100
@@ -28,6 +28,9 @@
 #include <glib/ghash.h>
 #include <glib/gutils.h>
 #include <cstdio> // sprintf
+#include <cstdlib>
+#include <string>
+#include <cstring>
 #include <errno.h>
 #include "strneq.h"
 using std::sprintf;
diff -Naur inkscape-0.45.1/src/svg/svg.h inkscape-0.45.1-mp/src/svg/svg.h
--- inkscape-0.45.1/src/svg/svg.h	2007-01-16 03:45:33.000000000 +0100
+++ inkscape-0.45.1-mp/src/svg/svg.h	2007-11-08 19:22:10.000000000 +0100
@@ -14,6 +14,9 @@
 #include <glib/gtypes.h>
 #include "svg/svg-length.h"
 #include <vector>
+#include <string>
+#include <cstring>
+
 
 struct NArtBpath;
 struct NRMatrix;
diff -Naur inkscape-0.45.1/src/svg/svg-length.cpp inkscape-0.45.1-mp/src/svg/svg-length.cpp
--- inkscape-0.45.1/src/svg/svg-length.cpp	2007-01-16 03:45:33.000000000 +0100
+++ inkscape-0.45.1-mp/src/svg/svg-length.cpp	2007-11-10 06:00:12.000000000 +0100
@@ -21,6 +21,8 @@
 #include "svg.h"
 #include "stringstream.h"
 #include "../unit-constants.h"
+#include <cstring>
+#include <string>
 
 
 static unsigned sp_svg_length_read_lff(gchar const *str, SVGLength::Unit *unit, float *val, float *computed, char **next);
diff -Naur inkscape-0.45.1/src/svg/svg-path.cpp inkscape-0.45.1-mp/src/svg/svg-path.cpp
--- inkscape-0.45.1/src/svg/svg-path.cpp	2007-01-16 03:45:33.000000000 +0100
+++ inkscape-0.45.1-mp/src/svg/svg-path.cpp	2007-11-10 06:00:30.000000000 +0100
@@ -30,6 +30,8 @@
 #include <glib/gmem.h>
 #include <glib/gmessages.h>
 #include <glib/gstrfuncs.h>
+#include <string>
+#include <cstring>
 
 #include "libnr/n-art-bpath.h"
 #include "gnome-canvas-bpath-util.h"
diff -Naur inkscape-0.45.1/src/text-chemistry.cpp inkscape-0.45.1-mp/src/text-chemistry.cpp
--- inkscape-0.45.1/src/text-chemistry.cpp	2007-01-26 03:05:31.000000000 +0100
+++ inkscape-0.45.1-mp/src/text-chemistry.cpp	2007-11-10 10:14:02.000000000 +0100
@@ -30,6 +30,8 @@
 #include "sp-flowtext.h"
 #include "sp-flowregion.h"
 #include "sp-flowdiv.h"
+#include <string>
+#include <cstring>
 
 
 SPItem *
diff -Naur inkscape-0.45.1/src/text-editing.cpp inkscape-0.45.1-mp/src/text-editing.cpp
--- inkscape-0.45.1/src/text-editing.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/text-editing.cpp	2007-11-10 10:14:14.000000000 +0100
@@ -14,6 +14,8 @@
 # include "config.h"
 #endif
 
+#include <string>
+#include <cstring>
 #include "desktop.h"
 #include "style.h"
 #include "unit-constants.h"
diff -Naur inkscape-0.45.1/src/tools-switch.cpp inkscape-0.45.1-mp/src/tools-switch.cpp
--- inkscape-0.45.1/src/tools-switch.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/tools-switch.cpp	2007-11-08 23:53:11.000000000 +0100
@@ -18,6 +18,8 @@
 #include "desktop.h"
 #include "desktop-handles.h"
 #include <glibmm/i18n.h>
+#include <cstring>
+#include <string>
 
 #include <xml/repr.h>
 
diff -Naur inkscape-0.45.1/src/ui/widget/style-swatch.cpp inkscape-0.45.1-mp/src/ui/widget/style-swatch.cpp
--- inkscape-0.45.1/src/ui/widget/style-swatch.cpp	2007-01-19 04:02:25.000000000 +0100
+++ inkscape-0.45.1-mp/src/ui/widget/style-swatch.cpp	2007-11-09 20:43:15.000000000 +0100
@@ -13,6 +13,9 @@
 # include <config.h>
 #endif
 
+#include <string>
+#include <cstring>
+
 #include "style-swatch.h"
 
 #include "widgets/spw-utilities.h"
diff -Naur inkscape-0.45.1/src/uri-references.cpp inkscape-0.45.1-mp/src/uri-references.cpp
--- inkscape-0.45.1/src/uri-references.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/uri-references.cpp	2007-11-10 10:14:39.000000000 +0100
@@ -12,6 +12,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <string>
+#include <cstring>
 #include "document.h"
 #include "sp-object.h"
 #include "uri.h"
diff -Naur inkscape-0.45.1/src/verbs.cpp inkscape-0.45.1-mp/src/verbs.cpp
--- inkscape-0.45.1/src/verbs.cpp	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/verbs.cpp	2007-11-08 02:32:49.000000000 +0100
@@ -26,6 +26,7 @@
 
 
 #include <gtk/gtkstock.h>
+#include <cstring>
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
diff -Naur inkscape-0.45.1/src/verbs.h inkscape-0.45.1-mp/src/verbs.h
--- inkscape-0.45.1/src/verbs.h	2007-01-16 03:46:08.000000000 +0100
+++ inkscape-0.45.1-mp/src/verbs.h	2007-11-10 10:15:03.000000000 +0100
@@ -20,6 +20,8 @@
 #include "helper/helper-forward.h"
 #include "forward.h"
 #include <glibmm/ustring.h>
+#include <cstring>
+#include <string>
 
 /** \brief This anonymous enum is used to provide a list of the Verbs
            which are defined staticly in the verb files.  There may be
diff -Naur inkscape-0.45.1/src/widgets/dash-selector.cpp inkscape-0.45.1-mp/src/widgets/dash-selector.cpp
--- inkscape-0.45.1/src/widgets/dash-selector.cpp	2007-01-16 03:45:18.000000000 +0100
+++ inkscape-0.45.1-mp/src/widgets/dash-selector.cpp	2007-11-10 06:38:02.000000000 +0100
@@ -20,6 +20,8 @@
 #endif
 #include <libnr/nr-macros.h>
 #include <gtk/gtk.h>
+#include <string>
+#include <cstring>
 
 #include <glibmm/i18n.h>
 #include "../style.h"
diff -Naur inkscape-0.45.1/src/widgets/icon.cpp inkscape-0.45.1-mp/src/widgets/icon.cpp
--- inkscape-0.45.1/src/widgets/icon.cpp	2007-01-16 03:45:18.000000000 +0100
+++ inkscape-0.45.1-mp/src/widgets/icon.cpp	2007-11-10 07:15:24.000000000 +0100
@@ -18,6 +18,7 @@
 
 
 
+#include <cstring> 
 #include <glib/gmem.h>
 #include <gtk/gtkiconfactory.h>
 #include <gtk/gtkstock.h>
diff -Naur inkscape-0.45.1/src/widgets/layer-selector.cpp inkscape-0.45.1-mp/src/widgets/layer-selector.cpp
--- inkscape-0.45.1/src/widgets/layer-selector.cpp	2007-01-16 03:45:18.000000000 +0100
+++ inkscape-0.45.1-mp/src/widgets/layer-selector.cpp	2007-11-10 06:38:19.000000000 +0100
@@ -14,6 +14,8 @@
 #endif
 
 #include <glibmm/i18n.h>
+#include <cstring> 
+#include <string>
 
 #include "desktop-handles.h"
 
diff -Naur inkscape-0.45.1/src/widgets/paint-selector.cpp inkscape-0.45.1-mp/src/widgets/paint-selector.cpp
--- inkscape-0.45.1/src/widgets/paint-selector.cpp	2007-01-16 03:45:18.000000000 +0100
+++ inkscape-0.45.1-mp/src/widgets/paint-selector.cpp	2007-11-10 06:38:36.000000000 +0100
@@ -16,7 +16,8 @@
 #endif
 
 
-
+#include <string>
+#include <cstring>
 #include <gtk/gtkhbox.h>
 #include <gtk/gtkradiobutton.h>
 #include <gtk/gtkframe.h>
diff -Naur inkscape-0.45.1/src/widgets/ruler.cpp inkscape-0.45.1-mp/src/widgets/ruler.cpp
--- inkscape-0.45.1/src/widgets/ruler.cpp	2007-01-16 03:45:18.000000000 +0100
+++ inkscape-0.45.1-mp/src/widgets/ruler.cpp	2007-11-10 07:48:02.000000000 +0100
@@ -15,7 +15,7 @@
 
 #include <cmath>
 #include <cstdio>
-#include <string.h>
+#include <cstring>
 #include "widget-sizes.h"
 #include "ruler.h"
 #include "unit-constants.h"
diff -Naur inkscape-0.45.1/src/widgets/sp-color-notebook.cpp inkscape-0.45.1-mp/src/widgets/sp-color-notebook.cpp
--- inkscape-0.45.1/src/widgets/sp-color-notebook.cpp	2007-01-16 03:45:18.000000000 +0100
+++ inkscape-0.45.1-mp/src/widgets/sp-color-notebook.cpp	2007-11-10 06:39:44.000000000 +0100
@@ -17,8 +17,9 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <string>
+#include <cstdlib>
 #include <gtk/gtk.h>
 #include <glibmm/i18n.h>
 #include "../dialogs/dialog-events.h"
diff -Naur inkscape-0.45.1/src/widgets/sp-color-wheel.cpp inkscape-0.45.1-mp/src/widgets/sp-color-wheel.cpp
--- inkscape-0.45.1/src/widgets/sp-color-wheel.cpp	2007-01-16 03:45:18.000000000 +0100
+++ inkscape-0.45.1-mp/src/widgets/sp-color-wheel.cpp	2007-11-10 07:14:42.000000000 +0100
@@ -14,6 +14,8 @@
  */
 
 #include <gtk/gtksignal.h>
+#include <cstring>
+#include <string>
 #include "sp-color-wheel.h"
 
 #include "libnr/nr-rotate-ops.h"
diff -Naur inkscape-0.45.1/src/widgets/spw-utilities.cpp inkscape-0.45.1-mp/src/widgets/spw-utilities.cpp
--- inkscape-0.45.1/src/widgets/spw-utilities.cpp	2007-01-16 03:45:18.000000000 +0100
+++ inkscape-0.45.1-mp/src/widgets/spw-utilities.cpp	2007-11-10 06:38:52.000000000 +0100
@@ -18,6 +18,8 @@
 
 
 #include <gtk/gtk.h>
+#include <cstring>
+#include <string>
  
 #include "selection.h"
 
diff -Naur inkscape-0.45.1/src/widgets/sp-xmlview-attr-list.cpp inkscape-0.45.1-mp/src/widgets/sp-xmlview-attr-list.cpp
--- inkscape-0.45.1/src/widgets/sp-xmlview-attr-list.cpp	2007-01-16 03:45:18.000000000 +0100
+++ inkscape-0.45.1-mp/src/widgets/sp-xmlview-attr-list.cpp	2007-11-10 07:47:06.000000000 +0100
@@ -14,6 +14,7 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+#include <cstring>
 #include "helper/sp-marshal.h"
 #include <glibmm/i18n.h>
 #include "../xml/node-event-vector.h"
diff -Naur inkscape-0.45.1/src/widgets/sp-xmlview-content.cpp inkscape-0.45.1-mp/src/widgets/sp-xmlview-content.cpp
--- inkscape-0.45.1/src/widgets/sp-xmlview-content.cpp	2007-01-16 03:45:18.000000000 +0100
+++ inkscape-0.45.1-mp/src/widgets/sp-xmlview-content.cpp	2007-11-10 07:48:11.000000000 +0100
@@ -11,7 +11,7 @@
  * Released under the GNU GPL; see COPYING for details
  */
 
-
+#include <cstring>
 #include "xml/node-event-vector.h"
 #include "sp-xmlview-content.h"
 #include "desktop-handles.h"
diff -Naur inkscape-0.45.1/src/widgets/sp-xmlview-tree.cpp inkscape-0.45.1-mp/src/widgets/sp-xmlview-tree.cpp
--- inkscape-0.45.1/src/widgets/sp-xmlview-tree.cpp	2007-01-16 03:45:18.000000000 +0100
+++ inkscape-0.45.1-mp/src/widgets/sp-xmlview-tree.cpp	2007-11-10 06:40:26.000000000 +0100
@@ -13,6 +13,8 @@
 
 #include "../xml/node-event-vector.h"
 #include "sp-xmlview-tree.h"
+#include <string>
+#include <cstring>
 
 struct NodeData {
 	SPXMLViewTree * tree;
diff -Naur inkscape-0.45.1/src/widgets/toolbox.cpp inkscape-0.45.1-mp/src/widgets/toolbox.cpp
--- inkscape-0.45.1/src/widgets/toolbox.cpp	2007-02-20 05:00:01.000000000 +0100
+++ inkscape-0.45.1-mp/src/widgets/toolbox.cpp	2007-11-10 06:39:07.000000000 +0100
@@ -33,6 +33,8 @@
 #include <gtk/gtk.h>
 #include <iostream>
 #include <sstream>
+#include <string>
+#include <cstring>
 
 #include "widgets/button.h"
 #include "widgets/widget-sizes.h"
diff -Naur inkscape-0.45.1/src/xml/composite-node-observer.cpp inkscape-0.45.1-mp/src/xml/composite-node-observer.cpp
--- inkscape-0.45.1/src/xml/composite-node-observer.cpp	2007-01-16 03:45:36.000000000 +0100
+++ inkscape-0.45.1-mp/src/xml/composite-node-observer.cpp	2007-11-10 08:25:00.000000000 +0100
@@ -12,6 +12,7 @@
  *
  */
 
+#include <cstring>
 #include "algorithms/find-if-before.h"
 #include "xml/composite-node-observer.h"
 #include "xml/node-event-vector.h"
diff -Naur inkscape-0.45.1/src/xml/croco-node-iface.cpp inkscape-0.45.1-mp/src/xml/croco-node-iface.cpp
--- inkscape-0.45.1/src/xml/croco-node-iface.cpp	2007-01-16 03:45:36.000000000 +0100
+++ inkscape-0.45.1-mp/src/xml/croco-node-iface.cpp	2007-11-10 09:06:02.000000000 +0100
@@ -1,6 +1,8 @@
 #include "xml/croco-node-iface.h"
 #include "xml/node.h"
 #include <glib/gstrfuncs.h>
+#include <string>
+#include <cstring>
 
 static char const *
 local_part(char const *const qname)
diff -Naur inkscape-0.45.1/src/xml/node-fns.cpp inkscape-0.45.1-mp/src/xml/node-fns.cpp
--- inkscape-0.45.1/src/xml/node-fns.cpp	2007-01-16 03:45:36.000000000 +0100
+++ inkscape-0.45.1-mp/src/xml/node-fns.cpp	2007-11-10 08:27:13.000000000 +0100
@@ -3,7 +3,8 @@
 #endif
 
 #include <map>
-
+#include <cstring>
+#include <string>
 #include "xml/node-iterators.h"
 #include "algorithms/find-if-before.h"
 
diff -Naur inkscape-0.45.1/src/xml/quote.cpp inkscape-0.45.1-mp/src/xml/quote.cpp
--- inkscape-0.45.1/src/xml/quote.cpp	2007-01-16 03:45:36.000000000 +0100
+++ inkscape-0.45.1-mp/src/xml/quote.cpp	2007-11-10 08:27:27.000000000 +0100
@@ -11,7 +11,7 @@
  * of the GNU General Public License: see the file `COPYING'.
  */
 
-#include <string.h>
+#include <cstring>
 #include <glib/gmem.h>
 
 
diff -Naur inkscape-0.45.1/src/xml/quote-test.cpp inkscape-0.45.1-mp/src/xml/quote-test.cpp
--- inkscape-0.45.1/src/xml/quote-test.cpp	2007-01-16 03:45:36.000000000 +0100
+++ inkscape-0.45.1-mp/src/xml/quote-test.cpp	2007-11-10 08:27:49.000000000 +0100
@@ -1,6 +1,7 @@
 /* Initial author: Peter Moulder.
    Hereby released into the Public Domain. */
 
+#include <cstring>
 #include <functional>
 #include "utest/test-1ary-cases.h"
 
diff -Naur inkscape-0.45.1/src/xml/repr-action-test.cpp inkscape-0.45.1-mp/src/xml/repr-action-test.cpp
--- inkscape-0.45.1/src/xml/repr-action-test.cpp	2007-01-16 03:45:36.000000000 +0100
+++ inkscape-0.45.1-mp/src/xml/repr-action-test.cpp	2007-11-10 08:28:14.000000000 +0100
@@ -1,4 +1,4 @@
-#include <stdlib.h>
+#include <cstdlib>
 #include <glib.h>
 #include "../utest/utest.h"
 
diff -Naur inkscape-0.45.1/src/xml/repr.cpp inkscape-0.45.1-mp/src/xml/repr.cpp
--- inkscape-0.45.1/src/xml/repr.cpp	2007-01-16 03:45:36.000000000 +0100
+++ inkscape-0.45.1-mp/src/xml/repr.cpp	2007-11-10 08:28:38.000000000 +0100
@@ -22,6 +22,7 @@
 # include "config.h"
 #endif
 
+#include <cstring>
 #include "xml/repr.h"
 #include "xml/text-node.h"
 #include "xml/element-node.h"
diff -Naur inkscape-0.45.1/src/xml/repr-css.cpp inkscape-0.45.1-mp/src/xml/repr-css.cpp
--- inkscape-0.45.1/src/xml/repr-css.cpp	2007-03-13 19:06:21.000000000 +0100
+++ inkscape-0.45.1-mp/src/xml/repr-css.cpp	2007-11-10 08:29:02.000000000 +0100
@@ -6,7 +6,7 @@
 
 
 #include <glibmm/ustring.h>
-
+#include <cstring>
 #include "xml/repr.h"
 #include "xml/simple-node.h"
 
diff -Naur inkscape-0.45.1/src/xml/repr-io.cpp inkscape-0.45.1-mp/src/xml/repr-io.cpp
--- inkscape-0.45.1/src/xml/repr-io.cpp	2007-01-16 03:45:36.000000000 +0100
+++ inkscape-0.45.1-mp/src/xml/repr-io.cpp	2007-11-10 08:29:40.000000000 +0100
@@ -17,6 +17,8 @@
 #endif
 
 #include <stdexcept>
+#include <string>
+#include <cstring>
 
 #include "xml/repr.h"
 #include "xml/attribute-record.h"
diff -Naur inkscape-0.45.1/src/xml/repr-util.cpp inkscape-0.45.1-mp/src/xml/repr-util.cpp
--- inkscape-0.45.1/src/xml/repr-util.cpp	2007-01-16 03:45:36.000000000 +0100
+++ inkscape-0.45.1-mp/src/xml/repr-util.cpp	2007-11-10 08:30:08.000000000 +0100
@@ -20,11 +20,11 @@
 #include <math.h>
 
 #if HAVE_STRING_H
-# include <string.h>
+# include <cstring>
 #endif
 
 #if HAVE_STDLIB_H
-# include <stdlib.h>
+# include <cstdlib>
 #endif
 
 
diff -Naur inkscape-0.45.1/src/xml/simple-node.cpp inkscape-0.45.1-mp/src/xml/simple-node.cpp
--- inkscape-0.45.1/src/xml/simple-node.cpp	2007-01-16 03:45:36.000000000 +0100
+++ inkscape-0.45.1-mp/src/xml/simple-node.cpp	2007-11-10 08:31:03.000000000 +0100
@@ -15,6 +15,8 @@
  *
  */
 
+#include <cstring>
+#include <string>
 #include <glib/gstrfuncs.h>
 #include "xml/simple-node.h"
 #include "xml/node-event-vector.h"
Index: src/remove-last.h
===================================================================
--- inkscape-0.45.1/src/remove-last.h	(Revision 14522)
+++ inkscape-0.45.1/src/remove-last.h	(Revision 14523)
@@ -1,6 +1,7 @@
 #ifndef __REMOVE_LAST_H__
 #define __REMOVE_LAST_H__
 
+#include <algorithm>
 #include <vector>
 #include <glib.h>
 
Index: src/libnrtype/Layout-TNG.h
===================================================================
--- inkscape-0.45.1/src/libnrtype/Layout-TNG.h	(Revision 14522)
+++ inkscape-0.45.1/src/libnrtype/Layout-TNG.h	(Revision 14523)
@@ -17,6 +17,7 @@
 #include "libnr/nr-rotate-ops.h"
 #include <glibmm/ustring.h>
 #include <pango/pango-break.h>
+#include <algorithm>
 #include <vector>
 
 #ifdef HAVE_CAIRO_PDF
Index: src/composite-undo-stack-observer.cpp
===================================================================
--- inkscape-0.45.1/src/composite-undo-stack-observer.cpp	(Revision 14522)
+++ inkscape-0.45.1/src/composite-undo-stack-observer.cpp	(Revision 14523)
@@ -11,6 +11,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <algorithm>
 
 #include "composite-undo-stack-observer.h"
 #include "xml/event.h"
Index: src/svg/itos.cpp
===================================================================
--- inkscape-0.45.1/src/svg/itos.cpp	(Revision 14522)
+++ inkscape-0.45.1/src/svg/itos.cpp	(Revision 14523)
@@ -14,6 +14,7 @@
 /////////////////////////////////////////////////////////////////////////
 
 // Standard include files
+#include <algorithm>
 #include <string>		// for string
 
 using namespace std;
Index: src/debug/demangle.cpp
===================================================================
--- inkscape-0.45.1/src/debug/demangle.cpp	(Revision 14522)
+++ inkscape-0.45.1/src/debug/demangle.cpp	(Revision 14523)
@@ -40,8 +40,8 @@
 }
 
 struct string_less_than {
-    bool operator()(char const *a, char const *b) {
+    bool operator()(char const *a, char const *b) const {
         return ( strcmp(a, b) < 0 );
     }
 };

Index: sp-item-update-cns.cpp
===================================================================
--- inkscape-0.45.1/src/sp-item-update-cns.cpp	(Revision 14522)
+++ inkscape-0.45.1/src/sp-item-update-cns.cpp	(Revision 14523)
@@ -3,6 +3,7 @@
 #include "sp-guide-constraint.h"
 #include <sp-guide.h>
 #include <sp-item.h>
+#include <algorithm>
 using std::find;
 using std::vector;
 
Index: makepath.cpp
===================================================================
--- inkscape-0.45.1/src/libavoid/makepath.cpp	(Revision 14522)
+++ inkscape-0.45.1/src/libavoid/makepath.cpp	(Revision 14523)
@@ -31,7 +31,9 @@
 #include "libavoid/connector.h"
 #include "libavoid/graph.h"
 #include "libavoid/router.h"
+#include <algorithm>
 #include <vector>
+#include <limits.h>
 #include <math.h>
 
 namespace Avoid {