Minor include file cleanup.

10 files changed, 8 insertions, 17 deletions

diff --git a/src/display/cairo-utils.cpp b/src/display/cairo-utils.cpp
index aeda3f379..c94cb45ae 100644
--- a/src/display/cairo-utils.cpp
+++ b/src/display/cairo-utils.cpp
@@ -15,8 +15,11 @@
 #include "display/cairo-utils.h"
 
 #include <stdexcept>
+
 #include <glib/gstdio.h>
 #include <glibmm/fileutils.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include <2geom/pathvector.h>
 #include <2geom/curves.h>
 #include <2geom/affine.h>
@@ -24,12 +27,13 @@
 #include <2geom/path.h>
 #include <2geom/transforms.h>
 #include <2geom/sbasis-to-bezier.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include <boost/operators.hpp>
+#include <boost/optional/optional.hpp>
 
 #include "color.h"
 #include "style.h"
-#include "helper/geom-curves.h"
-#include "display/cairo-templates.h"
+#include "cairo-templates.h"
 
 /**
  * Key for cairo_surface_t to keep track of current color interpolation value
diff --git a/src/display/cairo-utils.h b/src/display/cairo-utils.h
index 72087471d..bada170ca 100644
--- a/src/display/cairo-utils.h
+++ b/src/display/cairo-utils.h
@@ -13,7 +13,6 @@
 #define SEEN_INKSCAPE_DISPLAY_CAIRO_UTILS_H
 
 #include <2geom/forward.h>
-#include <boost/noncopyable.hpp>
 #include <cairomm/cairomm.h>
 #include "style.h"
 
diff --git a/src/display/canvas-axonomgrid.h b/src/display/canvas-axonomgrid.h
index 92cdb4c50..ad6ade0a7 100644
--- a/src/display/canvas-axonomgrid.h
+++ b/src/display/canvas-axonomgrid.h
@@ -13,7 +13,6 @@
 #include "canvas-grid.h"
 
 struct SPCanvasBuf;
-class  SPDesktop;
 class SPNamedView;
 
 namespace Inkscape {
diff --git a/src/display/canvas-debug.cpp b/src/display/canvas-debug.cpp
index 1748029e9..00a4f3fee 100644
--- a/src/display/canvas-debug.cpp
+++ b/src/display/canvas-debug.cpp
@@ -9,9 +9,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "inkscape.h"
-#include "desktop.h"
-
 #include "canvas-debug.h"
 #include "sp-canvas.h"
 #include "cairo-utils.h"
diff --git a/src/display/canvas-temporary-item.cpp b/src/display/canvas-temporary-item.cpp
index f55c8bf4e..cb7145d61 100644
--- a/src/display/canvas-temporary-item.cpp
+++ b/src/display/canvas-temporary-item.cpp
@@ -50,7 +50,7 @@ TemporaryItem::~TemporaryItem()
     if (canvasitem) {
         // destroying the item automatically hides it
         sp_canvas_item_destroy(canvasitem);
-        canvasitem = NULL;
+        canvasitem = nullptr;
     }
 }
 
diff --git a/src/display/canvas-temporary-item.h b/src/display/canvas-temporary-item.h
index 39ca2fc65..d7d3951f1 100644
--- a/src/display/canvas-temporary-item.h
+++ b/src/display/canvas-temporary-item.h
@@ -11,7 +11,6 @@
  */
 
 
-#include <cstddef>
 #include <sigc++/signal.h>
 
 struct SPCanvasItem;
diff --git a/src/display/canvas-text.cpp b/src/display/canvas-text.cpp
index efef018e6..4117825e3 100644
--- a/src/display/canvas-text.cpp
+++ b/src/display/canvas-text.cpp
@@ -19,7 +19,6 @@
 #include "canvas-text.h"
 #include "display/cairo-utils.h"
 #include "desktop.h"
-#include "color.h"
 #include "display/sp-canvas.h"
 
 static void sp_canvastext_destroy(SPCanvasItem *object);
diff --git a/src/display/drawing-context.cpp b/src/display/drawing-context.cpp
index 1a1f20425..ffd60ef9f 100644
--- a/src/display/drawing-context.cpp
+++ b/src/display/drawing-context.cpp
@@ -12,7 +12,6 @@
 #include "display/drawing-context.h"
 #include "display/drawing-surface.h"
 #include "display/cairo-utils.h"
-#include "helper/geom.h"
 
 namespace Inkscape {
 
diff --git a/src/display/drawing-context.h b/src/display/drawing-context.h
index a15e0d0e5..b0e99bbdf 100644
--- a/src/display/drawing-context.h
+++ b/src/display/drawing-context.h
@@ -12,8 +12,6 @@
 #ifndef SEEN_INKSCAPE_DISPLAY_DRAWING_CONTEXT_H
 #define SEEN_INKSCAPE_DISPLAY_DRAWING_CONTEXT_H
 
-#include <2geom/affine.h>
-#include <2geom/angle.h>
 #include <2geom/rect.h>
 #include <2geom/transforms.h>
 #include <boost/utility.hpp>
diff --git a/src/display/drawing-group.cpp b/src/display/drawing-group.cpp
index 018f23e74..6abce34a2 100644
--- a/src/display/drawing-group.cpp
+++ b/src/display/drawing-group.cpp
@@ -10,12 +10,9 @@
  */
 
 #include "display/drawing.h"
-#include "display/drawing-context.h"
 #include "display/drawing-item.h"
 #include "display/drawing-group.h"
-#include "style.h"
 
-#include "display/cairo-utils.h"
 
 namespace Inkscape {