summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniele Forsi <iu5hkx@gmail.com>2024-04-08 22:40:24 +0200
committerDaniele Forsi <iu5hkx@gmail.com>2024-04-11 23:31:34 +0200
commit8c3f7e3775921d0149cec30180667b1b0b725a0c (patch)
tree927b1b9f04c15a67fbde14a204cbbe56d89c95df
parent13222cac8d1deb0cc8097db84d8dc87392562a4e (diff)
Remove unused includes and use more direct includes
-rw-r--r--devices/plutosdr/deviceplutosdrbox.cpp1
-rw-r--r--plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.cpp1
-rw-r--r--plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodbaseband.cpp1
-rw-r--r--plugins/channelmimo/doa2/doa2.cpp1
-rw-r--r--plugins/channelmimo/doa2/doa2baseband.cpp2
-rw-r--r--plugins/channelmimo/doa2/doa2gui.cpp1
-rw-r--r--plugins/channelmimo/doa2/doa2settings.cpp1
-rw-r--r--plugins/channelmimo/interferometer/interferometer.cpp1
-rw-r--r--plugins/channelmimo/interferometer/interferometerbaseband.cpp1
-rw-r--r--plugins/channelmimo/interferometer/interferometersettings.cpp1
-rw-r--r--plugins/channelrx/chanalyzer/chanalyzerbaseband.cpp1
-rw-r--r--plugins/channelrx/chanalyzer/chanalyzergui.cpp1
-rw-r--r--plugins/channelrx/chanalyzer/chanalyzersettings.cpp1
-rw-r--r--plugins/channelrx/channelpower/channelpower.cpp3
-rw-r--r--plugins/channelrx/channelpower/channelpowerbaseband.cpp1
-rw-r--r--plugins/channelrx/channelpower/channelpowergui.cpp2
-rw-r--r--plugins/channelrx/channelpower/channelpowersettings.cpp1
-rw-r--r--plugins/channelrx/demodadsb/adsbdemod.cpp1
-rw-r--r--plugins/channelrx/demodadsb/adsbdemodgui.cpp3
-rw-r--r--plugins/channelrx/demodadsb/adsbdemodsettings.cpp2
-rw-r--r--plugins/channelrx/demodadsb/adsbdemodsinkworker.cpp4
-rw-r--r--plugins/channelrx/demodais/aisdemod.cpp4
-rw-r--r--plugins/channelrx/demodais/aisdemodbaseband.cpp1
-rw-r--r--plugins/channelrx/demodais/aisdemodgui.cpp6
-rw-r--r--plugins/channelrx/demodais/aisdemodsettings.cpp1
-rw-r--r--plugins/channelrx/demodais/aisdemodsink.cpp3
-rw-r--r--plugins/channelrx/demodam/amdemod.cpp3
-rw-r--r--plugins/channelrx/demodam/amdemodgui.cpp2
-rw-r--r--plugins/channelrx/demodam/amdemodsettings.cpp3
-rw-r--r--plugins/channelrx/demodam/amdemodsink.cpp1
-rw-r--r--plugins/channelrx/demodapt/aptdemod.cpp6
-rw-r--r--plugins/channelrx/demodapt/aptdemodbaseband.cpp1
-rw-r--r--plugins/channelrx/demodapt/aptdemodgui.cpp7
-rw-r--r--plugins/channelrx/demodapt/aptdemodsettings.cpp1
-rw-r--r--plugins/channelrx/demodapt/aptdemodsink.cpp6
-rw-r--r--plugins/channelrx/demodatv/atvdemod.cpp1
-rw-r--r--plugins/channelrx/demodatv/atvdemodbaseband.cpp1
-rw-r--r--plugins/channelrx/demodatv/atvdemodgui.cpp1
-rw-r--r--plugins/channelrx/demodatv/atvdemodsettings.cpp1
-rw-r--r--plugins/channelrx/demodbfm/bfmdemod.cpp2
-rw-r--r--plugins/channelrx/demodbfm/bfmdemodgui.cpp2
-rw-r--r--plugins/channelrx/demodbfm/bfmdemodsettings.cpp2
-rw-r--r--plugins/channelrx/demodbfm/bfmdemodsink.cpp6
-rw-r--r--plugins/channelrx/demodchirpchat/chirpchatdemod.cpp1
-rw-r--r--plugins/channelrx/demodchirpchat/chirpchatdemodbaseband.cpp1
-rw-r--r--plugins/channelrx/demodchirpchat/chirpchatdemodgui.cpp2
-rw-r--r--plugins/channelrx/demodchirpchat/chirpchatdemodsettings.cpp1
-rw-r--r--plugins/channelrx/demoddab/dabdemod.cpp5
-rw-r--r--plugins/channelrx/demoddab/dabdemodgui.cpp2
-rw-r--r--plugins/channelrx/demoddab/dabdemodsettings.cpp2
-rw-r--r--plugins/channelrx/demoddab/dabdemodsink.cpp2
-rw-r--r--plugins/channelrx/demoddatv/datvdemodgui.cpp4
-rw-r--r--plugins/channelrx/demoddatv/datvdemodsettings.cpp2
-rw-r--r--plugins/channelrx/demoddatv/datvdemodsink.cpp4
-rw-r--r--plugins/channelrx/demoddsc/dscdemod.cpp3
-rw-r--r--plugins/channelrx/demoddsc/dscdemodbaseband.cpp1
-rw-r--r--plugins/channelrx/demoddsc/dscdemodgui.cpp4
-rw-r--r--plugins/channelrx/demoddsc/dscdemodsettings.cpp1
-rw-r--r--plugins/channelrx/demoddsc/dscdemodsink.cpp3
-rw-r--r--plugins/channelrx/demoddsd/dsddecoder.cpp2
-rw-r--r--plugins/channelrx/demoddsd/dsddemod.cpp2
-rw-r--r--plugins/channelrx/demoddsd/dsddemodgui.cpp2
-rw-r--r--plugins/channelrx/demoddsd/dsddemodsettings.cpp2
-rw-r--r--plugins/channelrx/demoddsd/dsddemodsink.cpp9
-rw-r--r--plugins/channelrx/demodendoftrain/endoftraindemod.cpp1
-rw-r--r--plugins/channelrx/demodendoftrain/endoftraindemodbaseband.cpp1
-rw-r--r--plugins/channelrx/demodendoftrain/endoftraindemodgui.cpp6
-rw-r--r--plugins/channelrx/demodendoftrain/endoftraindemodsink.cpp2
-rw-r--r--plugins/channelrx/demodfreedv/freedvdemod.cpp2
-rw-r--r--plugins/channelrx/demodfreedv/freedvdemodgui.cpp2
-rw-r--r--plugins/channelrx/demodfreedv/freedvdemodsettings.cpp2
-rw-r--r--plugins/channelrx/demodfreedv/freedvdemodsink.cpp1
-rw-r--r--plugins/channelrx/demodft8/ft8demod.cpp2
-rw-r--r--plugins/channelrx/demodft8/ft8demodbaseband.cpp1
-rw-r--r--plugins/channelrx/demodft8/ft8demodgui.cpp3
-rw-r--r--plugins/channelrx/demodft8/ft8demodsettings.cpp1
-rw-r--r--plugins/channelrx/demodft8/ft8demodsink.cpp6
-rw-r--r--plugins/channelrx/demodils/ilsdemod.cpp3
-rw-r--r--plugins/channelrx/demodils/ilsdemodgui.cpp5
-rw-r--r--plugins/channelrx/demodils/ilsdemodsettings.cpp2
-rw-r--r--plugins/channelrx/demodils/ilsdemodsink.cpp3
-rw-r--r--plugins/channelrx/demodm17/m17demod.cpp3
-rw-r--r--plugins/channelrx/demodm17/m17demodgui.cpp3
-rw-r--r--plugins/channelrx/demodm17/m17demodsettings.cpp2
-rw-r--r--plugins/channelrx/demodm17/m17demodsink.cpp10
-rw-r--r--plugins/channelrx/demodnavtex/navtexdemod.cpp3
-rw-r--r--plugins/channelrx/demodnavtex/navtexdemodbaseband.cpp1
-rw-r--r--plugins/channelrx/demodnavtex/navtexdemodgui.cpp7
-rw-r--r--plugins/channelrx/demodnavtex/navtexdemodsettings.cpp1
-rw-r--r--plugins/channelrx/demodnavtex/navtexdemodsink.cpp2
-rw-r--r--plugins/channelrx/demodnfm/nfmdemod.cpp2
-rw-r--r--plugins/channelrx/demodnfm/nfmdemodgui.cpp2
-rw-r--r--plugins/channelrx/demodnfm/nfmdemodsink.cpp7
-rw-r--r--plugins/channelrx/demodpacket/packetdemod.cpp3
-rw-r--r--plugins/channelrx/demodpacket/packetdemodbaseband.cpp1
-rw-r--r--plugins/channelrx/demodpacket/packetdemodgui.cpp6
-rw-r--r--plugins/channelrx/demodpacket/packetdemodsettings.cpp1
-rw-r--r--plugins/channelrx/demodpacket/packetdemodsink.cpp3
-rw-r--r--plugins/channelrx/demodpager/pagerdemod.cpp2
-rw-r--r--plugins/channelrx/demodpager/pagerdemodbaseband.cpp1
-rw-r--r--plugins/channelrx/demodpager/pagerdemodgui.cpp4
-rw-r--r--plugins/channelrx/demodpager/pagerdemodsettings.cpp1
-rw-r--r--plugins/channelrx/demodpager/pagerdemodsink.cpp2
-rw-r--r--plugins/channelrx/demodradiosonde/radiosondedemod.cpp4
-rw-r--r--plugins/channelrx/demodradiosonde/radiosondedemodbaseband.cpp1
-rw-r--r--plugins/channelrx/demodradiosonde/radiosondedemodgui.cpp5
-rw-r--r--plugins/channelrx/demodradiosonde/radiosondedemodsettings.cpp1
-rw-r--r--plugins/channelrx/demodradiosonde/radiosondedemodsink.cpp3
-rw-r--r--plugins/channelrx/demodrtty/rttydemod.cpp3
-rw-r--r--plugins/channelrx/demodrtty/rttydemodbaseband.cpp1
-rw-r--r--plugins/channelrx/demodrtty/rttydemodgui.cpp7
-rw-r--r--plugins/channelrx/demodrtty/rttydemodsettings.cpp1
-rw-r--r--plugins/channelrx/demodrtty/rttydemodsink.cpp1
-rw-r--r--plugins/channelrx/demodssb/ssbdemod.cpp2
-rw-r--r--plugins/channelrx/demodssb/ssbdemodgui.cpp2
-rw-r--r--plugins/channelrx/demodssb/ssbdemodsettings.cpp2
-rw-r--r--plugins/channelrx/demodssb/ssbdemodsink.cpp5
-rw-r--r--plugins/channelrx/demodvor/vordemod.cpp2
-rw-r--r--plugins/channelrx/demodvor/vordemodbaseband.cpp1
-rw-r--r--plugins/channelrx/demodvor/vordemodgui.cpp4
-rw-r--r--plugins/channelrx/demodvor/vordemodsettings.cpp2
-rw-r--r--plugins/channelrx/demodvor/vordemodsink.cpp3
-rw-r--r--plugins/channelrx/demodvormc/vordemodmc.cpp2
-rw-r--r--plugins/channelrx/demodvormc/vordemodmcgui.cpp4
-rw-r--r--plugins/channelrx/demodvormc/vordemodmcsettings.cpp1
-rw-r--r--plugins/channelrx/demodvormc/vordemodmcsink.cpp2
-rw-r--r--plugins/channelrx/demodwfm/wfmdemod.cpp3
-rw-r--r--plugins/channelrx/demodwfm/wfmdemodgui.cpp2
-rw-r--r--plugins/channelrx/demodwfm/wfmdemodsettings.cpp2
-rw-r--r--plugins/channelrx/demodwfm/wfmdemodsink.cpp5
-rw-r--r--plugins/channelrx/filesink/filesink.cpp2
-rw-r--r--plugins/channelrx/filesink/filesinkbaseband.cpp1
-rw-r--r--plugins/channelrx/filesink/filesinkgui.cpp3
-rw-r--r--plugins/channelrx/freqscanner/freqscanner.cpp2
-rw-r--r--plugins/channelrx/freqscanner/freqscannerbaseband.cpp1
-rw-r--r--plugins/channelrx/freqscanner/freqscannergui.cpp4
-rw-r--r--plugins/channelrx/freqtracker/freqtracker.cpp4
-rw-r--r--plugins/channelrx/freqtracker/freqtrackerbaseband.cpp2
-rw-r--r--plugins/channelrx/freqtracker/freqtrackergui.cpp3
-rw-r--r--plugins/channelrx/freqtracker/freqtrackersettings.cpp1
-rw-r--r--plugins/channelrx/freqtracker/freqtrackersink.cpp2
-rw-r--r--plugins/channelrx/heatmap/heatmap.cpp5
-rw-r--r--plugins/channelrx/heatmap/heatmapbaseband.cpp1
-rw-r--r--plugins/channelrx/heatmap/heatmapgui.cpp7
-rw-r--r--plugins/channelrx/heatmap/heatmapsettings.cpp1
-rw-r--r--plugins/channelrx/heatmap/heatmapsink.cpp5
-rw-r--r--plugins/channelrx/localsink/localsink.cpp1
-rw-r--r--plugins/channelrx/localsink/localsinkbaseband.cpp1
-rw-r--r--plugins/channelrx/localsink/localsinkgui.cpp1
-rw-r--r--plugins/channelrx/localsink/localsinksink.cpp1
-rw-r--r--plugins/channelrx/noisefigure/noisefigure.cpp5
-rw-r--r--plugins/channelrx/noisefigure/noisefigurebaseband.cpp1
-rw-r--r--plugins/channelrx/noisefigure/noisefiguregui.cpp4
-rw-r--r--plugins/channelrx/noisefigure/noisefiguresettings.cpp1
-rw-r--r--plugins/channelrx/radioastronomy/radioastronomy.cpp5
-rw-r--r--plugins/channelrx/radioastronomy/radioastronomybaseband.cpp1
-rw-r--r--plugins/channelrx/radioastronomy/radioastronomygui.cpp7
-rw-r--r--plugins/channelrx/radioastronomy/radioastronomysettings.cpp1
-rw-r--r--plugins/channelrx/radioclock/radioclock.cpp4
-rw-r--r--plugins/channelrx/radioclock/radioclockbaseband.cpp1
-rw-r--r--plugins/channelrx/radioclock/radioclockgui.cpp5
-rw-r--r--plugins/channelrx/radioclock/radioclocksettings.cpp1
-rw-r--r--plugins/channelrx/radioclock/radioclocksink.cpp2
-rw-r--r--plugins/channelrx/remotesink/remotesink.cpp2
-rw-r--r--plugins/channelrx/remotesink/remotesinkbaseband.cpp1
-rw-r--r--plugins/channelrx/remotesink/remotesinkgui.cpp2
-rw-r--r--plugins/channelrx/remotetcpsink/remotetcpsink.cpp3
-rw-r--r--plugins/channelrx/remotetcpsink/remotetcpsinkbaseband.cpp1
-rw-r--r--plugins/channelrx/remotetcpsink/remotetcpsinkgui.cpp3
-rw-r--r--plugins/channelrx/remotetcpsink/remotetcpsinksink.cpp3
-rw-r--r--plugins/channelrx/sigmffilesink/sigmffilesink.cpp2
-rw-r--r--plugins/channelrx/sigmffilesink/sigmffilesinkbaseband.cpp1
-rw-r--r--plugins/channelrx/sigmffilesink/sigmffilesinkgui.cpp3
-rw-r--r--plugins/channelrx/udpsink/udpsink.cpp2
-rw-r--r--plugins/channelrx/udpsink/udpsinkgui.cpp2
-rw-r--r--plugins/channelrx/udpsink/udpsinksettings.cpp1
-rw-r--r--plugins/channelrx/udpsink/udpsinksink.cpp9
-rw-r--r--plugins/channeltx/filesource/filesource.cpp3
-rw-r--r--plugins/channeltx/filesource/filesourcebaseband.cpp1
-rw-r--r--plugins/channeltx/filesource/filesourcegui.cpp3
-rw-r--r--plugins/channeltx/filesource/filesourcesource.cpp3
-rw-r--r--plugins/channeltx/localsource/localsource.cpp1
-rw-r--r--plugins/channeltx/localsource/localsourcegui.cpp2
-rw-r--r--plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp3
-rw-r--r--plugins/channeltx/mod802.15.4/ieee_802_15_4_modbaseband.cpp1
-rw-r--r--plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.cpp2
-rw-r--r--plugins/channeltx/mod802.15.4/ieee_802_15_4_modsettings.cpp1
-rw-r--r--plugins/channeltx/modais/aismod.cpp2
-rw-r--r--plugins/channeltx/modais/aismodbaseband.cpp1
-rw-r--r--plugins/channeltx/modais/aismodgui.cpp3
-rw-r--r--plugins/channeltx/modais/aismodsettings.cpp1
-rw-r--r--plugins/channeltx/modam/ammod.cpp2
-rw-r--r--plugins/channeltx/modam/ammodgui.cpp2
-rw-r--r--plugins/channeltx/modam/ammodsettings.cpp2
-rw-r--r--plugins/channeltx/modatv/atvmod.cpp2
-rw-r--r--plugins/channeltx/modatv/atvmodbaseband.cpp1
-rw-r--r--plugins/channeltx/modatv/atvmodgui.cpp2
-rw-r--r--plugins/channeltx/modatv/atvmodsettings.cpp1
-rw-r--r--plugins/channeltx/modatv/atvmodsource.cpp3
-rw-r--r--plugins/channeltx/modchirpchat/chirpchatmod.cpp2
-rw-r--r--plugins/channeltx/modchirpchat/chirpchatmodbaseband.cpp1
-rw-r--r--plugins/channeltx/modchirpchat/chirpchatmodgui.cpp3
-rw-r--r--plugins/channeltx/modchirpchat/chirpchatmodsettings.cpp1
-rw-r--r--plugins/channeltx/moddatv/datvmod.cpp2
-rw-r--r--plugins/channeltx/moddatv/datvmodbaseband.cpp1
-rw-r--r--plugins/channeltx/moddatv/datvmodgui.cpp2
-rw-r--r--plugins/channeltx/moddatv/datvmodsettings.cpp1
-rw-r--r--plugins/channeltx/moddatv/datvmodsource.cpp3
-rw-r--r--plugins/channeltx/moddatv/dvb-s2/DVB2.cpp1
-rw-r--r--plugins/channeltx/moddatv/dvb-s2/dvb2_bbheader.cpp1
-rw-r--r--plugins/channeltx/moddatv/dvb-s2/dvbs2_interleave.cpp1
-rw-r--r--plugins/channeltx/modfreedv/freedvmod.cpp2
-rw-r--r--plugins/channeltx/modfreedv/freedvmodgui.cpp2
-rw-r--r--plugins/channeltx/modfreedv/freedvmodsettings.cpp2
-rw-r--r--plugins/channeltx/modm17/m17mod.cpp3
-rw-r--r--plugins/channeltx/modm17/m17modgui.cpp3
-rw-r--r--plugins/channeltx/modm17/m17modsettings.cpp2
-rw-r--r--plugins/channeltx/modm17/m17modsource.cpp1
-rw-r--r--plugins/channeltx/modnfm/nfmmod.cpp2
-rw-r--r--plugins/channeltx/modnfm/nfmmodgui.cpp2
-rw-r--r--plugins/channeltx/modnfm/nfmmodsettings.cpp2
-rw-r--r--plugins/channeltx/modpacket/packetmod.cpp3
-rw-r--r--plugins/channeltx/modpacket/packetmodbaseband.cpp1
-rw-r--r--plugins/channeltx/modpacket/packetmodgui.cpp2
-rw-r--r--plugins/channeltx/modpacket/packetmodsettings.cpp1
-rw-r--r--plugins/channeltx/modpsk31/psk31mod.cpp3
-rw-r--r--plugins/channeltx/modpsk31/psk31modbaseband.cpp1
-rw-r--r--plugins/channeltx/modpsk31/psk31modgui.cpp3
-rw-r--r--plugins/channeltx/modpsk31/psk31modsettings.cpp2
-rw-r--r--plugins/channeltx/modrtty/rttymod.cpp3
-rw-r--r--plugins/channeltx/modrtty/rttymodbaseband.cpp1
-rw-r--r--plugins/channeltx/modrtty/rttymodgui.cpp3
-rw-r--r--plugins/channeltx/modrtty/rttymodsettings.cpp1
-rw-r--r--plugins/channeltx/modssb/ssbmod.cpp2
-rw-r--r--plugins/channeltx/modssb/ssbmodgui.cpp2
-rw-r--r--plugins/channeltx/modssb/ssbmodsettings.cpp2
-rw-r--r--plugins/channeltx/modwfm/wfmmod.cpp3
-rw-r--r--plugins/channeltx/modwfm/wfmmodgui.cpp2
-rw-r--r--plugins/channeltx/remotesource/remotesource.cpp2
-rw-r--r--plugins/channeltx/remotesource/remotesourcegui.cpp2
-rw-r--r--plugins/channeltx/udpsource/udpsource.cpp1
-rw-r--r--plugins/channeltx/udpsource/udpsourcebaseband.cpp1
-rw-r--r--plugins/channeltx/udpsource/udpsourcegui.cpp2
-rw-r--r--plugins/channeltx/udpsource/udpsourcesettings.cpp1
-rw-r--r--plugins/channeltx/udpsource/udpsourcesource.cpp2
-rw-r--r--plugins/feature/afc/afcgui.cpp3
-rw-r--r--plugins/feature/afc/afcworker.cpp3
-rw-r--r--plugins/feature/ais/ais.cpp6
-rw-r--r--plugins/feature/ais/aisgui.cpp3
-rw-r--r--plugins/feature/ambe/ambegui.cpp1
-rw-r--r--plugins/feature/antennatools/antennatools.cpp6
-rw-r--r--plugins/feature/antennatools/antennatoolsgui.cpp1
-rw-r--r--plugins/feature/aprs/aprs.cpp6
-rw-r--r--plugins/feature/aprs/aprsgui.cpp2
-rw-r--r--plugins/feature/aprs/aprsworker.cpp1
-rw-r--r--plugins/feature/demodanalyzer/demodanalyzer.cpp4
-rw-r--r--plugins/feature/demodanalyzer/demodanalyzergui.cpp1
-rw-r--r--plugins/feature/gs232controller/gs232controller.cpp2
-rw-r--r--plugins/feature/gs232controller/gs232controllergui.cpp2
-rw-r--r--plugins/feature/gs232controller/gs232controllerworker.cpp1
-rw-r--r--plugins/feature/jogdialcontroller/jogdialcontroller.cpp4
-rw-r--r--plugins/feature/jogdialcontroller/jogdialcontrollergui.cpp2
-rw-r--r--plugins/feature/limerfe/limerfegui.cpp2
-rw-r--r--plugins/feature/map/map.cpp4
-rw-r--r--plugins/feature/map/mapgui.cpp3
-rw-r--r--plugins/feature/map/mapsettingsdialog.cpp8
-rw-r--r--plugins/feature/pertester/pertester.cpp5
-rw-r--r--plugins/feature/pertester/pertestergui.cpp2
-rw-r--r--plugins/feature/radiosonde/radiosonde.cpp6
-rw-r--r--plugins/feature/radiosonde/radiosondegui.cpp3
-rw-r--r--plugins/feature/rigctlserver/rigctlserver.cpp1
-rw-r--r--plugins/feature/satellitetracker/satellitedevicesettingsgui.cpp2
-rw-r--r--plugins/feature/satellitetracker/satelliteradiocontroldialog.cpp4
-rw-r--r--plugins/feature/satellitetracker/satelliteselectiondialog.cpp2
-rw-r--r--plugins/feature/satellitetracker/satellitetracker.cpp1
-rw-r--r--plugins/feature/satellitetracker/satellitetrackergui.cpp8
-rw-r--r--plugins/feature/satellitetracker/satellitetrackersettingsdialog.cpp1
-rw-r--r--plugins/feature/satellitetracker/satellitetrackerworker.cpp1
-rw-r--r--plugins/feature/sid/sid.cpp3
-rw-r--r--plugins/feature/sid/sidgui.cpp4
-rw-r--r--plugins/feature/sid/sidsettings.cpp1
-rw-r--r--plugins/feature/sid/sidworker.cpp1
-rw-r--r--plugins/feature/simpleptt/simpleptt.cpp1
-rw-r--r--plugins/feature/skymap/skymap.cpp5
-rw-r--r--plugins/feature/skymap/skymapsettings.cpp1
-rw-r--r--plugins/feature/startracker/startracker.cpp4
-rw-r--r--plugins/feature/startracker/startrackergui.cpp3
-rw-r--r--plugins/feature/startracker/startrackerworker.cpp1
-rw-r--r--plugins/feature/vorlocalizer/vorlocalizer.cpp1
-rw-r--r--plugins/feature/vorlocalizer/vorlocalizergui.cpp5
-rw-r--r--plugins/feature/vorlocalizer/vorlocalizersettings.cpp1
-rw-r--r--plugins/feature/vorlocalizer/vorlocalizerworker.cpp2
-rw-r--r--plugins/samplemimo/audiocatsiso/audiocatsiso.cpp2
-rw-r--r--plugins/samplemimo/audiocatsiso/audiocatsisogui.cpp5
-rw-r--r--plugins/samplemimo/audiocatsiso/audiocatsisoplugin.cpp1
-rw-r--r--plugins/samplemimo/bladerf2mimo/bladerf2mimo.cpp3
-rw-r--r--plugins/samplemimo/bladerf2mimo/bladerf2mimogui.cpp6
-rw-r--r--plugins/samplemimo/bladerf2mimo/bladerf2mimoplugin.cpp1
-rw-r--r--plugins/samplemimo/bladerf2mimo/bladerf2mithread.cpp2
-rw-r--r--plugins/samplemimo/limesdrmimo/limesdrmimo.cpp6
-rw-r--r--plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp6
-rw-r--r--plugins/samplemimo/limesdrmimo/limesdrmimoplugin.cpp1
-rw-r--r--plugins/samplemimo/metismiso/metismiso.cpp3
-rw-r--r--plugins/samplemimo/metismiso/metismisogui.cpp6
-rw-r--r--plugins/samplemimo/metismiso/metismisoplugin.cpp1
-rw-r--r--plugins/samplemimo/plutosdrmimo/plutosdrmimo.cpp3
-rw-r--r--plugins/samplemimo/plutosdrmimo/plutosdrmimogui.cpp6
-rw-r--r--plugins/samplemimo/plutosdrmimo/plutosdrmimoplugin.cpp1
-rw-r--r--plugins/samplemimo/plutosdrmimo/plutosdrmithread.cpp1
-rw-r--r--plugins/samplemimo/testmi/testmi.cpp2
-rw-r--r--plugins/samplemimo/testmi/testmigui.cpp5
-rw-r--r--plugins/samplemimo/testmi/testmiplugin.cpp1
-rw-r--r--plugins/samplemimo/testmosync/testmosync.cpp4
-rw-r--r--plugins/samplemimo/testmosync/testmosyncgui.cpp3
-rw-r--r--plugins/samplemimo/testmosync/testmosyncplugin.cpp1
-rw-r--r--plugins/samplemimo/xtrxmimo/xtrxmimo.cpp5
-rw-r--r--plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp8
-rw-r--r--plugins/samplemimo/xtrxmimo/xtrxmimoplugin.cpp1
-rw-r--r--plugins/samplesink/aaroniartsaoutput/aaroniartsaoutput.cpp1
-rw-r--r--plugins/samplesink/aaroniartsaoutput/aaroniartsaoutputgui.cpp3
-rw-r--r--plugins/samplesink/aaroniartsaoutput/aaroniartsaoutputplugin.cpp1
-rw-r--r--plugins/samplesink/audiooutput/audiooutputgui.cpp1
-rw-r--r--plugins/samplesink/audiooutput/audiooutputplugin.cpp1
-rw-r--r--plugins/samplesink/bladerf1output/bladerf1output.cpp2
-rw-r--r--plugins/samplesink/bladerf1output/bladerf1outputgui.cpp1
-rw-r--r--plugins/samplesink/bladerf1output/bladerf1outputplugin.cpp1
-rw-r--r--plugins/samplesink/bladerf2output/bladerf2output.cpp2
-rw-r--r--plugins/samplesink/bladerf2output/bladerf2outputgui.cpp1
-rw-r--r--plugins/samplesink/bladerf2output/bladerf2outputplugin.cpp1
-rw-r--r--plugins/samplesink/fileoutput/fileoutput.cpp1
-rw-r--r--plugins/samplesink/fileoutput/fileoutputgui.cpp4
-rw-r--r--plugins/samplesink/fileoutput/fileoutputplugin.cpp1
-rw-r--r--plugins/samplesink/hackrfoutput/hackrfoutput.cpp1
-rw-r--r--plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp2
-rw-r--r--plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp2
-rw-r--r--plugins/samplesink/limesdroutput/limesdroutput.cpp1
-rw-r--r--plugins/samplesink/limesdroutput/limesdroutputgui.cpp1
-rw-r--r--plugins/samplesink/limesdroutput/limesdroutputplugin.cpp1
-rw-r--r--plugins/samplesink/limesdroutput/limesdroutputthread.cpp1
-rw-r--r--plugins/samplesink/localoutput/localoutput.cpp1
-rw-r--r--plugins/samplesink/localoutput/localoutputgui.cpp4
-rw-r--r--plugins/samplesink/localoutput/localoutputplugin.cpp1
-rw-r--r--plugins/samplesink/plutosdroutput/plutosdroutput.cpp1
-rw-r--r--plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp1
-rw-r--r--plugins/samplesink/plutosdroutput/plutosdroutputthread.cpp3
-rw-r--r--plugins/samplesink/remoteoutput/remoteoutput.cpp1
-rw-r--r--plugins/samplesink/remoteoutput/remoteoutputgui.cpp7
-rw-r--r--plugins/samplesink/remoteoutput/remoteoutputplugin.cpp1
-rw-r--r--plugins/samplesink/soapysdroutput/soapysdroutput.cpp1
-rw-r--r--plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp2
-rw-r--r--plugins/samplesink/soapysdroutput/soapysdroutputplugin.cpp1
-rw-r--r--plugins/samplesink/testsink/testsinkgui.cpp4
-rw-r--r--plugins/samplesink/testsink/testsinkoutput.cpp2
-rw-r--r--plugins/samplesink/testsink/testsinkplugin.cpp1
-rw-r--r--plugins/samplesink/usrpoutput/usrpoutput.cpp1
-rw-r--r--plugins/samplesink/usrpoutput/usrpoutputgui.cpp1
-rw-r--r--plugins/samplesink/usrpoutput/usrpoutputplugin.cpp1
-rw-r--r--plugins/samplesink/usrpoutput/usrpoutputthread.cpp1
-rw-r--r--plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp1
-rw-r--r--plugins/samplesink/xtrxoutput/xtrxoutputplugin.cpp1
-rw-r--r--plugins/samplesource/aaroniartsainput/aaroniartsainput.cpp1
-rw-r--r--plugins/samplesource/aaroniartsainput/aaroniartsainputgui.cpp5
-rw-r--r--plugins/samplesource/aaroniartsainput/aaroniartsainputplugin.cpp1
-rw-r--r--plugins/samplesource/aaroniartsainput/aaroniartsainputworker.cpp1
-rw-r--r--plugins/samplesource/airspy/airspygui.cpp1
-rw-r--r--plugins/samplesource/airspy/airspyinput.cpp1
-rw-r--r--plugins/samplesource/airspy/airspyplugin.cpp2
-rw-r--r--plugins/samplesource/airspyhf/airspyhfgui.cpp1
-rw-r--r--plugins/samplesource/airspyhf/airspyhfinput.cpp2
-rw-r--r--plugins/samplesource/airspyhf/airspyhfplugin.cpp1
-rw-r--r--plugins/samplesource/androidsdrdriverinput/androidsdrdriverinput.cpp4
-rw-r--r--plugins/samplesource/androidsdrdriverinput/androidsdrdriverinputgui.cpp4
-rw-r--r--plugins/samplesource/androidsdrdriverinput/androidsdrdriverinputplugin.cpp1
-rw-r--r--plugins/samplesource/androidsdrdriverinput/androidsdrdriverinputtcphandler.cpp2
-rw-r--r--plugins/samplesource/audioinput/audioinputgui.cpp2
-rw-r--r--plugins/samplesource/audioinput/audioinputplugin.cpp1
-rw-r--r--plugins/samplesource/bladerf1input/bladerf1input.cpp2
-rw-r--r--plugins/samplesource/bladerf1input/bladerf1inputgui.cpp1
-rw-r--r--plugins/samplesource/bladerf1input/bladerf1inputplugin.cpp1
-rw-r--r--plugins/samplesource/bladerf2input/bladerf2input.cpp1
-rw-r--r--plugins/samplesource/bladerf2input/bladerf2inputgui.cpp1
-rw-r--r--plugins/samplesource/bladerf2input/bladerf2inputplugin.cpp1
-rw-r--r--plugins/samplesource/fcdpro/fcdprogui.cpp1
-rw-r--r--plugins/samplesource/fcdpro/fcdproplugin.cpp1
-rw-r--r--plugins/samplesource/fcdproplus/fcdproplusgui.cpp1
-rw-r--r--plugins/samplesource/fcdproplus/fcdproplusplugin.cpp1
-rw-r--r--plugins/samplesource/fileinput/fileinput.cpp1
-rw-r--r--plugins/samplesource/fileinput/fileinputgui.cpp5
-rw-r--r--plugins/samplesource/fileinput/fileinputplugin.cpp1
-rw-r--r--plugins/samplesource/fileinput/fileinputworker.cpp1
-rw-r--r--plugins/samplesource/hackrfinput/hackrfinput.cpp2
-rw-r--r--plugins/samplesource/hackrfinput/hackrfinputgui.cpp1
-rw-r--r--plugins/samplesource/hackrfinput/hackrfinputplugin.cpp2
-rw-r--r--plugins/samplesource/kiwisdr/kiwisdrgui.cpp5
-rw-r--r--plugins/samplesource/kiwisdr/kiwisdrinput.cpp1
-rw-r--r--plugins/samplesource/kiwisdr/kiwisdrplugin.cpp1
-rw-r--r--plugins/samplesource/limesdrinput/limesdrinput.cpp1
-rw-r--r--plugins/samplesource/limesdrinput/limesdrinputgui.cpp1
-rw-r--r--plugins/samplesource/limesdrinput/limesdrinputplugin.cpp1
-rw-r--r--plugins/samplesource/limesdrinput/limesdrinputthread.cpp1
-rw-r--r--plugins/samplesource/localinput/localinput.cpp1
-rw-r--r--plugins/samplesource/localinput/localinputgui.cpp4
-rw-r--r--plugins/samplesource/localinput/localinputplugin.cpp1
-rw-r--r--plugins/samplesource/perseus/perseusgui.cpp1
-rw-r--r--plugins/samplesource/perseus/perseusinput.cpp1
-rw-r--r--plugins/samplesource/perseus/perseusplugin.cpp1
-rw-r--r--plugins/samplesource/plutosdrinput/plutosdrinput.cpp1
-rw-r--r--plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp1
-rw-r--r--plugins/samplesource/plutosdrinput/plutosdrinputthread.cpp2
-rw-r--r--plugins/samplesource/remoteinput/remoteinput.cpp2
-rw-r--r--plugins/samplesource/remoteinput/remoteinputgui.cpp3
-rw-r--r--plugins/samplesource/remoteinput/remoteinputplugin.cpp1
-rw-r--r--plugins/samplesource/remoteinput/remoteinputudphandler.cpp1
-rw-r--r--plugins/samplesource/remotetcpinput/remotetcpinput.cpp2
-rw-r--r--plugins/samplesource/remotetcpinput/remotetcpinputgui.cpp4
-rw-r--r--plugins/samplesource/remotetcpinput/remotetcpinputplugin.cpp1
-rw-r--r--plugins/samplesource/remotetcpinput/remotetcpinputtcphandler.cpp3
-rw-r--r--plugins/samplesource/rtlsdr/rtlsdrgui.cpp1
-rw-r--r--plugins/samplesource/rtlsdr/rtlsdrinput.cpp2
-rw-r--r--plugins/samplesource/rtlsdr/rtlsdrplugin.cpp1
-rw-r--r--plugins/samplesource/sdrplay/sdrplaygui.cpp1
-rw-r--r--plugins/samplesource/sdrplay/sdrplayinput.cpp1
-rw-r--r--plugins/samplesource/sdrplay/sdrplayplugin.cpp1
-rw-r--r--plugins/samplesource/sdrplayv3/sdrplayv3gui.cpp1
-rw-r--r--plugins/samplesource/sdrplayv3/sdrplayv3input.cpp1
-rw-r--r--plugins/samplesource/sigmffileinput/sigmffileinput.cpp1
-rw-r--r--plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp5
-rw-r--r--plugins/samplesource/sigmffileinput/sigmffileinputplugin.cpp1
-rw-r--r--plugins/samplesource/sigmffileinput/sigmffileinputworker.cpp1
-rw-r--r--plugins/samplesource/soapysdrinput/soapysdrinput.cpp1
-rw-r--r--plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp2
-rw-r--r--plugins/samplesource/soapysdrinput/soapysdrinputplugin.cpp1
-rw-r--r--plugins/samplesource/testsource/testsourcegui.cpp4
-rw-r--r--plugins/samplesource/testsource/testsourceinput.cpp1
-rw-r--r--plugins/samplesource/testsource/testsourceplugin.cpp1
-rw-r--r--plugins/samplesource/usrpinput/usrpinput.cpp1
-rw-r--r--plugins/samplesource/usrpinput/usrpinputgui.cpp1
-rw-r--r--plugins/samplesource/usrpinput/usrpinputplugin.cpp1
-rw-r--r--plugins/samplesource/usrpinput/usrpinputthread.cpp1
-rw-r--r--plugins/samplesource/xtrxinput/xtrxinputgui.cpp1
-rw-r--r--plugins/samplesource/xtrxinput/xtrxinputplugin.cpp1
-rw-r--r--plugins/samplesource/xtrxinput/xtrxinputthread.cpp1
-rw-r--r--sdrbase/audio/audiofifo.cpp1
-rw-r--r--sdrbase/availablechannelorfeature.cpp3
-rw-r--r--sdrbase/channel/channelapi.cpp1
-rw-r--r--sdrbase/channel/channelwebapiutils.cpp3
-rw-r--r--sdrbase/dsp/basebandsamplesink.cpp1
-rw-r--r--sdrbase/dsp/basebandsamplesource.cpp1
-rw-r--r--sdrbase/dsp/devicesamplemimo.cpp2
-rw-r--r--sdrbase/dsp/downchannelizer.cpp2
-rw-r--r--sdrbase/dsp/dspdevicesourceengine.cpp1
-rw-r--r--sdrbase/dsp/dspengine.h1
-rw-r--r--sdrbase/dsp/filerecord.cpp1
-rw-r--r--sdrbase/dsp/upchannelizer.cpp2
-rw-r--r--sdrbase/dsp/wavfilerecord.cpp1
-rw-r--r--sdrbase/feature/feature.cpp1
-rw-r--r--sdrbase/plugin/pluginmanager.cpp5
-rw-r--r--sdrbase/util/iot/homeassistant.cpp1
-rw-r--r--sdrbase/util/message.cpp1
-rw-r--r--sdrbase/util/rtpsink.cpp1
-rw-r--r--sdrbase/webapi/webapiadapter.cpp3
-rw-r--r--sdrbase/webapi/webapirequestmapper.cpp3
-rw-r--r--sdrgui/device/deviceuiset.cpp1
-rw-r--r--sdrgui/gui/cwkeyergui.cpp1
-rw-r--r--sdrgui/gui/featurepresetsdialog.cpp1
-rw-r--r--sdrgui/gui/glscopegui.cpp1
-rw-r--r--sdrgui/gui/glspectrumgui.cpp1
-rw-r--r--sdrgui/gui/pluginpresetsdialog.cpp1
-rw-r--r--sdrgui/gui/rollupcontents.cpp1
-rw-r--r--sdrgui/gui/rollupwidget.cpp1
-rw-r--r--sdrgui/gui/spectrummeasurementsdialog.cpp2
-rw-r--r--sdrgui/mainwindow.cpp4
472 files changed, 34 insertions, 1006 deletions
diff --git a/devices/plutosdr/deviceplutosdrbox.cpp b/devices/plutosdr/deviceplutosdrbox.cpp
index dbfbf1fba..3f5cff6ea 100644
--- a/devices/plutosdr/deviceplutosdrbox.cpp
+++ b/devices/plutosdr/deviceplutosdrbox.cpp
@@ -27,7 +27,6 @@
#include <boost/lexical_cast.hpp>
#include <QtGlobal>
-#include "dsp/dsptypes.h"
#include "dsp/wfir.h"
#include "deviceplutosdr.h"
#include "deviceplutosdrbox.h"
diff --git a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.cpp b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.cpp
index ee1b5ff62..7bd4f8ab4 100644
--- a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.cpp
+++ b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmod.cpp
@@ -29,7 +29,6 @@
#include "dsp/hbfilterchainconverter.h"
#include "dsp/dspcommands.h"
#include "settings/serializable.h"
-#include "feature/feature.h"
#include "maincore.h"
#include "beamsteeringcwmodbaseband.h"
diff --git a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodbaseband.cpp b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodbaseband.cpp
index bb58d8492..72e31d48c 100644
--- a/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodbaseband.cpp
+++ b/plugins/channelmimo/beamsteeringcwmod/beamsteeringcwmodbaseband.cpp
@@ -20,7 +20,6 @@
#include <QDebug>
#include "dsp/upchannelizer.h"
-#include "dsp/dspcommands.h"
#include "beamsteeringcwmodbaseband.h"
diff --git a/plugins/channelmimo/doa2/doa2.cpp b/plugins/channelmimo/doa2/doa2.cpp
index 52cb6e242..6ff653772 100644
--- a/plugins/channelmimo/doa2/doa2.cpp
+++ b/plugins/channelmimo/doa2/doa2.cpp
@@ -29,7 +29,6 @@
#include "device/deviceapi.h"
#include "dsp/hbfilterchainconverter.h"
#include "dsp/dspcommands.h"
-#include "feature/feature.h"
#include "util/db.h"
#include "maincore.h"
diff --git a/plugins/channelmimo/doa2/doa2baseband.cpp b/plugins/channelmimo/doa2/doa2baseband.cpp
index 3453cc1a5..f33fc637e 100644
--- a/plugins/channelmimo/doa2/doa2baseband.cpp
+++ b/plugins/channelmimo/doa2/doa2baseband.cpp
@@ -22,9 +22,7 @@
#include <QDebug>
#include "dsp/downchannelizer.h"
-#include "dsp/basebandsamplesink.h"
#include "dsp/scopevis.h"
-#include "dsp/dspcommands.h"
#include "doa2baseband.h"
#include "doa2settings.h"
diff --git a/plugins/channelmimo/doa2/doa2gui.cpp b/plugins/channelmimo/doa2/doa2gui.cpp
index b24badd9e..75f6b6fa0 100644
--- a/plugins/channelmimo/doa2/doa2gui.cpp
+++ b/plugins/channelmimo/doa2/doa2gui.cpp
@@ -25,7 +25,6 @@
#include "gui/dialogpositioner.h"
#include "dsp/hbfilterchainconverter.h"
#include "dsp/scopevis.h"
-#include "dsp/spectrumvis.h"
#include "maincore.h"
#include "doa2gui.h"
diff --git a/plugins/channelmimo/doa2/doa2settings.cpp b/plugins/channelmimo/doa2/doa2settings.cpp
index b9709bd89..f54d7d753 100644
--- a/plugins/channelmimo/doa2/doa2settings.cpp
+++ b/plugins/channelmimo/doa2/doa2settings.cpp
@@ -18,7 +18,6 @@
#include <QColor>
-#include "dsp/dspengine.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
diff --git a/plugins/channelmimo/interferometer/interferometer.cpp b/plugins/channelmimo/interferometer/interferometer.cpp
index 92fc14d11..0f2290428 100644
--- a/plugins/channelmimo/interferometer/interferometer.cpp
+++ b/plugins/channelmimo/interferometer/interferometer.cpp
@@ -28,7 +28,6 @@
#include "device/deviceapi.h"
#include "dsp/hbfilterchainconverter.h"
#include "dsp/dspcommands.h"
-#include "feature/feature.h"
#include "maincore.h"
#include "interferometerbaseband.h"
diff --git a/plugins/channelmimo/interferometer/interferometerbaseband.cpp b/plugins/channelmimo/interferometer/interferometerbaseband.cpp
index b763824d6..0c0db4887 100644
--- a/plugins/channelmimo/interferometer/interferometerbaseband.cpp
+++ b/plugins/channelmimo/interferometer/interferometerbaseband.cpp
@@ -24,7 +24,6 @@
#include "dsp/downchannelizer.h"
#include "dsp/basebandsamplesink.h"
#include "dsp/scopevis.h"
-#include "dsp/dspcommands.h"
#include "interferometerbaseband.h"
diff --git a/plugins/channelmimo/interferometer/interferometersettings.cpp b/plugins/channelmimo/interferometer/interferometersettings.cpp
index cb2632b71..fdb5c39c0 100644
--- a/plugins/channelmimo/interferometer/interferometersettings.cpp
+++ b/plugins/channelmimo/interferometer/interferometersettings.cpp
@@ -18,7 +18,6 @@
#include <QColor>
-#include "dsp/dspengine.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
diff --git a/plugins/channelrx/chanalyzer/chanalyzerbaseband.cpp b/plugins/channelrx/chanalyzer/chanalyzerbaseband.cpp
index 005b11711..3344411f4 100644
--- a/plugins/channelrx/chanalyzer/chanalyzerbaseband.cpp
+++ b/plugins/channelrx/chanalyzer/chanalyzerbaseband.cpp
@@ -18,7 +18,6 @@
#include <QDebug>
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/downchannelizer.h"
diff --git a/plugins/channelrx/chanalyzer/chanalyzergui.cpp b/plugins/channelrx/chanalyzer/chanalyzergui.cpp
index 374fedfbf..6de3cac8c 100644
--- a/plugins/channelrx/chanalyzer/chanalyzergui.cpp
+++ b/plugins/channelrx/chanalyzer/chanalyzergui.cpp
@@ -31,7 +31,6 @@
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "maincore.h"
diff --git a/plugins/channelrx/chanalyzer/chanalyzersettings.cpp b/plugins/channelrx/chanalyzer/chanalyzersettings.cpp
index 691e7fc6f..73d35315c 100644
--- a/plugins/channelrx/chanalyzer/chanalyzersettings.cpp
+++ b/plugins/channelrx/chanalyzer/chanalyzersettings.cpp
@@ -18,7 +18,6 @@
#include <QColor>
-#include "dsp/dspengine.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
diff --git a/plugins/channelrx/channelpower/channelpower.cpp b/plugins/channelrx/channelpower/channelpower.cpp
index 42bca59e3..f86272b05 100644
--- a/plugins/channelrx/channelpower/channelpower.cpp
+++ b/plugins/channelrx/channelpower/channelpower.cpp
@@ -32,13 +32,10 @@
#include "SWGWorkspaceInfo.h"
#include "SWGChannelReport.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "settings/serializable.h"
#include "util/db.h"
-#include "maincore.h"
MESSAGE_CLASS_DEFINITION(ChannelPower::MsgConfigureChannelPower, Message)
diff --git a/plugins/channelrx/channelpower/channelpowerbaseband.cpp b/plugins/channelrx/channelpower/channelpowerbaseband.cpp
index 16795906f..1f9bd38ad 100644
--- a/plugins/channelrx/channelpower/channelpowerbaseband.cpp
+++ b/plugins/channelrx/channelpower/channelpowerbaseband.cpp
@@ -18,7 +18,6 @@
#include <QDebug>
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/downchannelizer.h"
diff --git a/plugins/channelrx/channelpower/channelpowergui.cpp b/plugins/channelrx/channelpower/channelpowergui.cpp
index c05eba4e1..5b90dcc15 100644
--- a/plugins/channelrx/channelpower/channelpowergui.cpp
+++ b/plugins/channelrx/channelpower/channelpowergui.cpp
@@ -24,10 +24,8 @@
#include "dsp/dspcommands.h"
#include "ui_channelpowergui.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
#include "dsp/dspengine.h"
diff --git a/plugins/channelrx/channelpower/channelpowersettings.cpp b/plugins/channelrx/channelpower/channelpowersettings.cpp
index b8f97429c..9476169cd 100644
--- a/plugins/channelrx/channelpower/channelpowersettings.cpp
+++ b/plugins/channelrx/channelpower/channelpowersettings.cpp
@@ -18,7 +18,6 @@
#include <QColor>
-#include "dsp/dspengine.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
#include "channelpowersettings.h"
diff --git a/plugins/channelrx/demodadsb/adsbdemod.cpp b/plugins/channelrx/demodadsb/adsbdemod.cpp
index 42caa6a2c..30eec3eba 100644
--- a/plugins/channelrx/demodadsb/adsbdemod.cpp
+++ b/plugins/channelrx/demodadsb/adsbdemod.cpp
@@ -37,7 +37,6 @@
#include "SWGADSBDemodReport.h"
#include "SWGTargetAzimuthElevation.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/devicesamplemimo.h"
#include "device/deviceapi.h"
diff --git a/plugins/channelrx/demodadsb/adsbdemodgui.cpp b/plugins/channelrx/demodadsb/adsbdemodgui.cpp
index 6088baa51..721a7a2b8 100644
--- a/plugins/channelrx/demodadsb/adsbdemodgui.cpp
+++ b/plugins/channelrx/demodadsb/adsbdemodgui.cpp
@@ -43,12 +43,10 @@
#include "plugin/pluginapi.h"
#include "util/airlines.h"
#include "util/crc.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "util/units.h"
#include "util/morse.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/crightclickenabler.h"
#include "gui/clickablelabel.h"
#include "gui/tabletapandhold.h"
@@ -56,7 +54,6 @@
#include "gui/dialogpositioner.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
-#include "mainwindow.h"
#include "adsbdemodreport.h"
#include "adsbdemod.h"
diff --git a/plugins/channelrx/demodadsb/adsbdemodsettings.cpp b/plugins/channelrx/demodadsb/adsbdemodsettings.cpp
index a7bb870a4..e7dfa9ac2 100644
--- a/plugins/channelrx/demodadsb/adsbdemodsettings.cpp
+++ b/plugins/channelrx/demodadsb/adsbdemodsettings.cpp
@@ -20,10 +20,8 @@
#include <QDataStream>
#include <QDebug>
-#include "dsp/dspengine.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
-#include "settings/rollupstate.h"
#include "adsbdemodsettings.h"
diff --git a/plugins/channelrx/demodadsb/adsbdemodsinkworker.cpp b/plugins/channelrx/demodadsb/adsbdemodsinkworker.cpp
index bd48e4db8..e879b6822 100644
--- a/plugins/channelrx/demodadsb/adsbdemodsinkworker.cpp
+++ b/plugins/channelrx/demodadsb/adsbdemodsinkworker.cpp
@@ -20,11 +20,7 @@
#include <QDebug>
-#include "util/stepfunctions.h"
#include "util/db.h"
-#include "dsp/dspengine.h"
-#include "dsp/dspcommands.h"
-#include "device/deviceapi.h"
#include "adsbdemodreport.h"
#include "adsbdemodsink.h"
diff --git a/plugins/channelrx/demodais/aisdemod.cpp b/plugins/channelrx/demodais/aisdemod.cpp
index 6b3fe9fd2..de40b6787 100644
--- a/plugins/channelrx/demodais/aisdemod.cpp
+++ b/plugins/channelrx/demodais/aisdemod.cpp
@@ -30,14 +30,10 @@
#include "SWGChannelSettings.h"
#include "SWGWorkspaceInfo.h"
-#include "SWGChannelReport.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "util/ais.h"
-#include "util/db.h"
#include "maincore.h"
MESSAGE_CLASS_DEFINITION(AISDemod::MsgConfigureAISDemod, Message)
diff --git a/plugins/channelrx/demodais/aisdemodbaseband.cpp b/plugins/channelrx/demodais/aisdemodbaseband.cpp
index e69864179..edd29f7e1 100644
--- a/plugins/channelrx/demodais/aisdemodbaseband.cpp
+++ b/plugins/channelrx/demodais/aisdemodbaseband.cpp
@@ -19,7 +19,6 @@
#include <QDebug>
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/downchannelizer.h"
diff --git a/plugins/channelrx/demodais/aisdemodgui.cpp b/plugins/channelrx/demodais/aisdemodgui.cpp
index 99f9ab291..2542ae7ca 100644
--- a/plugins/channelrx/demodais/aisdemodgui.cpp
+++ b/plugins/channelrx/demodais/aisdemodgui.cpp
@@ -37,25 +37,19 @@
#include "dsp/dspcommands.h"
#include "ui_aisdemodgui.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/ais.h"
#include "util/csv.h"
#include "util/db.h"
#include "util/mmsi.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
#include "dsp/dspengine.h"
#include "dsp/glscopesettings.h"
-#include "gui/crightclickenabler.h"
#include "gui/tabletapandhold.h"
-#include "channel/channelwebapiutils.h"
#include "maincore.h"
-#include "feature/featurewebapiutils.h"
#include "aisdemod.h"
-#include "aisdemodsink.h"
void AISDemodGUI::resizeTable()
{
diff --git a/plugins/channelrx/demodais/aisdemodsettings.cpp b/plugins/channelrx/demodais/aisdemodsettings.cpp
index 62faffd3b..9821d500e 100644
--- a/plugins/channelrx/demodais/aisdemodsettings.cpp
+++ b/plugins/channelrx/demodais/aisdemodsettings.cpp
@@ -20,7 +20,6 @@
#include <QColor>
-#include "dsp/dspengine.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
#include "aisdemodsettings.h"
diff --git a/plugins/channelrx/demodais/aisdemodsink.cpp b/plugins/channelrx/demodais/aisdemodsink.cpp
index 4b6f2a375..19bfd735d 100644
--- a/plugins/channelrx/demodais/aisdemodsink.cpp
+++ b/plugins/channelrx/demodais/aisdemodsink.cpp
@@ -20,13 +20,10 @@
#include <complex.h>
-#include "dsp/dspengine.h"
#include "dsp/datafifo.h"
#include "dsp/scopevis.h"
#include "device/deviceapi.h"
#include "channel/channelwebapiutils.h"
-#include "util/db.h"
-#include "util/stepfunctions.h"
#include "maincore.h"
#include "aisdemod.h"
diff --git a/plugins/channelrx/demodam/amdemod.cpp b/plugins/channelrx/demodam/amdemod.cpp
index e563990e2..4ec996a92 100644
--- a/plugins/channelrx/demodam/amdemod.cpp
+++ b/plugins/channelrx/demodam/amdemod.cpp
@@ -38,11 +38,8 @@
#include "SWGChannelReport.h"
#include "SWGAMDemodReport.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
-#include "dsp/devicesamplesource.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "settings/serializable.h"
#include "util/db.h"
#include "maincore.h"
diff --git a/plugins/channelrx/demodam/amdemodgui.cpp b/plugins/channelrx/demodam/amdemodgui.cpp
index 960706ef2..415a65f3e 100644
--- a/plugins/channelrx/demodam/amdemodgui.cpp
+++ b/plugins/channelrx/demodam/amdemodgui.cpp
@@ -30,10 +30,8 @@
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/crightclickenabler.h"
#include "gui/audioselectdialog.h"
#include "gui/dialogpositioner.h"
diff --git a/plugins/channelrx/demodam/amdemodsettings.cpp b/plugins/channelrx/demodam/amdemodsettings.cpp
index 8576fb88a..d9dc2f9a1 100644
--- a/plugins/channelrx/demodam/amdemodsettings.cpp
+++ b/plugins/channelrx/demodam/amdemodsettings.cpp
@@ -20,10 +20,9 @@
#include <QColor>
-#include "dsp/dspengine.h"
+#include "audio/audiodevicemanager.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
-#include "settings/rollupstate.h"
#include "amdemodsettings.h"
AMDemodSettings::AMDemodSettings() :
diff --git a/plugins/channelrx/demodam/amdemodsink.cpp b/plugins/channelrx/demodam/amdemodsink.cpp
index c0d6146a5..3e7c59ac0 100644
--- a/plugins/channelrx/demodam/amdemodsink.cpp
+++ b/plugins/channelrx/demodam/amdemodsink.cpp
@@ -21,7 +21,6 @@
#include <complex.h>
-#include "audio/audiooutputdevice.h"
#include "dsp/fftfilt.h"
#include "dsp/datafifo.h"
#include "util/db.h"
diff --git a/plugins/channelrx/demodapt/aptdemod.cpp b/plugins/channelrx/demodapt/aptdemod.cpp
index 1295890c3..625375403 100644
--- a/plugins/channelrx/demodapt/aptdemod.cpp
+++ b/plugins/channelrx/demodapt/aptdemod.cpp
@@ -31,18 +31,12 @@
#include "SWGChannelSettings.h"
#include "SWGWorkspaceInfo.h"
#include "SWGAPTDemodSettings.h"
-#include "SWGChannelReport.h"
#include "SWGChannelActions.h"
-#include "SWGMapItem.h"
#include "SWGAPTDemodActions.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "settings/serializable.h"
-#include "util/db.h"
-#include "maincore.h"
MESSAGE_CLASS_DEFINITION(APTDemod::MsgConfigureAPTDemod, Message)
MESSAGE_CLASS_DEFINITION(APTDemod::MsgPixels, Message)
diff --git a/plugins/channelrx/demodapt/aptdemodbaseband.cpp b/plugins/channelrx/demodapt/aptdemodbaseband.cpp
index 0009d3288..e58384af0 100644
--- a/plugins/channelrx/demodapt/aptdemodbaseband.cpp
+++ b/plugins/channelrx/demodapt/aptdemodbaseband.cpp
@@ -18,7 +18,6 @@
#include <QDebug>
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/downchannelizer.h"
diff --git a/plugins/channelrx/demodapt/aptdemodgui.cpp b/plugins/channelrx/demodapt/aptdemodgui.cpp
index cb8701dd9..32408006b 100644
--- a/plugins/channelrx/demodapt/aptdemodgui.cpp
+++ b/plugins/channelrx/demodapt/aptdemodgui.cpp
@@ -37,22 +37,15 @@
#include "dsp/dspcommands.h"
#include "ui_aptdemodgui.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
-#include "util/morse.h"
-#include "util/units.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
#include "dsp/dspengine.h"
-#include "gui/crightclickenabler.h"
#include "gui/graphicsviewzoom.h"
-#include "channel/channelwebapiutils.h"
#include "maincore.h"
#include "aptdemod.h"
-#include "aptdemodsink.h"
#include "aptdemodsettingsdialog.h"
#include "aptdemodselectdialog.h"
diff --git a/plugins/channelrx/demodapt/aptdemodsettings.cpp b/plugins/channelrx/demodapt/aptdemodsettings.cpp
index 5e4e9ed6a..95870be89 100644
--- a/plugins/channelrx/demodapt/aptdemodsettings.cpp
+++ b/plugins/channelrx/demodapt/aptdemodsettings.cpp
@@ -18,7 +18,6 @@
#include <QColor>
-#include "dsp/dspengine.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
#include "aptdemodsettings.h"
diff --git a/plugins/channelrx/demodapt/aptdemodsink.cpp b/plugins/channelrx/demodapt/aptdemodsink.cpp
index 18457ca32..13b41f798 100644
--- a/plugins/channelrx/demodapt/aptdemodsink.cpp
+++ b/plugins/channelrx/demodapt/aptdemodsink.cpp
@@ -20,12 +20,6 @@
#include <complex.h>
-#include "dsp/dspengine.h"
-#include "dsp/dspengine.h"
-#include "util/db.h"
-#include "util/stepfunctions.h"
-#include "maincore.h"
-
#include "aptdemod.h"
#include "aptdemodsink.h"
diff --git a/plugins/channelrx/demodatv/atvdemod.cpp b/plugins/channelrx/demodatv/atvdemod.cpp
index 7f687fe07..00c2025f3 100644
--- a/plugins/channelrx/demodatv/atvdemod.cpp
+++ b/plugins/channelrx/demodatv/atvdemod.cpp
@@ -23,7 +23,6 @@
#include <stdio.h>
#include <complex.h>
-#include "dsp/dspengine.h"
#include "device/deviceapi.h"
#include "atvdemod.h"
diff --git a/plugins/channelrx/demodatv/atvdemodbaseband.cpp b/plugins/channelrx/demodatv/atvdemodbaseband.cpp
index 8eaa12ca8..5d2ed6810 100644
--- a/plugins/channelrx/demodatv/atvdemodbaseband.cpp
+++ b/plugins/channelrx/demodatv/atvdemodbaseband.cpp
@@ -18,7 +18,6 @@
#include <QDebug>
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/downchannelizer.h"
diff --git a/plugins/channelrx/demodatv/atvdemodgui.cpp b/plugins/channelrx/demodatv/atvdemodgui.cpp
index 0734ca800..10391cfc2 100644
--- a/plugins/channelrx/demodatv/atvdemodgui.cpp
+++ b/plugins/channelrx/demodatv/atvdemodgui.cpp
@@ -31,7 +31,6 @@
#include "gui/dialogpositioner.h"
#include "ui_atvdemodgui.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "dsp/dspengine.h"
#include "maincore.h"
diff --git a/plugins/channelrx/demodatv/atvdemodsettings.cpp b/plugins/channelrx/demodatv/atvdemodsettings.cpp
index 675e89912..6ab06474f 100644
--- a/plugins/channelrx/demodatv/atvdemodsettings.cpp
+++ b/plugins/channelrx/demodatv/atvdemodsettings.cpp
@@ -19,7 +19,6 @@
#include <QColor>
-#include "dsp/dspengine.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
#include "atvdemodsettings.h"
diff --git a/plugins/channelrx/demodbfm/bfmdemod.cpp b/plugins/channelrx/demodbfm/bfmdemod.cpp
index 19535d31b..da581a4d1 100644
--- a/plugins/channelrx/demodbfm/bfmdemod.cpp
+++ b/plugins/channelrx/demodbfm/bfmdemod.cpp
@@ -36,11 +36,9 @@
#include "SWGBFMDemodReport.h"
#include "SWGRDSReport.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/devicesamplemimo.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "util/db.h"
#include "maincore.h"
diff --git a/plugins/channelrx/demodbfm/bfmdemodgui.cpp b/plugins/channelrx/demodbfm/bfmdemodgui.cpp
index 46e71e83c..550a7a108 100644
--- a/plugins/channelrx/demodbfm/bfmdemodgui.cpp
+++ b/plugins/channelrx/demodbfm/bfmdemodgui.cpp
@@ -37,10 +37,8 @@
#include "dsp/dspcommands.h"
#include "gui/glspectrum.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/crightclickenabler.h"
#include "gui/audioselectdialog.h"
#include "gui/dialogpositioner.h"
diff --git a/plugins/channelrx/demodbfm/bfmdemodsettings.cpp b/plugins/channelrx/demodbfm/bfmdemodsettings.cpp
index 65762b0e3..f7bd742cd 100644
--- a/plugins/channelrx/demodbfm/bfmdemodsettings.cpp
+++ b/plugins/channelrx/demodbfm/bfmdemodsettings.cpp
@@ -20,7 +20,7 @@
#include <QColor>
-#include "dsp/dspengine.h"
+#include "audio/audiodevicemanager.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
diff --git a/plugins/channelrx/demodbfm/bfmdemodsink.cpp b/plugins/channelrx/demodbfm/bfmdemodsink.cpp
index 47080c42c..da4ebcdf3 100644
--- a/plugins/channelrx/demodbfm/bfmdemodsink.cpp
+++ b/plugins/channelrx/demodbfm/bfmdemodsink.cpp
@@ -16,21 +16,15 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
///////////////////////////////////////////////////////////////////////////////////
-#include "boost/format.hpp"
#include <stdio.h>
#include <complex.h>
#include <QTime>
#include <QDebug>
-#include "audio/audiooutputdevice.h"
-#include "dsp/dspengine.h"
-#include "dsp/dspcommands.h"
-#include "dsp/devicesamplemimo.h"
#include "dsp/basebandsamplesink.h"
#include "dsp/datafifo.h"
#include "pipes/datapipes.h"
-#include "util/db.h"
#include "maincore.h"
#include "rdsparser.h"
diff --git a/plugins/channelrx/demodchirpchat/chirpchatdemod.cpp b/plugins/channelrx/demodchirpchat/chirpchatdemod.cpp
index 387cb0601..6f6523bcf 100644
--- a/plugins/channelrx/demodchirpchat/chirpchatdemod.cpp
+++ b/plugins/channelrx/demodchirpchat/chirpchatdemod.cpp
@@ -38,7 +38,6 @@
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "util/ax25.h"
#include "util/db.h"
#include "maincore.h"
diff --git a/plugins/channelrx/demodchirpchat/chirpchatdemodbaseband.cpp b/plugins/channelrx/demodchirpchat/chirpchatdemodbaseband.cpp
index d1b271c84..45c36c5c9 100644
--- a/plugins/channelrx/demodchirpchat/chirpchatdemodbaseband.cpp
+++ b/plugins/channelrx/demodchirpchat/chirpchatdemodbaseband.cpp
@@ -18,7 +18,6 @@
#include <QDebug>
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/downchannelizer.h"
diff --git a/plugins/channelrx/demodchirpchat/chirpchatdemodgui.cpp b/plugins/channelrx/demodchirpchat/chirpchatdemodgui.cpp
index 25f99edc7..7a87afeb5 100644
--- a/plugins/channelrx/demodchirpchat/chirpchatdemodgui.cpp
+++ b/plugins/channelrx/demodchirpchat/chirpchatdemodgui.cpp
@@ -31,11 +31,9 @@
#include "gui/glspectrum.h"
#include "gui/glspectrumgui.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "maincore.h"
diff --git a/plugins/channelrx/demodchirpchat/chirpchatdemodsettings.cpp b/plugins/channelrx/demodchirpchat/chirpchatdemodsettings.cpp
index 4643aecdc..0c6a95dc5 100644
--- a/plugins/channelrx/demodchirpchat/chirpchatdemodsettings.cpp
+++ b/plugins/channelrx/demodchirpchat/chirpchatdemodsettings.cpp
@@ -18,7 +18,6 @@
#include <QColor>
-#include "dsp/dspengine.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
diff --git a/plugins/channelrx/demoddab/dabdemod.cpp b/plugins/channelrx/demoddab/dabdemod.cpp
index 72e9dc7e3..6b51cf664 100644
--- a/plugins/channelrx/demoddab/dabdemod.cpp
+++ b/plugins/channelrx/demoddab/dabdemod.cpp
@@ -34,15 +34,10 @@
#include "SWGChannelSettings.h"
#include "SWGWorkspaceInfo.h"
#include "SWGDABDemodSettings.h"
-#include "SWGChannelReport.h"
-#include "SWGMapItem.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "settings/serializable.h"
-#include "util/db.h"
#include "maincore.h"
MESSAGE_CLASS_DEFINITION(DABDemod::MsgConfigureDABDemod, Message)
diff --git a/plugins/channelrx/demoddab/dabdemodgui.cpp b/plugins/channelrx/demoddab/dabdemodgui.cpp
index db7694de5..36f984d48 100644
--- a/plugins/channelrx/demoddab/dabdemodgui.cpp
+++ b/plugins/channelrx/demoddab/dabdemodgui.cpp
@@ -30,11 +30,9 @@
#include "dsp/dspcommands.h"
#include "ui_dabdemodgui.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "gui/audioselectdialog.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/crightclickenabler.h"
#include "gui/dialogpositioner.h"
#include "channel/channelwebapiutils.h"
diff --git a/plugins/channelrx/demoddab/dabdemodsettings.cpp b/plugins/channelrx/demoddab/dabdemodsettings.cpp
index 1102802db..5bd91bce4 100644
--- a/plugins/channelrx/demoddab/dabdemodsettings.cpp
+++ b/plugins/channelrx/demoddab/dabdemodsettings.cpp
@@ -20,7 +20,7 @@
#include <QColor>
-#include "dsp/dspengine.h"
+#include "audio/audiodevicemanager.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
#include "dabdemodsettings.h"
diff --git a/plugins/channelrx/demoddab/dabdemodsink.cpp b/plugins/channelrx/demoddab/dabdemodsink.cpp
index 8af0ef18e..86d9e0d8a 100644
--- a/plugins/channelrx/demoddab/dabdemodsink.cpp
+++ b/plugins/channelrx/demoddab/dabdemodsink.cpp
@@ -21,9 +21,7 @@
#include <complex.h>
-#include "dsp/dspengine.h"
#include "dsp/datafifo.h"
-#include "util/db.h"
#include "maincore.h"
#include "dabdemod.h"
diff --git a/plugins/channelrx/demoddatv/datvdemodgui.cpp b/plugins/channelrx/demoddatv/datvdemodgui.cpp
index ec64274ac..56ef72028 100644
--- a/plugins/channelrx/demoddatv/datvdemodgui.cpp
+++ b/plugins/channelrx/demoddatv/datvdemodgui.cpp
@@ -28,15 +28,13 @@
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "gui/crightclickenabler.h"
#include "gui/audioselectdialog.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
-#include "mainwindow.h"
+#include "maincore.h"
#include "ui_datvdemodgui.h"
#include "datvdemodreport.h"
diff --git a/plugins/channelrx/demoddatv/datvdemodsettings.cpp b/plugins/channelrx/demoddatv/datvdemodsettings.cpp
index 7532d59a3..b9179e7d3 100644
--- a/plugins/channelrx/demoddatv/datvdemodsettings.cpp
+++ b/plugins/channelrx/demoddatv/datvdemodsettings.cpp
@@ -22,7 +22,7 @@
#include "leansdr/dvb.h"
#include "leansdr/sdr.h"
-#include "dsp/dspengine.h"
+#include "audio/audiodevicemanager.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
diff --git a/plugins/channelrx/demoddatv/datvdemodsink.cpp b/plugins/channelrx/demoddatv/datvdemodsink.cpp
index d18665517..42e47170d 100644
--- a/plugins/channelrx/demoddatv/datvdemodsink.cpp
+++ b/plugins/channelrx/demoddatv/datvdemodsink.cpp
@@ -26,10 +26,6 @@
#include <QFileInfo>
#include <QMutexLocker>
-#include "audio/audiooutputdevice.h"
-#include "dsp/dspengine.h"
-#include "device/deviceapi.h"
-
#include "datvdemodreport.h"
const unsigned int DATVDemodSink::m_rfFilterFftLength = 512;
diff --git a/plugins/channelrx/demoddsc/dscdemod.cpp b/plugins/channelrx/demoddsc/dscdemod.cpp
index 82d886d29..48bcf8b80 100644
--- a/plugins/channelrx/demoddsc/dscdemod.cpp
+++ b/plugins/channelrx/demoddsc/dscdemod.cpp
@@ -33,12 +33,9 @@
#include "SWGWorkspaceInfo.h"
#include "SWGDSCDemodSettings.h"
#include "SWGChannelReport.h"
-#include "SWGMapItem.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "settings/serializable.h"
#include "util/db.h"
#include "maincore.h"
diff --git a/plugins/channelrx/demoddsc/dscdemodbaseband.cpp b/plugins/channelrx/demoddsc/dscdemodbaseband.cpp
index e94c40eed..612028414 100644
--- a/plugins/channelrx/demoddsc/dscdemodbaseband.cpp
+++ b/plugins/channelrx/demoddsc/dscdemodbaseband.cpp
@@ -19,7 +19,6 @@
#include <QDebug>
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/downchannelizer.h"
diff --git a/plugins/channelrx/demoddsc/dscdemodgui.cpp b/plugins/channelrx/demoddsc/dscdemodgui.cpp
index 90bf9cfc0..000668797 100644
--- a/plugins/channelrx/demoddsc/dscdemodgui.cpp
+++ b/plugins/channelrx/demoddsc/dscdemodgui.cpp
@@ -36,13 +36,10 @@
#include "dsp/dspdevicesourceengine.h"
#include "ui_dscdemodgui.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/csv.h"
#include "util/db.h"
#include "util/mmsi.h"
-#include "util/units.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/decimaldelegate.h"
#include "dsp/dspengine.h"
#include "dsp/glscopesettings.h"
@@ -55,7 +52,6 @@
#include "maincore.h"
#include "dscdemod.h"
-#include "dscdemodsink.h"
#include "SWGMapItem.h"
diff --git a/plugins/channelrx/demoddsc/dscdemodsettings.cpp b/plugins/channelrx/demoddsc/dscdemodsettings.cpp
index f641a7d02..41133af99 100644
--- a/plugins/channelrx/demoddsc/dscdemodsettings.cpp
+++ b/plugins/channelrx/demoddsc/dscdemodsettings.cpp
@@ -20,7 +20,6 @@
#include <QColor>
-#include "dsp/dspengine.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
#include "dscdemodsettings.h"
diff --git a/plugins/channelrx/demoddsc/dscdemodsink.cpp b/plugins/channelrx/demoddsc/dscdemodsink.cpp
index 7b5019f24..23687f1d3 100644
--- a/plugins/channelrx/demoddsc/dscdemodsink.cpp
+++ b/plugins/channelrx/demoddsc/dscdemodsink.cpp
@@ -19,13 +19,10 @@
#include <complex.h>
-#include "dsp/dspengine.h"
#include "dsp/scopevis.h"
#include "device/deviceapi.h"
#include "util/db.h"
-#include "util/popcount.h"
#include "channel/channelwebapiutils.h"
-#include "maincore.h"
#include "dscdemod.h"
#include "dscdemodsink.h"
diff --git a/plugins/channelrx/demoddsd/dsddecoder.cpp b/plugins/channelrx/demoddsd/dsddecoder.cpp
index 71ee85b96..1ba32205d 100644
--- a/plugins/channelrx/demoddsd/dsddecoder.cpp
+++ b/plugins/channelrx/demoddsd/dsddecoder.cpp
@@ -18,8 +18,6 @@
#include "dsddecoder.h"
#include <QtGlobal>
-#include "audio/audiofifo.h"
-
DSDDecoder::DSDDecoder()
{
diff --git a/plugins/channelrx/demoddsd/dsddemod.cpp b/plugins/channelrx/demoddsd/dsddemod.cpp
index 36648781a..bf7e3884f 100644
--- a/plugins/channelrx/demoddsd/dsddemod.cpp
+++ b/plugins/channelrx/demoddsd/dsddemod.cpp
@@ -39,9 +39,7 @@
#include "SWGDSDDemodSettings.h"
#include "SWGChannelReport.h"
#include "SWGDSDDemodReport.h"
-#include "SWGRDSReport.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
#include "feature/feature.h"
diff --git a/plugins/channelrx/demoddsd/dsddemodgui.cpp b/plugins/channelrx/demoddsd/dsddemodgui.cpp
index 429da08fc..fa88e0248 100644
--- a/plugins/channelrx/demoddsd/dsddemodgui.cpp
+++ b/plugins/channelrx/demoddsd/dsddemodgui.cpp
@@ -27,10 +27,8 @@
#include "dsp/scopevisxy.h"
#include "dsp/dspcommands.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/crightclickenabler.h"
#include "gui/audioselectdialog.h"
#include "gui/dialogpositioner.h"
diff --git a/plugins/channelrx/demoddsd/dsddemodsettings.cpp b/plugins/channelrx/demoddsd/dsddemodsettings.cpp
index 06b7173b1..13d867fa9 100644
--- a/plugins/channelrx/demoddsd/dsddemodsettings.cpp
+++ b/plugins/channelrx/demoddsd/dsddemodsettings.cpp
@@ -18,7 +18,7 @@
#include <QColor>
-#include "dsp/dspengine.h"
+#include "audio/audiodevicemanager.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
#include "dsddemodsettings.h"
diff --git a/plugins/channelrx/demoddsd/dsddemodsink.cpp b/plugins/channelrx/demoddsd/dsddemodsink.cpp
index f8c2249d2..ed1be9f45 100644
--- a/plugins/channelrx/demoddsd/dsddemodsink.cpp
+++ b/plugins/channelrx/demoddsd/dsddemodsink.cpp
@@ -25,19 +25,10 @@
#include <QNetworkReply>
#include <QBuffer>
-#include "SWGChannelSettings.h"
-#include "SWGDSDDemodSettings.h"
-#include "SWGChannelReport.h"
-#include "SWGDSDDemodReport.h"
-#include "SWGRDSReport.h"
-
-#include "dsp/dspengine.h"
#include "dsp/basebandsamplesink.h"
#include "dsp/datafifo.h"
#include "dsp/dspcommands.h"
#include "feature/feature.h"
-#include "audio/audiooutputdevice.h"
-#include "util/db.h"
#include "util/messagequeue.h"
#include "maincore.h"
diff --git a/plugins/channelrx/demodendoftrain/endoftraindemod.cpp b/plugins/channelrx/demodendoftrain/endoftraindemod.cpp
index b9a17de61..9a186e23f 100644
--- a/plugins/channelrx/demodendoftrain/endoftraindemod.cpp
+++ b/plugins/channelrx/demodendoftrain/endoftraindemod.cpp
@@ -30,7 +30,6 @@
#include "SWGEndOfTrainDemodSettings.h"
#include "SWGChannelReport.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
#include "settings/serializable.h"
diff --git a/plugins/channelrx/demodendoftrain/endoftraindemodbaseband.cpp b/plugins/channelrx/demodendoftrain/endoftraindemodbaseband.cpp
index b00b09614..ecc0a7833 100644
--- a/plugins/channelrx/demodendoftrain/endoftraindemodbaseband.cpp
+++ b/plugins/channelrx/demodendoftrain/endoftraindemodbaseband.cpp
@@ -19,7 +19,6 @@
#include <QDebug>
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/downchannelizer.h"
diff --git a/plugins/channelrx/demodendoftrain/endoftraindemodgui.cpp b/plugins/channelrx/demodendoftrain/endoftraindemodgui.cpp
index 68ec859e5..e66af8551 100644
--- a/plugins/channelrx/demodendoftrain/endoftraindemodgui.cpp
+++ b/plugins/channelrx/demodendoftrain/endoftraindemodgui.cpp
@@ -32,21 +32,15 @@
#include "dsp/dspcommands.h"
#include "ui_endoftraindemodgui.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/csv.h"
#include "util/db.h"
-#include "util/units.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "dsp/dspengine.h"
#include "dsp/glscopesettings.h"
-#include "gui/crightclickenabler.h"
#include "gui/dialogpositioner.h"
-#include "channel/channelwebapiutils.h"
#include "maincore.h"
#include "endoftraindemod.h"
-#include "endoftraindemodsink.h"
void EndOfTrainDemodGUI::resizeTable()
{
diff --git a/plugins/channelrx/demodendoftrain/endoftraindemodsink.cpp b/plugins/channelrx/demodendoftrain/endoftraindemodsink.cpp
index 83775f7df..d950a574a 100644
--- a/plugins/channelrx/demodendoftrain/endoftraindemodsink.cpp
+++ b/plugins/channelrx/demodendoftrain/endoftraindemodsink.cpp
@@ -18,10 +18,8 @@
#include <QDebug>
-#include "dsp/dspengine.h"
#include "dsp/datafifo.h"
#include "device/deviceapi.h"
-#include "util/db.h"
#include "channel/channelwebapiutils.h"
#include "maincore.h"
diff --git a/plugins/channelrx/demodfreedv/freedvdemod.cpp b/plugins/channelrx/demodfreedv/freedvdemod.cpp
index 6705afd2b..1d6dd4a31 100644
--- a/plugins/channelrx/demodfreedv/freedvdemod.cpp
+++ b/plugins/channelrx/demodfreedv/freedvdemod.cpp
@@ -31,11 +31,9 @@
#include "SWGChannelReport.h"
#include "SWGFreeDVDemodReport.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/devicesamplemimo.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "util/db.h"
#include "maincore.h"
diff --git a/plugins/channelrx/demodfreedv/freedvdemodgui.cpp b/plugins/channelrx/demodfreedv/freedvdemodgui.cpp
index 53b5aeb8d..5a738215f 100644
--- a/plugins/channelrx/demodfreedv/freedvdemodgui.cpp
+++ b/plugins/channelrx/demodfreedv/freedvdemodgui.cpp
@@ -29,11 +29,9 @@
#include "dsp/dspcommands.h"
#include "gui/glspectrum.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "gui/crightclickenabler.h"
#include "gui/audioselectdialog.h"
diff --git a/plugins/channelrx/demodfreedv/freedvdemodsettings.cpp b/plugins/channelrx/demodfreedv/freedvdemodsettings.cpp
index 5bb1ee191..2d1945081 100644
--- a/plugins/channelrx/demodfreedv/freedvdemodsettings.cpp
+++ b/plugins/channelrx/demodfreedv/freedvdemodsettings.cpp
@@ -20,7 +20,7 @@
#include <QColor>
-#include "dsp/dspengine.h"
+#include "audio/audiodevicemanager.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
#include "freedvdemodsettings.h"
diff --git a/plugins/channelrx/demodfreedv/freedvdemodsink.cpp b/plugins/channelrx/demodfreedv/freedvdemodsink.cpp
index 44f0bbac0..070ed4048 100644
--- a/plugins/channelrx/demodfreedv/freedvdemodsink.cpp
+++ b/plugins/channelrx/demodfreedv/freedvdemodsink.cpp
@@ -22,7 +22,6 @@
#include "codec2/modem_stats.h"
#include "dsp/basebandsamplesink.h"
-#include "audio/audiooutputdevice.h"
#include "util/db.h"
#include "freedvdemodsink.h"
diff --git a/plugins/channelrx/demodft8/ft8demod.cpp b/plugins/channelrx/demodft8/ft8demod.cpp
index 23232a3a8..dccdd3c31 100644
--- a/plugins/channelrx/demodft8/ft8demod.cpp
+++ b/plugins/channelrx/demodft8/ft8demod.cpp
@@ -36,7 +36,6 @@
#include "SWGChannelReport.h"
#include "SWGFT8DemodReport.h"
-#include "dsp/dspengine.h"
#include "dsp/dspdevicesourceengine.h"
#include "dsp/dspdevicemimoengine.h"
#include "dsp/devicesamplesource.h"
@@ -44,7 +43,6 @@
#include "dsp/dspcommands.h"
#include "dsp/devicesamplemimo.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "util/db.h"
#include "maincore.h"
diff --git a/plugins/channelrx/demodft8/ft8demodbaseband.cpp b/plugins/channelrx/demodft8/ft8demodbaseband.cpp
index 6cf604d89..6981f90b4 100644
--- a/plugins/channelrx/demodft8/ft8demodbaseband.cpp
+++ b/plugins/channelrx/demodft8/ft8demodbaseband.cpp
@@ -19,7 +19,6 @@
#include <QDebug>
#include <QThread>
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/spectrumvis.h"
#include "maincore.h"
diff --git a/plugins/channelrx/demodft8/ft8demodgui.cpp b/plugins/channelrx/demodft8/ft8demodgui.cpp
index bb66a4888..43f762245 100644
--- a/plugins/channelrx/demodft8/ft8demodgui.cpp
+++ b/plugins/channelrx/demodft8/ft8demodgui.cpp
@@ -25,11 +25,8 @@
#include "dsp/spectrumvis.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
-#include "util/simpleserializer.h"
#include "gui/glspectrum.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
-#include "gui/crightclickenabler.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
#include "util/db.h"
diff --git a/plugins/channelrx/demodft8/ft8demodsettings.cpp b/plugins/channelrx/demodft8/ft8demodsettings.cpp
index eec84bb14..08a8b2cda 100644
--- a/plugins/channelrx/demodft8/ft8demodsettings.cpp
+++ b/plugins/channelrx/demodft8/ft8demodsettings.cpp
@@ -20,7 +20,6 @@
#include <QColor>
-#include "dsp/dspengine.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
#include "ft8demodsettings.h"
diff --git a/plugins/channelrx/demodft8/ft8demodsink.cpp b/plugins/channelrx/demodft8/ft8demodsink.cpp
index 64e72afef..8bff93045 100644
--- a/plugins/channelrx/demodft8/ft8demodsink.cpp
+++ b/plugins/channelrx/demodft8/ft8demodsink.cpp
@@ -20,14 +20,8 @@
#include <QTime>
#include <QDebug>
-#include "audio/audiooutputdevice.h"
-#include "dsp/dspengine.h"
-#include "dsp/dspcommands.h"
-#include "dsp/devicesamplemimo.h"
#include "dsp/spectrumvis.h"
#include "dsp/datafifo.h"
-#include "device/deviceapi.h"
-#include "util/db.h"
#include "util/messagequeue.h"
#include "maincore.h"
diff --git a/plugins/channelrx/demodils/ilsdemod.cpp b/plugins/channelrx/demodils/ilsdemod.cpp
index d0b48d600..c93afac92 100644
--- a/plugins/channelrx/demodils/ilsdemod.cpp
+++ b/plugins/channelrx/demodils/ilsdemod.cpp
@@ -31,13 +31,10 @@
#include "SWGWorkspaceInfo.h"
#include "SWGILSDemodSettings.h"
#include "SWGChannelReport.h"
-#include "SWGMapItem.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/morsedemod.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "settings/serializable.h"
#include "util/db.h"
#include "maincore.h"
diff --git a/plugins/channelrx/demodils/ilsdemodgui.cpp b/plugins/channelrx/demodils/ilsdemodgui.cpp
index 11e9e3632..e15f02368 100644
--- a/plugins/channelrx/demodils/ilsdemodgui.cpp
+++ b/plugins/channelrx/demodils/ilsdemodgui.cpp
@@ -36,27 +36,22 @@
#include "dsp/morsedemod.h"
#include "ui_ilsdemodgui.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "util/units.h"
#include "util/morse.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "dsp/dspengine.h"
#include "dsp/glscopesettings.h"
#include "dsp/spectrumvis.h"
#include "gui/crightclickenabler.h"
-#include "gui/tabletapandhold.h"
#include "gui/dialogpositioner.h"
#include "gui/audioselectdialog.h"
#include "channel/channelwebapiutils.h"
#include "feature/featurewebapiutils.h"
#include "feature/feature.h"
-#include "feature/featureset.h"
#include "maincore.h"
#include "ilsdemod.h"
-#include "ilsdemodsink.h"
MESSAGE_CLASS_DEFINITION(ILSDemodGUI::MsgGSAngle, Message)
diff --git a/plugins/channelrx/demodils/ilsdemodsettings.cpp b/plugins/channelrx/demodils/ilsdemodsettings.cpp
index 07899c530..dbd612f33 100644
--- a/plugins/channelrx/demodils/ilsdemodsettings.cpp
+++ b/plugins/channelrx/demodils/ilsdemodsettings.cpp
@@ -17,7 +17,7 @@
#include <QColor>
-#include "dsp/dspengine.h"
+#include "audio/audiodevicemanager.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
#include "ilsdemodsettings.h"
diff --git a/plugins/channelrx/demodils/ilsdemodsink.cpp b/plugins/channelrx/demodils/ilsdemodsink.cpp
index 333e59efc..30243f831 100644
--- a/plugins/channelrx/demodils/ilsdemodsink.cpp
+++ b/plugins/channelrx/demodils/ilsdemodsink.cpp
@@ -24,9 +24,6 @@
#include "dsp/scopevis.h"
#include "util/stepfunctions.h"
#include "util/db.h"
-#include "util/morse.h"
-#include "util/units.h"
-#include "maincore.h"
#include "ilsdemod.h"
#include "ilsdemodsink.h"
diff --git a/plugins/channelrx/demodm17/m17demod.cpp b/plugins/channelrx/demodm17/m17demod.cpp
index c42b399de..58a2df106 100644
--- a/plugins/channelrx/demodm17/m17demod.cpp
+++ b/plugins/channelrx/demodm17/m17demod.cpp
@@ -36,11 +36,8 @@
#include "SWGWorkspaceInfo.h"
#include "SWGChannelReport.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
-#include "feature/featureset.h"
#include "settings/serializable.h"
#include "util/db.h"
#include "maincore.h"
diff --git a/plugins/channelrx/demodm17/m17demodgui.cpp b/plugins/channelrx/demodm17/m17demodgui.cpp
index dbd2de524..51941bf2a 100644
--- a/plugins/channelrx/demodm17/m17demodgui.cpp
+++ b/plugins/channelrx/demodm17/m17demodgui.cpp
@@ -33,11 +33,8 @@
#include "dsp/scopevisxy.h"
#include "dsp/dspcommands.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
-#include "util/csv.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/crightclickenabler.h"
#include "gui/audioselectdialog.h"
#include "gui/dialpopup.h"
diff --git a/plugins/channelrx/demodm17/m17demodsettings.cpp b/plugins/channelrx/demodm17/m17demodsettings.cpp
index fb92f4e25..5dbe4d0f0 100644
--- a/plugins/channelrx/demodm17/m17demodsettings.cpp
+++ b/plugins/channelrx/demodm17/m17demodsettings.cpp
@@ -18,7 +18,7 @@
#include <QColor>
-#include "dsp/dspengine.h"
+#include "audio/audiodevicemanager.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
diff --git a/plugins/channelrx/demodm17/m17demodsink.cpp b/plugins/channelrx/demodm17/m17demodsink.cpp
index 321f54c15..7fd8ad4a0 100644
--- a/plugins/channelrx/demodm17/m17demodsink.cpp
+++ b/plugins/channelrx/demodm17/m17demodsink.cpp
@@ -26,18 +26,8 @@
#include <QNetworkReply>
#include <QBuffer>
-#include "SWGChannelSettings.h"
-#include "SWGDSDDemodSettings.h"
-#include "SWGChannelReport.h"
-#include "SWGDSDDemodReport.h"
-
-#include "dsp/dspengine.h"
#include "dsp/basebandsamplesink.h"
#include "dsp/datafifo.h"
-#include "dsp/dspcommands.h"
-#include "feature/feature.h"
-#include "audio/audiooutputdevice.h"
-#include "util/db.h"
#include "util/messagequeue.h"
#include "maincore.h"
diff --git a/plugins/channelrx/demodnavtex/navtexdemod.cpp b/plugins/channelrx/demodnavtex/navtexdemod.cpp
index 9c7a59b51..eddb49d4e 100644
--- a/plugins/channelrx/demodnavtex/navtexdemod.cpp
+++ b/plugins/channelrx/demodnavtex/navtexdemod.cpp
@@ -32,12 +32,9 @@
#include "SWGWorkspaceInfo.h"
#include "SWGNavtexDemodSettings.h"
#include "SWGChannelReport.h"
-#include "SWGMapItem.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "settings/serializable.h"
#include "util/db.h"
#include "maincore.h"
diff --git a/plugins/channelrx/demodnavtex/navtexdemodbaseband.cpp b/plugins/channelrx/demodnavtex/navtexdemodbaseband.cpp
index 655d9bfcb..8720ceddf 100644
--- a/plugins/channelrx/demodnavtex/navtexdemodbaseband.cpp
+++ b/plugins/channelrx/demodnavtex/navtexdemodbaseband.cpp
@@ -19,7 +19,6 @@
#include <QDebug>
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/downchannelizer.h"
diff --git a/plugins/channelrx/demodnavtex/navtexdemodgui.cpp b/plugins/channelrx/demodnavtex/navtexdemodgui.cpp
index dc64f8db5..2c71eb467 100644
--- a/plugins/channelrx/demodnavtex/navtexdemodgui.cpp
+++ b/plugins/channelrx/demodnavtex/navtexdemodgui.cpp
@@ -33,25 +33,18 @@
#include "dsp/dspcommands.h"
#include "ui_navtexdemodgui.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/csv.h"
#include "util/db.h"
-#include "util/morse.h"
-#include "util/units.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/decimaldelegate.h"
#include "dsp/dspengine.h"
#include "dsp/glscopesettings.h"
-#include "gui/crightclickenabler.h"
#include "gui/tabletapandhold.h"
#include "gui/dialogpositioner.h"
-#include "channel/channelwebapiutils.h"
#include "feature/featurewebapiutils.h"
#include "maincore.h"
#include "navtexdemod.h"
-#include "navtexdemodsink.h"
void NavtexDemodGUI::resizeTable()
{
diff --git a/plugins/channelrx/demodnavtex/navtexdemodsettings.cpp b/plugins/channelrx/demodnavtex/navtexdemodsettings.cpp
index fe377409d..e78ae8bf6 100644
--- a/plugins/channelrx/demodnavtex/navtexdemodsettings.cpp
+++ b/plugins/channelrx/demodnavtex/navtexdemodsettings.cpp
@@ -20,7 +20,6 @@
#include <QColor>
-#include "dsp/dspengine.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
#include "navtexdemodsettings.h"
diff --git a/plugins/channelrx/demodnavtex/navtexdemodsink.cpp b/plugins/channelrx/demodnavtex/navtexdemodsink.cpp
index c73b3a2b3..ba91b870e 100644
--- a/plugins/channelrx/demodnavtex/navtexdemodsink.cpp
+++ b/plugins/channelrx/demodnavtex/navtexdemodsink.cpp
@@ -21,10 +21,8 @@
#include <complex.h>
-#include "dsp/dspengine.h"
#include "dsp/scopevis.h"
#include "util/db.h"
-#include "maincore.h"
#include "navtexdemod.h"
#include "navtexdemodsink.h"
diff --git a/plugins/channelrx/demodnfm/nfmdemod.cpp b/plugins/channelrx/demodnfm/nfmdemod.cpp
index f04ae8b86..ab475ee79 100644
--- a/plugins/channelrx/demodnfm/nfmdemod.cpp
+++ b/plugins/channelrx/demodnfm/nfmdemod.cpp
@@ -36,11 +36,9 @@
#include "SWGChannelReport.h"
#include "SWGNFMDemodReport.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/devicesamplemimo.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "settings/serializable.h"
#include "util/db.h"
#include "maincore.h"
diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.cpp b/plugins/channelrx/demodnfm/nfmdemodgui.cpp
index f65690501..f581cdbbc 100644
--- a/plugins/channelrx/demodnfm/nfmdemodgui.cpp
+++ b/plugins/channelrx/demodnfm/nfmdemodgui.cpp
@@ -25,10 +25,8 @@
#include "ui_nfmdemodgui.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/crightclickenabler.h"
#include "gui/audioselectdialog.h"
#include "gui/dialpopup.h"
diff --git a/plugins/channelrx/demodnfm/nfmdemodsink.cpp b/plugins/channelrx/demodnfm/nfmdemodsink.cpp
index 2639be51c..9d56b6045 100644
--- a/plugins/channelrx/demodnfm/nfmdemodsink.cpp
+++ b/plugins/channelrx/demodnfm/nfmdemodsink.cpp
@@ -22,16 +22,9 @@
#include <QTime>
#include <QDebug>
-#include "util/stepfunctions.h"
-#include "util/db.h"
#include "util/messagequeue.h"
-#include "audio/audiooutputdevice.h"
-#include "dsp/dspengine.h"
-#include "dsp/dspcommands.h"
-#include "dsp/devicesamplemimo.h"
#include "dsp/misc.h"
#include "dsp/datafifo.h"
-#include "device/deviceapi.h"
#include "maincore.h"
#include "nfmdemodreport.h"
diff --git a/plugins/channelrx/demodpacket/packetdemod.cpp b/plugins/channelrx/demodpacket/packetdemod.cpp
index 1e58a7c47..2afebb1db 100644
--- a/plugins/channelrx/demodpacket/packetdemod.cpp
+++ b/plugins/channelrx/demodpacket/packetdemod.cpp
@@ -32,12 +32,9 @@
#include "SWGWorkspaceInfo.h"
#include "SWGPacketDemodSettings.h"
#include "SWGChannelReport.h"
-#include "SWGMapItem.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "settings/serializable.h"
#include "util/ax25.h"
#include "util/db.h"
diff --git a/plugins/channelrx/demodpacket/packetdemodbaseband.cpp b/plugins/channelrx/demodpacket/packetdemodbaseband.cpp
index c6f92ab71..e943a78f8 100644
--- a/plugins/channelrx/demodpacket/packetdemodbaseband.cpp
+++ b/plugins/channelrx/demodpacket/packetdemodbaseband.cpp
@@ -19,7 +19,6 @@
#include <QDebug>
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/downchannelizer.h"
diff --git a/plugins/channelrx/demodpacket/packetdemodgui.cpp b/plugins/channelrx/demodpacket/packetdemodgui.cpp
index 26256648a..a53c99aad 100644
--- a/plugins/channelrx/demodpacket/packetdemodgui.cpp
+++ b/plugins/channelrx/demodpacket/packetdemodgui.cpp
@@ -31,20 +31,14 @@
#include "dsp/dspcommands.h"
#include "ui_packetdemodgui.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/csv.h"
#include "util/db.h"
-#include "util/units.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "dsp/dspengine.h"
-#include "gui/crightclickenabler.h"
#include "gui/dialogpositioner.h"
-#include "channel/channelwebapiutils.h"
#include "maincore.h"
#include "packetdemod.h"
-#include "packetdemodsink.h"
void PacketDemodGUI::resizeTable()
{
diff --git a/plugins/channelrx/demodpacket/packetdemodsettings.cpp b/plugins/channelrx/demodpacket/packetdemodsettings.cpp
index d3a9c5172..1705a7541 100644
--- a/plugins/channelrx/demodpacket/packetdemodsettings.cpp
+++ b/plugins/channelrx/demodpacket/packetdemodsettings.cpp
@@ -20,7 +20,6 @@
#include <QColor>
-#include "dsp/dspengine.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
#include "packetdemodsettings.h"
diff --git a/plugins/channelrx/demodpacket/packetdemodsink.cpp b/plugins/channelrx/demodpacket/packetdemodsink.cpp
index ae3b1079b..21a971a99 100644
--- a/plugins/channelrx/demodpacket/packetdemodsink.cpp
+++ b/plugins/channelrx/demodpacket/packetdemodsink.cpp
@@ -20,11 +20,8 @@
#include <complex.h>
-#include "dsp/dspengine.h"
#include "dsp/datafifo.h"
#include "device/deviceapi.h"
-#include "util/db.h"
-#include "util/stepfunctions.h"
#include "channel/channelwebapiutils.h"
#include "maincore.h"
diff --git a/plugins/channelrx/demodpager/pagerdemod.cpp b/plugins/channelrx/demodpager/pagerdemod.cpp
index 8bc9d227c..49bb2af58 100644
--- a/plugins/channelrx/demodpager/pagerdemod.cpp
+++ b/plugins/channelrx/demodpager/pagerdemod.cpp
@@ -28,10 +28,8 @@
#include "SWGWorkspaceInfo.h"
#include "SWGChannelReport.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "util/db.h"
#include "maincore.h"
diff --git a/plugins/channelrx/demodpager/pagerdemodbaseband.cpp b/plugins/channelrx/demodpager/pagerdemodbaseband.cpp
index 5b06de944..1e38cce06 100644
--- a/plugins/channelrx/demodpager/pagerdemodbaseband.cpp
+++ b/plugins/channelrx/demodpager/pagerdemodbaseband.cpp
@@ -19,7 +19,6 @@
#include <QDebug>
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/downchannelizer.h"
diff --git a/plugins/channelrx/demodpager/pagerdemodgui.cpp b/plugins/channelrx/demodpager/pagerdemodgui.cpp
index 6250f9731..89dea3efd 100644
--- a/plugins/channelrx/demodpager/pagerdemodgui.cpp
+++ b/plugins/channelrx/demodpager/pagerdemodgui.cpp
@@ -34,14 +34,10 @@
#include "dsp/dspcommands.h"
#include "ui_pagerdemodgui.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "util/csv.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "dsp/dspengine.h"
-#include "dsp/glscopesettings.h"
-#include "gui/crightclickenabler.h"
#include "gui/dialogpositioner.h"
#include "maincore.h"
diff --git a/plugins/channelrx/demodpager/pagerdemodsettings.cpp b/plugins/channelrx/demodpager/pagerdemodsettings.cpp
index bbbe52bd6..df737ba90 100644
--- a/plugins/channelrx/demodpager/pagerdemodsettings.cpp
+++ b/plugins/channelrx/demodpager/pagerdemodsettings.cpp
@@ -21,7 +21,6 @@
#include <QColor>
#include <QDataStream>
-#include "dsp/dspengine.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
#include "pagerdemodsettings.h"
diff --git a/plugins/channelrx/demodpager/pagerdemodsink.cpp b/plugins/channelrx/demodpager/pagerdemodsink.cpp
index c5b43d1cf..cc6918fba 100644
--- a/plugins/channelrx/demodpager/pagerdemodsink.cpp
+++ b/plugins/channelrx/demodpager/pagerdemodsink.cpp
@@ -20,10 +20,8 @@
#include <complex.h>
-#include "dsp/dspengine.h"
#include "dsp/datafifo.h"
#include "dsp/scopevis.h"
-#include "util/db.h"
#include "util/popcount.h"
#include "maincore.h"
diff --git a/plugins/channelrx/demodradiosonde/radiosondedemod.cpp b/plugins/channelrx/demodradiosonde/radiosondedemod.cpp
index 8aefc3f7e..6ed212731 100644
--- a/plugins/channelrx/demodradiosonde/radiosondedemod.cpp
+++ b/plugins/channelrx/demodradiosonde/radiosondedemod.cpp
@@ -30,13 +30,9 @@
#include "SWGChannelSettings.h"
#include "SWGWorkspaceInfo.h"
-#include "SWGChannelReport.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
-#include "util/db.h"
#include "maincore.h"
MESSAGE_CLASS_DEFINITION(RadiosondeDemod::MsgConfigureRadiosondeDemod, Message)
diff --git a/plugins/channelrx/demodradiosonde/radiosondedemodbaseband.cpp b/plugins/channelrx/demodradiosonde/radiosondedemodbaseband.cpp
index a81853a91..9b0809a56 100644
--- a/plugins/channelrx/demodradiosonde/radiosondedemodbaseband.cpp
+++ b/plugins/channelrx/demodradiosonde/radiosondedemodbaseband.cpp
@@ -19,7 +19,6 @@
#include <QDebug>
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/downchannelizer.h"
diff --git a/plugins/channelrx/demodradiosonde/radiosondedemodgui.cpp b/plugins/channelrx/demodradiosonde/radiosondedemodgui.cpp
index 4991b2a59..84d6f4839 100644
--- a/plugins/channelrx/demodradiosonde/radiosondedemodgui.cpp
+++ b/plugins/channelrx/demodradiosonde/radiosondedemodgui.cpp
@@ -32,12 +32,10 @@
#include "dsp/dspcommands.h"
#include "ui_radiosondedemodgui.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/csv.h"
#include "util/db.h"
#include "util/units.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/datetimedelegate.h"
#include "gui/decimaldelegate.h"
#include "gui/timedelegate.h"
@@ -45,14 +43,11 @@
#include "gui/dialogpositioner.h"
#include "dsp/dspengine.h"
#include "dsp/glscopesettings.h"
-#include "gui/crightclickenabler.h"
#include "gui/tabletapandhold.h"
-#include "channel/channelwebapiutils.h"
#include "maincore.h"
#include "feature/featurewebapiutils.h"
#include "radiosondedemod.h"
-#include "radiosondedemodsink.h"
void RadiosondeDemodGUI::resizeTable()
{
diff --git a/plugins/channelrx/demodradiosonde/radiosondedemodsettings.cpp b/plugins/channelrx/demodradiosonde/radiosondedemodsettings.cpp
index 01063807d..e01956bd0 100644
--- a/plugins/channelrx/demodradiosonde/radiosondedemodsettings.cpp
+++ b/plugins/channelrx/demodradiosonde/radiosondedemodsettings.cpp
@@ -20,7 +20,6 @@
#include <QColor>
-#include "dsp/dspengine.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
#include "radiosondedemodsettings.h"
diff --git a/plugins/channelrx/demodradiosonde/radiosondedemodsink.cpp b/plugins/channelrx/demodradiosonde/radiosondedemodsink.cpp
index f020361dc..8c709c1fa 100644
--- a/plugins/channelrx/demodradiosonde/radiosondedemodsink.cpp
+++ b/plugins/channelrx/demodradiosonde/radiosondedemodsink.cpp
@@ -20,12 +20,9 @@
#include <complex.h>
-#include "dsp/dspengine.h"
#include "dsp/datafifo.h"
#include "dsp/scopevis.h"
#include "device/deviceapi.h"
-#include "util/db.h"
-#include "util/stepfunctions.h"
#include "channel/channelwebapiutils.h"
#include "util/reedsolomon.h"
#include "maincore.h"
diff --git a/plugins/channelrx/demodrtty/rttydemod.cpp b/plugins/channelrx/demodrtty/rttydemod.cpp
index 12c73ade0..68c71ca09 100644
--- a/plugins/channelrx/demodrtty/rttydemod.cpp
+++ b/plugins/channelrx/demodrtty/rttydemod.cpp
@@ -32,12 +32,9 @@
#include "SWGWorkspaceInfo.h"
#include "SWGRTTYDemodSettings.h"
#include "SWGChannelReport.h"
-#include "SWGMapItem.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "settings/serializable.h"
#include "util/db.h"
#include "maincore.h"
diff --git a/plugins/channelrx/demodrtty/rttydemodbaseband.cpp b/plugins/channelrx/demodrtty/rttydemodbaseband.cpp
index 00cdbae9d..f134a1ab8 100644
--- a/plugins/channelrx/demodrtty/rttydemodbaseband.cpp
+++ b/plugins/channelrx/demodrtty/rttydemodbaseband.cpp
@@ -19,7 +19,6 @@
#include <QDebug>
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/downchannelizer.h"
diff --git a/plugins/channelrx/demodrtty/rttydemodgui.cpp b/plugins/channelrx/demodrtty/rttydemodgui.cpp
index 4bfbf0f35..29977f38d 100644
--- a/plugins/channelrx/demodrtty/rttydemodgui.cpp
+++ b/plugins/channelrx/demodrtty/rttydemodgui.cpp
@@ -31,22 +31,15 @@
#include "dsp/dspcommands.h"
#include "ui_rttydemodgui.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "util/rtty.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "dsp/dspengine.h"
#include "dsp/glscopesettings.h"
-#include "gui/crightclickenabler.h"
-#include "gui/tabletapandhold.h"
#include "gui/dialogpositioner.h"
-#include "channel/channelwebapiutils.h"
-#include "feature/featurewebapiutils.h"
#include "maincore.h"
#include "rttydemod.h"
-#include "rttydemodsink.h"
RttyDemodGUI* RttyDemodGUI::create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel)
{
diff --git a/plugins/channelrx/demodrtty/rttydemodsettings.cpp b/plugins/channelrx/demodrtty/rttydemodsettings.cpp
index 8f0f2fce9..5da7a8086 100644
--- a/plugins/channelrx/demodrtty/rttydemodsettings.cpp
+++ b/plugins/channelrx/demodrtty/rttydemodsettings.cpp
@@ -20,7 +20,6 @@
#include <QColor>
-#include "dsp/dspengine.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
#include "rttydemodsettings.h"
diff --git a/plugins/channelrx/demodrtty/rttydemodsink.cpp b/plugins/channelrx/demodrtty/rttydemodsink.cpp
index 119133e4b..f011bf6bf 100644
--- a/plugins/channelrx/demodrtty/rttydemodsink.cpp
+++ b/plugins/channelrx/demodrtty/rttydemodsink.cpp
@@ -23,7 +23,6 @@
#include "dsp/dspengine.h"
#include "dsp/scopevis.h"
#include "util/db.h"
-#include "maincore.h"
#include "rttydemod.h"
#include "rttydemodsink.h"
diff --git a/plugins/channelrx/demodssb/ssbdemod.cpp b/plugins/channelrx/demodssb/ssbdemod.cpp
index 0d9554a3e..9306b65fc 100644
--- a/plugins/channelrx/demodssb/ssbdemod.cpp
+++ b/plugins/channelrx/demodssb/ssbdemod.cpp
@@ -38,11 +38,9 @@
#include "SWGChannelReport.h"
#include "SWGSSBDemodReport.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/devicesamplemimo.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "util/db.h"
#include "maincore.h"
diff --git a/plugins/channelrx/demodssb/ssbdemodgui.cpp b/plugins/channelrx/demodssb/ssbdemodgui.cpp
index 5bc545011..ea969e5e1 100644
--- a/plugins/channelrx/demodssb/ssbdemodgui.cpp
+++ b/plugins/channelrx/demodssb/ssbdemodgui.cpp
@@ -29,9 +29,7 @@
#include "dsp/dspcommands.h"
#include "gui/glspectrum.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "gui/crightclickenabler.h"
#include "gui/audioselectdialog.h"
diff --git a/plugins/channelrx/demodssb/ssbdemodsettings.cpp b/plugins/channelrx/demodssb/ssbdemodsettings.cpp
index bf51c6da1..48e9be872 100644
--- a/plugins/channelrx/demodssb/ssbdemodsettings.cpp
+++ b/plugins/channelrx/demodssb/ssbdemodsettings.cpp
@@ -20,7 +20,7 @@
#include <QColor>
-#include "dsp/dspengine.h"
+#include "audio/audiodevicemanager.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
#include "ssbdemodsettings.h"
diff --git a/plugins/channelrx/demodssb/ssbdemodsink.cpp b/plugins/channelrx/demodssb/ssbdemodsink.cpp
index 3635ac96e..88f9e575d 100644
--- a/plugins/channelrx/demodssb/ssbdemodsink.cpp
+++ b/plugins/channelrx/demodssb/ssbdemodsink.cpp
@@ -20,13 +20,8 @@
#include <QTime>
#include <QDebug>
-#include "audio/audiooutputdevice.h"
-#include "dsp/dspengine.h"
-#include "dsp/dspcommands.h"
-#include "dsp/devicesamplemimo.h"
#include "dsp/spectrumvis.h"
#include "dsp/datafifo.h"
-#include "device/deviceapi.h"
#include "util/db.h"
#include "util/messagequeue.h"
#include "maincore.h"
diff --git a/plugins/channelrx/demodvor/vordemod.cpp b/plugins/channelrx/demodvor/vordemod.cpp
index 5ee93644e..06f830abd 100644
--- a/plugins/channelrx/demodvor/vordemod.cpp
+++ b/plugins/channelrx/demodvor/vordemod.cpp
@@ -36,11 +36,9 @@
#include "SWGChannelReport.h"
#include "SWGVORDemodReport.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/morsedemod.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "settings/serializable.h"
#include "util/db.h"
#include "maincore.h"
diff --git a/plugins/channelrx/demodvor/vordemodbaseband.cpp b/plugins/channelrx/demodvor/vordemodbaseband.cpp
index 819133f08..7d140b724 100644
--- a/plugins/channelrx/demodvor/vordemodbaseband.cpp
+++ b/plugins/channelrx/demodvor/vordemodbaseband.cpp
@@ -24,7 +24,6 @@
#include "dsp/downchannelizer.h"
#include "vordemodbaseband.h"
-#include "vordemodreport.h"
MESSAGE_CLASS_DEFINITION(VORDemodBaseband::MsgConfigureVORDemodBaseband, Message)
diff --git a/plugins/channelrx/demodvor/vordemodgui.cpp b/plugins/channelrx/demodvor/vordemodgui.cpp
index 57504060b..4de437e5b 100644
--- a/plugins/channelrx/demodvor/vordemodgui.cpp
+++ b/plugins/channelrx/demodvor/vordemodgui.cpp
@@ -25,17 +25,13 @@
#include "dsp/dspcommands.h"
#include "dsp/dspengine.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "util/morse.h"
-#include "util/units.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/crightclickenabler.h"
#include "gui/audioselectdialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
-#include "channel/channelwebapiutils.h"
#include "maincore.h"
#include "ui_vordemodgui.h"
diff --git a/plugins/channelrx/demodvor/vordemodsettings.cpp b/plugins/channelrx/demodvor/vordemodsettings.cpp
index 276939fbc..f14cd1a96 100644
--- a/plugins/channelrx/demodvor/vordemodsettings.cpp
+++ b/plugins/channelrx/demodvor/vordemodsettings.cpp
@@ -20,7 +20,7 @@
#include <QColor>
-#include "dsp/dspengine.h"
+#include "audio/audiodevicemanager.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
#include "vordemodsettings.h"
diff --git a/plugins/channelrx/demodvor/vordemodsink.cpp b/plugins/channelrx/demodvor/vordemodsink.cpp
index 42c793458..b60d43c4b 100644
--- a/plugins/channelrx/demodvor/vordemodsink.cpp
+++ b/plugins/channelrx/demodvor/vordemodsink.cpp
@@ -20,11 +20,8 @@
#include <complex.h>
-#include "audio/audiooutputdevice.h"
-#include "dsp/dspengine.h"
#include "util/db.h"
#include "util/stepfunctions.h"
-#include "util/morse.h"
#include "util/units.h"
#include "vordemodreport.h"
diff --git a/plugins/channelrx/demodvormc/vordemodmc.cpp b/plugins/channelrx/demodvormc/vordemodmc.cpp
index ff6f1a972..7282723ac 100644
--- a/plugins/channelrx/demodvormc/vordemodmc.cpp
+++ b/plugins/channelrx/demodvormc/vordemodmc.cpp
@@ -33,10 +33,8 @@
#include "SWGChannelReport.h"
#include "SWGVORDemodReport.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "settings/serializable.h"
#include "util/db.h"
#include "maincore.h"
diff --git a/plugins/channelrx/demodvormc/vordemodmcgui.cpp b/plugins/channelrx/demodvormc/vordemodmcgui.cpp
index e200faf0c..7d91478b8 100644
--- a/plugins/channelrx/demodvormc/vordemodmcgui.cpp
+++ b/plugins/channelrx/demodvormc/vordemodmcgui.cpp
@@ -34,23 +34,19 @@
#include "dsp/dspcommands.h"
#include "ui_vordemodmcgui.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "util/morse.h"
#include "util/units.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "dsp/dspengine.h"
#include "gui/crightclickenabler.h"
#include "gui/audioselectdialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
-#include "channel/channelwebapiutils.h"
#include "maincore.h"
#include "vordemodmc.h"
#include "vordemodmcreport.h"
-#include "vordemodmcsink.h"
#define VOR_COL_NAME 0
#define VOR_COL_FREQUENCY 1
diff --git a/plugins/channelrx/demodvormc/vordemodmcsettings.cpp b/plugins/channelrx/demodvormc/vordemodmcsettings.cpp
index fbcfcf6ee..6691b56b8 100644
--- a/plugins/channelrx/demodvormc/vordemodmcsettings.cpp
+++ b/plugins/channelrx/demodvormc/vordemodmcsettings.cpp
@@ -18,7 +18,6 @@
#include <QColor>
-#include "dsp/dspengine.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
#include "vordemodmcsettings.h"
diff --git a/plugins/channelrx/demodvormc/vordemodmcsink.cpp b/plugins/channelrx/demodvormc/vordemodmcsink.cpp
index ab84286c1..f7debaf10 100644
--- a/plugins/channelrx/demodvormc/vordemodmcsink.cpp
+++ b/plugins/channelrx/demodvormc/vordemodmcsink.cpp
@@ -20,8 +20,6 @@
#include <complex.h>
-#include "audio/audiooutputdevice.h"
-#include "dsp/dspengine.h"
#include "util/db.h"
#include "util/stepfunctions.h"
#include "util/morse.h"
diff --git a/plugins/channelrx/demodwfm/wfmdemod.cpp b/plugins/channelrx/demodwfm/wfmdemod.cpp
index 52d0ac236..0254195ba 100644
--- a/plugins/channelrx/demodwfm/wfmdemod.cpp
+++ b/plugins/channelrx/demodwfm/wfmdemod.cpp
@@ -37,12 +37,9 @@
#include "SWGWFMDemodReport.h"
#include "device/deviceapi.h"
-#include "audio/audiooutputdevice.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/devicesamplemimo.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "settings/serializable.h"
#include "util/db.h"
#include "maincore.h"
diff --git a/plugins/channelrx/demodwfm/wfmdemodgui.cpp b/plugins/channelrx/demodwfm/wfmdemodgui.cpp
index 31b43c276..b9e576411 100644
--- a/plugins/channelrx/demodwfm/wfmdemodgui.cpp
+++ b/plugins/channelrx/demodwfm/wfmdemodgui.cpp
@@ -30,10 +30,8 @@
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/crightclickenabler.h"
#include "gui/dialogpositioner.h"
#include "gui/audioselectdialog.h"
diff --git a/plugins/channelrx/demodwfm/wfmdemodsettings.cpp b/plugins/channelrx/demodwfm/wfmdemodsettings.cpp
index eac4e12af..fe2e2fe4f 100644
--- a/plugins/channelrx/demodwfm/wfmdemodsettings.cpp
+++ b/plugins/channelrx/demodwfm/wfmdemodsettings.cpp
@@ -20,7 +20,7 @@
#include <QColor>
-#include "dsp/dspengine.h"
+#include "audio/audiodevicemanager.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
diff --git a/plugins/channelrx/demodwfm/wfmdemodsink.cpp b/plugins/channelrx/demodwfm/wfmdemodsink.cpp
index 408b5b8bb..3c7ca36d5 100644
--- a/plugins/channelrx/demodwfm/wfmdemodsink.cpp
+++ b/plugins/channelrx/demodwfm/wfmdemodsink.cpp
@@ -21,12 +21,7 @@
#include <QTime>
#include <QDebug>
-#include "audio/audiooutputdevice.h"
-#include "dsp/dspengine.h"
-#include "dsp/dspcommands.h"
-#include "dsp/devicesamplemimo.h"
#include "dsp/datafifo.h"
-#include "util/db.h"
#include "util/messagequeue.h"
#include "maincore.h"
diff --git a/plugins/channelrx/filesink/filesink.cpp b/plugins/channelrx/filesink/filesink.cpp
index 4a1301dc5..61317ea67 100644
--- a/plugins/channelrx/filesink/filesink.cpp
+++ b/plugins/channelrx/filesink/filesink.cpp
@@ -37,10 +37,8 @@
#include "dsp/dspdevicesourceengine.h"
#include "dsp/dspengine.h"
#include "dsp/devicesamplesource.h"
-#include "dsp/hbfilterchainconverter.h"
#include "dsp/devicesamplemimo.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "maincore.h"
#include "filesinkmessages.h"
diff --git a/plugins/channelrx/filesink/filesinkbaseband.cpp b/plugins/channelrx/filesink/filesinkbaseband.cpp
index e99cf2236..2e2e1c689 100644
--- a/plugins/channelrx/filesink/filesinkbaseband.cpp
+++ b/plugins/channelrx/filesink/filesinkbaseband.cpp
@@ -19,7 +19,6 @@
#include <QTimer>
#include <QDebug>
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/spectrumvis.h"
#include "util/db.h"
diff --git a/plugins/channelrx/filesink/filesinkgui.cpp b/plugins/channelrx/filesink/filesinkgui.cpp
index 2a974ba79..1b83569f0 100644
--- a/plugins/channelrx/filesink/filesinkgui.cpp
+++ b/plugins/channelrx/filesink/filesinkgui.cpp
@@ -24,12 +24,9 @@
#include "device/deviceuiset.h"
#include "device/deviceapi.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
-#include "dsp/hbfilterchainconverter.h"
#include "dsp/dspcommands.h"
-#include "mainwindow.h"
#include "filesinkmessages.h"
#include "filesink.h"
diff --git a/plugins/channelrx/freqscanner/freqscanner.cpp b/plugins/channelrx/freqscanner/freqscanner.cpp
index 6d4c3c509..c6c7e64fc 100644
--- a/plugins/channelrx/freqscanner/freqscanner.cpp
+++ b/plugins/channelrx/freqscanner/freqscanner.cpp
@@ -38,9 +38,7 @@
#include "dsp/devicesamplesource.h"
#include "dsp/devicesamplemimo.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "settings/serializable.h"
-#include "util/db.h"
#include "channel/channelwebapiutils.h"
#include "maincore.h"
#include "dsp/spectrumvis.h"
diff --git a/plugins/channelrx/freqscanner/freqscannerbaseband.cpp b/plugins/channelrx/freqscanner/freqscannerbaseband.cpp
index 9a1e10e37..2ddaaa308 100644
--- a/plugins/channelrx/freqscanner/freqscannerbaseband.cpp
+++ b/plugins/channelrx/freqscanner/freqscannerbaseband.cpp
@@ -19,7 +19,6 @@
#include <QDebug>
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/downchannelizer.h"
diff --git a/plugins/channelrx/freqscanner/freqscannergui.cpp b/plugins/channelrx/freqscanner/freqscannergui.cpp
index 68c92577a..2e725c598 100644
--- a/plugins/channelrx/freqscanner/freqscannergui.cpp
+++ b/plugins/channelrx/freqscanner/freqscannergui.cpp
@@ -28,11 +28,8 @@
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "ui_freqscannergui.h"
-#include "util/simpleserializer.h"
-#include "util/db.h"
#include "gui/basicchannelsettingsdialog.h"
#include "dsp/dspengine.h"
-#include "dsp/glscopesettings.h"
#include "gui/tabletapandhold.h"
#include "gui/dialogpositioner.h"
#include "gui/decimaldelegate.h"
@@ -45,7 +42,6 @@
#include "freqscannergui.h"
#include "freqscanneraddrangedialog.h"
#include "freqscanner.h"
-#include "freqscannersink.h"
FreqScannerGUI* FreqScannerGUI::create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel)
{
diff --git a/plugins/channelrx/freqtracker/freqtracker.cpp b/plugins/channelrx/freqtracker/freqtracker.cpp
index aa052663b..4a4936ae5 100644
--- a/plugins/channelrx/freqtracker/freqtracker.cpp
+++ b/plugins/channelrx/freqtracker/freqtracker.cpp
@@ -35,14 +35,10 @@
#include "SWGChannelReport.h"
#include "SWGFreqTrackerReport.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
-#include "dsp/fftfilt.h"
#include "dsp/devicesamplemimo.h"
#include "device/deviceapi.h"
#include "util/db.h"
-#include "util/stepfunctions.h"
-#include "feature/feature.h"
#include "maincore.h"
#include "freqtrackerreport.h"
diff --git a/plugins/channelrx/freqtracker/freqtrackerbaseband.cpp b/plugins/channelrx/freqtracker/freqtrackerbaseband.cpp
index 0f5707162..0f297759c 100644
--- a/plugins/channelrx/freqtracker/freqtrackerbaseband.cpp
+++ b/plugins/channelrx/freqtracker/freqtrackerbaseband.cpp
@@ -18,11 +18,9 @@
#include <QDebug>
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/downchannelizer.h"
-#include "freqtrackerreport.h"
#include "freqtrackerbaseband.h"
MESSAGE_CLASS_DEFINITION(FreqTrackerBaseband::MsgConfigureFreqTrackerBaseband, Message)
diff --git a/plugins/channelrx/freqtracker/freqtrackergui.cpp b/plugins/channelrx/freqtracker/freqtrackergui.cpp
index 362945139..2bb22702f 100644
--- a/plugins/channelrx/freqtracker/freqtrackergui.cpp
+++ b/plugins/channelrx/freqtracker/freqtrackergui.cpp
@@ -30,12 +30,9 @@
#include "dsp/dspcommands.h"
#include "ui_freqtrackergui.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "dsp/dspengine.h"
-#include "gui/crightclickenabler.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
#include "maincore.h"
diff --git a/plugins/channelrx/freqtracker/freqtrackersettings.cpp b/plugins/channelrx/freqtracker/freqtrackersettings.cpp
index 9b1782af8..62e15e527 100644
--- a/plugins/channelrx/freqtracker/freqtrackersettings.cpp
+++ b/plugins/channelrx/freqtracker/freqtrackersettings.cpp
@@ -20,7 +20,6 @@
#include <QColor>
-#include "dsp/dspengine.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
#include "freqtrackersettings.h"
diff --git a/plugins/channelrx/freqtracker/freqtrackersink.cpp b/plugins/channelrx/freqtracker/freqtrackersink.cpp
index 7b0dc837e..7323eeb13 100644
--- a/plugins/channelrx/freqtracker/freqtrackersink.cpp
+++ b/plugins/channelrx/freqtracker/freqtrackersink.cpp
@@ -20,11 +20,9 @@
#include <QDebug>
#include "dsp/dspengine.h"
-#include "dsp/dspcommands.h"
#include "dsp/fftfilt.h"
#include "dsp/spectrumvis.h"
#include "util/db.h"
-#include "util/stepfunctions.h"
#include "util/messagequeue.h"
#include "freqtrackerreport.h"
diff --git a/plugins/channelrx/heatmap/heatmap.cpp b/plugins/channelrx/heatmap/heatmap.cpp
index 83222bfa0..6695ca864 100644
--- a/plugins/channelrx/heatmap/heatmap.cpp
+++ b/plugins/channelrx/heatmap/heatmap.cpp
@@ -30,14 +30,9 @@
#include "SWGChannelSettings.h"
#include "SWGWorkspaceInfo.h"
-#include "SWGChannelReport.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
-#include "util/db.h"
-#include "maincore.h"
MESSAGE_CLASS_DEFINITION(HeatMap::MsgConfigureHeatMap, Message)
diff --git a/plugins/channelrx/heatmap/heatmapbaseband.cpp b/plugins/channelrx/heatmap/heatmapbaseband.cpp
index dfc704f03..551f3481a 100644
--- a/plugins/channelrx/heatmap/heatmapbaseband.cpp
+++ b/plugins/channelrx/heatmap/heatmapbaseband.cpp
@@ -19,7 +19,6 @@
#include <QDebug>
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/downchannelizer.h"
diff --git a/plugins/channelrx/heatmap/heatmapgui.cpp b/plugins/channelrx/heatmap/heatmapgui.cpp
index 3c438d07a..c9ca22db1 100644
--- a/plugins/channelrx/heatmap/heatmapgui.cpp
+++ b/plugins/channelrx/heatmap/heatmapgui.cpp
@@ -34,24 +34,17 @@
#include "dsp/dspcommands.h"
#include "ui_heatmapgui.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/astronomy.h"
#include "util/csv.h"
#include "util/db.h"
#include "util/units.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
#include "dsp/dspengine.h"
-#include "gui/crightclickenabler.h"
-#include "gui/tabletapandhold.h"
-#include "channel/channelwebapiutils.h"
#include "maincore.h"
-#include "feature/featurewebapiutils.h"
#include "heatmap.h"
-#include "heatmapsink.h"
#include "SWGMapItem.h"
diff --git a/plugins/channelrx/heatmap/heatmapsettings.cpp b/plugins/channelrx/heatmap/heatmapsettings.cpp
index 5495f0ecd..5ff0d51f0 100644
--- a/plugins/channelrx/heatmap/heatmapsettings.cpp
+++ b/plugins/channelrx/heatmap/heatmapsettings.cpp
@@ -17,7 +17,6 @@
#include <QColor>
-#include "dsp/dspengine.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
#include "heatmapsettings.h"
diff --git a/plugins/channelrx/heatmap/heatmapsink.cpp b/plugins/channelrx/heatmap/heatmapsink.cpp
index e7a6bc3de..6502b9fce 100644
--- a/plugins/channelrx/heatmap/heatmapsink.cpp
+++ b/plugins/channelrx/heatmap/heatmapsink.cpp
@@ -19,12 +19,7 @@
#include <complex.h>
-#include "dsp/dspengine.h"
-#include "dsp/datafifo.h"
#include "dsp/scopevis.h"
-#include "util/db.h"
-#include "util/stepfunctions.h"
-#include "maincore.h"
#include "heatmap.h"
#include "heatmapsink.h"
diff --git a/plugins/channelrx/localsink/localsink.cpp b/plugins/channelrx/localsink/localsink.cpp
index ac7abd56a..3f4a794eb 100644
--- a/plugins/channelrx/localsink/localsink.cpp
+++ b/plugins/channelrx/localsink/localsink.cpp
@@ -36,7 +36,6 @@
#include "dsp/devicesamplemimo.h"
#include "device/deviceapi.h"
#include "device/deviceset.h"
-#include "feature/feature.h"
#include "settings/serializable.h"
#include "maincore.h"
diff --git a/plugins/channelrx/localsink/localsinkbaseband.cpp b/plugins/channelrx/localsink/localsinkbaseband.cpp
index 94b015c20..fa1a188d4 100644
--- a/plugins/channelrx/localsink/localsinkbaseband.cpp
+++ b/plugins/channelrx/localsink/localsinkbaseband.cpp
@@ -20,7 +20,6 @@
#include <QDebug>
#include "dsp/downchannelizer.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/spectrumvis.h"
diff --git a/plugins/channelrx/localsink/localsinkgui.cpp b/plugins/channelrx/localsink/localsinkgui.cpp
index 2b8c2618f..002de5ac4 100644
--- a/plugins/channelrx/localsink/localsinkgui.cpp
+++ b/plugins/channelrx/localsink/localsinkgui.cpp
@@ -20,7 +20,6 @@
#include "device/deviceuiset.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/dialogpositioner.h"
#include "dsp/hbfilterchainconverter.h"
#include "dsp/dspcommands.h"
diff --git a/plugins/channelrx/localsink/localsinksink.cpp b/plugins/channelrx/localsink/localsinksink.cpp
index 3b828ea08..d3dcf60ab 100644
--- a/plugins/channelrx/localsink/localsinksink.cpp
+++ b/plugins/channelrx/localsink/localsinksink.cpp
@@ -20,7 +20,6 @@
#include <boost/crc.hpp>
#include <boost/cstdint.hpp>
#include "dsp/devicesamplesource.h"
-#include "dsp/hbfilterchainconverter.h"
#include "dsp/spectrumvis.h"
#include "dsp/fftfilt.h"
#include "util/db.h"
diff --git a/plugins/channelrx/noisefigure/noisefigure.cpp b/plugins/channelrx/noisefigure/noisefigure.cpp
index 8593c7b8d..48e86014c 100644
--- a/plugins/channelrx/noisefigure/noisefigure.cpp
+++ b/plugins/channelrx/noisefigure/noisefigure.cpp
@@ -32,16 +32,11 @@
#include "SWGChannelSettings.h"
#include "SWGWorkspaceInfo.h"
-#include "SWGChannelReport.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
-#include "util/db.h"
#include "util/interpolation.h"
#include "channel/channelwebapiutils.h"
-#include "maincore.h"
#if BOOST_VERSION < 107700
using namespace boost::math;
diff --git a/plugins/channelrx/noisefigure/noisefigurebaseband.cpp b/plugins/channelrx/noisefigure/noisefigurebaseband.cpp
index 4353f8085..163432a4f 100644
--- a/plugins/channelrx/noisefigure/noisefigurebaseband.cpp
+++ b/plugins/channelrx/noisefigure/noisefigurebaseband.cpp
@@ -19,7 +19,6 @@
#include <QDebug>
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/downchannelizer.h"
diff --git a/plugins/channelrx/noisefigure/noisefiguregui.cpp b/plugins/channelrx/noisefigure/noisefiguregui.cpp
index b3db84891..9c0ba3f1d 100644
--- a/plugins/channelrx/noisefigure/noisefiguregui.cpp
+++ b/plugins/channelrx/noisefigure/noisefiguregui.cpp
@@ -28,17 +28,13 @@
#include "dsp/dspcommands.h"
#include "ui_noisefiguregui.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
-#include "gui/crightclickenabler.h"
#include "gui/decimaldelegate.h"
#include "gui/dialogpositioner.h"
#include "maincore.h"
#include "noisefigure.h"
-#include "noisefiguresink.h"
#include "noisefigurecontroldialog.h"
#include "noisefigureenrdialog.h"
diff --git a/plugins/channelrx/noisefigure/noisefiguresettings.cpp b/plugins/channelrx/noisefigure/noisefiguresettings.cpp
index 0813041d1..9960098a3 100644
--- a/plugins/channelrx/noisefigure/noisefiguresettings.cpp
+++ b/plugins/channelrx/noisefigure/noisefiguresettings.cpp
@@ -19,7 +19,6 @@
#include <QColor>
#include <QDataStream>
-#include "dsp/dspengine.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
#include "noisefiguresettings.h"
diff --git a/plugins/channelrx/radioastronomy/radioastronomy.cpp b/plugins/channelrx/radioastronomy/radioastronomy.cpp
index 7254a49f8..2a4bfe2f3 100644
--- a/plugins/channelrx/radioastronomy/radioastronomy.cpp
+++ b/plugins/channelrx/radioastronomy/radioastronomy.cpp
@@ -31,18 +31,13 @@
#include "SWGChannelSettings.h"
#include "SWGWorkspaceInfo.h"
-#include "SWGChannelReport.h"
#include "SWGChannelActions.h"
#include "SWGRadioAstronomyActions.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "channel/channelwebapiutils.h"
-#include "feature/featureset.h"
#include "util/astronomy.h"
-#include "util/db.h"
#include "maincore.h"
#include "radioastronomyworker.h"
diff --git a/plugins/channelrx/radioastronomy/radioastronomybaseband.cpp b/plugins/channelrx/radioastronomy/radioastronomybaseband.cpp
index 12452838e..286bdc0ed 100644
--- a/plugins/channelrx/radioastronomy/radioastronomybaseband.cpp
+++ b/plugins/channelrx/radioastronomy/radioastronomybaseband.cpp
@@ -18,7 +18,6 @@
#include <QDebug>
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/downchannelizer.h"
diff --git a/plugins/channelrx/radioastronomy/radioastronomygui.cpp b/plugins/channelrx/radioastronomy/radioastronomygui.cpp
index 1ccc60fb9..44fd8256e 100644
--- a/plugins/channelrx/radioastronomy/radioastronomygui.cpp
+++ b/plugins/channelrx/radioastronomy/radioastronomygui.cpp
@@ -39,32 +39,25 @@
#include "dsp/dspcommands.h"
#include "ui_radioastronomygui.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "util/astronomy.h"
#include "util/interpolation.h"
#include "util/png.h"
#include "util/units.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "dsp/dspengine.h"
-#include "gui/crightclickenabler.h"
#include "gui/timedelegate.h"
#include "gui/decimaldelegate.h"
#include "gui/dialogpositioner.h"
#include "channel/channelwebapiutils.h"
#include "maincore.h"
-#include "feature/featurewebapiutils.h"
#include "feature/feature.h"
-#include "feature/featureset.h"
#include "webapi/webapiutils.h"
#include "radioastronomy.h"
-#include "radioastronomysink.h"
#include "radioastronomysensordialog.h"
#include "radioastronomycalibrationdialog.h"
-#include "SWGMapItem.h"
#include "SWGStarTrackerTarget.h"
#include "SWGStarTrackerDisplaySettings.h"
#include "SWGStarTrackerDisplayLoSSettings.h"
diff --git a/plugins/channelrx/radioastronomy/radioastronomysettings.cpp b/plugins/channelrx/radioastronomy/radioastronomysettings.cpp
index 953aec450..db2a41311 100644
--- a/plugins/channelrx/radioastronomy/radioastronomysettings.cpp
+++ b/plugins/channelrx/radioastronomy/radioastronomysettings.cpp
@@ -18,7 +18,6 @@
#include <QColor>
-#include "dsp/dspengine.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
#include "radioastronomysettings.h"
diff --git a/plugins/channelrx/radioclock/radioclock.cpp b/plugins/channelrx/radioclock/radioclock.cpp
index 8b6a2291e..9f0420feb 100644
--- a/plugins/channelrx/radioclock/radioclock.cpp
+++ b/plugins/channelrx/radioclock/radioclock.cpp
@@ -32,13 +32,9 @@
#include "SWGWorkspaceInfo.h"
#include "SWGChannelReport.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "util/db.h"
-#include "maincore.h"
-#include "radioclocksink.h"
#include "radioclocksettings.h"
MESSAGE_CLASS_DEFINITION(RadioClock::MsgConfigureRadioClock, Message)
diff --git a/plugins/channelrx/radioclock/radioclockbaseband.cpp b/plugins/channelrx/radioclock/radioclockbaseband.cpp
index 737b42443..0a48c688c 100644
--- a/plugins/channelrx/radioclock/radioclockbaseband.cpp
+++ b/plugins/channelrx/radioclock/radioclockbaseband.cpp
@@ -19,7 +19,6 @@
#include <QDebug>
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/downchannelizer.h"
diff --git a/plugins/channelrx/radioclock/radioclockgui.cpp b/plugins/channelrx/radioclock/radioclockgui.cpp
index 8860c2233..e1fe6ff59 100644
--- a/plugins/channelrx/radioclock/radioclockgui.cpp
+++ b/plugins/channelrx/radioclock/radioclockgui.cpp
@@ -28,19 +28,14 @@
#include "dsp/dspcommands.h"
#include "ui_radioclockgui.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
#include "dsp/dspengine.h"
-#include "dsp/glscopesettings.h"
-#include "gui/crightclickenabler.h"
#include "maincore.h"
#include "radioclock.h"
-#include "radioclocksink.h"
RadioClockGUI* RadioClockGUI::create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel)
{
diff --git a/plugins/channelrx/radioclock/radioclocksettings.cpp b/plugins/channelrx/radioclock/radioclocksettings.cpp
index 2a0825c48..1b0a3485a 100644
--- a/plugins/channelrx/radioclock/radioclocksettings.cpp
+++ b/plugins/channelrx/radioclock/radioclocksettings.cpp
@@ -20,7 +20,6 @@
#include <QColor>
-#include "dsp/dspengine.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
#include "radioclocksettings.h"
diff --git a/plugins/channelrx/radioclock/radioclocksink.cpp b/plugins/channelrx/radioclock/radioclocksink.cpp
index 21e00b6a4..d937bde16 100644
--- a/plugins/channelrx/radioclock/radioclocksink.cpp
+++ b/plugins/channelrx/radioclock/radioclocksink.cpp
@@ -20,10 +20,8 @@
#include <complex.h>
-#include "dsp/dspengine.h"
#include "dsp/scopevis.h"
#include "util/db.h"
-#include "maincore.h"
#include "radioclock.h"
#include "radioclocksink.h"
diff --git a/plugins/channelrx/remotesink/remotesink.cpp b/plugins/channelrx/remotesink/remotesink.cpp
index 5538ba4dd..2a93d6c85 100644
--- a/plugins/channelrx/remotesink/remotesink.cpp
+++ b/plugins/channelrx/remotesink/remotesink.cpp
@@ -37,10 +37,8 @@
#include "dsp/dspcommands.h"
#include "dsp/hbfilterchainconverter.h"
#include "dsp/devicesamplemimo.h"
-#include "dsp/dspdevicesourceengine.h"
#include "dsp/devicesamplesource.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "settings/serializable.h"
#include "maincore.h"
diff --git a/plugins/channelrx/remotesink/remotesinkbaseband.cpp b/plugins/channelrx/remotesink/remotesinkbaseband.cpp
index 7692cc78c..f68d84fb5 100644
--- a/plugins/channelrx/remotesink/remotesinkbaseband.cpp
+++ b/plugins/channelrx/remotesink/remotesinkbaseband.cpp
@@ -20,7 +20,6 @@
#include <QDebug>
#include "dsp/downchannelizer.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "remotesinkbaseband.h"
diff --git a/plugins/channelrx/remotesink/remotesinkgui.cpp b/plugins/channelrx/remotesink/remotesinkgui.cpp
index 0e002c607..259b0929a 100644
--- a/plugins/channelrx/remotesink/remotesinkgui.cpp
+++ b/plugins/channelrx/remotesink/remotesinkgui.cpp
@@ -20,12 +20,10 @@
#include "device/deviceuiset.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
#include "dsp/hbfilterchainconverter.h"
#include "dsp/dspcommands.h"
-#include "mainwindow.h"
#include "remotesinkgui.h"
#include "remotesink.h"
diff --git a/plugins/channelrx/remotetcpsink/remotetcpsink.cpp b/plugins/channelrx/remotetcpsink/remotetcpsink.cpp
index 53d32100e..501d621c3 100644
--- a/plugins/channelrx/remotetcpsink/remotetcpsink.cpp
+++ b/plugins/channelrx/remotetcpsink/remotetcpsink.cpp
@@ -31,10 +31,7 @@
#include "util/simpleserializer.h"
#include "dsp/dspcommands.h"
#include "dsp/devicesamplemimo.h"
-#include "dsp/dspdevicesourceengine.h"
-#include "dsp/devicesamplesource.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "settings/serializable.h"
#include "maincore.h"
diff --git a/plugins/channelrx/remotetcpsink/remotetcpsinkbaseband.cpp b/plugins/channelrx/remotetcpsink/remotetcpsinkbaseband.cpp
index c16fb7a06..c23ce0985 100644
--- a/plugins/channelrx/remotetcpsink/remotetcpsinkbaseband.cpp
+++ b/plugins/channelrx/remotetcpsink/remotetcpsinkbaseband.cpp
@@ -20,7 +20,6 @@
#include <QDebug>
#include "dsp/downchannelizer.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "remotetcpsinkbaseband.h"
diff --git a/plugins/channelrx/remotetcpsink/remotetcpsinkgui.cpp b/plugins/channelrx/remotetcpsink/remotetcpsinkgui.cpp
index 34f87af36..17c1fde3f 100644
--- a/plugins/channelrx/remotetcpsink/remotetcpsinkgui.cpp
+++ b/plugins/channelrx/remotetcpsink/remotetcpsinkgui.cpp
@@ -21,12 +21,9 @@
#include "device/deviceuiset.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
-#include "dsp/hbfilterchainconverter.h"
#include "dsp/dspcommands.h"
-#include "mainwindow.h"
#include "remotetcpsinkgui.h"
#include "remotetcpsink.h"
diff --git a/plugins/channelrx/remotetcpsink/remotetcpsinksink.cpp b/plugins/channelrx/remotetcpsink/remotetcpsinksink.cpp
index 391f86348..b00072440 100644
--- a/plugins/channelrx/remotetcpsink/remotetcpsinksink.cpp
+++ b/plugins/channelrx/remotetcpsink/remotetcpsinksink.cpp
@@ -20,14 +20,11 @@
#include <QThread>
#include "channel/channelwebapiutils.h"
-#include "dsp/hbfilterchainconverter.h"
#include "device/deviceapi.h"
-#include "util/timeutil.h"
#include "maincore.h"
#include "remotetcpsinksink.h"
#include "remotetcpsink.h"
-#include "remotetcpsinkbaseband.h"
RemoteTCPSinkSink::RemoteTCPSinkSink() :
m_running(false),
diff --git a/plugins/channelrx/sigmffilesink/sigmffilesink.cpp b/plugins/channelrx/sigmffilesink/sigmffilesink.cpp
index b4b5dd893..f928de627 100644
--- a/plugins/channelrx/sigmffilesink/sigmffilesink.cpp
+++ b/plugins/channelrx/sigmffilesink/sigmffilesink.cpp
@@ -37,10 +37,8 @@
#include "dsp/dspdevicesourceengine.h"
#include "dsp/dspengine.h"
#include "dsp/devicesamplesource.h"
-#include "dsp/hbfilterchainconverter.h"
#include "dsp/devicesamplemimo.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "maincore.h"
#include "sigmffilesinkmessages.h"
diff --git a/plugins/channelrx/sigmffilesink/sigmffilesinkbaseband.cpp b/plugins/channelrx/sigmffilesink/sigmffilesinkbaseband.cpp
index 477252de9..fa4546594 100644
--- a/plugins/channelrx/sigmffilesink/sigmffilesinkbaseband.cpp
+++ b/plugins/channelrx/sigmffilesink/sigmffilesinkbaseband.cpp
@@ -19,7 +19,6 @@
#include <QTimer>
#include <QDebug>
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/spectrumvis.h"
#include "util/db.h"
diff --git a/plugins/channelrx/sigmffilesink/sigmffilesinkgui.cpp b/plugins/channelrx/sigmffilesink/sigmffilesinkgui.cpp
index 50886d450..4036cbef0 100644
--- a/plugins/channelrx/sigmffilesink/sigmffilesinkgui.cpp
+++ b/plugins/channelrx/sigmffilesink/sigmffilesinkgui.cpp
@@ -23,12 +23,9 @@
#include "device/deviceuiset.h"
#include "device/deviceapi.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
-#include "dsp/hbfilterchainconverter.h"
#include "dsp/dspcommands.h"
-#include "mainwindow.h"
#include "sigmffilesinkmessages.h"
#include "sigmffilesink.h"
diff --git a/plugins/channelrx/udpsink/udpsink.cpp b/plugins/channelrx/udpsink/udpsink.cpp
index 7495d1812..6622defe2 100644
--- a/plugins/channelrx/udpsink/udpsink.cpp
+++ b/plugins/channelrx/udpsink/udpsink.cpp
@@ -32,12 +32,10 @@
#include "SWGChannelReport.h"
#include "SWGUDPSinkReport.h"
-#include "dsp/dspengine.h"
#include "util/db.h"
#include "dsp/dspcommands.h"
#include "dsp/devicesamplemimo.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "maincore.h"
#include "udpsink.h"
diff --git a/plugins/channelrx/udpsink/udpsinkgui.cpp b/plugins/channelrx/udpsink/udpsinkgui.cpp
index 7d394660b..fada6d19f 100644
--- a/plugins/channelrx/udpsink/udpsinkgui.cpp
+++ b/plugins/channelrx/udpsink/udpsinkgui.cpp
@@ -24,10 +24,8 @@
#include "dsp/spectrumvis.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
#include "ui_udpsinkgui.h"
diff --git a/plugins/channelrx/udpsink/udpsinksettings.cpp b/plugins/channelrx/udpsink/udpsinksettings.cpp
index 801f1964a..66dc833db 100644
--- a/plugins/channelrx/udpsink/udpsinksettings.cpp
+++ b/plugins/channelrx/udpsink/udpsinksettings.cpp
@@ -18,7 +18,6 @@
#include <QColor>
-#include "dsp/dspengine.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
#include "udpsinksettings.h"
diff --git a/plugins/channelrx/udpsink/udpsinksink.cpp b/plugins/channelrx/udpsink/udpsinksink.cpp
index ca95d47da..3b69797ff 100644
--- a/plugins/channelrx/udpsink/udpsinksink.cpp
+++ b/plugins/channelrx/udpsink/udpsinksink.cpp
@@ -21,16 +21,7 @@
#include <QNetworkReply>
#include <QBuffer>
-#include "SWGChannelSettings.h"
-#include "SWGUDPSinkSettings.h"
-#include "SWGChannelReport.h"
-#include "SWGUDPSinkReport.h"
-
#include "dsp/basebandsamplesink.h"
-#include "dsp/dspengine.h"
-#include "dsp/dspcommands.h"
-#include "dsp/devicesamplemimo.h"
-#include "device/deviceapi.h"
#include "util/db.h"
#include "udpsinksink.h"
diff --git a/plugins/channeltx/filesource/filesource.cpp b/plugins/channeltx/filesource/filesource.cpp
index 2b08956d4..3526e632d 100644
--- a/plugins/channeltx/filesource/filesource.cpp
+++ b/plugins/channeltx/filesource/filesource.cpp
@@ -33,10 +33,7 @@
#include "device/deviceapi.h"
#include "dsp/dspcommands.h"
-#include "dsp/devicesamplesink.h"
#include "dsp/hbfilterchainconverter.h"
-#include "dsp/filerecord.h"
-#include "feature/feature.h"
#include "settings/serializable.h"
#include "util/db.h"
#include "maincore.h"
diff --git a/plugins/channeltx/filesource/filesourcebaseband.cpp b/plugins/channeltx/filesource/filesourcebaseband.cpp
index 2451da96d..6d1874c71 100644
--- a/plugins/channeltx/filesource/filesourcebaseband.cpp
+++ b/plugins/channeltx/filesource/filesourcebaseband.cpp
@@ -19,7 +19,6 @@
#include <QDebug>
#include "dsp/upchannelizer.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "filesourcebaseband.h"
diff --git a/plugins/channeltx/filesource/filesourcegui.cpp b/plugins/channeltx/filesource/filesourcegui.cpp
index 96ce65d93..9d95a09ca 100644
--- a/plugins/channeltx/filesource/filesourcegui.cpp
+++ b/plugins/channeltx/filesource/filesourcegui.cpp
@@ -25,12 +25,9 @@
#include "dsp/hbfilterchainconverter.h"
#include "dsp/dspcommands.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/dialogpositioner.h"
#include "util/db.h"
-#include "mainwindow.h"
-
#include "filesourcereport.h"
#include "filesourcegui.h"
#include "filesource.h"
diff --git a/plugins/channeltx/filesource/filesourcesource.cpp b/plugins/channeltx/filesource/filesourcesource.cpp
index 298d69307..c0fe28f76 100644
--- a/plugins/channeltx/filesource/filesourcesource.cpp
+++ b/plugins/channeltx/filesource/filesourcesource.cpp
@@ -29,9 +29,6 @@
#include <QDebug>
-#include "dsp/dspcommands.h"
-#include "dsp/devicesamplesink.h"
-#include "dsp/hbfilterchainconverter.h"
#include "dsp/filerecord.h"
#include "dsp/wavfilerecord.h"
#include "util/db.h"
diff --git a/plugins/channeltx/localsource/localsource.cpp b/plugins/channeltx/localsource/localsource.cpp
index a91248740..ae710665a 100644
--- a/plugins/channeltx/localsource/localsource.cpp
+++ b/plugins/channeltx/localsource/localsource.cpp
@@ -33,7 +33,6 @@
#include "dsp/devicesamplesink.h"
#include "dsp/hbfilterchainconverter.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "settings/serializable.h"
#include "maincore.h"
diff --git a/plugins/channeltx/localsource/localsourcegui.cpp b/plugins/channeltx/localsource/localsourcegui.cpp
index 78fe281d2..62138d604 100644
--- a/plugins/channeltx/localsource/localsourcegui.cpp
+++ b/plugins/channeltx/localsource/localsourcegui.cpp
@@ -20,11 +20,9 @@
#include "device/deviceuiset.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/dialogpositioner.h"
#include "dsp/hbfilterchainconverter.h"
#include "dsp/dspcommands.h"
-#include "mainwindow.h"
#include "localsourcegui.h"
#include "localsource.h"
diff --git a/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp b/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp
index 3e419081f..7117b2fad 100644
--- a/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp
+++ b/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp
@@ -39,12 +39,9 @@
#include <complex.h>
#include <algorithm>
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "util/db.h"
-#include "util/crc.h"
#include "maincore.h"
#include "ieee_802_15_4_modbaseband.h"
diff --git a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modbaseband.cpp b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modbaseband.cpp
index f75ad3aef..5cefb4036 100644
--- a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modbaseband.cpp
+++ b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modbaseband.cpp
@@ -20,7 +20,6 @@
#include <QDebug>
#include "dsp/upchannelizer.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "ieee_802_15_4_modbaseband.h"
diff --git a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.cpp b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.cpp
index 2032478cb..b9123943c 100644
--- a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.cpp
+++ b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.cpp
@@ -25,7 +25,6 @@
#include "device/deviceuiset.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "dsp/spectrumvis.h"
#include "dsp/scopevis.h"
@@ -35,7 +34,6 @@
#include "gui/glspectrum.h"
#include "gui/crightclickenabler.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
#include "maincore.h"
diff --git a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modsettings.cpp b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modsettings.cpp
index b273f5575..07d0e7b06 100644
--- a/plugins/channeltx/mod802.15.4/ieee_802_15_4_modsettings.cpp
+++ b/plugins/channeltx/mod802.15.4/ieee_802_15_4_modsettings.cpp
@@ -19,7 +19,6 @@
#include <QColor>
#include <QDebug>
-#include "dsp/dspengine.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
#include "ieee_802_15_4_modsettings.h"
diff --git a/plugins/channeltx/modais/aismod.cpp b/plugins/channeltx/modais/aismod.cpp
index 294914dbb..d040a9855 100644
--- a/plugins/channeltx/modais/aismod.cpp
+++ b/plugins/channeltx/modais/aismod.cpp
@@ -36,10 +36,8 @@
#include <complex.h>
#include <algorithm>
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "util/db.h"
#include "maincore.h"
diff --git a/plugins/channeltx/modais/aismodbaseband.cpp b/plugins/channeltx/modais/aismodbaseband.cpp
index 083825664..9be7ee1a7 100644
--- a/plugins/channeltx/modais/aismodbaseband.cpp
+++ b/plugins/channeltx/modais/aismodbaseband.cpp
@@ -20,7 +20,6 @@
#include <QDebug>
#include "dsp/upchannelizer.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "aismodbaseband.h"
diff --git a/plugins/channeltx/modais/aismodgui.cpp b/plugins/channeltx/modais/aismodgui.cpp
index 3f3029520..d41a09f86 100644
--- a/plugins/channeltx/modais/aismodgui.cpp
+++ b/plugins/channeltx/modais/aismodgui.cpp
@@ -28,13 +28,11 @@
#include "dsp/dspcommands.h"
#include "device/deviceuiset.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "dsp/dspengine.h"
#include "gui/glspectrum.h"
#include "gui/crightclickenabler.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
#include "maincore.h"
@@ -43,7 +41,6 @@
#include "aismodgui.h"
#include "aismodrepeatdialog.h"
#include "aismodtxsettingsdialog.h"
-#include "aismodsource.h"
AISModGUI* AISModGUI::create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx)
{
diff --git a/plugins/channeltx/modais/aismodsettings.cpp b/plugins/channeltx/modais/aismodsettings.cpp
index 098758b50..98dd39da0 100644
--- a/plugins/channeltx/modais/aismodsettings.cpp
+++ b/plugins/channeltx/modais/aismodsettings.cpp
@@ -19,7 +19,6 @@
#include <QColor>
#include <QDebug>
-#include "dsp/dspengine.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
#include "aismodsettings.h"
diff --git a/plugins/channeltx/modam/ammod.cpp b/plugins/channeltx/modam/ammod.cpp
index a3bb9f9f2..b947d4f76 100644
--- a/plugins/channeltx/modam/ammod.cpp
+++ b/plugins/channeltx/modam/ammod.cpp
@@ -33,12 +33,10 @@
#include "SWGChannelReport.h"
#include "SWGAMModReport.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/devicesamplemimo.h"
#include "dsp/cwkeyer.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "util/db.h"
#include "maincore.h"
diff --git a/plugins/channeltx/modam/ammodgui.cpp b/plugins/channeltx/modam/ammodgui.cpp
index 33c5f42b5..5a0cfd791 100644
--- a/plugins/channeltx/modam/ammodgui.cpp
+++ b/plugins/channeltx/modam/ammodgui.cpp
@@ -29,7 +29,6 @@
#include "device/deviceuiset.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "dsp/dspengine.h"
#include "dsp/cwkeyer.h"
@@ -37,7 +36,6 @@
#include "gui/crightclickenabler.h"
#include "gui/audioselectdialog.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
#include "maincore.h"
diff --git a/plugins/channeltx/modam/ammodsettings.cpp b/plugins/channeltx/modam/ammodsettings.cpp
index 061ec3b45..b0479cc34 100644
--- a/plugins/channeltx/modam/ammodsettings.cpp
+++ b/plugins/channeltx/modam/ammodsettings.cpp
@@ -20,7 +20,7 @@
#include <QColor>
-#include "dsp/dspengine.h"
+#include "audio/audiodevicemanager.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
#include "ammodsettings.h"
diff --git a/plugins/channeltx/modatv/atvmod.cpp b/plugins/channeltx/modatv/atvmod.cpp
index 4228e63bb..98cf9e736 100644
--- a/plugins/channeltx/modatv/atvmod.cpp
+++ b/plugins/channeltx/modatv/atvmod.cpp
@@ -32,11 +32,9 @@
#include "SWGChannelReport.h"
#include "SWGATVModReport.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/devicesamplemimo.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "settings/serializable.h"
#include "util/db.h"
#include "maincore.h"
diff --git a/plugins/channeltx/modatv/atvmodbaseband.cpp b/plugins/channeltx/modatv/atvmodbaseband.cpp
index 38a499031..9eea0390d 100644
--- a/plugins/channeltx/modatv/atvmodbaseband.cpp
+++ b/plugins/channeltx/modatv/atvmodbaseband.cpp
@@ -19,7 +19,6 @@
#include <QDebug>
#include "dsp/upchannelizer.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "atvmodbaseband.h"
diff --git a/plugins/channeltx/modatv/atvmodgui.cpp b/plugins/channeltx/modatv/atvmodgui.cpp
index 1c27df55b..0c0968950 100644
--- a/plugins/channeltx/modatv/atvmodgui.cpp
+++ b/plugins/channeltx/modatv/atvmodgui.cpp
@@ -32,12 +32,10 @@
#include "device/deviceuiset.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "util/db.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
#include "maincore.h"
diff --git a/plugins/channeltx/modatv/atvmodsettings.cpp b/plugins/channeltx/modatv/atvmodsettings.cpp
index 45ef5cbde..ab7bad8dd 100644
--- a/plugins/channeltx/modatv/atvmodsettings.cpp
+++ b/plugins/channeltx/modatv/atvmodsettings.cpp
@@ -18,7 +18,6 @@
#include <QColor>
-#include "dsp/dspengine.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
#include "atvmodsettings.h"
diff --git a/plugins/channeltx/modatv/atvmodsource.cpp b/plugins/channeltx/modatv/atvmodsource.cpp
index 0a8f50e97..e4bd6fdc8 100644
--- a/plugins/channeltx/modatv/atvmodsource.cpp
+++ b/plugins/channeltx/modatv/atvmodsource.cpp
@@ -26,9 +26,6 @@
#include "opencv2/imgproc/imgproc.hpp"
-#include "dsp/dspcommands.h"
-#include "device/deviceapi.h"
-#include "util/db.h"
#include "util/messagequeue.h"
#include "atvmodreport.h"
diff --git a/plugins/channeltx/modchirpchat/chirpchatmod.cpp b/plugins/channeltx/modchirpchat/chirpchatmod.cpp
index cd60864ef..1eaa2930c 100644
--- a/plugins/channeltx/modchirpchat/chirpchatmod.cpp
+++ b/plugins/channeltx/modchirpchat/chirpchatmod.cpp
@@ -37,10 +37,8 @@
#include <complex.h>
#include <algorithm>
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "settings/serializable.h"
#include "util/db.h"
#include "maincore.h"
diff --git a/plugins/channeltx/modchirpchat/chirpchatmodbaseband.cpp b/plugins/channeltx/modchirpchat/chirpchatmodbaseband.cpp
index bfbb72257..0256123d7 100644
--- a/plugins/channeltx/modchirpchat/chirpchatmodbaseband.cpp
+++ b/plugins/channeltx/modchirpchat/chirpchatmodbaseband.cpp
@@ -20,7 +20,6 @@
#include <QDebug>
#include "dsp/upchannelizer.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "chirpchatmodbaseband.h"
diff --git a/plugins/channeltx/modchirpchat/chirpchatmodgui.cpp b/plugins/channeltx/modchirpchat/chirpchatmodgui.cpp
index 29fa32f64..f177e2bb5 100644
--- a/plugins/channeltx/modchirpchat/chirpchatmodgui.cpp
+++ b/plugins/channeltx/modchirpchat/chirpchatmodgui.cpp
@@ -24,13 +24,10 @@
#include "device/deviceuiset.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
-#include "gui/crightclickenabler.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
#include "maincore.h"
diff --git a/plugins/channeltx/modchirpchat/chirpchatmodsettings.cpp b/plugins/channeltx/modchirpchat/chirpchatmodsettings.cpp
index 03d2f65b3..3b8a95a68 100644
--- a/plugins/channeltx/modchirpchat/chirpchatmodsettings.cpp
+++ b/plugins/channeltx/modchirpchat/chirpchatmodsettings.cpp
@@ -20,7 +20,6 @@
#include <QColor>
-#include "dsp/dspengine.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
diff --git a/plugins/channeltx/moddatv/datvmod.cpp b/plugins/channeltx/moddatv/datvmod.cpp
index a5730b197..d4bac5c61 100644
--- a/plugins/channeltx/moddatv/datvmod.cpp
+++ b/plugins/channeltx/moddatv/datvmod.cpp
@@ -35,11 +35,9 @@
#include "SWGChannelReport.h"
//#include "SWGDATVModReport.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/devicesamplemimo.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "settings/serializable.h"
#include "util/db.h"
#include "maincore.h"
diff --git a/plugins/channeltx/moddatv/datvmodbaseband.cpp b/plugins/channeltx/moddatv/datvmodbaseband.cpp
index afc17040e..e4bf84606 100644
--- a/plugins/channeltx/moddatv/datvmodbaseband.cpp
+++ b/plugins/channeltx/moddatv/datvmodbaseband.cpp
@@ -19,7 +19,6 @@
#include <QDebug>
#include "dsp/upchannelizer.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "datvmodbaseband.h"
diff --git a/plugins/channeltx/moddatv/datvmodgui.cpp b/plugins/channeltx/moddatv/datvmodgui.cpp
index b57399c75..6190f4938 100644
--- a/plugins/channeltx/moddatv/datvmodgui.cpp
+++ b/plugins/channeltx/moddatv/datvmodgui.cpp
@@ -27,12 +27,10 @@
#include "device/deviceuiset.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "util/db.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/dialogpositioner.h"
#include "maincore.h"
diff --git a/plugins/channeltx/moddatv/datvmodsettings.cpp b/plugins/channeltx/moddatv/datvmodsettings.cpp
index ab175acd9..991d2d129 100644
--- a/plugins/channeltx/moddatv/datvmodsettings.cpp
+++ b/plugins/channeltx/moddatv/datvmodsettings.cpp
@@ -18,7 +18,6 @@
#include <QColor>
-#include "dsp/dspengine.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
#include "datvmodsettings.h"
diff --git a/plugins/channeltx/moddatv/datvmodsource.cpp b/plugins/channeltx/moddatv/datvmodsource.cpp
index e0bfa29db..9549141e3 100644
--- a/plugins/channeltx/moddatv/datvmodsource.cpp
+++ b/plugins/channeltx/moddatv/datvmodsource.cpp
@@ -35,9 +35,6 @@ extern "C"
#include <libavformat/avformat.h>
}
-#include "dsp/dspcommands.h"
-#include "device/deviceapi.h"
-#include "util/db.h"
#include "util/messagequeue.h"
#include "datvmodreport.h"
diff --git a/plugins/channeltx/moddatv/dvb-s2/DVB2.cpp b/plugins/channeltx/moddatv/dvb-s2/DVB2.cpp
index 6d8a47ec5..beabedda6 100644
--- a/plugins/channeltx/moddatv/dvb-s2/DVB2.cpp
+++ b/plugins/channeltx/moddatv/dvb-s2/DVB2.cpp
@@ -14,7 +14,6 @@
// You should have received a copy of the GNU General Public License //
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
///////////////////////////////////////////////////////////////////////////////////////
-#include "memory.h"
#include "DVB2.h"
diff --git a/plugins/channeltx/moddatv/dvb-s2/dvb2_bbheader.cpp b/plugins/channeltx/moddatv/dvb-s2/dvb2_bbheader.cpp
index 86c427a40..e11c0c2b9 100644
--- a/plugins/channeltx/moddatv/dvb-s2/dvb2_bbheader.cpp
+++ b/plugins/channeltx/moddatv/dvb-s2/dvb2_bbheader.cpp
@@ -15,7 +15,6 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
///////////////////////////////////////////////////////////////////////////////////////
#include "DVB2.h"
-#include "memory.h"
//
// This file adds the BB header and new transport packets
//
diff --git a/plugins/channeltx/moddatv/dvb-s2/dvbs2_interleave.cpp b/plugins/channeltx/moddatv/dvb-s2/dvbs2_interleave.cpp
index 2205a064b..37a603a35 100644
--- a/plugins/channeltx/moddatv/dvb-s2/dvbs2_interleave.cpp
+++ b/plugins/channeltx/moddatv/dvb-s2/dvbs2_interleave.cpp
@@ -14,7 +14,6 @@
// You should have received a copy of the GNU General Public License //
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
///////////////////////////////////////////////////////////////////////////////////////
-#include "memory.h"
#include "DVBS2.h"
//
// The output is bit packed ready for modulating
diff --git a/plugins/channeltx/modfreedv/freedvmod.cpp b/plugins/channeltx/modfreedv/freedvmod.cpp
index 069a760aa..48514d151 100644
--- a/plugins/channeltx/modfreedv/freedvmod.cpp
+++ b/plugins/channeltx/modfreedv/freedvmod.cpp
@@ -34,10 +34,8 @@
#include "SWGChannelReport.h"
#include "SWGFreeDVModReport.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "util/db.h"
#include "maincore.h"
diff --git a/plugins/channeltx/modfreedv/freedvmodgui.cpp b/plugins/channeltx/modfreedv/freedvmodgui.cpp
index 2a7ff5de2..5d289d51b 100644
--- a/plugins/channeltx/modfreedv/freedvmodgui.cpp
+++ b/plugins/channeltx/modfreedv/freedvmodgui.cpp
@@ -31,7 +31,6 @@
#include "device/deviceuiset.h"
#include "dsp/spectrumvis.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
@@ -39,7 +38,6 @@
#include "gui/crightclickenabler.h"
#include "gui/audioselectdialog.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
#include "maincore.h"
diff --git a/plugins/channeltx/modfreedv/freedvmodsettings.cpp b/plugins/channeltx/modfreedv/freedvmodsettings.cpp
index 3eddae21c..152b5ac74 100644
--- a/plugins/channeltx/modfreedv/freedvmodsettings.cpp
+++ b/plugins/channeltx/modfreedv/freedvmodsettings.cpp
@@ -18,7 +18,7 @@
#include <QColor>
-#include "dsp/dspengine.h"
+#include "audio/audiodevicemanager.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
#include "freedvmodsettings.h"
diff --git a/plugins/channeltx/modm17/m17mod.cpp b/plugins/channeltx/modm17/m17mod.cpp
index 730a93b8f..2fe8d5be6 100644
--- a/plugins/channeltx/modm17/m17mod.cpp
+++ b/plugins/channeltx/modm17/m17mod.cpp
@@ -28,16 +28,13 @@
#include "SWGChannelSettings.h"
#include "SWGWorkspaceInfo.h"
#include "SWGChannelReport.h"
-#include "SWGNFMModReport.h"
#include <stdio.h>
#include <complex.h>
#include <algorithm>
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "util/db.h"
#include "maincore.h"
diff --git a/plugins/channeltx/modm17/m17modgui.cpp b/plugins/channeltx/modm17/m17modgui.cpp
index 7c31e3e07..c06b59c2c 100644
--- a/plugins/channeltx/modm17/m17modgui.cpp
+++ b/plugins/channeltx/modm17/m17modgui.cpp
@@ -29,15 +29,12 @@
#include "device/deviceuiset.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
-#include "dsp/scopevisxy.h"
#include "gui/crightclickenabler.h"
#include "gui/audioselectdialog.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
#include "maincore.h"
diff --git a/plugins/channeltx/modm17/m17modsettings.cpp b/plugins/channeltx/modm17/m17modsettings.cpp
index 87c91fc77..c2d95f007 100644
--- a/plugins/channeltx/modm17/m17modsettings.cpp
+++ b/plugins/channeltx/modm17/m17modsettings.cpp
@@ -21,7 +21,7 @@
#include <QColor>
#include <QDebug>
-#include "dsp/dspengine.h"
+#include "audio/audiodevicemanager.h"
#include "dsp/ctcssfrequencies.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
diff --git a/plugins/channeltx/modm17/m17modsource.cpp b/plugins/channeltx/modm17/m17modsource.cpp
index d3bb6418f..2146d0de0 100644
--- a/plugins/channeltx/modm17/m17modsource.cpp
+++ b/plugins/channeltx/modm17/m17modsource.cpp
@@ -20,7 +20,6 @@
#include <QDebug>
#include "dsp/datafifo.h"
-#include "dsp/basebandsamplesink.h"
#include "util/messagequeue.h"
#include "maincore.h"
diff --git a/plugins/channeltx/modnfm/nfmmod.cpp b/plugins/channeltx/modnfm/nfmmod.cpp
index 2f55522e6..78940acd3 100644
--- a/plugins/channeltx/modnfm/nfmmod.cpp
+++ b/plugins/channeltx/modnfm/nfmmod.cpp
@@ -35,11 +35,9 @@
#include <complex.h>
#include <algorithm>
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/cwkeyer.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "util/db.h"
#include "maincore.h"
diff --git a/plugins/channeltx/modnfm/nfmmodgui.cpp b/plugins/channeltx/modnfm/nfmmodgui.cpp
index 5fc1b512e..c3b51aff0 100644
--- a/plugins/channeltx/modnfm/nfmmodgui.cpp
+++ b/plugins/channeltx/modnfm/nfmmodgui.cpp
@@ -29,7 +29,6 @@
#include "device/deviceuiset.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "dsp/dspengine.h"
#include "dsp/cwkeyer.h"
@@ -37,7 +36,6 @@
#include "gui/crightclickenabler.h"
#include "gui/audioselectdialog.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
#include "maincore.h"
diff --git a/plugins/channeltx/modnfm/nfmmodsettings.cpp b/plugins/channeltx/modnfm/nfmmodsettings.cpp
index 21594c2b0..4e9a63b2b 100644
--- a/plugins/channeltx/modnfm/nfmmodsettings.cpp
+++ b/plugins/channeltx/modnfm/nfmmodsettings.cpp
@@ -21,7 +21,7 @@
#include <QColor>
#include <QDebug>
-#include "dsp/dspengine.h"
+#include "audio/audiodevicemanager.h"
#include "dsp/ctcssfrequencies.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
diff --git a/plugins/channeltx/modpacket/packetmod.cpp b/plugins/channeltx/modpacket/packetmod.cpp
index a302ec36d..48d7105e1 100644
--- a/plugins/channeltx/modpacket/packetmod.cpp
+++ b/plugins/channeltx/modpacket/packetmod.cpp
@@ -39,12 +39,9 @@
#include <complex.h>
#include <algorithm>
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "util/db.h"
-#include "util/crc.h"
#include "maincore.h"
#include "packetmodbaseband.h"
diff --git a/plugins/channeltx/modpacket/packetmodbaseband.cpp b/plugins/channeltx/modpacket/packetmodbaseband.cpp
index 740da72fc..8c9c08854 100644
--- a/plugins/channeltx/modpacket/packetmodbaseband.cpp
+++ b/plugins/channeltx/modpacket/packetmodbaseband.cpp
@@ -20,7 +20,6 @@
#include <QDebug>
#include "dsp/upchannelizer.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "packetmodbaseband.h"
diff --git a/plugins/channeltx/modpacket/packetmodgui.cpp b/plugins/channeltx/modpacket/packetmodgui.cpp
index 58ea64c04..6db20b8df 100644
--- a/plugins/channeltx/modpacket/packetmodgui.cpp
+++ b/plugins/channeltx/modpacket/packetmodgui.cpp
@@ -27,12 +27,10 @@
#include "dsp/dspcommands.h"
#include "device/deviceuiset.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "gui/glspectrum.h"
#include "gui/crightclickenabler.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/fmpreemphasisdialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
diff --git a/plugins/channeltx/modpacket/packetmodsettings.cpp b/plugins/channeltx/modpacket/packetmodsettings.cpp
index 408365525..483aafb35 100644
--- a/plugins/channeltx/modpacket/packetmodsettings.cpp
+++ b/plugins/channeltx/modpacket/packetmodsettings.cpp
@@ -19,7 +19,6 @@
#include <QColor>
#include <QDebug>
-#include "dsp/dspengine.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
#include "packetmodsettings.h"
diff --git a/plugins/channeltx/modpsk31/psk31mod.cpp b/plugins/channeltx/modpsk31/psk31mod.cpp
index 9bed9c3c4..70efa98e0 100644
--- a/plugins/channeltx/modpsk31/psk31mod.cpp
+++ b/plugins/channeltx/modpsk31/psk31mod.cpp
@@ -36,12 +36,9 @@
#include <complex.h>
#include <algorithm>
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "util/db.h"
-#include "util/crc.h"
#include "maincore.h"
#include "psk31modbaseband.h"
diff --git a/plugins/channeltx/modpsk31/psk31modbaseband.cpp b/plugins/channeltx/modpsk31/psk31modbaseband.cpp
index 691414567..7304cbeff 100644
--- a/plugins/channeltx/modpsk31/psk31modbaseband.cpp
+++ b/plugins/channeltx/modpsk31/psk31modbaseband.cpp
@@ -20,7 +20,6 @@
#include <QDebug>
#include "dsp/upchannelizer.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "psk31modbaseband.h"
diff --git a/plugins/channeltx/modpsk31/psk31modgui.cpp b/plugins/channeltx/modpsk31/psk31modgui.cpp
index 9f00fabfd..92c9d1f0d 100644
--- a/plugins/channeltx/modpsk31/psk31modgui.cpp
+++ b/plugins/channeltx/modpsk31/psk31modgui.cpp
@@ -28,15 +28,12 @@
#include "device/deviceuiset.h"
#include "plugin/pluginapi.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "util/rtty.h"
#include "util/maidenhead.h"
#include "gui/glspectrum.h"
#include "gui/crightclickenabler.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
-#include "gui/fmpreemphasisdialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
#include "maincore.h"
diff --git a/plugins/channeltx/modpsk31/psk31modsettings.cpp b/plugins/channeltx/modpsk31/psk31modsettings.cpp
index 896fca1aa..ebb38ddc0 100644
--- a/plugins/channeltx/modpsk31/psk31modsettings.cpp
+++ b/plugins/channeltx/modpsk31/psk31modsettings.cpp
@@ -18,8 +18,6 @@
#include <QColor>
#include <QDebug>
-#include "dsp/dspengine.h"
-#include "util/baudot.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
#include "psk31modsettings.h"
diff --git a/plugins/channeltx/modrtty/rttymod.cpp b/plugins/channeltx/modrtty/rttymod.cpp
index cfd190d8c..3f761f870 100644
--- a/plugins/channeltx/modrtty/rttymod.cpp
+++ b/plugins/channeltx/modrtty/rttymod.cpp
@@ -36,12 +36,9 @@
#include <complex.h>
#include <algorithm>
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "util/db.h"
-#include "util/crc.h"
#include "maincore.h"
#include "rttymodbaseband.h"
diff --git a/plugins/channeltx/modrtty/rttymodbaseband.cpp b/plugins/channeltx/modrtty/rttymodbaseband.cpp
index 85802be64..a5d1f27d9 100644
--- a/plugins/channeltx/modrtty/rttymodbaseband.cpp
+++ b/plugins/channeltx/modrtty/rttymodbaseband.cpp
@@ -20,7 +20,6 @@
#include <QDebug>
#include "dsp/upchannelizer.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "rttymodbaseband.h"
diff --git a/plugins/channeltx/modrtty/rttymodgui.cpp b/plugins/channeltx/modrtty/rttymodgui.cpp
index 2e7169085..eeaa0ee43 100644
--- a/plugins/channeltx/modrtty/rttymodgui.cpp
+++ b/plugins/channeltx/modrtty/rttymodgui.cpp
@@ -28,15 +28,12 @@
#include "device/deviceuiset.h"
#include "plugin/pluginapi.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "util/rtty.h"
#include "util/maidenhead.h"
#include "gui/glspectrum.h"
#include "gui/crightclickenabler.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
-#include "gui/fmpreemphasisdialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
#include "maincore.h"
diff --git a/plugins/channeltx/modrtty/rttymodsettings.cpp b/plugins/channeltx/modrtty/rttymodsettings.cpp
index 077890562..3d85b842b 100644
--- a/plugins/channeltx/modrtty/rttymodsettings.cpp
+++ b/plugins/channeltx/modrtty/rttymodsettings.cpp
@@ -18,7 +18,6 @@
#include <QColor>
#include <QDebug>
-#include "dsp/dspengine.h"
#include "util/baudot.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
diff --git a/plugins/channeltx/modssb/ssbmod.cpp b/plugins/channeltx/modssb/ssbmod.cpp
index 2c31a12c8..67106ec72 100644
--- a/plugins/channeltx/modssb/ssbmod.cpp
+++ b/plugins/channeltx/modssb/ssbmod.cpp
@@ -35,11 +35,9 @@
#include "SWGChannelReport.h"
#include "SWGSSBModReport.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/cwkeyer.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "util/db.h"
#include "maincore.h"
diff --git a/plugins/channeltx/modssb/ssbmodgui.cpp b/plugins/channeltx/modssb/ssbmodgui.cpp
index 3289db300..d0f9e5946 100644
--- a/plugins/channeltx/modssb/ssbmodgui.cpp
+++ b/plugins/channeltx/modssb/ssbmodgui.cpp
@@ -33,7 +33,6 @@
#include "dsp/spectrumvis.h"
#include "ui_ssbmodgui.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
@@ -41,7 +40,6 @@
#include "gui/crightclickenabler.h"
#include "gui/audioselectdialog.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
#include "maincore.h"
diff --git a/plugins/channeltx/modssb/ssbmodsettings.cpp b/plugins/channeltx/modssb/ssbmodsettings.cpp
index 87bb66eab..d001a2806 100644
--- a/plugins/channeltx/modssb/ssbmodsettings.cpp
+++ b/plugins/channeltx/modssb/ssbmodsettings.cpp
@@ -18,7 +18,7 @@
#include <QColor>
-#include "dsp/dspengine.h"
+#include "audio/audiodevicemanager.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
#include "ssbmodsettings.h"
diff --git a/plugins/channeltx/modwfm/wfmmod.cpp b/plugins/channeltx/modwfm/wfmmod.cpp
index ddae066b0..5c6955734 100644
--- a/plugins/channeltx/modwfm/wfmmod.cpp
+++ b/plugins/channeltx/modwfm/wfmmod.cpp
@@ -32,12 +32,9 @@
#include "SWGChannelSettings.h"
#include "SWGWorkspaceInfo.h"
#include "SWGChannelReport.h"
-#include "SWGAMModReport.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "util/db.h"
#include "maincore.h"
diff --git a/plugins/channeltx/modwfm/wfmmodgui.cpp b/plugins/channeltx/modwfm/wfmmodgui.cpp
index 0d690ad6f..1fcb1eb58 100644
--- a/plugins/channeltx/modwfm/wfmmodgui.cpp
+++ b/plugins/channeltx/modwfm/wfmmodgui.cpp
@@ -29,7 +29,6 @@
#include "device/deviceuiset.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "dsp/dspengine.h"
#include "dsp/cwkeyer.h"
@@ -37,7 +36,6 @@
#include "gui/crightclickenabler.h"
#include "gui/audioselectdialog.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
#include "maincore.h"
diff --git a/plugins/channeltx/remotesource/remotesource.cpp b/plugins/channeltx/remotesource/remotesource.cpp
index a4bc9fec2..ec9308ffa 100644
--- a/plugins/channeltx/remotesource/remotesource.cpp
+++ b/plugins/channeltx/remotesource/remotesource.cpp
@@ -34,10 +34,8 @@
#include "dsp/hbfilterchainconverter.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
-#include "feature/feature.h"
#include "settings/serializable.h"
#include "util/timeutil.h"
-#include "util/db.h"
#include "maincore.h"
#include "remotesourcebaseband.h"
diff --git a/plugins/channeltx/remotesource/remotesourcegui.cpp b/plugins/channeltx/remotesource/remotesourcegui.cpp
index c94a03003..f53676bdd 100644
--- a/plugins/channeltx/remotesource/remotesourcegui.cpp
+++ b/plugins/channeltx/remotesource/remotesourcegui.cpp
@@ -23,9 +23,7 @@
#include "dsp/hbfilterchainconverter.h"
#include "dsp/dspcommands.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/dialogpositioner.h"
-#include "mainwindow.h"
#include "remotesource.h"
#include "ui_remotesourcegui.h"
diff --git a/plugins/channeltx/udpsource/udpsource.cpp b/plugins/channeltx/udpsource/udpsource.cpp
index 263b107a6..e30d1a1d0 100644
--- a/plugins/channeltx/udpsource/udpsource.cpp
+++ b/plugins/channeltx/udpsource/udpsource.cpp
@@ -30,7 +30,6 @@
#include "device/deviceapi.h"
#include "dsp/dspcommands.h"
-#include "feature/feature.h"
#include "util/db.h"
#include "maincore.h"
diff --git a/plugins/channeltx/udpsource/udpsourcebaseband.cpp b/plugins/channeltx/udpsource/udpsourcebaseband.cpp
index 1ea0167b1..f68ab4ab6 100644
--- a/plugins/channeltx/udpsource/udpsourcebaseband.cpp
+++ b/plugins/channeltx/udpsource/udpsourcebaseband.cpp
@@ -19,7 +19,6 @@
#include <QDebug>
#include "dsp/upchannelizer.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "udpsourcebaseband.h"
diff --git a/plugins/channeltx/udpsource/udpsourcegui.cpp b/plugins/channeltx/udpsource/udpsourcegui.cpp
index 4079497ca..b93a0c687 100644
--- a/plugins/channeltx/udpsource/udpsourcegui.cpp
+++ b/plugins/channeltx/udpsource/udpsourcegui.cpp
@@ -22,10 +22,8 @@
#include "dsp/spectrumvis.h"
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "gui/basicchannelsettingsdialog.h"
-#include "gui/devicestreamselectiondialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
#include "plugin/pluginapi.h"
diff --git a/plugins/channeltx/udpsource/udpsourcesettings.cpp b/plugins/channeltx/udpsource/udpsourcesettings.cpp
index db7ca32f2..08ad66661 100644
--- a/plugins/channeltx/udpsource/udpsourcesettings.cpp
+++ b/plugins/channeltx/udpsource/udpsourcesettings.cpp
@@ -20,7 +20,6 @@
#include <QColor>
-#include "dsp/dspengine.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
diff --git a/plugins/channeltx/udpsource/udpsourcesource.cpp b/plugins/channeltx/udpsource/udpsourcesource.cpp
index ce223c5b6..71d6c563c 100644
--- a/plugins/channeltx/udpsource/udpsourcesource.cpp
+++ b/plugins/channeltx/udpsource/udpsourcesource.cpp
@@ -17,12 +17,10 @@
#include <QDebug>
-#include "dsp/dspcommands.h"
#include "dsp/basebandsamplesink.h"
#include "util/db.h"
#include "udpsourcesource.h"
-#include "udpsourcemsg.h"
UDPSourceSource::UDPSourceSource() :
m_channelSampleRate(48000),
diff --git a/plugins/feature/afc/afcgui.cpp b/plugins/feature/afc/afcgui.cpp
index 013bffae4..0108852f0 100644
--- a/plugins/feature/afc/afcgui.cpp
+++ b/plugins/feature/afc/afcgui.cpp
@@ -19,12 +19,9 @@
#include <QMessageBox>
#include "feature/featureuiset.h"
-#include "device/deviceset.h"
-#include "channel/channelapi.h"
#include "gui/basicfeaturesettingsdialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
-#include "maincore.h"
#include "ui_afcgui.h"
#include "afcreport.h"
diff --git a/plugins/feature/afc/afcworker.cpp b/plugins/feature/afc/afcworker.cpp
index a6f5ccb04..458724d04 100644
--- a/plugins/feature/afc/afcworker.cpp
+++ b/plugins/feature/afc/afcworker.cpp
@@ -19,8 +19,6 @@
#include <QDebug>
-#include "SWGDeviceState.h"
-#include "SWGSuccessResponse.h"
#include "SWGDeviceSettings.h"
#include "SWGChannelSettings.h"
#include "SWGErrorResponse.h"
@@ -30,7 +28,6 @@
#include "device/deviceset.h"
#include "device/deviceapi.h"
#include "channel/channelapi.h"
-#include "feature/feature.h"
#include "maincore.h"
#include "afcreport.h"
diff --git a/plugins/feature/ais/ais.cpp b/plugins/feature/ais/ais.cpp
index 484b9a32a..23df56062 100644
--- a/plugins/feature/ais/ais.cpp
+++ b/plugins/feature/ais/ais.cpp
@@ -22,13 +22,7 @@
#include <QBuffer>
#include "SWGFeatureSettings.h"
-#include "SWGFeatureReport.h"
-#include "SWGFeatureActions.h"
-#include "SWGDeviceState.h"
-#include "dsp/dspengine.h"
-#include "device/deviceset.h"
-#include "channel/channelapi.h"
#include "feature/featureset.h"
#include "settings/serializable.h"
#include "maincore.h"
diff --git a/plugins/feature/ais/aisgui.cpp b/plugins/feature/ais/aisgui.cpp
index 9ce611f6a..6927e2733 100644
--- a/plugins/feature/ais/aisgui.cpp
+++ b/plugins/feature/ais/aisgui.cpp
@@ -29,9 +29,8 @@
#include "gui/basicfeaturesettingsdialog.h"
#include "gui/tabletapandhold.h"
#include "gui/dialogpositioner.h"
-#include "mainwindow.h"
-#include "device/deviceuiset.h"
#include "util/mmsi.h"
+#include "maincore.h"
#include "ui_aisgui.h"
#include "ais.h"
diff --git a/plugins/feature/ambe/ambegui.cpp b/plugins/feature/ambe/ambegui.cpp
index 9de9131a0..b7f306eaf 100644
--- a/plugins/feature/ambe/ambegui.cpp
+++ b/plugins/feature/ambe/ambegui.cpp
@@ -18,7 +18,6 @@
#include "feature/featureuiset.h"
#include "gui/basicfeaturesettingsdialog.h"
-#include "gui/crightclickenabler.h"
#include "gui/dialogpositioner.h"
#include "ui_ambegui.h"
diff --git a/plugins/feature/antennatools/antennatools.cpp b/plugins/feature/antennatools/antennatools.cpp
index 40606ccff..f897e19d2 100644
--- a/plugins/feature/antennatools/antennatools.cpp
+++ b/plugins/feature/antennatools/antennatools.cpp
@@ -22,15 +22,9 @@
#include <QBuffer>
#include "SWGFeatureSettings.h"
-#include "SWGDeviceState.h"
-#include "dsp/dspengine.h"
-
-#include "device/deviceset.h"
-#include "channel/channelapi.h"
#include "feature/featureset.h"
#include "settings/serializable.h"
-#include "maincore.h"
#include "antennatools.h"
MESSAGE_CLASS_DEFINITION(AntennaTools::MsgConfigureAntennaTools, Message)
diff --git a/plugins/feature/antennatools/antennatoolsgui.cpp b/plugins/feature/antennatools/antennatoolsgui.cpp
index ba71377ae..0266590d7 100644
--- a/plugins/feature/antennatools/antennatoolsgui.cpp
+++ b/plugins/feature/antennatools/antennatoolsgui.cpp
@@ -24,7 +24,6 @@
#include "gui/basicfeaturesettingsdialog.h"
#include "gui/dialogpositioner.h"
#include "channel/channelwebapiutils.h"
-#include "mainwindow.h"
#include "maincore.h"
#include "device/deviceuiset.h"
#include "util/units.h"
diff --git a/plugins/feature/aprs/aprs.cpp b/plugins/feature/aprs/aprs.cpp
index 8bd06c23a..ecba7f919 100644
--- a/plugins/feature/aprs/aprs.cpp
+++ b/plugins/feature/aprs/aprs.cpp
@@ -22,14 +22,8 @@
#include <QBuffer>
#include "SWGFeatureSettings.h"
-#include "SWGFeatureReport.h"
-#include "SWGFeatureActions.h"
#include "SWGDeviceState.h"
-#include "dsp/dspengine.h"
-
-#include "device/deviceset.h"
-#include "channel/channelapi.h"
#include "settings/serializable.h"
#include "maincore.h"
#include "aprsworker.h"
diff --git a/plugins/feature/aprs/aprsgui.cpp b/plugins/feature/aprs/aprsgui.cpp
index eea47c40b..8b111bfc8 100644
--- a/plugins/feature/aprs/aprsgui.cpp
+++ b/plugins/feature/aprs/aprsgui.cpp
@@ -34,9 +34,7 @@
#include "feature/featurewebapiutils.h"
#include "gui/basicfeaturesettingsdialog.h"
#include "gui/dialogpositioner.h"
-#include "mainwindow.h"
#include "maincore.h"
-#include "device/deviceuiset.h"
#include "ui_aprsgui.h"
#include "aprs.h"
diff --git a/plugins/feature/aprs/aprsworker.cpp b/plugins/feature/aprs/aprsworker.cpp
index 38d55a6dc..9095efba5 100644
--- a/plugins/feature/aprs/aprsworker.cpp
+++ b/plugins/feature/aprs/aprsworker.cpp
@@ -24,7 +24,6 @@
#include <QCoreApplication>
#include "webapi/webapiadapterinterface.h"
-#include "webapi/webapiutils.h"
#include "maincore.h"
#include "util/ax25.h"
#include "util/aprs.h"
diff --git a/plugins/feature/demodanalyzer/demodanalyzer.cpp b/plugins/feature/demodanalyzer/demodanalyzer.cpp
index 8cf34680f..9d9b7cc9c 100644
--- a/plugins/feature/demodanalyzer/demodanalyzer.cpp
+++ b/plugins/feature/demodanalyzer/demodanalyzer.cpp
@@ -26,11 +26,7 @@
#include "SWGDeviceState.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
#include "dsp/datafifo.h"
-#include "dsp/dspdevicesourceengine.h"
-#include "dsp/devicesamplesource.h"
-#include "device/deviceset.h"
#include "channel/channelapi.h"
#include "maincore.h"
diff --git a/plugins/feature/demodanalyzer/demodanalyzergui.cpp b/plugins/feature/demodanalyzer/demodanalyzergui.cpp
index cda4b97cf..bd6cc65be 100644
--- a/plugins/feature/demodanalyzer/demodanalyzergui.cpp
+++ b/plugins/feature/demodanalyzer/demodanalyzergui.cpp
@@ -26,7 +26,6 @@
#include "gui/glscope.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
-#include "device/deviceset.h"
#include "util/db.h"
#include "maincore.h"
diff --git a/plugins/feature/gs232controller/gs232controller.cpp b/plugins/feature/gs232controller/gs232controller.cpp
index dff0774c1..c4d47cad5 100644
--- a/plugins/feature/gs232controller/gs232controller.cpp
+++ b/plugins/feature/gs232controller/gs232controller.cpp
@@ -31,8 +31,6 @@
#include "SWGDeviceState.h"
#include "SWGTargetAzimuthElevation.h"
-#include "dsp/dspengine.h"
-#include "device/deviceset.h"
#include "feature/featureset.h"
#include "settings/serializable.h"
#include "maincore.h"
diff --git a/plugins/feature/gs232controller/gs232controllergui.cpp b/plugins/feature/gs232controller/gs232controllergui.cpp
index 6c9477310..4d8a0593f 100644
--- a/plugins/feature/gs232controller/gs232controllergui.cpp
+++ b/plugins/feature/gs232controller/gs232controllergui.cpp
@@ -26,8 +26,6 @@
#include "feature/featureuiset.h"
#include "gui/basicfeaturesettingsdialog.h"
#include "gui/dialogpositioner.h"
-#include "mainwindow.h"
-#include "device/deviceuiset.h"
#include "util/astronomy.h"
#include "ui_gs232controllergui.h"
diff --git a/plugins/feature/gs232controller/gs232controllerworker.cpp b/plugins/feature/gs232controller/gs232controllerworker.cpp
index 10fb93d21..1a13c6a44 100644
--- a/plugins/feature/gs232controller/gs232controllerworker.cpp
+++ b/plugins/feature/gs232controller/gs232controllerworker.cpp
@@ -26,7 +26,6 @@
#include <QRegularExpression>
#include "maincore.h"
-#include "util/astronomy.h"
#include "SWGTargetAzimuthElevation.h"
diff --git a/plugins/feature/jogdialcontroller/jogdialcontroller.cpp b/plugins/feature/jogdialcontroller/jogdialcontroller.cpp
index 0c9170a07..80dbfd207 100644
--- a/plugins/feature/jogdialcontroller/jogdialcontroller.cpp
+++ b/plugins/feature/jogdialcontroller/jogdialcontroller.cpp
@@ -21,11 +21,8 @@
#include <QBuffer>
#include "SWGFeatureSettings.h"
-#include "SWGFeatureActions.h"
#include "SWGDeviceState.h"
-#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
#include "dsp/dspdevicesourceengine.h"
#include "dsp/dspdevicesinkengine.h"
#include "dsp/devicesamplesource.h"
@@ -33,7 +30,6 @@
#include "device/deviceset.h"
#include "channel/channelapi.h"
#include "device/deviceapi.h"
-#include "commands/commandkeyreceiver.h"
#include "settings/serializable.h"
#include "maincore.h"
diff --git a/plugins/feature/jogdialcontroller/jogdialcontrollergui.cpp b/plugins/feature/jogdialcontroller/jogdialcontrollergui.cpp
index 1301590d7..2f1e395f5 100644
--- a/plugins/feature/jogdialcontroller/jogdialcontrollergui.cpp
+++ b/plugins/feature/jogdialcontroller/jogdialcontrollergui.cpp
@@ -22,8 +22,6 @@
#include "feature/featureuiset.h"
#include "gui/basicfeaturesettingsdialog.h"
#include "gui/dialogpositioner.h"
-#include "device/deviceset.h"
-#include "util/db.h"
#include "maincore.h"
#include "ui_jogdialcontrollergui.h"
diff --git a/plugins/feature/limerfe/limerfegui.cpp b/plugins/feature/limerfe/limerfegui.cpp
index abd6608ba..2dcab36cc 100644
--- a/plugins/feature/limerfe/limerfegui.cpp
+++ b/plugins/feature/limerfe/limerfegui.cpp
@@ -18,10 +18,8 @@
#include "feature/featureuiset.h"
#include "gui/basicfeaturesettingsdialog.h"
-#include "gui/crightclickenabler.h"
#include "gui/dialogpositioner.h"
#include "util/db.h"
-#include "dsp/dspengine.h"
#include "dsp/dspdevicesourceengine.h"
#include "dsp/dspdevicesinkengine.h"
#include "device/deviceset.h"
diff --git a/plugins/feature/map/map.cpp b/plugins/feature/map/map.cpp
index ed12fe3d4..7d09e80c8 100644
--- a/plugins/feature/map/map.cpp
+++ b/plugins/feature/map/map.cpp
@@ -28,10 +28,6 @@
#include "SWGFeatureActions.h"
#include "SWGDeviceState.h"
-#include "dsp/dspengine.h"
-
-#include "device/deviceset.h"
-#include "channel/channelapi.h"
#include "feature/featureset.h"
#include "settings/serializable.h"
#include "maincore.h"
diff --git a/plugins/feature/map/mapgui.cpp b/plugins/feature/map/mapgui.cpp
index ea1987642..8bd3d6a0b 100644
--- a/plugins/feature/map/mapgui.cpp
+++ b/plugins/feature/map/mapgui.cpp
@@ -38,11 +38,9 @@
#include "feature/featureuiset.h"
#include "gui/basicfeaturesettingsdialog.h"
#include "gui/dialogpositioner.h"
-#include "mainwindow.h"
#include "device/deviceset.h"
#include "device/deviceapi.h"
#include "dsp/devicesamplesource.h"
-#include "device/deviceuiset.h"
#include "device/deviceenumerator.h"
#include "util/units.h"
#include "util/maidenhead.h"
@@ -58,7 +56,6 @@
#include "map.h"
#include "mapgui.h"
#include "SWGMapItem.h"
-#include "SWGTargetAzimuthElevation.h"
#include "SWGDeviceSettings.h"
#include "SWGKiwiSDRSettings.h"
#include "SWGRemoteTCPInputSettings.h"
diff --git a/plugins/feature/map/mapsettingsdialog.cpp b/plugins/feature/map/mapsettingsdialog.cpp
index 7ec0f9c88..d6c43f0e2 100644
--- a/plugins/feature/map/mapsettingsdialog.cpp
+++ b/plugins/feature/map/mapsettingsdialog.cpp
@@ -21,18 +21,14 @@
#include <QToolButton>
#include <QFileDialog>
+#include "mapsettingsdialog.h"
+
#if (QT_VERSION < QT_VERSION_CHECK(6, 6, 0))
#include <QtGui/private/qzipreader_p.h>
#else
#include <QtCore/private/qzipreader_p.h>
#endif
-#include "util/units.h"
-#include "gui/colordialog.h"
-
-#include "mapsettingsdialog.h"
-#include "maplocationdialog.h"
-
MapItemSettingsGUI::MapItemSettingsGUI(QTableWidget *table, int row, MapSettings::MapItemSettings *settings) :
m_track2D(table, row, MapSettingsDialog::COL_2D_TRACK, !settings->m_display2DTrack, settings->m_2DTrackColor),
m_point3D(table, row, MapSettingsDialog::COL_3D_POINT, !settings->m_display3DPoint, settings->m_3DPointColor),
diff --git a/plugins/feature/pertester/pertester.cpp b/plugins/feature/pertester/pertester.cpp
index 402508595..2e0333286 100644
--- a/plugins/feature/pertester/pertester.cpp
+++ b/plugins/feature/pertester/pertester.cpp
@@ -28,16 +28,11 @@
#include "SWGDeviceState.h"
#include "SWGPERTesterActions.h"
-#include "dsp/dspengine.h"
-#include "device/deviceset.h"
-#include "channel/channelapi.h"
#include "feature/featureset.h"
#include "settings/serializable.h"
-#include "maincore.h"
#include "pertester.h"
#include "pertesterworker.h"
-#include "pertesterreport.h"
MESSAGE_CLASS_DEFINITION(PERTester::MsgConfigurePERTester, Message)
MESSAGE_CLASS_DEFINITION(PERTester::MsgStartStop, Message)
diff --git a/plugins/feature/pertester/pertestergui.cpp b/plugins/feature/pertester/pertestergui.cpp
index 9ad465441..0acfc50e0 100644
--- a/plugins/feature/pertester/pertestergui.cpp
+++ b/plugins/feature/pertester/pertestergui.cpp
@@ -23,8 +23,6 @@
#include "feature/featureuiset.h"
#include "gui/basicfeaturesettingsdialog.h"
#include "gui/dialogpositioner.h"
-#include "mainwindow.h"
-#include "device/deviceuiset.h"
#include "ui_pertestergui.h"
#include "pertester.h"
diff --git a/plugins/feature/radiosonde/radiosonde.cpp b/plugins/feature/radiosonde/radiosonde.cpp
index 0fcafa60b..7d5f9e06c 100644
--- a/plugins/feature/radiosonde/radiosonde.cpp
+++ b/plugins/feature/radiosonde/radiosonde.cpp
@@ -22,13 +22,7 @@
#include <QBuffer>
#include "SWGFeatureSettings.h"
-#include "SWGFeatureReport.h"
-#include "SWGFeatureActions.h"
-#include "SWGDeviceState.h"
-#include "dsp/dspengine.h"
-#include "device/deviceset.h"
-#include "channel/channelapi.h"
#include "feature/featureset.h"
#include "settings/serializable.h"
#include "maincore.h"
diff --git a/plugins/feature/radiosonde/radiosondegui.cpp b/plugins/feature/radiosonde/radiosondegui.cpp
index 585a6707a..1aa3e1af6 100644
--- a/plugins/feature/radiosonde/radiosondegui.cpp
+++ b/plugins/feature/radiosonde/radiosondegui.cpp
@@ -30,9 +30,8 @@
#include "gui/tabletapandhold.h"
#include "gui/dialogpositioner.h"
#include "gui/crightclickenabler.h"
-#include "mainwindow.h"
-#include "device/deviceuiset.h"
#include "device/deviceapi.h"
+#include "maincore.h"
#include "ui_radiosondegui.h"
#include "radiosonde.h"
diff --git a/plugins/feature/rigctlserver/rigctlserver.cpp b/plugins/feature/rigctlserver/rigctlserver.cpp
index de70fb481..7a405bc90 100644
--- a/plugins/feature/rigctlserver/rigctlserver.cpp
+++ b/plugins/feature/rigctlserver/rigctlserver.cpp
@@ -27,7 +27,6 @@
#include "SWGFeatureActions.h"
#include "SWGDeviceState.h"
-#include "dsp/dspengine.h"
#include "settings/serializable.h"
#include "rigctlserverworker.h"
diff --git a/plugins/feature/satellitetracker/satellitedevicesettingsgui.cpp b/plugins/feature/satellitetracker/satellitedevicesettingsgui.cpp
index fe2288534..248925a88 100644
--- a/plugins/feature/satellitetracker/satellitedevicesettingsgui.cpp
+++ b/plugins/feature/satellitetracker/satellitedevicesettingsgui.cpp
@@ -24,9 +24,7 @@
#include "device/deviceset.h"
#include "settings/mainsettings.h"
#include "maincore.h"
-#include "util/messagequeue.h"
#include "plugin/pluginmanager.h"
-#include "plugin/pluginapi.h"
SatelliteDeviceSettingsGUI::SatelliteDeviceSettingsGUI(SatelliteTrackerSettings::SatelliteDeviceSettings *devSettings,
QTabWidget *tab, QWidget *parent) :
diff --git a/plugins/feature/satellitetracker/satelliteradiocontroldialog.cpp b/plugins/feature/satellitetracker/satelliteradiocontroldialog.cpp
index b354ccea3..6845ebb77 100644
--- a/plugins/feature/satellitetracker/satelliteradiocontroldialog.cpp
+++ b/plugins/feature/satellitetracker/satelliteradiocontroldialog.cpp
@@ -22,10 +22,8 @@
#include <QCheckBox>
#include "device/deviceset.h"
-#include "settings/mainsettings.h"
-#include "settings/preset.h"
#include "maincore.h"
-#include "util/messagequeue.h"
+
#include "satelliteradiocontroldialog.h"
SatelliteRadioControlDialog::SatelliteRadioControlDialog(SatelliteTrackerSettings *settings,
diff --git a/plugins/feature/satellitetracker/satelliteselectiondialog.cpp b/plugins/feature/satellitetracker/satelliteselectiondialog.cpp
index 73751a8f2..7b6de3e91 100644
--- a/plugins/feature/satellitetracker/satelliteselectiondialog.cpp
+++ b/plugins/feature/satellitetracker/satelliteselectiondialog.cpp
@@ -24,8 +24,8 @@
#include <OrbitalElements.h>
#include <Tle.h>
-#include "satelliteselectiondialog.h"
#include "util/units.h"
+#include "satelliteselectiondialog.h"
using namespace libsgp4;
diff --git a/plugins/feature/satellitetracker/satellitetracker.cpp b/plugins/feature/satellitetracker/satellitetracker.cpp
index b92955ca0..9aae7946e 100644
--- a/plugins/feature/satellitetracker/satellitetracker.cpp
+++ b/plugins/feature/satellitetracker/satellitetracker.cpp
@@ -28,7 +28,6 @@
#include "SWGSatelliteTrackerSettings.h"
#include "SWGSatelliteDeviceSettings.h"
-#include "dsp/dspengine.h"
#include "util/httpdownloadmanager.h"
#include "settings/serializable.h"
#include "channel/channelwebapiutils.h"
diff --git a/plugins/feature/satellitetracker/satellitetrackergui.cpp b/plugins/feature/satellitetracker/satellitetrackergui.cpp
index 4f0c9767d..807f1d5ed 100644
--- a/plugins/feature/satellitetracker/satellitetrackergui.cpp
+++ b/plugins/feature/satellitetracker/satellitetrackergui.cpp
@@ -27,8 +27,6 @@
#include <QtCharts/QDateTimeAxis>
#include <QtCharts/QValueAxis>
-#include "device/deviceapi.h"
-#include "device/deviceset.h"
#include "channel/channelwebapiutils.h"
#include "feature/featureset.h"
#include "feature/featureuiset.h"
@@ -36,10 +34,10 @@
#include "feature/featurewebapiutils.h"
#include "gui/basicfeaturesettingsdialog.h"
#include "gui/dialogpositioner.h"
-#include "mainwindow.h"
-#include "device/deviceuiset.h"
#include "util/units.h"
-#include "util/astronomy.h"
+#include "device/deviceapi.h"
+#include "device/deviceset.h"
+#include "maincore.h"
#include "ui_satellitetrackergui.h"
#include "satellitetracker.h"
diff --git a/plugins/feature/satellitetracker/satellitetrackersettingsdialog.cpp b/plugins/feature/satellitetracker/satellitetrackersettingsdialog.cpp
index cc53c6158..229458a7a 100644
--- a/plugins/feature/satellitetracker/satellitetrackersettingsdialog.cpp
+++ b/plugins/feature/satellitetracker/satellitetrackersettingsdialog.cpp
@@ -15,6 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
///////////////////////////////////////////////////////////////////////////////////
+#include "util/units.h"
#include "satellitetrackersettingsdialog.h"
#include <QDebug>
diff --git a/plugins/feature/satellitetracker/satellitetrackerworker.cpp b/plugins/feature/satellitetracker/satellitetrackerworker.cpp
index 52321e933..bf03c2a4a 100644
--- a/plugins/feature/satellitetracker/satellitetrackerworker.cpp
+++ b/plugins/feature/satellitetracker/satellitetrackerworker.cpp
@@ -32,7 +32,6 @@
#include "SWGMapItem.h"
#include "webapi/webapiadapterinterface.h"
-#include "webapi/webapiutils.h"
#include "util/units.h"
#include "device/deviceset.h"
diff --git a/plugins/feature/sid/sid.cpp b/plugins/feature/sid/sid.cpp
index e655a69c2..80d3f3456 100644
--- a/plugins/feature/sid/sid.cpp
+++ b/plugins/feature/sid/sid.cpp
@@ -24,11 +24,8 @@
#include "SWGFeatureSettings.h"
#include "SWGDeviceState.h"
-#include "dsp/dspengine.h"
-#include "device/deviceset.h"
#include "feature/featureset.h"
#include "settings/serializable.h"
-#include "maincore.h"
#include "sid.h"
#include "sidworker.h"
diff --git a/plugins/feature/sid/sidgui.cpp b/plugins/feature/sid/sidgui.cpp
index dce08bab2..f5639cd3a 100644
--- a/plugins/feature/sid/sidgui.cpp
+++ b/plugins/feature/sid/sidgui.cpp
@@ -27,13 +27,11 @@
#include "channel/channelwebapiutils.h"
#include "gui/crightclickenabler.h"
#include "gui/basicfeaturesettingsdialog.h"
-#include "gui/tabletapandhold.h"
#include "gui/dialogpositioner.h"
-#include "mainwindow.h"
-#include "device/deviceuiset.h"
#include "util/csv.h"
#include "util/astronomy.h"
#include "util/vlftransmitters.h"
+#include "maincore.h"
#include "ui_sidgui.h"
#include "sid.h"
diff --git a/plugins/feature/sid/sidsettings.cpp b/plugins/feature/sid/sidsettings.cpp
index 7b3dadc68..a3e051f84 100644
--- a/plugins/feature/sid/sidsettings.cpp
+++ b/plugins/feature/sid/sidsettings.cpp
@@ -23,7 +23,6 @@
#include "settings/serializable.h"
#include "channel/channelwebapiutils.h"
#include "device/deviceset.h"
-#include "device/deviceapi.h"
#include "maincore.h"
#include "sidsettings.h"
diff --git a/plugins/feature/sid/sidworker.cpp b/plugins/feature/sid/sidworker.cpp
index ab7b234fb..aa49b45a3 100644
--- a/plugins/feature/sid/sidworker.cpp
+++ b/plugins/feature/sid/sidworker.cpp
@@ -19,7 +19,6 @@
#include <QDebug>
#include "webapi/webapiadapterinterface.h"
-#include "webapi/webapiutils.h"
#include "channel/channelwebapiutils.h"
#include "device/deviceset.h"
#include "device/deviceapi.h"
diff --git a/plugins/feature/simpleptt/simpleptt.cpp b/plugins/feature/simpleptt/simpleptt.cpp
index eafa2d8da..19a67f7d5 100644
--- a/plugins/feature/simpleptt/simpleptt.cpp
+++ b/plugins/feature/simpleptt/simpleptt.cpp
@@ -29,7 +29,6 @@
#include "SWGSimplePTTReport.h"
#include "SWGDeviceState.h"
-#include "dsp/dspengine.h"
#include "settings/serializable.h"
#include "simplepttworker.h"
diff --git a/plugins/feature/skymap/skymap.cpp b/plugins/feature/skymap/skymap.cpp
index a2bba969e..4c5e8a7b9 100644
--- a/plugins/feature/skymap/skymap.cpp
+++ b/plugins/feature/skymap/skymap.cpp
@@ -28,13 +28,8 @@
#include "SWGFeatureActions.h"
#include "SWGDeviceState.h"
-#include "dsp/dspengine.h"
-
-#include "device/deviceset.h"
-#include "channel/channelapi.h"
#include "feature/featureset.h"
#include "settings/serializable.h"
-#include "maincore.h"
#include "skymap.h"
MESSAGE_CLASS_DEFINITION(SkyMap::MsgConfigureSkyMap, Message)
diff --git a/plugins/feature/skymap/skymapsettings.cpp b/plugins/feature/skymap/skymapsettings.cpp
index 79154d6d2..fe11fce04 100644
--- a/plugins/feature/skymap/skymapsettings.cpp
+++ b/plugins/feature/skymap/skymapsettings.cpp
@@ -23,7 +23,6 @@
#include <QDebug>
#include "util/simpleserializer.h"
-#include "util/httpdownloadmanager.h"
#include "settings/serializable.h"
#include "skymapsettings.h"
diff --git a/plugins/feature/startracker/startracker.cpp b/plugins/feature/startracker/startracker.cpp
index fdd9846d6..6f6a22104 100644
--- a/plugins/feature/startracker/startracker.cpp
+++ b/plugins/feature/startracker/startracker.cpp
@@ -25,17 +25,13 @@
#include "SWGFeatureReport.h"
#include "SWGFeatureActions.h"
#include "SWGDeviceState.h"
-#include "SWGStarTrackerDisplaySettings.h"
-#include "device/deviceset.h"
-#include "dsp/dspengine.h"
#include "feature/featureset.h"
#include "util/weather.h"
#include "util/units.h"
#include "settings/serializable.h"
#include "maincore.h"
-#include "startrackerreport.h"
#include "startrackerworker.h"
#include "startracker.h"
diff --git a/plugins/feature/startracker/startrackergui.cpp b/plugins/feature/startracker/startrackergui.cpp
index 36a29bca9..852a71e34 100644
--- a/plugins/feature/startracker/startrackergui.cpp
+++ b/plugins/feature/startracker/startrackergui.cpp
@@ -42,12 +42,11 @@
#include "gui/dmsspinbox.h"
#include "gui/graphicsviewzoom.h"
#include "gui/dialogpositioner.h"
-#include "mainwindow.h"
-#include "device/deviceuiset.h"
#include "util/units.h"
#include "util/astronomy.h"
#include "util/interpolation.h"
#include "util/png.h"
+#include "maincore.h"
#include "ui_startrackergui.h"
#include "startracker.h"
diff --git a/plugins/feature/startracker/startrackerworker.cpp b/plugins/feature/startracker/startrackerworker.cpp
index cd62c0bab..4f004625d 100644
--- a/plugins/feature/startracker/startrackerworker.cpp
+++ b/plugins/feature/startracker/startrackerworker.cpp
@@ -33,7 +33,6 @@
#include "SWGSkyMapTarget.h"
#include "webapi/webapiadapterinterface.h"
-#include "webapi/webapiutils.h"
#include "channel/channelwebapiutils.h"
#include "util/units.h"
diff --git a/plugins/feature/vorlocalizer/vorlocalizer.cpp b/plugins/feature/vorlocalizer/vorlocalizer.cpp
index f3594b934..e48c0f5c0 100644
--- a/plugins/feature/vorlocalizer/vorlocalizer.cpp
+++ b/plugins/feature/vorlocalizer/vorlocalizer.cpp
@@ -27,7 +27,6 @@
#include "SWGDeviceState.h"
#include "SWGChannelReport.h"
-#include "dsp/dspengine.h"
#include "dsp/dspdevicesourceengine.h"
#include "dsp/devicesamplesource.h"
#include "device/deviceset.h"
diff --git a/plugins/feature/vorlocalizer/vorlocalizergui.cpp b/plugins/feature/vorlocalizer/vorlocalizergui.cpp
index 45aa3a76b..23c8352bb 100644
--- a/plugins/feature/vorlocalizer/vorlocalizergui.cpp
+++ b/plugins/feature/vorlocalizer/vorlocalizergui.cpp
@@ -31,17 +31,12 @@
#include <QAction>
#include "feature/featureuiset.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
#include "ui_vorlocalizergui.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
-#include "util/db.h"
#include "util/morse.h"
#include "util/units.h"
#include "gui/basicfeaturesettingsdialog.h"
-#include "gui/crightclickenabler.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
#include "maincore.h"
diff --git a/plugins/feature/vorlocalizer/vorlocalizersettings.cpp b/plugins/feature/vorlocalizer/vorlocalizersettings.cpp
index ea217cb32..e306620f2 100644
--- a/plugins/feature/vorlocalizer/vorlocalizersettings.cpp
+++ b/plugins/feature/vorlocalizer/vorlocalizersettings.cpp
@@ -20,7 +20,6 @@
#include <QColor>
-#include "dsp/dspengine.h"
#include "util/simpleserializer.h"
#include "settings/serializable.h"
#include "vorlocalizersettings.h"
diff --git a/plugins/feature/vorlocalizer/vorlocalizerworker.cpp b/plugins/feature/vorlocalizer/vorlocalizerworker.cpp
index a09d7dc26..c1920f82f 100644
--- a/plugins/feature/vorlocalizer/vorlocalizerworker.cpp
+++ b/plugins/feature/vorlocalizer/vorlocalizerworker.cpp
@@ -19,8 +19,6 @@
#include <QDebug>
-#include "SWGDeviceState.h"
-#include "SWGDeviceSettings.h"
#include "SWGChannelSettings.h"
#include "SWGSuccessResponse.h"
#include "SWGErrorResponse.h"
diff --git a/plugins/samplemimo/audiocatsiso/audiocatsiso.cpp b/plugins/samplemimo/audiocatsiso/audiocatsiso.cpp
index 4347d6936..208e34ec9 100644
--- a/plugins/samplemimo/audiocatsiso/audiocatsiso.cpp
+++ b/plugins/samplemimo/audiocatsiso/audiocatsiso.cpp
@@ -30,8 +30,6 @@
#include "dsp/dspengine.h"
#include "dsp/samplesourcefifo.h"
#include "dsp/samplesinkfifo.h"
-#include "dsp/devicesamplesource.h"
-#include "dsp/devicesamplesink.h"
#include "device/deviceapi.h"
#include "util/serialutil.h"
diff --git a/plugins/samplemimo/audiocatsiso/audiocatsisogui.cpp b/plugins/samplemimo/audiocatsiso/audiocatsisogui.cpp
index bb0b23098..0476af6f3 100644
--- a/plugins/samplemimo/audiocatsiso/audiocatsisogui.cpp
+++ b/plugins/samplemimo/audiocatsiso/audiocatsisogui.cpp
@@ -24,7 +24,6 @@
#include <QMessageBox>
#include <QFileDialog>
-#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
#include "gui/colormapper.h"
@@ -34,12 +33,8 @@
#include "gui/basicdevicesettingsdialog.h"
#include "gui/audioselectdialog.h"
#include "dsp/dspengine.h"
-#include "dsp/dspdevicemimoengine.h"
#include "dsp/dspcommands.h"
#include "dsp/devicesamplesource.h"
-#include "util/db.h"
-
-#include "mainwindow.h"
#include "ui_audiocatsisogui.h"
#include "audiocatsisogui.h"
diff --git a/plugins/samplemimo/audiocatsiso/audiocatsisoplugin.cpp b/plugins/samplemimo/audiocatsiso/audiocatsisoplugin.cpp
index 0a171b23a..fc5eae97d 100644
--- a/plugins/samplemimo/audiocatsiso/audiocatsisoplugin.cpp
+++ b/plugins/samplemimo/audiocatsiso/audiocatsisoplugin.cpp
@@ -20,7 +20,6 @@
#include <QtPlugin>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#ifdef SERVER_MODE
#include "audiocatsiso.h"
diff --git a/plugins/samplemimo/bladerf2mimo/bladerf2mimo.cpp b/plugins/samplemimo/bladerf2mimo/bladerf2mimo.cpp
index 66107e32c..65162c8ca 100644
--- a/plugins/samplemimo/bladerf2mimo/bladerf2mimo.cpp
+++ b/plugins/samplemimo/bladerf2mimo/bladerf2mimo.cpp
@@ -25,13 +25,10 @@
#include "SWGDeviceSettings.h"
#include "SWGDeviceState.h"
-#include "SWGTestMISettings.h"
#include "SWGDeviceReport.h"
#include "device/deviceapi.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
-#include "dsp/dspdevicemimoengine.h"
#include "dsp/devicesamplesource.h"
#include "dsp/devicesamplesink.h"
#include "bladerf2/devicebladerf2.h"
diff --git a/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.cpp b/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.cpp
index 43a7a6404..408716fef 100644
--- a/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.cpp
+++ b/plugins/samplemimo/bladerf2mimo/bladerf2mimogui.cpp
@@ -25,20 +25,14 @@
#include <QMessageBox>
#include <QFileDialog>
-#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
#include "gui/colormapper.h"
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
-#include "dsp/dspdevicemimoengine.h"
#include "dsp/dspcommands.h"
#include "dsp/devicesamplestatic.h"
-#include "util/db.h"
-
-#include "mainwindow.h"
#include "bladerf2mimo.h"
#include "ui_bladerf2mimogui.h"
diff --git a/plugins/samplemimo/bladerf2mimo/bladerf2mimoplugin.cpp b/plugins/samplemimo/bladerf2mimo/bladerf2mimoplugin.cpp
index 179ffa090..f664177da 100644
--- a/plugins/samplemimo/bladerf2mimo/bladerf2mimoplugin.cpp
+++ b/plugins/samplemimo/bladerf2mimo/bladerf2mimoplugin.cpp
@@ -21,7 +21,6 @@
#include <QtPlugin>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#ifndef SERVER_MODE
#include "bladerf2mimogui.h"
diff --git a/plugins/samplemimo/bladerf2mimo/bladerf2mithread.cpp b/plugins/samplemimo/bladerf2mimo/bladerf2mithread.cpp
index 4f2156ca3..579bec7b5 100644
--- a/plugins/samplemimo/bladerf2mimo/bladerf2mithread.cpp
+++ b/plugins/samplemimo/bladerf2mimo/bladerf2mithread.cpp
@@ -17,7 +17,7 @@
#include <algorithm>
-#include "bladerf2/devicebladerf2shared.h"
+#include "bladerf2/devicebladerf2.h"
#include "dsp/samplemififo.h"
#include "bladerf2mithread.h"
diff --git a/plugins/samplemimo/limesdrmimo/limesdrmimo.cpp b/plugins/samplemimo/limesdrmimo/limesdrmimo.cpp
index 7613a65d2..e4b98eb30 100644
--- a/plugins/samplemimo/limesdrmimo/limesdrmimo.cpp
+++ b/plugins/samplemimo/limesdrmimo/limesdrmimo.cpp
@@ -24,16 +24,10 @@
#include "SWGLimeSdrMIMOSettings.h"
#include "SWGDeviceState.h"
#include "SWGDeviceReport.h"
-#include "SWGDeviceActions.h"
#include "SWGLimeSdrMIMOReport.h"
#include "device/deviceapi.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
-#include "dsp/dspdevicemimoengine.h"
-#include "dsp/devicesamplesource.h"
-#include "dsp/devicesamplesink.h"
-#include "limesdr/devicelimesdrparam.h"
#include "limesdr/devicelimesdrshared.h"
#include "limesdrmithread.h"
diff --git a/plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp b/plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp
index fa6b51c8d..dcb506844 100644
--- a/plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp
+++ b/plugins/samplemimo/limesdrmimo/limesdrmimogui.cpp
@@ -24,7 +24,6 @@
#include <QMessageBox>
#include <QFileDialog>
-#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
#include "gui/colormapper.h"
@@ -32,15 +31,10 @@
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
-#include "dsp/dspdevicemimoengine.h"
#include "dsp/dspcommands.h"
#include "dsp/devicesamplestatic.h"
-#include "util/db.h"
#include "limesdr/devicelimesdrshared.h"
-#include "mainwindow.h"
-
#include "limesdrmimo.h"
#include "ui_limesdrmimogui.h"
#include "limesdrmimogui.h"
diff --git a/plugins/samplemimo/limesdrmimo/limesdrmimoplugin.cpp b/plugins/samplemimo/limesdrmimo/limesdrmimoplugin.cpp
index e23454bcd..cb3460f9b 100644
--- a/plugins/samplemimo/limesdrmimo/limesdrmimoplugin.cpp
+++ b/plugins/samplemimo/limesdrmimo/limesdrmimoplugin.cpp
@@ -21,7 +21,6 @@
#include <QtPlugin>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "limesdr/devicelimesdr.h"
#ifndef SERVER_MODE
diff --git a/plugins/samplemimo/metismiso/metismiso.cpp b/plugins/samplemimo/metismiso/metismiso.cpp
index 48b0dd617..46c2c3ff6 100644
--- a/plugins/samplemimo/metismiso/metismiso.cpp
+++ b/plugins/samplemimo/metismiso/metismiso.cpp
@@ -29,9 +29,6 @@
#include "device/deviceapi.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
-#include "dsp/dspdevicemimoengine.h"
-#include "dsp/devicesamplesource.h"
#include "dsp/samplesourcefifo.h"
#include "metis/devicemetis.h"
diff --git a/plugins/samplemimo/metismiso/metismisogui.cpp b/plugins/samplemimo/metismiso/metismisogui.cpp
index dcc68ddd5..958f2bc3d 100644
--- a/plugins/samplemimo/metismiso/metismisogui.cpp
+++ b/plugins/samplemimo/metismiso/metismisogui.cpp
@@ -24,7 +24,6 @@
#include <QMessageBox>
#include <QFileDialog>
-#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
#include "gui/colormapper.h"
@@ -32,12 +31,7 @@
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
#include "gui/basicdevicesettingsdialog.h"
-#include "dsp/dspengine.h"
-#include "dsp/dspdevicemimoengine.h"
#include "dsp/dspcommands.h"
-#include "util/db.h"
-
-#include "mainwindow.h"
#include "ui_metismisogui.h"
#include "metismisogui.h"
diff --git a/plugins/samplemimo/metismiso/metismisoplugin.cpp b/plugins/samplemimo/metismiso/metismisoplugin.cpp
index af4694d70..64cee2a91 100644
--- a/plugins/samplemimo/metismiso/metismisoplugin.cpp
+++ b/plugins/samplemimo/metismiso/metismisoplugin.cpp
@@ -21,7 +21,6 @@
#include "plugin/pluginapi.h"
#include "metis/devicemetis.h"
-#include "util/simpleserializer.h"
#ifdef SERVER_MODE
#include "metismiso.h"
diff --git a/plugins/samplemimo/plutosdrmimo/plutosdrmimo.cpp b/plugins/samplemimo/plutosdrmimo/plutosdrmimo.cpp
index 743312be9..4cfffc4e6 100644
--- a/plugins/samplemimo/plutosdrmimo/plutosdrmimo.cpp
+++ b/plugins/samplemimo/plutosdrmimo/plutosdrmimo.cpp
@@ -25,12 +25,9 @@
#include "SWGDeviceReport.h"
#include "device/deviceapi.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
-#include "dsp/dspdevicemimoengine.h"
#include "dsp/devicesamplesource.h"
#include "dsp/devicesamplesink.h"
#include "plutosdr/deviceplutosdrparams.h"
-#include "plutosdr/deviceplutosdrshared.h"
#include "plutosdrmithread.h"
#include "plutosdrmothread.h"
diff --git a/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.cpp b/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.cpp
index 0bd20b19b..9ea5c1bb3 100644
--- a/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.cpp
+++ b/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.cpp
@@ -23,7 +23,6 @@
#include <QString>
#include <QMessageBox>
-#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
#include "gui/colormapper.h"
@@ -31,17 +30,12 @@
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
-#include "dsp/dspdevicemimoengine.h"
#include "dsp/dspcommands.h"
#include "dsp/devicesamplestatic.h"
#include "dsp/devicesamplesource.h"
#include "dsp/devicesamplesink.h"
-#include "util/db.h"
#include "plutosdr/deviceplutosdr.h"
-#include "mainwindow.h"
-
#include "plutosdrmimo.h"
#include "ui_plutosdrmimogui.h"
#include "plutosdrmimogui.h"
diff --git a/plugins/samplemimo/plutosdrmimo/plutosdrmimoplugin.cpp b/plugins/samplemimo/plutosdrmimo/plutosdrmimoplugin.cpp
index d7de2c681..7216c10bd 100644
--- a/plugins/samplemimo/plutosdrmimo/plutosdrmimoplugin.cpp
+++ b/plugins/samplemimo/plutosdrmimo/plutosdrmimoplugin.cpp
@@ -21,7 +21,6 @@
#include <QtPlugin>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "plutosdr/deviceplutosdr.h"
#ifndef SERVER_MODE
diff --git a/plugins/samplemimo/plutosdrmimo/plutosdrmithread.cpp b/plugins/samplemimo/plutosdrmimo/plutosdrmithread.cpp
index 4c371d78a..0ad2118be 100644
--- a/plugins/samplemimo/plutosdrmimo/plutosdrmithread.cpp
+++ b/plugins/samplemimo/plutosdrmimo/plutosdrmithread.cpp
@@ -18,7 +18,6 @@
#include "plutosdr/deviceplutosdrbox.h"
#include "dsp/samplemififo.h"
-#include "plutosdrmimosettings.h"
#include "plutosdrmithread.h"
PlutoSDRMIThread::PlutoSDRMIThread(DevicePlutoSDRBox* plutoBox, QObject* parent) :
diff --git a/plugins/samplemimo/testmi/testmi.cpp b/plugins/samplemimo/testmi/testmi.cpp
index 3afc491ee..92985611c 100644
--- a/plugins/samplemimo/testmi/testmi.cpp
+++ b/plugins/samplemimo/testmi/testmi.cpp
@@ -31,8 +31,6 @@
#include "device/deviceapi.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
-#include "dsp/dspdevicemimoengine.h"
#include "dsp/devicesamplesource.h"
#include "testmiworker.h"
diff --git a/plugins/samplemimo/testmi/testmigui.cpp b/plugins/samplemimo/testmi/testmigui.cpp
index ec2f0f598..cd94f0268 100644
--- a/plugins/samplemimo/testmi/testmigui.cpp
+++ b/plugins/samplemimo/testmi/testmigui.cpp
@@ -24,7 +24,6 @@
#include <QMessageBox>
#include <QFileDialog>
-#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
#include "gui/colormapper.h"
@@ -32,13 +31,9 @@
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
-#include "dsp/dspdevicemimoengine.h"
#include "dsp/dspcommands.h"
#include "util/db.h"
-#include "mainwindow.h"
-
#include "ui_testmigui.h"
#include "testmigui.h"
diff --git a/plugins/samplemimo/testmi/testmiplugin.cpp b/plugins/samplemimo/testmi/testmiplugin.cpp
index 69f7e0725..0bad0d36f 100644
--- a/plugins/samplemimo/testmi/testmiplugin.cpp
+++ b/plugins/samplemimo/testmi/testmiplugin.cpp
@@ -20,7 +20,6 @@
#include <QtPlugin>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#ifdef SERVER_MODE
#include "testmi.h"
diff --git a/plugins/samplemimo/testmosync/testmosync.cpp b/plugins/samplemimo/testmosync/testmosync.cpp
index 167173841..6d835fa0f 100644
--- a/plugins/samplemimo/testmosync/testmosync.cpp
+++ b/plugins/samplemimo/testmosync/testmosync.cpp
@@ -27,10 +27,6 @@
#include "device/deviceapi.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
-#include "dsp/dspdevicemimoengine.h"
-#include "dsp/devicesamplesource.h"
-#include "dsp/devicesamplesink.h"
#include "testmosyncworker.h"
#include "testmosync.h"
diff --git a/plugins/samplemimo/testmosync/testmosyncgui.cpp b/plugins/samplemimo/testmosync/testmosyncgui.cpp
index cf5b97e74..d92315b47 100644
--- a/plugins/samplemimo/testmosync/testmosyncgui.cpp
+++ b/plugins/samplemimo/testmosync/testmosyncgui.cpp
@@ -23,17 +23,14 @@
#include <QString>
#include <QMessageBox>
-#include "plugin/pluginapi.h"
#include "gui/colormapper.h"
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/spectrumvis.h"
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
-#include "maincore.h"
#include "testmosync.h"
#include "ui_testmosyncgui.h"
diff --git a/plugins/samplemimo/testmosync/testmosyncplugin.cpp b/plugins/samplemimo/testmosync/testmosyncplugin.cpp
index 5553ae865..3e327c804 100644
--- a/plugins/samplemimo/testmosync/testmosyncplugin.cpp
+++ b/plugins/samplemimo/testmosync/testmosyncplugin.cpp
@@ -21,7 +21,6 @@
#include <QtPlugin>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#ifndef SERVER_MODE
#include "testmosyncgui.h"
diff --git a/plugins/samplemimo/xtrxmimo/xtrxmimo.cpp b/plugins/samplemimo/xtrxmimo/xtrxmimo.cpp
index 39d24d0d1..3a4e90166 100644
--- a/plugins/samplemimo/xtrxmimo/xtrxmimo.cpp
+++ b/plugins/samplemimo/xtrxmimo/xtrxmimo.cpp
@@ -24,15 +24,12 @@
#include "SWGXtrxMIMOSettings.h"
#include "SWGDeviceState.h"
#include "SWGDeviceReport.h"
-#include "SWGDeviceActions.h"
#include "SWGXtrxMIMOReport.h"
#include "device/deviceapi.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
-#include "dsp/dspdevicemimoengine.h"
-#include "dsp/devicesamplesource.h"
#include "dsp/devicesamplesink.h"
+#include "dsp/devicesamplesource.h"
#include "xtrx/devicextrxparam.h"
#include "xtrx/devicextrxshared.h"
#include "xtrx/devicextrx.h"
diff --git a/plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp b/plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp
index 191a75631..168ad995d 100644
--- a/plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp
+++ b/plugins/samplemimo/xtrxmimo/xtrxmimogui.cpp
@@ -23,7 +23,6 @@
#include <QMessageBox>
#include <QFileDialog>
-#include "plugin/pluginapi.h"
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
#include "gui/colormapper.h"
@@ -31,15 +30,10 @@
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
-#include "dsp/dspdevicemimoengine.h"
-#include "dsp/dspcommands.h"
#include "dsp/devicesamplestatic.h"
-#include "util/db.h"
+#include "dsp/dspcommands.h"
#include "xtrx/devicextrxshared.h"
-#include "mainwindow.h"
-
#include "xtrxmimo.h"
#include "ui_xtrxmimogui.h"
#include "xtrxmimogui.h"
diff --git a/plugins/samplemimo/xtrxmimo/xtrxmimoplugin.cpp b/plugins/samplemimo/xtrxmimo/xtrxmimoplugin.cpp
index 60e4e2aa6..a51b90b27 100644
--- a/plugins/samplemimo/xtrxmimo/xtrxmimoplugin.cpp
+++ b/plugins/samplemimo/xtrxmimo/xtrxmimoplugin.cpp
@@ -21,7 +21,6 @@
#include <QtPlugin>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "xtrx/devicextrx.h"
#ifndef SERVER_MODE
diff --git a/plugins/samplesink/aaroniartsaoutput/aaroniartsaoutput.cpp b/plugins/samplesink/aaroniartsaoutput/aaroniartsaoutput.cpp
index a463c0bc8..7902cf0bc 100644
--- a/plugins/samplesink/aaroniartsaoutput/aaroniartsaoutput.cpp
+++ b/plugins/samplesink/aaroniartsaoutput/aaroniartsaoutput.cpp
@@ -31,7 +31,6 @@
#include "util/simpleserializer.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
#include "device/deviceapi.h"
#include "aaroniartsaoutputworker.h"
diff --git a/plugins/samplesink/aaroniartsaoutput/aaroniartsaoutputgui.cpp b/plugins/samplesink/aaroniartsaoutput/aaroniartsaoutputgui.cpp
index a74059de7..88b7a20a4 100644
--- a/plugins/samplesink/aaroniartsaoutput/aaroniartsaoutputgui.cpp
+++ b/plugins/samplesink/aaroniartsaoutput/aaroniartsaoutputgui.cpp
@@ -35,10 +35,7 @@
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
-#include "mainwindow.h"
-#include "util/simpleserializer.h"
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
#include "aaroniartsaoutputgui.h"
diff --git a/plugins/samplesink/aaroniartsaoutput/aaroniartsaoutputplugin.cpp b/plugins/samplesink/aaroniartsaoutput/aaroniartsaoutputplugin.cpp
index 15537baaf..4072af136 100644
--- a/plugins/samplesink/aaroniartsaoutput/aaroniartsaoutputplugin.cpp
+++ b/plugins/samplesink/aaroniartsaoutput/aaroniartsaoutputplugin.cpp
@@ -20,7 +20,6 @@
#include <QtPlugin>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#ifdef SERVER_MODE
#include "aaroniartsaoutput.h"
diff --git a/plugins/samplesink/audiooutput/audiooutputgui.cpp b/plugins/samplesink/audiooutput/audiooutputgui.cpp
index c6ea6078b..15a649278 100644
--- a/plugins/samplesink/audiooutput/audiooutputgui.cpp
+++ b/plugins/samplesink/audiooutput/audiooutputgui.cpp
@@ -20,7 +20,6 @@
#include <QFileDialog>
#include "ui_audiooutputgui.h"
-#include "gui/colormapper.h"
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/audioselectdialog.h"
diff --git a/plugins/samplesink/audiooutput/audiooutputplugin.cpp b/plugins/samplesink/audiooutput/audiooutputplugin.cpp
index 758adcc5d..72c058120 100644
--- a/plugins/samplesink/audiooutput/audiooutputplugin.cpp
+++ b/plugins/samplesink/audiooutput/audiooutputplugin.cpp
@@ -19,7 +19,6 @@
#include <QtPlugin>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "audiooutputplugin.h"
#include "audiooutputwebapiadapter.h"
diff --git a/plugins/samplesink/bladerf1output/bladerf1output.cpp b/plugins/samplesink/bladerf1output/bladerf1output.cpp
index ab12ee751..1dc1b2feb 100644
--- a/plugins/samplesink/bladerf1output/bladerf1output.cpp
+++ b/plugins/samplesink/bladerf1output/bladerf1output.cpp
@@ -27,8 +27,6 @@
#include "dsp/dspcommands.h"
#include "dsp/dspdevicesourceengine.h"
-#include "dsp/dspdevicesinkengine.h"
-#include "dsp/dspengine.h"
#include "device/deviceapi.h"
#include "bladerf1/devicebladerf1shared.h"
#include "bladerf1outputthread.h"
diff --git a/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp b/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp
index 11b78b95e..4377f6331 100644
--- a/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp
+++ b/plugins/samplesink/bladerf1output/bladerf1outputgui.cpp
@@ -26,7 +26,6 @@
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
diff --git a/plugins/samplesink/bladerf1output/bladerf1outputplugin.cpp b/plugins/samplesink/bladerf1output/bladerf1outputplugin.cpp
index e8d305221..2ea6c1898 100644
--- a/plugins/samplesink/bladerf1output/bladerf1outputplugin.cpp
+++ b/plugins/samplesink/bladerf1output/bladerf1outputplugin.cpp
@@ -21,7 +21,6 @@
#include <QtPlugin>
#include <libbladeRF.h>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "bladerf1outputplugin.h"
#include "bladerf1outputwebapiadapter.h"
diff --git a/plugins/samplesink/bladerf2output/bladerf2output.cpp b/plugins/samplesink/bladerf2output/bladerf2output.cpp
index 08fa76ada..d267dacb6 100644
--- a/plugins/samplesink/bladerf2output/bladerf2output.cpp
+++ b/plugins/samplesink/bladerf2output/bladerf2output.cpp
@@ -25,12 +25,10 @@
#include "SWGDeviceState.h"
#include "SWGDeviceSettings.h"
-#include "SWGBladeRF2InputSettings.h"
#include "SWGDeviceReport.h"
#include "SWGBladeRF2OutputReport.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
#include "device/deviceapi.h"
#include "bladerf2/devicebladerf2shared.h"
#include "bladerf2/devicebladerf2.h"
diff --git a/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp b/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp
index 83a2a51b1..60af6650c 100644
--- a/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp
+++ b/plugins/samplesink/bladerf2output/bladerf2outputgui.cpp
@@ -27,7 +27,6 @@
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
diff --git a/plugins/samplesink/bladerf2output/bladerf2outputplugin.cpp b/plugins/samplesink/bladerf2output/bladerf2outputplugin.cpp
index 12dd47174..1cd194bd5 100644
--- a/plugins/samplesink/bladerf2output/bladerf2outputplugin.cpp
+++ b/plugins/samplesink/bladerf2output/bladerf2outputplugin.cpp
@@ -21,7 +21,6 @@
#include <QtPlugin>
#include <libbladeRF.h>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "bladerf2outputplugin.h"
#include "bladerf2outputwebapiadapter.h"
diff --git a/plugins/samplesink/fileoutput/fileoutput.cpp b/plugins/samplesink/fileoutput/fileoutput.cpp
index ebf7d88ec..8181ee7a9 100644
--- a/plugins/samplesink/fileoutput/fileoutput.cpp
+++ b/plugins/samplesink/fileoutput/fileoutput.cpp
@@ -27,7 +27,6 @@
#include "util/simpleserializer.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
#include "dsp/filerecord.h"
#include "device/deviceapi.h"
diff --git a/plugins/samplesink/fileoutput/fileoutputgui.cpp b/plugins/samplesink/fileoutput/fileoutputgui.cpp
index 7d2fe2989..e90d9b972 100644
--- a/plugins/samplesink/fileoutput/fileoutputgui.cpp
+++ b/plugins/samplesink/fileoutput/fileoutputgui.cpp
@@ -26,16 +26,12 @@
#include <QMessageBox>
#include "ui_fileoutputgui.h"
-#include "plugin/pluginapi.h"
#include "gui/colormapper.h"
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
-#include "mainwindow.h"
-
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
#include "fileoutputgui.h"
diff --git a/plugins/samplesink/fileoutput/fileoutputplugin.cpp b/plugins/samplesink/fileoutput/fileoutputplugin.cpp
index 2660d2307..b0c9bb5cd 100644
--- a/plugins/samplesink/fileoutput/fileoutputplugin.cpp
+++ b/plugins/samplesink/fileoutput/fileoutputplugin.cpp
@@ -20,7 +20,6 @@
#include <QtPlugin>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#ifdef SERVER_MODE
#include "fileoutput.h"
diff --git a/plugins/samplesink/hackrfoutput/hackrfoutput.cpp b/plugins/samplesink/hackrfoutput/hackrfoutput.cpp
index 8076158f7..6d1524abb 100644
--- a/plugins/samplesink/hackrfoutput/hackrfoutput.cpp
+++ b/plugins/samplesink/hackrfoutput/hackrfoutput.cpp
@@ -27,7 +27,6 @@
#include "util/simpleserializer.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
#include "device/deviceapi.h"
#include "hackrf/devicehackrfshared.h"
#include "hackrfoutputthread.h"
diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp b/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp
index 014838059..6195ce65b 100644
--- a/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp
+++ b/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp
@@ -25,12 +25,10 @@
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
#include "hackrf/devicehackrfvalues.h"
-#include "hackrf/devicehackrfshared.h"
#include "hackrfoutputgui.h"
#include "ui_hackrfoutputgui.h"
diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp b/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp
index fa6d40b74..651aa5ab6 100644
--- a/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp
+++ b/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp
@@ -18,10 +18,8 @@
///////////////////////////////////////////////////////////////////////////////////
#include <QtPlugin>
-#include "libhackrf/hackrf.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#ifdef SERVER_MODE
#include "hackrfoutput.h"
diff --git a/plugins/samplesink/limesdroutput/limesdroutput.cpp b/plugins/samplesink/limesdroutput/limesdroutput.cpp
index 195307138..afcea2d4e 100644
--- a/plugins/samplesink/limesdroutput/limesdroutput.cpp
+++ b/plugins/samplesink/limesdroutput/limesdroutput.cpp
@@ -34,7 +34,6 @@
#include "device/deviceapi.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
#include "limesdroutputthread.h"
#include "limesdr/devicelimesdrparam.h"
#include "limesdr/devicelimesdr.h"
diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp
index 67d8d0009..d77b6c0ec 100644
--- a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp
+++ b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp
@@ -24,7 +24,6 @@
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
diff --git a/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp b/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp
index af8ee0067..d6ff13f01 100644
--- a/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp
+++ b/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp
@@ -23,7 +23,6 @@
#include "lime/LimeSuite.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "limesdr/devicelimesdr.h"
#ifdef SERVER_MODE
diff --git a/plugins/samplesink/limesdroutput/limesdroutputthread.cpp b/plugins/samplesink/limesdroutput/limesdroutputthread.cpp
index fdd102b63..e7bb34219 100644
--- a/plugins/samplesink/limesdroutput/limesdroutputthread.cpp
+++ b/plugins/samplesink/limesdroutput/limesdroutputthread.cpp
@@ -21,7 +21,6 @@
#include "dsp/samplesourcefifo.h"
#include "limesdroutputthread.h"
-#include "limesdroutputsettings.h"
LimeSDROutputThread::LimeSDROutputThread(lms_stream_t* stream, SampleSourceFifo* sampleFifo, QObject* parent) :
QThread(parent),
diff --git a/plugins/samplesink/localoutput/localoutput.cpp b/plugins/samplesink/localoutput/localoutput.cpp
index e5416d726..986ee27ad 100644
--- a/plugins/samplesink/localoutput/localoutput.cpp
+++ b/plugins/samplesink/localoutput/localoutput.cpp
@@ -30,7 +30,6 @@
#include "util/simpleserializer.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
#include "device/deviceapi.h"
#include "localoutput.h"
diff --git a/plugins/samplesink/localoutput/localoutputgui.cpp b/plugins/samplesink/localoutput/localoutputgui.cpp
index 314f2a893..6700716a2 100644
--- a/plugins/samplesink/localoutput/localoutputgui.cpp
+++ b/plugins/samplesink/localoutput/localoutputgui.cpp
@@ -31,14 +31,10 @@
#include <QJsonObject>
#include "ui_localoutputgui.h"
-#include "gui/colormapper.h"
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
-#include "mainwindow.h"
-#include "util/simpleserializer.h"
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
#include "localoutputgui.h"
diff --git a/plugins/samplesink/localoutput/localoutputplugin.cpp b/plugins/samplesink/localoutput/localoutputplugin.cpp
index a2e3a3370..5d6dfaedf 100644
--- a/plugins/samplesink/localoutput/localoutputplugin.cpp
+++ b/plugins/samplesink/localoutput/localoutputplugin.cpp
@@ -20,7 +20,6 @@
#include <QtPlugin>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#ifdef SERVER_MODE
#include "localoutput.h"
diff --git a/plugins/samplesink/plutosdroutput/plutosdroutput.cpp b/plugins/samplesink/plutosdroutput/plutosdroutput.cpp
index 5cf7ff00c..f60e051fa 100644
--- a/plugins/samplesink/plutosdroutput/plutosdroutput.cpp
+++ b/plugins/samplesink/plutosdroutput/plutosdroutput.cpp
@@ -29,7 +29,6 @@
#include "SWGPlutoSdrOutputReport.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
#include "device/deviceapi.h"
#include "plutosdr/deviceplutosdrparams.h"
#include "plutosdr/deviceplutosdrbox.h"
diff --git a/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp b/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp
index 498d9b83b..de9283219 100644
--- a/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp
+++ b/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp
@@ -23,7 +23,6 @@
#include <QDebug>
#include <QMessageBox>
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
diff --git a/plugins/samplesink/plutosdroutput/plutosdroutputthread.cpp b/plugins/samplesink/plutosdroutput/plutosdroutputthread.cpp
index 217474cd2..a223d7841 100644
--- a/plugins/samplesink/plutosdroutput/plutosdroutputthread.cpp
+++ b/plugins/samplesink/plutosdroutput/plutosdroutputthread.cpp
@@ -15,11 +15,8 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
///////////////////////////////////////////////////////////////////////////////////
-#include "iio.h"
-
#include "dsp/samplesourcefifo.h"
#include "plutosdr/deviceplutosdrbox.h"
-#include "plutosdroutputsettings.h"
#include "plutosdroutputthread.h"
PlutoSDROutputThread::PlutoSDROutputThread(uint32_t blocksizeSamples, DevicePlutoSDRBox* plutoBox, SampleSourceFifo* sampleFifo, QObject* parent) :
diff --git a/plugins/samplesink/remoteoutput/remoteoutput.cpp b/plugins/samplesink/remoteoutput/remoteoutput.cpp
index 95d584515..23879e404 100644
--- a/plugins/samplesink/remoteoutput/remoteoutput.cpp
+++ b/plugins/samplesink/remoteoutput/remoteoutput.cpp
@@ -31,7 +31,6 @@
#include "util/simpleserializer.h"
#include "util/timeutil.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
#include "device/deviceapi.h"
diff --git a/plugins/samplesink/remoteoutput/remoteoutputgui.cpp b/plugins/samplesink/remoteoutput/remoteoutputgui.cpp
index 9641f31da..e88bcf57b 100644
--- a/plugins/samplesink/remoteoutput/remoteoutputgui.cpp
+++ b/plugins/samplesink/remoteoutput/remoteoutputgui.cpp
@@ -27,23 +27,16 @@
#include <boost/lexical_cast.hpp>
#include "ui_remoteoutputgui.h"
-#include "plugin/pluginapi.h"
-#include "gui/colormapper.h"
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
-#include "mainwindow.h"
-
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
#include "remoteoutputgui.h"
-#include "channel/remotedatablock.h"
-
RemoteOutputSinkGui::RemoteOutputSinkGui(DeviceUISet *deviceUISet, QWidget* parent) :
DeviceGUI(parent),
ui(new Ui::RemoteOutputGui),
diff --git a/plugins/samplesink/remoteoutput/remoteoutputplugin.cpp b/plugins/samplesink/remoteoutput/remoteoutputplugin.cpp
index 09cbeccf7..2429d817b 100644
--- a/plugins/samplesink/remoteoutput/remoteoutputplugin.cpp
+++ b/plugins/samplesink/remoteoutput/remoteoutputplugin.cpp
@@ -20,7 +20,6 @@
#include <QtPlugin>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#ifdef SERVER_MODE
#include "remoteoutput.h"
diff --git a/plugins/samplesink/soapysdroutput/soapysdroutput.cpp b/plugins/samplesink/soapysdroutput/soapysdroutput.cpp
index 71e7a7b73..43aa7f2d5 100644
--- a/plugins/samplesink/soapysdroutput/soapysdroutput.cpp
+++ b/plugins/samplesink/soapysdroutput/soapysdroutput.cpp
@@ -30,7 +30,6 @@
#include "util/simpleserializer.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
#include "device/deviceapi.h"
#include "soapysdr/devicesoapysdr.h"
diff --git a/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp b/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp
index 57044da09..7216a2195 100644
--- a/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp
+++ b/plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp
@@ -20,11 +20,9 @@
#include <QCheckBox>
#include <QResizeEvent>
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
-#include "util/simpleserializer.h"
#include "ui_soapysdroutputgui.h"
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
diff --git a/plugins/samplesink/soapysdroutput/soapysdroutputplugin.cpp b/plugins/samplesink/soapysdroutput/soapysdroutputplugin.cpp
index ef3cc92e6..57cfdf775 100644
--- a/plugins/samplesink/soapysdroutput/soapysdroutputplugin.cpp
+++ b/plugins/samplesink/soapysdroutput/soapysdroutputplugin.cpp
@@ -20,7 +20,6 @@
#include <QtPlugin>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "soapysdr/devicesoapysdr.h"
#include "soapysdroutputplugin.h"
diff --git a/plugins/samplesink/testsink/testsinkgui.cpp b/plugins/samplesink/testsink/testsinkgui.cpp
index 4d06a393d..2a9919e48 100644
--- a/plugins/samplesink/testsink/testsinkgui.cpp
+++ b/plugins/samplesink/testsink/testsinkgui.cpp
@@ -24,17 +24,13 @@
#include <QMessageBox>
#include "ui_testsinkgui.h"
-#include "plugin/pluginapi.h"
#include "gui/colormapper.h"
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialogpositioner.h"
#include "dsp/spectrumvis.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
-#include "maincore.h"
-
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
#include "testsinkgui.h"
diff --git a/plugins/samplesink/testsink/testsinkoutput.cpp b/plugins/samplesink/testsink/testsinkoutput.cpp
index b864fe67c..c36f21740 100644
--- a/plugins/samplesink/testsink/testsinkoutput.cpp
+++ b/plugins/samplesink/testsink/testsinkoutput.cpp
@@ -21,12 +21,10 @@
#include <QDebug>
#include <QThread>
-#include "SWGDeviceSettings.h"
#include "SWGDeviceState.h"
#include "util/simpleserializer.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
#include "dsp/basebandsamplesink.h"
#include "device/deviceapi.h"
diff --git a/plugins/samplesink/testsink/testsinkplugin.cpp b/plugins/samplesink/testsink/testsinkplugin.cpp
index 58b9c2b94..58d3f3948 100644
--- a/plugins/samplesink/testsink/testsinkplugin.cpp
+++ b/plugins/samplesink/testsink/testsinkplugin.cpp
@@ -20,7 +20,6 @@
#include <QtPlugin>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#ifdef SERVER_MODE
#include "testsinkoutput.h"
diff --git a/plugins/samplesink/usrpoutput/usrpoutput.cpp b/plugins/samplesink/usrpoutput/usrpoutput.cpp
index d08c7cd04..fdd989031 100644
--- a/plugins/samplesink/usrpoutput/usrpoutput.cpp
+++ b/plugins/samplesink/usrpoutput/usrpoutput.cpp
@@ -34,7 +34,6 @@
#include "device/deviceapi.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
#include "usrpoutputthread.h"
#include "usrp/deviceusrpparam.h"
#include "usrp/deviceusrp.h"
diff --git a/plugins/samplesink/usrpoutput/usrpoutputgui.cpp b/plugins/samplesink/usrpoutput/usrpoutputgui.cpp
index f1f6e5575..59bce9fd8 100644
--- a/plugins/samplesink/usrpoutput/usrpoutputgui.cpp
+++ b/plugins/samplesink/usrpoutput/usrpoutputgui.cpp
@@ -24,7 +24,6 @@
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
diff --git a/plugins/samplesink/usrpoutput/usrpoutputplugin.cpp b/plugins/samplesink/usrpoutput/usrpoutputplugin.cpp
index 32f3f4f22..e91a63e52 100644
--- a/plugins/samplesink/usrpoutput/usrpoutputplugin.cpp
+++ b/plugins/samplesink/usrpoutput/usrpoutputplugin.cpp
@@ -23,7 +23,6 @@
#include <string>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "usrp/deviceusrp.h"
#ifdef SERVER_MODE
diff --git a/plugins/samplesink/usrpoutput/usrpoutputthread.cpp b/plugins/samplesink/usrpoutput/usrpoutputthread.cpp
index 83ac22738..3037442b6 100644
--- a/plugins/samplesink/usrpoutput/usrpoutputthread.cpp
+++ b/plugins/samplesink/usrpoutput/usrpoutputthread.cpp
@@ -24,7 +24,6 @@
#include "dsp/samplesourcefifo.h"
#include "usrpoutputthread.h"
-#include "usrpoutputsettings.h"
USRPOutputThread::USRPOutputThread(uhd::tx_streamer::sptr stream, size_t bufSamples, SampleSourceFifo* sampleFifo, QObject* parent) :
QThread(parent),
diff --git a/plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp b/plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp
index 7dfc98da3..fb56a584d 100644
--- a/plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp
+++ b/plugins/samplesink/xtrxoutput/xtrxoutputgui.cpp
@@ -26,7 +26,6 @@
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
diff --git a/plugins/samplesink/xtrxoutput/xtrxoutputplugin.cpp b/plugins/samplesink/xtrxoutput/xtrxoutputplugin.cpp
index ca6c5b2db..ea59abcc6 100644
--- a/plugins/samplesink/xtrxoutput/xtrxoutputplugin.cpp
+++ b/plugins/samplesink/xtrxoutput/xtrxoutputplugin.cpp
@@ -24,7 +24,6 @@
#include "xtrx_api.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "xtrx/devicextrx.h"
#ifdef SERVER_MODE
diff --git a/plugins/samplesource/aaroniartsainput/aaroniartsainput.cpp b/plugins/samplesource/aaroniartsainput/aaroniartsainput.cpp
index 52ca29cc1..9fc89c927 100644
--- a/plugins/samplesource/aaroniartsainput/aaroniartsainput.cpp
+++ b/plugins/samplesource/aaroniartsainput/aaroniartsainput.cpp
@@ -34,7 +34,6 @@
#include "device/deviceapi.h"
#include "aaroniartsainputworker.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
MESSAGE_CLASS_DEFINITION(AaroniaRTSAInput::MsgConfigureAaroniaRTSA, Message)
MESSAGE_CLASS_DEFINITION(AaroniaRTSAInput::MsgStartStop, Message)
diff --git a/plugins/samplesource/aaroniartsainput/aaroniartsainputgui.cpp b/plugins/samplesource/aaroniartsainput/aaroniartsainputgui.cpp
index cec6e44c4..6e7fc49cf 100644
--- a/plugins/samplesource/aaroniartsainput/aaroniartsainputgui.cpp
+++ b/plugins/samplesource/aaroniartsainput/aaroniartsainputgui.cpp
@@ -26,16 +26,11 @@
#include <QFileDialog>
#include "ui_aaroniartsainputgui.h"
-#include "plugin/pluginapi.h"
#include "gui/colormapper.h"
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
-#include "util/db.h"
-
-#include "mainwindow.h"
#include "aaroniartsainputgui.h"
#include "device/deviceapi.h"
diff --git a/plugins/samplesource/aaroniartsainput/aaroniartsainputplugin.cpp b/plugins/samplesource/aaroniartsainput/aaroniartsainputplugin.cpp
index 2cf1a82e4..a8ead18fd 100644
--- a/plugins/samplesource/aaroniartsainput/aaroniartsainputplugin.cpp
+++ b/plugins/samplesource/aaroniartsainput/aaroniartsainputplugin.cpp
@@ -21,7 +21,6 @@
#include <QtPlugin>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#ifdef SERVER_MODE
#include "aaroniartsainput.h"
diff --git a/plugins/samplesource/aaroniartsainput/aaroniartsainputworker.cpp b/plugins/samplesource/aaroniartsainput/aaroniartsainputworker.cpp
index 1e866c290..ce92b3841 100644
--- a/plugins/samplesource/aaroniartsainput/aaroniartsainputworker.cpp
+++ b/plugins/samplesource/aaroniartsainput/aaroniartsainputworker.cpp
@@ -24,7 +24,6 @@
#include <QJsonValue>
#include "util/messagequeue.h"
-#include "dsp/dspcommands.h"
#include "aaroniartsainputsettings.h"
#include "aaroniartsainputworker.h"
diff --git a/plugins/samplesource/airspy/airspygui.cpp b/plugins/samplesource/airspy/airspygui.cpp
index 36f0cc859..da2c885ed 100644
--- a/plugins/samplesource/airspy/airspygui.cpp
+++ b/plugins/samplesource/airspy/airspygui.cpp
@@ -32,7 +32,6 @@
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
AirspyGui::AirspyGui(DeviceUISet *deviceUISet, QWidget* parent) :
diff --git a/plugins/samplesource/airspy/airspyinput.cpp b/plugins/samplesource/airspy/airspyinput.cpp
index d232a21d4..b71cffeab 100644
--- a/plugins/samplesource/airspy/airspyinput.cpp
+++ b/plugins/samplesource/airspy/airspyinput.cpp
@@ -37,7 +37,6 @@
#include "device/deviceapi.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
#include "airspysettings.h"
#include "airspyworker.h"
#ifdef ANDROID
diff --git a/plugins/samplesource/airspy/airspyplugin.cpp b/plugins/samplesource/airspy/airspyplugin.cpp
index a79192c61..b78c53d38 100644
--- a/plugins/samplesource/airspy/airspyplugin.cpp
+++ b/plugins/samplesource/airspy/airspyplugin.cpp
@@ -30,7 +30,7 @@
#include "airspyplugin.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
+
#ifdef ANDROID
#include "util/android.h"
#endif
diff --git a/plugins/samplesource/airspyhf/airspyhfgui.cpp b/plugins/samplesource/airspyhf/airspyhfgui.cpp
index 159f996f2..c7b281e39 100644
--- a/plugins/samplesource/airspyhf/airspyhfgui.cpp
+++ b/plugins/samplesource/airspyhf/airspyhfgui.cpp
@@ -30,7 +30,6 @@
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "airspyhfgui.h"
diff --git a/plugins/samplesource/airspyhf/airspyhfinput.cpp b/plugins/samplesource/airspyhf/airspyhfinput.cpp
index 715b78e58..2fcaa7896 100644
--- a/plugins/samplesource/airspyhf/airspyhfinput.cpp
+++ b/plugins/samplesource/airspyhf/airspyhfinput.cpp
@@ -31,11 +31,9 @@
#include "device/deviceapi.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
#include "airspyhfinput.h"
-#include "airspyhfplugin.h"
#include "airspyhfsettings.h"
#include "airspyhfworker.h"
#ifdef ANDROID
diff --git a/plugins/samplesource/airspyhf/airspyhfplugin.cpp b/plugins/samplesource/airspyhf/airspyhfplugin.cpp
index 5fbb41795..c9bf609a4 100644
--- a/plugins/samplesource/airspyhf/airspyhfplugin.cpp
+++ b/plugins/samplesource/airspyhf/airspyhfplugin.cpp
@@ -22,7 +22,6 @@
#include <libairspyhf/airspyhf.h>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "airspyhfplugin.h"
#include "airspyhfwebapiadapter.h"
#ifdef SERVER_MODE
diff --git a/plugins/samplesource/androidsdrdriverinput/androidsdrdriverinput.cpp b/plugins/samplesource/androidsdrdriverinput/androidsdrdriverinput.cpp
index 9a0710f61..70baae819 100644
--- a/plugins/samplesource/androidsdrdriverinput/androidsdrdriverinput.cpp
+++ b/plugins/samplesource/androidsdrdriverinput/androidsdrdriverinput.cpp
@@ -25,17 +25,13 @@
#include <QJsonParseError>
#include "SWGDeviceSettings.h"
-#include "SWGChannelSettings.h"
#include "SWGDeviceState.h"
#include "SWGDeviceReport.h"
#include "SWGAndroidSDRDriverInputReport.h"
#include "util/simpleserializer.h"
-#include "util/android.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
#include "device/deviceapi.h"
-#include "maincore.h"
#include "androidsdrdriverinput.h"
#include "androidsdrdriverinputtcphandler.h"
diff --git a/plugins/samplesource/androidsdrdriverinput/androidsdrdriverinputgui.cpp b/plugins/samplesource/androidsdrdriverinput/androidsdrdriverinputgui.cpp
index aff8505ea..ae4d11612 100644
--- a/plugins/samplesource/androidsdrdriverinput/androidsdrdriverinputgui.cpp
+++ b/plugins/samplesource/androidsdrdriverinput/androidsdrdriverinputgui.cpp
@@ -25,11 +25,7 @@
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
-#include "dsp/hbfilterchainconverter.h"
-#include "mainwindow.h"
-#include "util/simpleserializer.h"
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
#include "androidsdrdriverinputgui.h"
diff --git a/plugins/samplesource/androidsdrdriverinput/androidsdrdriverinputplugin.cpp b/plugins/samplesource/androidsdrdriverinput/androidsdrdriverinputplugin.cpp
index 41281598b..ee5001ff9 100644
--- a/plugins/samplesource/androidsdrdriverinput/androidsdrdriverinputplugin.cpp
+++ b/plugins/samplesource/androidsdrdriverinput/androidsdrdriverinputplugin.cpp
@@ -21,7 +21,6 @@
#include <QtPlugin>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#ifdef SERVER_MODE
#include "androidsdrdriverinput.h"
diff --git a/plugins/samplesource/androidsdrdriverinput/androidsdrdriverinputtcphandler.cpp b/plugins/samplesource/androidsdrdriverinput/androidsdrdriverinputtcphandler.cpp
index 079a0ed68..c15d949b0 100644
--- a/plugins/samplesource/androidsdrdriverinput/androidsdrdriverinputtcphandler.cpp
+++ b/plugins/samplesource/androidsdrdriverinput/androidsdrdriverinputtcphandler.cpp
@@ -20,8 +20,6 @@
#include <QUdpSocket>
#include <QDebug>
-#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
#include "device/deviceapi.h"
#include "androidsdrdriverinputtcphandler.h"
diff --git a/plugins/samplesource/audioinput/audioinputgui.cpp b/plugins/samplesource/audioinput/audioinputgui.cpp
index c6b321de5..e0fe9563f 100644
--- a/plugins/samplesource/audioinput/audioinputgui.cpp
+++ b/plugins/samplesource/audioinput/audioinputgui.cpp
@@ -20,12 +20,10 @@
#include <QFileDialog>
#include "ui_audioinputgui.h"
-#include "gui/colormapper.h"
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "audioinputgui.h"
diff --git a/plugins/samplesource/audioinput/audioinputplugin.cpp b/plugins/samplesource/audioinput/audioinputplugin.cpp
index ba48641f0..97661dc6b 100644
--- a/plugins/samplesource/audioinput/audioinputplugin.cpp
+++ b/plugins/samplesource/audioinput/audioinputplugin.cpp
@@ -20,7 +20,6 @@
#include <QtPlugin>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "audioinputplugin.h"
#include "audioinputwebapiadapter.h"
diff --git a/plugins/samplesource/bladerf1input/bladerf1input.cpp b/plugins/samplesource/bladerf1input/bladerf1input.cpp
index 7e5cf12bd..ad284afd1 100644
--- a/plugins/samplesource/bladerf1input/bladerf1input.cpp
+++ b/plugins/samplesource/bladerf1input/bladerf1input.cpp
@@ -28,9 +28,7 @@
#include "util/simpleserializer.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspdevicesourceengine.h"
#include "dsp/dspdevicesinkengine.h"
-#include "dsp/dspengine.h"
#include "device/deviceapi.h"
#include "bladerf1input.h"
diff --git a/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp b/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp
index 813936da1..dd55e7a16 100644
--- a/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp
+++ b/plugins/samplesource/bladerf1input/bladerf1inputgui.cpp
@@ -27,7 +27,6 @@
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
diff --git a/plugins/samplesource/bladerf1input/bladerf1inputplugin.cpp b/plugins/samplesource/bladerf1input/bladerf1inputplugin.cpp
index 4eaa239e5..c77984b70 100644
--- a/plugins/samplesource/bladerf1input/bladerf1inputplugin.cpp
+++ b/plugins/samplesource/bladerf1input/bladerf1inputplugin.cpp
@@ -23,7 +23,6 @@
#include <QtPlugin>
#include <libbladeRF.h>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "bladerf1inputwebapiadapter.h"
#ifdef SERVER_MODE
diff --git a/plugins/samplesource/bladerf2input/bladerf2input.cpp b/plugins/samplesource/bladerf2input/bladerf2input.cpp
index 9e0acbbca..8f7c03f5b 100644
--- a/plugins/samplesource/bladerf2input/bladerf2input.cpp
+++ b/plugins/samplesource/bladerf2input/bladerf2input.cpp
@@ -30,7 +30,6 @@
#include "device/deviceapi.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
#include "bladerf2/devicebladerf2shared.h"
#include "bladerf2/devicebladerf2.h"
diff --git a/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp b/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp
index 3d8cb9bd9..dd613bb5a 100644
--- a/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp
+++ b/plugins/samplesource/bladerf2input/bladerf2inputgui.cpp
@@ -27,7 +27,6 @@
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
diff --git a/plugins/samplesource/bladerf2input/bladerf2inputplugin.cpp b/plugins/samplesource/bladerf2input/bladerf2inputplugin.cpp
index 667991e77..ecf557e4b 100644
--- a/plugins/samplesource/bladerf2input/bladerf2inputplugin.cpp
+++ b/plugins/samplesource/bladerf2input/bladerf2inputplugin.cpp
@@ -23,7 +23,6 @@
#include <QtPlugin>
#include <libbladeRF.h>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "bladerf2inputwebapiadapter.h"
#ifdef SERVER_MODE
diff --git a/plugins/samplesource/fcdpro/fcdprogui.cpp b/plugins/samplesource/fcdpro/fcdprogui.cpp
index 0f0788759..c799774d1 100644
--- a/plugins/samplesource/fcdpro/fcdprogui.cpp
+++ b/plugins/samplesource/fcdpro/fcdprogui.cpp
@@ -25,7 +25,6 @@
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "fcdprogui.h"
diff --git a/plugins/samplesource/fcdpro/fcdproplugin.cpp b/plugins/samplesource/fcdpro/fcdproplugin.cpp
index fed081a2e..9a3b7c32a 100644
--- a/plugins/samplesource/fcdpro/fcdproplugin.cpp
+++ b/plugins/samplesource/fcdpro/fcdproplugin.cpp
@@ -19,7 +19,6 @@
#include <QtPlugin>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "fcdproplugin.h"
#include "fcdprowebapiadapter.h"
diff --git a/plugins/samplesource/fcdproplus/fcdproplusgui.cpp b/plugins/samplesource/fcdproplus/fcdproplusgui.cpp
index c2461b93c..23e4bcaaa 100644
--- a/plugins/samplesource/fcdproplus/fcdproplusgui.cpp
+++ b/plugins/samplesource/fcdproplus/fcdproplusgui.cpp
@@ -26,7 +26,6 @@
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "fcdproplusgui.h"
diff --git a/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp b/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp
index ecb775739..37c71cc12 100644
--- a/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp
+++ b/plugins/samplesource/fcdproplus/fcdproplusplugin.cpp
@@ -20,7 +20,6 @@
#include <QtPlugin>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "fcdproplusplugin.h"
#include "fcdpropluswebapiadapter.h"
diff --git a/plugins/samplesource/fileinput/fileinput.cpp b/plugins/samplesource/fileinput/fileinput.cpp
index 42382bb13..9f932868b 100644
--- a/plugins/samplesource/fileinput/fileinput.cpp
+++ b/plugins/samplesource/fileinput/fileinput.cpp
@@ -33,7 +33,6 @@
#include "util/simpleserializer.h"
#include "dsp/dspcommands.h"
#include "dsp/dspdevicesourceengine.h"
-#include "dsp/dspengine.h"
#include "dsp/filerecord.h"
#include "dsp/wavfilerecord.h"
#include "device/deviceapi.h"
diff --git a/plugins/samplesource/fileinput/fileinputgui.cpp b/plugins/samplesource/fileinput/fileinputgui.cpp
index e58f1d8cb..f7d5a451c 100644
--- a/plugins/samplesource/fileinput/fileinputgui.cpp
+++ b/plugins/samplesource/fileinput/fileinputgui.cpp
@@ -28,16 +28,11 @@
#include <QMessageBox>
#include "ui_fileinputgui.h"
-#include "plugin/pluginapi.h"
-#include "gui/colormapper.h"
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
-#include "mainwindow.h"
-
#include "fileinputgui.h"
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
diff --git a/plugins/samplesource/fileinput/fileinputplugin.cpp b/plugins/samplesource/fileinput/fileinputplugin.cpp
index 169eda27b..97cc5813f 100644
--- a/plugins/samplesource/fileinput/fileinputplugin.cpp
+++ b/plugins/samplesource/fileinput/fileinputplugin.cpp
@@ -20,7 +20,6 @@
#include <QtPlugin>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#ifdef SERVER_MODE
#include "fileinput.h"
diff --git a/plugins/samplesource/fileinput/fileinputworker.cpp b/plugins/samplesource/fileinput/fileinputworker.cpp
index 9f7c08f45..c6dcc2dae 100644
--- a/plugins/samplesource/fileinput/fileinputworker.cpp
+++ b/plugins/samplesource/fileinput/fileinputworker.cpp
@@ -20,7 +20,6 @@
#include <errno.h>
#include <QDebug>
-#include "dsp/filerecord.h"
#include "fileinputworker.h"
#include "dsp/samplesinkfifo.h"
#include "util/messagequeue.h"
diff --git a/plugins/samplesource/hackrfinput/hackrfinput.cpp b/plugins/samplesource/hackrfinput/hackrfinput.cpp
index 0504f9ae4..13c34c5f4 100644
--- a/plugins/samplesource/hackrfinput/hackrfinput.cpp
+++ b/plugins/samplesource/hackrfinput/hackrfinput.cpp
@@ -30,9 +30,7 @@
#include "util/simpleserializer.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
#include "device/deviceapi.h"
-#include "hackrf/devicehackrfvalues.h"
#include "hackrf/devicehackrfshared.h"
#include "hackrfinput.h"
diff --git a/plugins/samplesource/hackrfinput/hackrfinputgui.cpp b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp
index 619b1a17e..32cf4743b 100644
--- a/plugins/samplesource/hackrfinput/hackrfinputgui.cpp
+++ b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp
@@ -29,7 +29,6 @@
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
diff --git a/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp b/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp
index fe27cd028..903daa022 100644
--- a/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp
+++ b/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp
@@ -19,10 +19,8 @@
#include <QtPlugin>
-#include "libhackrf/hackrf.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#ifdef SERVER_MODE
#include "hackrfinput.h"
diff --git a/plugins/samplesource/kiwisdr/kiwisdrgui.cpp b/plugins/samplesource/kiwisdr/kiwisdrgui.cpp
index ea82fd682..ac5feb16a 100644
--- a/plugins/samplesource/kiwisdr/kiwisdrgui.cpp
+++ b/plugins/samplesource/kiwisdr/kiwisdrgui.cpp
@@ -26,16 +26,11 @@
#include <QFileDialog>
#include "ui_kiwisdrgui.h"
-#include "plugin/pluginapi.h"
#include "gui/colormapper.h"
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
-#include "util/db.h"
-
-#include "mainwindow.h"
#include "kiwisdrgui.h"
#include "device/deviceapi.h"
diff --git a/plugins/samplesource/kiwisdr/kiwisdrinput.cpp b/plugins/samplesource/kiwisdr/kiwisdrinput.cpp
index d4c31653a..b83ad2cf9 100644
--- a/plugins/samplesource/kiwisdr/kiwisdrinput.cpp
+++ b/plugins/samplesource/kiwisdr/kiwisdrinput.cpp
@@ -34,7 +34,6 @@
#include "device/deviceapi.h"
#include "kiwisdrworker.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
MESSAGE_CLASS_DEFINITION(KiwiSDRInput::MsgConfigureKiwiSDR, Message)
MESSAGE_CLASS_DEFINITION(KiwiSDRInput::MsgStartStop, Message)
diff --git a/plugins/samplesource/kiwisdr/kiwisdrplugin.cpp b/plugins/samplesource/kiwisdr/kiwisdrplugin.cpp
index e74d81536..9fdc67df2 100644
--- a/plugins/samplesource/kiwisdr/kiwisdrplugin.cpp
+++ b/plugins/samplesource/kiwisdr/kiwisdrplugin.cpp
@@ -21,7 +21,6 @@
#include <QtPlugin>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#ifdef SERVER_MODE
#include "kiwisdrinput.h"
diff --git a/plugins/samplesource/limesdrinput/limesdrinput.cpp b/plugins/samplesource/limesdrinput/limesdrinput.cpp
index f0eaae215..64ff741cb 100644
--- a/plugins/samplesource/limesdrinput/limesdrinput.cpp
+++ b/plugins/samplesource/limesdrinput/limesdrinput.cpp
@@ -35,7 +35,6 @@
#include "device/deviceapi.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
#include "limesdrinput.h"
#include "limesdrinputthread.h"
#include "limesdr/devicelimesdrparam.h"
diff --git a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp
index b5e72e3bf..7b2b04929 100644
--- a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp
+++ b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp
@@ -30,7 +30,6 @@
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
diff --git a/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp b/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp
index 430fe0797..7995f8c6a 100644
--- a/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp
+++ b/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp
@@ -23,7 +23,6 @@
#include "lime/LimeSuite.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "limesdr/devicelimesdr.h"
#ifdef SERVER_MODE
diff --git a/plugins/samplesource/limesdrinput/limesdrinputthread.cpp b/plugins/samplesource/limesdrinput/limesdrinputthread.cpp
index 2ec3f4164..34523f4eb 100644
--- a/plugins/samplesource/limesdrinput/limesdrinputthread.cpp
+++ b/plugins/samplesource/limesdrinput/limesdrinputthread.cpp
@@ -19,7 +19,6 @@
#include <algorithm>
#include "dsp/replaybuffer.h"
-#include "limesdrinputsettings.h"
#include "limesdrinputthread.h"
LimeSDRInputThread::LimeSDRInputThread(lms_stream_t* stream, SampleSinkFifo* sampleFifo,
diff --git a/plugins/samplesource/localinput/localinput.cpp b/plugins/samplesource/localinput/localinput.cpp
index f2955a48e..31b3f8461 100644
--- a/plugins/samplesource/localinput/localinput.cpp
+++ b/plugins/samplesource/localinput/localinput.cpp
@@ -30,7 +30,6 @@
#include "util/simpleserializer.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
#include "device/deviceapi.h"
#include "localinput.h"
diff --git a/plugins/samplesource/localinput/localinputgui.cpp b/plugins/samplesource/localinput/localinputgui.cpp
index 7ae1f79dd..fe9a26734 100644
--- a/plugins/samplesource/localinput/localinputgui.cpp
+++ b/plugins/samplesource/localinput/localinputgui.cpp
@@ -32,14 +32,10 @@
#include <QJsonObject>
#include "ui_localinputgui.h"
-#include "gui/colormapper.h"
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
-#include "mainwindow.h"
-#include "util/simpleserializer.h"
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
#include "localinputgui.h"
diff --git a/plugins/samplesource/localinput/localinputplugin.cpp b/plugins/samplesource/localinput/localinputplugin.cpp
index d6bae4d43..3e661fb4e 100644
--- a/plugins/samplesource/localinput/localinputplugin.cpp
+++ b/plugins/samplesource/localinput/localinputplugin.cpp
@@ -20,7 +20,6 @@
#include <QtPlugin>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#ifdef SERVER_MODE
#include "localinput.h"
diff --git a/plugins/samplesource/perseus/perseusgui.cpp b/plugins/samplesource/perseus/perseusgui.cpp
index d175cb42a..ab1e76d62 100644
--- a/plugins/samplesource/perseus/perseusgui.cpp
+++ b/plugins/samplesource/perseus/perseusgui.cpp
@@ -28,7 +28,6 @@
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "perseusgui.h"
diff --git a/plugins/samplesource/perseus/perseusinput.cpp b/plugins/samplesource/perseus/perseusinput.cpp
index 77b6366d4..d74bacd88 100644
--- a/plugins/samplesource/perseus/perseusinput.cpp
+++ b/plugins/samplesource/perseus/perseusinput.cpp
@@ -27,7 +27,6 @@
#include "SWGPerseusReport.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
#include "device/deviceapi.h"
#include "perseus/deviceperseus.h"
diff --git a/plugins/samplesource/perseus/perseusplugin.cpp b/plugins/samplesource/perseus/perseusplugin.cpp
index a03f236dd..e8d1c3dde 100644
--- a/plugins/samplesource/perseus/perseusplugin.cpp
+++ b/plugins/samplesource/perseus/perseusplugin.cpp
@@ -21,7 +21,6 @@
#include "perseus-sdr.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "perseus/deviceperseus.h"
#include "perseusplugin.h"
#include "perseuswebapiadapter.h"
diff --git a/plugins/samplesource/plutosdrinput/plutosdrinput.cpp b/plugins/samplesource/plutosdrinput/plutosdrinput.cpp
index b38a2e025..723b2c8c8 100644
--- a/plugins/samplesource/plutosdrinput/plutosdrinput.cpp
+++ b/plugins/samplesource/plutosdrinput/plutosdrinput.cpp
@@ -29,7 +29,6 @@
#include "SWGPlutoSdrInputReport.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
#include "device/deviceapi.h"
#include "plutosdr/deviceplutosdrparams.h"
#include "plutosdr/deviceplutosdrbox.h"
diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp b/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp
index 31d650ef6..877e741c3 100644
--- a/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp
+++ b/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp
@@ -24,7 +24,6 @@
#include <QMessageBox>
#include <QFileDialog>
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputthread.cpp b/plugins/samplesource/plutosdrinput/plutosdrinputthread.cpp
index 6ccd074a7..923666d34 100644
--- a/plugins/samplesource/plutosdrinput/plutosdrinputthread.cpp
+++ b/plugins/samplesource/plutosdrinput/plutosdrinputthread.cpp
@@ -20,8 +20,6 @@
#include "plutosdrinputsettings.h"
#include "plutosdrinputthread.h"
-#include "iio.h"
-
PlutoSDRInputThread::PlutoSDRInputThread(uint32_t blocksizeSamples, DevicePlutoSDRBox* plutoBox, SampleSinkFifo* sampleFifo, QObject* parent) :
QThread(parent),
m_running(false),
diff --git a/plugins/samplesource/remoteinput/remoteinput.cpp b/plugins/samplesource/remoteinput/remoteinput.cpp
index 3cb82ad99..969bdc9e9 100644
--- a/plugins/samplesource/remoteinput/remoteinput.cpp
+++ b/plugins/samplesource/remoteinput/remoteinput.cpp
@@ -32,8 +32,6 @@
#include "SWGRemoteInputReport.h"
#include "util/simpleserializer.h"
-#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
#include "device/deviceapi.h"
#include "remoteinput.h"
diff --git a/plugins/samplesource/remoteinput/remoteinputgui.cpp b/plugins/samplesource/remoteinput/remoteinputgui.cpp
index fe6d796fa..c60627641 100644
--- a/plugins/samplesource/remoteinput/remoteinputgui.cpp
+++ b/plugins/samplesource/remoteinput/remoteinputgui.cpp
@@ -33,11 +33,8 @@
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/hbfilterchainconverter.h"
-#include "mainwindow.h"
-#include "util/simpleserializer.h"
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
#include "remoteinputgui.h"
diff --git a/plugins/samplesource/remoteinput/remoteinputplugin.cpp b/plugins/samplesource/remoteinput/remoteinputplugin.cpp
index c9364ca0c..d87245c04 100644
--- a/plugins/samplesource/remoteinput/remoteinputplugin.cpp
+++ b/plugins/samplesource/remoteinput/remoteinputplugin.cpp
@@ -20,7 +20,6 @@
#include <QtPlugin>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#ifdef SERVER_MODE
#include "remoteinput.h"
diff --git a/plugins/samplesource/remoteinput/remoteinputudphandler.cpp b/plugins/samplesource/remoteinput/remoteinputudphandler.cpp
index 118bcebd8..b55fbc10c 100644
--- a/plugins/samplesource/remoteinput/remoteinputudphandler.cpp
+++ b/plugins/samplesource/remoteinput/remoteinputudphandler.cpp
@@ -20,7 +20,6 @@
#include <QTimer>
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
#include "device/deviceapi.h"
#include "remoteinputudphandler.h"
diff --git a/plugins/samplesource/remotetcpinput/remotetcpinput.cpp b/plugins/samplesource/remotetcpinput/remotetcpinput.cpp
index 730313a09..afc29a195 100644
--- a/plugins/samplesource/remotetcpinput/remotetcpinput.cpp
+++ b/plugins/samplesource/remotetcpinput/remotetcpinput.cpp
@@ -26,14 +26,12 @@
#include <QJsonParseError>
#include "SWGDeviceSettings.h"
-#include "SWGChannelSettings.h"
#include "SWGDeviceState.h"
#include "SWGDeviceReport.h"
#include "SWGRemoteTCPInputReport.h"
#include "util/simpleserializer.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
#include "device/deviceapi.h"
#include "remotetcpinput.h"
diff --git a/plugins/samplesource/remotetcpinput/remotetcpinputgui.cpp b/plugins/samplesource/remotetcpinput/remotetcpinputgui.cpp
index 3d1623cc9..b1eec42ea 100644
--- a/plugins/samplesource/remotetcpinput/remotetcpinputgui.cpp
+++ b/plugins/samplesource/remotetcpinput/remotetcpinputgui.cpp
@@ -27,11 +27,7 @@
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
-#include "dsp/hbfilterchainconverter.h"
-#include "mainwindow.h"
-#include "util/simpleserializer.h"
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
#include "remotetcpinputgui.h"
diff --git a/plugins/samplesource/remotetcpinput/remotetcpinputplugin.cpp b/plugins/samplesource/remotetcpinput/remotetcpinputplugin.cpp
index f6aaf313b..bf4711f4a 100644
--- a/plugins/samplesource/remotetcpinput/remotetcpinputplugin.cpp
+++ b/plugins/samplesource/remotetcpinput/remotetcpinputplugin.cpp
@@ -21,7 +21,6 @@
#include <QtPlugin>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#ifdef SERVER_MODE
#include "remotetcpinput.h"
diff --git a/plugins/samplesource/remotetcpinput/remotetcpinputtcphandler.cpp b/plugins/samplesource/remotetcpinput/remotetcpinputtcphandler.cpp
index 906d62bdf..62236edb4 100644
--- a/plugins/samplesource/remotetcpinput/remotetcpinputtcphandler.cpp
+++ b/plugins/samplesource/remotetcpinput/remotetcpinputtcphandler.cpp
@@ -20,9 +20,8 @@
#include <QUdpSocket>
#include <QDebug>
-#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
#include "device/deviceapi.h"
+#include "util/message.h"
#include "remotetcpinputtcphandler.h"
#include "remotetcpinput.h"
diff --git a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp
index 1cb0e9b21..ee9890166 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp
+++ b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp
@@ -34,7 +34,6 @@
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
RTLSDRGui::RTLSDRGui(DeviceUISet *deviceUISet, QWidget* parent) :
diff --git a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp
index a791d3704..8cf3d0081 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp
+++ b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp
@@ -31,14 +31,12 @@
#include "SWGRtlSdrSettings.h"
#include "SWGDeviceState.h"
#include "SWGDeviceReport.h"
-#include "SWGDeviceActions.h"
#include "SWGRtlSdrReport.h"
#include "rtlsdrinput.h"
#include "device/deviceapi.h"
#include "rtlsdrthread.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
#ifdef ANDROID
#include "util/android.h"
#endif
diff --git a/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp b/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp
index 7d9ac0808..58c02a958 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp
+++ b/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp
@@ -24,7 +24,6 @@
#include <rtl-sdr.h>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#ifdef SERVER_MODE
#include "rtlsdrinput.h"
diff --git a/plugins/samplesource/sdrplay/sdrplaygui.cpp b/plugins/samplesource/sdrplay/sdrplaygui.cpp
index 3ea434eea..29528906d 100644
--- a/plugins/samplesource/sdrplay/sdrplaygui.cpp
+++ b/plugins/samplesource/sdrplay/sdrplaygui.cpp
@@ -31,7 +31,6 @@
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
diff --git a/plugins/samplesource/sdrplay/sdrplayinput.cpp b/plugins/samplesource/sdrplay/sdrplayinput.cpp
index f1d1a2602..6c8740fd4 100644
--- a/plugins/samplesource/sdrplay/sdrplayinput.cpp
+++ b/plugins/samplesource/sdrplay/sdrplayinput.cpp
@@ -31,7 +31,6 @@
#include "util/simpleserializer.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
#include "sdrplayinput.h"
#include <device/deviceapi.h>
diff --git a/plugins/samplesource/sdrplay/sdrplayplugin.cpp b/plugins/samplesource/sdrplay/sdrplayplugin.cpp
index a2ebfdfb0..5172fbd48 100644
--- a/plugins/samplesource/sdrplay/sdrplayplugin.cpp
+++ b/plugins/samplesource/sdrplay/sdrplayplugin.cpp
@@ -20,7 +20,6 @@
#include <QtPlugin>
#include <mirisdr.h>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#ifdef SERVER_MODE
#include "sdrplayinput.h"
diff --git a/plugins/samplesource/sdrplayv3/sdrplayv3gui.cpp b/plugins/samplesource/sdrplayv3/sdrplayv3gui.cpp
index 9bb681ce9..43513854d 100644
--- a/plugins/samplesource/sdrplayv3/sdrplayv3gui.cpp
+++ b/plugins/samplesource/sdrplayv3/sdrplayv3gui.cpp
@@ -32,7 +32,6 @@
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
SDRPlayV3Gui::SDRPlayV3Gui(DeviceUISet *deviceUISet, QWidget* parent) :
diff --git a/plugins/samplesource/sdrplayv3/sdrplayv3input.cpp b/plugins/samplesource/sdrplayv3/sdrplayv3input.cpp
index 9468e418e..9fb01c809 100644
--- a/plugins/samplesource/sdrplayv3/sdrplayv3input.cpp
+++ b/plugins/samplesource/sdrplayv3/sdrplayv3input.cpp
@@ -33,7 +33,6 @@
#include "util/simpleserializer.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
#include "sdrplayv3input.h"
#include <device/deviceapi.h>
diff --git a/plugins/samplesource/sigmffileinput/sigmffileinput.cpp b/plugins/samplesource/sigmffileinput/sigmffileinput.cpp
index 674b9dec0..b9d3516fc 100644
--- a/plugins/samplesource/sigmffileinput/sigmffileinput.cpp
+++ b/plugins/samplesource/sigmffileinput/sigmffileinput.cpp
@@ -37,7 +37,6 @@
#include "dsp/dspcommands.h"
#include "dsp/dspdevicesourceengine.h"
-#include "dsp/dspengine.h"
#include "device/deviceapi.h"
#include "util/sha512.h"
diff --git a/plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp b/plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp
index acdf03185..15bcd50fb 100644
--- a/plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp
+++ b/plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp
@@ -25,19 +25,14 @@
#include <QMessageBox>
#include "ui_sigmffileinputgui.h"
-#include "plugin/pluginapi.h"
-#include "gui/colormapper.h"
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "dsp/filerecordinterface.h"
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
-#include "mainwindow.h"
-
#include "recordinfodialog.h"
#include "sigmffileinputgui.h"
diff --git a/plugins/samplesource/sigmffileinput/sigmffileinputplugin.cpp b/plugins/samplesource/sigmffileinput/sigmffileinputplugin.cpp
index fee23ad57..b7db774b7 100644
--- a/plugins/samplesource/sigmffileinput/sigmffileinputplugin.cpp
+++ b/plugins/samplesource/sigmffileinput/sigmffileinputplugin.cpp
@@ -20,7 +20,6 @@
#include <QtPlugin>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#ifdef SERVER_MODE
#include "sigmffileinput.h"
diff --git a/plugins/samplesource/sigmffileinput/sigmffileinputworker.cpp b/plugins/samplesource/sigmffileinput/sigmffileinputworker.cpp
index 04b88ee6b..e04a708ea 100644
--- a/plugins/samplesource/sigmffileinput/sigmffileinputworker.cpp
+++ b/plugins/samplesource/sigmffileinput/sigmffileinputworker.cpp
@@ -19,7 +19,6 @@
#include <errno.h>
#include <QDebug>
-#include "dsp/filerecord.h"
#include "dsp/samplesinkfifo.h"
#include "util/messagequeue.h"
diff --git a/plugins/samplesource/soapysdrinput/soapysdrinput.cpp b/plugins/samplesource/soapysdrinput/soapysdrinput.cpp
index 49c848ec5..a7b5b9ddb 100644
--- a/plugins/samplesource/soapysdrinput/soapysdrinput.cpp
+++ b/plugins/samplesource/soapysdrinput/soapysdrinput.cpp
@@ -32,7 +32,6 @@
#include "device/deviceapi.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
#include "soapysdr/devicesoapysdr.h"
#include "soapysdrinputthread.h"
diff --git a/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp b/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp
index 5f849081a..37e9a11f2 100644
--- a/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp
+++ b/plugins/samplesource/soapysdrinput/soapysdrinputgui.cpp
@@ -21,11 +21,9 @@
#include <QFileDialog>
#include <QResizeEvent>
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
-#include "util/simpleserializer.h"
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialogpositioner.h"
diff --git a/plugins/samplesource/soapysdrinput/soapysdrinputplugin.cpp b/plugins/samplesource/soapysdrinput/soapysdrinputplugin.cpp
index e4052cc84..361e4ee23 100644
--- a/plugins/samplesource/soapysdrinput/soapysdrinputplugin.cpp
+++ b/plugins/samplesource/soapysdrinput/soapysdrinputplugin.cpp
@@ -19,7 +19,6 @@
#include <QtPlugin>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "soapysdr/devicesoapysdr.h"
#include "soapysdrinputplugin.h"
diff --git a/plugins/samplesource/testsource/testsourcegui.cpp b/plugins/samplesource/testsource/testsourcegui.cpp
index 5722b5196..a2fa40827 100644
--- a/plugins/samplesource/testsource/testsourcegui.cpp
+++ b/plugins/samplesource/testsource/testsourcegui.cpp
@@ -25,18 +25,14 @@
#include <QFileDialog>
#include "ui_testsourcegui.h"
-#include "plugin/pluginapi.h"
#include "gui/colormapper.h"
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "util/db.h"
-#include "mainwindow.h"
-
#include "testsourcegui.h"
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
diff --git a/plugins/samplesource/testsource/testsourceinput.cpp b/plugins/samplesource/testsource/testsourceinput.cpp
index 8ede1be55..024f6aa6c 100644
--- a/plugins/samplesource/testsource/testsourceinput.cpp
+++ b/plugins/samplesource/testsource/testsourceinput.cpp
@@ -32,7 +32,6 @@
#include "device/deviceapi.h"
#include "testsourceworker.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
MESSAGE_CLASS_DEFINITION(TestSourceInput::MsgConfigureTestSource, Message)
MESSAGE_CLASS_DEFINITION(TestSourceInput::MsgStartStop, Message)
diff --git a/plugins/samplesource/testsource/testsourceplugin.cpp b/plugins/samplesource/testsource/testsourceplugin.cpp
index 5d4e03708..702ee02f5 100644
--- a/plugins/samplesource/testsource/testsourceplugin.cpp
+++ b/plugins/samplesource/testsource/testsourceplugin.cpp
@@ -20,7 +20,6 @@
#include <QtPlugin>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#ifdef SERVER_MODE
#include "testsourceinput.h"
diff --git a/plugins/samplesource/usrpinput/usrpinput.cpp b/plugins/samplesource/usrpinput/usrpinput.cpp
index b35cfb0f2..e317aa5b8 100644
--- a/plugins/samplesource/usrpinput/usrpinput.cpp
+++ b/plugins/samplesource/usrpinput/usrpinput.cpp
@@ -34,7 +34,6 @@
#include "device/deviceapi.h"
#include "dsp/dspcommands.h"
-#include "dsp/dspengine.h"
#include "util/poweroftwo.h"
#include "usrpinput.h"
#include "usrpinputthread.h"
diff --git a/plugins/samplesource/usrpinput/usrpinputgui.cpp b/plugins/samplesource/usrpinput/usrpinputgui.cpp
index 5a856f5fb..e068d40b3 100644
--- a/plugins/samplesource/usrpinput/usrpinputgui.cpp
+++ b/plugins/samplesource/usrpinput/usrpinputgui.cpp
@@ -29,7 +29,6 @@
#include "gui/glspectrum.h"
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
diff --git a/plugins/samplesource/usrpinput/usrpinputplugin.cpp b/plugins/samplesource/usrpinput/usrpinputplugin.cpp
index e401099e7..fe4668a7d 100644
--- a/plugins/samplesource/usrpinput/usrpinputplugin.cpp
+++ b/plugins/samplesource/usrpinput/usrpinputplugin.cpp
@@ -23,7 +23,6 @@
#include <string>
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "usrp/deviceusrp.h"
#ifdef SERVER_MODE
diff --git a/plugins/samplesource/usrpinput/usrpinputthread.cpp b/plugins/samplesource/usrpinput/usrpinputthread.cpp
index b53d60b2a..621fa618e 100644
--- a/plugins/samplesource/usrpinput/usrpinputthread.cpp
+++ b/plugins/samplesource/usrpinput/usrpinputthread.cpp
@@ -23,7 +23,6 @@
#include <uhd/types/stream_cmd.hpp>
-#include "usrpinputsettings.h"
#include "usrpinputthread.h"
USRPInputThread::USRPInputThread(uhd::rx_streamer::sptr stream, size_t bufSamples,
diff --git a/plugins/samplesource/xtrxinput/xtrxinputgui.cpp b/plugins/samplesource/xtrxinput/xtrxinputgui.cpp
index 335cb180d..69aa3b3e4 100644
--- a/plugins/samplesource/xtrxinput/xtrxinputgui.cpp
+++ b/plugins/samplesource/xtrxinput/xtrxinputgui.cpp
@@ -31,7 +31,6 @@
#include "gui/basicdevicesettingsdialog.h"
#include "gui/dialpopup.h"
#include "gui/dialogpositioner.h"
-#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
#include "device/deviceuiset.h"
diff --git a/plugins/samplesource/xtrxinput/xtrxinputplugin.cpp b/plugins/samplesource/xtrxinput/xtrxinputplugin.cpp
index 137728a66..5204ff18a 100644
--- a/plugins/samplesource/xtrxinput/xtrxinputplugin.cpp
+++ b/plugins/samplesource/xtrxinput/xtrxinputplugin.cpp
@@ -28,7 +28,6 @@
#include "xtrx_api.h"
#include "plugin/pluginapi.h"
-#include "util/simpleserializer.h"
#include "xtrx/devicextrx.h"
#ifdef SERVER_MODE
diff --git a/plugins/samplesource/xtrxinput/xtrxinputthread.cpp b/plugins/samplesource/xtrxinput/xtrxinputthread.cpp
index e85dc8b6a..de1ee8071 100644
--- a/plugins/samplesource/xtrxinput/xtrxinputthread.cpp
+++ b/plugins/samplesource/xtrxinput/xtrxinputthread.cpp
@@ -21,7 +21,6 @@
#include <thread>
#include "xtrx/devicextrx.h"
-#include "xtrxinputsettings.h"
#include "xtrxinputthread.h"
XTRXInputThread::XTRXInputThread(struct xtrx_dev *dev, unsigned int nbChannels, unsigned int uniqueChannelIndex, QObject* parent) :
diff --git a/sdrbase/audio/audiofifo.cpp b/sdrbase/audio/audiofifo.cpp
index d562c8a76..57d90c096 100644
--- a/sdrbase/audio/audiofifo.cpp
+++ b/sdrbase/audio/audiofifo.cpp
@@ -21,7 +21,6 @@
#include <QTime>
#include "dsp/dsptypes.h"
#include "audio/audiofifo.h"
-#include "audio/audionetsink.h"
#define MIN(x, y) ((x) < (y) ? (x) : (y))
diff --git a/sdrbase/availablechannelorfeature.cpp b/sdrbase/availablechannelorfeature.cpp
index 096d5e90e..be08a5ae5 100644
--- a/sdrbase/availablechannelorfeature.cpp
+++ b/sdrbase/availablechannelorfeature.cpp
@@ -16,9 +16,6 @@
///////////////////////////////////////////////////////////////////////////////////
#include "availablechannelorfeature.h"
-#include "feature/feature.h"
-#include "channel/channelapi.h"
-#include "maincore.h"
bool AvailableChannelOrFeature::operator==(const AvailableChannelOrFeature& a) const
{
diff --git a/sdrbase/channel/channelapi.cpp b/sdrbase/channel/channelapi.cpp
index 4b021cafc..8141ddc4e 100644
--- a/sdrbase/channel/channelapi.cpp
+++ b/sdrbase/channel/channelapi.cpp
@@ -22,7 +22,6 @@
#include "util/uid.h"
#include "channelapi.h"
-#include "maincore.h"
ChannelAPI::ChannelAPI(const QString& uri, StreamType streamType) :
m_guiMessageQueue(nullptr),
diff --git a/sdrbase/channel/channelwebapiutils.cpp b/sdrbase/channel/channelwebapiutils.cpp
index 141964aa6..496bc3eb6 100644
--- a/sdrbase/channel/channelwebapiutils.cpp
+++ b/sdrbase/channel/channelwebapiutils.cpp
@@ -21,12 +21,10 @@
#include "channelwebapiutils.h"
#include "SWGDeviceState.h"
-#include "SWGSuccessResponse.h"
#include "SWGErrorResponse.h"
#include "SWGDeviceSettings.h"
#include "SWGDeviceReport.h"
#include "SWGChannelSettings.h"
-#include "SWGDeviceSet.h"
#include "SWGChannelActions.h"
#include "SWGFileSinkActions.h"
#include "SWGFeatureSettings.h"
@@ -40,7 +38,6 @@
#include "dsp/devicesamplesource.h"
#include "dsp/devicesamplesink.h"
#include "dsp/devicesamplemimo.h"
-#include "webapi/webapiadapterinterface.h"
#include "webapi/webapiutils.h"
#include "feature/featureset.h"
#include "feature/feature.h"
diff --git a/sdrbase/dsp/basebandsamplesink.cpp b/sdrbase/dsp/basebandsamplesink.cpp
index 4f2ff4c03..a2910f232 100644
--- a/sdrbase/dsp/basebandsamplesink.cpp
+++ b/sdrbase/dsp/basebandsamplesink.cpp
@@ -16,7 +16,6 @@
// You should have received a copy of the GNU General Public License //
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
///////////////////////////////////////////////////////////////////////////////////
-#include "util/message.h"
#include "basebandsamplesink.h"
diff --git a/sdrbase/dsp/basebandsamplesource.cpp b/sdrbase/dsp/basebandsamplesource.cpp
index 427adfa25..1dce1d0d3 100644
--- a/sdrbase/dsp/basebandsamplesource.cpp
+++ b/sdrbase/dsp/basebandsamplesource.cpp
@@ -18,7 +18,6 @@
///////////////////////////////////////////////////////////////////////////////////
#include "dsp/basebandsamplesource.h"
-#include "util/message.h"
BasebandSampleSource::BasebandSampleSource()
{
diff --git a/sdrbase/dsp/devicesamplemimo.cpp b/sdrbase/dsp/devicesamplemimo.cpp
index df0e64f82..ec29c1608 100644
--- a/sdrbase/dsp/devicesamplemimo.cpp
+++ b/sdrbase/dsp/devicesamplemimo.cpp
@@ -17,8 +17,6 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
///////////////////////////////////////////////////////////////////////////////////
-#include <QDebug>
-
#include "devicesamplemimo.h"
DeviceSampleMIMO::DeviceSampleMIMO() :
diff --git a/sdrbase/dsp/downchannelizer.cpp b/sdrbase/dsp/downchannelizer.cpp
index 23a361aea..6c2bd482e 100644
--- a/sdrbase/dsp/downchannelizer.cpp
+++ b/sdrbase/dsp/downchannelizer.cpp
@@ -23,8 +23,6 @@
#include <QString>
#include <QDebug>
-#include "dsp/inthalfbandfilter.h"
-#include "dsp/dspcommands.h"
#include "dsp/hbfilterchainconverter.h"
#include "downchannelizer.h"
diff --git a/sdrbase/dsp/dspdevicesourceengine.cpp b/sdrbase/dsp/dspdevicesourceengine.cpp
index a0d2dd71d..7ac7b0019 100644
--- a/sdrbase/dsp/dspdevicesourceengine.cpp
+++ b/sdrbase/dsp/dspdevicesourceengine.cpp
@@ -26,7 +26,6 @@
#include <stdio.h>
#include <QDebug>
#include "dsp/dspcommands.h"
-#include "util/fixed.h"
#include "samplesinkfifo.h"
DSPDeviceSourceEngine::DSPDeviceSourceEngine(uint uid, QObject* parent) :
diff --git a/sdrbase/dsp/dspengine.h b/sdrbase/dsp/dspengine.h
index dc56c8f62..0a518e1ec 100644
--- a/sdrbase/dsp/dspengine.h
+++ b/sdrbase/dsp/dspengine.h
@@ -26,7 +26,6 @@
#include <vector>
#include "audio/audiodevicemanager.h"
-#include "audio/audiooutputdevice.h"
#include "export.h"
class DSPDeviceSourceEngine;
diff --git a/sdrbase/dsp/filerecord.cpp b/sdrbase/dsp/filerecord.cpp
index cb860cd9d..e60b054ea 100644
--- a/sdrbase/dsp/filerecord.cpp
+++ b/sdrbase/dsp/filerecord.cpp
@@ -29,7 +29,6 @@
#include <QDateTime>
#include "dsp/dspcommands.h"
-#include "util/simpleserializer.h"
#include "util/message.h"
#include "filerecord.h"
diff --git a/sdrbase/dsp/upchannelizer.cpp b/sdrbase/dsp/upchannelizer.cpp
index 08d34772c..7753956be 100644
--- a/sdrbase/dsp/upchannelizer.cpp
+++ b/sdrbase/dsp/upchannelizer.cpp
@@ -22,8 +22,6 @@
#include <QDebug>
#include <algorithm>
-#include "inthalfbandfilter.h"
-#include "dspcommands.h"
#include "hbfilterchainconverter.h"
#include "upchannelizer.h"
diff --git a/sdrbase/dsp/wavfilerecord.cpp b/sdrbase/dsp/wavfilerecord.cpp
index 4bbc6e916..18e2f8b12 100644
--- a/sdrbase/dsp/wavfilerecord.cpp
+++ b/sdrbase/dsp/wavfilerecord.cpp
@@ -25,7 +25,6 @@
#include <QRegExp>
#include "dsp/dspcommands.h"
-#include "util/simpleserializer.h"
#include "util/message.h"
#include "wavfilerecord.h"
diff --git a/sdrbase/feature/feature.cpp b/sdrbase/feature/feature.cpp
index 28d97e1b3..3b3bd40a8 100644
--- a/sdrbase/feature/feature.cpp
+++ b/sdrbase/feature/feature.cpp
@@ -26,7 +26,6 @@
#include "SWGDeviceState.h"
#include "feature.h"
-#include "maincore.h"
Feature::Feature(const QString& uri, WebAPIAdapterInterface *webAPIAdapterInterface) :
m_guiMessageQueue(nullptr),
diff --git a/sdrbase/plugin/pluginmanager.cpp b/sdrbase/plugin/pluginmanager.cpp
index 4922fe998..2bf2b3afd 100644
--- a/sdrbase/plugin/pluginmanager.cpp
+++ b/sdrbase/plugin/pluginmanager.cpp
@@ -30,11 +30,6 @@
#include <algorithm>
#include "device/deviceenumerator.h"
-#include "settings/preset.h"
-#include "util/message.h"
-#include "dsp/dspdevicesourceengine.h"
-#include "dsp/dspdevicesinkengine.h"
-
#include "plugin/pluginmanager.h"
#ifndef LIB
diff --git a/sdrbase/util/iot/homeassistant.cpp b/sdrbase/util/iot/homeassistant.cpp
index ec403d940..0f980f103 100644
--- a/sdrbase/util/iot/homeassistant.cpp
+++ b/sdrbase/util/iot/homeassistant.cpp
@@ -24,7 +24,6 @@
#include <QRegularExpression>
#include "util/iot/homeassistant.h"
-#include "util/simpleserializer.h"
HomeAssistantDevice::HomeAssistantDevice(const QString& apiKey, const QString& url, const QString &deviceId,
const QStringList &controls, const QStringList &sensors,
diff --git a/sdrbase/util/message.cpp b/sdrbase/util/message.cpp
index 6c04514fc..4e4872418 100644
--- a/sdrbase/util/message.cpp
+++ b/sdrbase/util/message.cpp
@@ -20,7 +20,6 @@
#include <QWaitCondition>
#include <QMutex>
#include "util/message.h"
-#include "util/messagequeue.h"
const char* Message::m_identifier = 0;
diff --git a/sdrbase/util/rtpsink.cpp b/sdrbase/util/rtpsink.cpp
index f2ca816c7..6c5507b60 100644
--- a/sdrbase/util/rtpsink.cpp
+++ b/sdrbase/util/rtpsink.cpp
@@ -17,7 +17,6 @@
///////////////////////////////////////////////////////////////////////////////////
#include "rtpsink.h"
-#include "dsp/dsptypes.h"
#include <algorithm>
RTPSink::RTPSink(QUdpSocket *udpSocket, int sampleRate, bool stereo) :
diff --git a/sdrbase/webapi/webapiadapter.cpp b/sdrbase/webapi/webapiadapter.cpp
index b72a20d40..1b5805451 100644
--- a/sdrbase/webapi/webapiadapter.cpp
+++ b/sdrbase/webapi/webapiadapter.cpp
@@ -47,7 +47,6 @@
#include "plugin/pluginmanager.h"
#include "channel/channelapi.h"
#include "webapi/webapiadapterbase.h"
-#include "util/serialutil.h"
#include "SWGInstanceSummaryResponse.h"
#include "SWGInstanceConfigResponse.h"
@@ -80,8 +79,6 @@
#include "SWGSuccessResponse.h"
#include "SWGErrorResponse.h"
#include "SWGDeviceState.h"
-#include "SWGLimeRFEDevices.h"
-#include "SWGLimeRFESettings.h"
#include "SWGFeaturePresets.h"
#include "SWGFeaturePresetGroup.h"
#include "SWGFeaturePresetItem.h"
diff --git a/sdrbase/webapi/webapirequestmapper.cpp b/sdrbase/webapi/webapirequestmapper.cpp
index 50891d249..7171def63 100644
--- a/sdrbase/webapi/webapirequestmapper.cpp
+++ b/sdrbase/webapi/webapirequestmapper.cpp
@@ -38,13 +38,10 @@
#include "SWGInstanceFeaturesResponse.h"
#include "SWGAudioDevices.h"
#include "SWGLocationInformation.h"
-#include "SWGAMBEDevices.h"
-#include "SWGLimeRFEDevices.h"
#include "SWGLimeRFESettings.h"
#include "SWGPresets.h"
#include "SWGPresetTransfer.h"
#include "SWGPresetIdentifier.h"
-#include "SWGPresetImport.h"
#include "SWGPresetExport.h"
#include "SWGBase64Blob.h"
#include "SWGFilePath.h"
diff --git a/sdrgui/device/deviceuiset.cpp b/sdrgui/device/deviceuiset.cpp
index 0de391efc..94271d2d6 100644
--- a/sdrgui/device/deviceuiset.cpp
+++ b/sdrgui/device/deviceuiset.cpp
@@ -26,7 +26,6 @@
#include "dsp/dspdevicesourceengine.h"
#include "dsp/dspdevicesinkengine.h"
#include "gui/glspectrum.h"
-#include "gui/glspectrumview.h"
#include "gui/glspectrumgui.h"
// #include "gui/channelwindow.h"
#include "gui/mdiutils.h"
diff --git a/sdrgui/gui/cwkeyergui.cpp b/sdrgui/gui/cwkeyergui.cpp
index abeb7008b..227621180 100644
--- a/sdrgui/gui/cwkeyergui.cpp
+++ b/sdrgui/gui/cwkeyergui.cpp
@@ -24,7 +24,6 @@
#include "gui/cwmousekeyerenabler.h"
#include "ui_cwkeyergui.h"
#include "dsp/cwkeyer.h"
-#include "util/simpleserializer.h"
#include "util/messagequeue.h"
#include "commands/commandkeyreceiver.h"
#include "mainwindow.h"
diff --git a/sdrgui/gui/featurepresetsdialog.cpp b/sdrgui/gui/featurepresetsdialog.cpp
index e2f24fa1d..a7c97c984 100644
--- a/sdrgui/gui/featurepresetsdialog.cpp
+++ b/sdrgui/gui/featurepresetsdialog.cpp
@@ -21,7 +21,6 @@
#include "gui/addpresetdialog.h"
#include "feature/featureuiset.h"
#include "settings/featuresetpreset.h"
-#include "maincore.h"
#include "featurepresetsdialog.h"
#include "ui_featurepresetsdialog.h"
diff --git a/sdrgui/gui/glscopegui.cpp b/sdrgui/gui/glscopegui.cpp
index 8d6aa7589..8a1db233d 100644
--- a/sdrgui/gui/glscopegui.cpp
+++ b/sdrgui/gui/glscopegui.cpp
@@ -26,7 +26,6 @@
#include "glscope.h"
#include "ui_glscopegui.h"
#include "gui/dialpopup.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
GLScopeGUI::GLScopeGUI(QWidget* parent) :
diff --git a/sdrgui/gui/glspectrumgui.cpp b/sdrgui/gui/glspectrumgui.cpp
index 2404aaeae..482bef04e 100644
--- a/sdrgui/gui/glspectrumgui.cpp
+++ b/sdrgui/gui/glspectrumgui.cpp
@@ -46,7 +46,6 @@
#include "gui/dialogpositioner.h"
#include "gui/dialpopup.h"
#include "util/colormap.h"
-#include "util/simpleserializer.h"
#include "util/db.h"
#include "ui_glspectrumgui.h"
diff --git a/sdrgui/gui/pluginpresetsdialog.cpp b/sdrgui/gui/pluginpresetsdialog.cpp
index 7df437fb3..a67e3dbfb 100644
--- a/sdrgui/gui/pluginpresetsdialog.cpp
+++ b/sdrgui/gui/pluginpresetsdialog.cpp
@@ -22,7 +22,6 @@
#include "gui/addpresetdialog.h"
#include "settings/serializableinterface.h"
#include "settings/pluginpreset.h"
-#include "maincore.h"
#include "pluginpresetsdialog.h"
#include "ui_pluginpresetsdialog.h"
diff --git a/sdrgui/gui/rollupcontents.cpp b/sdrgui/gui/rollupcontents.cpp
index 0db4e575b..ae15062c1 100644
--- a/sdrgui/gui/rollupcontents.cpp
+++ b/sdrgui/gui/rollupcontents.cpp
@@ -28,7 +28,6 @@
#include "gui/rollupcontents.h"
#include "settings/rollupstate.h"
-#include "ui_glspectrumgui.h"
RollupContents::RollupContents(QWidget* parent) :
QWidget(parent),
diff --git a/sdrgui/gui/rollupwidget.cpp b/sdrgui/gui/rollupwidget.cpp
index 6612e43cc..2543b661c 100644
--- a/sdrgui/gui/rollupwidget.cpp
+++ b/sdrgui/gui/rollupwidget.cpp
@@ -28,7 +28,6 @@
#include "gui/rollupwidget.h"
#include "settings/rollupstate.h"
-#include "ui_glspectrumgui.h"
RollupWidget::RollupWidget(QWidget* parent) :
QWidget(parent),
diff --git a/sdrgui/gui/spectrummeasurementsdialog.cpp b/sdrgui/gui/spectrummeasurementsdialog.cpp
index 61a8dc870..b23241761 100644
--- a/sdrgui/gui/spectrummeasurementsdialog.cpp
+++ b/sdrgui/gui/spectrummeasurementsdialog.cpp
@@ -19,8 +19,6 @@
#include <QColorDialog>
#include <QFileDialog>
-#include "util/db.h"
-#include "util/csv.h"
#include "spectrummeasurementsdialog.h"
#include "spectrummeasurements.h"
#include "glspectrum.h"
diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp
index a721e9540..f24355e63 100644
--- a/sdrgui/mainwindow.cpp
+++ b/sdrgui/mainwindow.cpp
@@ -63,12 +63,9 @@
#include "feature/featuregui.h"
#include "mainspectrum/mainspectrumgui.h"
#include "commands/commandkeyreceiver.h"
-#include "gui/indicator.h"
#include "gui/presetitem.h"
-#include "gui/addpresetdialog.h"
#include "gui/pluginsdialog.h"
#include "gui/aboutdialog.h"
-#include "gui/rollupwidget.h"
#include "gui/audiodialog.h"
#include "gui/graphicsdialog.h"
#include "gui/loggingdialog.h"
@@ -97,7 +94,6 @@
#include "dsp/dspdevicemimoengine.h"
#include "plugin/pluginapi.h"
#include "gui/glspectrum.h"
-#include "gui/glspectrumgui.h"
#include "loggerwithfile.h"
#include "webapi/webapirequestmapper.h"
#include "webapi/webapiserver.h"