diff --git a/dumux/experimental/common/CMakeLists.txt b/dumux/experimental/common/CMakeLists.txt
index f0b5c0779c7bc8e2b11a9e40e8998ea5fa687425..34c0cf49ef7c6ede7b9230d87f3798cbf7305ee2 100644
--- a/dumux/experimental/common/CMakeLists.txt
+++ b/dumux/experimental/common/CMakeLists.txt
@@ -1,3 +1,3 @@
-file(GLOB DUMUX_COMMON_HEADERS *.hh *.inc)
-install(FILES ${DUMUX_COMMON_HEADERS}
+file(GLOB DUMUX_EXPERIMENTAL_COMMON_HEADERS *.hh *.inc)
+install(FILES ${DUMUX_EXPERIMENTAL_COMMON_HEADERS}
         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/experimental/common)
diff --git a/dumux/experimental/discretization/CMakeLists.txt b/dumux/experimental/discretization/CMakeLists.txt
index b90e970e3637a3d776379cfb3e04656b4c3b8bbe..c793bb9ea37f223867c588b6ed8043fa9549d6e8 100644
--- a/dumux/experimental/discretization/CMakeLists.txt
+++ b/dumux/experimental/discretization/CMakeLists.txt
@@ -1,3 +1,3 @@
-file(GLOB DUMUX_DISCRETIZATION_HEADERS *.hh *.inc)
-install(FILES ${DUMUX_DISCRETIZATION_HEADERS}
+file(GLOB DUMUX_EXPERIMENTAL_DISCRETIZATION_HEADERS *.hh *.inc)
+install(FILES ${DUMUX_EXPERIMENTAL_DISCRETIZATION_HEADERS}
         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/experimental/discretization)
diff --git a/dumux/experimental/timestepping/CMakeLists.txt b/dumux/experimental/timestepping/CMakeLists.txt
index 1cdee5925db3abe13cbd84727175702b25c5e92e..c1787790be8fa494d8b2ce17b77bde4ead1d8136 100644
--- a/dumux/experimental/timestepping/CMakeLists.txt
+++ b/dumux/experimental/timestepping/CMakeLists.txt
@@ -1,3 +1,3 @@
-file(GLOB DUMUX_TIMESTEPPING_HEADERS *.hh *.inc)
-install(FILES ${DUMUX_TIMESTEPPING_HEADERS}
+file(GLOB DUMUX_EXPERIMENTAL_TIMESTEPPING_HEADERS *.hh *.inc)
+install(FILES ${DUMUX_EXPERIMENTAL_TIMESTEPPING_HEADERS}
         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/experimental/timestepping)
diff --git a/dumux/freeflow/navierstokes/momentum/cvfe/CMakeLists.txt b/dumux/freeflow/navierstokes/momentum/cvfe/CMakeLists.txt
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8e598de76b723c714ffc0fa80a9fc277cf985eec 100644
--- a/dumux/freeflow/navierstokes/momentum/cvfe/CMakeLists.txt
+++ b/dumux/freeflow/navierstokes/momentum/cvfe/CMakeLists.txt
@@ -0,0 +1,3 @@
+file(GLOB DUMUX_FREEFLOW_NAVIERSTOKES_MOMENTUM_CVFE_HEADERS *.hh *.inc)
+install(FILES ${DUMUX_FREEFLOW_NAVIERSTOKES_MOMENTUM_CVFE_HEADERS}
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/freeflow/navierstokes/momentum/cvfe)
diff --git a/dumux/io/CMakeLists.txt b/dumux/io/CMakeLists.txt
index 163aa0e68b4ff70c8d6ea3766225665a51a3c48b..af8fdfcfb297a78b21d1a63dc6e13939ac29f2f8 100644
--- a/dumux/io/CMakeLists.txt
+++ b/dumux/io/CMakeLists.txt
@@ -1,5 +1,6 @@
 add_subdirectory(format)
 add_subdirectory(grid)
+add_subdirectory(json)
 add_subdirectory(vtk)
 add_subdirectory(xml)
 
diff --git a/dumux/io/json/CMakeLists.txt b/dumux/io/json/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391