diff --git a/src/averagedistanceassembler.hh b/src/averagedistanceassembler.hh
index 592df5b45f3081ac764d968953f1ee5ed4ceb40f..d3872b9e6cfe383d35a07cc05f3c1898fc63a889 100644
--- a/src/averagedistanceassembler.hh
+++ b/src/averagedistanceassembler.hh
@@ -1,6 +1,8 @@
 #ifndef AVERAGE_DISTANCE_ASSEMBLER_HH
 #define AVERAGE_DISTANCE_ASSEMBLER_HH
 
+#include <vector>
+
 #include "rotation.hh"
 
 template <class TargetSpace>
diff --git a/src/averageinterface.hh b/src/averageinterface.hh
index 41063f94edbb654483daf7a500d95cf96d2bf1c6..c2faf7e66d81f4a07306d3d0e7e684e1f5f39ca3 100644
--- a/src/averageinterface.hh
+++ b/src/averageinterface.hh
@@ -7,7 +7,10 @@
 #include <dune/ag-common/dgindexset.hh>
 #include <dune/ag-common/crossproduct.hh>
 #include <dune/ag-common/surfmassmatrix.hh>
+#include <dune-solvers/numproc.hh>
+
 #include "svd.hh"
+#include "rigidbodymotion.hh"
 
 #ifdef HAVE_IPOPT
 #include "coin/IpTNLP.hpp"
diff --git a/src/geodesicdifference.hh b/src/geodesicdifference.hh
index 7961c5614d4d7d4b60a6bfd8a0dfc66cd23abb05..a8542362884b77c6db86b0464689d7c404ed3e17 100644
--- a/src/geodesicdifference.hh
+++ b/src/geodesicdifference.hh
@@ -1,6 +1,10 @@
 #ifndef GEODESIC_DIFFERENCE_HH
 #define GEODESIC_DIFFERENCE_HH
 
+#include <vector>
+
+#include <dune/istl/bvector.hh>
+
 template <class TargetSpace>
 Dune::BlockVector<typename TargetSpace::TangentVector> computeGeodesicDifference(const std::vector<TargetSpace>& a,
                                                                                  const std::vector<TargetSpace>& b)
diff --git a/src/makestraightrod.hh b/src/makestraightrod.hh
index ab7bc62321f6e59f4536deda654d105b28551ffb..933d85055f68eccd2a19781362cb95b08ffbff7d 100644
--- a/src/makestraightrod.hh
+++ b/src/makestraightrod.hh
@@ -3,6 +3,8 @@
 
 #include <vector>
 #include <dune/common/fvector.hh>
+#include <dune/ag-common/crossproduct.hh>
+
 #include "rotation.hh"
 
 /** \brief Make a straight rod from two given endpoints
diff --git a/src/rodwriter.hh b/src/rodwriter.hh
index 97b49e8dfb0f3ace1ac1427250d777a232077e54..08686984870b93360499661cb28356aba907e682 100644
--- a/src/rodwriter.hh
+++ b/src/rodwriter.hh
@@ -4,6 +4,7 @@
 #include <fstream>
 
 #include <dune/common/exceptions.hh>
+#include <dune/istl/bvector.hh>
 
 #include "rigidbodymotion.hh"