diff --git a/modules/iswa/util/dataprocessor.cpp b/modules/iswa/util/dataprocessor.cpp
index 8bb5ef817c..5e7e80e50f 100644
--- a/modules/iswa/util/dataprocessor.cpp
+++ b/modules/iswa/util/dataprocessor.cpp
@@ -25,21 +25,9 @@
 #include <openspace/util/histogram.h>
 
 #include <fstream>
-#include <ghoul/io/texture/texturereader.h>
-#include <ghoul/opengl/programobject.h>
-#include <ghoul/opengl/textureunit.h>
-#include <openspace/scene/scene.h>
-#include <openspace/scene/scenegraphnode.h>
-#include <openspace/engine/openspaceengine.h>
-#include <openspace/rendering/renderengine.h>
-#include <openspace/util/spicemanager.h>
-#include <ghoul/filesystem/filesystem.h>
-#include <modules/iswa/util/iswamanager.h>
-#include <modules/iswa/ext/json/json.hpp>
 
 namespace {
 	const std::string _loggerCat = "DataProcessor";
-    using json = nlohmann::json;
 }
 
 namespace openspace {
diff --git a/modules/iswa/util/dataprocessor.h b/modules/iswa/util/dataprocessor.h
index 07aafe928d..75ecd78da0 100644
--- a/modules/iswa/util/dataprocessor.h
+++ b/modules/iswa/util/dataprocessor.h
@@ -25,11 +25,9 @@
 #ifndef __DATAPROCESSOR_H__
 #define __DATAPROCESSOR_H__
 
-#include <openspace/properties/propertyowner.h>
-#include <openspace/properties/scalarproperty.h>
 #include <openspace/properties/selectionproperty.h>
 #include <ghoul/glm.h>
-#include <ghoul/opengl/texture.h>
+#include <glm/gtx/std_based_type.hpp>
 #include <set>
 #include <openspace/util/histogram.h>
 
diff --git a/modules/iswa/util/dataprocessorkameleon.cpp b/modules/iswa/util/dataprocessorkameleon.cpp
index d38f2931d3..5abba4833b 100644
--- a/modules/iswa/util/dataprocessorkameleon.cpp
+++ b/modules/iswa/util/dataprocessorkameleon.cpp
@@ -22,7 +22,7 @@
 * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
 ****************************************************************************************/
 #include <modules/iswa/util/dataprocessorkameleon.h>
-#include <algorithm>
+//#include <algorithm>
 #include <ghoul/filesystem/filesystem.h>
 
 namespace {
diff --git a/modules/iswa/util/dataprocessortext.cpp b/modules/iswa/util/dataprocessortext.cpp
index 1fa92ac3f1..ecdb1ac4d0 100644
--- a/modules/iswa/util/dataprocessortext.cpp
+++ b/modules/iswa/util/dataprocessortext.cpp
@@ -22,8 +22,7 @@
 * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
 ****************************************************************************************/
 #include <modules/iswa/util/dataprocessortext.h>
-#include <algorithm>
-#include <iterator>
+//#include <algorithm>
 //#include <boost/iostreams/device/mapped_file.hpp>
 //
 //#include <boost/config/warning_disable.hpp>
@@ -159,13 +158,13 @@ std::vector<float*> DataProcessorText::processData(std::string data, properties:
         int first, last, option, lineSize;
         
         std::vector<float*> dataOptions(numOptions, nullptr);
-        for(int option : selectedOptions){
+        for (int option : selectedOptions) {
             dataOptions[option] = new float[dimensions.x*dimensions.y]{0.0f};
         }
 
         int numValues = 0;
-        while(getline(memorystream, line)){
-            if(line.find("#") == 0) continue;
+        while (getline(memorystream, line)) {
+            if (line.find("#") == 0) continue;
 
             
             // ----------- OLD METHODS ------------------------