diff --git a/FileIO/Legacy/OGSIOVer4.cpp b/FileIO/Legacy/OGSIOVer4.cpp
index e2f5674c87526c02fd53a3528a870898ead032c9..c675d37cf6cb227f511586990163d54e0663440a 100644
--- a/FileIO/Legacy/OGSIOVer4.cpp
+++ b/FileIO/Legacy/OGSIOVer4.cpp
@@ -8,8 +8,6 @@
 #include <iomanip>
 #include <sstream>
 
-//TODO6 #include "Configure.h"
-
 // FileIO
 #include "MeshIO/GMSHInterface.h"
 #include "OGSIOVer4.h"
diff --git a/Gui/DataView/StationTreeView.cpp b/Gui/DataView/StationTreeView.cpp
index 50a61103d2ce4cee93f3103fcdefbdef506fca5f..f8ff5304610d9abf76be0328f4fdc20d701f77e8 100644
--- a/Gui/DataView/StationTreeView.cpp
+++ b/Gui/DataView/StationTreeView.cpp
@@ -7,9 +7,8 @@
 #include <QMenu>
 #include <iostream>
 
-//TODO6 #include "GMSInterface.h"
+#include "GMSInterface.h"
 #include "Station.h"
-//TODO6 #include "StationIO.h"
 
 #include "DiagramPrefsDialog.h"
 #include "ModelTreeItem.h"
@@ -172,14 +171,12 @@ void StationTreeView::exportStation()
 		QString temp_name;
 		std::vector<std::string> temp_soil_names;
 		temp_soil_names.push_back(""); // soil name vector needs to be initialised
-		/* TODO6
 		GMSInterface::writeBoreholeToGMS(static_cast<GeoLib::StationBorehole*>(static_cast<
 		                                                                               StationTreeModel
 		                                                                               *>(
 		                                                                               model())->stationFromIndex(index,
 		                                                                                                          temp_name)),
 		                                 fileName.toStdString(), temp_soil_names);
-		*/
 	}
 }
 
diff --git a/Gui/VtkVis/CMakeLists.txt b/Gui/VtkVis/CMakeLists.txt
index 1e94ce27c6b47bded7a3709ad0aaacba20c039f3..5b48f3692c31a586c03006d74b67dd616007a1e8 100644
--- a/Gui/VtkVis/CMakeLists.txt
+++ b/Gui/VtkVis/CMakeLists.txt
@@ -132,6 +132,7 @@ INCLUDE_DIRECTORIES(
 	${CMAKE_SOURCE_DIR}/Gui/VtkAct
 	${CMAKE_BINARY_DIR}/Gui/VtkVis
 	${CMAKE_SOURCE_DIR}/BaseLib
+	${CMAKE_BINARY_DIR}/BaseLib
 	${CMAKE_SOURCE_DIR}/FemLib
 	${CMAKE_SOURCE_DIR}/GeoLib
 	${CMAKE_SOURCE_DIR}/MathLib
diff --git a/Gui/VtkVis/VtkVisPipeline.h b/Gui/VtkVis/VtkVisPipeline.h
index f76030fff9e9dc82c48e5377497ea79a59821b2f..4db365bea0d31e81b885b273de0f4f2a1b74a5e8 100644
--- a/Gui/VtkVis/VtkVisPipeline.h
+++ b/Gui/VtkVis/VtkVisPipeline.h
@@ -9,7 +9,6 @@
 
 // ** INCLUDES **
 #include "Color.h"
-//TODO6 #include "Configure.h"
 #include "FEMCondition.h"
 #include "GeoType.h"
 #include "MSHEnums.h"
diff --git a/Gui/VtkVis/VtkVisPipelineItem.h b/Gui/VtkVis/VtkVisPipelineItem.h
index f645acb7121a841d991685cbcb231531000fdf60..8054a8de91288139168f7de41805f0c713709509 100644
--- a/Gui/VtkVis/VtkVisPipelineItem.h
+++ b/Gui/VtkVis/VtkVisPipelineItem.h
@@ -8,7 +8,7 @@
 #define VTKVISPIPELINEITEM_H
 
 // ** INCLUDES **
-//TODO6 #include "Configure.h"
+#include "BuildInfo.h"
 #include "TreeItem.h"
 
 #include <QList>
diff --git a/Gui/mainwindow.cpp b/Gui/mainwindow.cpp
index b5cf38e36b64ed13c94857690b0a8b3c382f3a5e..439e0dfa386b44a5edf00f21b5af23a6c88c96c3 100644
--- a/Gui/mainwindow.cpp
+++ b/Gui/mainwindow.cpp
@@ -57,7 +57,6 @@
 #include "MeshIO/GMSHInterface.h"
 // TODO6 #include "MeshIO/TetGenInterface.h"
 #include "PetrelInterface.h"
-// TODO6 #include "StationIO.h"
 #include "XmlIO/XmlCndInterface.h"
 #include "XmlIO/XmlGmlInterface.h"
 #include "XmlIO/XmlGspInterface.h"
@@ -69,7 +68,6 @@
 #include "Mesh.h"
 #include "Node.h"
 #include "MshEditor.h"
-//TODO6 #include "ExtractMeshNodes.h"
 
 // Qt includes
 #include <QDesktopWidget>
@@ -326,6 +324,7 @@ MainWindow::MainWindow(QWidget* parent /* = 0*/)
 
 MainWindow::~MainWindow()
 {
+	delete _signal_mapper;
 	delete _import_files_menu;
 	delete _vtkVisPipeline;
 	delete _meshModels;
@@ -532,6 +531,7 @@ void MainWindow::loadFile(ImportFileType::type t, const QString &fileName)
 	}
 	else if (t == ImportFileType::FEFLOW)
 	{
+		OGSError::box("Interface not yet integrated");
 		/* TODO6
 		FEFLOWInterface feflowIO(_geoModels);
 		MeshLib::Mesh* msh = feflowIO.readFEFLOWModelFile(fileName.toStdString());
@@ -572,6 +572,7 @@ void MainWindow::loadFile(ImportFileType::type t, const QString &fileName)
 	}
 	else if (t == ImportFileType::GMSH)
 	{
+		OGSError::box("Interface not yet integrated");
 		// TODO6
 	}
 	else if (t == ImportFileType::NETCDF)
@@ -630,6 +631,7 @@ void MainWindow::loadFile(ImportFileType::type t, const QString &fileName)
 						                                     "TetGen element files (*.ele);;");
 
 		if (!fileName.isEmpty() && !element_fname.isEmpty()) {
+			OGSError::box("Interface not yet integrated");
 			/* TODO6
 			FileIO::TetGenInterface tetgen;
 			MeshLib::Mesh* msh (tetgen.readTetGenMesh(node_fname.toStdString(), element_fname.toStdString()));