Applying fixes for gcc 4.3 build issues (closes LP: #169115)

(bzr r4629)

123 files changed, 334 insertions, 81 deletions

diff --git a/src/color-profile.cpp b/src/color-profile.cpp
index a95039928..ecc0bcd4e 100644
--- a/src/color-profile.cpp
+++ b/src/color-profile.cpp
@@ -10,6 +10,8 @@
 #include <gtk/gtkmessagedialog.h>
 #endif // DEBUG_LCMS
 
+#include <cstring>
+#include <string>
 #include "xml/repr.h"
 #include "color-profile.h"
 #include "color-profile-fns.h"
diff --git a/src/conn-avoid-ref.cpp b/src/conn-avoid-ref.cpp
index 0bbefa3c0..997e316b5 100644
--- a/src/conn-avoid-ref.cpp
+++ b/src/conn-avoid-ref.cpp
@@ -10,6 +10,8 @@
  */
 
 
+#include <cstring>
+#include <string>
 
 #include "sp-item.h"
 #include "conn-avoid-ref.h"
diff --git a/src/connector-context.cpp b/src/connector-context.cpp
index 3e04883b7..6da465f2a 100644
--- a/src/connector-context.cpp
+++ b/src/connector-context.cpp
@@ -42,6 +42,8 @@
  */
 
 #include <gdk/gdkkeysyms.h>
+#include <string>
+#include <cstring>
 
 #include "connector-context.h"
 #include "pixmaps/cursor-connector.xpm"
diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp
index fe388ded3..7ff2be2c8 100644
--- a/src/desktop-style.cpp
+++ b/src/desktop-style.cpp
@@ -12,6 +12,9 @@
  * 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 --git a/src/dialogs/object-attributes.cpp b/src/dialogs/object-attributes.cpp
index f23e986b1..475e8dce6 100644
--- a/src/dialogs/object-attributes.cpp
+++ b/src/dialogs/object-attributes.cpp
@@ -16,8 +16,9 @@
 # include "config.h"
 #endif
 
-#include <string.h>
 #include <glibmm/i18n.h>
+#include <string>
+#include <cstring>
 
 #include "helper/window.h"
 #include "macros.h"
diff --git a/src/dir-util.cpp b/src/dir-util.cpp
index b2a7c97f6..7cc69f89d 100644
--- a/src/dir-util.cpp
+++ b/src/dir-util.cpp
@@ -3,7 +3,8 @@
 #define DIR_UTIL_C
 
 #include <errno.h>
-#include <string.h>
+#include <string>
+#include <cstring>
 #include <glib/gutils.h>
 #include <glib/gmem.h>
 #include <glib/gerror.h>
diff --git a/src/display/canvas-grid.h b/src/display/canvas-grid.h
index c201fa7df..8ae26d4c4 100644
--- a/src/display/canvas-grid.h
+++ b/src/display/canvas-grid.h
@@ -11,21 +11,20 @@
  *
  */
 
-#include <display/sp-canvas.h>
-#include "xml/repr.h"
-#include <gtkmm/box.h>
-
+#include <cstring>
+#include <string>
 
+#include <gtkmm/box.h>
 #include <gtkmm.h>
+
+#include "display/sp-canvas.h"
+#include "xml/repr.h"
 #include "ui/widget/color-picker.h"
 #include "ui/widget/scalar-unit.h"
-
 #include "ui/widget/registered-widget.h"
 #include "ui/widget/registry.h"
 #include "ui/widget/tolerance-slider.h"
-
 #include "xml/node-event-vector.h"
-
 #include "snapper.h"
 #include "line-snapper.h"
 
diff --git a/src/display/curve.cpp b/src/display/curve.cpp
index 01148c44c..9b59a3c45 100644
--- a/src/display/curve.cpp
+++ b/src/display/curve.cpp
@@ -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 --git a/src/display/nr-arena-item.cpp b/src/display/nr-arena-item.cpp
index c78a0eca5..95b0c0eae 100644
--- a/src/display/nr-arena-item.cpp
+++ b/src/display/nr-arena-item.cpp
@@ -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 --git a/src/display/nr-filter-gaussian.cpp b/src/display/nr-filter-gaussian.cpp
index a3fa37bd7..b4d1fb00d 100644
--- a/src/display/nr-filter-gaussian.cpp
+++ b/src/display/nr-filter-gaussian.cpp
@@ -17,6 +17,7 @@
 #include <cmath>
 #include <complex>
 #include <glib.h>
+#include <cstdlib>
 #include <limits>
 
 #include "isnan.h"
diff --git a/src/display/nr-filter.cpp b/src/display/nr-filter.cpp
index 84e8180bc..6027b5f27 100644
--- a/src/display/nr-filter.cpp
+++ b/src/display/nr-filter.cpp
@@ -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 --git a/src/document-undo.cpp b/src/document-undo.cpp
index 7df4943b7..ae1c82e71 100644
--- a/src/document-undo.cpp
+++ b/src/document-undo.cpp
@@ -58,6 +58,8 @@
 #if HAVE_STDLIB_H
 #endif
 
+#include <string>
+#include <cstring>
 #include "xml/repr.h"
 #include "document-private.h"
 #include "inkscape.h"
diff --git a/src/document.cpp b/src/document.cpp
index bb63db52b..fb160fd9e 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -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 --git a/src/dyna-draw-context.cpp b/src/dyna-draw-context.cpp
index 7a229883e..666ea4d2d 100644
--- a/src/dyna-draw-context.cpp
+++ b/src/dyna-draw-context.cpp
@@ -28,7 +28,8 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
-
+#include <string>
+#include <cstring>
 #include <numeric>
 
 #include "svg/svg.h"
diff --git a/src/event-context.cpp b/src/event-context.cpp
index 146237346..f482c99fb 100644
--- a/src/event-context.cpp
+++ b/src/event-context.cpp
@@ -32,6 +32,8 @@
 #include <gtk/gtkmain.h>
 #include <gtk/gtkmenu.h>
 #include <glibmm/i18n.h>
+#include <cstring>
+#include <string>
 
 #include "display/sp-canvas.h"
 #include "xml/node-event-vector.h"
diff --git a/src/gc.cpp b/src/gc.cpp
index 248a324bd..8a55a3b15 100644
--- a/src/gc.cpp
+++ b/src/gc.cpp
@@ -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 --git a/src/gradient-drag.cpp b/src/gradient-drag.cpp
index 11cc3cf3b..a557209ea 100644
--- a/src/gradient-drag.cpp
+++ b/src/gradient-drag.cpp
@@ -18,6 +18,8 @@
 #endif
 
 #include <glibmm/i18n.h>
+#include <cstring>
+#include <string>
 
 #include "desktop-handles.h"
 #include "selection.h"
diff --git a/src/graphlayout/graphlayout.cpp b/src/graphlayout/graphlayout.cpp
index ffab82362..9285e9618 100644
--- a/src/graphlayout/graphlayout.cpp
+++ b/src/graphlayout/graphlayout.cpp
@@ -14,6 +14,8 @@
 #include <map>
 #include <vector>
 #include <algorithm>
+#include <cstring>
+#include <cstdlib>
 #include <float.h>
 
 #include "desktop.h"
diff --git a/src/inkjar/jar.cpp b/src/inkjar/jar.cpp
index 655f11cbb..d78fcf0cd 100644
--- a/src/inkjar/jar.cpp
+++ b/src/inkjar/jar.cpp
@@ -42,7 +42,9 @@
 #include <fcntl.h>
 //#endif
 
-
+#include <cstring>
+#include <string>
+#include <cstdlib>
 #include <glib.h>
 
 #include "jar.h"
diff --git a/src/inkscape.cpp b/src/inkscape.cpp
index cd176c0cf..388b8fb1f 100644
--- a/src/inkscape.cpp
+++ b/src/inkscape.cpp
@@ -43,6 +43,8 @@ using Inkscape::Extension::Internal::PrintWin32;
 #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 --git a/src/io/gzipstream.cpp b/src/io/gzipstream.cpp
index 02309ecdd..f19fd327d 100644
--- a/src/io/gzipstream.cpp
+++ b/src/io/gzipstream.cpp
@@ -14,7 +14,8 @@
  */
 
 #include "gzipstream.h"
-
+#include <cstring>
+#include <string>
 
 namespace Inkscape
 {
diff --git a/src/io/simple-sax.cpp b/src/io/simple-sax.cpp
index 2ba103cd3..d8733858b 100644
--- a/src/io/simple-sax.cpp
+++ b/src/io/simple-sax.cpp
@@ -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 --git a/src/io/uristream.cpp b/src/io/uristream.cpp
index 9787620db..f529c7f8b 100644
--- a/src/io/uristream.cpp
+++ b/src/io/uristream.cpp
@@ -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 --git a/src/libavoid/connector.cpp b/src/libavoid/connector.cpp
index 3526b3f15..647303371 100644
--- a/src/libavoid/connector.cpp
+++ b/src/libavoid/connector.cpp
@@ -17,9 +17,10 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
+ *
 */
 
+#include <cstdlib>
 #include "libavoid/graph.h"
 #include "libavoid/connector.h"
 #include "libavoid/makepath.h"
@@ -30,7 +31,6 @@
 
 namespace Avoid {
 
-    
 ConnRef::ConnRef(Router *router, const unsigned int id)
     : _router(router)
     , _id(id)
diff --git a/src/libavoid/makepath.cpp b/src/libavoid/makepath.cpp
index 9a4f7beaa..56d3a257e 100644
--- a/src/libavoid/makepath.cpp
+++ b/src/libavoid/makepath.cpp
@@ -33,6 +33,7 @@
 #include "libavoid/router.h"
 #include <algorithm>
 #include <vector>
+#include <climits>
 #include <limits.h>
 #include <math.h>
 
diff --git a/src/libavoid/router.cpp b/src/libavoid/router.cpp
index 4b1652ca0..df0bacd02 100644
--- a/src/libavoid/router.cpp
+++ b/src/libavoid/router.cpp
@@ -17,9 +17,10 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
+ *
 */
 
+#include <cstdlib>
 #include "libavoid/shape.h"
 #include "libavoid/router.h"
 #include "libavoid/visibility.h"
@@ -636,7 +637,7 @@ void Router::markConnectors(ShapeRef *shape)
                 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 --git a/src/libavoid/visibility.cpp b/src/libavoid/visibility.cpp
index 58df94d92..d2b057643 100644
--- a/src/libavoid/visibility.cpp
+++ b/src/libavoid/visibility.cpp
@@ -20,7 +20,6 @@
  *
 */
 
-
 #include <algorithm>
 #include <cfloat>
 
diff --git a/src/libcola/straightener.cpp b/src/libcola/straightener.cpp
index 6b062eb32..e237c03c3 100644
--- a/src/libcola/straightener.cpp
+++ b/src/libcola/straightener.cpp
@@ -1,5 +1,5 @@
 /*
-** vim: set cindent 
+** vim: set cindent
 ** vim: ts=4 sw=4 et tw=0 wm=0
 */
 /**
@@ -20,6 +20,7 @@
 #include "straightener.h"
 #include <iostream>
 #include <cmath>
+#include <cstdlib>
 
 using std::set;
 using std::vector;
diff --git a/src/libnr/n-art-bpath.h b/src/libnr/n-art-bpath.h
index 0f0f690fc..fdb9855be 100644
--- a/src/libnr/n-art-bpath.h
+++ b/src/libnr/n-art-bpath.h
@@ -9,6 +9,7 @@
 
 #include "libnr/nr-point.h"
 #include "libnr/nr-path-code.h"
+#include <cstdlib>
 
 /**
  * Old-style path segment.
@@ -31,7 +32,7 @@ public:
             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();
         }
     }
 
@@ -43,7 +44,7 @@ public:
             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 --git a/src/libnr/nr-matrix.cpp b/src/libnr/nr-matrix.cpp
index 12a2f2fcb..db01b966e 100644
--- a/src/libnr/nr-matrix.cpp
+++ b/src/libnr/nr-matrix.cpp
@@ -11,6 +11,7 @@
  * This code is in public domain
  */
 
+#include <cstdlib>
 #include "nr-matrix.h"
 
 
@@ -605,7 +606,7 @@ void assert_close(Matrix const &a, Matrix const &b)
                 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 --git a/src/libnr/nr-pixblock.cpp b/src/libnr/nr-pixblock.cpp
index 2f103d7d1..8d2e930ef 100644
--- a/src/libnr/nr-pixblock.cpp
+++ b/src/libnr/nr-pixblock.cpp
@@ -9,6 +9,9 @@
  * This code is in the Public Domain
  */
 
+#include <cstring>
+#include <string>
+#include <string.h>
 #include <glib/gmem.h>
 #include "nr-pixblock.h"
 
diff --git a/src/libvpsc/csolve_VPSC.cpp b/src/libvpsc/csolve_VPSC.cpp
index bd7db5ab2..5176242d5 100644
--- a/src/libvpsc/csolve_VPSC.cpp
+++ b/src/libvpsc/csolve_VPSC.cpp
@@ -10,6 +10,7 @@
  */
 #include <iostream>
 #include <cassert>
+#include <cstdlib>
 #include "variable.h"
 #include "constraint.h"
 #include "generate-constraints.h"
diff --git a/src/libvpsc/generate-constraints.cpp b/src/libvpsc/generate-constraints.cpp
index 3b69e7968..3574a2743 100644
--- a/src/libvpsc/generate-constraints.cpp
+++ b/src/libvpsc/generate-constraints.cpp
@@ -12,6 +12,7 @@
 
 #include <set>
 #include <cassert>
+#include <cstdlib>
 #include "generate-constraints.h"
 #include "constraint.h"
 
diff --git a/src/livarot/BitLigne.cpp b/src/livarot/BitLigne.cpp
index d6196d29e..c4c134615 100644
--- a/src/livarot/BitLigne.cpp
+++ b/src/livarot/BitLigne.cpp
@@ -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 --git a/src/livarot/PathCutting.cpp b/src/livarot/PathCutting.cpp
index 276c9b260..7bc1114a3 100644
--- a/src/livarot/PathCutting.cpp
+++ b/src/livarot/PathCutting.cpp
@@ -13,6 +13,10 @@
  *  Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <cstring>
+#include <string>
+#include <cstdio>
+
 #include "Path.h"
 #include "style.h"
 #include "livarot/path-description.h"
@@ -25,11 +29,11 @@ void  Path::DashPolyline(float head,float tail,float body,int nbD,float *dashs,b
 
   std::vector<path_lineto> orig_pts = pts;
   pts.clear();
-  
+
   int       lastMI=-1;
   int curP = 0;
   int lastMP = -1;
-  
+
   for (int i = 0; i < int(orig_pts.size()); i++) {
     if ( orig_pts[curP].isMoveTo == polyline_moveto ) {
       if ( lastMI >= 0 && lastMI < i-1 ) { // au moins 2 points
diff --git a/src/livarot/Shape.cpp b/src/livarot/Shape.cpp
index c694cdd27..d03940f2f 100644
--- a/src/livarot/Shape.cpp
+++ b/src/livarot/Shape.cpp
@@ -6,6 +6,8 @@
  *
  */
 
+#include <cstdio>
+#include <cstdlib>
 #include <glib/gmem.h>
 #include "Shape.h"
 #include "livarot/sweep-event-queue.h"
diff --git a/src/livarot/ShapeDraw.cpp b/src/livarot/ShapeDraw.cpp
index 07e46afc7..f3a8dbd1f 100644
--- a/src/livarot/ShapeDraw.cpp
+++ b/src/livarot/ShapeDraw.cpp
@@ -6,6 +6,9 @@
  *
  */
 
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include "Shape.h"
 //#include <ApplicationServices/ApplicationServices.h>
 
diff --git a/src/livarot/ShapeMisc.cpp b/src/livarot/ShapeMisc.cpp
index 12b8d8491..2b398ef7c 100644
--- a/src/livarot/ShapeMisc.cpp
+++ b/src/livarot/ShapeMisc.cpp
@@ -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 --git a/src/livarot/ShapeSweep.cpp b/src/livarot/ShapeSweep.cpp
index 70f33af2c..18f8e3a69 100644
--- a/src/livarot/ShapeSweep.cpp
+++ b/src/livarot/ShapeSweep.cpp
@@ -6,6 +6,9 @@
  *
  */
 
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <glib/gmem.h>
 #include "Shape.h"
 #include "livarot/sweep-event-queue.h"
diff --git a/src/livarot/float-line.cpp b/src/livarot/float-line.cpp
index afa3b6032..959143138 100644
--- a/src/livarot/float-line.cpp
+++ b/src/livarot/float-line.cpp
@@ -2,7 +2,7 @@
  *  \file livarot/float-line.cpp
  *
  * Implementation of coverage with floating-point values.
- * 
+ *
  *  \author Fred
  *
  *  public domain
@@ -14,6 +14,7 @@
 #endif
 #include "livarot/float-line.h"
 #include "livarot/int-line.h"
+#include <cstdio>
 
 FloatLigne::FloatLigne()
 {
@@ -23,7 +24,6 @@ FloatLigne::FloatLigne()
 
 FloatLigne::~FloatLigne()
 {
-    
 }
 
 /// Reset the line to  empty (boundaries and runs).
diff --git a/src/livarot/int-line.cpp b/src/livarot/int-line.cpp
index fabe8d01c..c1e388fe2 100644
--- a/src/livarot/int-line.cpp
+++ b/src/livarot/int-line.cpp
@@ -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 --git a/src/main.cpp b/src/main.cpp
index f5e76a632..4580b7271 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -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 --git a/src/marker.cpp b/src/marker.cpp
index 15b856595..0050fc87c 100644
--- a/src/marker.cpp
+++ b/src/marker.cpp
@@ -13,6 +13,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <cstring>
+#include <string>
 #include "config.h"
 
 
diff --git a/src/message-stack.cpp b/src/message-stack.cpp
index 33a23e7f3..05aec87fc 100644
--- a/src/message-stack.cpp
+++ b/src/message-stack.cpp
@@ -11,6 +11,8 @@
 
 #include <string.h>
 #include <glib/gstrfuncs.h>
+#include <cstring>
+#include <string>
 #include "message-stack.h"
 
 namespace Inkscape {
diff --git a/src/node-context.cpp b/src/node-context.cpp
index 3d11aefe4..14fcc8866 100644
--- a/src/node-context.cpp
+++ b/src/node-context.cpp
@@ -13,6 +13,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 --git a/src/nodepath.cpp b/src/nodepath.cpp
index 55c9ea3c7..d0becd45d 100644
--- a/src/nodepath.cpp
+++ b/src/nodepath.cpp
@@ -47,6 +47,8 @@
 #include "display/bezier-utils.h"
 #include <vector>
 #include <algorithm>
+#include <cstring>
+#include <string>
 #include "live_effects/lpeobject.h"
 #include "live_effects/parameter/parameter.h"
 #include "util/mathfns.h"
diff --git a/src/path-chemistry.cpp b/src/path-chemistry.cpp
index 32e2a7bec..254a00e27 100644
--- a/src/path-chemistry.cpp
+++ b/src/path-chemistry.cpp
@@ -16,6 +16,8 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+#include <cstring>
+#include <string>
 #include "xml/repr.h"
 #include "svg/svg.h"
 #include "display/curve.h"
diff --git a/src/pedro/pedroconfig.cpp b/src/pedro/pedroconfig.cpp
index 08b9cd17b..250674477 100644
--- a/src/pedro/pedroconfig.cpp
+++ b/src/pedro/pedroconfig.cpp
@@ -49,6 +49,9 @@ We are expecting an xml file with this format:
 #include "pedrodom.h"
 
 #include <stdio.h>
+#include <cstring>
+#include <string>
+#include <cstdlib>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/pedro/pedroxmpp.cpp b/src/pedro/pedroxmpp.cpp
index bed99004f..72a0cb832 100644
--- a/src/pedro/pedroxmpp.cpp
+++ b/src/pedro/pedroxmpp.cpp
@@ -22,7 +22,8 @@
  */
 
 
-#include <stdio.h>
+#include <algorithm>
+#include <cstdio>
 #include <stdarg.h>
 #include <stdlib.h>
 
diff --git a/src/pen-context.cpp b/src/pen-context.cpp
index cae8afbc9..204ed9c8d 100644
--- a/src/pen-context.cpp
+++ b/src/pen-context.cpp
@@ -16,6 +16,8 @@
  */
 
 #include <gdk/gdkkeysyms.h>
+#include <cstring>
+#include <string>
 
 #include "pen-context.h"
 #include "sp-namedview.h"
diff --git a/src/prefix.cpp b/src/prefix.cpp
index 4999e1524..0814bd53f 100644
--- a/src/prefix.cpp
+++ b/src/prefix.cpp
@@ -39,10 +39,10 @@
     #include <glib.h> //for GThreads
 #endif /* BR_THREADS */
 
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
 #include <limits.h>
-#include <string.h>
 #include "prefix.h"
 
 #ifdef __cplusplus
diff --git a/src/rect-context.cpp b/src/rect-context.cpp
index 938b4496d..6aa7d418c 100644
--- a/src/rect-context.cpp
+++ b/src/rect-context.cpp
@@ -18,6 +18,8 @@
 #include "inkscape.h"
 
 #include <gdk/gdkkeysyms.h>
+#include <cstring>
+#include <string>
 
 #include "macros.h"
 #include "display/sp-canvas.h"
diff --git a/src/select-context.cpp b/src/select-context.cpp
index 48afadb2b..0eb5777cf 100644
--- a/src/select-context.cpp
+++ b/src/select-context.cpp
@@ -16,6 +16,8 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#include <cstring>
+#include <string>
 #include <gdk/gdkkeysyms.h>
 #include "macros.h"
 #include "rubberband.h"
diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp
index caf32ce3e..07b79b259 100644
--- a/src/selection-chemistry.cpp
+++ b/src/selection-chemistry.cpp
@@ -72,6 +72,8 @@
 #include "layer-fns.h"
 #include "context-fns.h"
 #include <map>
+#include <cstring>
+#include <string>
 #include "helper/units.h"
 #include "sp-item.h"
 #include "box3d.h"
diff --git a/src/seltrans.cpp b/src/seltrans.cpp
index a3f343841..7d09289bc 100644
--- a/src/seltrans.cpp
+++ b/src/seltrans.cpp
@@ -16,6 +16,8 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+#include <cstring>
+#include <string>
 
 #include <libnr/nr-matrix-ops.h>
 #include <libnr/nr-matrix-translate-ops.h>
diff --git a/src/shortcuts.cpp b/src/shortcuts.cpp
index 12657410c..7d0f3747d 100644
--- a/src/shortcuts.cpp
+++ b/src/shortcuts.cpp
@@ -23,6 +23,8 @@
 #endif
 
 #include <vector>
+#include <cstring>
+#include <string>
 
 #include <gdk/gdkkeys.h>
 #include <gdk/gdkkeysyms.h>
diff --git a/src/sp-clippath.cpp b/src/sp-clippath.cpp
index f21a15cdf..881605a13 100644
--- a/src/sp-clippath.cpp
+++ b/src/sp-clippath.cpp
@@ -12,7 +12,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-
+#include <cstring>
+#include <string>
 
 #include "display/nr-arena.h"
 #include "display/nr-arena-group.h"
diff --git a/src/sp-conn-end-pair.cpp b/src/sp-conn-end-pair.cpp
index d13ef9e86..087069293 100644
--- a/src/sp-conn-end-pair.cpp
+++ b/src/sp-conn-end-pair.cpp
@@ -10,6 +10,9 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <cstring>
+#include <string>
+
 #include "attributes.h"
 #include "sp-conn-end.h"
 #include "uri.h"
diff --git a/src/sp-conn-end.cpp b/src/sp-conn-end.cpp
index 3840daf97..99b908e69 100644
--- a/src/sp-conn-end.cpp
+++ b/src/sp-conn-end.cpp
@@ -1,4 +1,7 @@
 
+#include <cstring>
+#include <string>
+
 #include "display/curve.h"
 #include "libnr/nr-matrix-div.h"
 #include "libnr/nr-matrix-fns.h"
diff --git a/src/sp-cursor.cpp b/src/sp-cursor.cpp
index 3e9c5ef90..4bbba5f10 100644
--- a/src/sp-cursor.cpp
+++ b/src/sp-cursor.cpp
@@ -13,7 +13,8 @@
  */
 
 #include <cstdio>
-#include <string.h>
+#include <cstring>
+#include <string>
 #include <ctype.h>
 #include "sp-cursor.h"
 
@@ -32,7 +33,7 @@ sp_cursor_bitmap_and_mask_from_xpm(GdkBitmap **bitmap, GdkBitmap **mask, gchar c
 
     int transparent_color = ' ';
     int black_color = '.';
-	
+
     char pixmap_buffer[(32 * 32)/8];
     char mask_buffer[(32 * 32)/8];
 
diff --git a/src/sp-filter.cpp b/src/sp-filter.cpp
index e89108d1c..c74a9ffdb 100644
--- a/src/sp-filter.cpp
+++ b/src/sp-filter.cpp
@@ -28,6 +28,8 @@ using std::pair;
 #include "sp-filter-reference.h"
 #include "uri.h"
 #include "xml/repr.h"
+#include <cstring>
+#include <string>
 
 #define SP_MACROS_SILENT
 #include "macros.h"
diff --git a/src/sp-flowtext.cpp b/src/sp-flowtext.cpp
index 01df68b99..552adb36e 100644
--- a/src/sp-flowtext.cpp
+++ b/src/sp-flowtext.cpp
@@ -5,6 +5,8 @@
 # include "config.h"
 #endif
 #include <glibmm/i18n.h>
+#include <cstring>
+#include <string>
 
 #include "attributes.h"
 #include "xml/repr.h"
diff --git a/src/sp-gradient.cpp b/src/sp-gradient.cpp
index a00924029..02544d0b1 100644
--- a/src/sp-gradient.cpp
+++ b/src/sp-gradient.cpp
@@ -18,6 +18,8 @@
 
 #define noSP_GRADIENT_VERBOSE
 
+#include <cstring>
+#include <string>
 
 #include <libnr/nr-matrix-div.h>
 #include <libnr/nr-matrix-fns.h>
diff --git a/src/sp-guide.cpp b/src/sp-guide.cpp
index c54dd3282..a6312f985 100644
--- a/src/sp-guide.cpp
+++ b/src/sp-guide.cpp
@@ -18,6 +18,10 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#include <algorithm>
+#include <cstring>
+#include <string>
 #include "display/guideline.h"
 #include "svg/svg.h"
 #include "svg/stringstream.h"
diff --git a/src/sp-image.cpp b/src/sp-image.cpp
index 46362c889..8c9df56b4 100644
--- a/src/sp-image.cpp
+++ b/src/sp-image.cpp
@@ -16,8 +16,10 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-#include <libnr/nr-matrix-fns.h>
 
+#include <cstring>
+#include <string>
+#include <libnr/nr-matrix-fns.h>
 //#define GDK_PIXBUF_ENABLE_BACKEND 1
 //#include <gdk-pixbuf/gdk-pixbuf-io.h>
 #include "display/nr-arena-image.h"
diff --git a/src/sp-item-group.cpp b/src/sp-item-group.cpp
index aafd48966..ac7aee1d4 100644
--- a/src/sp-item-group.cpp
+++ b/src/sp-item-group.cpp
@@ -19,6 +19,8 @@
 #endif
 
 #include <glibmm/i18n.h>
+#include <cstring>
+#include <string>
 
 #include "display/nr-arena-group.h"
 #include "libnr/nr-matrix-ops.h"
diff --git a/src/sp-item-rm-unsatisfied-cns.cpp b/src/sp-item-rm-unsatisfied-cns.cpp
index 7f3f06975..fe6d73a3a 100644
--- a/src/sp-item-rm-unsatisfied-cns.cpp
+++ b/src/sp-item-rm-unsatisfied-cns.cpp
@@ -1,9 +1,12 @@
 
-#include <approx-equal.h>
-#include <remove-last.h>
-#include <sp-guide.h>
-#include <sp-guide-constraint.h>
-#include <sp-item.h>
+#include <algorithm>
+
+#include "approx-equal.h"
+#include "remove-last.h"
+#include "sp-guide.h"
+#include "sp-guide-constraint.h"
+#include "sp-item.h"
+
 using std::vector;
 
 void sp_item_rm_unsatisfied_cns(SPItem &item)
diff --git a/src/sp-mask.cpp b/src/sp-mask.cpp
index 64ff38019..0019b598e 100644
--- a/src/sp-mask.cpp
+++ b/src/sp-mask.cpp
@@ -11,6 +11,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <cstring>
+#include <string>
 
 #include "display/nr-arena.h"
 #include "display/nr-arena-group.h"
diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp
index d26f00529..cc7adeaa8 100644
--- a/src/sp-namedview.cpp
+++ b/src/sp-namedview.cpp
@@ -15,6 +15,8 @@
  */
 
 #include "config.h"
+#include <cstring>
+#include <string>
 
 #include "display/canvas-grid.h"
 #include "helper/units.h"
diff --git a/src/sp-object.cpp b/src/sp-object.cpp
index ff4769f64..99d739700 100644
--- a/src/sp-object.cpp
+++ b/src/sp-object.cpp
@@ -31,6 +31,8 @@
  * dictionary and so on. Source: doc/architecture.txt
  */
 
+#include <cstring>
+#include <string>
 
 #include "helper/sp-marshal.h"
 #include "xml/node-event-vector.h"
diff --git a/src/sp-offset.cpp b/src/sp-offset.cpp
index 97481a477..44384dee9 100644
--- a/src/sp-offset.cpp
+++ b/src/sp-offset.cpp
@@ -19,6 +19,8 @@
 # include "config.h"
 #endif
 
+#include <cstring>
+#include <string>
 
 #include "svg/svg.h"
 #include "attributes.h"
diff --git a/src/sp-pattern.cpp b/src/sp-pattern.cpp
index 21ec66141..c3d35de72 100644
--- a/src/sp-pattern.cpp
+++ b/src/sp-pattern.cpp
@@ -12,8 +12,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
+#include <cstring>
+#include <string>
 #include <libnr/nr-matrix-ops.h>
 #include "libnr/nr-matrix-fns.h"
 #include <libnr/nr-translate-matrix-ops.h>
diff --git a/src/sp-root.cpp b/src/sp-root.cpp
index c555c78a0..6ad5ff638 100644
--- a/src/sp-root.cpp
+++ b/src/sp-root.cpp
@@ -13,7 +13,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <cstring>
+#include <string>
 
 #include "svg/svg.h"
 #include "display/nr-arena-group.h"
diff --git a/src/sp-star.cpp b/src/sp-star.cpp
index 767175e87..a04af838f 100644
--- a/src/sp-star.cpp
+++ b/src/sp-star.cpp
@@ -14,8 +14,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
+#include <cstring>
+#include <string>
 #include <glibmm/i18n.h>
 
 #include "svg/svg.h"
diff --git a/src/sp-symbol.cpp b/src/sp-symbol.cpp
index 5dbbe4e41..0a7fca4d2 100644
--- a/src/sp-symbol.cpp
+++ b/src/sp-symbol.cpp
@@ -11,7 +11,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <cstring>
+#include <string>
 
 #include "libnr/nr-matrix-fns.h"
 #include "libnr/nr-matrix-ops.h"
diff --git a/src/sp-tspan.cpp b/src/sp-tspan.cpp
index 8050cdbf9..7d56e177b 100644
--- a/src/sp-tspan.cpp
+++ b/src/sp-tspan.cpp
@@ -27,6 +27,8 @@
 # include "config.h"
 #endif
 
+#include <cstring>
+#include <string>
 #include <glibmm/i18n.h>
 
 #include <livarot/Path.h>
diff --git a/src/sp-use-reference.cpp b/src/sp-use-reference.cpp
index c7923504a..1474a43a9 100644
--- a/src/sp-use-reference.cpp
+++ b/src/sp-use-reference.cpp
@@ -7,6 +7,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information.
  */
 
+#include <cstring>
+#include <string>
 #include <string.h>
 
 #include "enums.h"
diff --git a/src/sp-use.cpp b/src/sp-use.cpp
index 0e1c257eb..dc1774e3d 100644
--- a/src/sp-use.cpp
+++ b/src/sp-use.cpp
@@ -16,6 +16,10 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#include <cstring>
+#include <string>
+
 #include <libnr/nr-matrix-ops.h>
 #include <libnr/nr-matrix-fns.h>
 #include "libnr/nr-matrix-translate-ops.h"
diff --git a/src/spiral-context.cpp b/src/spiral-context.cpp
index 6dbdb74c9..d0404c3d0 100644
--- a/src/spiral-context.cpp
+++ b/src/spiral-context.cpp
@@ -17,6 +17,8 @@
 #include "config.h"
 
 #include <gdk/gdkkeysyms.h>
+#include <cstring>
+#include <string>
 
 #include "macros.h"
 #include "display/sp-canvas.h"
diff --git a/src/splivarot.cpp b/src/splivarot.cpp
index f8e666e95..f176776a6 100644
--- a/src/splivarot.cpp
+++ b/src/splivarot.cpp
@@ -17,6 +17,8 @@
 # include <config.h>
 #endif
 
+#include <cstring>
+#include <string>
 #include <vector>
 #include <glib/gmem.h>
 #include "xml/repr.h"
diff --git a/src/star-context.cpp b/src/star-context.cpp
index 73e230deb..cee03b4b1 100644
--- a/src/star-context.cpp
+++ b/src/star-context.cpp
@@ -14,7 +14,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <cstring>
+#include <string>
 
 #include <gdk/gdkkeysyms.h>
 
diff --git a/src/streams-gzip.cpp b/src/streams-gzip.cpp
index 9cd107770..c77e7162b 100644
--- a/src/streams-gzip.cpp
+++ b/src/streams-gzip.cpp
@@ -9,6 +9,8 @@
  * Released under GNU LGPL, read the file 'COPYING.LIB' for more information
  */
 
+#include <cstring>
+#include <string>
 #include <string.h>
 
 #include "streams-gzip.h"
diff --git a/src/streams-zlib.cpp b/src/streams-zlib.cpp
index 60953ad5f..2d5fae01e 100644
--- a/src/streams-zlib.cpp
+++ b/src/streams-zlib.cpp
@@ -9,6 +9,8 @@
  * Released under GNU LGPL, read the file 'COPYING.LIB' for more information
  */
 
+#include <cstring>
+#include <string>
 #include <string.h>
 #include <vector>
 #include "streams-zlib.h"
diff --git a/src/streq.h b/src/streq.h
index daed17cf0..c790db9e8 100644
--- a/src/streq.h
+++ b/src/streq.h
@@ -2,6 +2,7 @@
 #define INKSCAPE_STREQ_H
 
 #include <cstring>
+#include <string>
 
 /** Convenience/readability wrapper for strcmp(a,b)==0. */
 inline bool
diff --git a/src/style.cpp b/src/style.cpp
index 357fe5f0e..759b054c2 100644
--- a/src/style.cpp
+++ b/src/style.cpp
@@ -19,6 +19,9 @@
 # include "config.h"
 #endif
 
+#include <cstring>
+#include <string>
+
 #include "libcroco/cr-sel-eng.h"
 #include "xml/croco-node-iface.h"
 
diff --git a/src/svg/gnome-canvas-bpath-util.cpp b/src/svg/gnome-canvas-bpath-util.cpp
index b583e1a66..057e54ec2 100644
--- a/src/svg/gnome-canvas-bpath-util.cpp
+++ b/src/svg/gnome-canvas-bpath-util.cpp
@@ -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 --git a/src/svg/itos.cpp b/src/svg/itos.cpp
index ee49f5014..0f2c64ec4 100644
--- a/src/svg/itos.cpp
+++ b/src/svg/itos.cpp
@@ -16,6 +16,7 @@
 // Standard include files
 #include <algorithm>
 #include <string>		// for string
+#include <cstring>
 
 using namespace std;
 
diff --git a/src/svg/strip-trailing-zeros.cpp b/src/svg/strip-trailing-zeros.cpp
index 79b266b42..769834d18 100644
--- a/src/svg/strip-trailing-zeros.cpp
+++ b/src/svg/strip-trailing-zeros.cpp
@@ -1,5 +1,10 @@
-#include "svg/strip-trailing-zeros.h"
+
+#include <cstring>
+#include <string>
 #include <glib/gmessages.h>
+
+#include "svg/strip-trailing-zeros.h"
+
 using std::string;
 
 string
diff --git a/src/svg/svg-affine.cpp b/src/svg/svg-affine.cpp
index 71ee5dcb5..98a6cbf3b 100644
--- a/src/svg/svg-affine.cpp
+++ b/src/svg/svg-affine.cpp
@@ -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 --git a/src/svg/svg-color.cpp b/src/svg/svg-color.cpp
index fe79736dc..e1f87fdb9 100644
--- a/src/svg/svg-color.cpp
+++ b/src/svg/svg-color.cpp
@@ -17,9 +17,10 @@
 # include "config.h"
 #endif
 
-#include "prefs-utils.h"
-#include "svg-color.h"
-#include "svg-icc-color.h"
+#include <cstdlib>
+#include <cstdio> // sprintf
+#include <cstring>
+#include <string>
 #include <cassert>
 #include <math.h>
 #include <glib/gmem.h>
@@ -28,9 +29,13 @@
 #include <glib/gstrfuncs.h>
 #include <glib/ghash.h>
 #include <glib/gutils.h>
-#include <cstdio> // sprintf
 #include <errno.h>
+
 #include "strneq.h"
+#include "prefs-utils.h"
+#include "svg-color.h"
+#include "svg-icc-color.h"
+
 using std::sprintf;
 
 struct SPSVGColor {
diff --git a/src/svg/svg-length.cpp b/src/svg/svg-length.cpp
index 3b13e3d89..f0b7f85f6 100644
--- a/src/svg/svg-length.cpp
+++ b/src/svg/svg-length.cpp
@@ -16,8 +16,11 @@
 # include "config.h"
 #endif
 
+#include <cstring>
+#include <string>
 #include <math.h>
 #include <glib/gstrfuncs.h>
+
 #include "svg.h"
 #include "stringstream.h"
 #include "../unit-constants.h"
diff --git a/src/svg/svg-path.cpp b/src/svg/svg-path.cpp
index b491e61c0..0239d2ae0 100644
--- a/src/svg/svg-path.cpp
+++ b/src/svg/svg-path.cpp
@@ -26,6 +26,8 @@
      Lauris Kaplinski <lauris@ximian.com>
 */
 
+#include <cstring>
+#include <string>
 #include <cassert>
 #include <glib/gmem.h>
 #include <glib/gmessages.h>
diff --git a/src/svg/svg.h b/src/svg/svg.h
index 1881fb4a0..4adacef7a 100644
--- a/src/svg/svg.h
+++ b/src/svg/svg.h
@@ -12,10 +12,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 #include <glib/gtypes.h>
-#include "svg/svg-length.h"
 #include <vector>
+#include <cstring>
 #include <string>
 
+#include "svg/svg-length.h"
+
 struct NArtBpath;
 struct NRMatrix;
 namespace NR {
diff --git a/src/text-chemistry.cpp b/src/text-chemistry.cpp
index ef5bd90bf..3a100a6fe 100644
--- a/src/text-chemistry.cpp
+++ b/src/text-chemistry.cpp
@@ -14,9 +14,13 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
+#include <cstring>
+#include <string>
+#include <glibmm/i18n.h>
+
 #include "libnr/nr-matrix-fns.h"
 #include "xml/repr.h"
-#include <glibmm/i18n.h>
 #include "sp-rect.h"
 #include "sp-textpath.h"
 #include "inkscape.h"
diff --git a/src/text-editing.cpp b/src/text-editing.cpp
index dd054f063..cab71e94a 100644
--- a/src/text-editing.cpp
+++ b/src/text-editing.cpp
@@ -14,6 +14,8 @@
 # include "config.h"
 #endif
 
+#include <cstring>
+#include <string>
 #include <glibmm/i18n.h>
 
 #include "desktop.h"
diff --git a/src/tools-switch.cpp b/src/tools-switch.cpp
index c6251fe5b..11e3ff5b4 100644
--- a/src/tools-switch.cpp
+++ b/src/tools-switch.cpp
@@ -15,6 +15,9 @@
 # include "config.h"
 #endif
 
+#include <cstring>
+#include <string>
+
 #include "inkscape-private.h"
 #include "desktop.h"
 #include "desktop-handles.h"
diff --git a/src/ui/widget/style-swatch.cpp b/src/ui/widget/style-swatch.cpp
index e5e8d5d78..5a50ab84b 100644
--- a/src/ui/widget/style-swatch.cpp
+++ b/src/ui/widget/style-swatch.cpp
@@ -13,6 +13,9 @@
 # include <config.h>
 #endif
 
+#include <cstring>
+#include <string>
+
 #include "style-swatch.h"
 
 #include "widgets/spw-utilities.h"
diff --git a/src/uri-references.cpp b/src/uri-references.cpp
index 7fc1f4838..8041fbf52 100644
--- a/src/uri-references.cpp
+++ b/src/uri-references.cpp
@@ -12,6 +12,9 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <cstring>
+#include <string>
+
 #include "document.h"
 #include "sp-object.h"
 #include "uri.h"
diff --git a/src/verbs.cpp b/src/verbs.cpp
index f2d1d3b39..95d44483e 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -23,14 +23,14 @@
  */
 
 
-
-
-#include <gtk/gtkstock.h>
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <cstring>
+#include <string>
+#include <gtk/gtkstock.h>
+
 #include "helper/action.h"
 
 #include <gtkmm/messagedialog.h>
diff --git a/src/verbs.h b/src/verbs.h
index 2d0d3d0b6..52f69e54e 100644
--- a/src/verbs.h
+++ b/src/verbs.h
@@ -11,11 +11,13 @@
  *
  *  Copyright (C) 2006 Johan Engelen <johan@shouraizou.nl>
  *  Copyright (C) (date unspecified) Authors
- 
+
  * This code is in public domain if done by Lauris
  * This code is GPL if done by Ted or David
  */
 
+#include <cstring>
+#include <string>
 #include <string.h>
 #include "require-config.h"   /* HAVE_GTK_WINDOW_FULLSCREEN */
 #include "helper/helper-forward.h"
diff --git a/src/widgets/dash-selector.cpp b/src/widgets/dash-selector.cpp
index 474ab90f9..ea666070f 100644
--- a/src/widgets/dash-selector.cpp
+++ b/src/widgets/dash-selector.cpp
@@ -18,10 +18,13 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+
+#include <cstring>
+#include <string>
 #include <libnr/nr-macros.h>
 #include <gtk/gtk.h>
-
 #include <glibmm/i18n.h>
+
 #include "../style.h"
 #include "../dialogs/dialog-events.h"
 
diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp
index 9be74a556..03a39acb6 100644
--- a/src/widgets/icon.cpp
+++ b/src/widgets/icon.cpp
@@ -14,17 +14,15 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
-#include "path-prefix.h"
-
-
 
+#include <cstring>
 #include <glib/gmem.h>
 #include <gtk/gtkiconfactory.h>
 #include <gtk/gtkstock.h>
 #include <gtk/gtkimage.h>
-
 #include <gtkmm/image.h>
 
+#include "path-prefix.h"
 #include "prefs-utils.h"
 #include "inkscape.h"
 #include "document.h"
diff --git a/src/widgets/layer-selector.cpp b/src/widgets/layer-selector.cpp
index 10b497cac..65f64fa4f 100644
--- a/src/widgets/layer-selector.cpp
+++ b/src/widgets/layer-selector.cpp
@@ -13,6 +13,8 @@
 # include "config.h"
 #endif
 
+#include <cstring>
+#include <string>
 #include <glibmm/i18n.h>
 
 #include "desktop-handles.h"
diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index ea9730d50..c66fbd3c7 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -16,7 +16,8 @@
 # include "config.h"
 #endif
 
-
+#include <cstring>
+#include <string>
 
 #include <gtk/gtkhbox.h>
 #include <gtk/gtkradiobutton.h>
diff --git a/src/widgets/ruler.cpp b/src/widgets/ruler.cpp
index e0f0ba680..fab2a0ba9 100644
--- a/src/widgets/ruler.cpp
+++ b/src/widgets/ruler.cpp
@@ -13,9 +13,10 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <cstring>
 #include <cmath>
 #include <cstdio>
-#include <string.h>
+
 #include "widget-sizes.h"
 #include "desktop-widget.h"
 #include "ruler.h"
diff --git a/src/widgets/sp-color-notebook.cpp b/src/widgets/sp-color-notebook.cpp
index b7ec3eb2c..cbb7faadb 100644
--- a/src/widgets/sp-color-notebook.cpp
+++ b/src/widgets/sp-color-notebook.cpp
@@ -18,15 +18,17 @@
 #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"
 #include "../prefs-utils.h"
 #include "sp-color-notebook.h"
 #include "spw-utilities.h"
-
 #include "sp-color-scales.h"
 #include "sp-color-wheel-selector.h"
 #include "sp-color-icc-selector.h"
diff --git a/src/widgets/sp-color-wheel.cpp b/src/widgets/sp-color-wheel.cpp
index e59cce4d3..c7d1acb3e 100644
--- a/src/widgets/sp-color-wheel.cpp
+++ b/src/widgets/sp-color-wheel.cpp
@@ -13,6 +13,9 @@
  * This code is in public domain
  */
 
+#include <cstring>
+#include <string>
+
 #include <gtk/gtksignal.h>
 #include "sp-color-wheel.h"
 
diff --git a/src/widgets/sp-xmlview-attr-list.cpp b/src/widgets/sp-xmlview-attr-list.cpp
index e39b2a4e9..923420740 100644
--- a/src/widgets/sp-xmlview-attr-list.cpp
+++ b/src/widgets/sp-xmlview-attr-list.cpp
@@ -12,8 +12,11 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include "helper/sp-marshal.h"
+
+#include <cstring>
 #include <glibmm/i18n.h>
+
+#include "helper/sp-marshal.h"
 #include "../xml/node-event-vector.h"
 #include "sp-xmlview-attr-list.h"
 
diff --git a/src/widgets/sp-xmlview-content.cpp b/src/widgets/sp-xmlview-content.cpp
index 356c1384e..6f0b0dff1 100644
--- a/src/widgets/sp-xmlview-content.cpp
+++ b/src/widgets/sp-xmlview-content.cpp
@@ -11,13 +11,14 @@
  * Released under the GNU GPL; see COPYING for details
  */
 
+#include <cstring>
+#include <glibmm/i18n.h>
 
 #include "xml/node-event-vector.h"
 #include "sp-xmlview-content.h"
 #include "desktop-handles.h"
 #include "document-private.h"
 #include "inkscape.h"
-#include <glibmm/i18n.h>
 
 static void sp_xmlview_content_class_init (SPXMLViewContentClass * klass);
 static void sp_xmlview_content_init (SPXMLViewContent * text);
diff --git a/src/widgets/sp-xmlview-tree.cpp b/src/widgets/sp-xmlview-tree.cpp
index d6fd92d78..ee5ca1823 100644
--- a/src/widgets/sp-xmlview-tree.cpp
+++ b/src/widgets/sp-xmlview-tree.cpp
@@ -11,6 +11,9 @@
  * Released under the GNU GPL; see COPYING for details
  */
 
+#include <cstring>
+#include <string>
+
 #include "../xml/node-event-vector.h"
 #include "sp-xmlview-tree.h"
 
diff --git a/src/widgets/spw-utilities.cpp b/src/widgets/spw-utilities.cpp
index ecec84979..291e191e5 100644
--- a/src/widgets/spw-utilities.cpp
+++ b/src/widgets/spw-utilities.cpp
@@ -16,9 +16,10 @@
 # include "config.h"
 #endif
 
-
+#include <cstring>
+#include <string>
 #include <gtk/gtk.h>
- 
+
 #include "selection.h"
 
 #include "helper/unit-menu.h"
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index b0a6a7e91..31720b3e8 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -27,6 +27,9 @@
 # include "config.h"
 #endif
 
+#include <cstring>
+#include <string>
+
 #include <gtkmm.h>
 #include <gtk/gtk.h>
 #include <iostream>
diff --git a/src/xml/composite-node-observer.cpp b/src/xml/composite-node-observer.cpp
index bb68ba9c4..979462cef 100644
--- a/src/xml/composite-node-observer.cpp
+++ b/src/xml/composite-node-observer.cpp
@@ -12,6 +12,8 @@
  *
  */
 
+#include <cstring>
+
 #include "algorithms/find-if-before.h"
 #include "xml/composite-node-observer.h"
 #include "xml/node-event-vector.h"
diff --git a/src/xml/croco-node-iface.cpp b/src/xml/croco-node-iface.cpp
index 0464e4fb7..a40ddd661 100644
--- a/src/xml/croco-node-iface.cpp
+++ b/src/xml/croco-node-iface.cpp
@@ -1,6 +1,10 @@
+
+#include <cstring>
+#include <string>
+#include <glib/gstrfuncs.h>
+
 #include "xml/croco-node-iface.h"
 #include "xml/node.h"
-#include <glib/gstrfuncs.h>
 
 static char const *
 local_part(char const *const qname)
diff --git a/src/xml/node-fns.cpp b/src/xml/node-fns.cpp
index 4d346e009..cb4161141 100644
--- a/src/xml/node-fns.cpp
+++ b/src/xml/node-fns.cpp
@@ -3,6 +3,8 @@
 #endif
 
 #include <map>
+#include <cstring>
+#include <string>
 #include <glib.h> // g_assert()
 
 #include "xml/node-iterators.h"
diff --git a/src/xml/quote-test.cpp b/src/xml/quote-test.cpp
index 61291b9de..197ca5309 100644
--- a/src/xml/quote-test.cpp
+++ b/src/xml/quote-test.cpp
@@ -1,7 +1,9 @@
 /* Initial author: Peter Moulder.
    Hereby released into the Public Domain. */
 
+#include <cstring>
 #include <functional>
+
 #include "utest/test-1ary-cases.h"
 
 /* mental disclaims all responsibility for this evil idea for testing
diff --git a/src/xml/quote.cpp b/src/xml/quote.cpp
index b5505c5e1..37f00bad0 100644
--- a/src/xml/quote.cpp
+++ b/src/xml/quote.cpp
@@ -11,7 +11,7 @@
  * of the GNU General Public License: see the file `COPYING'.
  */
 
-#include <string.h>
+#include <cstring>
 #include <glib/gmem.h>
 
 
diff --git a/src/xml/repr-action-test.cpp b/src/xml/repr-action-test.cpp
index 0e3d8d4a4..7e022eb18 100644
--- a/src/xml/repr-action-test.cpp
+++ b/src/xml/repr-action-test.cpp
@@ -1,4 +1,4 @@
-#include <stdlib.h>
+#include <cstdlib>
 #include <glib.h>
 #include "../utest/utest.h"
 
diff --git a/src/xml/repr-css.cpp b/src/xml/repr-css.cpp
index ec5848366..0a2e215a0 100644
--- a/src/xml/repr-css.cpp
+++ b/src/xml/repr-css.cpp
@@ -1,10 +1,10 @@
 /*
  *   bulia byak <buliabyak@users.sf.net>
-*/ 
- 
-#define SP_REPR_CSS_C
+*/
 
+#define SP_REPR_CSS_C
 
+#include <cstring>
 #include <glibmm/ustring.h>
 
 #include "xml/repr.h"
diff --git a/src/xml/repr-io.cpp b/src/xml/repr-io.cpp
index 62d43dd41..8f149a130 100644
--- a/src/xml/repr-io.cpp
+++ b/src/xml/repr-io.cpp
@@ -16,6 +16,8 @@
 # include <config.h>
 #endif
 
+#include <cstring>
+#include <string>
 #include <stdexcept>
 
 #include "xml/repr.h"
diff --git a/src/xml/repr-util.cpp b/src/xml/repr-util.cpp
index 7a45f6fcd..97676bebe 100644
--- a/src/xml/repr-util.cpp
+++ b/src/xml/repr-util.cpp
@@ -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 --git a/src/xml/repr.cpp b/src/xml/repr.cpp
index be226a357..4494d3fe6 100644
--- a/src/xml/repr.cpp
+++ b/src/xml/repr.cpp
@@ -22,6 +22,8 @@
 # include "config.h"
 #endif
 
+#include <cstring>
+
 #include "xml/repr.h"
 #include "xml/text-node.h"
 #include "xml/element-node.h"
diff --git a/src/xml/simple-node.cpp b/src/xml/simple-node.cpp
index d38e14b3f..084547a59 100644
--- a/src/xml/simple-node.cpp
+++ b/src/xml/simple-node.cpp
@@ -15,7 +15,10 @@
  *
  */
 
+#include <cstring>
+#include <string>
 #include <glib/gstrfuncs.h>
+
 #include "xml/simple-node.h"
 #include "xml/node-event-vector.h"
 #include "xml/node-fns.h"