[MERGE]

src/core/common/WPropertyVariable.h

@@ -27,11 +27,9 @@
 
 #include <stdint.h>
 
-#include <iostream>
 #include <list>
 #include <set>
 #include <string>
-#include <vector>
 
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>

src/core/common/WThreadedJobs.h

@@ -25,14 +25,12 @@
 #ifndef WTHREADEDJOBS_H
 #define WTHREADEDJOBS_H
 
-#include <iostream>
 #include <string>
 
 #include <boost/shared_ptr.hpp>
 
 #include "WException.h"
 #include "WFlag.h"
-#include "WLogger.h"
 
 /**
  * \class WThreadedJobs

src/core/common/math/WLine.h

@@ -25,14 +25,12 @@
 #ifndef WLINE_H
 #define WLINE_H
 
-#include <algorithm>
-#include <iostream>
 #include <vector>
 
 #include "../WBoundingBox.h"
 
 #include "../WMixinVector.h"
-#include "linearAlgebra/WLinearAlgebra.h"
+#include "linearAlgebra/WPosition.h"
 
 // forward declarations
 class WLineTest;

src/core/common/math/WOSSIMHelper.h

@@ -27,7 +27,7 @@
 
 #ifdef OW_USE_OSSIM
     #include <algorithm>
-    #include <iostream>
+//    #include <iostream>
     #include <vector>
 
     #include <matrix/newmat.h>

src/core/common/math/WPolynomialEquationSolvers.h

@@ -26,7 +26,6 @@
 #define WPOLYNOMIALEQUATIONSOLVERS_H
 
 #include <complex>
-#include <iostream>
 #include <sstream>
 #include <utility>
 

src/core/common/math/WTensorSym.h

@@ -26,7 +26,6 @@
 #define WTENSORSYM_H
 
 #include <iostream>
-#include <vector>
 
 #include <boost/array.hpp>
 

src/core/dataHandler/WDataSetFibers.cpp

@@ -23,13 +23,10 @@
 //---------------------------------------------------------------------------
 
 #include <algorithm>
-#include <iostream>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include <boost/filesystem/fstream.hpp>
-
 #include "../common/datastructures/WFiber.h"
 #include "../common/WBoundingBox.h"
 #include "../common/WColor.h"

src/core/dataHandler/WSubject.h

@@ -27,7 +27,6 @@
 
 #include <string>
 #include <vector>
-#include <set>
 #include <boost/shared_ptr.hpp>
 
 #include "../common/WConditionSet.h"

src/core/gui/WGUI.h

@@ -26,13 +26,10 @@
 #define WGUI_H
 
 #include <string>
-#include <vector>
 
 #include <boost/shared_ptr.hpp>
-#include <boost/signals2/signal.hpp>
 
 #include "../common/WFlag.h"
-#include "../kernel/WModule.h"
 #include "../graphicsEngine/WGECamera.h"
 #include "WCustomWidget.h"
 

src/core/kernel/WCrosshair.h

@@ -26,7 +26,7 @@
 #define WCROSSHAIR_H
 
 #include <boost/shared_ptr.hpp>
-#include "../common/math/linearAlgebra/WLinearAlgebra.h"
+#include "../common/math/linearAlgebra/WPosition.h"
 
 
 

src/core/kernel/WKernel.cpp

@@ -33,6 +33,7 @@
 #include <string>
 #include <vector>
 
+#include "../common/WLogger.h"
 #include "../common/WThreadedRunner.h"
 #include "../common/WTimer.h"
 #include "../common/WRealtimeTimer.h"

src/core/kernel/WKernel.h

@@ -31,7 +31,6 @@
 #include <boost/shared_ptr.hpp>
 
 #include "../common/WTimer.h"
-#include "../common/WLogger.h"
 #include "../scripting/WScriptEngine.h"
 #include "../graphicsEngine/WGraphicsEngine.h"
 

src/core/kernel/WModuleFactory.h

@@ -31,7 +31,6 @@
 #include <vector>
 
 #include <boost/shared_ptr.hpp>
-#include <boost/thread.hpp>
 
 #include "../common/WSharedAssociativeContainer.h"
 #include "WModuleCombinerTypes.h"

src/core/kernel/WModuleLoader.cpp

@@ -32,8 +32,6 @@
 #include "../common/WPathHelper.h"
 #include "../common/WSharedLib.h"
 
-#include "WKernel.h"
-
 #include "WModuleLoader.h"
 
 WModuleLoader::WModuleLoader( )

src/core/kernel/WModuleLoader.h

@@ -32,7 +32,6 @@
 #include <boost/filesystem.hpp>
 #include <boost/shared_ptr.hpp>
 
-#include "../common/WLogger.h"
 #include "../common/WSharedAssociativeContainer.h"
 #include "../common/WSharedLib.h"
 

src/core/kernel/WModuleOutputForwardData.h

@@ -25,13 +25,10 @@
 #ifndef WMODULEOUTPUTFORWARDDATA_H
 #define WMODULEOUTPUTFORWARDDATA_H
 
-#include <iostream>
 #include <string>
 
 #include <boost/shared_ptr.hpp>
 
-#include "../common/WLogger.h"
-
 #include "WModuleInputData.h"
 #include "WModuleOutputData.h"