diff --git a/dune/stuff/functions/interfaces.hh b/dune/stuff/functions/interfaces.hh
index 7eedc648220ccfa1b41d275c8c5e87bb9cb5d659..58ca67edcbc07b993492bb5f73554fc56c58223c 100644
--- a/dune/stuff/functions/interfaces.hh
+++ b/dune/stuff/functions/interfaces.hh
@@ -40,7 +40,7 @@
 #include <dune/stuff/aliases.hh>
 #include <dune/stuff/common/exceptions.hh>
 #include <dune/stuff/common/memory.hh>
-
+#include <dune/stuff/common/type_utils.hh>
 
 namespace Dune {
 namespace Stuff {
diff --git a/dune/stuff/test/functions_combined.cc b/dune/stuff/test/functions_combined.cc
index e341bf6caf5a903ab3008aba9853be5159c06b6f..2814075ff2c6f2363ce15ee909ffc757a0aca6a3 100644
--- a/dune/stuff/test/functions_combined.cc
+++ b/dune/stuff/test/functions_combined.cc
@@ -99,16 +99,15 @@ TYPED_TEST(DifferenceFunctionTest, evaluate_check)
 
 #else // HAVE_DUNE_GRID
 
-#if DS_COMPILE_DISABLED_TESTS
-TYPED_TEST(DISABLED_FlatTopFunctionTest, static_interface_check)
+// no-compile placeholders to mark disabled tests in test-binary output
+TEST(DISABLED_FlatTopFunctionTest, static_interface_check)
 {
 }
-TYPED_TEST(DISABLED_DifferenceFunctionTest, dynamic_interface_check)
+TEST(DISABLED_DifferenceFunctionTest, dynamic_interface_check)
 {
 }
-TYPED_TEST(DISABLED_DifferenceFunctionTest, evaluate_check)
+TEST(DISABLED_DifferenceFunctionTest, evaluate_check)
 {
 }
-#endif
 
 #endif // HAVE_DUNE_GRID
diff --git a/dune/stuff/test/functions_flattop.cc b/dune/stuff/test/functions_flattop.cc
index 6a30339efcd817e5e86c56add4f1d7be0ee99558..7976b6653b9c599c276012de02538ed444b98b1b 100644
--- a/dune/stuff/test/functions_flattop.cc
+++ b/dune/stuff/test/functions_flattop.cc
@@ -129,22 +129,21 @@ TYPED_TEST(FlatTopFunctionTest, evaluate_check)
 
 #else // HAVE_DUNE_GRID
 
-#if DS_COMPILE_DISABLED_TESTS
-TYPED_TEST(DISABLED_FlatTopFunctionTest, static_interface_check)
+// no-compile placeholders to mark disabled tests in test-binary output
+TEST(DISABLED_FlatTopFunctionTest, static_interface_check)
 {
 }
-TYPED_TEST(DISABLED_FlatTopFunctionTest, static_create_check)
+TEST(DISABLED_FlatTopFunctionTest, static_create_check)
 {
 }
-TYPED_TEST(DISABLED_FlatTopFunctionTest, dynamic_interface_check)
+TEST(DISABLED_FlatTopFunctionTest, dynamic_interface_check)
 {
 }
-TYPED_TEST(DISABLED_FlatTopFunctionTest, copy_check)
+TEST(DISABLED_FlatTopFunctionTest, copy_check)
 {
 }
-TYPED_TEST(DISABLED_FlatTopFunctionTest, evaluate_check)
+TEST(DISABLED_FlatTopFunctionTest, evaluate_check)
 {
 }
-#endif
 
 #endif // HAVE_DUNE_GRID