diff --git a/src/FluidAmpSlice/CMakeLists.txt b/src/FluidAmpSlice/CMakeLists.txt
index ee75433..01d2f6a 100644
--- a/src/FluidAmpSlice/CMakeLists.txt
+++ b/src/FluidAmpSlice/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)
diff --git a/src/FluidBufAmpSlice/CMakeLists.txt b/src/FluidBufAmpSlice/CMakeLists.txt
index ee75433..01d2f6a 100644
--- a/src/FluidBufAmpSlice/CMakeLists.txt
+++ b/src/FluidBufAmpSlice/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)
diff --git a/src/FluidBufCompose/CMakeLists.txt b/src/FluidBufCompose/CMakeLists.txt
index ee75433..01d2f6a 100755
--- a/src/FluidBufCompose/CMakeLists.txt
+++ b/src/FluidBufCompose/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)
diff --git a/src/FluidBufHPSS/CMakeLists.txt b/src/FluidBufHPSS/CMakeLists.txt
index ee75433..01d2f6a 100755
--- a/src/FluidBufHPSS/CMakeLists.txt
+++ b/src/FluidBufHPSS/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)
diff --git a/src/FluidBufLoudness/CMakeLists.txt b/src/FluidBufLoudness/CMakeLists.txt
index ee75433..01d2f6a 100644
--- a/src/FluidBufLoudness/CMakeLists.txt
+++ b/src/FluidBufLoudness/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)
diff --git a/src/FluidBufMFCC/CMakeLists.txt b/src/FluidBufMFCC/CMakeLists.txt
index ee75433..01d2f6a 100644
--- a/src/FluidBufMFCC/CMakeLists.txt
+++ b/src/FluidBufMFCC/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)
diff --git a/src/FluidBufMelBands/CMakeLists.txt b/src/FluidBufMelBands/CMakeLists.txt
index ee75433..01d2f6a 100644
--- a/src/FluidBufMelBands/CMakeLists.txt
+++ b/src/FluidBufMelBands/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)
diff --git a/src/FluidBufNMF/CMakeLists.txt b/src/FluidBufNMF/CMakeLists.txt
index ee75433..01d2f6a 100755
--- a/src/FluidBufNMF/CMakeLists.txt
+++ b/src/FluidBufNMF/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)
diff --git a/src/FluidBufNoveltySlice/CMakeLists.txt b/src/FluidBufNoveltySlice/CMakeLists.txt
index ee75433..01d2f6a 100644
--- a/src/FluidBufNoveltySlice/CMakeLists.txt
+++ b/src/FluidBufNoveltySlice/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)
diff --git a/src/FluidBufOnsetSlice/CMakeLists.txt b/src/FluidBufOnsetSlice/CMakeLists.txt
index ee75433..01d2f6a 100644
--- a/src/FluidBufOnsetSlice/CMakeLists.txt
+++ b/src/FluidBufOnsetSlice/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)
diff --git a/src/FluidBufPitch/CMakeLists.txt b/src/FluidBufPitch/CMakeLists.txt
index ee75433..4c2400a 100644
--- a/src/FluidBufPitch/CMakeLists.txt
+++ b/src/FluidBufPitch/CMakeLists.txt
@@ -9,12 +9,5 @@ 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)
diff --git a/src/FluidBufSines/CMakeLists.txt b/src/FluidBufSines/CMakeLists.txt
index ee75433..01d2f6a 100755
--- a/src/FluidBufSines/CMakeLists.txt
+++ b/src/FluidBufSines/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)
diff --git a/src/FluidBufSpectralShape/CMakeLists.txt b/src/FluidBufSpectralShape/CMakeLists.txt
index ee75433..01d2f6a 100755
--- a/src/FluidBufSpectralShape/CMakeLists.txt
+++ b/src/FluidBufSpectralShape/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)
diff --git a/src/FluidBufStats/CMakeLists.txt b/src/FluidBufStats/CMakeLists.txt
index ee75433..01d2f6a 100644
--- a/src/FluidBufStats/CMakeLists.txt
+++ b/src/FluidBufStats/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)
diff --git a/src/FluidBufThreadDemo/CMakeLists.txt b/src/FluidBufThreadDemo/CMakeLists.txt
index ee75433..01d2f6a 100644
--- a/src/FluidBufThreadDemo/CMakeLists.txt
+++ b/src/FluidBufThreadDemo/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)
diff --git a/src/FluidBufTransientSlice/CMakeLists.txt b/src/FluidBufTransientSlice/CMakeLists.txt
index ee75433..01d2f6a 100755
--- a/src/FluidBufTransientSlice/CMakeLists.txt
+++ b/src/FluidBufTransientSlice/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)
diff --git a/src/FluidBufTransients/CMakeLists.txt b/src/FluidBufTransients/CMakeLists.txt
index ee75433..4c2400a 100755
--- a/src/FluidBufTransients/CMakeLists.txt
+++ b/src/FluidBufTransients/CMakeLists.txt
@@ -9,12 +9,5 @@ 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)
diff --git a/src/FluidGain/CMakeLists.txt b/src/FluidGain/CMakeLists.txt
index 5c24cc5..01d2f6a 100755
--- a/src/FluidGain/CMakeLists.txt
+++ b/src/FluidGain/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 FLUID_SC_WRAPPER
-)
-
 include(${CMAKE_CURRENT_LIST_DIR}/../../scripts/target_post.cmake)
