diff --git a/core/data/CMakeLists.txt b/core/data/CMakeLists.txt
index 95559844905f38d49b4a9dc395aa302e8afe1431..b768cc7879413d0c94506283d2e0abf3af06e138 100644
--- a/core/data/CMakeLists.txt
+++ b/core/data/CMakeLists.txt
@@ -50,7 +50,7 @@ set(SRCS
   CbmLink.cxx
   CbmMatch.cxx
   CbmTrackMatchNew.cxx
-  
+
   base/CbmDigiBranchBase.cxx
   base/CbmDigiContainer.cxx
 
@@ -137,8 +137,8 @@ set(DEPENDENCIES Base)
 GENERATE_LIBRARY()
 
 # Install file which has no corresponding source file
-Install(FILES 
+Install(FILES
         CbmDefs.h rich/CbmRichRingLight.h base/CbmDigiVector.h
-        raw/bitmask_operators.hpp raw/PsdGbtDataFormat.h
+        raw/bitmask_operators.hpp raw/StsXyterFinalHit.h raw/PsdGbtDataFormat.h
         DESTINATION include
        )
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index e97aab5f54ac136f7e9490e8c3186b2bdd65501d..6b19bb8d0eb7191352966acf710a67e1e846b821 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -13,6 +13,8 @@ if(DOWNLOAD_EXTERNALS)
                              SOURCE_DIR      ${CMAKE_CURRENT_SOURCE_DIR}/cppzmq
                              TEST_FILE       zmq.hpp
                             )
+  # Install header files
+  install(FILES cppzmq/zmq.hpp DESTINATION include)
 
 
   Set(IPC_INCLUDE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ipc/ipc/lib/fles_ipc PARENT_SCOPE)
diff --git a/external/ipc/CMakeLists.txt b/external/ipc/CMakeLists.txt
index e5737cb1115913599f6f5ad5fdcd2eff818c57a8..dea275cddc0d57740beece2d15c0ef40a40e2c0a 100644
--- a/external/ipc/CMakeLists.txt
+++ b/external/ipc/CMakeLists.txt
@@ -75,3 +75,8 @@ EndIf()
 
 
 GENERATE_LIBRARY()
+
+# Install header files
+install(FILES ipc/lib/logging/log.hpp DESTINATION include)
+file(GLOB_RECURSE IPC_HEADERS ipc/lib/fles_ipc/*.hpp)
+install(FILES ${IPC_HEADERS} DESTINATION include)
diff --git a/fles/mcbm2018/CMakeLists.txt b/fles/mcbm2018/CMakeLists.txt
index 77b6297669ed17a31ab6d020332e0df7c1bf4e17..12c2612487d6d2cc64e5ec2a8d5400ec34a6880a 100644
--- a/fles/mcbm2018/CMakeLists.txt
+++ b/fles/mcbm2018/CMakeLists.txt
@@ -58,7 +58,6 @@ Link_Directories(
 )
 
 Set(SRCS
-
    CbmMcbmUnpack.cxx
    CbmMcbm2018Source.cxx
    CbmMcbm2018MsCrcCheck.cxx
@@ -137,3 +136,6 @@ Set(DEPENDENCIES
 )
 
 GENERATE_LIBRARY()
+
+# Install file which has no corresponding source file
+install(FILES commonMQ/CbmStar2019Algo.h DESTINATION include)