diff --git a/bin/add_config_header.py b/bin/add_config_header.py
index 7bbb596521f1a8f1406d9393b4c959c9225ef14e..e59aa095cd242fb5b87114906a8dff4f78182e94 100644
--- a/bin/add_config_header.py
+++ b/bin/add_config_header.py
@@ -1,12 +1,12 @@
 import os
 import sys
 
-def add_config_header(module, dir):
+def add_config_header(config_file, dir):
   if not os.path.exists(dir):
     print('directory {} does not exist.'.format(dir))
     exit(2)
 
-  config_header = '#include <dune/internal/{}.hh>'.format(module)
+  config_header = '#include <{}>'.format(config_file)
   for root, dirs, files in os.walk(dir):
     for filename in filter(lambda f: f.endswith('.hh'), files):
         file = os.path.join(root,filename)
@@ -43,7 +43,7 @@ def add_config_header(module, dir):
 
 if __name__ == '__main__':
   if len(sys.argv) < 3:
-    print('usage: {} <module> <dir>'.format(sys.argv[0]))
+    print('usage: {} <config_file> <dir>'.format(sys.argv[0]))
     exit(1)
 
   add_config_header(sys.argv[1], sys.argv[2])
diff --git a/cmake/modules/DuneMacros.cmake b/cmake/modules/DuneMacros.cmake
index a28a81de1f10e5a3a63ec4296c4ba2858c53c440..8cbebb6b060c572db6340235f8b1ef48b0145f32 100644
--- a/cmake/modules/DuneMacros.cmake
+++ b/cmake/modules/DuneMacros.cmake
@@ -1198,33 +1198,19 @@ endmacro(add_dune_all_flags targets)
 
 
 # create a module specific config header file and force an include
-macro(dune_target_add_config_header _target _scope _config_h)
-  set(CONFIG_H_IN_FILE ${CMAKE_CURRENT_BINARY_DIR}/config.h.in)
-  file(READ ${_config_h} _config_h_content)
-  file(WRITE ${CONFIG_H_IN_FILE} "${_config_h_content}")
+macro(dune_add_config_header _config_hh_in _config_hh)
+  set(_config_hh_tmp ${CMAKE_CURRENT_BINARY_DIR}/config.hh.in)
+  file(READ ${_config_hh_in} _config_hh_content)
+  file(WRITE ${_config_hh_tmp} "${_config_hh_content}")
 
   # define that we found this module
   set(${ProjectName}_FOUND 1)
   foreach(_dep ${ProjectName} ${ALL_DEPENDENCIES})
     dune_module_to_uppercase(_upper ${_dep})
     set(HAVE_${_upper} ${${_dep}_FOUND})
-    file(APPEND ${CONFIG_H_IN_FILE}
-      "\n\n/* Define to 1 if you have module ${_dep} available */\n#cmakedefine01 HAVE_${_upper}\n")
+    file(APPEND ${_config_hh_tmp}
+      "\n/* Define to 1 if you have module ${_dep} available */\n#cmakedefine01 HAVE_${_upper}\n")
   endforeach()
 
-  configure_file(${CONFIG_H_IN_FILE} ${PROJECT_BINARY_DIR}/dune/internal/${ProjectName}.hh)
-  install(FILES ${PROJECT_BINARY_DIR}/dune/internal/${ProjectName}.hh
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/internal)
-
-  # Set the generated header as precompiled-header to be automatically included
-  # target_precompile_headers(${_target} ${_scope}
-  #   $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/dune/internal/${ProjectName}.hh>
-  #   $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}/dune/internal/${ProjectName}.hh>)
-
-  # force include of the generated config header
-  if(NOT DUNE_DISABLE_FORCED_INCLUDE)
-    target_compile_options(${_target} ${_scope}
-      $<BUILD_INTERFACE:-include${PROJECT_BINARY_DIR}/dune/internal/${ProjectName}.hh>
-      $<INSTALL_INTERFACE:-include$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}/dune/internal/${ProjectName}.hh>)
-  endif()
-endmacro(dune_target_add_config_header)
+  configure_file(${_config_hh_tmp} ${_config_hh})
+endmacro(dune_add_config_header)
diff --git a/dune/common/CMakeLists.txt b/dune/common/CMakeLists.txt
index dd820f09502086af7e87a407e5310f965f2beb69..925079c27d1b2332fb16008a17217cf725bee174 100644
--- a/dune/common/CMakeLists.txt
+++ b/dune/common/CMakeLists.txt
@@ -125,5 +125,14 @@ install(FILES test/iteratortest.hh
   test/checkmatrixinterface.hh
   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/common/test)
 
-# create and install package config.h file
-dune_target_add_config_header(dunecommon PUBLIC config.h.in)
\ No newline at end of file
+# create and install package config.hh header
+dune_add_config_header(config.hh.in ${CMAKE_CURRENT_BINARY_DIR}/config.hh)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/config.hh
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/common)
+
+# force include of the generated config header
+if(NOT DUNE_DISABLE_FORCED_INCLUDE)
+  target_compile_options(dunecommon PUBLIC
+    $<BUILD_INTERFACE:-include${CMAKE_CURRENT_BINARY_DIR}/config.hh>
+    $<INSTALL_INTERFACE:-include$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}/dune/common/config.hh>)
+endif()
\ No newline at end of file
diff --git a/dune/common/alignedallocator.hh b/dune/common/alignedallocator.hh
index 64d517ea0c3f5b6ce234a07e865e17126168d11e..6b605baeda34abe184f41a60091df88c33e4c2dc 100644
--- a/dune/common/alignedallocator.hh
+++ b/dune/common/alignedallocator.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_ALIGNED_ALLOCATOR_HH
 #define DUNE_ALIGNED_ALLOCATOR_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include "mallocallocator.hh"
 #include <cstdlib>
diff --git a/dune/common/arraylist.hh b/dune/common/arraylist.hh
index 526d3fbb30ccbb78d19c8680cd371aa5958fea67..7a0cb6bad7b87204be8ecab1d21df88f079bab96 100644
--- a/dune/common/arraylist.hh
+++ b/dune/common/arraylist.hh
@@ -3,7 +3,7 @@
 
 #ifndef DUNE_COMMON_ARRAYLIST_HH
 #define DUNE_COMMON_ARRAYLIST_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <array>
 #include <cassert>
diff --git a/dune/common/assertandreturn.hh b/dune/common/assertandreturn.hh
index 478d8ad4c35c53f43f44dd0aa70baca7aa9d4feb..ea1fb25ac39fd988baeea23bf699b65bd1b98fa0 100644
--- a/dune/common/assertandreturn.hh
+++ b/dune/common/assertandreturn.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_ASSERTANDRETURN_HH
 #define DUNE_COMMON_ASSERTANDRETURN_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <cassert>
 
diff --git a/dune/common/bigunsignedint.hh b/dune/common/bigunsignedint.hh
index c8371453caf3dae7ca5361153c0ce03647dfa941..6abda5477a47022c20426b667c921ba6de7edc60 100644
--- a/dune/common/bigunsignedint.hh
+++ b/dune/common/bigunsignedint.hh
@@ -3,7 +3,7 @@
 
 #ifndef DUNE_BIGUNSIGNEDINT_HH
 #define DUNE_BIGUNSIGNEDINT_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <algorithm>
 #include <iostream>
diff --git a/dune/common/binaryfunctions.hh b/dune/common/binaryfunctions.hh
index 8b92fa58953bb0503341d8286a8cf0fdb96bd7ef..7410c8a11ebaa3dc9fcb3114afd70a2d18782398 100644
--- a/dune/common/binaryfunctions.hh
+++ b/dune/common/binaryfunctions.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_BINARYFUNCTIONS_HH
 #define DUNE_BINARYFUNCTIONS_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /** \file
  * \brief helper classes to provide unique types for standard functions
diff --git a/dune/common/bitsetvector.hh b/dune/common/bitsetvector.hh
index ad6b2bbfddd220ab752ac8af6da39dcb11897459..bae5769118ce250803829020c50981c736acce21 100644
--- a/dune/common/bitsetvector.hh
+++ b/dune/common/bitsetvector.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_BLOCK_BITFIELD_HH
 #define DUNE_BLOCK_BITFIELD_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /** \file
     \brief Efficient implementation of a dynamic array of static arrays of booleans
diff --git a/dune/common/boundschecking.hh b/dune/common/boundschecking.hh
index de7006a81c9d0906f8aeccdbffe35f7f21e44406..ffa7f2c57571c7847ebfd45266ff60c4c1a7ccc3 100644
--- a/dune/common/boundschecking.hh
+++ b/dune/common/boundschecking.hh
@@ -1,6 +1,6 @@
 #ifndef DUNE_BOUNDSCHECKING_HH
 #define DUNE_BOUNDSCHECKING_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <dune/common/exceptions.hh>
 
diff --git a/dune/common/classname.hh b/dune/common/classname.hh
index 4fa62a39161eb5501a1d9aa990ad06f1529a13ef..4722413170718026ee49d41868514773d90ebb63 100644
--- a/dune/common/classname.hh
+++ b/dune/common/classname.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_CLASSNAME_HH
 #define DUNE_CLASSNAME_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /** \file
  * \brief A free function to provide the demangled class name
diff --git a/dune/common/concept.hh b/dune/common/concept.hh
index 4f1c7af3b56d5379059942bf0f533b0327bc270f..c7f86c16866442a1f1b604b7006fd8f5e7f73d74 100644
--- a/dune/common/concept.hh
+++ b/dune/common/concept.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_CONCEPT_HH
 #define DUNE_COMMON_CONCEPT_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <type_traits>
 #include <utility>
