diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index e251a377a826d264eb93c7b022a30cbb2c606034..df288d25df17298a9c1b605f0680d1e2bde1eb07 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -1,11 +1,11 @@
 #------------------------------------------------------------------------------
-# Add relevant subdirs
 add_subdirectory(common)
 add_subdirectory(coords)
-
+add_subdirectory(gridded_response)
 add_subdirectory(hamaker)
 add_subdirectory(lobes)
 add_subdirectory(oskar)
+add_subdirectory(telescope)
 
 #------------------------------------------------------------------------------
 add_library(everybeam SHARED
@@ -31,8 +31,6 @@ install (
   EXPORT EveryBeamTargets
   DESTINATION lib)
 
-#------------------------------------------------------------------------------
-# Install headers  
 install (FILES
   Antenna.h
   BeamFormer.h
@@ -42,8 +40,7 @@ install (FILES
   Station.h
   # Related to new API:
   load.h
-  # Not needed as yet:
-  # options.h
+  options.h
 DESTINATION "include/${CMAKE_PROJECT_NAME}")
 
 install(
diff --git a/cpp/common/CMakeLists.txt b/cpp/common/CMakeLists.txt
index f115fb1aaefd58f78db90bc34bd99d11bf4d85cc..70d924db3afaae973d189579a1a496ce8c248862 100644
--- a/cpp/common/CMakeLists.txt
+++ b/cpp/common/CMakeLists.txt
@@ -1,9 +1,7 @@
-#------------------------------------------------------------------------------
-# Install headers
 install (FILES
   casa_utils.h
   Constants.h
   MathUtil.h
   MutablePtr.h
   Types.h
-DESTINATION "include/${CMAKE_PROJECT_NAME}/common")
\ No newline at end of file
+DESTINATION "include/${CMAKE_PROJECT_NAME}/common")
diff --git a/cpp/coords/CMakeLists.txt b/cpp/coords/CMakeLists.txt
index 34f2e0c3003883e8ea02ce7b8a26a2d85f0912f2..b5ea2ad574273ee3acc97230b4bd3df57a8da092 100644
--- a/cpp/coords/CMakeLists.txt
+++ b/cpp/coords/CMakeLists.txt
@@ -1,5 +1,3 @@
-#------------------------------------------------------------------------------
-# Install headers
 install (FILES
   ITRFConverter.h
   ITRFDirection.h
diff --git a/cpp/gridded_response/CMakeLists.txt b/cpp/gridded_response/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..134f6ee0eddfd98228f7c6c797652291b536fd94
--- /dev/null
+++ b/cpp/gridded_response/CMakeLists.txt
@@ -0,0 +1,4 @@
+install (FILES
+  griddedresponse.h
+  lofargrid.h
+DESTINATION "include/${CMAKE_PROJECT_NAME}/gridded_response")
diff --git a/cpp/telescope/CMakeLists.txt b/cpp/telescope/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..27539ca1783f0e1849892e1634e7a351ee513ff5
--- /dev/null
+++ b/cpp/telescope/CMakeLists.txt
@@ -0,0 +1,5 @@
+install (FILES
+  lofar.h 
+  telescope.h
+DESTINATION "include/${CMAKE_PROJECT_NAME}/telescope")
+