compatibility patch to compile using gcc 4.6

Fixed bugs:
  - https://launchpad.net/bugs/707205

(bzr r10070.1.1)

76 files changed, 77 insertions, 1 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 0c585d6a9..993fd01ac 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -212,7 +212,7 @@ libinkscape_a_SOURCES = $(ink_common_sources)
 
 inkscape_SOURCES += main.cpp $(win32_sources)
 inkscape_LDADD = $(all_libs)
-inkscape_LDFLAGS = --export-dynamic $(kdeldflags) $(mwindows)
+inkscape_LDFLAGS = -Wl,--export-dynamic $(kdeldflags) $(mwindows)
 
 inkview_SOURCES += inkview.cpp $(win32_sources)
 inkview_LDADD = $(all_libs)
diff --git a/src/arc-context.h b/src/arc-context.h
index 1e182225a..3ed4478ba 100644
--- a/src/arc-context.h
+++ b/src/arc-context.h
@@ -15,6 +15,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <stddef.h>
 #include <sigc++/connection.h>
 
 #include <2geom/point.h>
diff --git a/src/box3d-context.h b/src/box3d-context.h
index 913e98263..4b8435d74 100644
--- a/src/box3d-context.h
+++ b/src/box3d-context.h
@@ -15,6 +15,7 @@
  * Released under GNU GPL
  */
 
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 #include "event-context.h"
 #include "proj_pt.h"
diff --git a/src/conn-avoid-ref.h b/src/conn-avoid-ref.h
index eaf479e37..9a028371a 100644
--- a/src/conn-avoid-ref.h
+++ b/src/conn-avoid-ref.h
@@ -14,6 +14,7 @@
  */
 
 #include <glib/gslist.h>
+#include <stddef.h>
 #include <sigc++/connection.h>
 
 struct SPDesktop;
diff --git a/src/connection-pool.h b/src/connection-pool.h
index 67bcf0002..4aa44e30a 100644
--- a/src/connection-pool.h
+++ b/src/connection-pool.h
@@ -3,6 +3,7 @@
 
 #include <glib-object.h>
 #include <gtkmm.h>
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 
 namespace Inkscape
diff --git a/src/connector-context.h b/src/connector-context.h
index b03d0fcf0..97e21025d 100644
--- a/src/connector-context.h
+++ b/src/connector-context.h
@@ -12,6 +12,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 #include <sigc++/connection.h>
 #include "event-context.h"
diff --git a/src/desktop.h b/src/desktop.h
index 4fdc0b98b..947e92fe7 100644
--- a/src/desktop.h
+++ b/src/desktop.h
@@ -29,6 +29,7 @@
 
 #include <gdk/gdkevents.h>
 #include <gtk/gtktypeutils.h>
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 
 #include <2geom/affine.h>
diff --git a/src/dialogs/object-attributes.cpp b/src/dialogs/object-attributes.cpp
index cbf5f1e89..57b295e4e 100644
--- a/src/dialogs/object-attributes.cpp
+++ b/src/dialogs/object-attributes.cpp
@@ -13,6 +13,7 @@
 #include <glibmm/i18n.h>
 #include <string>
 #include <cstring>
+#include <stddef.h>
 #include <sigc++/connection.h>
 #include <sigc++/functors/ptr_fun.h>
 #include <sigc++/adaptors/bind.h>
diff --git a/src/display/canvas-temporary-item.h b/src/display/canvas-temporary-item.h
index 692f9d85b..b73907bad 100644
--- a/src/display/canvas-temporary-item.h
+++ b/src/display/canvas-temporary-item.h
@@ -13,6 +13,7 @@
  */
 
 
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 #include <glib/gtypes.h>
 
diff --git a/src/document-private.h b/src/document-private.h
index 61e6bad67..d641679ed 100644
--- a/src/document-private.h
+++ b/src/document-private.h
@@ -15,6 +15,7 @@
  */
 
 #include <map>
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 #include "xml/event-fns.h"
 #include "sp-defs.h"
