diff --git a/FileIO/XmlIO/Boost/BoostXmlGmlInterface.cpp b/FileIO/XmlIO/Boost/BoostXmlGmlInterface.cpp
index ca43206b9a345fde305009f3c99863938adfbf8e..d161929e52ea6a44b303c9fce14fd5dba3137e86 100644
--- a/FileIO/XmlIO/Boost/BoostXmlGmlInterface.cpp
+++ b/FileIO/XmlIO/Boost/BoostXmlGmlInterface.cpp
@@ -21,9 +21,6 @@
 
 #include "logog/include/logog.hpp"
 
-#include "ProjectData.h"
-#include "GEOObjects.h"
-
 
 namespace FileIO
 {
diff --git a/FileIO/XmlIO/Boost/BoostXmlGmlInterface.h b/FileIO/XmlIO/Boost/BoostXmlGmlInterface.h
index 23566746c73f9db753228de7178d4ecd6c73e405..91ac8b1a31feb637b6400ab629172b6e8bd4d742 100644
--- a/FileIO/XmlIO/Boost/BoostXmlGmlInterface.h
+++ b/FileIO/XmlIO/Boost/BoostXmlGmlInterface.h
@@ -24,6 +24,7 @@
 #include <boost/optional.hpp>
 
 #include "../XMLInterface.h"
+#include "GeoLib/GEOObjects.h"
 
 class Point;
 class Polyline;
diff --git a/FileIO/XmlIO/Qt/XmlGmlInterface.h b/FileIO/XmlIO/Qt/XmlGmlInterface.h
index 768b18fc9019155a0b445defca09b22e642307b3..af8ed3f17e7bf90abea880b132de125d099d2ef6 100644
--- a/FileIO/XmlIO/Qt/XmlGmlInterface.h
+++ b/FileIO/XmlIO/Qt/XmlGmlInterface.h
@@ -18,6 +18,8 @@
 #include "../XMLInterface.h"
 #include "XMLQtInterface.h"
 
+#include "GeoLib/GEOObjects.h"
+
 namespace FileIO
 {
 
@@ -27,10 +29,6 @@ namespace FileIO
 class XmlGmlInterface : public XMLInterface, public XMLQtInterface
 {
 public:
-	/**
-	 * Constructor
-	 * \param project Project data.
-	 */
 	XmlGmlInterface(GeoLib::GEOObjects& geo_objs);
 
 	virtual ~XmlGmlInterface() {}
diff --git a/FileIO/XmlIO/Qt/XmlGspInterface.h b/FileIO/XmlIO/Qt/XmlGspInterface.h
index 7c242995dc2ddb81e5d80be25c71e7d284d9185f..5cb48c32f6a65e15c06f7f8403631ceb172ae064 100644
--- a/FileIO/XmlIO/Qt/XmlGspInterface.h
+++ b/FileIO/XmlIO/Qt/XmlGspInterface.h
@@ -18,6 +18,8 @@
 #include "../XMLInterface.h"
 #include "XMLQtInterface.h"
 
+#include "OGS/ProjectData.h"
+
 namespace FileIO
 {
 
diff --git a/FileIO/XmlIO/Qt/XmlStnInterface.h b/FileIO/XmlIO/Qt/XmlStnInterface.h
index ed1519e974d1eeaa9a70249ff772ba1cef472259..db97cc9a94e7c46e4ece30ab9a54f2baf20c90d8 100644
--- a/FileIO/XmlIO/Qt/XmlStnInterface.h
+++ b/FileIO/XmlIO/Qt/XmlStnInterface.h
@@ -20,6 +20,8 @@
 #include "../XMLInterface.h"
 #include "XMLQtInterface.h"
 
+#include "GeoLib/GEOObjects.h"
+
 namespace GeoLib {
 	class StationBorehole;
 }
@@ -33,10 +35,6 @@ namespace FileIO
 class XmlStnInterface : public XMLInterface, public XMLQtInterface
 {
 public:
-	/**
-	 * Constructor
-	 * \param project Project data.
-	 */
 	XmlStnInterface(GeoLib::GEOObjects& geo_objs);
 
 	/// Reads an xml-file containing station object definitions into the GEOObjects used in the contructor (requires Qt)
diff --git a/FileIO/XmlIO/XMLInterface.h b/FileIO/XmlIO/XMLInterface.h
index 50c898d07f3b11efc07c7032cb78a0c080d41071..6e9acfe5d66d266a3aed5608aa468c3bd49ce843 100644
--- a/FileIO/XmlIO/XMLInterface.h
+++ b/FileIO/XmlIO/XMLInterface.h
@@ -15,8 +15,6 @@
 #ifndef XMLINTERFACE_H
 #define XMLINTERFACE_H
 
-#include "OGS/ProjectData.h"
-
 #include "FileIO/Writer.h"
 
 namespace FileIO