Remove 'document-private.h' where not needed plus some other header cleanup.

8 files changed, 23 insertions, 22 deletions

diff --git a/src/object/persp3d.cpp b/src/object/persp3d.cpp
index 7861a7565..0c4a3205a 100644
--- a/src/object/persp3d.cpp
+++ b/src/object/persp3d.cpp
@@ -17,7 +17,6 @@
 #include "sp-defs.h"
 
 #include "attributes.h"
-#include "document-private.h"
 #include "document-undo.h"
 #include "vanishing-point.h"
 #include "ui/tools/box3d-tool.h"
diff --git a/src/object/sp-clippath.cpp b/src/object/sp-clippath.cpp
index cb1e30d8b..3b4169d34 100644
--- a/src/object/sp-clippath.cpp
+++ b/src/object/sp-clippath.cpp
@@ -20,7 +20,6 @@
 #include "enums.h"
 #include "attributes.h"
 #include "document.h"
-#include "document-private.h"
 #include "style.h"
 
 #include <2geom/transforms.h>
diff --git a/src/object/sp-gradient.cpp b/src/object/sp-gradient.cpp
index 0fe7f1943..c8e7f92b0 100644
--- a/src/object/sp-gradient.cpp
+++ b/src/object/sp-gradient.cpp
@@ -36,13 +36,11 @@
 #include <sigc++/functors/ptr_fun.h>
 #include <sigc++/adaptors/bind.h>
 
-#include "bad-uri-exception.h"
-#include "display/cairo-utils.h"
-#include "svg/svg.h"
-#include "svg/css-ostringstream.h"
 #include "attributes.h"
-#include "document-private.h"
+#include "bad-uri-exception.h"
+#include "document.h"
 #include "gradient-chemistry.h"
+
 #include "sp-gradient-reference.h"
 #include "sp-linear-gradient.h"
 #include "sp-radial-gradient.h"
@@ -51,8 +49,10 @@
 #include "sp-mesh-patch.h"
 #include "sp-stop.h"
 
-/// Has to be power of 2   Seems to be unused.
-//#define NCOLORS NR_GRADIENT_VECTOR_LENGTH
+#include "display/cairo-utils.h"
+
+#include "svg/svg.h"
+#include "svg/css-ostringstream.h"
 
 bool SPGradient::hasStops() const
 {
diff --git a/src/object/sp-hatch-path.cpp b/src/object/sp-hatch-path.cpp
index 5cacaa9be..76e7d4100 100644
--- a/src/object/sp-hatch-path.cpp
+++ b/src/object/sp-hatch-path.cpp
@@ -24,7 +24,6 @@
 #include "display/drawing-shape.h"
 #include "helper/geom.h"
 #include "attributes.h"
-#include "document-private.h"
 #include "sp-item.h"
 #include "sp-hatch-path.h"
 #include "svg/css-ostringstream.h"
diff --git a/src/object/sp-hatch.cpp b/src/object/sp-hatch.cpp
index 2fbf4cc4c..7183b561c 100644
--- a/src/object/sp-hatch.cpp
+++ b/src/object/sp-hatch.cpp
@@ -20,17 +20,20 @@
 #include <2geom/transforms.h>
 #include <sigc++/functors/mem_fun.h>
 
+#include "attributes.h"
 #include "bad-uri-exception.h"
-#include "svg/svg.h"
+#include "document.h"
+
 #include "display/cairo-utils.h"
 #include "display/drawing-context.h"
 #include "display/drawing-surface.h"
 #include "display/drawing.h"
 #include "display/drawing-pattern.h"
-#include "attributes.h"
-#include "document-private.h"
+
 #include "sp-hatch-path.h"
 
+#include "svg/svg.h"
+
 SPHatch::SPHatch()
     : SPPaintServer(),
       href(),
diff --git a/src/object/sp-marker.cpp b/src/object/sp-marker.cpp
index 7cf9cd708..8017a182d 100644
--- a/src/object/sp-marker.cpp
+++ b/src/object/sp-marker.cpp
@@ -24,7 +24,6 @@
 #include "xml/repr.h"
 #include "attributes.h"
 #include "document.h"
-#include "document-private.h"
 #include "preferences.h"
 
 #include "sp-marker.h"
diff --git a/src/object/sp-mask.cpp b/src/object/sp-mask.cpp
index 08f315cc2..3dfd5b72a 100644
--- a/src/object/sp-mask.cpp
+++ b/src/object/sp-mask.cpp
@@ -22,7 +22,6 @@
 #include "enums.h"
 #include "attributes.h"
 #include "document.h"
-#include "document-private.h"
 #include "style.h"
 #include "attributes.h"
 
diff --git a/src/object/sp-pattern.cpp b/src/object/sp-pattern.cpp
index e25f48473..925b3e3ee 100644
--- a/src/object/sp-pattern.cpp
+++ b/src/object/sp-pattern.cpp
@@ -16,23 +16,26 @@
 
 #include <cstring>
 #include <string>
+
 #include <glibmm.h>
+
 #include <2geom/transforms.h>
 
+#include "attributes.h"
 #include "bad-uri-exception.h"
-#include "svg/svg.h"
+#include "document.h"
+
+#include "sp-defs.h"
+#include "sp-factory.h"
+#include "sp-item.h"
+
 #include "display/cairo-utils.h"
 #include "display/drawing-context.h"
 #include "display/drawing-surface.h"
 #include "display/drawing.h"
 #include "display/drawing-group.h"
-#include "attributes.h"
-#include "document-private.h"
-
-#include "sp-factory.h"
 
-#include "sp-defs.h"
-#include "sp-item.h"
+#include "svg/svg.h"
 
 SPPattern::SPPattern()
     : SPPaintServer()