diff --git a/src/document-subset.h b/src/document-subset.h
index ce7776da4..5f87e6429 100644
--- a/src/document-subset.h
+++ b/src/document-subset.h
@@ -10,6 +10,7 @@
 #ifndef SEEN_INKSCAPE_DOCUMENT_SUBSET_H
 #define SEEN_INKSCAPE_DOCUMENT_SUBSET_H
 
+#include <stddef.h>
 #include <sigc++/connection.h>
 #include <sigc++/functors/slot.h>
 
diff --git a/src/document.h b/src/document.h
index 82c874cb7..2eb5e2e09 100644
--- a/src/document.h
+++ b/src/document.h
@@ -19,6 +19,7 @@
 
 #include <glib-object.h>
 #include <gtk/gtksignal.h>
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 #include <sigc++/class_slot.h>
 
diff --git a/src/draw-context.h b/src/draw-context.h
index 2827714cb..3cad8da06 100644
--- a/src/draw-context.h
+++ b/src/draw-context.h
@@ -14,6 +14,7 @@
  * Released under GNU GPL
  */
 
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 #include "event-context.h"
 #include <forward.h>
diff --git a/src/extension/timer.h b/src/extension/timer.h
index ebae62b24..33b9829e9 100644
--- a/src/extension/timer.h
+++ b/src/extension/timer.h
@@ -13,6 +13,7 @@
 #ifndef INKSCAPE_EXTENSION_TIMER_H__
 #define INKSCAPE_EXTENSION_TIMER_H__
 
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 #include <glibmm/timeval.h>
 #include "extension-forward.h"
diff --git a/src/flood-context.h b/src/flood-context.h
index af537dea0..d9da96010 100644
--- a/src/flood-context.h
+++ b/src/flood-context.h
@@ -11,6 +11,7 @@
  * Released under GNU GPL
  */
 
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 #include <gtk/gtk.h>
 #include "event-context.h"
diff --git a/src/gc-alloc.h b/src/gc-alloc.h
index a552ff6d2..ba672ae2c 100644
--- a/src/gc-alloc.h
+++ b/src/gc-alloc.h
@@ -16,6 +16,7 @@
 #define SEEN_INKSCAPE_GC_ALLOC_H
 
 #include <limits>
