summaryrefslogtreecommitdiff
path: root/plugins/feature
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/feature')
-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
47 files changed, 12 insertions, 122 deletions
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"