diff --git a/ag-common/functiontools/leafp1functiontransfer.hh b/ag-common/functiontools/leafp1functiontransfer.hh
index 870cc7897e8533f6fc72c91d337b0edb2c6077b4..6a05219525cb24338b05c07bf76343fc3e37f507 100644
--- a/ag-common/functiontools/leafp1functiontransfer.hh
+++ b/ag-common/functiontools/leafp1functiontransfer.hh
@@ -1,6 +1,8 @@
 #ifndef LEAFP1FUNCTIONTRANSFER_HH
 #define LEAFP1FUNCTIONTRANSFER_HH
 
+#if HAVE_DUNE_DISC
+
 #include <vector>
 
 #include <dune/common/bitsetvector.hh>
@@ -123,5 +125,9 @@ class LeafP1FunctionTransfer
 
 };
 
+#else 
+    #warning leafp1functiontransfer.hh was included but dune-disc is not present !
+#endif // end of #if HAVE_DUNE_DISC
+
 #endif
 
diff --git a/ag-common/neumannassembler.hh b/ag-common/neumannassembler.hh
index 42747a768e47d30cc1ab9a1c01e8dc7c259d68d8..8e95574fe54ec3f59fe0d52b88e27b2bee0ccd75 100644
--- a/ag-common/neumannassembler.hh
+++ b/ag-common/neumannassembler.hh
@@ -1,6 +1,8 @@
 #ifndef NEUMANN_ASSEMBLER_HH
 #define NEUMANN_ASSEMBLER_HH
 
+#if HAVE_DUNE_DISC
+
 /** \file
     \brief Contains a method which assembles the right hand side term for Neumann boundary data.
 */
@@ -96,4 +98,8 @@ void assembleAndAddNeumannTerm(const BoundaryPatchBase<GridView>& neumannBoundar
     
 }
 
+#else 
+    #warning neumannassembler.hh was included but dune-disc is not present !
+#endif // end of #if HAVE_DUNE_DISC
+
 #endif
diff --git a/ag-common/surfmassmatrix.hh b/ag-common/surfmassmatrix.hh
index da619907f55f31116825c35986fab71dd447f677..7585765d0547cb65dd86719fb0720380f8b7860d 100644
--- a/ag-common/surfmassmatrix.hh
+++ b/ag-common/surfmassmatrix.hh
@@ -1,6 +1,8 @@
 #ifndef SURFACE_MASSMATRIX_HH
 #define SURFACE_MASSMATRIX_HH
 
+#if HAVE_DUNE_DISC
+
 /** \file
     \brief Contains a method which assembles the FE mass matrix of a boundary patch of a grid.
 */
@@ -133,4 +135,8 @@ void assembleSurfaceMassMatrix(const BoundaryPatchBase<GridView>& boundary,
 
 }
 
+#else 
+    #warning surfmassmatrix.hh was included but dune-disc is not present !
+#endif // end of #if HAVE_DUNE_DISC
+
 #endif
diff --git a/dune.module b/dune.module
index 7dab00e4e6c054b33de2c82f84e77056ccc861b4..4799f36f875b4a0b1556d992bf47bcd13bf4fdd7 100644
--- a/dune.module
+++ b/dune.module
@@ -1,2 +1,3 @@
 Module: ag-common
-Depends: dune-common dune-grid dune-istl dune-disc dune-localfunctions
+Depends: dune-common dune-grid dune-istl dune-localfunctions
+Suggests: dune-disc