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

39 files changed, 63 insertions, 70 deletions

diff --git a/src/extension/internal/cdr-input.cpp b/src/extension/internal/cdr-input.cpp
index 095208a3d..25fc4e704 100644
--- a/src/extension/internal/cdr-input.cpp
+++ b/src/extension/internal/cdr-input.cpp
@@ -50,7 +50,6 @@
 #include "extension/input.h"
 
 #include "document.h"
-#include "document-private.h"
 #include "inkscape.h"
 
 #include "ui/dialog-events.h"
diff --git a/src/extension/internal/gdkpixbuf-input.cpp b/src/extension/internal/gdkpixbuf-input.cpp
index 31b347d5b..e3c7f1f89 100644
--- a/src/extension/internal/gdkpixbuf-input.cpp
+++ b/src/extension/internal/gdkpixbuf-input.cpp
@@ -1,23 +1,29 @@
+#include <set>
+
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdkmm/pixbuf.h>
 #include <gdkmm/pixbufformat.h>
-
 #include <glib/gprintf.h>
 #include <glibmm/i18n.h>
-#include "io/dir-util.h"
-#include "display/cairo-utils.h"
-#include "document-private.h"
+
+#include "document.h"
 #include "document-undo.h"
-#include "extension/input.h"
-#include "extension/system.h"
-#include "image-resolution.h"
 #include "gdkpixbuf-input.h"
+#include "image-resolution.h"
 #include "preferences.h"
 #include "selection-chemistry.h"
+
+#include "display/cairo-utils.h"
+
+#include "extension/input.h"
+#include "extension/system.h"
+
+#include "io/dir-util.h"
+
 #include "object/sp-image.h"
 #include "object/sp-root.h"
+
 #include "util/units.h"
