[MERGE]

src/core/common/test/WPropertyStruct_test.h

@@ -71,7 +71,7 @@ public:
         // we test getting/setting via string here
 
         // create the prop
-        typedef typename WPropertyStruct< WPropInt, WPropBool >::SPtr TestStruct;
+        typedef WPropertyStruct< WPropInt, WPropBool >::SPtr TestStruct;
         TestStruct prop( new TestStruct::element_type( "Hallo", "Description Text" ) );
 
         // set some defaults

src/core/dataHandler/WDataSetSegmentation.cpp

@@ -26,7 +26,6 @@
 #include <vector>
 
 #include "WDataSetScalar.h"
-#include "../kernel/WKernel.h"
 
 #include "WDataSetSegmentation.h"
 

src/core/dataHandler/WDataSetSegmentation.h

@@ -30,7 +30,6 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include "../kernel/WModuleInputData.h"
 #include "WDataSet.h"
 #include "WDataSetScalar.h"
 #include "WDataSetSingle.h"

src/core/kernel/WModuleInputData.h

@@ -26,7 +26,6 @@
 #define WMODULEINPUTDATA_H
 
 #include <string>
-#include <sstream>
 
 #include <boost/shared_ptr.hpp>
 #include <boost/thread/locks.hpp>