Remove unused includes and use more direct includes

devices/bladerf1/devicebladerf1shared.h

@@ -20,7 +20,6 @@
 #ifndef DEVICES_BLADERF_DEVICEHACKRFSHARED_H_
 #define DEVICES_BLADERF_DEVICEHACKRFSHARED_H_
 
-#include "util/message.h"
 #include "export.h"
 
 class DEVICES_API DeviceBladeRF1Shared

modemm17/Trellis.h

@@ -4,9 +4,6 @@
 
 #pragma once
 
-#include "Util.h"
-#include "Convolution.h"
-
 #include <array>
 #include <cstdlib>
 #include <cstdint>

modemm17/Viterbi.h

@@ -2,7 +2,6 @@
 
 #pragma once
 
-#include "Trellis.h"
 #include "Convolution.h"
 #include "Util.h"
 

plugins/channelmimo/doa2/doa2baseband.h

@@ -25,6 +25,7 @@
 #include <QRecursiveMutex>
 
 #include "dsp/samplemififo.h"
+#include "util/message.h"
 #include "util/messagequeue.h"
 #include "doa2streamsink.h"
 #include "doa2corr.h"

plugins/channelmimo/doa2/doa2corr.h

@@ -23,7 +23,6 @@
 
 #include "dsp/dsptypes.h"
 #include "dsp/fftwindow.h"
-#include "util/message.h"
 
 #include "doa2settings.h"
 

plugins/channelmimo/doa2/doa2webapiadapter.h

@@ -20,7 +20,6 @@
 
 #include "channel/channelwebapiadapter.h"
 #include "dsp/glscopesettings.h"
