diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ba34773c9bc34dc01e9af4ed72e0b8e4b991cc3..2db6b877654b26eab29df19fd2df729f4eeb0c04 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,7 +88,6 @@ foreach (MODEL ${MODELS})
   set_target_properties (
     CONEX${MODEL}
     PROPERTIES
-    INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/src/;${CMAKE_CURRENT_BINARY_DIR}/src/;${CMAKE_CURRENT_SOURCE_DIR}/src/urqmd13/"
     COMPILE_OPTIONS "-std=legacy;-Wfunction-elimination;-w;-fno-second-underscore;-fno-automatic;-Wno-conversion"
     COMPILE_DEFINITIONS "${${MODEL_DEF}};CX_NO_ROOT;CORSIKA_8;__CORSIKA8__;__URQMD__;__CXSUB__;CORSIKA_DATA=${CORSIKA_DATA}"
     POSITION_INDEPENDENT_CODE 1
@@ -98,8 +97,11 @@ foreach (MODEL ${MODELS})
   target_include_directories (
     CONEX${MODEL}
     PUBLIC
-    $<BUILD_INTERFACE: ${CMAKE_CURRENT_SOURCE_DIR}/src;${CMAKE_CURRENT_BINARY_DIR}/src>
-    $<INSTALL_INTERFACE: ${CMAKE_CURRENT_SOURCE_DIR}/src;${CMAKE_CURRENT_BINARY_DIR}/src>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/src>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/urqmd13/>
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include/modules/conex>
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include/modules/urqmd>
     )
 
   # make sure to link to actual model library
@@ -124,7 +126,15 @@ foreach (MODEL ${MODELS})
   #
   add_dependencies (CORSIKA8 CONEX${MODEL})
   target_link_libraries (CORSIKA8 INTERFACE CONEX${MODEL})
-  
+
+  install (
+    TARGETS CONEX${MODEL}
+    EXPORT CORSIKA8
+    DESTINATION lib
+    PUBLIC_HEADER DESTINATION include/modules/conex
+    )
+
+
 endforeach ()