diff --git a/dumux/common/CMakeLists.txt b/dumux/common/CMakeLists.txt
index 203c6367569ec9512a373f46efa6439aeaca8d3a..9743710a3e7e12c825c9032a76af3e3b3416acf6 100644
--- a/dumux/common/CMakeLists.txt
+++ b/dumux/common/CMakeLists.txt
@@ -1,24 +1,38 @@
+add_subdirectory(properties)
+add_subdirectory(geometry)
+
 #install headers
 install(FILES
-basicproperties.hh
+balanceequationopts.hh
 boundaryconditions.hh
+boundaryflag.hh
 boundarytypes.hh
+boundingboxtree.hh
+defaultusagemessage.hh
 dimensionlessnumbers.hh
+dumuxmessage.hh
 eigenvalues.hh
+entitymap.hh
 exceptions.hh
 fixedlengthspline_.hh
+fvproblem.hh
 intersectionmapper.hh
+intrange.hh
+loggingparametertree.hh
 math.hh
 optional.hh
 parameters.hh
-propertysystem.hh
+pointsource.hh
+properties.hh
 quad.hh
 reorderingdofmapper.hh
-splinecommon_.hh
 spline.hh
+splinecommon_.hh
+staggeredfvproblem.hh
 start.hh
 tabulated2dfunction.hh
 timemanager.hh
+timesteppingscheme.hh
 valgrind.hh
 variablelengthspline_.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/common)
diff --git a/dumux/common/geometry/CMakeLists.txt b/dumux/common/geometry/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..252f84e8e905583b4237f1ef2bed3b1cfafdcc37
--- /dev/null
+++ b/dumux/common/geometry/CMakeLists.txt
@@ -0,0 +1,10 @@
+
+#install headers
+install(FILES
+boundingboxtree.hh
+boundingboxtreeintersection.hh
+geometricentityset.hh
+intersectingentities.hh
+intersectspointgeometry.hh
+intersectspointsimplex.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/common/geometry)
diff --git a/dumux/common/properties/CMakeLists.txt b/dumux/common/properties/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e60bf0e0804d4d9962c7b728048e1adee3176976
--- /dev/null
+++ b/dumux/common/properties/CMakeLists.txt
@@ -0,0 +1,7 @@
+
+#install headers
+install(FILES
+grid.hh
+model.hh
+propertysystem.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/common/properties)