diff --git a/dumux/discretization/CMakeLists.txt b/dumux/discretization/CMakeLists.txt
index 1fd9c81445e12a78b76930736f83d369c28113b1..1db77918eeddcf5ba017d7dbba7b867403ce610a 100644
--- a/dumux/discretization/CMakeLists.txt
+++ b/dumux/discretization/CMakeLists.txt
@@ -16,7 +16,6 @@ fvgridvariables.hh
 fvproperties.hh
 methods.hh
 scvandscvfiterators.hh
-scvoperator.hh
 stationaryvelocityfield.hh
 subcontrolvolumebase.hh
 subcontrolvolumefacebase.hh
diff --git a/dumux/discretization/cellcentered/mpfa/CMakeLists.txt b/dumux/discretization/cellcentered/mpfa/CMakeLists.txt
index 86256a3acb18b243c021647f88f1013d93b3631b..a77788d00fdce86f2d5275a4503a91d19c0df2ca 100644
--- a/dumux/discretization/cellcentered/mpfa/CMakeLists.txt
+++ b/dumux/discretization/cellcentered/mpfa/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_subdirectory("omethod")
 
 install(FILES
-computetransmissibility
+computetransmissibility.hh
 connectivitymap.hh
 darcyslaw.hh
 dualgridindexset.hh
@@ -12,7 +12,6 @@ fluxvariablescachefiller.hh
 fourierslaw.hh
 fvelementgeometry.hh
 fvgridgeometry.hh
-generalconnectivitymap.hh
 gridfluxvariablescache.hh
 gridinteractionvolumeindexsets.hh
 helper.hh
diff --git a/dumux/discretization/staggered/CMakeLists.txt b/dumux/discretization/staggered/CMakeLists.txt
index 2c9c80e3c932f0d78a35a8cf9d87d07f6b201216..a792fb69ba3ff5558ae006ccd12efd27d2b86c14 100644
--- a/dumux/discretization/staggered/CMakeLists.txt
+++ b/dumux/discretization/staggered/CMakeLists.txt
@@ -1,17 +1,15 @@
 add_subdirectory("freeflow")
 
 install(FILES
-connectivitymap.hh
 elementfacevariables.hh
-elementfluxvariables.hh
-elementvolumevariables.hh
+elementfluxvariablescache.hh
+elementsolution.hh
 facesolution.hh
 fvelementgeometry.hh
 fvgridgeometry.hh
-globalfacevariables.hh
-gridfluxvariables.hh
+gridfacevariables.hh
+gridfluxvariablescache.hh
 gridvariables.hh
-gridvolumevariables.hh
 properties.hh
 subcontrolvolumeface.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/discretization/staggered)
diff --git a/dumux/linear/CMakeLists.txt b/dumux/linear/CMakeLists.txt
index 525c3ed5da1e2d2913b161885b1716fddd2fc5f2..1c7080066724f65e90bb90ef46c39d005199b54e 100644
--- a/dumux/linear/CMakeLists.txt
+++ b/dumux/linear/CMakeLists.txt
@@ -4,9 +4,9 @@ amgbackend.hh
 amgparallelhelpers.hh
 amgtraits.hh
 linearsolveracceptsmultitypematrix.hh
-linearsolverproperties.hh
-pardisobackend.hh
+matrixconverter.hh
 scotchbackend.hh
 seqsolverbackend.hh
+solver.hh
 vectorexchange.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/linear)
diff --git a/dumux/material/fluidsystems/CMakeLists.txt b/dumux/material/fluidsystems/CMakeLists.txt
index 9226fb7542864a7507a4b80af333f1b8ad387482..3b5f1e5c864d37c83eb13aa7fa7d8cdf2244e1d7 100644
--- a/dumux/material/fluidsystems/CMakeLists.txt
+++ b/dumux/material/fluidsystems/CMakeLists.txt
@@ -1,18 +1,19 @@
 install(FILES
+  1pgas.hh
+  1pliquid.hh
+  2p1c.hh
   2pimmiscible.hh
-  2pliquidvapor.hh
+  3pimmiscible.hh
   base.hh
   brineair.hh
   brineco2.hh
-  1pgas.hh
   h2oair.hh
   h2oairmesitylene.hh
   h2oairxylene.hh
-  h2oheavyoilfluidsystem.hh
+  h2oheavyoil.hh
   h2on2.hh
   h2on2kinetic.hh
   h2on2o2.hh
-  1pliquid.hh
   liquidphase2c.hh
   nullparametercache.hh
   parametercachebase.hh
diff --git a/dumux/material/solidsystems/CMakeLists.txt b/dumux/material/solidsystems/CMakeLists.txt
index 211e9cc08a7a188ee71db7da087fb29afbe428cb..0e9afac55930f53f485b7711128c8e64af1e6d96 100644
--- a/dumux/material/solidsystems/CMakeLists.txt
+++ b/dumux/material/solidsystems/CMakeLists.txt
@@ -1,4 +1,4 @@
 install(FILES
   inertsolidphase.hh
-  compositionalsolidstate.hh
+  compositionalsolidphase.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/material/solidsystems)
diff --git a/dumux/porousmediumflow/2p/CMakeLists.txt b/dumux/porousmediumflow/2p/CMakeLists.txt
index 068e9dc616fc10056ac36f3f11a79233d6d3f9cb..10af09f9c6d455dd14cd55ea8f0f6abf95b74fa5 100644
--- a/dumux/porousmediumflow/2p/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p/CMakeLists.txt
@@ -2,11 +2,14 @@ add_subdirectory("sequential")
 
 #install headers
 install(FILES
-adaptionhelper.hh
+boxmaterialinterfaceparams.hh
+formulation.hh
 gridadaptindicator.hh
-indices.hh
+griddatatransfer.hh
 incompressiblelocalresidual.hh
+indices.hh
 model.hh
+saturationreconstruction.hh
 volumevariables.hh
 vtkoutputfields.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2p)
diff --git a/dumux/porousmediumflow/mpnc/CMakeLists.txt b/dumux/porousmediumflow/mpnc/CMakeLists.txt
index 178f4c5f8d9e4911dded69490b6d1f6f053862c4..b203874496406edbf408dfa4a6fe0f40c91f7ae7 100644
--- a/dumux/porousmediumflow/mpnc/CMakeLists.txt
+++ b/dumux/porousmediumflow/mpnc/CMakeLists.txt
@@ -3,6 +3,7 @@ install(FILES
 indices.hh
 localresidual.hh
 model.hh
+pressureformulation.hh
 volumevariables.hh
-vtkoutputfield.hh
+vtkoutputfields.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/mpnc)