diff --git a/src/amdis/CMakeLists.txt b/src/amdis/CMakeLists.txt
index d20670089e062009f814b626678ce776edb14782..6ac8d9c5e3c396ced25e78011c0270ea5399619c 100644
--- a/src/amdis/CMakeLists.txt
+++ b/src/amdis/CMakeLists.txt
@@ -8,7 +8,6 @@ dune_library_add_sources(amdis SOURCES
     AMDiS.cpp
     Initfile.cpp
     InitfileParser.cpp
-    Marker.cpp
     ProblemInstatBase.cpp
     # ProblemInstat.cpp
     ProblemStat.cpp
@@ -38,6 +37,7 @@ install(FILES
     LocalAssembler.hpp
     LocalAssemblerBase.hpp
     Marker.hpp
+    Marker.inc.hpp
     Mesh.hpp
     Operations.hpp
     Operators.hpp
diff --git a/src/amdis/Marker.hpp b/src/amdis/Marker.hpp
index 96ae49d612afc3c9a6d4d88732743fce0f540da1..628c6b4278d050be6b949ed46435de916e974d23 100644
--- a/src/amdis/Marker.hpp
+++ b/src/amdis/Marker.hpp
@@ -343,3 +343,5 @@ namespace AMDiS {
   };
 
 }
+
+#include "Marker.inc.hpp"
\ No newline at end of file
diff --git a/src/amdis/Marker.cpp b/src/amdis/Marker.inc.hpp
similarity index 99%
rename from src/amdis/Marker.cpp
rename to src/amdis/Marker.inc.hpp
index 0c646b49226a7337a2376845e170271bfeb84711..346d51e5335c2cb10a5a69cb3cdb1c4d01ff9e34 100644
--- a/src/amdis/Marker.cpp
+++ b/src/amdis/Marker.inc.hpp
@@ -1,7 +1,5 @@
 // TODO: Cleanup of copied comments
 
-#include "Marker.hpp"
-
 #include <amdis/common/Math.hpp>
 
 namespace AMDiS {
diff --git a/src/amdis/ProblemStat.hpp b/src/amdis/ProblemStat.hpp
index 77c84c0f3c50cb75ea63f18c6c34f49d8ec5728e..12833cebc30d674634e01eef9c3b2380ccc34080 100644
--- a/src/amdis/ProblemStat.hpp
+++ b/src/amdis/ProblemStat.hpp
@@ -20,7 +20,7 @@
 #include <amdis/Flag.hpp>
 #include <amdis/Initfile.hpp>
 #include <amdis/LinearAlgebra.hpp>
-#include <amdis/Marker.cpp>
+#include <amdis/Marker.hpp>
 #include <amdis/Mesh.hpp>
 #include <amdis/ProblemStatBase.hpp>
 #include <amdis/ProblemStatTraits.hpp>