2 files changed, 6 insertions, 4 deletions
diff --git a/src/measure-context.cpp b/src/measure-context.cpp
index 9d8dc2b2f..7570e36e7 100644
--- a/src/measure-context.cpp
+++ b/src/measure-context.cpp
@@ -309,10 +309,6 @@ static void calculate_intersections(SPDesktop * /*desktop*/, SPItem* item, Geom:
 }
 
 bool SPMeasureContext::root_handler(GdkEvent* event) {
-    Geom::Point start_point;
-    boost::optional<Geom::Point> explicitBase;
-    boost::optional<Geom::Point> lastEnd;
-
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100);
 
diff --git a/src/measure-context.h b/src/measure-context.h
index e42265045..7d5a88ab7 100644
--- a/src/measure-context.h
+++ b/src/measure-context.h
@@ -13,6 +13,8 @@
  */
 
 #include "event-context.h"
+#include <2geom/point.h>
+#include <boost/optional.hpp>
 
 #define SP_MEASURE_CONTEXT(obj) (dynamic_cast<SPMeasureContext*>((SPEventContext*)obj))
 #define SP_IS_MEASURE_CONTEXT(obj) (dynamic_cast<const SPMeasureContext*>((const SPEventContext*)obj) != NULL)
@@ -31,6 +33,10 @@ public:
 
 private:
 	SPCanvasItem* grabbed;
+
+    Geom::Point start_point;
+    boost::optional<Geom::Point> explicitBase;
+    boost::optional<Geom::Point> lastEnd;
 };
 
 #endif // SEEN_SP_MEASURING_CONTEXT_H