diff --git a/src/amdis/linearalgebra/DOFMapping.hpp b/src/amdis/linearalgebra/DOFMapping.hpp
index bde448aa51d9123c36c1ea37e228840795a758bf..38153fffb50da34dfe1518a1fa5fe02ff7ce01e0 100644
--- a/src/amdis/linearalgebra/DOFMapping.hpp
+++ b/src/amdis/linearalgebra/DOFMapping.hpp
@@ -8,10 +8,10 @@
 
 #if HAVE_MPI
 #include <dune/common/parallel/remoteindices.hh>
+#include <amdis/common/parallel/Communicator.hpp>
 #endif
 
 #include <amdis/Environment.hpp>
-#include <amdis/common/parallel/Communicator.hpp>
 #include <amdis/linearalgebra/AttributeSet.hpp>
 
 namespace AMDiS
diff --git a/src/amdis/linearalgebra/DOFMapping.inc.hpp b/src/amdis/linearalgebra/DOFMapping.inc.hpp
index f4efe7f3f3498be2fda0372f38cc0e245e0be03d..d75388d7b258b356806c5592485147fe4602c289 100644
--- a/src/amdis/linearalgebra/DOFMapping.inc.hpp
+++ b/src/amdis/linearalgebra/DOFMapping.inc.hpp
@@ -4,8 +4,10 @@
 
 #include <dune/common/timer.hh>
 
+#if HAVE_MPI
 #include <amdis/common/parallel/Collective.hpp>
 #include <amdis/common/parallel/RequestOperations.hpp>
+#endif
 
 namespace AMDiS {
 
diff --git a/src/amdis/linearalgebra/petsc/Communication.hpp b/src/amdis/linearalgebra/petsc/Communication.hpp
index 4c0f77a911f64f674f4884f5d70f47379b0c7b91..25332ccb12e3a7bb9dd006e3b191fafbe0fdb418 100644
--- a/src/amdis/linearalgebra/petsc/Communication.hpp
+++ b/src/amdis/linearalgebra/petsc/Communication.hpp
@@ -8,6 +8,7 @@
 #include <dune/common/parallel/remoteindices.hh>
 #include <dune/common/std/optional.hh>
 
+#include <amdis/functions/GlobalIdSet.hpp>
 #include <amdis/linearalgebra/Communication.hpp>
 #include <amdis/linearalgebra/DOFMapping.hpp>
 #include <amdis/linearalgebra/ParallelIndexSet.hpp>
diff --git a/src/amdis/linearalgebra/petsc/MatrixNnzStructure.hpp b/src/amdis/linearalgebra/petsc/MatrixNnzStructure.hpp
index 25327000bb693f424e0257434284905c78a13b32..1a83ec3ddc48adb03eda338c15b678281a3da45a 100644
--- a/src/amdis/linearalgebra/petsc/MatrixNnzStructure.hpp
+++ b/src/amdis/linearalgebra/petsc/MatrixNnzStructure.hpp
@@ -3,7 +3,9 @@
 #include <algorithm>
 #include <vector>
 
+#if HAVE_MPI
 #include <amdis/common/parallel/Communicator.hpp>
+#endif
 
 namespace AMDiS
 {
diff --git a/src/amdis/linearalgebra/petsc/MatrixNnzStructure.inc.hpp b/src/amdis/linearalgebra/petsc/MatrixNnzStructure.inc.hpp
index df56ecafd0ad12d7e6fd30d3bf37f4dc81b66be0..cf7a5070854f96c5392de21b6d14b65464bb8bc5 100644
--- a/src/amdis/linearalgebra/petsc/MatrixNnzStructure.inc.hpp
+++ b/src/amdis/linearalgebra/petsc/MatrixNnzStructure.inc.hpp
@@ -8,8 +8,10 @@
 
 #include <amdis/AdaptiveGrid.hpp>
 #include <amdis/Output.hpp>
+#if HAVE_MPI
 #include <amdis/common/parallel/Communicator.hpp>
 #include <amdis/common/parallel/RequestOperations.hpp>
+#endif
 #include <amdis/linearalgebra/AttributeSet.hpp>
 
 namespace AMDiS {