diff --git a/FileIO/XmlIO/XMLInterface.h b/FileIO/XmlIO/XMLInterface.h
index 38ef612d4005e8c0c65ddb96ae74c3fd33c6ca99..5992edff65991eb043bac92a81448af26f420a79 100644
--- a/FileIO/XmlIO/XMLInterface.h
+++ b/FileIO/XmlIO/XMLInterface.h
@@ -17,7 +17,7 @@
 
 #include "OGS/ProjectData.h"
 
-#include "Writer.h"
+#include "FileIO/Writer.h"
 
 namespace FileIO
 {
diff --git a/GeoLib/AABB.h b/GeoLib/AABB.h
index 24cc8651e254c7cc7bf12ba3f4d1e92dd0ffcc9c..3e8d850a6ebd9a38cf66a556983e84ff365d8b67 100644
--- a/GeoLib/AABB.h
+++ b/GeoLib/AABB.h
@@ -22,7 +22,7 @@
 #include <vector>
 #include <stdexcept>
 
-#include "MathTools.h"
+#include "MathLib/MathTools.h"
 #include "Point.h"
 
 namespace GeoLib
diff --git a/GeoLib/Point.h b/GeoLib/Point.h
index d5e26e6e7ee56049d4db079f88e2eee79a1cf0ca..8145c351fa0bec81b72b4041e6a08b07325d3d4e 100644
--- a/GeoLib/Point.h
+++ b/GeoLib/Point.h
@@ -22,7 +22,7 @@
 #include "GeoObject.h"
 
 // MathLib
-#include "TemplatePoint.h"
+#include "MathLib/TemplatePoint.h"
 
 namespace GeoLib
 {
diff --git a/OGS/GeoInfo.h b/OGS/GeoInfo.h
index 62e869a78a411b0bf35416a6478a85a752720342..3771710497ae24a7154e55486fd001f386ae00c7 100644
--- a/OGS/GeoInfo.h
+++ b/OGS/GeoInfo.h
@@ -16,8 +16,8 @@
 #define GEOINFO_H_
 
 // GEO
-#include "GeoObject.h"
-#include "GeoType.h"
+#include "GeoLib/GeoObject.h"
+#include "GeoLib/GeoType.h"
 
 /**
  * \brief GeoInfo stores the type of the geometric entity and