+#include <cstddef>
 #include "gc-core.h"
 
 namespace Inkscape {
diff --git a/src/gc-finalized.h b/src/gc-finalized.h
index 4e09d6f8b..814a2af18 100644
--- a/src/gc-finalized.h
+++ b/src/gc-finalized.h
@@ -17,6 +17,7 @@
 #define SEEN_INKSCAPE_GC_FINALIZED_H
 
 #include <new>
+#include <cstddef>
 #include "gc-core.h"
 
 namespace Inkscape {
diff --git a/src/gc.cpp b/src/gc.cpp
index 97350daff..6b904c05f 100644
--- a/src/gc.cpp
+++ b/src/gc.cpp
@@ -16,6 +16,7 @@
 #include <glib/gmessages.h>
 #include <sigc++/functors/ptr_fun.h>
 #include <glibmm/main.h>
+#include <cstddef>
 
 namespace Inkscape {
 namespace GC {
diff --git a/src/gradient-context.h b/src/gradient-context.h
index 0e1059ee9..3bb9efa15 100644
--- a/src/gradient-context.h
+++ b/src/gradient-context.h
@@ -15,6 +15,7 @@
  * Released under GNU GPL
  */
 
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 #include "event-context.h"
 
diff --git a/src/gradient-drag.h b/src/gradient-drag.h
index 8cbe9f305..40ab065ca 100644
--- a/src/gradient-drag.h
+++ b/src/gradient-drag.h
@@ -15,6 +15,7 @@
  */
 
 #include <glib/gslist.h>
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 #include <vector>
 
diff --git a/src/knot.h b/src/knot.h
index 24a86282e..1af2548e1 100644
--- a/src/knot.h
+++ b/src/knot.h
@@ -19,6 +19,7 @@
 #include "forward.h"
 #include <2geom/point.h>
 #include "knot-enums.h"
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 
 class SPKnot;
diff --git a/src/libavoid/geomtypes.h b/src/libavoid/geomtypes.h
index ced53e6b0..61963c46f 100644
--- a/src/libavoid/geomtypes.h
+++ b/src/libavoid/geomtypes.h
@@ -29,6 +29,7 @@
 #ifndef AVOID_GEOMTYPES_H
 #define AVOID_GEOMTYPES_H
 
+#include <cstddef>
 #include <vector>
 #include <utility>
 
diff --git a/src/live_effects/lpeobject-reference.h b/src/live_effects/lpeobject-reference.h
index 48d7eb3a5..8d2b406eb 100644
--- a/src/live_effects/lpeobject-reference.h
+++ b/src/live_effects/lpeobject-reference.h
@@ -11,6 +11,7 @@
 
 #include <forward.h>
 #include <uri-references.h>
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 
 namespace Inkscape {
diff --git a/src/live_effects/parameter/path-reference.h b/src/live_effects/parameter/path-reference.h
index 3bedecccb..26fce952a 100644
--- a/src/live_effects/parameter/path-reference.h
+++ b/src/live_effects/parameter/path-reference.h
@@ -13,6 +13,7 @@
 #include <forward.h>
 #include "sp-item.h"
 #include <uri-references.h>
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 
 class Path;
diff --git a/src/live_effects/parameter/path.h b/src/live_effects/parameter/path.h
index e3d3901cc..8c4de7cff 100644
--- a/src/live_effects/parameter/path.h
+++ b/src/live_effects/parameter/path.h
@@ -16,6 +16,7 @@
 
 #include "live_effects/parameter/parameter.h"
 #include "live_effects/parameter/path-reference.h"
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 
 namespace Inkscape {
diff --git a/src/message-stack.h b/src/message-stack.h
index b5f1dd345..ae8860965 100644
--- a/src/message-stack.h
+++ b/src/message-stack.h
@@ -14,6 +14,7 @@
 #ifndef SEEN_INKSCAPE_MESSAGE_STACK_H
 #define SEEN_INKSCAPE_MESSAGE_STACK_H
 
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 #include <glib.h>
 #include <stdarg.h>
diff --git a/src/object-hierarchy.h b/src/object-hierarchy.h
index 8a6d4aedc..f6ae4f15d 100644
--- a/src/object-hierarchy.h
+++ b/src/object-hierarchy.h
@@ -14,6 +14,7 @@
 
 #include <exception>
 #include <list>
+#include <stddef.h>
 #include <sigc++/connection.h>
 #include <sigc++/signal.h>
 #include <glib/gmessages.h>
diff --git a/src/persp3d-reference.h b/src/persp3d-reference.h
index 992d34f60..28744b2fa 100644
--- a/src/persp3d-reference.h
+++ b/src/persp3d-reference.h
@@ -11,6 +11,7 @@
  */
 
 #include "uri-references.h"
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 #include "persp3d.h"
 
diff --git a/src/rect-context.h b/src/rect-context.h
index 0445338bf..54f790c68 100644
--- a/src/rect-context.h
+++ b/src/rect-context.h
@@ -14,6 +14,7 @@
  * Released under GNU GPL
  */
 
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 #include "event-context.h"
 #include "libnr/nr-point.h"
diff --git a/src/selcue.h b/src/selcue.h
index c9266ac9a..0869a597d 100644
--- a/src/selcue.h
+++ b/src/selcue.h
@@ -14,6 +14,7 @@
  */
 
 #include <list>
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 
 class SPDesktop;
diff --git a/src/selection-describer.h b/src/selection-describer.h
index cca6a3033..b4174edd8 100644
--- a/src/selection-describer.h
+++ b/src/selection-describer.h
@@ -12,6 +12,7 @@
 #ifndef SEEN_INKSCAPE_SELECTION_DESCRIPTION_HANDLER_H
 #define SEEN_INKSCAPE_SELECTION_DESCRIPTION_HANDLER_H
 
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 #include "message-context.h"
 
diff --git a/src/selection.h b/src/selection.h
index 9ac49ae12..de4294a63 100644
--- a/src/selection.h
+++ b/src/selection.h
@@ -19,6 +19,7 @@
 #include <vector>
 #include <map>
 #include <list>
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 
 //#include "libnr/nr-rect.h"
diff --git a/src/seltrans.h b/src/seltrans.h
index d1a99f9d3..dd890ee9b 100644
--- a/src/seltrans.h
+++ b/src/seltrans.h
@@ -15,6 +15,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 #include <2geom/point.h>
 #include <2geom/affine.h>
diff --git a/src/sp-conn-end-pair.h b/src/sp-conn-end-pair.h
index fa585d618..6e62b9839 100644
--- a/src/sp-conn-end-pair.h
+++ b/src/sp-conn-end-pair.h
@@ -15,6 +15,7 @@
 
 #include "forward.h"
 #include "libnr/nr-point.h"
+#include <stddef.h>
 #include <sigc++/connection.h>
 #include <sigc++/functors/slot.h>
 #include <sigc++/signal.h>
diff --git a/src/sp-conn-end.h b/src/sp-conn-end.h
index 16a611ec4..052e8ddcb 100644
--- a/src/sp-conn-end.h
+++ b/src/sp-conn-end.h
@@ -2,6 +2,7 @@
 #define SEEN_SP_CONN_END
 
 #include <glib/gtypes.h>
+#include <stddef.h>
 #include <sigc++/connection.h>
 
 #include "sp-use-reference.h"
diff --git a/src/sp-gradient.h b/src/sp-gradient.h
index f670cd451..2adb085c1 100644
--- a/src/sp-gradient.h
+++ b/src/sp-gradient.h
@@ -25,6 +25,7 @@
 #include "sp-gradient-units.h"
 #include "sp-gradient-vector.h"
 
+#include <stddef.h>
 #include <sigc++/connection.h>
 
 struct SPGradientReference;
diff --git a/src/sp-object.h b/src/sp-object.h
index 20cf54098..38d39c4cd 100644
--- a/src/sp-object.h
+++ b/src/sp-object.h
@@ -52,6 +52,7 @@ class SPObjectClass;
 #define SP_OBJECT_WRITE_ALL (1 << 2)
 
 #include <glib-object.h>
+#include <stddef.h>
 #include <sigc++/connection.h>
 #include <sigc++/functors/slot.h>
 #include <sigc++/signal.h>
diff --git a/src/sp-offset.h b/src/sp-offset.h
index 47e597c28..a229e0bb6 100644
--- a/src/sp-offset.h
+++ b/src/sp-offset.h
@@ -16,6 +16,7 @@
 
 #include "sp-shape.h"
 
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 
 #define SP_TYPE_OFFSET            (sp_offset_get_type ())
diff --git a/src/sp-pattern.h b/src/sp-pattern.h
index 54f2c6a9b..fa0541698 100644
--- a/src/sp-pattern.h
+++ b/src/sp-pattern.h
@@ -33,6 +33,7 @@ class SPPatternClass;
 #include "sp-paint-server.h"
 #include "uri-references.h"
 
+#include <stddef.h>
 #include <sigc++/connection.h>
 
 class SPPatternReference : public Inkscape::URIReference {
diff --git a/src/sp-shape.h b/src/sp-shape.h
index 3fd356fdc..b29b0c50b 100644
--- a/src/sp-shape.h
+++ b/src/sp-shape.h
@@ -20,6 +20,7 @@
 #include "sp-marker-loc.h"
 #include <2geom/forward.h>
 
+#include <stddef.h>
 #include <sigc++/connection.h>
 
 #define SP_TYPE_SHAPE (SPShape::getType ())
diff --git a/src/sp-switch.h b/src/sp-switch.h
index 91fdcae46..310655a23 100644
--- a/src/sp-switch.h
+++ b/src/sp-switch.h
@@ -14,6 +14,7 @@
 
 #include "sp-item-group.h"
 
+#include <stddef.h>
 #include <sigc++/connection.h>
 
 #define SP_TYPE_SWITCH            (CSwitch::getType())
diff --git a/src/sp-text.h b/src/sp-text.h
index 116d8d869..c98721ec9 100644
--- a/src/sp-text.h
+++ b/src/sp-text.h
@@ -14,6 +14,7 @@
  */
 
 #include <glib/gtypes.h>
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 #include "sp-item.h"
 #include "sp-string.h"
diff --git a/src/sp-tref-reference.h b/src/sp-tref-reference.h
index c2264f83e..2e340f423 100644
--- a/src/sp-tref-reference.h
+++ b/src/sp-tref-reference.h
@@ -15,6 +15,7 @@
 #include <forward.h>
 #include "sp-item.h"
 #include <uri-references.h>
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 
 #include "util/share.h"
diff --git a/src/sp-use-reference.h b/src/sp-use-reference.h
index 73d46c8aa..25a67b85b 100644
--- a/src/sp-use-reference.h
+++ b/src/sp-use-reference.h
@@ -12,6 +12,7 @@
 #include <forward.h>
 #include "sp-item.h"
 #include <uri-references.h>
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 
 class Path;
diff --git a/src/sp-use.h b/src/sp-use.h
index ff0e1c604..399f30a4c 100644
--- a/src/sp-use.h
+++ b/src/sp-use.h
@@ -13,6 +13,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 #include "svg/svg-length.h"
 #include "sp-item.h"
diff --git a/src/spiral-context.h b/src/spiral-context.h
index d80c9740e..29a5f41b2 100644
--- a/src/spiral-context.h
+++ b/src/spiral-context.h
@@ -16,6 +16,7 @@
  */
 
 #include <gtk/gtktypeutils.h>
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 #include "event-context.h"
 #include "libnr/nr-point.h"
diff --git a/src/star-context.h b/src/star-context.h
index 024bf8d74..3bc8ca386 100644
--- a/src/star-context.h
+++ b/src/star-context.h
@@ -14,6 +14,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 #include "event-context.h"
 #include "libnr/nr-point.h"
diff --git a/src/style.h b/src/style.h
index b4663e8f6..70e84ab42 100644
--- a/src/style.h
+++ b/src/style.h
@@ -24,6 +24,7 @@
 #include "uri.h"
 #include "sp-paint-server.h"
 
+#include <stddef.h>
 #include <sigc++/connection.h>
 
 namespace Inkscape {
diff --git a/src/text-context.h b/src/text-context.h
index 2cceaebb2..ec1710da3 100644
--- a/src/text-context.h
+++ b/src/text-context.h
@@ -15,6 +15,7 @@
  */
 
 /*  #include <gdk/gdkic.h> */
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 #include <gtk/gtkimcontext.h>
 
diff --git a/src/ui/dialog/desktop-tracker.h b/src/ui/dialog/desktop-tracker.h
index edde110af..d73071194 100644
--- a/src/ui/dialog/desktop-tracker.h
+++ b/src/ui/dialog/desktop-tracker.h
@@ -11,6 +11,7 @@
 #ifndef SEEN_DIALOG_DESKTOP_TRACKER
 #define SEEN_DIALOG_DESKTOP_TRACKER
 
+#include <stddef.h>
 #include <sigc++/connection.h>
 #include <glib/gtypes.h>
 
diff --git a/src/ui/dialog/document-metadata.h b/src/ui/dialog/document-metadata.h
index 21915c00f..8194b9920 100644
--- a/src/ui/dialog/document-metadata.h
+++ b/src/ui/dialog/document-metadata.h
@@ -14,6 +14,7 @@
 #define INKSCAPE_UI_DIALOG_DOCUMENT_METADATA_H
 
 #include <list>
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 #include <gtkmm/notebook.h>
 #include <glibmm/i18n.h>
diff --git a/src/ui/dialog/document-properties.h b/src/ui/dialog/document-properties.h
index dbefca235..b88f0db26 100644
--- a/src/ui/dialog/document-properties.h
+++ b/src/ui/dialog/document-properties.h
@@ -15,6 +15,7 @@
 #define INKSCAPE_UI_DIALOG_DOCUMENT_PREFERENCES_H
 
 #include <list>
+#include <stddef.h>
 #include <sigc++/sigc++.h>//
 #include <gtkmm/notebook.h>
 #include <glibmm/i18n.h>
diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h
index f09409d4a..a20278551 100644
--- a/src/ui/dialog/inkscape-preferences.h
+++ b/src/ui/dialog/inkscape-preferences.h
@@ -28,6 +28,7 @@
 #include <gtkmm/frame.h>
 #include <gtkmm/notebook.h>
 #include "ui/widget/preferences-widget.h"
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 #include <glibmm/i18n.h>
 #include <gtkmm/textview.h>
diff --git a/src/ui/dialog/undo-history.cpp b/src/ui/dialog/undo-history.cpp
index 17d032758..e6f113e48 100644
--- a/src/ui/dialog/undo-history.cpp
+++ b/src/ui/dialog/undo-history.cpp
@@ -15,6 +15,7 @@
 
 #include <glibmm/i18n.h>
 #include <gtk/gtkimage.h>
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 
 
diff --git a/src/ui/tool/control-point-selection.h b/src/ui/tool/control-point-selection.h
index a9c929cb1..7e09d50f5 100644
--- a/src/ui/tool/control-point-selection.h
+++ b/src/ui/tool/control-point-selection.h
@@ -14,6 +14,7 @@
 
 #include <memory>
 #include <boost/optional.hpp>
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 #include <2geom/forward.h>
 #include <2geom/point.h>
diff --git a/src/ui/tool/control-point.h b/src/ui/tool/control-point.h
index 0b88786e5..9f62fca42 100644
--- a/src/ui/tool/control-point.h
+++ b/src/ui/tool/control-point.h
@@ -12,6 +12,7 @@
 #define SEEN_UI_TOOL_CONTROL_POINT_H
 
 #include <boost/utility.hpp>
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 #include <gdkmm.h>
 #include <gtkmm.h>
diff --git a/src/ui/tool/manipulator.h b/src/ui/tool/manipulator.h
index fd24e7b61..6866ec9dd 100644
--- a/src/ui/tool/manipulator.h
+++ b/src/ui/tool/manipulator.h
@@ -13,6 +13,7 @@
 
 #include <set>
 #include <map>
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 #include <glib.h>
 #include <gdk/gdk.h>
diff --git a/src/ui/tool/multi-path-manipulator.h b/src/ui/tool/multi-path-manipulator.h
index aef9c1ac9..c25719790 100644
--- a/src/ui/tool/multi-path-manipulator.h
+++ b/src/ui/tool/multi-path-manipulator.h
@@ -11,6 +11,7 @@
 #ifndef SEEN_UI_TOOL_MULTI_PATH_MANIPULATOR_H
 #define SEEN_UI_TOOL_MULTI_PATH_MANIPULATOR_H
 
+#include <stddef.h>
 #include <sigc++/connection.h>
 #include "forward.h"
 #include "ui/tool/commit-events.h"
diff --git a/src/ui/tool/node-tool.h b/src/ui/tool/node-tool.h
index bcf6a8d5e..d005a0bdf 100644
--- a/src/ui/tool/node-tool.h
+++ b/src/ui/tool/node-tool.h
@@ -14,6 +14,7 @@
 #include <memory>
 #include <boost/ptr_container/ptr_map.hpp>
 #include <glib.h>
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 #include "event-context.h"
 #include "forward.h"
diff --git a/src/ui/tool/node.h b/src/ui/tool/node.h
index 451915dbe..b7145790b 100644
--- a/src/ui/tool/node.h
+++ b/src/ui/tool/node.h
@@ -15,6 +15,7 @@
 #include <iterator>
 #include <iosfwd>
 #include <stdexcept>
+#include <cstddef>
 #include <tr1/functional>
 #include <boost/utility.hpp>
 #include <boost/shared_ptr.hpp>
diff --git a/src/ui/view/view.h b/src/ui/view/view.h
index 882746cea..e6853555f 100644
--- a/src/ui/view/view.h
+++ b/src/ui/view/view.h
@@ -15,6 +15,7 @@
  */
 
 #include <gdk/gdktypes.h>
+#include <stddef.h>
 #include <sigc++/connection.h>
 #include "message.h"
 #include "gc-managed.h"
diff --git a/src/ui/widget/color-picker.h b/src/ui/widget/color-picker.h
index 2c246aaa3..346ce5121 100644
--- a/src/ui/widget/color-picker.h
+++ b/src/ui/widget/color-picker.h
@@ -13,6 +13,7 @@
 #ifndef __COLOR_PICKER_H__
 #define __COLOR_PICKER_H__
 
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 #include <gtkmm/button.h>
 #include <gtkmm/dialog.h>
diff --git a/src/ui/widget/page-sizer.h b/src/ui/widget/page-sizer.h
index ba6c8dd13..2072aeccd 100644
--- a/src/ui/widget/page-sizer.h
+++ b/src/ui/widget/page-sizer.h
@@ -13,6 +13,7 @@
 #define INKSCAPE_UI_WIDGET_PAGE_SIZER__H
 
 #include <gtkmm.h>
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 
 #include "helper/units.h"
diff --git a/src/ui/widget/preferences-widget.h b/src/ui/widget/preferences-widget.h
index 565b3468e..6c7f9ce4a 100644
--- a/src/ui/widget/preferences-widget.h
+++ b/src/ui/widget/preferences-widget.h
@@ -26,6 +26,7 @@
 #include <gtkmm/drawingarea.h>
 #include <gtkmm/frame.h>
 #include <gtkmm/filechooserbutton.h>
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 #include <glibmm/i18n.h>
 
diff --git a/src/ui/widget/selected-style.h b/src/ui/widget/selected-style.h
index 0229364c7..e74d5b1ae 100644
--- a/src/ui/widget/selected-style.h
+++ b/src/ui/widget/selected-style.h
@@ -23,6 +23,7 @@
 #include <gtkmm/adjustment.h>
 #include <gtkmm/spinbutton.h>
 
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 
 #include <glibmm/i18n.h>
diff --git a/src/ui/widget/style-subject.h b/src/ui/widget/style-subject.h
index 77e4c4846..6d5c96350 100644
--- a/src/ui/widget/style-subject.h
+++ b/src/ui/widget/style-subject.h
@@ -14,6 +14,7 @@
 #include "libnr/nr-rect.h"
 #include <2geom/rect.h>
 #include "sp-item.h"
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 
 class SPDesktop;
diff --git a/src/uri-references.h b/src/uri-references.h
index c0f9190b1..938dd4cd8 100644
--- a/src/uri-references.h
+++ b/src/uri-references.h
@@ -14,6 +14,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <stddef.h>
 #include <sigc++/connection.h>
 #include <sigc++/trackable.h>
 
diff --git a/src/util/forward-pointer-iterator.h b/src/util/forward-pointer-iterator.h
index 198225d5f..4d1cfa413 100644
--- a/src/util/forward-pointer-iterator.h
+++ b/src/util/forward-pointer-iterator.h
@@ -15,6 +15,7 @@
 #define SEEN_INKSCAPE_UTIL_FORWARD_POINTER_ITERATOR_H
 
 #include <iterator>
+#include <cstddef>
 #include "util/reference.h"
 
 namespace Inkscape {
diff --git a/src/util/share.h b/src/util/share.h
index 4891b9588..6b5e6a4ef 100644
--- a/src/util/share.h
+++ b/src/util/share.h
@@ -14,6 +14,7 @@
 
 #include "gc-core.h"
 #include <cstring>
+#include <cstddef>
 
 namespace Inkscape {
 namespace Util {
diff --git a/src/util/unordered-containers.h b/src/util/unordered-containers.h
index 9411657a5..6f738f0ce 100644
--- a/src/util/unordered-containers.h
+++ b/src/util/unordered-containers.h
@@ -41,6 +41,8 @@
 # define INK_UNORDERED_MAP __gnu_cxx::hash_map
 # define INK_HASH __gnu_cxx::hash
 
+#include <cstddef>
+
 namespace __gnu_cxx {
 // hash function for pointers
 // TR1 and Boost have this defined by default, __gnu_cxx doesn't
diff --git a/src/widgets/desktop-widget.h b/src/widgets/desktop-widget.h
index 1bb10fc51..0102897e5 100644
--- a/src/widgets/desktop-widget.h
+++ b/src/widgets/desktop-widget.h
@@ -22,6 +22,7 @@
 #include "ui/view/view-widget.h"
 #include "ui/view/edit-widget-interface.h"
 
+#include <stddef.h>
 #include <sigc++/connection.h>
 
 // forward declaration
diff --git a/src/widgets/gradient-image.h b/src/widgets/gradient-image.h
index d0864b6e8..7b3854a02 100644
--- a/src/widgets/gradient-image.h
+++ b/src/widgets/gradient-image.h
@@ -19,6 +19,7 @@ class SPGradient;
 
 #include <glib.h>
 
+#include <stddef.h>
 #include <sigc++/connection.h>
 
 #define SP_TYPE_GRADIENT_IMAGE (sp_gradient_image_get_type ())
diff --git a/src/widgets/gradient-vector.h b/src/widgets/gradient-vector.h
index 9147f9cc1..012d4e9a3 100644
--- a/src/widgets/gradient-vector.h
+++ b/src/widgets/gradient-vector.h
@@ -17,6 +17,7 @@
 
 #include <glib.h>
 
+#include <stddef.h>
 #include <sigc++/connection.h>
 
 #include <gtk/gtkvbox.h>
diff --git a/src/widgets/sp-attribute-widget.h b/src/widgets/sp-attribute-widget.h
index 2703bd98a..617c5b012 100644
--- a/src/widgets/sp-attribute-widget.h
+++ b/src/widgets/sp-attribute-widget.h
@@ -14,6 +14,7 @@
 #define SEEN_DIALOGS_SP_ATTRIBUTE_WIDGET_H
 
 #include <glib.h>
+#include <stddef.h>
 #include <sigc++/connection.h>
 
 #define SP_TYPE_ATTRIBUTE_WIDGET (sp_attribute_widget_get_type ())
diff --git a/src/widgets/sp-color-notebook.cpp b/src/widgets/sp-color-notebook.cpp
index 8429434a6..174971555 100644
--- a/src/widgets/sp-color-notebook.cpp
+++ b/src/widgets/sp-color-notebook.cpp
@@ -22,6 +22,7 @@
 #include <cstring>
 #include <string>
 #include <cstdlib>
+#include <cstddef>
 #include <gtk/gtk.h>
 #include <glibmm/i18n.h>
 
diff --git a/src/xml/helper-observer.h b/src/xml/helper-observer.h
index d028d390b..e7881cd4d 100644
--- a/src/xml/helper-observer.h
+++ b/src/xml/helper-observer.h
@@ -5,6 +5,7 @@
 #include "node.h"
 #include "../sp-object.h"
 //#include "../sp-object-repr.h"
+#include <stddef.h>
 #include <sigc++/sigc++.h>
 
 namespace Inkscape {