-#include "dsp/spectrumsettings.h"
 #include "doa2settings.h"
 
 /**

plugins/channelmimo/interferometer/interferometerbaseband.h

@@ -25,6 +25,7 @@
 #include <QRecursiveMutex>
 
 #include "dsp/samplemififo.h"
+#include "util/message.h"
 #include "util/messagequeue.h"
 #include "interferometerstreamsink.h"
 #include "interferometercorr.h"

plugins/channelmimo/interferometer/interferometercorr.h

@@ -23,7 +23,6 @@
 
 #include "dsp/dsptypes.h"
 #include "dsp/fftwindow.h"
-#include "util/message.h"
 
 #include "interferometersettings.h"
 

plugins/channelrx/chanalyzer/chanalyzer.h

@@ -33,7 +33,6 @@
 #include "dsp/scopevis.h"
 #include "channel/channelapi.h"
 #include "util/message.h"
-#include "util/movingaverage.h"
 
 #include "chanalyzerbaseband.h"
 

plugins/channelrx/chanalyzer/chanalyzergui.h

@@ -23,7 +23,6 @@
 
 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
-#include "dsp/dsptypes.h"
 #include "util/movingaverage.h"
 #include "util/messagequeue.h"
 #include "settings/rollupstate.h"

plugins/channelrx/chanalyzer/chanalyzerwebapiadapter.h

@@ -19,8 +19,6 @@
 #define INCLUDE_CHANALYZER_WEBAPIADAPTER_H
 
 #include "channel/channelwebapiadapter.h"
-#include "dsp/glscopesettings.h"
-#include "dsp/spectrumsettings.h"
 #include "chanalyzersettings.h"
 
 /**

plugins/channelrx/demodadsb/adsbdemodgui.h

@@ -32,7 +32,6 @@
 #include "channel/channelgui.h"
 #include "dsp/dsptypes.h"
 #include "dsp/channelmarker.h"
-#include "dsp/movingaverage.h"
 #include "util/aviationweather.h"
 #include "util/messagequeue.h"
 #include "util/azel.h"
@@ -48,7 +47,6 @@
 #include "adsbdemodsettings.h"
 #include "util/ourairportsdb.h"
 #include "util/osndb.h"
-#include "util/airlines.h"
 
 class PluginAPI;
 class DeviceUISet;

plugins/channelrx/demodadsb/adsbdemodreport.h

@@ -23,7 +23,6 @@
 #include <QByteArray>
 #include <QDateTime>
 
-#include "dsp/dsptypes.h"
 #include "util/message.h"
 #include "adsbdemodstats.h"
 

plugins/channelrx/demodais/aisdemodsink.h

@@ -26,10 +26,8 @@
 #include "dsp/phasediscri.h"
 #include "dsp/nco.h"
 #include "dsp/interpolator.h"
-#include "dsp/firfilter.h"
 #include "dsp/gaussian.h"
 #include "util/movingaverage.h"
-#include "util/doublebufferfifo.h"
 #include "util/messagequeue.h"
 #include "util/crc.h"
 

plugins/channelrx/demodam/amdemodgui.h

@@ -24,7 +24,6 @@
 
 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
-#include "dsp/movingaverage.h"
 #include "util/messagequeue.h"
 #include "settings/rollupstate.h"
 #include "amdemodsettings.h"

plugins/channelrx/demodam/amdemodsettings.h

@@ -21,6 +21,7 @@
 #ifndef PLUGINS_CHANNELRX_DEMODAM_AMDEMODSETTINGS_H_
 #define PLUGINS_CHANNELRX_DEMODAM_AMDEMODSETTINGS_H_
 
+#include "dsp/dsptypes.h"
 #include <QByteArray>
 
 class Serializable;

plugins/channelrx/demodatv/atvdemod.cpp

@@ -26,6 +26,7 @@
 #include "device/deviceapi.h"
 
 #include "atvdemod.h"
+#include "dsp/dspcommands.h"
 
 MESSAGE_CLASS_DEFINITION(ATVDemod::MsgConfigureATVDemod, Message)
 

plugins/channelrx/demodatv/atvdemod.h

@@ -27,8 +27,6 @@
 
 #include "dsp/basebandsamplesink.h"
 #include "channel/channelapi.h"
-#include "dsp/devicesamplesource.h"
-#include "dsp/dspcommands.h"
 #include "util/message.h"
 
 #include "atvdemodbaseband.h"

plugins/channelrx/demodatv/atvdemodgui.cpp

@@ -24,6 +24,7 @@
 #include "atvdemodgui.h"
 
 #include "device/deviceuiset.h"
+#include "dsp/dspcommands.h"
 #include "dsp/scopevis.h"
 #include "dsp/glscopesettings.h"
 #include "gui/basicchannelsettingsdialog.h"

plugins/channelrx/demodatv/atvdemodsink.h

@@ -25,9 +25,7 @@
 
 #include "dsp/channelsamplesink.h"
 #include "dsp/nco.h"
-#include "dsp/interpolator.h"
 #include "dsp/fftfilt.h"
-#include "dsp/agc.h"
 #include "dsp/phaselock.h"
 #include "dsp/recursivefilters.h"
 #include "dsp/phasediscri.h"

plugins/channelrx/demodbfm/bfmdemodsink.h

@@ -27,7 +27,6 @@
 #include "dsp/nco.h"
 #include "dsp/interpolator.h"
 #include "dsp/firfilter.h"
-#include "dsp/movingaverage.h"
 #include "dsp/fftfilt.h"
 #include "dsp/phaselock.h"
 #include "dsp/filterrc.h"

plugins/channelrx/demodchirpchat/chirpchatdemodsink.h

@@ -25,7 +25,6 @@
 #include "dsp/nco.h"
 #include "dsp/interpolator.h"
 #include "dsp/fftwindow.h"
-#include "util/message.h"
 #include "util/movingaverage.h"
 
 #include "chirpchatdemodsettings.h"

plugins/channelrx/demoddatv/datvconstellation.h

@@ -23,6 +23,7 @@
 
 #include <vector>
 
+#include "leansdr/dvb.h"
 #include "leansdr/framework.h"
 #include "gui/tvscreen.h"
 

plugins/channelrx/demoddatv/datvdemod.cpp

@@ -30,6 +30,7 @@
 #include "SWGChannelReport.h"
 
 #include "device/deviceapi.h"
+#include "dsp/dspcommands.h"
 #include "settings/serializable.h"
 
 #include "datvdemod.h"

plugins/channelrx/demoddatv/datvdemod.h

@@ -29,8 +29,6 @@ class DeviceAPI;
 
 #include "channel/channelapi.h"
 #include "dsp/basebandsamplesink.h"
-#include "dsp/devicesamplesource.h"
-#include "dsp/dspcommands.h"
 #include "util/message.h"
 
 #include "datvdemodbaseband.h"

plugins/channelrx/demoddatv/datvdemodgui.h

@@ -25,7 +25,6 @@
 
 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
-#include "dsp/movingaverage.h"
 #include "settings/rollupstate.h"
 
 #include "datvdemod.h"

plugins/channelrx/demoddatv/datvdemodsink.h

@@ -43,8 +43,6 @@
 #include "dsp/fftfilt.h"
 #include "dsp/nco.h"
 #include "dsp/interpolator.h"
-#include "dsp/movingaverage.h"
-#include "dsp/agc.h"
 #include "dsp/interpolator.h"
 #include "audio/audiofifo.h"
 #include "util/messagequeue.h"

plugins/channelrx/demoddatv/datvdvbs2constellation.h

@@ -24,6 +24,7 @@
 #include <vector>
 
 #include "leansdr/framework.h"
+#include "leansdr/sdr.h"
 #include "gui/tvscreen.h"
 
 namespace leansdr {

plugins/channelrx/demoddsc/dscdemod.h

@@ -36,7 +36,6 @@
 #include "dsp/basebandsamplesink.h"
 #include "channel/channelapi.h"
 #include "util/message.h"
-#include "util/navtex.h"
 
 #include "dscdemodbaseband.h"
 #include "dscdemodsettings.h"

plugins/channelrx/demoddsc/dscdemodgui.h

@@ -21,7 +21,6 @@
 
 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
-#include "dsp/movingaverage.h"
 #include "util/aprsfi.h"
 #include "util/messagequeue.h"
 #include "settings/rollupstate.h"

plugins/channelrx/demodfreedv/freedvdemod.h

@@ -30,7 +30,6 @@
 #include "dsp/spectrumvis.h"
 #include "channel/channelapi.h"
 #include "util/message.h"
-#include "util/doublebufferfifo.h"
 
 #include "freedvdemodbaseband.h"
 

plugins/channelrx/demodfreedv/freedvdemodgui.h

@@ -25,7 +25,6 @@
 
 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
-#include "dsp/movingaverage.h"
 #include "util/messagequeue.h"
 #include "settings/rollupstate.h"
 #include "freedvdemodsettings.h"

plugins/channelrx/demodfreedv/freedvdemodsettings.h

@@ -25,6 +25,8 @@
 #include <QString>
 #include <stdint.h>
 
+#include "dsp/dsptypes.h"
+
 class Serializable;
 
 struct FreeDVDemodSettings

plugins/channelrx/demodft8/ft8demodgui.h

@@ -24,7 +24,6 @@
 
 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
-#include "dsp/movingaverage.h"
 #include "util/messagequeue.h"
 #include "util/ft8message.h"
 #include "settings/rollupstate.h"

plugins/channelrx/demodft8/ft8demodsink.h

@@ -25,7 +25,6 @@
 #include "dsp/interpolator.h"
 #include "dsp/fftfilt.h"
 #include "dsp/agc.h"
-#include "util/doublebufferfifo.h"
 
 #include "ft8demodsettings.h"
 

plugins/channelrx/demodils/ilsdemodgui.h

@@ -20,7 +20,6 @@
 
 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
-#include "dsp/movingaverage.h"
 #include "util/messagequeue.h"
 #include "settings/rollupstate.h"
 #include "ilsdemod.h"

plugins/channelrx/demodils/ilsdemodsettings.h

@@ -23,6 +23,7 @@
 
 #include <QByteArray>
 
+#include "dsp/dsptypes.h"
 #include "util/baudot.h"
 
 class Serializable;

plugins/channelrx/demodils/ilsdemodsink.h

@@ -32,7 +32,6 @@
 #include "dsp/morsedemod.h"
 #include "audio/audiofifo.h"
 #include "util/movingaverage.h"
-#include "util/movingmaximum.h"
 #include "util/doublebufferfifo.h"
 #include "util/messagequeue.h"
 

plugins/channelrx/demodm17/m17demodfilters.h

@@ -24,7 +24,6 @@
 #define NXZEROS 134
 
 #include "dsp/iirfilter.h"
-#include "export.h"
 
 /**
  * This is a 2 pole lowpass Chebyshev (recursive) filter at fc=0.075 using coefficients found in table 20-1 of

plugins/channelrx/demodm17/m17demodgui.h

@@ -26,9 +26,7 @@
 #include <QDateTime>
 
 #include "channel/channelgui.h"
-#include "dsp/dsptypes.h"
 #include "dsp/channelmarker.h"
-#include "dsp/movingaverage.h"
 #include "util/messagequeue.h"
 #include "settings/rollupstate.h"
 

plugins/channelrx/demodm17/m17demodsink.h

@@ -24,9 +24,6 @@
 #include "dsp/phasediscri.h"
 #include "dsp/nco.h"
 #include "dsp/interpolator.h"
-#include "dsp/firfilter.h"
-#include "dsp/afsquelch.h"
-#include "dsp/afsquelch.h"
 #include "audio/audiofifo.h"
 #include "util/movingaverage.h"
 #include "util/doublebufferfifo.h"

plugins/channelrx/demodnavtex/navtexdemodgui.h

@@ -21,7 +21,6 @@
 
 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
-#include "dsp/movingaverage.h"
 #include "util/messagequeue.h"
 #include "settings/rollupstate.h"
 #include "navtexdemod.h"

plugins/channelrx/demodnavtex/navtexdemodsettings.h

@@ -23,6 +23,8 @@
 
 #include <QByteArray>
 
+#include "dsp/dsptypes.h"
+
 class Serializable;
 
 // Number of columns in the table

plugins/channelrx/demodnfm/nfmdemodgui.h

@@ -23,7 +23,6 @@
 #include "channel/channelgui.h"
 #include "dsp/dsptypes.h"
 #include "dsp/channelmarker.h"
-#include "dsp/movingaverage.h"
 #include "util/messagequeue.h"
 #include "settings/rollupstate.h"
 

plugins/channelrx/demodnfm/nfmdemodsettings.h

@@ -23,6 +23,8 @@
 
 #include <stdint.h>
 
+#include "dsp/dsptypes.h"
+
 class Serializable;
 
 struct NFMDemodSettings

plugins/channelrx/demodnfm/nfmdemodsink.h

@@ -28,7 +28,6 @@
 #include "dsp/fftfilt.h"
 #include "dsp/firfilter.h"
 #include "dsp/afsquelch.h"
-#include "dsp/agc.h"
 #include "dsp/ctcssdetector.h"
 #include "dsp/dcscodes.h"
 #include "util/movingaverage.h"

plugins/channelrx/demodpacket/packetdemodgui.h

@@ -31,7 +31,6 @@
 
 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
-#include "dsp/movingaverage.h"
 #include "util/messagequeue.h"
 #include "settings/rollupstate.h"
 #include "packetdemodsettings.h"

plugins/channelrx/demodpacket/packetdemodsettings.h

@@ -24,6 +24,8 @@
 #include <QByteArray>
 #include <QHash>
 
+#include "dsp/dsptypes.h"
+
 class Serializable;
 
 // Number of columns in the table

plugins/channelrx/demodpacket/packetdemodsink.h

@@ -28,7 +28,6 @@
 #include "dsp/interpolator.h"
 #include "dsp/firfilter.h"
 #include "util/movingaverage.h"
-#include "util/doublebufferfifo.h"
 #include "util/messagequeue.h"
 #include "util/crc.h"
 

plugins/channelrx/demodradiosonde/radiosondedemodsink.h

@@ -29,7 +29,6 @@
 #include "dsp/firfilter.h"
 #include "dsp/gaussian.h"
 #include "util/movingaverage.h"
-#include "util/doublebufferfifo.h"
 #include "util/messagequeue.h"
 #include "util/crc.h"
 

plugins/channelrx/demodrtty/rttydemodgui.h

@@ -21,7 +21,6 @@
 
 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
-#include "dsp/movingaverage.h"
 #include "util/messagequeue.h"
 #include "settings/rollupstate.h"
 #include "rttydemod.h"

plugins/channelrx/demodrtty/rttydemodsettings.h

@@ -23,6 +23,7 @@
 
 #include <QByteArray>
 
+#include "dsp/dsptypes.h"
 #include "util/baudot.h"
 
 class Serializable;

plugins/channelrx/demodrtty/rttydemodsink.cpp

@@ -21,6 +21,7 @@
 #include <complex.h>
 
 #include "dsp/dspengine.h"
+#include "dsp/fftfactory.h"
 #include "dsp/scopevis.h"
 #include "util/db.h"
 

plugins/channelrx/demodrtty/rttydemodsink.h

@@ -25,11 +25,9 @@
 #include "dsp/interpolator.h"
 #include "dsp/firfilter.h"
 #include "dsp/raisedcosine.h"
-#include "dsp/fftfactory.h"
 #include "dsp/fftengine.h"
 #include "util/movingaverage.h"
 #include "util/movingmaximum.h"
-#include "util/doublebufferfifo.h"
 #include "util/messagequeue.h"
 
 #include "rttydemodsettings.h"

plugins/channelrx/demodssb/ssbdemodgui.h

@@ -24,7 +24,6 @@
 
 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
-#include "dsp/movingaverage.h"
 #include "gui/fftnrdialog.h"
 #include "util/messagequeue.h"
 #include "settings/rollupstate.h"

plugins/channelrx/demodvor/vordemodgui.h

@@ -21,7 +21,6 @@
 
 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
-#include "dsp/movingaverage.h"
 #include "util/messagequeue.h"
 #include "settings/rollupstate.h"
 #include "vordemodsettings.h"

plugins/channelrx/demodvor/vordemodsettings.h

@@ -24,6 +24,8 @@
 #include <QByteArray>
 #include <QHash>
 
+#include "dsp/dsptypes.h"
+
 class Serializable;
 
 struct VORDemodSettings

plugins/channelrx/demodwfm/wfmdemodsettings.h

@@ -23,6 +23,8 @@
 
 #include "dsp/dsptypes.h"
 
+#include "dsp/dsptypes.h"
+
 class Serializable;
 
 struct WFMDemodSettings

plugins/channelrx/demodwfm/wfmdemodsink.h

@@ -23,12 +23,10 @@
 #include "dsp/channelsamplesink.h"
 #include "dsp/nco.h"
 #include "dsp/interpolator.h"
-#include "dsp/firfilter.h"
 #include "util/movingaverage.h"
 #include "dsp/fftfilt.h"
 #include "dsp/phasediscri.h"
 #include "audio/audiofifo.h"
-#include "util/message.h"
 
 #include "wfmdemodsettings.h"
 

plugins/channelrx/freqscanner/freqscannersink.cpp

@@ -20,6 +20,7 @@
 #include <complex.h>
 
 #include "dsp/dspengine.h"
+#include "dsp/fftfactory.h"
 #include "util/db.h"
 
 #include "freqscanner.h"

plugins/channelrx/freqscanner/freqscannersink.h

@@ -25,7 +25,6 @@
 #include "dsp/channelsamplesink.h"
 #include "dsp/nco.h"
 #include "dsp/interpolator.h"
-#include "dsp/fftfactory.h"
 #include "dsp/fftengine.h"
 #include "dsp/fftwindow.h"
 #include "util/fixedaverage2d.h"

plugins/channelrx/freqtracker/freqtrackergui.h

@@ -25,7 +25,6 @@
 
 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
-#include "dsp/movingaverage.h"
 #include "util/messagequeue.h"
 #include "settings/rollupstate.h"
 

plugins/channelrx/freqtracker/freqtrackersink.h

@@ -26,12 +26,8 @@
 #include "dsp/ncof.h"
 #include "dsp/interpolator.h"
 #include "util/movingaverage.h"
-#include "dsp/agc.h"
-#include "dsp/firfilter.h"
 #include "dsp/phaselockcomplex.h"
 #include "dsp/freqlockcomplex.h"
-#include "util/message.h"
-#include "util/doublebufferfifo.h"
 
 #include "freqtrackersettings.h"
 

plugins/channelrx/heatmap/heatmapgui.cpp

@@ -36,6 +36,7 @@
 #include "plugin/pluginapi.h"
 #include "util/astronomy.h"
 #include "util/csv.h"
+#include "util/colormap.h"
 #include "util/db.h"
 #include "util/units.h"
 #include "gui/basicchannelsettingsdialog.h"

plugins/channelrx/heatmap/heatmapgui.h

@@ -30,7 +30,6 @@
 #include "channel/channelgui.h"
 #include "dsp/channelmarker.h"
 #include "util/messagequeue.h"
-#include "util/colormap.h"
 #include "settings/rollupstate.h"
 
 #include "heatmapsettings.h"

plugins/channelrx/heatmap/heatmapsink.h

@@ -24,15 +24,10 @@
 #include <QMutex>
 
 #include "dsp/channelsamplesink.h"
-#include "dsp/phasediscri.h"
 #include "dsp/nco.h"
 #include "dsp/interpolator.h"
-#include "dsp/firfilter.h"
-#include "dsp/gaussian.h"
 #include "util/movingaverage.h"
-#include "util/doublebufferfifo.h"
 #include "util/messagequeue.h"
-#include "util/crc.h"
 
 #include "heatmapsettings.h"
 

plugins/channelrx/localsink/localsinkworker.h

@@ -26,7 +26,6 @@
 #include <QMutex>
 #include <QWaitCondition>
 
-#include "dsp/dsptypes.h"
 #include "util/message.h"
 #include "util/messagequeue.h"
 

plugins/channelrx/noisefigure/noisefigure.cpp

@@ -35,6 +35,7 @@
 
 #include "dsp/dspcommands.h"
 #include "device/deviceapi.h"
+#include "settings/serializable.h"
 #include "util/interpolation.h"
 #include "channel/channelwebapiutils.h"
 

plugins/channelrx/noisefigure/noisefigurebaseband.h

@@ -24,7 +24,6 @@
 #include <QRecursiveMutex>
 
 #include "dsp/samplesinkfifo.h"
-#include "dsp/scopevis.h"
 #include "util/message.h"
 #include "util/messagequeue.h"
 

plugins/channelrx/noisefigure/noisefiguresink.cpp

@@ -21,6 +21,7 @@
 
 #include "dsp/dspengine.h"
 
+#include "dsp/fftfactory.h"
 #include "noisefigure.h"
 #include "noisefiguresink.h"
 

plugins/channelrx/noisefigure/noisefiguresink.h

@@ -23,7 +23,6 @@
 #include <QVector>
 
 #include "dsp/channelsamplesink.h"
-#include "dsp/fftfactory.h"
 #include "dsp/fftengine.h"
 #include "util/movingaverage.h"
 #include "util/messagequeue.h"

plugins/channelrx/radioastronomy/radioastronomy.cpp

@@ -37,6 +37,7 @@
 #include "dsp/dspcommands.h"
 #include "device/deviceapi.h"
 #include "channel/channelwebapiutils.h"
+#include "settings/serializable.h"
 #include "util/astronomy.h"
 #include "maincore.h"
 

plugins/channelrx/radioastronomy/radioastronomybaseband.h

@@ -23,7 +23,6 @@
 #include <QRecursiveMutex>
 
 #include "dsp/samplesinkfifo.h"
-#include "dsp/scopevis.h"
 #include "util/message.h"
 #include "util/messagequeue.h"
 

plugins/channelrx/radioastronomy/radioastronomysettings.h

@@ -23,8 +23,6 @@
 #include <QString>
 #include <QDateTime>
 
-#include "dsp/dsptypes.h"
-
 class Serializable;
 
 // Number of columns in the tables

plugins/channelrx/radioclock/radioclocksink.h

@@ -27,12 +27,7 @@
 #include "dsp/phasediscri.h"
 #include "dsp/nco.h"
 #include "dsp/interpolator.h"
-#include "dsp/firfilter.h"
-#include "dsp/fftfactory.h"
-#include "dsp/fftengine.h"
-#include "dsp/fftwindow.h"
 #include "util/movingaverage.h"
-#include "util/doublebufferfifo.h"
 #include "util/messagequeue.h"
 
 #include "radioclocksettings.h"

plugins/channelrx/remotetcpsink/remotetcpsinksink.h

@@ -28,7 +28,6 @@
 #include "dsp/channelsamplesink.h"
 #include "dsp/nco.h"
 #include "dsp/interpolator.h"
-#include "channel/remotedatablock.h"
 #include "util/messagequeue.h"
 
 #include "remotetcpsinksettings.h"

plugins/channeltx/filesource/filesource.cpp

@@ -39,6 +39,7 @@
 #include "maincore.h"
 
 #include "filesourcebaseband.h"
+#include "filesourcereport.h"
 
 MESSAGE_CLASS_DEFINITION(FileSource::MsgConfigureFileSource, Message)
 MESSAGE_CLASS_DEFINITION(FileSource::MsgConfigureFileSourceWork, Message)

plugins/channeltx/filesource/filesource.h

@@ -36,9 +36,7 @@
 #include "dsp/basebandsamplesource.h"
 #include "channel/channelapi.h"
 #include "util/message.h"
-#include "util/movingaverage.h"
 #include "filesourcesettings.h"
-#include "filesourcereport.h"
 
 class QNetworkAccessManager;
 class QNetworkReply;

plugins/channeltx/mod802.15.4/ieee_802_15_4_modsource.h

@@ -27,11 +27,9 @@
 
 #include "dsp/channelsamplesource.h"
 #include "dsp/nco.h"
-#include "dsp/ncof.h"
 #include "dsp/interpolator.h"
 #include "dsp/firfilter.h"
 #include "dsp/raisedcosine.h"
-#include "dsp/fmpreemphasis.h"
 #include "util/lfsr.h"
 #include "util/movingaverage.h"
 #include "util/message.h"

plugins/channeltx/modais/aismodsource.h

@@ -28,9 +28,7 @@
 
 #include "dsp/channelsamplesource.h"
 #include "dsp/nco.h"
-#include "dsp/ncof.h"
 #include "dsp/interpolator.h"
-#include "dsp/firfilter.h"
 #include "dsp/gaussian.h"
 #include "util/movingaverage.h"
 

plugins/channeltx/moddatv/datvmodsource.h

@@ -32,8 +32,6 @@
 #include "dsp/interpolator.h"
 #include "dsp/rootraisedcosine.h"
 #include "util/movingaverage.h"
-#include "dsp/fftfilt.h"
-#include "util/message.h"
 
 #include "datvmodsettings.h"
 

plugins/channeltx/modfreedv/freedvmod.h

@@ -28,7 +28,6 @@
 #include <QNetworkRequest>
 
 #include "dsp/basebandsamplesource.h"
-#include "dsp/basebandsamplesink.h"
 #include "dsp/spectrumvis.h"
 #include "channel/channelapi.h"
 #include "util/message.h"

plugins/channeltx/modfreedv/freedvmodsource.h

@@ -26,7 +26,6 @@
 #include <fstream>
 
 #include "dsp/channelsamplesource.h"
-#include "dsp/nco.h"
 #include "dsp/ncof.h"
 #include "dsp/interpolator.h"
 #include "dsp/fftfilt.h"

plugins/channeltx/modm17/m17modprocessor.h

@@ -26,7 +26,6 @@
 #include <QByteArray>
 
 #include "M17Modulator.h"
-#include "dsp/dsptypes.h"
 #include "util/message.h"
 #include "util/messagequeue.h"
 #include "m17modfifo.h"

plugins/channeltx/modnfm/nfmmodsettings.h

@@ -24,6 +24,7 @@
 #include <QByteArray>
 
 #include "dsp/cwkeyersettings.h"
+#include "dsp/dsptypes.h"
 
 class Serializable;
 

plugins/channeltx/modnfm/nfmmodsource.cpp

@@ -19,6 +19,7 @@
 #include <QDebug>
 
 #include "dsp/datafifo.h"
+#include "dsp/misc.h"
 #include "util/messagequeue.h"
 #include "maincore.h"
 

plugins/channeltx/modpacket/packetmodsource.h

@@ -28,7 +28,6 @@
 
 #include "dsp/channelsamplesource.h"
 #include "dsp/nco.h"
-#include "dsp/ncof.h"
 #include "dsp/interpolator.h"
 #include "dsp/firfilter.h"
 #include "dsp/raisedcosine.h"

plugins/channeltx/modpsk31/psk31modsource.h

@@ -25,7 +25,6 @@
 
 #include "dsp/channelsamplesource.h"
 #include "dsp/nco.h"
-#include "dsp/ncof.h"
 #include "dsp/interpolator.h"
 #include "dsp/firfilter.h"
 #include "dsp/raisedcosine.h"

plugins/channeltx/modrtty/rttymodsource.h

@@ -25,7 +25,6 @@
 
 #include "dsp/channelsamplesource.h"
 #include "dsp/nco.h"
-#include "dsp/ncof.h"
 #include "dsp/interpolator.h"
 #include "dsp/firfilter.h"
 #include "dsp/raisedcosine.h"

plugins/channeltx/modssb/ssbmod.h

@@ -30,7 +30,6 @@
 #include "dsp/basebandsamplesource.h"
 #include "dsp/spectrumvis.h"
 #include "channel/channelapi.h"
-#include "dsp/basebandsamplesink.h"
 #include "util/message.h"
 
 #include "ssbmodsettings.h"

plugins/channeltx/modssb/ssbmodsettings.h

@@ -26,6 +26,7 @@
 #include <stdint.h>
 
 #include "dsp/cwkeyersettings.h"
+#include "dsp/dsptypes.h"
 
 class Serializable;
 

plugins/channeltx/modwfm/wfmmodsettings.h

@@ -24,6 +24,7 @@
 #include <QByteArray>
 
 #include "dsp/cwkeyersettings.h"
+#include "dsp/dsptypes.h"
 
 class Serializable;
 

plugins/channeltx/udpsource/udpsource.h

@@ -26,7 +26,6 @@
 #include "dsp/basebandsamplesource.h"
 #include "dsp/spectrumvis.h"
 #include "channel/channelapi.h"
-#include "dsp/basebandsamplesink.h"
 #include "util/message.h"
 
 #include "udpsourcesettings.h"

plugins/feature/ais/aissettings.h

@@ -24,8 +24,6 @@
 #include <QByteArray>
 #include <QString>
 
-#include "util/message.h"
-
 class Serializable;
 
 // Number of columns in the tables

plugins/feature/antennatools/antennatoolssettings.h

@@ -24,8 +24,6 @@
 #include <QByteArray>
 #include <QString>
 
-#include "util/message.h"
-
 class Serializable;
 
 struct AntennaToolsSettings

plugins/feature/aprs/aprssettings.h

@@ -24,8 +24,6 @@
 #include <QByteArray>
 #include <QString>
 
-#include "util/message.h"
-
 class Serializable;
 
 // Number of columns in the tables

plugins/feature/demodanalyzer/demodanalyzersettings.h

@@ -24,8 +24,6 @@
 #include <QByteArray>
 #include <QString>
 
-#include "util/message.h"
-
 class Serializable;
 class ChannelAPI;
 

plugins/feature/gs232controller/gs232controller.h

@@ -28,7 +28,6 @@
 #include "feature/feature.h"
 #include "util/message.h"
 #include "availablechannelorfeaturehandler.h"
-#include "maincore.h"
 
 #include "gs232controllersettings.h"
 

plugins/feature/gs232controller/gs232controllergui.cpp

@@ -33,6 +33,7 @@
 #include "gs232controllergui.h"
 #include "gs232controllerreport.h"
 #include "dfmprotocol.h"
+#include "maincore.h"
 
 GS232ControllerGUI* GS232ControllerGUI::create(PluginAPI* pluginAPI, FeatureUISet *featureUISet, Feature *feature)
 {

plugins/feature/gs232controller/gs232controllersettings.h

@@ -24,7 +24,6 @@
 #include <QByteArray>
 #include <QString>
 
-#include "util/message.h"
 #include "inputcontrollersettings.h"
 
 class Serializable;