3 files changed, 5 insertions, 2 deletions
diff --git a/src/ui/tool/control-point.cpp b/src/ui/tool/control-point.cpp
index 069dcc67b..8c4924f26 100644
--- a/src/ui/tool/control-point.cpp
+++ b/src/ui/tool/control-point.cpp
@@ -7,8 +7,8 @@
  */
 
 #include <iostream>
-#include <gdk/gdkkeysyms.h>
 #include <gdkmm.h>
+#include <gtkmm.h>
 #include <2geom/point.h>
 #include "desktop.h"
 #include "desktop-handles.h"
diff --git a/src/ui/tool/node-tool.h b/src/ui/tool/node-tool.h
index bc5267bb2..49b1496d4 100644
--- a/src/ui/tool/node-tool.h
+++ b/src/ui/tool/node-tool.h
@@ -25,6 +25,9 @@
 #define INK_IS_NODE_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INK_TYPE_NODE_TOOL))
 #define INK_IS_NODE_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INK_TYPE_NODE_TOOL))
 
+class InkNodeTool;
+class InkNodeToolClass;
+
 namespace Inkscape {
 
 namespace Display {
diff --git a/src/ui/tool/path-manipulator.h b/src/ui/tool/path-manipulator.h
index 8bc097ed6..a235a3b05 100644
--- a/src/ui/tool/path-manipulator.h
+++ b/src/ui/tool/path-manipulator.h
@@ -22,7 +22,7 @@
 
 struct SPCanvasItem;
 class SPCurve;
-class SPPath;
+struct SPPath;
 
 namespace Inkscape {
 namespace XML { class Node; }