6 files changed, 4 insertions, 27 deletions
diff --git a/src/display/CMakeLists.txt b/src/display/CMakeLists.txt
index 800c4d0d4..d4f8c16ff 100644
--- a/src/display/CMakeLists.txt
+++ b/src/display/CMakeLists.txt
@@ -42,7 +42,6 @@ set(display_SRC
 	nr-filter-tile.cpp
 	nr-filter-turbulence.cpp
 	nr-filter-units.cpp
-	nr-filter-utils.cpp
 	nr-filter.cpp
 	nr-light.cpp
 	nr-style.cpp
diff --git a/src/display/Makefile_insert b/src/display/Makefile_insert
index 2355c3653..20e498981 100644
--- a/src/display/Makefile_insert
+++ b/src/display/Makefile_insert
@@ -90,7 +90,6 @@ ink_common_sources += \
 	display/nr-filter-types.h       \
 	display/nr-filter-units.cpp	\
 	display/nr-filter-units.h	\
-	display/nr-filter-utils.cpp     \
 	display/nr-filter-utils.h       \
 	display/nr-light.cpp			\
 	display/nr-light.h				\
diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp
index 88c23bf62..a2df86823 100644
--- a/src/display/canvas-axonomgrid.cpp
+++ b/src/display/canvas-axonomgrid.cpp
@@ -50,7 +50,7 @@
 #include "svg/svg-color.h"
 #include "2geom/line.h"
 #include "2geom/angle.h"
-#include "util/mathfns.h"
+#include "helper/mathfns.h"
 #include "round.h"
 #include "util/units.h"
 
diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp
index 0f58096ce..9b9f64529 100644
--- a/src/display/canvas-grid.cpp
+++ b/src/display/canvas-grid.cpp
@@ -35,7 +35,7 @@
 #include "ui/widget/registered-widget.h"
 #include "desktop.h"
 #include "sp-canvas-util.h"
-#include "util/mathfns.h"
+#include "helper/mathfns.h"
 
 #include "display/cairo-utils.h"
 #include "display/canvas-axonomgrid.h"
@@ -50,7 +50,7 @@
 #include "sp-root.h"
 #include "svg/svg-color.h"
 #include "svg/stringstream.h"
-#include "util/mathfns.h"
+#include "helper/mathfns.h"
 #include "xml/node-event-vector.h"
 #include "verbs.h"
 #include "display/sp-canvas.h"
diff --git a/src/display/nr-filter-utils.cpp b/src/display/nr-filter-utils.cpp
deleted file mode 100644
index 1ba341791..000000000
--- a/src/display/nr-filter-utils.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "nr-filter-utils.h"
-
-namespace Inkscape {
-namespace Filters {
-
-/* Everything moved to .h, because they were short functions that should
- * get inlined */
-
-} /* namespace Filters */
-} /* namespace Inkscape */
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/display/nr-filter.h b/src/display/nr-filter.h
index 9a30efabd..211d8ddd9 100644
--- a/src/display/nr-filter.h
+++ b/src/display/nr-filter.h
@@ -18,7 +18,7 @@
 #include "display/nr-filter-types.h"
 #include "svg/svg-length.h"
 #include "sp-filter-units.h"
-#include "gc-managed.h"
+#include "inkgc/gc-managed.h"
 
 namespace Inkscape {
 class DrawingContext;