diff --git a/FileIO/GMSHInterface.cpp b/FileIO/GMSHInterface.cpp
index 465789ae66bdd1546a789396648dc382a713f7eb..e059eab4e6d12e5242049b876ee38051bc32e583 100644
--- a/FileIO/GMSHInterface.cpp
+++ b/FileIO/GMSHInterface.cpp
@@ -15,22 +15,20 @@
 
 #include "BaseLib/BuildInfo.h"
 #include "BaseLib/FileTools.h"
-#include "BaseLib/StringTools.h"
 
 #include "FileIO/GMSHInterface.h"
 #include "FileIO/GmshIO/GMSHAdaptiveMeshDensity.h"
 #include "FileIO/GmshIO/GMSHFixedMeshDensity.h"
+#include "FileIO/GmshIO/GMSHPoint.h"
+#include "FileIO/GmshIO/GMSHPolygonTree.h"
+#include "FileIO/GmshIO/GMSHMeshDensityStrategy.h"
 
 #include "GeoLib/AnalyticalGeometry.h"
 #include "GeoLib/GEOObjects.h"
-#include "GeoLib/Point.h"
 #include "GeoLib/Polygon.h"
-#include "GeoLib/Polyline.h"
 #include "GeoLib/PolylineWithSegmentMarker.h"
 #include "GeoLib/PolygonWithSegmentMarker.h"
 
-#include "MathLib/LinAlg/Solvers/GaussAlgorithm.h"
-
 namespace FileIO
 {
 GMSHInterface::GMSHInterface(GeoLib::GEOObjects& geo_objs,
diff --git a/FileIO/GMSHInterface.h b/FileIO/GMSHInterface.h
index 32941f2188c6af1fc9c9141900439de90df29377..1f9ffdc06fd17641df80cca93a436d348b3c5a2e 100644
--- a/FileIO/GMSHInterface.h
+++ b/FileIO/GMSHInterface.h
@@ -1,8 +1,4 @@
 /**
- * \file
- * \author Thomas Fischer
- * \date   2010-04-29
- * \brief  Definition of the GMSHInterface class.
  *
  * \copyright
  * Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
@@ -15,14 +11,9 @@
 #ifndef GMSHINTERFACE_H_
 #define GMSHINTERFACE_H_
 
-#include <list>
-#include <map>
-#include <string>
+#include <iosfwd>
 
 #include "BaseLib/IO/Writer.h"
-#include "FileIO/GmshIO/GMSHPoint.h"
-#include "FileIO/GmshIO/GMSHPolygonTree.h"
-#include "FileIO/GmshIO/GMSHMeshDensityStrategy.h"
 
 #include "MathLib/LinAlg/Dense/DenseMatrix.h"
 
@@ -37,6 +28,10 @@ namespace FileIO
 
 namespace GMSH {
 
+class GMSHPoint;
+class GMSHPolygonTree;
+class GMSHMeshDensityStrategy;
+
 enum class MeshDensityAlgorithm {
     FixedMeshDensity, //!< set the parameter with a fixed value
     AdaptiveMeshDensity //!< computing the mesh density employing a QuadTree
diff --git a/MeshLib/IO/GmshReader.cpp b/MeshLib/IO/GmshReader.cpp
index a7e3232aeff3bcd09695531576b38459297cf503..9ffc22d6dadceeb750ef2ac7eb3603a2f7289b37 100644
--- a/MeshLib/IO/GmshReader.cpp
+++ b/MeshLib/IO/GmshReader.cpp
@@ -28,6 +28,7 @@
 #include <fstream>
 #include <map>
 #include <vector>
+
 namespace MeshLib
 {
 namespace IO