diff --git a/Applications/FileIO/Gmsh/GMSHInterface.cpp b/Applications/FileIO/Gmsh/GMSHInterface.cpp
index 6b70c66057f91054a7f4246c091b36c6ef8acbcd..d49977821c12a4cada6390c99e7f50b36805d127 100644
--- a/Applications/FileIO/Gmsh/GMSHInterface.cpp
+++ b/Applications/FileIO/Gmsh/GMSHInterface.cpp
@@ -25,6 +25,7 @@
 #include "GeoLib/Polygon.h"
 #include "GeoLib/PolygonWithSegmentMarker.h"
 #include "GeoLib/PolylineWithSegmentMarker.h"
+#include "GeoLib/Station.h"
 #include "InfoLib/GitInfo.h"
 
 namespace FileIO
diff --git a/Applications/FileIO/Gmsh/GMSHPolygonTree.cpp b/Applications/FileIO/Gmsh/GMSHPolygonTree.cpp
index 6d4a03c928bc83bd3ad58b95a39d6d0cc2419d19..b66547329fd8789f7575acf208e09f2613c65377 100644
--- a/Applications/FileIO/Gmsh/GMSHPolygonTree.cpp
+++ b/Applications/FileIO/Gmsh/GMSHPolygonTree.cpp
@@ -18,6 +18,7 @@
 #include "GeoLib/Polygon.h"
 #include "GeoLib/PolygonWithSegmentMarker.h"
 #include "GeoLib/PolylineWithSegmentMarker.h"
+#include "GeoLib/Station.h"
 
 namespace FileIO
 {
diff --git a/Applications/FileIO/Legacy/OGSIOVer4.cpp b/Applications/FileIO/Legacy/OGSIOVer4.cpp
index b8dc94ba004634d4a46ba19ab5094a42272030e2..9196c54843409487d09733d721161cb0ddae0cb2 100644
--- a/Applications/FileIO/Legacy/OGSIOVer4.cpp
+++ b/Applications/FileIO/Legacy/OGSIOVer4.cpp
@@ -29,6 +29,7 @@
 #include "GeoLib/PointVec.h"
 #include "GeoLib/Polygon.h"
 #include "GeoLib/Polyline.h"
+#include "GeoLib/Station.h"
 #include "GeoLib/Surface.h"
 #include "GeoLib/Triangle.h"
 
diff --git a/GeoLib/GEOObjects.cpp b/GeoLib/GEOObjects.cpp
index d831f6b1a05ac6b839062fe439ceaaa97f7a8020..ed604b9a56e9850ba5621491fb7cd53ea2b2fa9b 100644
--- a/GeoLib/GEOObjects.cpp
+++ b/GeoLib/GEOObjects.cpp
@@ -18,6 +18,7 @@
 
 #include "BaseLib/Logging.h"
 #include "BaseLib/StringTools.h"
+#include "Station.h"
 #include "Triangle.h"
 
 namespace GeoLib
diff --git a/GeoLib/GEOObjects.h b/GeoLib/GEOObjects.h
index 4f90ec9ec07636adb1704fef8564778bf51e95b3..e8a6098e95695fea186c82223060e078bd9f10b6 100644
--- a/GeoLib/GEOObjects.h
+++ b/GeoLib/GEOObjects.h
@@ -25,9 +25,6 @@
 #include "PolylineVec.h"
 #include "Surface.h"
 #include "SurfaceVec.h"
-
-#include "Station.h"
-
 #include "GeoType.h"
 
 namespace GeoLib
diff --git a/GeoLib/PointVec.h b/GeoLib/PointVec.h
index ebea781a1b6a271b50714c9f0674eff60417674f..e42c03d7623dde949f19de095d722e4517bd0f21 100644
--- a/GeoLib/PointVec.h
+++ b/GeoLib/PointVec.h
@@ -22,7 +22,6 @@
 #include "AABB.h"
 #include "OctTree.h"
 #include "Point.h"
-#include "Station.h"
 #include "TemplateVec.h"
 
 namespace GeoLib