diff --git a/src/amdis/AdaptInstationary.hpp b/src/amdis/AdaptInstationary.hpp
index 016f6355e0aa1ed2f88c3b9bdd7f531cbdf3a55f..02fe866452e827825f3aa34b26688d7d5f7eec4f 100644
--- a/src/amdis/AdaptInstationary.hpp
+++ b/src/amdis/AdaptInstationary.hpp
@@ -10,12 +10,12 @@ namespace AMDiS
 {
   // forward declarations
   class AdaptInfo;
-  class ProblemInterationInterface;
+  class ProblemIterationInterface;
   class ProblemTimeInterface;
 
   /** \ingroup Adaption
    * \brief
-   * AdaptInstationary implements the adaptive procdure for time dependent
+   * AdaptInstationary implements the adaptive procedure for time dependent
    * problems (see ProblemInstat). It contains a pointer to a ProblemInstat
    * object.
    */
diff --git a/src/amdis/ProblemInstat.inc.hpp b/src/amdis/ProblemInstat.inc.hpp
index 250bc00ccb146afc8ff4eb61e501bb9e02e0650f..cde54bcad990c510de94a6aaf19e3a093114d81d 100644
--- a/src/amdis/ProblemInstat.inc.hpp
+++ b/src/amdis/ProblemInstat.inc.hpp
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "ProblemInstat.hpp"
-
 #include <string>
 #include <vector>
 
diff --git a/src/amdis/StandardProblemIteration.hpp b/src/amdis/StandardProblemIteration.hpp
index 4ec7983cd79e61fcc91e69e168e9b81148d6bfdd..a64de368a2128351ddc55ce0c35ac8c07aff12d1 100644
--- a/src/amdis/StandardProblemIteration.hpp
+++ b/src/amdis/StandardProblemIteration.hpp
@@ -2,13 +2,13 @@
 
 #include <string>
 
-#include "Flag.hpp"
 #include "ProblemIterationInterface.hpp"
 
 namespace AMDiS
 {
   // forward declarations
   class AdaptInfo;
+  class Flag;
   class ProblemStatBase;
 
   /// A master problem for a single non coupled problem.
diff --git a/src/amdis/linearalgebra/LinearSolverInterface.hpp b/src/amdis/linearalgebra/LinearSolverInterface.hpp
index 083878a5b8593c86adc9753f84b60cf53ef13f55..bbaee462ae6ecfefc0f8772c69d6f2bfafda56b6 100644
--- a/src/amdis/linearalgebra/LinearSolverInterface.hpp
+++ b/src/amdis/linearalgebra/LinearSolverInterface.hpp
@@ -48,8 +48,4 @@ namespace AMDiS
     virtual void solveImpl(Mat const& A, Vec& x, Vec const& b, Comm& comm, SolverInfo& solverInfo) = 0;
   };
 
-
-  template <class Matrix, class Vector>
-  struct SolverCreator;
-
 } // end namespace AMDiS