diff --git a/plugins/channelmimo/beamsteeringcwmod/CMakeLists.txt b/plugins/channelmimo/beamsteeringcwmod/CMakeLists.txt
index 73f0905d6..5bec84b47 100644
--- a/plugins/channelmimo/beamsteeringcwmod/CMakeLists.txt
+++ b/plugins/channelmimo/beamsteeringcwmod/CMakeLists.txt
@@ -48,7 +48,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${beamsteeringcwmod_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME BeamSteeringCWModPlugin ${beamsteeringcwmod_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME BeamSteeringCWModPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${beamsteeringcwmod_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelmimo/doa2/CMakeLists.txt b/plugins/channelmimo/doa2/CMakeLists.txt
index b5e125e57..066accd08 100644
--- a/plugins/channelmimo/doa2/CMakeLists.txt
+++ b/plugins/channelmimo/doa2/CMakeLists.txt
@@ -52,7 +52,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${doa2_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME DOA2Plugin ${doa2_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME DOA2Plugin)
+    target_sources(${TARGET_NAME} PRIVATE ${doa2_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelmimo/interferometer/CMakeLists.txt b/plugins/channelmimo/interferometer/CMakeLists.txt
index 09e7a4aad..6ed6367b8 100644
--- a/plugins/channelmimo/interferometer/CMakeLists.txt
+++ b/plugins/channelmimo/interferometer/CMakeLists.txt
@@ -50,7 +50,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${interferometer_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME InterferometerPlugin ${interferometer_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME InterferometerPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${interferometer_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/chanalyzer/CMakeLists.txt b/plugins/channelrx/chanalyzer/CMakeLists.txt
index 59a133619..f5dbfec4c 100644
--- a/plugins/channelrx/chanalyzer/CMakeLists.txt
+++ b/plugins/channelrx/chanalyzer/CMakeLists.txt
@@ -35,7 +35,8 @@ set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${chanalyzer_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME ChannelAnalyzerPlugin ${chanalyzer_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME ChannelAnalyzerPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${chanalyzer_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/channelpower/CMakeLists.txt b/plugins/channelrx/channelpower/CMakeLists.txt
index 8eda7a16c..af7b446e6 100644
--- a/plugins/channelrx/channelpower/CMakeLists.txt
+++ b/plugins/channelrx/channelpower/CMakeLists.txt
@@ -47,7 +47,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${channelpower_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME ChannelPowerPlugin ${channelpower_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME ChannelPowerPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${channelpower_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/demodadsb/CMakeLists.txt b/plugins/channelrx/demodadsb/CMakeLists.txt
index b44b92d97..1d0ee654c 100644
--- a/plugins/channelrx/demodadsb/CMakeLists.txt
+++ b/plugins/channelrx/demodadsb/CMakeLists.txt
@@ -79,7 +79,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${adsb_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME ADSBPlugin ${adsb_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME ADSBPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${adsb_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/demodais/CMakeLists.txt b/plugins/channelrx/demodais/CMakeLists.txt
index f1b2f00e1..bbc482fd0 100644
--- a/plugins/channelrx/demodais/CMakeLists.txt
+++ b/plugins/channelrx/demodais/CMakeLists.txt
@@ -47,7 +47,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${demodais_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME AISDemodPlugin ${demodais_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME AISDemodPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${demodais_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/demodam/CMakeLists.txt b/plugins/channelrx/demodam/CMakeLists.txt
index 6558bff6f..220091a27 100644
--- a/plugins/channelrx/demodam/CMakeLists.txt
+++ b/plugins/channelrx/demodam/CMakeLists.txt
@@ -51,7 +51,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${am_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME AMDemodPlugin ${am_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME AMDemodPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${am_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/demodapt/CMakeLists.txt b/plugins/channelrx/demodapt/CMakeLists.txt
index acd74afa0..3017be2ee 100644
--- a/plugins/channelrx/demodapt/CMakeLists.txt
+++ b/plugins/channelrx/demodapt/CMakeLists.txt
@@ -58,7 +58,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${demodapt_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME APTDemodPlugin ${demodapt_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME APTDemodPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${demodapt_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/demodatv/CMakeLists.txt b/plugins/channelrx/demodatv/CMakeLists.txt
index ea49f19c5..eb092cf76 100644
--- a/plugins/channelrx/demodatv/CMakeLists.txt
+++ b/plugins/channelrx/demodatv/CMakeLists.txt
@@ -32,7 +32,8 @@ set(INSTALL_FOLDER ${INSTALL_PLUGINS_DIR})
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${atv_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME ATVDemodPlugin ${atv_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME ATVDemodPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${atv_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/demodbfm/CMakeLists.txt b/plugins/channelrx/demodbfm/CMakeLists.txt
index 2fe424f15..5fe52132d 100644
--- a/plugins/channelrx/demodbfm/CMakeLists.txt
+++ b/plugins/channelrx/demodbfm/CMakeLists.txt
@@ -59,7 +59,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${bfm_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME BFMPlugin ${bfm_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME BFMPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${bfm_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/demodchirpchat/CMakeLists.txt b/plugins/channelrx/demodchirpchat/CMakeLists.txt
index 66b63ebc5..c95a0cdf3 100644
--- a/plugins/channelrx/demodchirpchat/CMakeLists.txt
+++ b/plugins/channelrx/demodchirpchat/CMakeLists.txt
@@ -63,7 +63,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${chirpchat_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME ChirpChatDemodPlugin ${chirpchat_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME ChirpChatDemodPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${chirpchat_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/demoddab/CMakeLists.txt b/plugins/channelrx/demoddab/CMakeLists.txt
index 12040d4a2..6aeb91872 100644
--- a/plugins/channelrx/demoddab/CMakeLists.txt
+++ b/plugins/channelrx/demoddab/CMakeLists.txt
@@ -52,7 +52,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${demoddab_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME DABDemodPlugin ${demoddab_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME DABDemodPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${demoddab_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/demoddsc/CMakeLists.txt b/plugins/channelrx/demoddsc/CMakeLists.txt
index b9c6aa8bc..2391e57e0 100644
--- a/plugins/channelrx/demoddsc/CMakeLists.txt
+++ b/plugins/channelrx/demoddsc/CMakeLists.txt
@@ -49,7 +49,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${demoddsc_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME DSCDemodPlugin ${demoddsc_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME DSCDemodPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${demoddsc_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/demoddsd/CMakeLists.txt b/plugins/channelrx/demoddsd/CMakeLists.txt
index 861f7a6cd..daeacb017 100644
--- a/plugins/channelrx/demoddsd/CMakeLists.txt
+++ b/plugins/channelrx/demoddsd/CMakeLists.txt
@@ -56,7 +56,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${dsddemod_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME DSDDemodPlugin ${dsddemod_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME DSDDemodPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${dsddemod_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/demodendoftrain/CMakeLists.txt b/plugins/channelrx/demodendoftrain/CMakeLists.txt
index 4b940595e..ea10b5d67 100644
--- a/plugins/channelrx/demodendoftrain/CMakeLists.txt
+++ b/plugins/channelrx/demodendoftrain/CMakeLists.txt
@@ -49,7 +49,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${demodendoftrain_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME EndOfTrainDemodPlugin ${demodendoftrain_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME EndOfTrainDemodPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${demodendoftrain_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/demodfreedv/CMakeLists.txt b/plugins/channelrx/demodfreedv/CMakeLists.txt
index 73163e35e..8f2477574 100644
--- a/plugins/channelrx/demodfreedv/CMakeLists.txt
+++ b/plugins/channelrx/demodfreedv/CMakeLists.txt
@@ -47,7 +47,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${freedv_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME FreeDVDemodPlugin ${freedv_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME FreeDVDemodPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${freedv_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/demodft8/CMakeLists.txt b/plugins/channelrx/demodft8/CMakeLists.txt
index acf4b71b2..bcc3cdfcd 100644
--- a/plugins/channelrx/demodft8/CMakeLists.txt
+++ b/plugins/channelrx/demodft8/CMakeLists.txt
@@ -59,7 +59,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${demodft8_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME FT8Plugin ${demodft8_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME FT8Plugin)
+    target_sources(${TARGET_NAME} PRIVATE ${demodft8_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/demodils/CMakeLists.txt b/plugins/channelrx/demodils/CMakeLists.txt
index 614b076f9..673b6a53d 100644
--- a/plugins/channelrx/demodils/CMakeLists.txt
+++ b/plugins/channelrx/demodils/CMakeLists.txt
@@ -47,7 +47,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${demodils_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME ILSDemodPlugin ${demodils_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME ILSDemodPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${demodils_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/demodinmarsat/CMakeLists.txt b/plugins/channelrx/demodinmarsat/CMakeLists.txt
index d5c7f52dc..f07c03a55 100644
--- a/plugins/channelrx/demodinmarsat/CMakeLists.txt
+++ b/plugins/channelrx/demodinmarsat/CMakeLists.txt
@@ -48,7 +48,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${demodinmarsat_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME InmarsatDemodPlugin ${demodinmarsat_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME InmarsatDemodPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${demodinmarsat_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/demodm17/CMakeLists.txt b/plugins/channelrx/demodm17/CMakeLists.txt
index 68592f9c9..e97f895fc 100644
--- a/plugins/channelrx/demodm17/CMakeLists.txt
+++ b/plugins/channelrx/demodm17/CMakeLists.txt
@@ -57,7 +57,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${m17_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME M17DemodPlugin ${m17_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME M17DemodPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${m17_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/demodmeshtastic/CMakeLists.txt b/plugins/channelrx/demodmeshtastic/CMakeLists.txt
index cee9ee1ec..e33b2f5be 100644
--- a/plugins/channelrx/demodmeshtastic/CMakeLists.txt
+++ b/plugins/channelrx/demodmeshtastic/CMakeLists.txt
@@ -57,7 +57,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${meshtastic_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME MeshtasticPlugin ${meshtastic_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME MeshtasticPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${meshtastic_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/demodnavtex/CMakeLists.txt b/plugins/channelrx/demodnavtex/CMakeLists.txt
index 1cdf4acc4..df87866b6 100644
--- a/plugins/channelrx/demodnavtex/CMakeLists.txt
+++ b/plugins/channelrx/demodnavtex/CMakeLists.txt
@@ -47,7 +47,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${demodnavtex_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME NavtexDemodPlugin ${demodnavtex_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME NavtexDemodPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${demodnavtex_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/demodnfm/CMakeLists.txt b/plugins/channelrx/demodnfm/CMakeLists.txt
index 9676fab8b..057339606 100644
--- a/plugins/channelrx/demodnfm/CMakeLists.txt
+++ b/plugins/channelrx/demodnfm/CMakeLists.txt
@@ -52,7 +52,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${nfm_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME NFMPlugin ${nfm_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME NFMPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${nfm_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/demodpacket/CMakeLists.txt b/plugins/channelrx/demodpacket/CMakeLists.txt
index 797e0319a..d575744f0 100644
--- a/plugins/channelrx/demodpacket/CMakeLists.txt
+++ b/plugins/channelrx/demodpacket/CMakeLists.txt
@@ -47,7 +47,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${demodpacket_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME PacketDemodPlugin ${demodpacket_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME PacketDemodPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${demodpacket_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/demodpager/CMakeLists.txt b/plugins/channelrx/demodpager/CMakeLists.txt
index e47b048b8..6e61ec876 100644
--- a/plugins/channelrx/demodpager/CMakeLists.txt
+++ b/plugins/channelrx/demodpager/CMakeLists.txt
@@ -59,7 +59,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${demodpager_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME PagerDemodPlugin ${demodpager_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME PagerDemodPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${demodpager_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/demodradiosonde/CMakeLists.txt b/plugins/channelrx/demodradiosonde/CMakeLists.txt
index 8e5557a5e..31390a1cb 100644
--- a/plugins/channelrx/demodradiosonde/CMakeLists.txt
+++ b/plugins/channelrx/demodradiosonde/CMakeLists.txt
@@ -47,7 +47,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${demodradiosonde_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME RadiosondeDemodPlugin ${demodradiosonde_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME RadiosondeDemodPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${demodradiosonde_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/demodrtty/CMakeLists.txt b/plugins/channelrx/demodrtty/CMakeLists.txt
index 2e67f2c97..515c4e8f1 100644
--- a/plugins/channelrx/demodrtty/CMakeLists.txt
+++ b/plugins/channelrx/demodrtty/CMakeLists.txt
@@ -47,7 +47,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${demodrtty_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME RttyDemodPlugin ${demodrtty_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME RttyDemodPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${demodrtty_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/demodssb/CMakeLists.txt b/plugins/channelrx/demodssb/CMakeLists.txt
index 38c60d8fa..e734678ca 100644
--- a/plugins/channelrx/demodssb/CMakeLists.txt
+++ b/plugins/channelrx/demodssb/CMakeLists.txt
@@ -46,7 +46,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${ssb_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME SSBPlugin ${ssb_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME SSBPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${ssb_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/demodvor/CMakeLists.txt b/plugins/channelrx/demodvor/CMakeLists.txt
index 8a99291d9..055e9271c 100644
--- a/plugins/channelrx/demodvor/CMakeLists.txt
+++ b/plugins/channelrx/demodvor/CMakeLists.txt
@@ -49,7 +49,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${vor_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME VORDemodPlugin ${vor_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME VORDemodPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${vor_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/demodwfm/CMakeLists.txt b/plugins/channelrx/demodwfm/CMakeLists.txt
index e8348083a..b1257e1e3 100644
--- a/plugins/channelrx/demodwfm/CMakeLists.txt
+++ b/plugins/channelrx/demodwfm/CMakeLists.txt
@@ -47,7 +47,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${wfm_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME WFMPlugin ${wfm_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME WFMPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${wfm_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/filesink/CMakeLists.txt b/plugins/channelrx/filesink/CMakeLists.txt
index 38a48d592..5719f6f9a 100644
--- a/plugins/channelrx/filesink/CMakeLists.txt
+++ b/plugins/channelrx/filesink/CMakeLists.txt
@@ -50,7 +50,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${filesink_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME FileSinkPlugin ${filesink_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME FileSinkPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${filesink_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/freqscanner/CMakeLists.txt b/plugins/channelrx/freqscanner/CMakeLists.txt
index 7da5665af..e4c6a3b44 100644
--- a/plugins/channelrx/freqscanner/CMakeLists.txt
+++ b/plugins/channelrx/freqscanner/CMakeLists.txt
@@ -50,7 +50,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${freqscanner_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME FreqScannerPlugin ${freqscanner_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME FreqScannerPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${freqscanner_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/freqtracker/CMakeLists.txt b/plugins/channelrx/freqtracker/CMakeLists.txt
index f6c97a1c9..4d8866513 100644
--- a/plugins/channelrx/freqtracker/CMakeLists.txt
+++ b/plugins/channelrx/freqtracker/CMakeLists.txt
@@ -50,7 +50,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${freqtracker_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME FreqTrackerPlugin ${freqtracker_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME FreqTrackerPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${freqtracker_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/heatmap/CMakeLists.txt b/plugins/channelrx/heatmap/CMakeLists.txt
index fb7046984..bb998144e 100644
--- a/plugins/channelrx/heatmap/CMakeLists.txt
+++ b/plugins/channelrx/heatmap/CMakeLists.txt
@@ -47,7 +47,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${heatmap_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME HeatMapPlugin ${heatmap_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME HeatMapPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${heatmap_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/localsink/CMakeLists.txt b/plugins/channelrx/localsink/CMakeLists.txt
index 52ef12b32..6b12d1eab 100644
--- a/plugins/channelrx/localsink/CMakeLists.txt
+++ b/plugins/channelrx/localsink/CMakeLists.txt
@@ -49,7 +49,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${localsink_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME LocalSinkPlugin ${localsink_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME LocalSinkPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${localsink_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/noisefigure/CMakeLists.txt b/plugins/channelrx/noisefigure/CMakeLists.txt
index 361d6d2da..ac99d862e 100644
--- a/plugins/channelrx/noisefigure/CMakeLists.txt
+++ b/plugins/channelrx/noisefigure/CMakeLists.txt
@@ -54,7 +54,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${noisefigure_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME NoiseFigurePlugin ${noisefigure_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME NoiseFigurePlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${noisefigure_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/radioastronomy/CMakeLists.txt b/plugins/channelrx/radioastronomy/CMakeLists.txt
index 8c8864e72..337891bd4 100644
--- a/plugins/channelrx/radioastronomy/CMakeLists.txt
+++ b/plugins/channelrx/radioastronomy/CMakeLists.txt
@@ -56,7 +56,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${radioastronomy_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME RadioAstronomyPlugin ${radioastronomy_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME RadioAstronomyPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${radioastronomy_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/radioclock/CMakeLists.txt b/plugins/channelrx/radioclock/CMakeLists.txt
index 0ef1c5b1d..461f9a308 100644
--- a/plugins/channelrx/radioclock/CMakeLists.txt
+++ b/plugins/channelrx/radioclock/CMakeLists.txt
@@ -47,7 +47,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${radioclock_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME RadioClockPlugin ${radioclock_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME RadioClockPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${radioclock_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/remotesink/CMakeLists.txt b/plugins/channelrx/remotesink/CMakeLists.txt
index d8d131e20..9c02d1c7d 100644
--- a/plugins/channelrx/remotesink/CMakeLists.txt
+++ b/plugins/channelrx/remotesink/CMakeLists.txt
@@ -53,7 +53,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${remotesink_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME RemoteSinkPlugin ${remotesink_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME RemoteSinkPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${remotesink_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/remotetcpsink/CMakeLists.txt b/plugins/channelrx/remotetcpsink/CMakeLists.txt
index 1e36d7692..ca25f83cf 100644
--- a/plugins/channelrx/remotetcpsink/CMakeLists.txt
+++ b/plugins/channelrx/remotetcpsink/CMakeLists.txt
@@ -52,7 +52,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${remotetcpsink_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME RemoteTCPSinkPlugin ${remotetcpsink_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME RemoteTCPSinkPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${remotetcpsink_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/sigmffilesink/CMakeLists.txt b/plugins/channelrx/sigmffilesink/CMakeLists.txt
index 74305179e..edd3805f1 100644
--- a/plugins/channelrx/sigmffilesink/CMakeLists.txt
+++ b/plugins/channelrx/sigmffilesink/CMakeLists.txt
@@ -49,7 +49,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${sigmffilesink_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME SigMFSinkPlugin ${sigmffilesink_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME SigMFSinkPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${sigmffilesink_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/udpsink/CMakeLists.txt b/plugins/channelrx/udpsink/CMakeLists.txt
index fc9cd4c46..c3a34797d 100644
--- a/plugins/channelrx/udpsink/CMakeLists.txt
+++ b/plugins/channelrx/udpsink/CMakeLists.txt
@@ -48,7 +48,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${udpsink_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME UDPSinkPlugin ${udpsink_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME UDPSinkPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${udpsink_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channelrx/wdsprx/CMakeLists.txt b/plugins/channelrx/wdsprx/CMakeLists.txt
index 96c7f720e..b9fb85f71 100644
--- a/plugins/channelrx/wdsprx/CMakeLists.txt
+++ b/plugins/channelrx/wdsprx/CMakeLists.txt
@@ -75,7 +75,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${wdsprx_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME WDSPRxPlugin ${wdsprx_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME WDSPRxPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${wdsprx_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channeltx/filesource/CMakeLists.txt b/plugins/channeltx/filesource/CMakeLists.txt
index 2f20e06b3..1730e0cd9 100644
--- a/plugins/channeltx/filesource/CMakeLists.txt
+++ b/plugins/channeltx/filesource/CMakeLists.txt
@@ -49,7 +49,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${filesource_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME FileSourcePlugin ${filesource_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME FileSourcePlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${filesource_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channeltx/localsource/CMakeLists.txt b/plugins/channeltx/localsource/CMakeLists.txt
index e0b12cb88..1f7ea9362 100644
--- a/plugins/channeltx/localsource/CMakeLists.txt
+++ b/plugins/channeltx/localsource/CMakeLists.txt
@@ -51,7 +51,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${localsource_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME LocalSourcePlugin ${localsource_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME LocalSourcePlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${localsource_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channeltx/mod802.15.4/CMakeLists.txt b/plugins/channeltx/mod802.15.4/CMakeLists.txt
index 27d7c4f89..6c70bcd16 100644
--- a/plugins/channeltx/mod802.15.4/CMakeLists.txt
+++ b/plugins/channeltx/mod802.15.4/CMakeLists.txt
@@ -54,7 +54,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${mod_ieee_802_15_4_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME IEEE_802_15_4_ModPlugin ${mod_ieee_802_15_4_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME IEEE_802_15_4_ModPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${mod_ieee_802_15_4_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channeltx/modais/CMakeLists.txt b/plugins/channeltx/modais/CMakeLists.txt
index 8c6dba524..5a10c1391 100644
--- a/plugins/channeltx/modais/CMakeLists.txt
+++ b/plugins/channeltx/modais/CMakeLists.txt
@@ -52,7 +52,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${modais_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME AISModPlugin ${modais_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME AISModPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${modais_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channeltx/modam/CMakeLists.txt b/plugins/channeltx/modam/CMakeLists.txt
index 586f2f66b..3ea7b01f1 100644
--- a/plugins/channeltx/modam/CMakeLists.txt
+++ b/plugins/channeltx/modam/CMakeLists.txt
@@ -48,7 +48,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${modam_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME AMModPlugin ${modam_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME AMModPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${modam_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channeltx/modatv/CMakeLists.txt b/plugins/channeltx/modatv/CMakeLists.txt
index 97f07e3f6..16757456e 100644
--- a/plugins/channeltx/modatv/CMakeLists.txt
+++ b/plugins/channeltx/modatv/CMakeLists.txt
@@ -51,7 +51,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${modatv_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME ATVModPlugin ${modatv_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME ATVModPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${modatv_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channeltx/modchirpchat/CMakeLists.txt b/plugins/channeltx/modchirpchat/CMakeLists.txt
index 206d55052..3fae1436d 100644
--- a/plugins/channeltx/modchirpchat/CMakeLists.txt
+++ b/plugins/channeltx/modchirpchat/CMakeLists.txt
@@ -63,7 +63,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${modchirpchat_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME ChirpChatModPlugin ${modchirpchat_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME ChirpChatModPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${modchirpchat_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channeltx/moddatv/CMakeLists.txt b/plugins/channeltx/moddatv/CMakeLists.txt
index e26569906..bd8c6ffab 100644
--- a/plugins/channeltx/moddatv/CMakeLists.txt
+++ b/plugins/channeltx/moddatv/CMakeLists.txt
@@ -75,7 +75,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${moddatv_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME DATVModPlugin ${moddatv_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME DATVModPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${moddatv_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channeltx/modfreedv/CMakeLists.txt b/plugins/channeltx/modfreedv/CMakeLists.txt
index a29c70b32..d95661ec1 100644
--- a/plugins/channeltx/modfreedv/CMakeLists.txt
+++ b/plugins/channeltx/modfreedv/CMakeLists.txt
@@ -47,7 +47,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${modfreedv_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME FreeDVModPlugin ${modfreedv_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME FreeDVModPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${modfreedv_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channeltx/modm17/CMakeLists.txt b/plugins/channeltx/modm17/CMakeLists.txt
index 7642f645b..70b0ae111 100644
--- a/plugins/channeltx/modm17/CMakeLists.txt
+++ b/plugins/channeltx/modm17/CMakeLists.txt
@@ -57,7 +57,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${modm17_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME M17ModPlugin ${modm17_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME M17ModPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${modm17_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channeltx/modmeshtastic/CMakeLists.txt b/plugins/channeltx/modmeshtastic/CMakeLists.txt
index 5afb699cd..5c9d58352 100644
--- a/plugins/channeltx/modmeshtastic/CMakeLists.txt
+++ b/plugins/channeltx/modmeshtastic/CMakeLists.txt
@@ -52,7 +52,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${modmeshtastic_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME MeshtasticModPlugin ${modmeshtastic_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME MeshtasticModPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${modmeshtastic_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channeltx/modnfm/CMakeLists.txt b/plugins/channeltx/modnfm/CMakeLists.txt
index 7306dc787..fdd476069 100644
--- a/plugins/channeltx/modnfm/CMakeLists.txt
+++ b/plugins/channeltx/modnfm/CMakeLists.txt
@@ -50,7 +50,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${modnfm_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME NFMModPlugin ${modnfm_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME NFMModPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${modnfm_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channeltx/modpacket/CMakeLists.txt b/plugins/channeltx/modpacket/CMakeLists.txt
index 39bf380e9..0b1645293 100644
--- a/plugins/channeltx/modpacket/CMakeLists.txt
+++ b/plugins/channeltx/modpacket/CMakeLists.txt
@@ -55,7 +55,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${modpacket_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME PacketModPlugin ${modpacket_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME PacketModPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${modpacket_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channeltx/modpsk31/CMakeLists.txt b/plugins/channeltx/modpsk31/CMakeLists.txt
index 9bfc05db1..72ff0bad7 100644
--- a/plugins/channeltx/modpsk31/CMakeLists.txt
+++ b/plugins/channeltx/modpsk31/CMakeLists.txt
@@ -52,7 +52,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${modpsk31_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME PSK31Plugin ${modpsk31_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME PSK31Plugin)
+    target_sources(${TARGET_NAME} PRIVATE ${modpsk31_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channeltx/modrtty/CMakeLists.txt b/plugins/channeltx/modrtty/CMakeLists.txt
index 39ea41240..eba47dcdd 100644
--- a/plugins/channeltx/modrtty/CMakeLists.txt
+++ b/plugins/channeltx/modrtty/CMakeLists.txt
@@ -52,7 +52,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${modrtty_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME RttyModPlugin ${modrtty_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME RttyModPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${modrtty_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channeltx/modssb/CMakeLists.txt b/plugins/channeltx/modssb/CMakeLists.txt
index 067aa5f73..2314e23d1 100644
--- a/plugins/channeltx/modssb/CMakeLists.txt
+++ b/plugins/channeltx/modssb/CMakeLists.txt
@@ -48,7 +48,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${modssb_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME SSBModPlugin ${modssb_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME SSBModPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${modssb_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channeltx/modwfm/CMakeLists.txt b/plugins/channeltx/modwfm/CMakeLists.txt
index 22212ab61..bb05a37b3 100644
--- a/plugins/channeltx/modwfm/CMakeLists.txt
+++ b/plugins/channeltx/modwfm/CMakeLists.txt
@@ -48,7 +48,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${modwfm_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME WFMModPlugin ${modwfm_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME WFMModPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${modwfm_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/channeltx/remotesource/CMakeLists.txt b/plugins/channeltx/remotesource/CMakeLists.txt
index 8b3241ce1..a7e81b77d 100644
--- a/plugins/channeltx/remotesource/CMakeLists.txt
+++ b/plugins/channeltx/remotesource/CMakeLists.txt
@@ -52,7 +52,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${remotesource_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME RemoteSourcePlugin ${remotesource_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME RemoteSourcePlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${remotesource_SOURCES})
 endif()
 
 if(CM256CC_EXTERNAL)
diff --git a/plugins/channeltx/udpsource/CMakeLists.txt b/plugins/channeltx/udpsource/CMakeLists.txt
index 8491fbae2..fcbfb55cc 100644
--- a/plugins/channeltx/udpsource/CMakeLists.txt
+++ b/plugins/channeltx/udpsource/CMakeLists.txt
@@ -52,7 +52,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${udpsource_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME UDPSourcePlugin ${udpsource_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME UDPSourcePlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${udpsource_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/feature/afc/CMakeLists.txt b/plugins/feature/afc/CMakeLists.txt
index f9cf4630b..042cf4dbe 100644
--- a/plugins/feature/afc/CMakeLists.txt
+++ b/plugins/feature/afc/CMakeLists.txt
@@ -47,7 +47,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${afc_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME AFCPlugin ${afc_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME AFCPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${afc_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/feature/ais/CMakeLists.txt b/plugins/feature/ais/CMakeLists.txt
index b3f9d17b6..119d5a38d 100644
--- a/plugins/feature/ais/CMakeLists.txt
+++ b/plugins/feature/ais/CMakeLists.txt
@@ -44,7 +44,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${ais_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME AISPlugin ${ais_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME AISPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${ais_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/feature/ambe/CMakeLists.txt b/plugins/feature/ambe/CMakeLists.txt
index caded92b6..5672982f1 100644
--- a/plugins/feature/ambe/CMakeLists.txt
+++ b/plugins/feature/ambe/CMakeLists.txt
@@ -48,7 +48,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${ambe_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME AMBEPlugin ${ambe_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME AMBEPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${ambe_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/feature/antennatools/CMakeLists.txt b/plugins/feature/antennatools/CMakeLists.txt
index 117ad444f..de25cdd17 100644
--- a/plugins/feature/antennatools/CMakeLists.txt
+++ b/plugins/feature/antennatools/CMakeLists.txt
@@ -44,7 +44,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${antennatools_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME AntennaToolsPlugin ${antennatools_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME AntennaToolsPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${antennatools_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/feature/aprs/CMakeLists.txt b/plugins/feature/aprs/CMakeLists.txt
index e0d0663dd..ad08cbc1e 100644
--- a/plugins/feature/aprs/CMakeLists.txt
+++ b/plugins/feature/aprs/CMakeLists.txt
@@ -50,7 +50,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${aprs_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME APRSPlugin ${aprs_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME APRSPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${aprs_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/feature/demodanalyzer/CMakeLists.txt b/plugins/feature/demodanalyzer/CMakeLists.txt
index db25090d1..9bd7b7860 100644
--- a/plugins/feature/demodanalyzer/CMakeLists.txt
+++ b/plugins/feature/demodanalyzer/CMakeLists.txt
@@ -45,7 +45,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${demodanalyzer_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME DemodAnalyzerPlugin ${demodanalyzer_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME DemodAnalyzerPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${demodanalyzer_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/feature/denoiser/CMakeLists.txt b/plugins/feature/denoiser/CMakeLists.txt
index b0da23deb..e8cb69faa 100644
--- a/plugins/feature/denoiser/CMakeLists.txt
+++ b/plugins/feature/denoiser/CMakeLists.txt
@@ -46,7 +46,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${denoiser_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME DenoiserPlugin ${denoiser_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME DenoiserPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${denoiser_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/feature/freqdisplay/CMakeLists.txt b/plugins/feature/freqdisplay/CMakeLists.txt
index 70848fabb..918f9dff9 100644
--- a/plugins/feature/freqdisplay/CMakeLists.txt
+++ b/plugins/feature/freqdisplay/CMakeLists.txt
@@ -46,7 +46,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${freqdisplay_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME FreqDisplayPlugin ${freqdisplay_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME FreqDisplayPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${freqdisplay_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/feature/gs232controller/CMakeLists.txt b/plugins/feature/gs232controller/CMakeLists.txt
index 2c7992354..c3285c86e 100644
--- a/plugins/feature/gs232controller/CMakeLists.txt
+++ b/plugins/feature/gs232controller/CMakeLists.txt
@@ -77,7 +77,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${gs232controller_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME GS232ControllerPlugin ${gs232controller_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME GS232ControllerPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${gs232controller_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/feature/jogdialcontroller/CMakeLists.txt b/plugins/feature/jogdialcontroller/CMakeLists.txt
index 439d6f725..d5c6502d9 100644
--- a/plugins/feature/jogdialcontroller/CMakeLists.txt
+++ b/plugins/feature/jogdialcontroller/CMakeLists.txt
@@ -43,7 +43,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${jogdialcontroller_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME JogDialControllerPlugin ${jogdialcontroller_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME JogDialControllerPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${jogdialcontroller_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/feature/limerfe/CMakeLists.txt b/plugins/feature/limerfe/CMakeLists.txt
index f23c61f20..0b4b62143 100644
--- a/plugins/feature/limerfe/CMakeLists.txt
+++ b/plugins/feature/limerfe/CMakeLists.txt
@@ -46,7 +46,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${limerfe_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME LimeRFEPlugin ${limerfe_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME LimeRFEPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${limerfe_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/feature/map/CMakeLists.txt b/plugins/feature/map/CMakeLists.txt
index d93b6f2d0..8ac23d922 100644
--- a/plugins/feature/map/CMakeLists.txt
+++ b/plugins/feature/map/CMakeLists.txt
@@ -105,7 +105,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${map_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME MapPlugin ${map_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME MapPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${map_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/feature/morsedecoder/CMakeLists.txt b/plugins/feature/morsedecoder/CMakeLists.txt
index bf4325aca..f5eb3d340 100644
--- a/plugins/feature/morsedecoder/CMakeLists.txt
+++ b/plugins/feature/morsedecoder/CMakeLists.txt
@@ -46,7 +46,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${morsedecoder_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME MorseDecoderPlugin ${morsedecoder_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME MorseDecoderPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${morsedecoder_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/feature/pertester/CMakeLists.txt b/plugins/feature/pertester/CMakeLists.txt
index 8b19c052a..8f0d3bc11 100644
--- a/plugins/feature/pertester/CMakeLists.txt
+++ b/plugins/feature/pertester/CMakeLists.txt
@@ -46,7 +46,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${pertester_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME PERTesterPlugin ${pertester_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME PERTesterPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${pertester_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/feature/radiosonde/CMakeLists.txt b/plugins/feature/radiosonde/CMakeLists.txt
index f01d8223a..749b1fa53 100644
--- a/plugins/feature/radiosonde/CMakeLists.txt
+++ b/plugins/feature/radiosonde/CMakeLists.txt
@@ -47,7 +47,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${radiosonde_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME RadiosondePlugin ${radiosonde_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME RadiosondePlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${radiosonde_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/feature/remotecontrol/CMakeLists.txt b/plugins/feature/remotecontrol/CMakeLists.txt
index c5f5b017f..c89d5e50e 100644
--- a/plugins/feature/remotecontrol/CMakeLists.txt
+++ b/plugins/feature/remotecontrol/CMakeLists.txt
@@ -55,7 +55,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${remotecontrol_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME RemoteControlPlugin ${remotecontrol_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME RemoteControlPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${remotecontrol_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/feature/rigctlserver/CMakeLists.txt b/plugins/feature/rigctlserver/CMakeLists.txt
index efa72f3fa..8d125b0ce 100644
--- a/plugins/feature/rigctlserver/CMakeLists.txt
+++ b/plugins/feature/rigctlserver/CMakeLists.txt
@@ -45,7 +45,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${rigctlserver_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME RigCtlServerPlugin ${rigctlserver_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME RigCtlServerPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${rigctlserver_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/feature/satellitetracker/CMakeLists.txt b/plugins/feature/satellitetracker/CMakeLists.txt
index aeb81e92e..b130f8c9a 100644
--- a/plugins/feature/satellitetracker/CMakeLists.txt
+++ b/plugins/feature/satellitetracker/CMakeLists.txt
@@ -64,7 +64,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${satellitetracker_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME SatelliteTrackerPlugin ${satellitetracker_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME SatelliteTrackerPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${satellitetracker_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/feature/sid/CMakeLists.txt b/plugins/feature/sid/CMakeLists.txt
index 0de7854b7..f852a6698 100644
--- a/plugins/feature/sid/CMakeLists.txt
+++ b/plugins/feature/sid/CMakeLists.txt
@@ -52,7 +52,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${sid_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME SIDPlugin ${sid_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME SIDPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${sid_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/feature/simpleptt/CMakeLists.txt b/plugins/feature/simpleptt/CMakeLists.txt
index d638c3116..d9edf442e 100644
--- a/plugins/feature/simpleptt/CMakeLists.txt
+++ b/plugins/feature/simpleptt/CMakeLists.txt
@@ -54,7 +54,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${simpleptt_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME SimplePTTPlugin ${simpleptt_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME SimplePTTPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${simpleptt_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/feature/skymap/CMakeLists.txt b/plugins/feature/skymap/CMakeLists.txt
index d997842d8..87d431cf1 100644
--- a/plugins/feature/skymap/CMakeLists.txt
+++ b/plugins/feature/skymap/CMakeLists.txt
@@ -70,7 +70,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${skymap_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME SkyMapPlugin ${skymap_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME SkyMapPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${skymap_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/feature/startracker/CMakeLists.txt b/plugins/feature/startracker/CMakeLists.txt
index 58ed672e6..8c18a4bc5 100644
--- a/plugins/feature/startracker/CMakeLists.txt
+++ b/plugins/feature/startracker/CMakeLists.txt
@@ -64,7 +64,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${startracker_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME StarTrackerPlugin ${startracker_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME StarTrackerPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${startracker_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/feature/vorlocalizer/CMakeLists.txt b/plugins/feature/vorlocalizer/CMakeLists.txt
index 7a8221e62..a8eec9583 100644
--- a/plugins/feature/vorlocalizer/CMakeLists.txt
+++ b/plugins/feature/vorlocalizer/CMakeLists.txt
@@ -50,7 +50,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${vor_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME VORLocalizerPlugin ${vor_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME VORLocalizerPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${vor_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplemimo/audiocatsiso/CMakeLists.txt b/plugins/samplemimo/audiocatsiso/CMakeLists.txt
index a35c11e06..25ef0b073 100644
--- a/plugins/samplemimo/audiocatsiso/CMakeLists.txt
+++ b/plugins/samplemimo/audiocatsiso/CMakeLists.txt
@@ -55,7 +55,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${audiocatsiso_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME AudioCATSISOPlugin ${audiocatsiso_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME AudioCATSISOPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${audiocatsiso_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplemimo/bladerf2mimo/CMakeLists.txt b/plugins/samplemimo/bladerf2mimo/CMakeLists.txt
index 7d05a6539..498dff3a8 100644
--- a/plugins/samplemimo/bladerf2mimo/CMakeLists.txt
+++ b/plugins/samplemimo/bladerf2mimo/CMakeLists.txt
@@ -48,7 +48,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${bladerf2mimo_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME BladeRF2MIMOPlugin ${bladerf2mimo_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME BladeRF2MIMOPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${bladerf2mimo_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplemimo/limesdrmimo/CMakeLists.txt b/plugins/samplemimo/limesdrmimo/CMakeLists.txt
index 1dc17caed..005b4df1f 100644
--- a/plugins/samplemimo/limesdrmimo/CMakeLists.txt
+++ b/plugins/samplemimo/limesdrmimo/CMakeLists.txt
@@ -48,7 +48,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${limesdrmimo_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME LimeSDRMIMOPlugin ${limesdrmimo_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME LimeSDRMIMOPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${limesdrmimo_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplemimo/metismiso/CMakeLists.txt b/plugins/samplemimo/metismiso/CMakeLists.txt
index 12b425fd1..28c0ea40a 100644
--- a/plugins/samplemimo/metismiso/CMakeLists.txt
+++ b/plugins/samplemimo/metismiso/CMakeLists.txt
@@ -47,7 +47,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${metismiso_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME MetisMISOPlugin ${metismiso_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME MetisMISOPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${metismiso_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplemimo/plutosdrmimo/CMakeLists.txt b/plugins/samplemimo/plutosdrmimo/CMakeLists.txt
index 39d0bb728..0a1c30af1 100644
--- a/plugins/samplemimo/plutosdrmimo/CMakeLists.txt
+++ b/plugins/samplemimo/plutosdrmimo/CMakeLists.txt
@@ -48,7 +48,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${plutosdrmimo_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME PlutoSDRMIMOPlugin ${plutosdrmimo_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME PlutoSDRMIMOPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${plutosdrmimo_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplemimo/testmi/CMakeLists.txt b/plugins/samplemimo/testmi/CMakeLists.txt
index 27e5ec434..74afdcb56 100644
--- a/plugins/samplemimo/testmi/CMakeLists.txt
+++ b/plugins/samplemimo/testmi/CMakeLists.txt
@@ -44,7 +44,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${testmi_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME TestMIPlugin ${testmi_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME TestMIPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${testmi_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplemimo/testmosync/CMakeLists.txt b/plugins/samplemimo/testmosync/CMakeLists.txt
index 5bc8e79f9..fc0720f25 100644
--- a/plugins/samplemimo/testmosync/CMakeLists.txt
+++ b/plugins/samplemimo/testmosync/CMakeLists.txt
@@ -43,7 +43,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${testmosync_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME TestMOSyncPlugin ${testmosync_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME TestMOSyncPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${testmosync_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesink/aaroniartsaoutput/CMakeLists.txt b/plugins/samplesink/aaroniartsaoutput/CMakeLists.txt
index 0224a1251..e88b28924 100644
--- a/plugins/samplesink/aaroniartsaoutput/CMakeLists.txt
+++ b/plugins/samplesink/aaroniartsaoutput/CMakeLists.txt
@@ -45,7 +45,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${aaroniartsaoutput_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME AaroniaRTSAOutputPlugin ${aaroniartsaoutput_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME AaroniaRTSAOutputPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${aaroniartsaoutput_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesink/audiooutput/CMakeLists.txt b/plugins/samplesink/audiooutput/CMakeLists.txt
index 8c6753699..bd572d089 100644
--- a/plugins/samplesink/audiooutput/CMakeLists.txt
+++ b/plugins/samplesink/audiooutput/CMakeLists.txt
@@ -45,7 +45,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${audiooutput_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME AudioOutputPlugin ${audiooutput_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME AudioOutputPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${audiooutput_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesink/bladerf1output/CMakeLists.txt b/plugins/samplesink/bladerf1output/CMakeLists.txt
index 45ecf75b7..de010a2c9 100644
--- a/plugins/samplesink/bladerf1output/CMakeLists.txt
+++ b/plugins/samplesink/bladerf1output/CMakeLists.txt
@@ -48,7 +48,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${bladerf1output_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME Bladerf1OutputPlugin ${bladerf1output_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME Bladerf1OutputPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${bladerf1output_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesink/bladerf2output/CMakeLists.txt b/plugins/samplesink/bladerf2output/CMakeLists.txt
index dcac61b0f..55efeca43 100644
--- a/plugins/samplesink/bladerf2output/CMakeLists.txt
+++ b/plugins/samplesink/bladerf2output/CMakeLists.txt
@@ -48,7 +48,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${bladerf2output_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME BladeRF2OutputPlugin ${bladerf2output_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME BladeRF2OutputPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${bladerf2output_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesink/fileoutput/CMakeLists.txt b/plugins/samplesink/fileoutput/CMakeLists.txt
index e01c67429..7ffd91439 100644
--- a/plugins/samplesink/fileoutput/CMakeLists.txt
+++ b/plugins/samplesink/fileoutput/CMakeLists.txt
@@ -45,7 +45,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${fileoutput_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME FileOutputPlugin ${fileoutput_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME FileOutputPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${fileoutput_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesink/hackrfoutput/CMakeLists.txt b/plugins/samplesink/hackrfoutput/CMakeLists.txt
index 4009ff241..6f5e12b8d 100644
--- a/plugins/samplesink/hackrfoutput/CMakeLists.txt
+++ b/plugins/samplesink/hackrfoutput/CMakeLists.txt
@@ -48,7 +48,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${hackrfoutput_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME HackRFOutputPlugin ${hackrfoutput_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME HackRFOutputPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${hackrfoutput_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesink/limesdroutput/CMakeLists.txt b/plugins/samplesink/limesdroutput/CMakeLists.txt
index c7acd55c9..db918e880 100644
--- a/plugins/samplesink/limesdroutput/CMakeLists.txt
+++ b/plugins/samplesink/limesdroutput/CMakeLists.txt
@@ -48,7 +48,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${limesdroutput_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME LimeSDROutputPlugin ${limesdroutput_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME LimeSDROutputPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${limesdroutput_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesink/localoutput/CMakeLists.txt b/plugins/samplesink/localoutput/CMakeLists.txt
index 4d5909f11..5ae288208 100644
--- a/plugins/samplesink/localoutput/CMakeLists.txt
+++ b/plugins/samplesink/localoutput/CMakeLists.txt
@@ -44,7 +44,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${localoutput_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME LocalOutputPlugin ${localoutput_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME LocalOutputPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${localoutput_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesink/plutosdroutput/CMakeLists.txt b/plugins/samplesink/plutosdroutput/CMakeLists.txt
index c12a20134..1698b32db 100644
--- a/plugins/samplesink/plutosdroutput/CMakeLists.txt
+++ b/plugins/samplesink/plutosdroutput/CMakeLists.txt
@@ -48,7 +48,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${plutosdroutput_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME PlutoSDROutputPlugin ${plutosdroutput_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME PlutoSDROutputPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${plutosdroutput_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesink/remoteoutput/CMakeLists.txt b/plugins/samplesink/remoteoutput/CMakeLists.txt
index e67206ba1..afeb60a26 100644
--- a/plugins/samplesink/remoteoutput/CMakeLists.txt
+++ b/plugins/samplesink/remoteoutput/CMakeLists.txt
@@ -53,7 +53,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${remoteoutput_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME RemoteOutputPlugin ${remoteoutput_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME RemoteOutputPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${remoteoutput_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesink/soapysdroutput/CMakeLists.txt b/plugins/samplesink/soapysdroutput/CMakeLists.txt
index 93825f412..e7cc2426b 100644
--- a/plugins/samplesink/soapysdroutput/CMakeLists.txt
+++ b/plugins/samplesink/soapysdroutput/CMakeLists.txt
@@ -48,7 +48,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${soapysdroutput_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME SoapySDROutputPlugin ${soapysdroutput_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME SoapySDROutputPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${soapysdroutput_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesink/testsink/CMakeLists.txt b/plugins/samplesink/testsink/CMakeLists.txt
index bed6fe14f..8c42fd3fc 100644
--- a/plugins/samplesink/testsink/CMakeLists.txt
+++ b/plugins/samplesink/testsink/CMakeLists.txt
@@ -43,7 +43,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${testsink_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME TestSinkPlugin ${testsink_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME TestSinkPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${testsink_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesink/usrpoutput/CMakeLists.txt b/plugins/samplesink/usrpoutput/CMakeLists.txt
index a25ed4f78..7208d41f5 100644
--- a/plugins/samplesink/usrpoutput/CMakeLists.txt
+++ b/plugins/samplesink/usrpoutput/CMakeLists.txt
@@ -48,7 +48,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${usrpoutput_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME USRPOutputPlugin ${usrpoutput_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME USRPOutputPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${usrpoutput_SOURCES})
 endif()
 if(UHD_EXTERNAL)
     add_dependencies(${TARGET_NAME} uhd)
diff --git a/plugins/samplesink/xtrxoutput/CMakeLists.txt b/plugins/samplesink/xtrxoutput/CMakeLists.txt
index 286ae77a8..5a52c7763 100644
--- a/plugins/samplesink/xtrxoutput/CMakeLists.txt
+++ b/plugins/samplesink/xtrxoutput/CMakeLists.txt
@@ -47,7 +47,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${xtrxoutput_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME XTRXOutputPlugin ${xtrxoutput_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME XTRXOutputPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${xtrxoutput_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesource/aaroniartsainput/CMakeLists.txt b/plugins/samplesource/aaroniartsainput/CMakeLists.txt
index 8a5600a6f..a138c2650 100644
--- a/plugins/samplesource/aaroniartsainput/CMakeLists.txt
+++ b/plugins/samplesource/aaroniartsainput/CMakeLists.txt
@@ -46,7 +46,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${aaroniartsainput_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME AaroniaRTSAInputPlugin ${aaroniartsainput_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME AaroniaRTSAInputPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${aaroniartsainput_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesource/airspy/CMakeLists.txt b/plugins/samplesource/airspy/CMakeLists.txt
index e3c1c6369..e991ee95e 100644
--- a/plugins/samplesource/airspy/CMakeLists.txt
+++ b/plugins/samplesource/airspy/CMakeLists.txt
@@ -46,7 +46,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${airspy_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME AirspyPlugin ${airspy_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME AirspyPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${airspy_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesource/airspyhf/CMakeLists.txt b/plugins/samplesource/airspyhf/CMakeLists.txt
index a6ba3c465..3370c925f 100644
--- a/plugins/samplesource/airspyhf/CMakeLists.txt
+++ b/plugins/samplesource/airspyhf/CMakeLists.txt
@@ -47,7 +47,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${airspyhf_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME AirspyHFPlugin ${airspyhf_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME AirspyHFPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${airspyhf_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesource/androidsdrdriverinput/CMakeLists.txt b/plugins/samplesource/androidsdrdriverinput/CMakeLists.txt
index 39568148a..cb3ec6266 100644
--- a/plugins/samplesource/androidsdrdriverinput/CMakeLists.txt
+++ b/plugins/samplesource/androidsdrdriverinput/CMakeLists.txt
@@ -45,7 +45,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${androidsdrdriverinput_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME AndroidSDRDriverInputPlugin ${androidsdrdriverinput_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME AndroidSDRDriverInputPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${androidsdrdriverinput_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesource/audioinput/CMakeLists.txt b/plugins/samplesource/audioinput/CMakeLists.txt
index 742e10e58..0abce1a9f 100644
--- a/plugins/samplesource/audioinput/CMakeLists.txt
+++ b/plugins/samplesource/audioinput/CMakeLists.txt
@@ -45,7 +45,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${audioinput_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME AudioInputPlugin ${audioinput_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME AudioInputPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${audioinput_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesource/bladerf1input/CMakeLists.txt b/plugins/samplesource/bladerf1input/CMakeLists.txt
index 30ecdcd37..9c409c6b2 100644
--- a/plugins/samplesource/bladerf1input/CMakeLists.txt
+++ b/plugins/samplesource/bladerf1input/CMakeLists.txt
@@ -47,7 +47,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${bladerf1input_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME Blderf1InputPlugin ${bladerf1input_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME Blderf1InputPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${bladerf1input_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesource/bladerf2input/CMakeLists.txt b/plugins/samplesource/bladerf2input/CMakeLists.txt
index 08edd62b4..aeb6e73c2 100644
--- a/plugins/samplesource/bladerf2input/CMakeLists.txt
+++ b/plugins/samplesource/bladerf2input/CMakeLists.txt
@@ -48,7 +48,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${bladerf2input_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME Blderf2InputPlugin ${bladerf2input_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME Blderf2InputPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${bladerf2input_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesource/fcdpro/CMakeLists.txt b/plugins/samplesource/fcdpro/CMakeLists.txt
index dea327b72..d32970395 100644
--- a/plugins/samplesource/fcdpro/CMakeLists.txt
+++ b/plugins/samplesource/fcdpro/CMakeLists.txt
@@ -48,7 +48,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${fcdpro_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME FCDProPlugin ${fcdpro_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME FCDProPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${fcdpro_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesource/fcdproplus/CMakeLists.txt b/plugins/samplesource/fcdproplus/CMakeLists.txt
index a0714cd4e..d4766c1d0 100644
--- a/plugins/samplesource/fcdproplus/CMakeLists.txt
+++ b/plugins/samplesource/fcdproplus/CMakeLists.txt
@@ -48,7 +48,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${fcdproplus_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME FCDProPlusPlugin ${fcdproplus_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME FCDProPlusPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${fcdproplus_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesource/fileinput/CMakeLists.txt b/plugins/samplesource/fileinput/CMakeLists.txt
index 1270f7c3e..0b26f6766 100644
--- a/plugins/samplesource/fileinput/CMakeLists.txt
+++ b/plugins/samplesource/fileinput/CMakeLists.txt
@@ -44,7 +44,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${fileinput_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME FileInputPlugin ${fileinput_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME FileInputPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${fileinput_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesource/hackrfinput/CMakeLists.txt b/plugins/samplesource/hackrfinput/CMakeLists.txt
index d9151d0d1..3cc9a0656 100644
--- a/plugins/samplesource/hackrfinput/CMakeLists.txt
+++ b/plugins/samplesource/hackrfinput/CMakeLists.txt
@@ -48,7 +48,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${hackrfinput_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME HackRFInputPlugin ${hackrfinput_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME HackRFInputPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${hackrfinput_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesource/kiwisdr/CMakeLists.txt b/plugins/samplesource/kiwisdr/CMakeLists.txt
index 8e3df693a..3b633204c 100644
--- a/plugins/samplesource/kiwisdr/CMakeLists.txt
+++ b/plugins/samplesource/kiwisdr/CMakeLists.txt
@@ -46,7 +46,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${kiwisdr_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME KiwiSDRPlugin ${kiwisdr_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME KiwiSDRPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${kiwisdr_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesource/limesdrinput/CMakeLists.txt b/plugins/samplesource/limesdrinput/CMakeLists.txt
index 59df717d5..af7ec5079 100644
--- a/plugins/samplesource/limesdrinput/CMakeLists.txt
+++ b/plugins/samplesource/limesdrinput/CMakeLists.txt
@@ -48,7 +48,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${limesdrinput_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME LimeSDRInputPlugin ${limesdrinput_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME LimeSDRInputPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${limesdrinput_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesource/localinput/CMakeLists.txt b/plugins/samplesource/localinput/CMakeLists.txt
index 1fb017e6a..d4d03384a 100644
--- a/plugins/samplesource/localinput/CMakeLists.txt
+++ b/plugins/samplesource/localinput/CMakeLists.txt
@@ -45,7 +45,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${localinput_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME LocalInputPlugin ${localinput_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME LocalInputPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${localinput_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesource/perseus/CMakeLists.txt b/plugins/samplesource/perseus/CMakeLists.txt
index ebc672828..6311c507e 100644
--- a/plugins/samplesource/perseus/CMakeLists.txt
+++ b/plugins/samplesource/perseus/CMakeLists.txt
@@ -49,7 +49,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${perseus_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME PerseusPlugin ${perseus_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME PerseusPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${perseus_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesource/plutosdrinput/CMakeLists.txt b/plugins/samplesource/plutosdrinput/CMakeLists.txt
index 9cec34d87..9a092ca7d 100644
--- a/plugins/samplesource/plutosdrinput/CMakeLists.txt
+++ b/plugins/samplesource/plutosdrinput/CMakeLists.txt
@@ -48,7 +48,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${plutosdrinput_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME PlutoSDRInputPlugin ${plutosdrinput_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME PlutoSDRInputPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${plutosdrinput_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesource/remoteinput/CMakeLists.txt b/plugins/samplesource/remoteinput/CMakeLists.txt
index e0f875787..09a93c821 100644
--- a/plugins/samplesource/remoteinput/CMakeLists.txt
+++ b/plugins/samplesource/remoteinput/CMakeLists.txt
@@ -49,7 +49,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${remoteinput_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME RemoteInputPlugin ${remoteinput_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME RemoteInputPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${remoteinput_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesource/remotetcpinput/CMakeLists.txt b/plugins/samplesource/remotetcpinput/CMakeLists.txt
index 9dc957feb..ee9d0f5c7 100644
--- a/plugins/samplesource/remotetcpinput/CMakeLists.txt
+++ b/plugins/samplesource/remotetcpinput/CMakeLists.txt
@@ -48,7 +48,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${remotetcpinput_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME RemoteTCPInputPlugin ${remotetcpinput_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME RemoteTCPInputPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${remotetcpinput_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesource/rtlsdr/CMakeLists.txt b/plugins/samplesource/rtlsdr/CMakeLists.txt
index dd8b4a6ed..f53f06024 100644
--- a/plugins/samplesource/rtlsdr/CMakeLists.txt
+++ b/plugins/samplesource/rtlsdr/CMakeLists.txt
@@ -46,7 +46,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${rtlsdr_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME RTLSDRPlugin ${rtlsdr_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME RTLSDRPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${rtlsdr_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesource/sdrplay/CMakeLists.txt b/plugins/samplesource/sdrplay/CMakeLists.txt
index 37a722a8d..2ece0d527 100644
--- a/plugins/samplesource/sdrplay/CMakeLists.txt
+++ b/plugins/samplesource/sdrplay/CMakeLists.txt
@@ -47,7 +47,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${sdrplay_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME SDRPlayPlugin ${sdrplay_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME SDRPlayPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${sdrplay_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesource/sdrplayv3/CMakeLists.txt b/plugins/samplesource/sdrplayv3/CMakeLists.txt
index 855c2a15f..fea01c4f7 100644
--- a/plugins/samplesource/sdrplayv3/CMakeLists.txt
+++ b/plugins/samplesource/sdrplayv3/CMakeLists.txt
@@ -46,7 +46,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${sdrplayv3_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME SDRPlayV3Plugin ${sdrplayv3_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME SDRPlayV3Plugin)
+    target_sources(${TARGET_NAME} PRIVATE ${sdrplayv3_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesource/sigmffileinput/CMakeLists.txt b/plugins/samplesource/sigmffileinput/CMakeLists.txt
index e2d278611..8928d5ca9 100644
--- a/plugins/samplesource/sigmffileinput/CMakeLists.txt
+++ b/plugins/samplesource/sigmffileinput/CMakeLists.txt
@@ -49,7 +49,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${sigmffileinput_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME SigMFFileInputPlugin ${sigmffileinput_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME SigMFFileInputPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${sigmffileinput_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesource/soapysdrinput/CMakeLists.txt b/plugins/samplesource/soapysdrinput/CMakeLists.txt
index df0ded896..eaff447d5 100644
--- a/plugins/samplesource/soapysdrinput/CMakeLists.txt
+++ b/plugins/samplesource/soapysdrinput/CMakeLists.txt
@@ -48,7 +48,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${soapysdrinput_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME SoapySDRInputPlugin ${soapysdrinput_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME SoapySDRInputPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${soapysdrinput_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesource/testsource/CMakeLists.txt b/plugins/samplesource/testsource/CMakeLists.txt
index b62a8b804..1d25d57a5 100644
--- a/plugins/samplesource/testsource/CMakeLists.txt
+++ b/plugins/samplesource/testsource/CMakeLists.txt
@@ -46,7 +46,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${testsource_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME TestSourcePlugin ${testsource_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME TestSourcePlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${testsource_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesource/usrpinput/CMakeLists.txt b/plugins/samplesource/usrpinput/CMakeLists.txt
index eefab7e39..982bea462 100644
--- a/plugins/samplesource/usrpinput/CMakeLists.txt
+++ b/plugins/samplesource/usrpinput/CMakeLists.txt
@@ -48,7 +48,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${usrpinput_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME USRPInputPlugin ${usrpinput_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME USRPInputPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${usrpinput_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
diff --git a/plugins/samplesource/xtrxinput/CMakeLists.txt b/plugins/samplesource/xtrxinput/CMakeLists.txt
index e3146d3ce..5958e79f0 100644
--- a/plugins/samplesource/xtrxinput/CMakeLists.txt
+++ b/plugins/samplesource/xtrxinput/CMakeLists.txt
@@ -48,7 +48,8 @@ endif()
 if(NOT Qt6_FOUND)
     add_library(${TARGET_NAME} ${xtrxinput_SOURCES})
 else()
-    qt_add_plugin(${TARGET_NAME} CLASS_NAME XTRXInputPlugin ${xtrxinput_SOURCES})
+    qt_add_plugin(${TARGET_NAME} CLASS_NAME XTRXInputPlugin)
+    target_sources(${TARGET_NAME} PRIVATE ${xtrxinput_SOURCES})
 endif()
 
 if(NOT BUILD_SHARED_LIBS)