-#include <set>
 
 namespace Inkscape {
 
diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
index 9e5217dd3..1c9dd9223 100644
--- a/src/extension/internal/pdfinput/pdf-input.cpp
+++ b/src/extension/internal/pdfinput/pdf-input.cpp
@@ -52,7 +52,6 @@
 #include "svg-builder.h"
 #include "pdf-parser.h"
 
-#include "document-private.h"
 #include "document-undo.h"
 #include "inkscape.h"
 #include "util/units.h"
diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
index 3d8d9b9b1..4d678c3e4 100644
--- a/src/extension/internal/pdfinput/svg-builder.cpp
+++ b/src/extension/internal/pdfinput/svg-builder.cpp
@@ -22,9 +22,9 @@
 #include "svg-builder.h"
 #include "pdf-parser.h"
 
-#include <png.h>
+#include "document.h"
+#include "png.h"
 
-#include "document-private.h"
 #include "xml/document.h"
 #include "xml/node.h"
 #include "xml/repr.h"
diff --git a/src/extension/internal/vsd-input.cpp b/src/extension/internal/vsd-input.cpp
index 019e1852d..22012a015 100644
--- a/src/extension/internal/vsd-input.cpp
+++ b/src/extension/internal/vsd-input.cpp
@@ -49,7 +49,6 @@
 #include "extension/input.h"
 
 #include "document.h"
-#include "document-private.h"
 #include "inkscape.h"
 
 #include "ui/dialog-events.h"
diff --git a/src/extension/param/enum.cpp b/src/extension/param/enum.cpp
index 0de20a382..277d05c44 100644
--- a/src/extension/param/enum.cpp
+++ b/src/extension/param/enum.cpp
@@ -20,7 +20,6 @@
 
 #include "xml/node.h"
 #include "extension/extension.h"
-#include "document-private.h"
 #include "enum.h"
 #include "preferences.h"
 
diff --git a/src/extension/param/enum.h b/src/extension/param/enum.h
index 0c80bdcf6..6d93c8e83 100644
--- a/src/extension/param/enum.h
+++ b/src/extension/param/enum.h
@@ -15,7 +15,10 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <vector>
+
 #include "parameter.h"
+#include "document.h"
 
 namespace Gtk {
 class Widget;
diff --git a/src/extension/param/notebook.cpp b/src/extension/param/notebook.cpp
index de8508e5a..abfdee457 100644
--- a/src/extension/param/notebook.cpp
+++ b/src/extension/param/notebook.cpp
@@ -23,7 +23,6 @@
 
 #include <extension/extension.h>
 #include "preferences.h"
-#include "document-private.h"
 
 #include "notebook.h"
 
diff --git a/src/extension/param/parameter.cpp b/src/extension/param/parameter.cpp
index 31b40d2cd..4b5a23a8d 100644
--- a/src/extension/param/parameter.cpp
+++ b/src/extension/param/parameter.cpp
@@ -16,27 +16,31 @@
 #endif
 
 #include <cstring>
+#include <list>
 
-#include "ui/widget/color-notebook.h"
-#include <xml/node.h>
-
-#include <extension/extension.h>
-#include "document-private.h"
-#include "object/sp-defs.h"
-#include <color.h>
+#include <glibmm/i18n.h>
+#include <sigc++/sigc++.h>
 
-#include "parameter.h"
 #include "bool.h"
 #include "color.h"
+#include "color.h"
 #include "description.h"
 #include "enum.h"
 #include "float.h"
 #include "int.h"
 #include "notebook.h"
+#include "parameter.h"
 #include "radiobutton.h"
 #include "string.h"
 
-#include <glibmm/i18n.h>
+#include "extension/extension.h"
+
+#include "object/sp-defs.h"
+
+#include "ui/widget/color-notebook.h"
+
+#include "xml/node.h"
+
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/extension/param/parameter.h b/src/extension/param/parameter.h
index cb6c84441..f784fdd01 100644
--- a/src/extension/param/parameter.h
+++ b/src/extension/param/parameter.h
@@ -13,6 +13,10 @@
 #ifndef SEEN_INK_EXTENSION_PARAM_H__
 #define SEEN_INK_EXTENSION_PARAM_H__
 
+#include <string>
+
+#include <glibmm/ustring.h>
+
 class SPDocument;
 
 namespace Gtk {
diff --git a/src/extension/param/radiobutton.cpp b/src/extension/param/radiobutton.cpp
index 8044e899e..cc539dd92 100644
--- a/src/extension/param/radiobutton.cpp
+++ b/src/extension/param/radiobutton.cpp
@@ -22,7 +22,6 @@
 #include "xml/node.h"
 #include "extension/extension.h"
 #include "preferences.h"
-#include "document-private.h"
 
 #include "radiobutton.h"
 
diff --git a/src/extension/patheffect.cpp b/src/extension/patheffect.cpp
index 34c2be075..c112e6843 100644
--- a/src/extension/patheffect.cpp
+++ b/src/extension/patheffect.cpp
@@ -7,7 +7,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "document-private.h"
 
 #include "patheffect.h"
 #include "db.h"
diff --git a/src/file.cpp b/src/file.cpp
index e67c79f7b..5ea62f742 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -36,7 +36,6 @@
 #include "file.h"
 
 #include "desktop.h"
-#include "document-private.h"
 #include "document-undo.h"
 #include "event-log.h"
 #include "id-clash.h"
diff --git a/src/filter-chemistry.cpp b/src/filter-chemistry.cpp
index 2ce29b852..2157bac92 100644
--- a/src/filter-chemistry.cpp
+++ b/src/filter-chemistry.cpp
@@ -13,19 +13,19 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "filter-chemistry.h"
 
 #include <cstring>
 #include <glibmm.h>
 
-#include "document-private.h"
 #include "desktop-style.h"
-
-#include "filter-chemistry.h"
+#include "document.h"
 #include "filter-enums.h"
+#include "style.h"
 
 #include "object/sp-defs.h"
 #include "object/sp-item.h"
-#include "style.h"
+
 #include "object/filters/blend.h"
 #include "object/filters/gaussian-blur.h"
 
diff --git a/src/gradient-chemistry.cpp b/src/gradient-chemistry.cpp
index 97c77d146..8b5d2d1ff 100644
--- a/src/gradient-chemistry.cpp
+++ b/src/gradient-chemistry.cpp
@@ -27,7 +27,6 @@
 
 #include "desktop-style.h"
 #include "desktop.h"
-#include "document-private.h"
 #include "document-undo.h"
 #include "gradient-chemistry.h"
 #include "gradient-drag.h"
diff --git a/src/helper/stock-items.cpp b/src/helper/stock-items.cpp
index f80b3dd75..dbd9e6826 100644
--- a/src/helper/stock-items.cpp
+++ b/src/helper/stock-items.cpp
@@ -21,7 +21,6 @@
 #include "path-prefix.h"
 
 #include <xml/repr.h>
-#include "document-private.h"
 #include "inkscape.h"
 
 #include "io/sys.h"
diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index 8aa59e4fe..4c18e3124 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -75,7 +75,6 @@
 #include "xml/sp-css-attr.h"
 
 #include "message-stack.h"
-#include "document-private.h"
 #include "ui/tools/pen-tool.h"
 #include "ui/tools/node-tool.h"
 #include "ui/tools-switch.h"
diff --git a/src/live_effects/lpe-perspective_path.cpp b/src/live_effects/lpe-perspective_path.cpp
index e2ab2f3b8..a31d1319b 100644
--- a/src/live_effects/lpe-perspective_path.cpp
+++ b/src/live_effects/lpe-perspective_path.cpp
@@ -13,7 +13,6 @@
 #include <gtkmm.h>
 
 //#include "transf_mat_3x4.h"
-#include "document-private.h"
 #include "live_effects/lpe-perspective_path.h"
 #include "live_effects/lpeobject.h"
 #include "knot-holder-entity.h"
diff --git a/src/live_effects/lpeobject.cpp b/src/live_effects/lpeobject.cpp
index e90a99331..d3c49a366 100644
--- a/src/live_effects/lpeobject.cpp
+++ b/src/live_effects/lpeobject.cpp
@@ -13,7 +13,6 @@
 #include "xml/node-event-vector.h"
 #include "attributes.h"
 #include "document.h"
-#include "document-private.h"
 
 #include "object/sp-defs.h"
 
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()
diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp
index b67a61ca1..94eb6797e 100755
--- a/src/selection-chemistry.cpp
+++ b/src/selection-chemistry.cpp
@@ -40,7 +40,6 @@ SPCycleType SP_CYCLING = SP_CYCLE_FOCUS;
 #include "context-fns.h"
 #include "desktop-style.h"
 #include "desktop.h"
-#include "document-private.h"
 #include "document-undo.h"
 #include "gradient-drag.h"
 #include "layer-fns.h"
diff --git a/src/ui/cache/svg_preview_cache.cpp b/src/ui/cache/svg_preview_cache.cpp
index d83f3dd61..803f901e4 100644
--- a/src/ui/cache/svg_preview_cache.cpp
+++ b/src/ui/cache/svg_preview_cache.cpp
@@ -21,7 +21,6 @@
 
 #include "selection.h"
 #include "inkscape.h"
-#include "document-private.h"
 
 #include "display/cairo-utils.h"
 #include "display/drawing-context.h"
diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index 299c82905..b2d8fe58b 100644
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
@@ -37,7 +37,6 @@
 
 #include "desktop-style.h" // for sp_desktop_set_style, used in _pasteStyle
 #include "document.h"
-#include "document-private.h"
 #include "message-stack.h"
 #include "context-fns.h"
 #include "ui/tools/dropper-tool.h" // used in copy()
diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp
index 753da4de0..d8a1197a4 100644
--- a/src/ui/dialog/svg-fonts-dialog.cpp
+++ b/src/ui/dialog/svg-fonts-dialog.cpp
@@ -21,7 +21,6 @@
 #include <glibmm/i18n.h>
 
 #include "desktop.h"
-#include "document-private.h"
 #include "document-undo.h"
 #include "selection.h"
 #include "svg-fonts-dialog.h"
diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp
index 0eef5ecc3..90f661eb8 100644
--- a/src/ui/dialog/swatches.cpp
+++ b/src/ui/dialog/swatches.cpp
@@ -34,7 +34,6 @@
 
 #include "desktop-style.h"
 #include "document.h"
-#include "document-private.h"
 #include "document-undo.h"
 #include "extension/db.h"
 #include "inkscape.h"
diff --git a/src/ui/toolbar/mesh-toolbar.cpp b/src/ui/toolbar/mesh-toolbar.cpp
index 4b1593650..eb64f4010 100644
--- a/src/ui/toolbar/mesh-toolbar.cpp
+++ b/src/ui/toolbar/mesh-toolbar.cpp
@@ -21,7 +21,6 @@
 
 #include "desktop-style.h"
 #include "desktop.h"
-#include "document-private.h"
 #include "document-undo.h"
 #include "gradient-chemistry.h"
 #include "gradient-drag.h"
diff --git a/src/ui/tools/box3d-tool.cpp b/src/ui/tools/box3d-tool.cpp
index 9c7d6c6c9..7314046b2 100644
--- a/src/ui/tools/box3d-tool.cpp
+++ b/src/ui/tools/box3d-tool.cpp
@@ -22,7 +22,6 @@
 #include "context-fns.h"
 #include "desktop-style.h"
 #include "desktop.h"
-#include "document-private.h"
 #include "document-undo.h"
 #include "document.h"
 #include "message-context.h"
diff --git a/src/widgets/fill-style.cpp b/src/widgets/fill-style.cpp
index 8e419f20e..33006e912 100644
--- a/src/widgets/fill-style.cpp
+++ b/src/widgets/fill-style.cpp
@@ -23,7 +23,6 @@
 
 #include "desktop-style.h"
 #include "desktop.h"
-#include "document-private.h"
 #include "document-undo.h"
 #include "fill-n-stroke-factory.h"
 #include "fill-style.h"
diff --git a/src/widgets/gradient-selector.cpp b/src/widgets/gradient-selector.cpp
index 626fbb2b7..11a2cc34b 100644
--- a/src/widgets/gradient-selector.cpp
+++ b/src/widgets/gradient-selector.cpp
@@ -16,7 +16,6 @@
 #include <glibmm/i18n.h>
 #include <gtkmm/treeview.h>
 
-#include "document-private.h"
 #include "document-undo.h"
 #include "document.h"
 #include "gradient-chemistry.h"
diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index f748a9841..72b917c10 100644
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -27,7 +27,6 @@
 
 
 
-#include "document-private.h"
 #include "gradient-chemistry.h"
 #include "inkscape.h"
 #include "preferences.h"
diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index f26ebe30f..a2a84b115 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -24,7 +24,6 @@
 #include <glibmm/i18n.h>
 
 #include "desktop-style.h"
-#include "document-private.h"
 #include "gradient-selector.h"
 #include "inkscape.h"
 #include "paint-selector.h"
diff --git a/src/widgets/stroke-style.h b/src/widgets/stroke-style.h
index 5ee626b68..684479975 100644
--- a/src/widgets/stroke-style.h
+++ b/src/widgets/stroke-style.h
@@ -23,7 +23,6 @@
 
 #include "desktop-style.h"
 #include "desktop.h"
-#include "document-private.h"
 #include "document-undo.h"
 #include "fill-n-stroke-factory.h"
 #include "fill-style.h" // to get sp_fill_style_widget_set_desktop