4 files changed, 10 insertions, 10 deletions
diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp
index 59bb1e765..1c74e3d86 100644
--- a/src/display/canvas-axonomgrid.cpp
+++ b/src/display/canvas-axonomgrid.cpp
@@ -34,10 +34,13 @@
 #include "sp-namedview.h"
 #include "sp-object.h"
 #include "svg/svg-color.h"
+#include "ui/widget/registered-widget.h"
 #include "util/mathfns.h"
 #include "xml/node-event-vector.h"
 #include "round.h"
 
+#include <gtkmm/box.h>
+#include <gtkmm/label.h>
 #include <gtkmm/table.h>
 
 enum Dim3 { X=0, Y, Z };
diff --git a/src/display/canvas-axonomgrid.h b/src/display/canvas-axonomgrid.h
index b5757f4be..0a12d3743 100644
--- a/src/display/canvas-axonomgrid.h
+++ b/src/display/canvas-axonomgrid.h
@@ -8,12 +8,7 @@
 
 #include <display/sp-canvas.h>
 #include "xml/repr.h"
-#include <gtkmm/box.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 "xml/node-event-vector.h"
diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp
index 3a0b18f00..b847b7854 100644
--- a/src/display/canvas-grid.cpp
+++ b/src/display/canvas-grid.cpp
@@ -30,9 +30,12 @@
 #include "sp-object.h"
 #include "svg/svg-color.h"
 #include "svg/stringstream.h"
+#include "ui/widget/registered-widget.h"
 #include "util/mathfns.h"
 #include "xml/node-event-vector.h"
 
+#include <gtkmm/box.h>
+#include <gtkmm/label.h>
 #include <gtkmm/table.h>
 
 using Inkscape::DocumentUndo;
diff --git a/src/display/canvas-grid.h b/src/display/canvas-grid.h
index 55d53f045..f3b285be7 100644
--- a/src/display/canvas-grid.h
+++ b/src/display/canvas-grid.h
@@ -11,13 +11,8 @@
 #include <cstring>
 #include <string>
 
-#include <gtkmm/box.h>
-
 #include "sp-canvas-item.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 "xml/node-event-vector.h"
 #include "snapper.h"
@@ -28,6 +23,10 @@ struct SPNamedView;
 struct SPCanvasBuf;
 class  SPDocument;
 
+namespace Gtk {
+	class Widget;
+}
+
 namespace Inkscape {