From 1d4f6c254388f10ced11b67429cd12cb5ad5fcf9 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 17 Apr 2018 09:20:23 +0100
Subject: [PATCH] Cleaned up includes

---
 examples/osgmanipulator/osgmanipulator.cpp  | 7 ++-----
 include/osgManipulator/ScaleAxisDragger     | 2 +-
 include/osgManipulator/TranslateAxisDragger | 1 +
 src/osgManipulator/ScaleAxisDragger.cpp     | 3 ---
 src/osgManipulator/TrackballDragger.cpp     | 3 ---
 src/osgManipulator/TranslateAxisDragger.cpp | 4 ----
 6 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/examples/osgmanipulator/osgmanipulator.cpp b/examples/osgmanipulator/osgmanipulator.cpp
index 499bf3884..da63ead23 100644
--- a/examples/osgmanipulator/osgmanipulator.cpp
+++ b/examples/osgmanipulator/osgmanipulator.cpp
@@ -16,11 +16,12 @@
 *  THE SOFTWARE.
 */
 
+#include <osg/CoordinateSystemNode>
+#include <osg/Material>
 #include <osgDB/ReadFile>
 #include <osgUtil/Optimizer>
 #include <osgViewer/Viewer>
 #include <osgViewer/ViewerEventHandlers>
-#include <osg/CoordinateSystemNode>
 #include <osgText/Text>
 
 #include <osgManipulator/TabBoxDragger>
@@ -37,10 +38,6 @@
 #include <osgManipulator/RotateCylinderDragger>
 #include <osgManipulator/AntiSquish>
 
-#include <osg/ShapeDrawable>
-#include <osg/MatrixTransform>
-#include <osg/Geometry>
-#include <osg/Material>
 #include <osg/io_utils>
 
 #include <iostream>
diff --git a/include/osgManipulator/ScaleAxisDragger b/include/osgManipulator/ScaleAxisDragger
index 3fa634ce2..50a765373 100644
--- a/include/osgManipulator/ScaleAxisDragger
+++ b/include/osgManipulator/ScaleAxisDragger
@@ -17,7 +17,7 @@
 
 #include <osgManipulator/Scale1DDragger>
 #include <osg/ShapeDrawable>
-#include <osg/Geometry>
+#include <osg/Geode>
 #include <osg/LineWidth>
 
 namespace osgManipulator {
diff --git a/include/osgManipulator/TranslateAxisDragger b/include/osgManipulator/TranslateAxisDragger
index 9c0ff73e4..aa6741ade 100644
--- a/include/osgManipulator/TranslateAxisDragger
+++ b/include/osgManipulator/TranslateAxisDragger
@@ -18,6 +18,7 @@
 #include <osgManipulator/Translate1DDragger>
 #include <osg/ShapeDrawable>
 #include <osg/Geometry>
+#include <osg/Geode>
 #include <osg/LineWidth>
 
 namespace osgManipulator {
diff --git a/src/osgManipulator/ScaleAxisDragger.cpp b/src/osgManipulator/ScaleAxisDragger.cpp
index f254f50e6..f87420701 100644
--- a/src/osgManipulator/ScaleAxisDragger.cpp
+++ b/src/osgManipulator/ScaleAxisDragger.cpp
@@ -14,10 +14,7 @@
 
 #include <osgManipulator/ScaleAxisDragger>
 
-#include <osg/ShapeDrawable>
-#include <osg/Geode>
 #include <osg/Geometry>
-#include <osg/LineWidth>
 #include <osg/Quat>
 
 using namespace osgManipulator;
diff --git a/src/osgManipulator/TrackballDragger.cpp b/src/osgManipulator/TrackballDragger.cpp
index 441daf9d2..fdc2862d9 100644
--- a/src/osgManipulator/TrackballDragger.cpp
+++ b/src/osgManipulator/TrackballDragger.cpp
@@ -15,10 +15,7 @@
 #include <osgManipulator/TrackballDragger>
 #include <osgManipulator/AntiSquish>
 
-#include <osg/ShapeDrawable>
-#include <osg/Geode>
 #include <osg/Geometry>
-#include <osg/LineWidth>
 #include <osg/PolygonMode>
 #include <osg/CullFace>
 #include <osg/Quat>
diff --git a/src/osgManipulator/TranslateAxisDragger.cpp b/src/osgManipulator/TranslateAxisDragger.cpp
index 741b8f213..a240f1411 100644
--- a/src/osgManipulator/TranslateAxisDragger.cpp
+++ b/src/osgManipulator/TranslateAxisDragger.cpp
@@ -14,10 +14,6 @@
 
 #include <osgManipulator/TranslateAxisDragger>
 
-#include <osg/ShapeDrawable>
-#include <osg/Geode>
-#include <osg/Geometry>
-#include <osg/LineWidth>
 #include <osg/Quat>
 
 using namespace osgManipulator;