diff --git a/src/FluidHPSS/CMakeLists.txt b/src/FluidHPSS/CMakeLists.txt
index ee75433..01d2f6a 100755
--- a/src/FluidHPSS/CMakeLists.txt
+++ b/src/FluidHPSS/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)
diff --git a/src/FluidLoudness/CMakeLists.txt b/src/FluidLoudness/CMakeLists.txt
index ee75433..01d2f6a 100644
--- a/src/FluidLoudness/CMakeLists.txt
+++ b/src/FluidLoudness/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)
diff --git a/src/FluidMFCC/CMakeLists.txt b/src/FluidMFCC/CMakeLists.txt
index ee75433..01d2f6a 100644
--- a/src/FluidMFCC/CMakeLists.txt
+++ b/src/FluidMFCC/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)
diff --git a/src/FluidMelBands/CMakeLists.txt b/src/FluidMelBands/CMakeLists.txt
index ee75433..01d2f6a 100644
--- a/src/FluidMelBands/CMakeLists.txt
+++ b/src/FluidMelBands/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)
diff --git a/src/FluidNMFFilter/CMakeLists.txt b/src/FluidNMFFilter/CMakeLists.txt
index ee75433..01d2f6a 100644
--- a/src/FluidNMFFilter/CMakeLists.txt
+++ b/src/FluidNMFFilter/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)
diff --git a/src/FluidNMFMatch/CMakeLists.txt b/src/FluidNMFMatch/CMakeLists.txt
index ee75433..01d2f6a 100755
--- a/src/FluidNMFMatch/CMakeLists.txt
+++ b/src/FluidNMFMatch/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)
diff --git a/src/FluidNoveltySlice/CMakeLists.txt b/src/FluidNoveltySlice/CMakeLists.txt
index ee75433..01d2f6a 100644
--- a/src/FluidNoveltySlice/CMakeLists.txt
+++ b/src/FluidNoveltySlice/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)
diff --git a/src/FluidOnsetSlice/CMakeLists.txt b/src/FluidOnsetSlice/CMakeLists.txt
index ee75433..01d2f6a 100644
--- a/src/FluidOnsetSlice/CMakeLists.txt
+++ b/src/FluidOnsetSlice/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)
diff --git a/src/FluidPitch/CMakeLists.txt b/src/FluidPitch/CMakeLists.txt
index ee75433..4c2400a 100644
--- a/src/FluidPitch/CMakeLists.txt
+++ b/src/FluidPitch/CMakeLists.txt
@@ -9,12 +9,5 @@ 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)
diff --git a/src/FluidSTFTPass/CMakeLists.txt b/src/FluidSTFTPass/CMakeLists.txt
index ee75433..4c2400a 100755
--- a/src/FluidSTFTPass/CMakeLists.txt
+++ b/src/FluidSTFTPass/CMakeLists.txt
@@ -9,12 +9,5 @@ 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)
diff --git a/src/FluidSines/CMakeLists.txt b/src/FluidSines/CMakeLists.txt
index ee75433..4c2400a 100755
--- a/src/FluidSines/CMakeLists.txt
+++ b/src/FluidSines/CMakeLists.txt
@@ -9,12 +9,5 @@ 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)
diff --git a/src/FluidSpectralShape/CMakeLists.txt b/src/FluidSpectralShape/CMakeLists.txt
index ee75433..01d2f6a 100644
--- a/src/FluidSpectralShape/CMakeLists.txt
+++ b/src/FluidSpectralShape/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)
diff --git a/src/FluidTransientSlice/CMakeLists.txt b/src/FluidTransientSlice/CMakeLists.txt
index ee75433..01d2f6a 100755
--- a/src/FluidTransientSlice/CMakeLists.txt
+++ b/src/FluidTransientSlice/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)