Move classes derived from SPObject to own directory.

A lot of header clean-up.

1 files changed, 22 insertions, 16 deletions

diff --git a/src/ui/tools/box3d-tool.cpp b/src/ui/tools/box3d-tool.cpp
index 09ee2cda9..52c66fb2b 100644
--- a/src/ui/tools/box3d-tool.cpp
+++ b/src/ui/tools/box3d-tool.cpp
@@ -16,30 +16,36 @@
  */
 
 #include <gdk/gdkkeysyms.h>
+#include <glibmm/i18n.h>
 
-#include "macros.h"
-#include "display/sp-canvas.h"
-#include "document.h"
+
+#include "context-fns.h"
+#include "desktop-style.h"
+#include "desktop.h"
+#include "document-private.h"
 #include "document-undo.h"
-#include "sp-namedview.h"
-#include "selection.h"
+#include "document.h"
+#include "macros.h"
+#include "message-context.h"
+#include "perspective-line.h"
 #include "selection-chemistry.h"
+#include "selection.h"
+#include "verbs.h"
 
 #include "display/sp-canvas-item.h"
-#include "desktop.h"
-#include "message-context.h"
+#include "display/sp-canvas.h"
+
 #include "pixmaps/cursor-3dbox.xpm"
-#include "box3d.h"
+
+#include "object/box3d-side.h"
+#include "object/box3d.h"
+#include "object/sp-defs.h"
+#include "object/sp-namedview.h"
+
+#include "ui/shape-editor.h"
 #include "ui/tools/box3d-tool.h"
-#include <glibmm/i18n.h>
+
 #include "xml/node-event-vector.h"
-#include "context-fns.h"
-#include "desktop-style.h"
-#include "perspective-line.h"
-#include "box3d-side.h"
-#include "document-private.h"
-#include "ui/shape-editor.h"
-#include "verbs.h"
 
 using Inkscape::DocumentUndo;