diff --git a/CMakeLists.txt b/CMakeLists.txt
index bcd92ac..a919b34 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,7 +60,14 @@ set(CMAKE_SHARED_MODULE_SUFFIX ".scx")
 endif()
 
 add_library(FLUID_SC_WRAPPER INTERFACE)
-target_sources(FLUID_SC_WRAPPER INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include/FluidSCWrapper.hpp")
+target_sources(FLUID_SC_WRAPPER
+INTERFACE
+${CMAKE_CURRENT_SOURCE_DIR}/include/FluidSCWrapper.hpp
+${CMAKE_CURRENT_SOURCE_DIR}/include/NRTCommand.hpp
+${CMAKE_CURRENT_SOURCE_DIR}/include/SCBufferAdaptor.hpp
+${CMAKE_CURRENT_SOURCE_DIR}/include/GenerateSCCode.hpp
+${CMAKE_CURRENT_SOURCE_DIR}/include/fdNRTBase.hpp
+)
 
 SUBDIRLIST(PROJECT_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/src)
 foreach (project_dir ${PROJECT_DIRS})
diff --git a/scripts/target_post.cmake b/scripts/target_post.cmake
index 3d49245..0acffe9 100644
--- a/scripts/target_post.cmake
+++ b/scripts/target_post.cmake
@@ -1,5 +1,15 @@
+
+target_link_libraries(
+  ${PLUGIN}
+  PRIVATE
+  FLUID_DECOMPOSITION
+  FLUID_SC_WRAPPER
+)
+
 target_include_directories(
   ${PLUGIN}
+  PRIVATE
+  ${CMAKE_CURRENT_LIST_DIR}/../../include
   SYSTEM PRIVATE
   ${SC_PATH}/include/plugin_interface
   ${SC_PATH}/include/common
@@ -7,12 +17,15 @@ target_include_directories(
   ${SC_PATH}/external_libraries/boost #we need boost::align for deallocating buffer memory :-(
 )
 
+get_property(HEADERS TARGET FLUID_DECOMPOSITION PROPERTY INTERFACE_SOURCES)
+source_group(TREE ${FLUID_PATH}/include FILES ${HEADERS})
+
+
 if (SUPERNOVA)
     target_include_directories(
       ${PLUGIN}
       SYSTEM PRIVATE
       ${SC_PATH}/external_libraries/nova-tt
-
       ${SC_PATH}/external_libraries/boost_lockfree
       ${SC_PATH}/external_libraries/boost-lockfree
     )
diff --git a/src/FluidTransients/CMakeLists.txt b/src/FluidTransients/CMakeLists.txt
index 3693881..d1e5005 100755
--- a/src/FluidTransients/CMakeLists.txt
+++ b/src/FluidTransients/CMakeLists.txt
@@ -9,12 +9,4 @@ add_library(
   ${FILENAME}
 )
 
-target_include_directories(
-  ${PLUGIN} PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include
-)
-
-target_link_libraries(
-  ${PLUGIN} PRIVATE FLUID_DECOMPOSITION
-)
-
 include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake)