diff --git a/dune/common/bartonnackmanifcheck.hh b/dune/common/bartonnackmanifcheck.hh
index e86bdb5192963155c08584072d3b0b1ad7ecca35..63f49a93035350d9039aaac2d9044104c5ab6b0d 100644
--- a/dune/common/bartonnackmanifcheck.hh
+++ b/dune/common/bartonnackmanifcheck.hh
@@ -1,5 +1,8 @@
 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
+#ifndef DUNE_COMMON_BACTONNACKMANIFCHECK_HH
+#define DUNE_COMMON_BACTONNACKMANIFCHECK_HH
+
 /** @file
    @author Robert Kloefkorn
    @brief Provides check for implementation of interface methods when using
@@ -12,12 +15,9 @@
 //- Dune includes
 #include <dune/common/exceptions.hh>
 
-#ifndef CHECK_INTERFACE_IMPLEMENTATION
+#ifdef NDEBUG
 #define CHECK_INTERFACE_IMPLEMENTATION(dummy)
-#ifndef NDEBUG
-// only do checking if DUNE_DEVEL_MODE is defined aswell
-#ifdef DUNE_DEVEL_MODE
-#undef CHECK_INTERFACE_IMPLEMENTATION
+#else
 #define CHECK_INTERFACE_IMPLEMENTATION(__interface_method_to_call__) \
   {\
     static bool call = false; \
@@ -35,23 +35,18 @@
     } \
   }
 #endif
-#endif
-#endif
 
 /** The macro CHECK_AND_CALL_INTERFACE_IMPLEMENTATION throws an exception,
    if the interface method ist not implemented and just calls the method
    otherwise. If NDEBUG is defined no
    checking is done and the method is just called.
  */
-#ifndef CHECK_AND_CALL_INTERFACE_IMPLEMENTATION
+#ifndef NDEBUG
 #define CHECK_AND_CALL_INTERFACE_IMPLEMENTATION(__interface_method_to_call__) \
   (__interface_method_to_call__)
-#ifndef NDEBUG
-// only do checking if DUNE_DEVEL_MODE is defined aswell
-#ifdef DUNE_DEVEL_MODE
-#undef CHECK_AND_CALL_INTERFACE_IMPLEMENTATION
+#else
 #define CHECK_AND_CALL_INTERFACE_IMPLEMENTATION(__interface_method_to_call__) \
   CHECK_INTERFACE_IMPLEMENTATION(__interface_method_to_call__)
 #endif
-#endif
-#endif
+
+#endif // DUNE_COMMON_BACTONNACKMANIFCHECK_HH