13 files changed, 2 insertions, 32 deletions
diff --git a/src/guide-snapper.cpp b/src/guide-snapper.cpp
index 7ee35255f..3a9a861e5 100644
--- a/src/guide-snapper.cpp
+++ b/src/guide-snapper.cpp
@@ -12,8 +12,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "libnr/nr-values.h"
-#include "libnr/nr-point-fns.h"
 #include "sp-namedview.h"
 #include "desktop.h"
 #include "sp-guide.h"
diff --git a/src/guide-snapper.h b/src/guide-snapper.h
index 239e8b050..f9f433bf4 100644
--- a/src/guide-snapper.h
+++ b/src/guide-snapper.h
@@ -15,8 +15,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "libnr/nr-forward.h"
-#include "libnr/nr-coord.h"
 #include "line-snapper.h"
 
 struct SPNamedView;
diff --git a/src/line-snapper.cpp b/src/line-snapper.cpp
index dee944afd..a18fb8518 100644
--- a/src/line-snapper.cpp
+++ b/src/line-snapper.cpp
@@ -11,8 +11,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "libnr/nr-values.h"
-#include "libnr/nr-point-fns.h"
 #include <2geom/geom.h>
 #include "line-snapper.h"
 #include "snapped-line.h"
diff --git a/src/object-snapper.cpp b/src/object-snapper.cpp
index 9a7053c4c..b02b9786a 100644
--- a/src/object-snapper.cpp
+++ b/src/object-snapper.cpp
@@ -12,8 +12,6 @@
  */
 
 #include "svg/svg.h"
-#include "libnr/nr-rect-ops.h"
-#include "libnr/nr-point-fns.h"
 #include <2geom/path-intersection.h>
 #include <2geom/point.h>
 #include <2geom/rect.h>
diff --git a/src/snap.cpp b/src/snap.cpp
index 130742483..a22f25ab0 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -25,10 +25,6 @@
 #include "snapped-line.h"
 #include "snapped-curve.h"
 
-#include <libnr/nr-point-fns.h>
-#include <libnr/nr-scale-ops.h>
-#include <libnr/nr-values.h>
-
 #include "display/canvas-grid.h"
 #include "display/snap-indicator.h"
 
diff --git a/src/snap.h b/src/snap.h
index eba18f5de..ac314c66d 100644
--- a/src/snap.h
+++ b/src/snap.h
@@ -20,11 +20,6 @@
 
 #include <vector>
 
-#include <libnr/nr-coord.h>
-#include <libnr/nr-dim2.h>
-#include <libnr/nr-forward.h>
-#include <libnr/nr-scale.h>
-
 #include "guide-snapper.h"
 #include "object-snapper.h"
 #include "snap-preferences.h"
diff --git a/src/snapped-curve.cpp b/src/snapped-curve.cpp
index e66b44401..4da2d4c7d 100644
--- a/src/snapped-curve.cpp
+++ b/src/snapped-curve.cpp
@@ -9,10 +9,8 @@
  */
 
 #include "snapped-curve.h"
-#include "libnr/nr-values.h"
 #include <2geom/crossing.h>
 #include <2geom/path-intersection.h>
-#include <libnr/nr-convert2geom.h>
 
 Inkscape::SnappedCurve::SnappedCurve(Geom::Point const &snapped_point, Geom::Coord const &snapped_distance, Geom::Coord const &snapped_tolerance, bool const &always_snap, bool const &fully_constrained, Geom::Curve const *curve, SnapSourceType source, SnapTargetType target)
 {
diff --git a/src/snapped-curve.h b/src/snapped-curve.h
index 60f5fa0d9..0a1fe2431 100644
--- a/src/snapped-curve.h
+++ b/src/snapped-curve.h
@@ -13,9 +13,6 @@
 
 #include <vector>
 #include <list>
-#include "libnr/nr-coord.h"
-#include "libnr/nr-point.h"
-#include <libnr/nr-point-fns.h>
 #include "snapped-point.h"
 #include <2geom/forward.h>
 
diff --git a/src/snapped-line.cpp b/src/snapped-line.cpp
index 706893673..27e024821 100644
--- a/src/snapped-line.cpp
+++ b/src/snapped-line.cpp
@@ -10,7 +10,6 @@
 
 #include "snapped-line.h"
 #include <2geom/geom.h>
-#include "libnr/nr-values.h"
 
 Inkscape::SnappedLineSegment::SnappedLineSegment(Geom::Point const &snapped_point, Geom::Coord const &snapped_distance, SnapSourceType const &source, SnapTargetType const &target, Geom::Coord const &snapped_tolerance, bool const &always_snap, Geom::Point const &start_point_of_line, Geom::Point const &end_point_of_line)
     : _start_point_of_line(start_point_of_line), _end_point_of_line(end_point_of_line)
diff --git a/src/snapped-line.h b/src/snapped-line.h
index 3d6668311..85bbf1caa 100644
--- a/src/snapped-line.h
+++ b/src/snapped-line.h
@@ -13,9 +13,6 @@
 
 #include <vector>
 #include <list>
-#include "libnr/nr-coord.h"
-#include "libnr/nr-point.h"
-#include <libnr/nr-point-fns.h>
 #include "snapped-point.h"
 
 namespace Inkscape
diff --git a/src/snapped-point.h b/src/snapped-point.h
index 4f27c3be0..cc224452d 100644
--- a/src/snapped-point.h
+++ b/src/snapped-point.h
@@ -14,9 +14,8 @@
 
 #include <vector>
 #include <list>
-#include "libnr/nr-coord.h"
-#include "libnr/nr-point.h"
-#include <libnr/nr-values.h>
+#include <libnr/nr-values.h> //Because of NR_HUGE
+#include <2geom/geom.h>
 
 namespace Inkscape
 {
diff --git a/src/snapper.cpp b/src/snapper.cpp
index 7e08c22ef..2c646f4d6 100644
--- a/src/snapper.cpp
+++ b/src/snapper.cpp
@@ -9,7 +9,6 @@
  *  Released under GNU GPL, read the file 'COPYING' for more information.
  */
 
-#include "libnr/nr-values.h"
 #include "sp-namedview.h"
 #include "inkscape.h"
 #include "desktop.h"
diff --git a/src/snapper.h b/src/snapper.h
index 08b10e41b..0110a9154 100644
--- a/src/snapper.h
+++ b/src/snapper.h
@@ -14,8 +14,6 @@
 
 #include <map>
 #include <list>
-#include "libnr/nr-coord.h"
-#include "libnr/nr-point.h"
 #include <boost/optional.hpp>
 
 #include "snapped-point.h"