diff --git a/dumux/boxmodels/common/boxpropertydefaults.hh b/dumux/boxmodels/common/boxpropertydefaults.hh
index 2e708a936c34158c324d58f6c4a78a60cc16fb5b..638e13916026b409d2908854073cfe65313fa59a 100644
--- a/dumux/boxmodels/common/boxpropertydefaults.hh
+++ b/dumux/boxmodels/common/boxpropertydefaults.hh
@@ -33,9 +33,11 @@
 #include "boxelementvolumevariables.hh"
 #include "boxvolumevariables.hh"
 
+#if HAVE_DUNE_PDELAB
 #include <dune/pdelab/finiteelementmap/p1fem.hh>
 #include <dune/pdelab/finiteelementmap/q1fem.hh>
 #include <dune/pdelab/backend/istlmatrixbackend.hh>
+#endif // HAVE_DUNE_PDELAB
 
 #include <dumux/common/boundarytypes.hh>
 #include <dumux/common/timemanager.hh>
diff --git a/dumux/boxmodels/common/pdelabboxassembler.hh b/dumux/boxmodels/common/pdelabboxassembler.hh
index 5d1d8a023e14065db51875185f4709c2be763f47..2f3cce1dbf30966e5b9f089762a96021ab723fc2 100644
--- a/dumux/boxmodels/common/pdelabboxassembler.hh
+++ b/dumux/boxmodels/common/pdelabboxassembler.hh
@@ -22,7 +22,9 @@
 #ifndef DUMUX_PDELAB_BOX_ASSEMBLER_HH
 #define DUMUX_PDELAB_BOX_ASSEMBLER_HH
 
+#if HAVE_DUNE_PDELAB
 #include "pdelabboxlocaloperator.hh"
+#endif
 
 namespace Dumux {
 namespace PDELab {
diff --git a/dumux/boxmodels/common/pdelabboxlocaloperator.hh b/dumux/boxmodels/common/pdelabboxlocaloperator.hh
index 3f8ad4023077c3e098ecbbd8a52e656204e0cc9d..edea6cdd9b957447c6b64e3315d281d5895d1b0d 100644
--- a/dumux/boxmodels/common/pdelabboxlocaloperator.hh
+++ b/dumux/boxmodels/common/pdelabboxlocaloperator.hh
@@ -21,6 +21,10 @@
 #ifndef DUMUX_PDELAB_BOX_LOCAL_OPERATOR_HH
 #define DUMUX_PDELAB_BOX_LOCAL_OPERATOR_HH
 
+#if ! HAVE_DUNE_PDELAB
+#error "DUNE-PDELab must be available in order to include this file!"
+#endif
+
 #include<dune/pdelab/localoperator/pattern.hh>
 #include<dune/pdelab/localoperator/flags.hh>
 
diff --git a/dumux/common/pdelabpreconditioner.hh b/dumux/common/pdelabpreconditioner.hh
index c5e60c311024fa0c6cf77d74e9afb71f52f316aa..950ffa89b10990980dc559f95c92e01c18762141 100644
--- a/dumux/common/pdelabpreconditioner.hh
+++ b/dumux/common/pdelabpreconditioner.hh
@@ -23,6 +23,7 @@
 
 #include <dumux/common/pardiso.hh>
 #include <dumux/common/propertysystem.hh>
+
 #include <dune/pdelab/backend/istlsolverbackend.hh>
 
 namespace Dumux {
diff --git a/dumux/nonlinear/newtoncontroller.hh b/dumux/nonlinear/newtoncontroller.hh
index 562fe56139bfdecfaa8e8036f88b658821c4f47d..2350a92c9b03092fdf177bf38d98c5e6a79a6a16 100644
--- a/dumux/nonlinear/newtoncontroller.hh
+++ b/dumux/nonlinear/newtoncontroller.hh
@@ -23,14 +23,29 @@
 #ifndef DUMUX_NEWTON_CONTROLLER_HH
 #define DUMUX_NEWTON_CONTROLLER_HH
 
+#include <dumux/io/vtkmultiwriter.hh>
 #include <dumux/common/exceptions.hh>
 #include <dumux/common/math.hh>
 
 #include <dumux/common/pardiso.hh>
 
 #include <dumux/io/vtkmultiwriter.hh>
+
+#if HAVE_DUNE_PDELAB
+
 #include <dumux/common/pdelabpreconditioner.hh>
 
+#else // ! HAVE_DUNE_PDELAB
+
+#include <dune/istl/overlappingschwarz.hh>
+#include <dune/istl/schwarz.hh>
+#include <dune/istl/preconditioners.hh>
+#include <dune/istl/solvers.hh>
+#include <dune/istl/owneroverlapcopy.hh>
+#include <dune/istl/io.hh>
+
+#endif // HAVE_DUNE_PDELAB
+
 
 namespace Dumux
 {