diff --git a/src/core/ddsc/CMakeLists.txt b/src/core/ddsc/CMakeLists.txt
index e10f21f..b28a481 100644
--- a/src/core/ddsc/CMakeLists.txt
+++ b/src/core/ddsc/CMakeLists.txt
@@ -87,11 +87,6 @@ generate_export_header(
     EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/include/dds/export.h"
 )
 
-target_include_directories(
-  ddsc PUBLIC
-    "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>"
-    "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>")
-
 target_sources(ddsc
     PRIVATE
         ${srcs_ddsc}
@@ -103,27 +98,21 @@ target_sources(ddsc
 
 target_include_directories(ddsc
     PUBLIC
+        "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>"
+        "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>"
         "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>"
     PRIVATE
-        "${CMAKE_CURRENT_LIST_DIR}/src")
-
-target_include_directories(ddsc INTERFACE $<INSTALL_INTERFACE:include>)
+        "${CMAKE_CURRENT_LIST_DIR}/src"
+    INTERFACE
+        $<INSTALL_INTERFACE:include>)
 
 install(
-  DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/include/dds"
+  DIRECTORY
+      "${CMAKE_CURRENT_LIST_DIR}/include/"
+      "${CMAKE_CURRENT_BINARY_DIR}/include/"
   DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
   COMPONENT dev)
 
-install(
-  DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/include/ddsc"
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-  COMPONENT dev)
-
-install(
-  FILES "${CMAKE_CURRENT_BINARY_DIR}/include/dds/export.h"
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/dds"
-  COMPONENT dev)
-
 # TODO: improve test inclusion.
 if((BUILD_TESTING) AND ((NOT DEFINED MSVC_VERSION) OR (MSVC_VERSION GREATER "1800")))
   add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/tests")
diff --git a/src/core/ddsi/CMakeLists.txt b/src/core/ddsi/CMakeLists.txt
index 8ba1f8f..abde8ad 100644
--- a/src/core/ddsi/CMakeLists.txt
+++ b/src/core/ddsi/CMakeLists.txt
@@ -125,7 +125,7 @@ target_include_directories(ddsc
   PRIVATE "${CMAKE_CURRENT_LIST_DIR}/include")
 
 install(
-  DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/include/dds"
+  DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/include/"
   DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
   COMPONENT dev)
 
diff --git a/src/ddsrt/CMakeLists.txt b/src/ddsrt/CMakeLists.txt
index 32ab777..0b241d9 100644
--- a/src/ddsrt/CMakeLists.txt
+++ b/src/ddsrt/CMakeLists.txt
@@ -260,20 +260,9 @@ if(BUILD_TESTING)
 endif()
 
 install(
-  DIRECTORY "include/dds"
+  DIRECTORY
+      "include/"
+      ${CMAKE_CURRENT_BINARY_DIR}/include/
   DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
   COMPONENT dev
   FILES_MATCHING PATTERN "*.h")
-
-install(
-  FILES "${CMAKE_CURRENT_BINARY_DIR}/include/dds/version.h"
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/dds"
-  COMPONENT dev)
-
-if(WIN32)
-  install(
-    FILES "${CMAKE_CURRENT_BINARY_DIR}/include/getopt.h"
-    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-    COMPONENT dev)
-endif()
-