diff --git a/dumux/common/pdesolver.hh b/dumux/common/pdesolver.hh
index c86d1f5ed7a2d2d2fb7594ddc42e8ae110b5d087..9b02b124bc3fdb7509ac614e826056867afca522 100644
--- a/dumux/common/pdesolver.hh
+++ b/dumux/common/pdesolver.hh
@@ -26,6 +26,8 @@
 
 #include <memory>
 
+#include <dune/common/hybridutilities.hh>
+
 #include <dumux/common/typetraits/matrix.hh>
 #include <dumux/common/timeloop.hh>
 
diff --git a/dumux/linear/preconditioners.hh b/dumux/linear/preconditioners.hh
index c0fc457a0763d9518ff756998509e64fa357d245..bbfa48cad7229cd6c82315a3e0eda9b420e5fc0f 100644
--- a/dumux/linear/preconditioners.hh
+++ b/dumux/linear/preconditioners.hh
@@ -28,6 +28,7 @@
 #include <dune/common/float_cmp.hh>
 #include <dune/common/indices.hh>
 #include <dune/istl/preconditioners.hh>
+#include <dune/istl/paamg/amg.hh>
 #include <dune/common/version.hh>
 
 #if HAVE_UMFPACK
diff --git a/test/multidomain/facet/1pnc_1pnc/properties_bulk.hh b/test/multidomain/facet/1pnc_1pnc/properties_bulk.hh
index 8ec238392f4cafdd03158095c8a139660853b9a3..b483c0cb29f6f9a56ac45c573dbdf118e7cd4238 100644
--- a/test/multidomain/facet/1pnc_1pnc/properties_bulk.hh
+++ b/test/multidomain/facet/1pnc_1pnc/properties_bulk.hh
@@ -24,6 +24,10 @@
 #ifndef DUMUX_TEST_FACETCOUPLING_ONEPNC_BULK_PROPERTIES_HH
 #define DUMUX_TEST_FACETCOUPLING_ONEPNC_BULK_PROPERTIES_HH
 
+#ifndef DIMWORLD
+#define DIMWORLD 2
+#endif
+
 #include <dune/alugrid/grid.hh>
 
 #include <dumux/material/fluidsystems/h2on2.hh>
diff --git a/test/multidomain/facet/1pnc_1pnc/properties_facet.hh b/test/multidomain/facet/1pnc_1pnc/properties_facet.hh
index 9faac2df954bf68d15822e83a9ce12d550d11bda..53d3b195f7380c9d846c57fdb5321a55c31b81b4 100644
--- a/test/multidomain/facet/1pnc_1pnc/properties_facet.hh
+++ b/test/multidomain/facet/1pnc_1pnc/properties_facet.hh
@@ -24,6 +24,10 @@
 #ifndef DUMUX_TEST_FACETCOUPLING_ONEPNC_FACET_PROPERTIES_HH
 #define DUMUX_TEST_FACETCOUPLING_ONEPNC_FACET_PROPERTIES_HH
 
+#ifndef DIMWORLD
+#define DIMWORLD 2
+#endif
+
 #include <dune/foamgrid/foamgrid.hh>
 
 #include <dumux/material/fluidsystems/h2on2.hh>
@@ -31,7 +35,7 @@
 
 #include <dumux/discretization/box.hh>
 #include <dumux/discretization/cctpfa.hh>
-#include <dumux/porousmediumflow/1p/model.hh>
+#include <dumux/porousmediumflow/1pnc/model.hh>
 
 #include "problem_facet.hh"
 #include "spatialparams.hh"