diff --git a/dune/common/conditional.hh b/dune/common/conditional.hh
index c7dc5bf54d0aa11c1424d5a18d01128911fee1e5..098024e2a8436d142700fa64d4bfaa73e9567114 100644
--- a/dune/common/conditional.hh
+++ b/dune/common/conditional.hh
@@ -1,6 +1,6 @@
 #ifndef DUNE_COMMON_CONDITIONAL_HH
 #define DUNE_COMMON_CONDITIONAL_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 namespace Dune
 {
diff --git a/dune/common/config.h.in b/dune/common/config.hh.in
similarity index 96%
rename from dune/common/config.h.in
rename to dune/common/config.hh.in
index fae8954078d44b2f99c3573d6de4988c70425862..651f49b1e7a18b262c347082991663aee5073c39 100644
--- a/dune/common/config.h.in
+++ b/dune/common/config.hh.in
@@ -1,12 +1,14 @@
 #pragma once
 
-/* begin dune-common
-   put the definitions for config.h specific to
-   your project here. Everything above will be
-   overwritten
-*/
+/**
+ * \file
+ * This file acts as a template for configuration specific
+ * definitions and is filled automatically by cmake.
+ *
+ * The generated file will be stored in the build or install directory
+ * without the file extending as dune/common/config.hh
+**/
 
-/* begin private */
 /* Define to the version of dune-common */
 #define DUNE_COMMON_VERSION "${DUNE_COMMON_VERSION}"
 
@@ -176,7 +178,3 @@
 #endif
 
 #define FC_FUNC LAPACK_MANGLE
-
-/* end dune-common
-   Everything below here will be overwritten
-*/
\ No newline at end of file
diff --git a/dune/common/debugalign.hh b/dune/common/debugalign.hh
index 7a2e7015d18ae3c1a701af3b121061294c7c30f5..ea483156b015c142d1c6490ab995334518d823e0 100644
--- a/dune/common/debugalign.hh
+++ b/dune/common/debugalign.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_DEBUGALIGN_HH
 #define DUNE_DEBUGALIGN_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <algorithm>
 #include <cassert>
diff --git a/dune/common/debugallocator.hh b/dune/common/debugallocator.hh
index 3776762d93506879455b79031cebfc745a5a9f70..6f43dd806e22310e7a5a8dec45f6ddf7a9dd3a78 100644
--- a/dune/common/debugallocator.hh
+++ b/dune/common/debugallocator.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_DEBUG_ALLOCATOR_HH
 #define DUNE_DEBUG_ALLOCATOR_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <dune/common/unused.hh>
 #include <exception>
diff --git a/dune/common/debugstream.hh b/dune/common/debugstream.hh
index 8e2b7550f048ac858c432b1beeb9fd709aa30c80..a755c2db9f5dd303be0df3ae223756edd12ac60a 100644
--- a/dune/common/debugstream.hh
+++ b/dune/common/debugstream.hh
@@ -3,7 +3,7 @@
 
 #ifndef DUNE_DEBUGSTREAM_HH
 #define DUNE_DEBUGSTREAM_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /** \file
  * \brief Defines several output streams for messages of different importance
diff --git a/dune/common/densematrix.hh b/dune/common/densematrix.hh
index 78c54255cac892fb1806ece3386d73189d20049f..fa06fa6f32b825ad1e0df45c8d3a5493e18b1a55 100644
--- a/dune/common/densematrix.hh
+++ b/dune/common/densematrix.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_DENSEMATRIX_HH
 #define DUNE_DENSEMATRIX_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <cmath>
 #include <cstddef>
diff --git a/dune/common/densevector.hh b/dune/common/densevector.hh
index f37c02d2ff745575bc15a81606c257a7106857ae..df1365590aa0bb769789aaa25f75937d66469573 100644
--- a/dune/common/densevector.hh
+++ b/dune/common/densevector.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_DENSEVECTOR_HH
 #define DUNE_DENSEVECTOR_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <algorithm>
 #include <limits>
diff --git a/dune/common/deprecated.hh b/dune/common/deprecated.hh
index 73848b971250a3a9b713ac95dc2ada5765ca694b..2b4e9a006ba2d1c43a8248fde92041dd759f9d06 100644
--- a/dune/common/deprecated.hh
+++ b/dune/common/deprecated.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_DEPRECATED_HH
 #define DUNE_DEPRECATED_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /** \file
  * \brief Definition of the DUNE_DEPRECATED macro for the case that config.h
diff --git a/dune/common/diagonalmatrix.hh b/dune/common/diagonalmatrix.hh
index ce265b677e6f65d36fcd5507a2d5ab9fa09da068..ec132ca4bfe46a1f479eaa4123bb57fee2d23bb1 100644
--- a/dune/common/diagonalmatrix.hh
+++ b/dune/common/diagonalmatrix.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_DIAGONAL_MATRIX_HH
 #define DUNE_DIAGONAL_MATRIX_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /*! \file
    \brief  This file implements a quadratic diagonal matrix of fixed size.
diff --git a/dune/common/documentation.hh b/dune/common/documentation.hh
index 6b2e0973edb0671ccdf1dac8427cb61b810d69c8..5e4e07f10c6a8a65e9439debaa96a38f6fe2a014 100644
--- a/dune/common/documentation.hh
+++ b/dune/common/documentation.hh
@@ -3,7 +3,7 @@
 
 #ifndef DUNE_COMMON_DOCUMENTATION_HH
 #define DUNE_COMMON_DOCUMENTATION_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /** \file
     \brief Documentation related stuff
diff --git a/dune/common/dotproduct.hh b/dune/common/dotproduct.hh
index 3a90b17586c9d37c3ff677bc1b54cf3a6e51ba64..fbe0672d21e1e7b14b7cb0e5e7d49a63ad340090 100644
--- a/dune/common/dotproduct.hh
+++ b/dune/common/dotproduct.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_DOTPRODUCT_HH
 #define DUNE_DOTPRODUCT_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include "ftraits.hh"
 #include "typetraits.hh"
diff --git a/dune/common/dynmatrix.hh b/dune/common/dynmatrix.hh
index 55136af3b69765ab561b02848bb8c48116fb36d3..da72c0c50153d7afe0551d70c1f4adcd0cda856c 100644
--- a/dune/common/dynmatrix.hh
+++ b/dune/common/dynmatrix.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_DYNMATRIX_HH
 #define DUNE_DYNMATRIX_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <cmath>
 #include <cstddef>
diff --git a/dune/common/dynmatrixev.hh b/dune/common/dynmatrixev.hh
index 963e846f2f5163ab378e059650f96df91140be73..c3b2b085793cafe4dda8a69a9f21a6d714a7e6ca 100644
--- a/dune/common/dynmatrixev.hh
+++ b/dune/common/dynmatrixev.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_DYNMATRIXEIGENVALUES_HH
 #define DUNE_DYNMATRIXEIGENVALUES_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <algorithm>
 #include <memory>
diff --git a/dune/common/dynvector.hh b/dune/common/dynvector.hh
index 7a8283d33fada380c208765c397d61191f2cde51..64e4cc502f141bdb909257897820c057c2e7065b 100644
--- a/dune/common/dynvector.hh
+++ b/dune/common/dynvector.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_DYNVECTOR_HH
 #define DUNE_DYNVECTOR_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <cmath>
 #include <cstddef>
diff --git a/dune/common/enumset.hh b/dune/common/enumset.hh
index 2c3ed918148d68e8c0fe545db866872d43188a40..d5550bfa8a78450f1a303368995b5c7e78480c97 100644
--- a/dune/common/enumset.hh
+++ b/dune/common/enumset.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_ENUMSET_HH
 #define DUNE_ENUMSET_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <iostream>
 #include <dune/common/unused.hh>
diff --git a/dune/common/exceptions.hh b/dune/common/exceptions.hh
index 0dbaf7b297def5995ccdd0a4dd1054de361ce1c1..dd5a57b8a1de5f959ae000e0e4bd8b557831e947 100644
--- a/dune/common/exceptions.hh
+++ b/dune/common/exceptions.hh
@@ -3,7 +3,7 @@
 
 #ifndef DUNE_EXCEPTIONS_HH
 #define DUNE_EXCEPTIONS_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <exception>
 #include <string>
diff --git a/dune/common/filledarray.hh b/dune/common/filledarray.hh
index 5e683a74883f7330b1948157593e5a3289152ec1..35e18fb7bf0bf13f7b044763dc579db85e771508 100644
--- a/dune/common/filledarray.hh
+++ b/dune/common/filledarray.hh
@@ -3,7 +3,7 @@
 
 #ifndef DUNE_COMMON_FILLED_ARRAY_HH
 #define DUNE_COMMON_FILLED_ARRAY_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /** \file
     \brief Utility to generate an array with a certain value
diff --git a/dune/common/float_cmp.hh b/dune/common/float_cmp.hh
index cf288d9c074da14793ee3c77d284377cd417cd33..4bce8050b51f92fa8a1b5c7b627bd086b5a82447 100644
--- a/dune/common/float_cmp.hh
+++ b/dune/common/float_cmp.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_FLOAT_CMP_HH
 #define DUNE_COMMON_FLOAT_CMP_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /** \file
  * \brief Various ways to compare floating-point numbers
diff --git a/dune/common/fmatrix.hh b/dune/common/fmatrix.hh
index fcd793f4f8c0cc9c27560382c70468bd0802233b..8d31d27e04c2abfd5fbdc842bd7c361e71b2ec44 100644
--- a/dune/common/fmatrix.hh
+++ b/dune/common/fmatrix.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_FMATRIX_HH
 #define DUNE_FMATRIX_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <cmath>
 #include <cstddef>
diff --git a/dune/common/fmatrixev.hh b/dune/common/fmatrixev.hh
index c3120d214777d8a35d1ce7bf5ae193f7a8a5ed3d..359327796f5f10befbc4c84ea25c7a69bd37f3da 100644
--- a/dune/common/fmatrixev.hh
+++ b/dune/common/fmatrixev.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_FMATRIXEIGENVALUES_HH
 #define DUNE_FMATRIXEIGENVALUES_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /** \file
  * \brief Eigenvalue computations for the FieldMatrix class
diff --git a/dune/common/ftraits.hh b/dune/common/ftraits.hh
index c0f43f93cd20357b6f44c34860f227c253d4f527..95b6d94ed56a3cdd1b5ac5083e85af651764063e 100644
--- a/dune/common/ftraits.hh
+++ b/dune/common/ftraits.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_FTRAITS_HH
 #define DUNE_FTRAITS_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /** \file
  * \brief Type traits to determine the type of reals (when working with complex numbers)
diff --git a/dune/common/function.hh b/dune/common/function.hh
index 9a5be6c43ba487535d7a458d860d9fa2bebff8f8..6204d106c68166831ffb6d8835f5daba11c76df2 100644
--- a/dune/common/function.hh
+++ b/dune/common/function.hh
@@ -8,7 +8,7 @@
 
 #ifndef DUNE_FUNCTION_HH
 #define DUNE_FUNCTION_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <utility>
 
diff --git a/dune/common/fvector.hh b/dune/common/fvector.hh
index e862c3a7491180790467837ff38df1e42846a221..55a5212b6d508839aefdc8372b99b18bce5aa025 100644
--- a/dune/common/fvector.hh
+++ b/dune/common/fvector.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_FVECTOR_HH
 #define DUNE_FVECTOR_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <array>
 #include <cmath>
diff --git a/dune/common/gcd.hh b/dune/common/gcd.hh
index 34ea1af4bad444bcd610053b89f8587c7b4f6e6d..05a1b5701a8187d30f0e0ec91e71b243cd5ebd15 100644
--- a/dune/common/gcd.hh
+++ b/dune/common/gcd.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_GCD_HH
 #define DUNE_GCD_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 #warning "This header is deprecated and will be removed after Dune release 2.8. Use std::gcd instead"
 
 #include <numeric>
diff --git a/dune/common/genericiterator.hh b/dune/common/genericiterator.hh
index 5f777f852c34e70385f2fbab5ff492e29d53960e..27dbe0e41a3da91300a190f7d800466a86b708aa 100644
--- a/dune/common/genericiterator.hh
+++ b/dune/common/genericiterator.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_GENERICITERATOR_HH
 #define DUNE_GENERICITERATOR_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <dune/common/iteratorfacades.hh>
 #include <cassert>
diff --git a/dune/common/gmpfield.hh b/dune/common/gmpfield.hh
index d85bf1d952e66ce0834a85d85446e3b5a25528bc..3660a6f458e64082fe8b5f083fcd7e3bdefe3371 100644
--- a/dune/common/gmpfield.hh
+++ b/dune/common/gmpfield.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_GMPFIELD_HH
 #define DUNE_GMPFIELD_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /** \file
  * \brief Wrapper for the GNU multiprecision (GMP) library
diff --git a/dune/common/hash.hh b/dune/common/hash.hh
index bbec1c1c94aa421298ff405e9b22f86ae9b60128..3d0822ceb0e86e6e033ace3b21e9c3d36955a318 100644
--- a/dune/common/hash.hh
+++ b/dune/common/hash.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_HASH_HH
 #define DUNE_COMMON_HASH_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <functional>
 
diff --git a/dune/common/hybridutilities.hh b/dune/common/hybridutilities.hh
index 1e4d09a9ef84a2cb9088ce6c6a4885b6aa87b62b..d64bf65be95fd38f07fb2e4763d17a2c07de2f08 100644
--- a/dune/common/hybridutilities.hh
+++ b/dune/common/hybridutilities.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_HYBRIDUTILITIES_HH
 #define DUNE_COMMON_HYBRIDUTILITIES_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <tuple>
 #include <utility>
diff --git a/dune/common/indent.hh b/dune/common/indent.hh
index b7aeb9979d3d3e21f3e4bacd1d2cb80506da3b1d..e37f1724ba0b1f7d468194b3d66c86ceeb524b23 100644
--- a/dune/common/indent.hh
+++ b/dune/common/indent.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_INDENT_HH
 #define DUNE_COMMON_INDENT_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <ostream>
 #include <string>
diff --git a/dune/common/indices.hh b/dune/common/indices.hh
index 7c633365350e52f6cf8f7594480cd43a7f04aa14..90008e5c5c4ef4b4a7e605db7ed37d852e7b629e 100644
--- a/dune/common/indices.hh
+++ b/dune/common/indices.hh
@@ -3,7 +3,7 @@
 
 #ifndef DUNE_COMMON_INDICES_HH
 #define DUNE_COMMON_INDICES_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <cstddef>
 #include <type_traits>
diff --git a/dune/common/interfaces.hh b/dune/common/interfaces.hh
index d64b323bfb68c9d8a1d4d09cb397724325ed0bda..730fc85f2c0e689c2b8397f65aa7070b208b8d86 100644
--- a/dune/common/interfaces.hh
+++ b/dune/common/interfaces.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_INTERFACES_HH
 #define DUNE_INTERFACES_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /** @file
    @author Robert Kloefkorn
diff --git a/dune/common/ios_state.hh b/dune/common/ios_state.hh
index 134969916f6acd4c7fd16a7e1c13993652ae5e2a..43d60ff7d12dfac9a879e41d7c30aa7157d9952b 100644
--- a/dune/common/ios_state.hh
+++ b/dune/common/ios_state.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_IOS_STATE_HH
 #define DUNE_COMMON_IOS_STATE_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <ios>
 
diff --git a/dune/common/iteratorfacades.hh b/dune/common/iteratorfacades.hh
index 4c48c812fce1896840cb5f3142d4404307b8c9b1..4a21a8380c9e22d47b4c28099bd54acecd9e5265 100644
--- a/dune/common/iteratorfacades.hh
+++ b/dune/common/iteratorfacades.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_ITERATORFACADES_HH
 #define DUNE_ITERATORFACADES_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <iterator>
 #include <type_traits>
diff --git a/dune/common/iteratorrange.hh b/dune/common/iteratorrange.hh
index be0c0be1148a5c102218d920fe6f49716e066506..6d0f2366851190afa3824410a80693f7e29e30b2 100644
--- a/dune/common/iteratorrange.hh
+++ b/dune/common/iteratorrange.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_ITERATORRANGE_HH
 #define DUNE_COMMON_ITERATORRANGE_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 namespace Dune {
 
diff --git a/dune/common/keywords.hh b/dune/common/keywords.hh
index 2fa82b6a84836befe17fff76d3725a3456ef8bdd..e70d680ba12f3226be245de6ccbeb150e38dd1ad 100644
--- a/dune/common/keywords.hh
+++ b/dune/common/keywords.hh
@@ -1,6 +1,6 @@
 #ifndef DUNE_COMMON_KEYWORDS_HH
 #define DUNE_COMMON_KEYWORDS_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /** \file
  * \brief Definitions of several macros that conditionally make C++ syntax
diff --git a/dune/common/lcm.hh b/dune/common/lcm.hh
index 0d972099d71dc260d6389d6a5170ac4cb5bf4284..250cd6afb9b4fffd2198d4b231c9b871ae07fcab 100644
--- a/dune/common/lcm.hh
+++ b/dune/common/lcm.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_LCM_HH
 #define DUNE_LCM_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #warning "This header is deprecated and will be removed after release 2.8. Use std::lcm instead."
 
diff --git a/dune/common/lru.hh b/dune/common/lru.hh
index fcac126dbe30db16c3ab31936d55a31fd0185f36..027f2fbca6f3f9083de53c0a0debb71f70e4f2ba 100644
--- a/dune/common/lru.hh
+++ b/dune/common/lru.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_LRU_HH
 #define DUNE_COMMON_LRU_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <list>
 #include <utility>
diff --git a/dune/common/mallocallocator.hh b/dune/common/mallocallocator.hh
index 78cb3c86842adbbcfd69528135f116bb3b16b58c..a0517b93c8f11696182ecef809dc29f1d3882afc 100644
--- a/dune/common/mallocallocator.hh
+++ b/dune/common/mallocallocator.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_MALLOC_ALLOCATOR_HH
 #define DUNE_MALLOC_ALLOCATOR_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <exception>
 #include <cstdlib>
diff --git a/dune/common/math.hh b/dune/common/math.hh
index bd62938dc729aabd7d20ee4b3510c332b2cafb82..ef911968cfa79000340ff12823f559a1ffd289ce 100644
--- a/dune/common/math.hh
+++ b/dune/common/math.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_MATH_HH
 #define DUNE_MATH_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /** \file
  * \brief Some useful basic math stuff
diff --git a/dune/common/matvectraits.hh b/dune/common/matvectraits.hh
index 0fba897657bdc101f9618985fb9bbf4bfbc57c89..a7f3d6387048d2d3939569028dc508fc4a232ad3 100644
--- a/dune/common/matvectraits.hh
+++ b/dune/common/matvectraits.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_MATVECTRAITS_HH
 #define DUNE_MATVECTRAITS_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /** \file
  * \brief Documentation of the traits classes you need to write for each implementation of DenseVector or DenseMatrix
diff --git a/dune/common/overloadset.hh b/dune/common/overloadset.hh
index 6819727a392a1c69a62b67e285a14758c28d2ab5..6a4414916ef94a0dc3e2d0488e7861457655f01b 100644
--- a/dune/common/overloadset.hh
+++ b/dune/common/overloadset.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_OVERLOADSET_HH
 #define DUNE_COMMON_OVERLOADSET_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <utility>
 #include <type_traits>
diff --git a/dune/common/parallel/communication.hh b/dune/common/parallel/communication.hh
index 9c20c4d8c8347b8a3917ed6fe821c7be76651918..98dfb06da6ba13a73607b49de53dac5de7cad513 100644
--- a/dune/common/parallel/communication.hh
+++ b/dune/common/parallel/communication.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_PARALLEL_COMMUNICATION_HH
 #define DUNE_COMMON_PARALLEL_COMMUNICATION_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 /*!
    \file
    \brief Implements an utility class that provides
diff --git a/dune/common/parallel/communicator.hh b/dune/common/parallel/communicator.hh
index 04f67cc2aaea2e8c8f385594b24f91aeb172694b..b6e88a023ef14699ffa8a8371e7bd2818676fcf2 100644
--- a/dune/common/parallel/communicator.hh
+++ b/dune/common/parallel/communicator.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMUNICATOR
 #define DUNE_COMMUNICATOR
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #if HAVE_MPI
 
diff --git a/dune/common/parallel/future.hh b/dune/common/parallel/future.hh
index 709e8583573520dd9836339725743e3fa1abe146..0aaa2e5c7d8bbc1c77cb2a48b04ffdf2a49fd32b 100644
--- a/dune/common/parallel/future.hh
+++ b/dune/common/parallel/future.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_PARALLEL_FUTURE_HH
 #define DUNE_COMMON_PARALLEL_FUTURE_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <memory>
 #include <dune/common/exceptions.hh>
diff --git a/dune/common/parallel/indexset.hh b/dune/common/parallel/indexset.hh
index 32d55517a800f74f00a7a0a6d09b93f66da84f77..86c3246ef0945290c8293ee22631d43268d7580e 100644
--- a/dune/common/parallel/indexset.hh
+++ b/dune/common/parallel/indexset.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_INDEXSET_HH
 #define DUNE_INDEXSET_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <algorithm>
 #include <dune/common/arraylist.hh>
diff --git a/dune/common/parallel/indicessyncer.hh b/dune/common/parallel/indicessyncer.hh
index 71f83faa1ff7d1a7143185b235e5dbd4aaebc013..f25b17da08ed345765660a1a2c233f0d8dfb12e0 100644
--- a/dune/common/parallel/indicessyncer.hh
+++ b/dune/common/parallel/indicessyncer.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_INDICESSYNCER_HH
 #define DUNE_INDICESSYNCER_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include "indexset.hh"
 #include "remoteindices.hh"
diff --git a/dune/common/parallel/interface.hh b/dune/common/parallel/interface.hh
index b8894e7ec9ddaf36966017197bb2264c6d1cadbb..a17b9b4fb8c2272b562a3c51260bfd12f793fde3 100644
--- a/dune/common/parallel/interface.hh
+++ b/dune/common/parallel/interface.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_INTERFACE_HH
 #define DUNE_INTERFACE_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #if HAVE_MPI
 
diff --git a/dune/common/parallel/localindex.hh b/dune/common/parallel/localindex.hh
index d7ebfdb54fda1c7fe3730a475cf4182c94d02fce..b21c5c7e3237a2e5927bf836cb6bfaf4cd179b01 100644
--- a/dune/common/parallel/localindex.hh
+++ b/dune/common/parallel/localindex.hh
@@ -3,7 +3,7 @@
 
 #ifndef DUNE_COMMON_LOCALINDEX_HH
 #define DUNE_COMMON_LOCALINDEX_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <cstddef>
 
diff --git a/dune/common/parallel/mpicommunication.hh b/dune/common/parallel/mpicommunication.hh
index fc92b8f8db03b6185d8324ea1dde157ef05947a9..4e782d072cb0e3aaf07c3b52f24b375e370b27a9 100644
--- a/dune/common/parallel/mpicommunication.hh
+++ b/dune/common/parallel/mpicommunication.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_PARALLEL_MPICOMMUNICATION_HH
 #define DUNE_COMMON_PARALLEL_MPICOMMUNICATION_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /*!
    \file
diff --git a/dune/common/parallel/mpidata.hh b/dune/common/parallel/mpidata.hh
index caf80be829ebe9705f1c11de67cd3484bdf02461..248f8947ecb755f5d6a94f6fc6c7b8280ee943ed 100644
--- a/dune/common/parallel/mpidata.hh
+++ b/dune/common/parallel/mpidata.hh
@@ -3,7 +3,7 @@
 
 #ifndef DUNE_COMMON_PARALLEL_MPIDATA_HH
 #define DUNE_COMMON_PARALLEL_MPIDATA_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <vector>
 #include <string>
diff --git a/dune/common/parallel/mpifuture.hh b/dune/common/parallel/mpifuture.hh
index 4703d8b923a7bad04979314cc9aab2e30b09dfdd..fa9994463258dc2934c965a8f057b04b0dfc0dc6 100644
--- a/dune/common/parallel/mpifuture.hh
+++ b/dune/common/parallel/mpifuture.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_PARALLEL_MPIFUTURE_HH
 #define DUNE_COMMON_PARALLEL_MPIFUTURE_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <optional>
 
diff --git a/dune/common/parallel/mpiguard.hh b/dune/common/parallel/mpiguard.hh
index 217fe9dce72464ebcc04bf9264c2ccf7ec99cf55..4bf872c6b9d13f19c1861cadfa60021f62e66b51 100644
--- a/dune/common/parallel/mpiguard.hh
+++ b/dune/common/parallel/mpiguard.hh
@@ -10,7 +10,7 @@
 
 #ifndef DUNE_COMMON_MPIGUARD_HH
 #define DUNE_COMMON_MPIGUARD_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include "mpihelper.hh"
 #include "communication.hh"
diff --git a/dune/common/parallel/mpihelper.hh b/dune/common/parallel/mpihelper.hh
index 6f2f7eccbd5cdbea77754cd490f643047129cb7a..af121fa837ae33218e5fee55cf221fa4f2c5f036 100644
--- a/dune/common/parallel/mpihelper.hh
+++ b/dune/common/parallel/mpihelper.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_MPIHELPER
 #define DUNE_MPIHELPER
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #if HAVE_MPI
 #include <cassert>
diff --git a/dune/common/parallel/mpipack.hh b/dune/common/parallel/mpipack.hh
index 41f855d11a54fb50837218feadf49b6eb0ea79eb..41889961ceb0dcb7ff7e551da60eb70059674a35 100644
--- a/dune/common/parallel/mpipack.hh
+++ b/dune/common/parallel/mpipack.hh
@@ -17,7 +17,7 @@
 
 #ifndef DUNE_COMMON_PARALLEL_MPIPACK_HH
 #define DUNE_COMMON_PARALLEL_MPIPACK_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <vector>
 #if HAVE_MPI
diff --git a/dune/common/parallel/mpitraits.hh b/dune/common/parallel/mpitraits.hh
index 38dc58b74681c2b444ab87ed32ff6a9e066fd78e..fd298cf851c57b11d9e7b0495f04787e405e63e7 100644
--- a/dune/common/parallel/mpitraits.hh
+++ b/dune/common/parallel/mpitraits.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_MPITRAITS_HH
 #define DUNE_MPITRAITS_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /** @addtogroup ParallelCommunication
  *
diff --git a/dune/common/parallel/plocalindex.hh b/dune/common/parallel/plocalindex.hh
index a8426ede3a247a87e9deef9382199994838ac2db..549d6bc83bb00b0abd2eef376e7dd2b185982c23 100644
--- a/dune/common/parallel/plocalindex.hh
+++ b/dune/common/parallel/plocalindex.hh
@@ -3,7 +3,7 @@
 
 #ifndef DUNE_PLOCALINDEX_HH
 #define DUNE_PLOCALINDEX_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include "localindex.hh"
 #include "indexset.hh"
diff --git a/dune/common/parallel/remoteindices.hh b/dune/common/parallel/remoteindices.hh
index 3d6ce476b8cbe92e870076159750c9615c897f07..09a11e44014220890358d7b6dec94823e6ad11ae 100644
--- a/dune/common/parallel/remoteindices.hh
+++ b/dune/common/parallel/remoteindices.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_REMOTEINDICES_HH
 #define DUNE_REMOTEINDICES_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #if HAVE_MPI
 
diff --git a/dune/common/parallel/selection.hh b/dune/common/parallel/selection.hh
index 08656239512fdedbcb35d58169290776b12ff93b..2d2a3e942f1da476971251f5b7c293c7298115cf 100644
--- a/dune/common/parallel/selection.hh
+++ b/dune/common/parallel/selection.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_SELECTION_HH
 #define DUNE_SELECTION_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include "indexset.hh"
 #include <dune/common/iteratorfacades.hh>
diff --git a/dune/common/parallel/variablesizecommunicator.hh b/dune/common/parallel/variablesizecommunicator.hh
index d428d41657dbb16f840f52582aad9443a2f17d9a..3edbe5c674c8a7bfa44dff85b715275e4238642a 100644
--- a/dune/common/parallel/variablesizecommunicator.hh
+++ b/dune/common/parallel/variablesizecommunicator.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_PARALLEL_VARIABLESIZECOMMUNICATOR_HH // Still fits the line!
 #define DUNE_COMMON_PARALLEL_VARIABLESIZECOMMUNICATOR_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #if HAVE_MPI
 
diff --git a/dune/common/parameterizedobject.hh b/dune/common/parameterizedobject.hh
index d515dff2ff11d81bd973b516431bd3ecca6812a0..6fdf95f1f8454fcac6316f34d28bfa04f78c05c3 100644
--- a/dune/common/parameterizedobject.hh
+++ b/dune/common/parameterizedobject.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 #ifndef DUNE_COMMON_PARAMETERIZEDOBJECT_HH
 #define DUNE_COMMON_PARAMETERIZEDOBJECT_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <functional>
 #include <map>
diff --git a/dune/common/parametertree.hh b/dune/common/parametertree.hh
index 343a217c8296afbb8750676e22868589884e76da..252464d393f56cb20137ca10fcbaa18bd79cd426 100644
--- a/dune/common/parametertree.hh
+++ b/dune/common/parametertree.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_PARAMETERTREE_HH
 #define DUNE_PARAMETERTREE_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /** \file
  * \brief A hierarchical structure of string parameters
diff --git a/dune/common/parametertreeparser.hh b/dune/common/parametertreeparser.hh
index abf81e7c97cfce0488bc05bde1333acf692bd311..3364289009b6696b506d94d4d1425034ea08a604 100644
--- a/dune/common/parametertreeparser.hh
+++ b/dune/common/parametertreeparser.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_PARAMETER_PARSER_HH
 #define DUNE_PARAMETER_PARSER_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /** \file
  * \brief Various parser methods to get data into a ParameterTree object
diff --git a/dune/common/path.hh b/dune/common/path.hh
index c4dc75efcc15a1a9b5c93e005c168f3b8601d556..ae58a3fbc7b8a3093ad9b009fabe6d6c60345e33 100644
--- a/dune/common/path.hh
+++ b/dune/common/path.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_PATH_HH
 #define DUNE_COMMON_PATH_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <string>
 
diff --git a/dune/common/poolallocator.hh b/dune/common/poolallocator.hh
index 477ba3995da5445d5a87210aa84cf2a42969689b..12ccc73bcadd30d5ac54eaeff9651efc13b859fa 100644
--- a/dune/common/poolallocator.hh
+++ b/dune/common/poolallocator.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_POOLALLOCATOR_HH
 #define DUNE_COMMON_POOLALLOCATOR_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /** \file
  * \brief An stl-compliant pool allocator
diff --git a/dune/common/power.hh b/dune/common/power.hh
index 5fc8b13472b731d3112b478b7882254d34835add..e3ccc3c7b5c7158c810d9a797975a347ce15e416 100644
--- a/dune/common/power.hh
+++ b/dune/common/power.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_POWER_HH
 #define DUNE_COMMON_POWER_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /** \file
     \brief Various implementations of the power function for run-time and static arguments
diff --git a/dune/common/precision.hh b/dune/common/precision.hh
index 97260393644a0e2640f4bd6e177f4f471c6ec730..4e7a0de14f803b1cb78995aae47e4672aa899dd8 100644
--- a/dune/common/precision.hh
+++ b/dune/common/precision.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_PRECISION_HH
 #define DUNE_PRECISION_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /** \file
  * \brief Various precision settings for calculations with FieldMatrix and FieldVector
diff --git a/dune/common/promotiontraits.hh b/dune/common/promotiontraits.hh
index 639c421cd3726e2bb6687afe42b462b6f28e66af..89a36acf82c473ab7c0a6804a768757cf2939814 100644
--- a/dune/common/promotiontraits.hh
+++ b/dune/common/promotiontraits.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_PROMOTIONTRAITS_HH
 #define DUNE_PROMOTIONTRAITS_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <utility>
 
diff --git a/dune/common/propertymap.hh b/dune/common/propertymap.hh
index f57d19741cd4e78c792ed48f82a3238f9aec7f76..3af4aaa569cf10f8ba6f93caabe1bfb61b640881 100644
--- a/dune/common/propertymap.hh
+++ b/dune/common/propertymap.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_PROPERTYMAP_HH
 #define DUNE_PROPERTYMAP_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <cstddef>
 #include <iterator>
diff --git a/dune/common/proxymemberaccess.hh b/dune/common/proxymemberaccess.hh
index 1256f2f54f8d70de10e978c71817d2f37f67a663..fc3a7b27e8d9bf3e7413e30fcce74a64141f4ecc 100644
--- a/dune/common/proxymemberaccess.hh
+++ b/dune/common/proxymemberaccess.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_PROXYMEMBERACCESS_HH
 #define DUNE_COMMON_PROXYMEMBERACCESS_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /**
  * \file
diff --git a/dune/common/quadmath.hh b/dune/common/quadmath.hh
index e0083ba52c6b7a02f89429d65ca39f7483db4f1a..5c8ee25915406e26df557be65336bdc22919f447 100644
--- a/dune/common/quadmath.hh
+++ b/dune/common/quadmath.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_QUADMATH_HH
 #define DUNE_QUADMATH_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #if HAVE_QUADMATH
 #include <quadmath.h>
diff --git a/dune/common/rangeutilities.hh b/dune/common/rangeutilities.hh
index 183309a0f27335d5c29f84377648fa3e0e5bba7c..34af5de873395771630553dc0da75ae37a828c9f 100644
--- a/dune/common/rangeutilities.hh
+++ b/dune/common/rangeutilities.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_RANGE_UTILITIES_HH
 #define DUNE_COMMON_RANGE_UTILITIES_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <dune/common/typetraits.hh>
 #include <algorithm>
diff --git a/dune/common/reservedvector.hh b/dune/common/reservedvector.hh
index 969fc747148f1b6627ddf99521a76e886fd778fe..5f9565f4220331d9473606832841cf63d68d1fdf 100644
--- a/dune/common/reservedvector.hh
+++ b/dune/common/reservedvector.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_RESERVEDVECTOR_HH
 #define DUNE_COMMON_RESERVEDVECTOR_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /** \file
  * \brief An stl-compliant random-access container which stores everything on the stack
diff --git a/dune/common/scalarmatrixview.hh b/dune/common/scalarmatrixview.hh
index 3ecda7f8b015fdde808e0198c21aa4d5f7ef923f..f7be907ecc36925de54781f92dc083afbb629d9f 100644
--- a/dune/common/scalarmatrixview.hh
+++ b/dune/common/scalarmatrixview.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_SCALARMATRIXVIEW_HH
 #define DUNE_COMMON_SCALARMATRIXVIEW_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <cstddef>
 #include <type_traits>
diff --git a/dune/common/scalarvectorview.hh b/dune/common/scalarvectorview.hh
index 28fd30ba007331d44c4aab3d352c8260977994cf..ace75abaf893bc12c2f44958a711428f8651d930 100644
--- a/dune/common/scalarvectorview.hh
+++ b/dune/common/scalarvectorview.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_SCALARVECTORVIEW_HH
 #define DUNE_COMMON_SCALARVECTORVIEW_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <cstddef>
 #include <type_traits>
diff --git a/dune/common/shared_ptr.hh b/dune/common/shared_ptr.hh
index 7616a6e3b247eb0966952543d6ba9efbadb25015..0421022d92a0622047102c2f3fd97b7c5223d308 100644
--- a/dune/common/shared_ptr.hh
+++ b/dune/common/shared_ptr.hh
@@ -3,7 +3,7 @@
 
 #ifndef DUNE_SHARED_PTR_HH
 #define DUNE_SHARED_PTR_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <memory>
 
diff --git a/dune/common/simd.hh b/dune/common/simd.hh
index 61db3af8a74595d6b2cc6f6b778e2413953058b3..9817ac9723aa99a7b8ec38ce5c04f84f63be05a1 100644
--- a/dune/common/simd.hh
+++ b/dune/common/simd.hh
@@ -1,6 +1,6 @@
 #ifndef DUNE_COMMON_SIMD_HH
 #define DUNE_COMMON_SIMD_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #warning dune/common/simd.hh is deprecated.
 #warning Use the new infrastructure from dune/common/simd/simd.h instead.
diff --git a/dune/common/simd/base.hh b/dune/common/simd/base.hh
index 6aabb60196d8abf5996f732788f221b2c9dc97b5..d9ebabd96b5aec1f8d12094779416955ea6cff79 100644
--- a/dune/common/simd/base.hh
+++ b/dune/common/simd/base.hh
@@ -1,6 +1,6 @@
 #ifndef DUNE_COMMON_SIMD_BASE_HH
 #define DUNE_COMMON_SIMD_BASE_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /** @file
  *  @brief Basic definitions for SIMD Implementations
diff --git a/dune/common/simd/defaults.hh b/dune/common/simd/defaults.hh
index 819817cd24c36c2f97379917af60a9010e1aaaad..46d1d351bf0ffe1b0234c86c6b278155322168f5 100644
--- a/dune/common/simd/defaults.hh
+++ b/dune/common/simd/defaults.hh
@@ -1,6 +1,6 @@
 #ifndef DUNE_COMMON_SIMD_DEFAULTS_HH
 #define DUNE_COMMON_SIMD_DEFAULTS_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /** @file
  *  @brief Default implementations for SIMD Implementations
diff --git a/dune/common/simd/interface.hh b/dune/common/simd/interface.hh
index f36dc57d84a397a65500138879630b72d7d9426b..d6404e39903f897a92f0acc7dde3c7d393ac8758 100644
--- a/dune/common/simd/interface.hh
+++ b/dune/common/simd/interface.hh
@@ -1,6 +1,6 @@
 #ifndef DUNE_COMMON_SIMD_INTERFACE_HH
 #define DUNE_COMMON_SIMD_INTERFACE_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /** @file
  *  @brief User interface of the SIMD abstraction
diff --git a/dune/common/simd/io.hh b/dune/common/simd/io.hh
index 9a79173da8131c3b4efa6c37bc35bada0ca57065..a1ff55dc60a408ad0ac504e7a0b70f7f1935f3c3 100644
--- a/dune/common/simd/io.hh
+++ b/dune/common/simd/io.hh
@@ -1,6 +1,6 @@
 #ifndef DUNE_COMMON_SIMD_IO_HH
 #define DUNE_COMMON_SIMD_IO_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /** @file
  *  @brief IO interface of the SIMD abstraction
diff --git a/dune/common/simd/loop.hh b/dune/common/simd/loop.hh
index 5cce0c45599bc0fb9912983e8098555ea2048186..18cf82db5b03cbd358628568cc4d18b4952dabe5 100644
--- a/dune/common/simd/loop.hh
+++ b/dune/common/simd/loop.hh
@@ -1,6 +1,6 @@
 #ifndef DUNE_COMMON_SIMD_LOOP_HH
 #define DUNE_COMMON_SIMD_LOOP_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <array>
 #include <cmath>
diff --git a/dune/common/simd/simd.hh b/dune/common/simd/simd.hh
index 197803261ad2ae0fe111c51ac5fcced40e2249b3..4e9d65bfb16ec0266265a499bcea129fb02c1196 100644
--- a/dune/common/simd/simd.hh
+++ b/dune/common/simd/simd.hh
@@ -1,6 +1,6 @@
 #ifndef DUNE_COMMON_SIMD_SIMD_HH
 #define DUNE_COMMON_SIMD_SIMD_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /** @file
  *  @brief Include file for users of the SIMD abstraction layer
diff --git a/dune/common/simd/standard.hh b/dune/common/simd/standard.hh
index 994d1fdbf4d97b1356aee4c099cbb1d38f698790..be04606d8f3c7391ffa353fb7188ea9234581480 100644
--- a/dune/common/simd/standard.hh
+++ b/dune/common/simd/standard.hh
@@ -1,6 +1,6 @@
 #ifndef DUNE_COMMON_SIMD_STANDARD_HH
 #define DUNE_COMMON_SIMD_STANDARD_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /** @file
  *  @ingroup SIMDStandard
diff --git a/dune/common/simd/test.hh b/dune/common/simd/test.hh
index 7d9e15f4ae145c19d59505d529493c55e59103ea..23f4d625d0e5d6a83441b29952d1ca92e040ef2d 100644
--- a/dune/common/simd/test.hh
+++ b/dune/common/simd/test.hh
@@ -1,6 +1,6 @@
 #ifndef DUNE_COMMON_SIMD_TEST_HH
 #define DUNE_COMMON_SIMD_TEST_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /** @file
  *  @brief Common tests for simd abstraction implementations
diff --git a/dune/common/simd/vc.hh b/dune/common/simd/vc.hh
index 2086fa85a6fbc3bbe0e6af1b64975b968be80d80..3786fab327ea6d54ea57184fa0d815b3e6dfe7a5 100644
--- a/dune/common/simd/vc.hh
+++ b/dune/common/simd/vc.hh
@@ -1,6 +1,6 @@
 #ifndef DUNE_COMMON_SIMD_VC_HH
 #define DUNE_COMMON_SIMD_VC_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /** @file
  *  @ingroup SIMDVc
diff --git a/dune/common/singleton.hh b/dune/common/singleton.hh
index 1df68e7ccd2035e0ada67d8c1758e0d4601020ba..dca8850822c880bf6bfd119f2ba857bf1ef82c27 100644
--- a/dune/common/singleton.hh
+++ b/dune/common/singleton.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_SINGLETON_HH
 #define DUNE_SINGLETON_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <dune/common/visibility.hh>
 
diff --git a/dune/common/sllist.hh b/dune/common/sllist.hh
index 61665e16a39df18c7cf2307f54e0990fd7f1bf54..06bf63725c4065d0e76e6bb2aaa5b7271c502bdd 100644
--- a/dune/common/sllist.hh
+++ b/dune/common/sllist.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_SLLIST_HH
 #define DUNE_SLLIST_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <memory>
 #include <cassert>
diff --git a/dune/common/std/apply.hh b/dune/common/std/apply.hh
index c3101004f53bdc0cc7c3252cc4fc17e08026fea4..e772abb814277fb2d89aaab758647e96a37f1a79 100644
--- a/dune/common/std/apply.hh
+++ b/dune/common/std/apply.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_STD_APPLY_HH
 #define DUNE_COMMON_STD_APPLY_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #if DUNE_HAVE_CXX_APPLY
   #include <tuple>
diff --git a/dune/common/std/functional.hh b/dune/common/std/functional.hh
index 2fe1c4ef42f22ee5898354a03474a5ae6f74fa90..81d75f76761b6f9a0d8a8f35c1d907e7cc0dcaf1 100644
--- a/dune/common/std/functional.hh
+++ b/dune/common/std/functional.hh
@@ -2,7 +2,7 @@
 // vi: set ts=8 sw=2 et sts=2:
 #ifndef DUNE_COMMON_STD_FUNCTIONAL_HH
 #define DUNE_COMMON_STD_FUNCTIONAL_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <functional>
 
diff --git a/dune/common/std/make_array.hh b/dune/common/std/make_array.hh
index 6ab1a42159fd70f2210a4cb3fe584e6afe04ebb2..50f2327160b60642e74ad6f88c5d9b9b1b0d6147 100644
--- a/dune/common/std/make_array.hh
+++ b/dune/common/std/make_array.hh
@@ -1,6 +1,6 @@
 #ifndef DUNE_COMMON_STD_MAKE_ARRAY_HH
 #define DUNE_COMMON_STD_MAKE_ARRAY_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <array>
 #include <type_traits>
diff --git a/dune/common/std/optional.hh b/dune/common/std/optional.hh
index 3e5f3cc7300582f07a81c2f41ec8ae3ac36396ef..840fc616af7b24747d8468a9f5f754af39bd5ced 100644
--- a/dune/common/std/optional.hh
+++ b/dune/common/std/optional.hh
@@ -1,6 +1,6 @@
 #ifndef DUNE_COMMON_STD_OPTIONAL_HH
 #define DUNE_COMMON_STD_OPTIONAL_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <cassert>
 #include <functional>
diff --git a/dune/common/std/type_traits.hh b/dune/common/std/type_traits.hh
index 3c876a1a9fcd26a8194545c6826d7e5faa19d88d..d981954005884b85d22174b9fb9f67266736144f 100644
--- a/dune/common/std/type_traits.hh
+++ b/dune/common/std/type_traits.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_STD_TYPE_TRAITS_HH
 #define DUNE_COMMON_STD_TYPE_TRAITS_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <type_traits>
 #include <dune/common/typetraits.hh>
diff --git a/dune/common/std/utility.hh b/dune/common/std/utility.hh
index f75977d2aca52f88356a245fe3305bd4894fdadf..67735185fd7fd5420907a9c5bd1e5ee0b4f74f26 100644
--- a/dune/common/std/utility.hh
+++ b/dune/common/std/utility.hh
@@ -1,6 +1,6 @@
 #ifndef DUNE_COMMON_STD_UTILITY_HH
 #define DUNE_COMMON_STD_UTILITY_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <utility>
 
diff --git a/dune/common/std/variant.hh b/dune/common/std/variant.hh
index 4113bd2f2a9d9495cf883a904a576ea60e82bc1a..75ee920fc2b965492ed24cf0fba486f1d597746e 100644
--- a/dune/common/std/variant.hh
+++ b/dune/common/std/variant.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_STD_VARIANT_HH
 #define DUNE_COMMON_STD_VARIANT_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #warning dune/common/std/variant.hh is deprecated and will be removed after Dune 2.8.\
  Include <variant> instead
diff --git a/dune/common/stdstreams.hh b/dune/common/stdstreams.hh
index db41eeb593e9456574d69f8309a5049cec23a0b8..af71f6c34b4087f5625d9a0bd662149467df46bf 100644
--- a/dune/common/stdstreams.hh
+++ b/dune/common/stdstreams.hh
@@ -12,7 +12,7 @@
 
 #ifndef DUNE_COMMON_STDSTREAMS_HH
 #define DUNE_COMMON_STDSTREAMS_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include "debugstream.hh"
 
diff --git a/dune/common/stdthread.hh b/dune/common/stdthread.hh
index 75bf6bc415061706c4d3f05f54db506617190772..1a52f27b32560b5b471888e295e2e625dec3a9b6 100644
--- a/dune/common/stdthread.hh
+++ b/dune/common/stdthread.hh
@@ -3,7 +3,7 @@
 
 #ifndef DUNE_COMMON_STDTHREAD_HH
 #define DUNE_COMMON_STDTHREAD_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <dune/common/unused.hh>
 
diff --git a/dune/common/streamoperators.hh b/dune/common/streamoperators.hh
index 17ec160ef223dea2e481b33a47ce9b4d3096ff53..914f7644520749a7613635939e11e26cbd3b52e6 100644
--- a/dune/common/streamoperators.hh
+++ b/dune/common/streamoperators.hh
@@ -3,7 +3,7 @@
 
 #ifndef DUNE_STREAMOPERATORS_HH
 #define DUNE_STREAMOPERATORS_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /** \file
     \brief Implementation of stream operators for std::array and std::tuple
diff --git a/dune/common/stringutility.hh b/dune/common/stringutility.hh
index 4c9de5f35356582c87fe8afefe6321759c4933e7..e4401700f61e53b66549e1ce9d2bbfd99b5c0485 100644
--- a/dune/common/stringutility.hh
+++ b/dune/common/stringutility.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_STRINGUTILITY_HH
 #define DUNE_COMMON_STRINGUTILITY_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /** \file
     \brief Miscellaneous helper stuff
diff --git a/dune/common/test/arithmetictestsuite.hh b/dune/common/test/arithmetictestsuite.hh
index 406ad4a125721128347290cf2e08498f67201abb..a55c1c7e47e611ca5958b488e0782b292cdfa288 100644
--- a/dune/common/test/arithmetictestsuite.hh
+++ b/dune/common/test/arithmetictestsuite.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_TEST_ARITHMETICTESTSUITE_HH
 #define DUNE_COMMON_TEST_ARITHMETICTESTSUITE_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <string>
 #include <type_traits>
diff --git a/dune/common/test/checkmatrixinterface.hh b/dune/common/test/checkmatrixinterface.hh
index 5dcc1ba378e79fc0d6b3534adb1f7eea4cafe210..c87ddcb2c2d997c7754e2dd1fe6d77970fd0119b 100644
--- a/dune/common/test/checkmatrixinterface.hh
+++ b/dune/common/test/checkmatrixinterface.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_CHECK_MATRIX_INTERFACE_HH
 #define DUNE_COMMON_CHECK_MATRIX_INTERFACE_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <algorithm>
 #include <limits>
diff --git a/dune/common/test/collectorstream.hh b/dune/common/test/collectorstream.hh
index eea38638a9b7ec590dc6e3fbc1932e80d7e8c044..8e94196176a832f9b9144f808d1349026d669801 100644
--- a/dune/common/test/collectorstream.hh
+++ b/dune/common/test/collectorstream.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_TEST_COLLECTORSTREAM_HH
 #define DUNE_COMMON_TEST_COLLECTORSTREAM_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <sstream>
 #include <string>
diff --git a/dune/common/test/dummyiterator.hh b/dune/common/test/dummyiterator.hh
index 2645ad0e8dd11085dfc719975221db98f94872cb..4d30d0738898dd049977f001be40828ec8ad2052 100644
--- a/dune/common/test/dummyiterator.hh
+++ b/dune/common/test/dummyiterator.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_DUMMYITERATOR_HH
 #define DUNE_COMMON_DUMMYITERATOR_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <cstddef>
 #include <type_traits>
diff --git a/dune/common/test/iteratorfacadetest.hh b/dune/common/test/iteratorfacadetest.hh
index bfbbfafc0cf81d584e3600aa2334b5ee844d0680..9f6130c8e036e47ff4aa79df3aa124d44c554fba 100644
--- a/dune/common/test/iteratorfacadetest.hh
+++ b/dune/common/test/iteratorfacadetest.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_ITERATORFACADETEST_HH
 #define DUNE_ITERATORFACADETEST_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 #include <dune/common/iteratorfacades.hh>
 #include <dune/common/genericiterator.hh>
 #include <dune/common/typetraits.hh>
diff --git a/dune/common/test/iteratortest.hh b/dune/common/test/iteratortest.hh
index 28a0531b337f9c8ca71225289556ee73482a67b5..aee30ad41135f576ede6b942bc92ab532e7634b9 100644
--- a/dune/common/test/iteratortest.hh
+++ b/dune/common/test/iteratortest.hh
@@ -3,7 +3,7 @@
 
 #ifndef DUNE_COMMON_TEST_ITERATORTEST_HH
 #define DUNE_COMMON_TEST_ITERATORTEST_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 #include <iostream>
 #include <algorithm>
 #include <dune/common/classname.hh>
diff --git a/dune/common/test/metistest.cc b/dune/common/test/metistest.cc
index 1ee68ff99b3126a67dee2338602eaf225fe225c5..1d08618b80e592de5c75145c2404554400f84914 100644
--- a/dune/common/test/metistest.cc
+++ b/dune/common/test/metistest.cc
@@ -1,4 +1,4 @@
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <iostream>
 #include <vector>
diff --git a/dune/common/test/parameterizedobjectfactorysingleton.hh b/dune/common/test/parameterizedobjectfactorysingleton.hh
index e9448fa8481df4a73a7dea3cd5bf067ddf2841f5..3e2e15848f25f9e8700badabe920e4f0fe96220d 100644
--- a/dune/common/test/parameterizedobjectfactorysingleton.hh
+++ b/dune/common/test/parameterizedobjectfactorysingleton.hh
@@ -1,6 +1,6 @@
 #ifndef DUNE_COMMON_TEST_PARAMETERIZEDOBJECTFACTORYSINGLETON_HH
 #define DUNE_COMMON_TEST_PARAMETERIZEDOBJECTFACTORYSINGLETON_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <dune/common/parameterizedobject.hh>
 #include <dune/common/singleton.hh>
diff --git a/dune/common/test/parmetistest.cc b/dune/common/test/parmetistest.cc
index 732ca39fa60757dda403f8e15b6e5f704b0d3c1c..917a5ed17d9bc5edb91a6542b4d84a852f302521 100644
--- a/dune/common/test/parmetistest.cc
+++ b/dune/common/test/parmetistest.cc
@@ -1,4 +1,4 @@
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <cassert>
 #include <iostream>
diff --git a/dune/common/test/testsuite.hh b/dune/common/test/testsuite.hh
index 55da4cb45be4926c178f7d368e4985e2c58ff02a..0c6843fbf1307d6d258597e6982b13e3d6ec8d59 100644
--- a/dune/common/test/testsuite.hh
+++ b/dune/common/test/testsuite.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_TEST_TESTSUITE_HH
 #define DUNE_COMMON_TEST_TESTSUITE_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <iostream>
 #include <sstream>
diff --git a/dune/common/timer.hh b/dune/common/timer.hh
index 05b85ad2b70934edbc2f1cacaed9151b2129bec1..c537334f5f66c0b695b28fe442a20acb4fd1a7a8 100644
--- a/dune/common/timer.hh
+++ b/dune/common/timer.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_TIMER_HH
 #define DUNE_TIMER_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #ifndef TIMER_USE_STD_CLOCK
 // headers for std::chrono
diff --git a/dune/common/to_unique_ptr.hh b/dune/common/to_unique_ptr.hh
index 07525526d0815c9df616cdafc7964997ba6f6b52..77fc24a4f68bc42b8fe2e59874f72c6f0c450805 100644
--- a/dune/common/to_unique_ptr.hh
+++ b/dune/common/to_unique_ptr.hh
@@ -3,7 +3,7 @@
 
 #ifndef DUNE_TO_UNIQUE_PTR_HH
 #define DUNE_TO_UNIQUE_PTR_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <memory>
 
diff --git a/dune/common/transpose.hh b/dune/common/transpose.hh
index fe211f6c467c89e7f27da43c65cfcd1e2834092e..60b4768acfb32aebd24f59cf235a0e8a5ddd19e2 100644
--- a/dune/common/transpose.hh
+++ b/dune/common/transpose.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_TRANSPOSE_HH
 #define DUNE_COMMON_TRANSPOSE_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <cstddef>
 
diff --git a/dune/common/tupleutility.hh b/dune/common/tupleutility.hh
index aaef7c7a8a6c3d7d252bb6187017e401ff27a2a9..d2c98d8c82a2cdfc1f1e5d8e1b42d9feaabda381 100644
--- a/dune/common/tupleutility.hh
+++ b/dune/common/tupleutility.hh
@@ -3,7 +3,7 @@
 
 #ifndef DUNE_TUPLE_UTILITY_HH
 #define DUNE_TUPLE_UTILITY_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <cstddef>
 #include <tuple>
diff --git a/dune/common/tuplevector.hh b/dune/common/tuplevector.hh
index 83db32f567459aaf1a832a078d498abbe5bdc9ec..49ce48b9a16a96c06d92b973617224f73192d475 100644
--- a/dune/common/tuplevector.hh
+++ b/dune/common/tuplevector.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_TUPLEVECTOR_HH
 #define DUNE_COMMON_TUPLEVECTOR_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <tuple>
 #include <utility>
diff --git a/dune/common/typelist.hh b/dune/common/typelist.hh
index 14b96489b9ee33a13c36afa9f94ce4644cf329db..7a4a4c1d7b7f37a454615e9d3a6565797fc0199a 100644
--- a/dune/common/typelist.hh
+++ b/dune/common/typelist.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_TYPELIST_HH
 #define DUNE_COMMON_TYPELIST_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <type_traits>
 #include <tuple>
diff --git a/dune/common/typetraits.hh b/dune/common/typetraits.hh
index 34109bfe8ba06b70905eeb4723919d646613f385..d5858bbdb2335e7ea3b63294bd83ec9222af514e 100644
--- a/dune/common/typetraits.hh
+++ b/dune/common/typetraits.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_TYPETRAITS_HH
 #define DUNE_TYPETRAITS_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <complex>
 #include <type_traits>
diff --git a/dune/common/typeutilities.hh b/dune/common/typeutilities.hh
index 2c462d8ef1036375648edbe440175172288ab292..0da8a0dd9a426faf530b0753ea934df0de9df826 100644
--- a/dune/common/typeutilities.hh
+++ b/dune/common/typeutilities.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_TYPEUTILITIES_HH
 #define DUNE_COMMON_TYPEUTILITIES_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <cstddef>
 #include <type_traits>
diff --git a/dune/common/unused.hh b/dune/common/unused.hh
index d1e833e24f138e01af8a80f92f50940af8968367..f30364a77e51171a6c475fbf8ceaaa3241fd40e8 100644
--- a/dune/common/unused.hh
+++ b/dune/common/unused.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_UNUSED_HH
 #define DUNE_COMMON_UNUSED_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /** \file
  * \brief Definition of the DUNE_UNUSED macro for the case that config.h
diff --git a/dune/common/vc.hh b/dune/common/vc.hh
index 8cc7a6b51c0fb431068e7ca8040de70c451d82b5..559b3cf5cc4daa9957923f7b5d78e08cbd4f6cc2 100644
--- a/dune/common/vc.hh
+++ b/dune/common/vc.hh
@@ -1,6 +1,6 @@
 #ifndef DUNE_COMMON_VC_HH
 #define DUNE_COMMON_VC_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /**
    \file
diff --git a/dune/common/version.hh b/dune/common/version.hh
index b7918b377682a5c36e75f43990d23d041192aa6a..a145e6ed14d8757c22e9a5090e344cd633b0121e 100644
--- a/dune/common/version.hh
+++ b/dune/common/version.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_VERSION_HH
 #define DUNE_VERSION_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /** \file
  * \brief Various macros to work with %Dune module version numbers
diff --git a/dune/common/visibility.hh b/dune/common/visibility.hh
index a479c5f5e2123afd28d61f39d312efb841c6a7f2..623c77f672b432530f05c54e848a03e4d2cb232d 100644
--- a/dune/common/visibility.hh
+++ b/dune/common/visibility.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_COMMON_VISIBILITY_HH
 #define DUNE_COMMON_VISIBILITY_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 /** \file
  * \brief Definition of macros controlling symbol visibility at the ABI level.
diff --git a/dune/python/common/densematrix.hh b/dune/python/common/densematrix.hh
index 4b6e8193e04801fc04f71be551768cb8c48b556e..bbbec1d7dc655202134c9a017f82848c37c2b12c 100644
--- a/dune/python/common/densematrix.hh
+++ b/dune/python/common/densematrix.hh
@@ -1,6 +1,6 @@
 #ifndef DUNE_PYTHON_COMMON_DENSEMATRIX_HH
 #define DUNE_PYTHON_COMMON_DENSEMATRIX_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <string>
 #include <tuple>
diff --git a/dune/python/common/densevector.hh b/dune/python/common/densevector.hh
index eecad8b163d894e2a6bfbe4bf4399ab49b1386e8..0bc7db7b6c8bdbff02a3f6d53d927caa0054b07a 100644
--- a/dune/python/common/densevector.hh
+++ b/dune/python/common/densevector.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_PYTHON_COMMON_DENSEVECTOR_HH
 #define DUNE_PYTHON_COMMON_DENSEVECTOR_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <string>
 #include <tuple>
diff --git a/dune/python/common/dimrange.hh b/dune/python/common/dimrange.hh
index 9ada1d7f814eb9531c114da7304db01096817c46..a8ae258cf7ecb6b5b8544c46d5a9b71c76b3e223 100644
--- a/dune/python/common/dimrange.hh
+++ b/dune/python/common/dimrange.hh
@@ -1,6 +1,6 @@
 #ifndef DUNE_PYTHON_COMMON_DIMRANGE_HH
 #define DUNE_PYTHON_COMMON_DIMRANGE_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <cstddef>
 
diff --git a/dune/python/common/dynmatrix.hh b/dune/python/common/dynmatrix.hh
index 53ff330dc42bc3193f2d014cee087ab0192d5259..f9968716dbe5d69a335a176f7ccb68156544101a 100644
--- a/dune/python/common/dynmatrix.hh
+++ b/dune/python/common/dynmatrix.hh
@@ -3,7 +3,7 @@
 
 #ifndef DUNE_PYTHON_COMMON_DYNMATRIX_HH
 #define DUNE_PYTHON_COMMON_DYNMATRIX_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <string>
 #include <tuple>
diff --git a/dune/python/common/dynvector.hh b/dune/python/common/dynvector.hh
index fb47f469c014455b00960c5464b704ec23ac94a1..2c780e6ef854cd6faef7ffff9185b242bf3f9c7b 100644
--- a/dune/python/common/dynvector.hh
+++ b/dune/python/common/dynvector.hh
@@ -3,7 +3,7 @@
 
 #ifndef DUNE_PYTHON_COMMON_DYNVECTOR_HH
 #define DUNE_PYTHON_COMMON_DYNVECTOR_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <string>
 #include <tuple>
diff --git a/dune/python/common/fmatrix.hh b/dune/python/common/fmatrix.hh
index 5993162f8921f89e816f279a35f9a8adbf9819e1..96b203632130f674929e769d867e427b577d8c4b 100644
--- a/dune/python/common/fmatrix.hh
+++ b/dune/python/common/fmatrix.hh
@@ -1,6 +1,6 @@
 #ifndef DUNE_PYTHON_COMMON_FMATRIX_HH
 #define DUNE_PYTHON_COMMON_FMATRIX_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <cstddef>
 
diff --git a/dune/python/common/fvecmatregistry.hh b/dune/python/common/fvecmatregistry.hh
index dae5b2125165edb86fda7709ec64f5b4a5fed282..2bfcecb4e07b7733387083b8ef6ee3213305a96b 100644
--- a/dune/python/common/fvecmatregistry.hh
+++ b/dune/python/common/fvecmatregistry.hh
@@ -1,6 +1,6 @@
 #ifndef DUNE_PYTHON_COMMON_FVECMATREG_HH
 #define DUNE_PYTHON_COMMON_FVECMATREG_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <dune/python/pybind11/pybind11.h>
 #include <dune/python/common/fvector.hh>
diff --git a/dune/python/common/fvector.hh b/dune/python/common/fvector.hh
index c8cc7a052b27956521e84a0f4d000664a1ac854a..bb3d7ee4106213e467962b325a19d3cb5b2e0cd5 100644
--- a/dune/python/common/fvector.hh
+++ b/dune/python/common/fvector.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_PYTHON_COMMON_FVECTOR_HH
 #define DUNE_PYTHON_COMMON_FVECTOR_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <cstddef>
 
diff --git a/dune/python/common/getdimension.hh b/dune/python/common/getdimension.hh
index 5b3f6eb5c9fe303eff8669c7755d135432488104..dd1e73db275eda7bd1357527c6efd399c56b4c8d 100644
--- a/dune/python/common/getdimension.hh
+++ b/dune/python/common/getdimension.hh
@@ -1,6 +1,6 @@
 #ifndef DUNE_PYTHON_COMMON_GETDIMENSION_HH
 #define DUNE_PYTHON_COMMON_GETDIMENSION_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <type_traits>
 
diff --git a/dune/python/common/logger.hh b/dune/python/common/logger.hh
index 0624438121054d489e8edd69787eac44961ba6a5..85266bf7325b643f8f18d1eb67a7ad7a7bc9bf3a 100644
--- a/dune/python/common/logger.hh
+++ b/dune/python/common/logger.hh
@@ -1,6 +1,6 @@
 #ifndef DUNE_PYTHON_COMMON_LOGGER_HH
 #define DUNE_PYTHON_COMMON_LOGGER_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <string>
 #include <utility>
diff --git a/dune/python/common/mpihelper.hh b/dune/python/common/mpihelper.hh
index 2dd5a3d75eec4a5484522391640c5620aa4d9022..79f4c16b437c1107fa72ce7d7405a0055220ff4e 100644
--- a/dune/python/common/mpihelper.hh
+++ b/dune/python/common/mpihelper.hh
@@ -2,7 +2,7 @@
 // vi: set et ts=4 sw=2 sts=2:
 #ifndef DUNE_PYTHON_COMMON_MPIHELPER_HH
 #define DUNE_PYTHON_COMMON_MPIHELPER_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <dune/common/parallel/communication.hh>
 #include <dune/common/parallel/mpihelper.hh>
diff --git a/dune/python/common/numpyvector.hh b/dune/python/common/numpyvector.hh
index 70056bf0f60c67b2851050fc628f9af29ba56a8d..c7a7af8912f31504ea7f13f536495db289877659 100644
--- a/dune/python/common/numpyvector.hh
+++ b/dune/python/common/numpyvector.hh
@@ -1,6 +1,6 @@
 #ifndef DUNE_PYTHON_COMMON_NUMPYVECTOR_HH
 #define DUNE_PYTHON_COMMON_NUMPYVECTOR_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <dune/common/densevector.hh>
 #include <dune/common/ftraits.hh>
diff --git a/dune/python/common/pythonvector.hh b/dune/python/common/pythonvector.hh
index 328a2192cad9580e392431461b8289135728e6e0..f470dcddae0149485a3dbfa8b9d30ee4b82afab6 100644
--- a/dune/python/common/pythonvector.hh
+++ b/dune/python/common/pythonvector.hh
@@ -1,6 +1,6 @@
 #ifndef DUNE_PYTHON_COMMON_PYTHONVECTOR_HH
 #define DUNE_PYTHON_COMMON_PYTHONVECTOR_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <cstddef>
 
diff --git a/dune/python/common/string.hh b/dune/python/common/string.hh
index ff4a1a592b79f2bcda1af7832d4d2d289cc8be27..04e7c79928b18dde2701ceb2720fb9ec071e4b7d 100644
--- a/dune/python/common/string.hh
+++ b/dune/python/common/string.hh
@@ -1,6 +1,6 @@
 #ifndef DUNE_PYTHON_COMMON_STRING_HH
 #define DUNE_PYTHON_COMMON_STRING_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <string>
 #include <type_traits>
diff --git a/dune/python/common/typeregistry.hh b/dune/python/common/typeregistry.hh
index c466efdb8459c0ef095ebe485fb890c6b3562da9..b9db08588617cc25f5c42dfc7f5e671a22eaccb5 100644
--- a/dune/python/common/typeregistry.hh
+++ b/dune/python/common/typeregistry.hh
@@ -1,6 +1,6 @@
 #ifndef DUNE_PYTHON_COMMON_TYPEREGISTRY_HH
 #define DUNE_PYTHON_COMMON_TYPEREGISTRY_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <algorithm>
 #include <cassert>
diff --git a/dune/python/common/vector.hh b/dune/python/common/vector.hh
index 9939f0f158d75cd737ee5f717770bc6f17247558..f69f883866de954cfe08df9ca4aef6b7a8520c70 100644
--- a/dune/python/common/vector.hh
+++ b/dune/python/common/vector.hh
@@ -1,6 +1,6 @@
 #ifndef DUNE_PYTHON_COMMON_TYPE_TRAITS_HH
 #define DUNE_PYTHON_COMMON_TYPE_TRAITS_HH
-#include <dune/internal/dune-common.hh>
+#include <dune/common/config.hh>
 
 #include <type_traits>
 #include <utility>