diff --git a/cmake/pch_config.cmake b/cmake/pch_config.cmake
index d9c86da0a..855bf3304 100644
--- a/cmake/pch_config.cmake
+++ b/cmake/pch_config.cmake
@@ -6,56 +6,39 @@
 # For example "core" uses the same PCH as "misc" but with additional headers included.
 
 set(SWIFT_MISC_PCH
-    <QAudioDevice>
     [["misc/collection.h"]]
-    [["misc/containerbase.h"]]
     [["misc/dbus.h"]]
     [["misc/dictionary.h"]]
-    [["misc/iterator.h"]]
     [["misc/json.h"]]
     [["misc/metaclass.h"]]
-    [["misc/range.h"]]
     [["misc/sequence.h"]]
     [["misc/valueobject.h"]]
     [["misc/verify.h"]]
-    [["misc/worker.h"]]
 
     <QByteArray>
-    <QChar>
-    <QCoreApplication>
     <QDBusArgument>
     <QDBusMetaType>
-    <QDate>
     <QDateTime>
-    <QDebug>
     <QDir>
     <QFile>
-    <QFlag>
     <QFlags>
-    <QFutureWatcher>
-    <QGlobalStatic>
     <QHash>
-    <QIODevice>
     <QIcon>
     <QJsonArray>
     <QJsonObject>
     <QJsonValue>
     <QJsonValueRef>
-    <QLatin1Char>
     <QLatin1String>
     <QList>
     <QLoggingCategory>
     <QMap>
     <QMessageLogContext>
-    <QMetaMethod>
     <QMetaObject>
     <QMetaType>
     <QMutex>
-    <QMutexLocker>
     <QObject>
     <QPair>
     <QPixmap>
-    <QReadLocker>
     <QReadWriteLock>
     <QScopedPointer>
     <QSet>
@@ -68,37 +51,23 @@ set(SWIFT_MISC_PCH
     <QTime>
     <QTimer>
     <QVariant>
-    <QVariantList>
     <QVector>
-    <QWeakPointer>
-    <QWriteLocker>
     <QtGlobal>
 
     <algorithm>
-    <array>
-    <cctype>
     <cmath>
-    <cstddef>
-    <cstdio>
-    <cstdlib>
-    <cstring>
     <exception>
     <functional>
     <future>
     <initializer_list>
-    <iostream>
     <iterator>
     <map>
     <memory>
-    <numeric>
-    <random>
     <set>
-    <stdexcept>
     <string>
     <tuple>
     <type_traits>
     <typeindex>
-    <unordered_map>
     <utility>
     <vector>
 )
diff --git a/src/core/actionbind.h b/src/core/actionbind.h
index 2c29dadb8..2e8ff3ed3 100644
--- a/src/core/actionbind.h
+++ b/src/core/actionbind.h
@@ -6,8 +6,6 @@
 #ifndef SWIFT_CORE_ACTIONBIND_H
 #define SWIFT_CORE_ACTIONBIND_H
 
-#include <QPixmap>
-
 #include "core/application.h"
 #include "core/swiftcoreexport.h"
 
diff --git a/src/core/aircraftmatcher.cpp b/src/core/aircraftmatcher.cpp
index 1ceae9f54..72e98c21e 100644
--- a/src/core/aircraftmatcher.cpp
+++ b/src/core/aircraftmatcher.cpp
@@ -12,11 +12,11 @@
 
 #include "core/application.h"
 #include "core/webdataservices.h"
+#include "core/webdataservicesms.h"
 #include "misc/aviation/aircrafticaocode.h"
 #include "misc/aviation/airlineicaocode.h"
 #include "misc/aviation/callsign.h"
 #include "misc/aviation/livery.h"
-#include "misc/directoryutils.h"
 #include "misc/fileutils.h"
 #include "misc/logcategories.h"
 #include "misc/logmessage.h"
diff --git a/src/core/aircraftmatcher.h b/src/core/aircraftmatcher.h
index 2fcb3ab3d..a968d02ae 100644
--- a/src/core/aircraftmatcher.h
+++ b/src/core/aircraftmatcher.h
@@ -6,14 +6,10 @@
 #ifndef SWIFT_CORE_AIRCRAFTMATCHER_H
 #define SWIFT_CORE_AIRCRAFTMATCHER_H
 
-#include <QFlags>
 #include <QObject>
-#include <QPair>
-#include <QSet>
 #include <QString>
 
 #include "core/swiftcoreexport.h"
-#include "core/webdataservicesms.h"
 #include "misc/simulation/aircraftmatchersetup.h"
 #include "misc/simulation/aircraftmodellist.h"
 #include "misc/simulation/aircraftmodelsetprovider.h"
@@ -21,9 +17,6 @@
 #include "misc/simulation/matchinglog.h"
 #include "misc/simulation/matchingscriptmisc.h"
 #include "misc/simulation/matchingstatistics.h"
-#include "misc/statusmessage.h"
-#include "misc/valueobject.h"
-#include "misc/variant.h"
 
 namespace swift::misc
 {
diff --git a/src/core/airspaceanalyzer.h b/src/core/airspaceanalyzer.h
index 8675d5300..35573c29c 100644
--- a/src/core/airspaceanalyzer.h
+++ b/src/core/airspaceanalyzer.h
@@ -10,9 +10,7 @@
 #include <chrono>
 
 #include <QHash>
-#include <QObject>
 #include <QReadWriteLock>
-#include <QTimer>
 #include <QtGlobal>
 
 #include "core/fsd/fsdclient.h"
diff --git a/src/core/airspacemonitor.cpp b/src/core/airspacemonitor.cpp
index 93051e58a..03ba64964 100644
--- a/src/core/airspacemonitor.cpp
+++ b/src/core/airspacemonitor.cpp
@@ -3,14 +3,9 @@
 
 #include "core/airspacemonitor.h"
 
-#include <QCoreApplication>
 #include <QDateTime>
-#include <QEventLoop>
-#include <QReadLocker>
-#include <QThread>
 #include <QTime>
 #include <QVariant>
-#include <QWriteLocker>
 #include <Qt>
 
 #include "config/buildconfig.h"
diff --git a/src/core/airspacemonitor.h b/src/core/airspacemonitor.h
index dda57a1e1..32ededc4d 100644
--- a/src/core/airspacemonitor.h
+++ b/src/core/airspacemonitor.h
@@ -6,15 +6,11 @@
 #ifndef SWIFT_CORE_AIRSPACE_MONITOR_H
 #define SWIFT_CORE_AIRSPACE_MONITOR_H
 
-#include <functional>
-
 #include <QHash>
 #include <QJsonObject>
-#include <QList>
 #include <QMetaObject>
 #include <QObject>
 #include <QQueue>
-#include <QReadWriteLock>
 #include <QString>
 #include <QTimer>
 #include <QtGlobal>
diff --git a/src/core/application.h b/src/core/application.h
index 076f1c856..5a5edce25 100644
--- a/src/core/application.h
+++ b/src/core/application.h
@@ -29,9 +29,7 @@
 #include "core/swiftcoreexport.h"
 #include "core/webreaderflags.h"
 #include "misc/applicationinfolist.h"
-#include "misc/crashinfo.h"
 #include "misc/db/updateinfo.h"
-#include "misc/digestsignal.h"
 #include "misc/identifiable.h"
 #include "misc/network/networkutils.h"
 #include "misc/network/url.h"
diff --git a/src/core/application/applicationsettings.h b/src/core/application/applicationsettings.h
index 8cb9f172e..0351cc7de 100644
--- a/src/core/application/applicationsettings.h
+++ b/src/core/application/applicationsettings.h
@@ -8,7 +8,6 @@
 
 #include <QStringList>
 
-#include "config/buildconfig.h"
 #include "misc/input/actionhotkeylist.h"
 #include "misc/settingscache.h"
 #include "misc/simulation/simulatorplugininfo.h"
diff --git a/src/core/application/updatesettings.h b/src/core/application/updatesettings.h
index 75249b590..09c94674d 100644
--- a/src/core/application/updatesettings.h
+++ b/src/core/application/updatesettings.h
@@ -8,7 +8,6 @@
 
 #include <QStringList>
 
-#include "config/buildconfig.h"
 #include "core/application.h"
 #include "misc/platform.h"
 #include "misc/settingscache.h"
diff --git a/src/core/context/context.h b/src/core/context/context.h
index 00ad60274..777e4da8d 100644
--- a/src/core/context/context.h
+++ b/src/core/context/context.h
@@ -6,10 +6,8 @@
 #ifndef SWIFT_CORE_CONTEXT_CONTEXT_H
 #define SWIFT_CORE_CONTEXT_CONTEXT_H
 
-#include <QDateTime>
 #include <QObject>
 #include <QString>
-#include <QStringBuilder>
 #include <QtGlobal>
 
 #include "core/corefacade.h"
diff --git a/src/core/context/contextapplication.h b/src/core/context/contextapplication.h
index 8bd44d805..93bfef2ff 100644
--- a/src/core/context/contextapplication.h
+++ b/src/core/context/contextapplication.h
@@ -7,11 +7,8 @@
 #define SWIFT_CORE_CONTEXT_CONTEXTAPPLICATION_H
 
 #include <QDBusArgument>
-#include <QHash>
 #include <QList>
 #include <QMetaType>
-#include <QObject>
-#include <QPair>
 #include <QString>
 #include <QStringList>
 #include <QtGlobal>
@@ -22,7 +19,6 @@
 #include "misc/dictionary.h"
 #include "misc/identifier.h"
 #include "misc/identifierlist.h"
-#include "misc/mixin/mixincompare.h"
 #include "misc/statusmessage.h"
 #include "misc/valuecache.h"
 
diff --git a/src/core/context/contextaudio.h b/src/core/context/contextaudio.h
index e2b14c245..4fe65fd41 100644
--- a/src/core/context/contextaudio.h
+++ b/src/core/context/contextaudio.h
@@ -7,7 +7,6 @@
 #define SWIFT_CORE_CONTEXT_CONTEXTAUDIO_H
 
 #include <QCommandLineOption>
-#include <QObject>
 #include <QString>
 
 #include "core/actionbind.h"
diff --git a/src/core/context/contextaudioimpl.h b/src/core/context/contextaudioimpl.h
index 05944de23..4bd778b2a 100644
--- a/src/core/context/contextaudioimpl.h
+++ b/src/core/context/contextaudioimpl.h
@@ -6,13 +6,7 @@
 #ifndef SWIFT_CORE_CONTEXT_CONTEXTAUDIO_IMPL_H
 #define SWIFT_CORE_CONTEXT_CONTEXTAUDIO_IMPL_H
 
-#include <memory>
-
-#include <QHash>
-#include <QList>
 #include <QMap>
-#include <QObject>
-#include <QSharedPointer>
 #include <QString>
 
 #include "core/context/contextaudio.h"
diff --git a/src/core/context/contextaudioproxy.h b/src/core/context/contextaudioproxy.h
index 0e47c7aed..e1881d464 100644
--- a/src/core/context/contextaudioproxy.h
+++ b/src/core/context/contextaudioproxy.h
@@ -6,7 +6,6 @@
 #ifndef SWIFT_CORE_CONTEXT_CONTEXTVOICE_PROXY_H
 #define SWIFT_CORE_CONTEXT_CONTEXTVOICE_PROXY_H
 
-#include <QObject>
 #include <QString>
 
 #include "core/context/contextaudio.h"
@@ -16,7 +15,6 @@
 #include "misc/audio/notificationsounds.h"
 #include "misc/aviation/callsignset.h"
 #include "misc/aviation/comsystem.h"
-#include "misc/aviation/selcal.h"
 #include "misc/identifier.h"
 #include "misc/network/userlist.h"
 
diff --git a/src/core/context/contextnetworkproxy.h b/src/core/context/contextnetworkproxy.h
index dd39bad89..d6dfeacb0 100644
--- a/src/core/context/contextnetworkproxy.h
+++ b/src/core/context/contextnetworkproxy.h
@@ -6,8 +6,6 @@
 #ifndef SWIFT_CORE_CONTEXT_CONTEXTNETWORK_PROXY_H
 #define SWIFT_CORE_CONTEXT_CONTEXTNETWORK_PROXY_H
 
-#include <stdbool.h>
-
 #include <QObject>
 #include <QString>
 
diff --git a/src/core/context/contextownaircraftempty.h b/src/core/context/contextownaircraftempty.h
index 60d3cabb3..07ed6d762 100644
--- a/src/core/context/contextownaircraftempty.h
+++ b/src/core/context/contextownaircraftempty.h
@@ -8,7 +8,6 @@
 
 #include "core/context/contextownaircraft.h"
 #include "core/swiftcoreexport.h"
-#include "misc/logmessage.h"
 
 // clazy:excludeall=const-signal-or-slot
 
diff --git a/src/core/context/contextownaircraftimpl.h b/src/core/context/contextownaircraftimpl.h
index fecdea14b..43141c102 100644
--- a/src/core/context/contextownaircraftimpl.h
+++ b/src/core/context/contextownaircraftimpl.h
@@ -17,7 +17,6 @@
 #include "core/context/contextownaircraft.h"
 #include "core/corefacadeconfig.h"
 #include "core/swiftcoreexport.h"
-#include "core/vatsim/vatsimsettings.h"
 #include "misc/aviation/aircraftparts.h"
 #include "misc/aviation/aircraftsituationlist.h"
 #include "misc/aviation/airlineicaocode.h"
diff --git a/src/core/context/contextownaircraftproxy.h b/src/core/context/contextownaircraftproxy.h
index a749d5339..d778081d6 100644
--- a/src/core/context/contextownaircraftproxy.h
+++ b/src/core/context/contextownaircraftproxy.h
@@ -6,7 +6,6 @@
 #ifndef SWIFT_CORE_CONTEXT_OWNAIRCRAFT_PROXY_H
 #define SWIFT_CORE_CONTEXT_OWNAIRCRAFT_PROXY_H
 
-#include <QObject>
 #include <QString>
 
 #include "core/context/contextownaircraft.h"
diff --git a/src/core/context/contextsimulator.h b/src/core/context/contextsimulator.h
index 9e3e2153e..8a7de347e 100644
--- a/src/core/context/contextsimulator.h
+++ b/src/core/context/contextsimulator.h
@@ -9,7 +9,6 @@
 #include <QObject>
 #include <QString>
 
-#include "config/buildconfig.h"
 #include "core/context/context.h"
 #include "core/corefacade.h"
 #include "core/corefacadeconfig.h"
@@ -17,7 +16,6 @@
 #include "core/swiftcoreexport.h"
 #include "misc/aviation/airportlist.h"
 #include "misc/geo/elevationplane.h"
-#include "misc/identifier.h"
 #include "misc/pixmap.h"
 #include "misc/pq/length.h"
 #include "misc/pq/time.h"
diff --git a/src/core/context/contextsimulatorimpl.cpp b/src/core/context/contextsimulatorimpl.cpp
index 4ed591ac1..0316e1e0b 100644
--- a/src/core/context/contextsimulatorimpl.cpp
+++ b/src/core/context/contextsimulatorimpl.cpp
@@ -5,7 +5,6 @@
 
 #include <QMetaObject>
 #include <QPointer>
-#include <QStringBuilder>
 #include <QStringList>
 #include <QThread>
 #include <Qt>
diff --git a/src/core/context/contextsimulatorimpl.h b/src/core/context/contextsimulatorimpl.h
index 2d2de0dbf..3cec99a3e 100644
--- a/src/core/context/contextsimulatorimpl.h
+++ b/src/core/context/contextsimulatorimpl.h
@@ -6,7 +6,6 @@
 #ifndef SWIFT_CORE_CONTEXT_CONTEXTSIMULATOR_IMPL_H
 #define SWIFT_CORE_CONTEXT_CONTEXTSIMULATOR_IMPL_H
 
-#include <QObject>
 #include <QPair>
 #include <QPointer>
 #include <QString>
diff --git a/src/core/context/contextsimulatorproxy.h b/src/core/context/contextsimulatorproxy.h
index 59991290f..230f24437 100644
--- a/src/core/context/contextsimulatorproxy.h
+++ b/src/core/context/contextsimulatorproxy.h
@@ -6,7 +6,6 @@
 #ifndef SWIFT_CORE_CONTEXTSIMULATOR_PROXY_H
 #define SWIFT_CORE_CONTEXTSIMULATOR_PROXY_H
 
-#include <QObject>
 #include <QString>
 
 #include "core/context/contextsimulator.h"
diff --git a/src/core/corefacade.h b/src/core/corefacade.h
index 918d758d4..c9df06143 100644
--- a/src/core/corefacade.h
+++ b/src/core/corefacade.h
@@ -14,7 +14,6 @@
 #include "core/corefacadeconfig.h"
 #include "core/data/launchersetup.h"
 #include "core/swiftcoreexport.h"
-#include "core/vatsim/vatsimsettings.h"
 #include "misc/identifier.h"
 #include "misc/settingscache.h"
 
diff --git a/src/core/data/authenticateduser.h b/src/core/data/authenticateduser.h
index e18fd0029..c491c1851 100644
--- a/src/core/data/authenticateduser.h
+++ b/src/core/data/authenticateduser.h
@@ -6,7 +6,6 @@
 #ifndef SWIFT_CORE_DATA_AUTHENTICATEDUSER_H
 #define SWIFT_CORE_DATA_AUTHENTICATEDUSER_H
 
-#include "core/swiftcoreexport.h"
 #include "misc/datacache.h"
 #include "misc/network/authenticateduser.h"
 
diff --git a/src/core/data/dbcaches.h b/src/core/data/dbcaches.h
index b56f0d6d8..a787c8e17 100644
--- a/src/core/data/dbcaches.h
+++ b/src/core/data/dbcaches.h
@@ -6,9 +6,6 @@
 #ifndef SWIFT_CORE_DATA_DBCACHES
 #define SWIFT_CORE_DATA_DBCACHES
 
-#include <QDateTime>
-#include <QObject>
-
 #include "misc/aviation/aircraftcategorylist.h"
 #include "misc/aviation/aircrafticaocodelist.h"
 #include "misc/aviation/airlineicaocodelist.h"
diff --git a/src/core/data/networksetup.h b/src/core/data/networksetup.h
index 332d59b41..611f06584 100644
--- a/src/core/data/networksetup.h
+++ b/src/core/data/networksetup.h
@@ -6,14 +6,12 @@
 #ifndef SWIFT_CORE_DATA_NETWORKSETUP_H
 #define SWIFT_CORE_DATA_NETWORKSETUP_H
 
-#include <QMetaType>
 #include <QObject>
 #include <QString>
 
 #include "core/data/vatsimsetup.h"
 #include "core/swiftcoreexport.h"
 #include "core/vatsim/vatsimsettings.h"
-#include "misc/metaclass.h"
 #include "misc/network/data/lastserver.h"
 #include "misc/network/serverlist.h"
 #include "misc/network/settings/serversettings.h"
diff --git a/src/core/db/databaseauthentication.h b/src/core/db/databaseauthentication.h
index 909cc51ee..b56ac9ec3 100644
--- a/src/core/db/databaseauthentication.h
+++ b/src/core/db/databaseauthentication.h
@@ -12,7 +12,6 @@
 #include "core/data/authenticateduser.h"
 #include "core/swiftcoreexport.h"
 #include "misc/datacache.h"
-#include "misc/logcategories.h"
 #include "misc/statusmessagelist.h"
 
 class QNetworkReply;
diff --git a/src/core/db/databasereader.h b/src/core/db/databasereader.h
index 20ad5211a..2dd2dac5e 100644
--- a/src/core/db/databasereader.h
+++ b/src/core/db/databasereader.h
@@ -21,7 +21,6 @@
 #include "misc/db/dbinfolist.h"
 #include "misc/network/url.h"
 #include "misc/pq/time.h"
-#include "misc/sequence.h"
 #include "misc/statusmessage.h"
 #include "misc/valueobject.h"
 
diff --git a/src/core/db/databasereaderconfig.h b/src/core/db/databasereaderconfig.h
index 8e89d85a7..1b847afd0 100644
--- a/src/core/db/databasereaderconfig.h
+++ b/src/core/db/databasereaderconfig.h
@@ -9,9 +9,7 @@
 #include <QDateTime>
 #include <QJsonArray>
 #include <QObject>
-#include <QReadWriteLock>
 #include <QString>
-#include <QTimer>
 #include <QtGlobal>
 
 #include "core/swiftcoreexport.h"
diff --git a/src/core/db/icaodatareader.h b/src/core/db/icaodatareader.h
index 5fdab9280..6134f4cf9 100644
--- a/src/core/db/icaodatareader.h
+++ b/src/core/db/icaodatareader.h
@@ -9,7 +9,6 @@
 #include <atomic>
 
 #include <QObject>
-#include <QReadWriteLock>
 #include <QString>
 
 #include "core/data/dbcaches.h"
diff --git a/src/core/db/modeldatareader.h b/src/core/db/modeldatareader.h
index 491125ab9..dba3db8c3 100644
--- a/src/core/db/modeldatareader.h
+++ b/src/core/db/modeldatareader.h
@@ -9,7 +9,6 @@
 #include <QDateTime>
 #include <QList>
 #include <QObject>
-#include <QReadWriteLock>
 #include <QSet>
 #include <QString>
 #include <QStringList>
diff --git a/src/core/fsd/fsdclient.cpp b/src/core/fsd/fsdclient.cpp
index 546f0b096..7f862d82f 100644
--- a/src/core/fsd/fsdclient.cpp
+++ b/src/core/fsd/fsdclient.cpp
@@ -4,8 +4,8 @@
 #include "core/fsd/fsdclient.h"
 
 #include <QHostAddress>
+#include <QMetaEnum>
 #include <QNetworkReply>
-#include <QStringBuilder>
 #include <QStringView>
 
 #include "config/buildconfig.h"
diff --git a/src/core/inputmanager.cpp b/src/core/inputmanager.cpp
index a54c2971a..d647370e2 100644
--- a/src/core/inputmanager.cpp
+++ b/src/core/inputmanager.cpp
@@ -7,9 +7,7 @@
 
 #include <QtGlobal>
 
-#include "misc/dictionary.h"
 #include "misc/input/actionhotkey.h"
-#include "misc/mixin/mixincompare.h"
 #include "misc/range.h"
 #include "misc/sequence.h"
 
diff --git a/src/core/inputmanager.h b/src/core/inputmanager.h
index 5a7a9751b..c77149734 100644
--- a/src/core/inputmanager.h
+++ b/src/core/inputmanager.h
@@ -6,7 +6,6 @@
 #ifndef SWIFT_CORE_INPUTMANAGER_H
 #define SWIFT_CORE_INPUTMANAGER_H
 
-#include <algorithm>
 #include <functional>
 #include <memory>
 
diff --git a/src/core/pluginmanagersimulator.cpp b/src/core/pluginmanagersimulator.cpp
index 7cdc3addf..fedb61fd9 100644
--- a/src/core/pluginmanagersimulator.cpp
+++ b/src/core/pluginmanagersimulator.cpp
@@ -5,12 +5,10 @@
 
 #include <QJsonObject>
 #include <QJsonValue>
-#include <QStringBuilder>
 #include <QtGlobal>
 
 #include "core/application.h"
 #include "core/simulator.h"
-#include "misc/directoryutils.h"
 #include "misc/logmessage.h"
 #include "misc/swiftdirectories.h"
 
diff --git a/src/core/pluginmanagersimulator.h b/src/core/pluginmanagersimulator.h
index 93220a940..c27c03e2b 100644
--- a/src/core/pluginmanagersimulator.h
+++ b/src/core/pluginmanagersimulator.h
@@ -6,7 +6,6 @@
 #ifndef SWIFT_CORE_PLUGIN_MANAGER_SIMULATOR_H
 #define SWIFT_CORE_PLUGIN_MANAGER_SIMULATOR_H
 
-#include <QHash>
 #include <QMap>
 #include <QObject>
 #include <QString>
@@ -16,7 +15,6 @@
 #include "misc/sequence.h"
 #include "misc/simulation/simulatorplugininfo.h"
 #include "misc/simulation/simulatorplugininfolist.h"
-#include "misc/variant.h"
 
 namespace swift::core
 {
diff --git a/src/core/setupreader.h b/src/core/setupreader.h
index c5983ed69..976d5b9c5 100644
--- a/src/core/setupreader.h
+++ b/src/core/setupreader.h
@@ -8,11 +8,6 @@
 
 #include <atomic>
 
-#include <QCommandLineOption>
-#include <QCoreApplication>
-#include <QJsonObject>
-#include <QList>
-#include <QNetworkReply>
 #include <QObject>
 #include <QString>
 
diff --git a/src/core/vatsim/vatsimdatafilereader.h b/src/core/vatsim/vatsimdatafilereader.h
index 4a01bdc6f..a5c6f1678 100644
--- a/src/core/vatsim/vatsimdatafilereader.h
+++ b/src/core/vatsim/vatsimdatafilereader.h
@@ -21,7 +21,6 @@
 #include "misc/aviation/flightplan.h"
 #include "misc/datacache.h"
 #include "misc/network/entityflags.h"
-#include "misc/network/serverlist.h"
 #include "misc/network/userlist.h"
 #include "misc/network/voicecapabilities.h"
 #include "misc/simulation/simulatedaircraftlist.h"
diff --git a/src/core/vatsim/vatsimserverfilereader.h b/src/core/vatsim/vatsimserverfilereader.h
index 183573286..fb8fa5ede 100644
--- a/src/core/vatsim/vatsimserverfilereader.h
+++ b/src/core/vatsim/vatsimserverfilereader.h
@@ -6,24 +6,17 @@
 #ifndef SWIFT_CORE_VATSIM_VATSIMSERVERFILEREADER_H
 #define SWIFT_CORE_VATSIM_VATSIMSERVERFILEREADER_H
 
-#include <QMap>
 #include <QObject>
 #include <QString>
-#include <QStringList>
 
 #include "core/data/vatsimsetup.h"
 #include "core/swiftcoreexport.h"
 #include "core/threadedreader.h"
 #include "misc/aviation/aircrafticaocode.h"
-#include "misc/aviation/airlineicaocode.h"
-#include "misc/aviation/atcstationlist.h"
-#include "misc/aviation/callsignset.h"
 #include "misc/aviation/flightplan.h"
 #include "misc/datacache.h"
 #include "misc/network/entityflags.h"
 #include "misc/network/serverlist.h"
-#include "misc/network/userlist.h"
-#include "misc/network/voicecapabilities.h"
 #include "misc/simulation/simulatedaircraftlist.h"
 
 class QNetworkReply;
diff --git a/src/core/vatsim/vatsimsettings.h b/src/core/vatsim/vatsimsettings.h
index 522b62ce8..28eb4f10f 100644
--- a/src/core/vatsim/vatsimsettings.h
+++ b/src/core/vatsim/vatsimsettings.h
@@ -8,7 +8,6 @@
 
 #include "core/swiftcoreexport.h"
 #include "misc/directoryutils.h"
-#include "misc/fileutils.h"
 #include "misc/network/serverlist.h"
 #include "misc/pq/time.h"
 #include "misc/settingscache.h"
diff --git a/src/gui/components/infobarstatuscomponent.h b/src/gui/components/infobarstatuscomponent.h
index f88ce5145..574e584cf 100644
--- a/src/gui/components/infobarstatuscomponent.h
+++ b/src/gui/components/infobarstatuscomponent.h
@@ -14,6 +14,7 @@
 #include "core/actionbind.h"
 #include "gui/swiftguiexport.h"
 #include "misc/audio/audiodeviceinfo.h"
+#include "misc/digestsignal.h"
 #include "misc/input/actionhotkeydefs.h"
 #include "misc/network/connectionstatus.h"
 
diff --git a/src/misc/atomicfile.h b/src/misc/atomicfile.h
index 8cd51fed4..4f2dd062f 100644
--- a/src/misc/atomicfile.h
+++ b/src/misc/atomicfile.h
@@ -6,11 +6,8 @@
 #ifndef SWIFT_MISC_ATOMICFILE_H
 #define SWIFT_MISC_ATOMICFILE_H
 
-#include <exception>
-
 #include <QFile>
 #include <QFileDevice>
-#include <QIODevice>
 #include <QString>
 
 #include "misc/swiftmiscexport.h"
diff --git a/src/misc/audio/audioutils.cpp b/src/misc/audio/audioutils.cpp
index 3bf1a0eef..2310addf7 100644
--- a/src/misc/audio/audioutils.cpp
+++ b/src/misc/audio/audioutils.cpp
@@ -3,6 +3,7 @@
 
 #include "misc/audio/audioutils.h"
 
+#include <QAudioDevice>
 #include <QMediaDevices>
 #include <QProcess>
 
diff --git a/src/misc/containerbase.h b/src/misc/containerbase.h
index 5590aeac7..6aaaf2fbc 100644
--- a/src/misc/containerbase.h
+++ b/src/misc/containerbase.h
@@ -11,6 +11,7 @@
 #include <QStringList>
 
 #include "misc/json.h"
+#include "misc/jsonexception.h"
 #include "misc/mixin/mixindbus.h"
 #include "misc/mixin/mixinjson.h"
 #include "misc/mixin/mixinmetatype.h"
diff --git a/src/misc/datacache.h b/src/misc/datacache.h
index 6e84b634e..5c6c13b02 100644
--- a/src/misc/datacache.h
+++ b/src/misc/datacache.h
@@ -25,7 +25,6 @@
 #include <QString>
 #include <QStringList>
 #include <QUuid>
-#include <QtDebug>
 #include <QtGlobal>
 
 #include "misc/identifier.h"
diff --git a/src/misc/db/artifactlist.h b/src/misc/db/artifactlist.h
index ea2e7616a..cd57c4d0c 100644
--- a/src/misc/db/artifactlist.h
+++ b/src/misc/db/artifactlist.h
@@ -6,7 +6,6 @@
 #ifndef SWIFT_MISC_DB_ARTIFACTLIST_H
 #define SWIFT_MISC_DB_ARTIFACTLIST_H
 
-#include <QSet>
 #include <QString>
 
 #include "misc/collection.h"
diff --git a/src/misc/dbus.h b/src/misc/dbus.h
index 4151d8325..90708077b 100644
--- a/src/misc/dbus.h
+++ b/src/misc/dbus.h
@@ -8,13 +8,10 @@
 
 #include <string>
 #include <type_traits>
-#include <utility>
 
 #include <QDBusArgument>
 #include <QFlags>
 
-#include "misc/swiftmiscexport.h"
-
 /*!
  * Non member non-friend streaming for std::string
  */
diff --git a/src/misc/dictionary.h b/src/misc/dictionary.h
index 187fd6bf1..3e2f5ce47 100644
--- a/src/misc/dictionary.h
+++ b/src/misc/dictionary.h
@@ -17,24 +17,19 @@
 #include <QJsonObject>
 #include <QJsonValue>
 #include <QJsonValueRef>
-#include <QList>
 #include <QMap>
 #include <QString>
-#include <QtDebug>
 #include <QtGlobal>
 
 #include "misc/containerbase.h"
-#include "misc/inheritancetraits.h"
 #include "misc/iterator.h"
-#include "misc/metaclass.h"
+#include "misc/jsonexception.h"
 #include "misc/mixin/mixindatastream.h"
 #include "misc/mixin/mixindbus.h"
-#include "misc/mixin/mixinhash.h"
 #include "misc/mixin/mixinjson.h"
 #include "misc/mixin/mixinstring.h"
 #include "misc/predicates.h"
 #include "misc/range.h"
-#include "misc/swiftmiscexport.h"
 #include "misc/typetraits.h"
 
 namespace swift::misc
diff --git a/src/misc/directoryutils.h b/src/misc/directoryutils.h
index 6a881d40e..a1975a47c 100644
--- a/src/misc/directoryutils.h
+++ b/src/misc/directoryutils.h
@@ -6,10 +6,8 @@
 #ifndef SWIFT_MISC_DIRECTORYUTILS_H
 #define SWIFT_MISC_DIRECTORYUTILS_H
 
-#include <QDateTime>
 #include <QDir>
 #include <QFileInfoList>
-#include <QMap>
 #include <QSet>
 #include <QString>
 
diff --git a/src/misc/eventloop.h b/src/misc/eventloop.h
index 5bf0f9f5e..c394e41b3 100644
--- a/src/misc/eventloop.h
+++ b/src/misc/eventloop.h
@@ -11,8 +11,6 @@
 #include <QPointer>
 #include <QTimer>
 
-#include "misc/swiftmiscexport.h"
-
 namespace swift::misc
 {
     /*!
diff --git a/src/misc/fileutils.h b/src/misc/fileutils.h
index 1671de01b..5950511a8 100644
--- a/src/misc/fileutils.h
+++ b/src/misc/fileutils.h
@@ -14,7 +14,6 @@
 #include <QLockFile>
 #include <QString>
 #include <QStringList>
-#include <QUrl>
 #include <Qt>
 
 #include "misc/swiftmiscexport.h"
diff --git a/src/misc/genericdbusinterface.h b/src/misc/genericdbusinterface.h
index e85103cb5..0287cc790 100644
--- a/src/misc/genericdbusinterface.h
+++ b/src/misc/genericdbusinterface.h
@@ -7,7 +7,6 @@
 #define SWIFT_MISC_GENERICDBUSINTERFACE_H
 
 #include <QDBusAbstractInterface>
-#include <QDBusError>
 #include <QDBusPendingCall>
 #include <QDBusPendingReply>
 #include <QMetaMethod>
diff --git a/src/misc/icon.h b/src/misc/icon.h
index 1b27ad745..fa150bbfd 100644
--- a/src/misc/icon.h
+++ b/src/misc/icon.h
@@ -6,14 +6,11 @@
 #ifndef SWIFT_MISC_ICON_H
 #define SWIFT_MISC_ICON_H
 
-#include <tuple>
-
 #include <QIcon>
 #include <QMetaType>
 #include <QPixmap>
 #include <QString>
 
-#include "misc/dbus.h"
 #include "misc/icons.h"
 #include "misc/metaclass.h"
 #include "misc/mixin/mixincompare.h"
diff --git a/src/misc/iconlist.h b/src/misc/iconlist.h
index aeb8dbf38..df60d79d7 100644
--- a/src/misc/iconlist.h
+++ b/src/misc/iconlist.h
@@ -6,8 +6,6 @@
 #ifndef SWIFT_MISC_ICONLIST_H
 #define SWIFT_MISC_ICONLIST_H
 
-#include <tuple>
-
 #include <QJsonObject>
 #include <QMetaType>
 #include <QString>
@@ -16,7 +14,6 @@
 #include "misc/collection.h"
 #include "misc/icon.h"
 #include "misc/icons.h"
-#include "misc/mixin/mixincompare.h"
 #include "misc/sequence.h"
 #include "misc/swiftmiscexport.h"
 
diff --git a/src/misc/integersequence.h b/src/misc/integersequence.h
index b090479f1..ae9505d23 100644
--- a/src/misc/integersequence.h
+++ b/src/misc/integersequence.h
@@ -7,8 +7,6 @@
 #define SWIFT_MISC_INTEGERSEQUENCE_H
 
 #include <cstddef>
-#include <tuple>
-#include <type_traits>
 
 namespace swift::misc::private_ns
 {
diff --git a/src/misc/invoke.h b/src/misc/invoke.h
index 4cbf01ed0..310997b3e 100644
--- a/src/misc/invoke.h
+++ b/src/misc/invoke.h
@@ -9,8 +9,6 @@
 #include <tuple>
 
 #include <QMetaObject>
-#include <QThread>
-#include <QTimer>
 #include <QtGlobal>
 
 #include "misc/integersequence.h"
diff --git a/src/misc/iterator.h b/src/misc/iterator.h
index e748101a2..28a7ffec7 100644
--- a/src/misc/iterator.h
+++ b/src/misc/iterator.h
@@ -9,7 +9,6 @@
 #include <algorithm>
 #include <iterator>
 #include <type_traits>
-#include <typeindex>
 #include <utility>
 
 #include "misc/optional.h"
diff --git a/src/misc/json.cpp b/src/misc/json.cpp
index 559b582d0..2377dffbc 100644
--- a/src/misc/json.cpp
+++ b/src/misc/json.cpp
@@ -8,6 +8,7 @@
 #include <QStringList>
 
 #include "misc/imageutils.h"
+#include "misc/jsonexception.h"
 #include "misc/stringutils.h"
 
 using namespace swift::misc;
diff --git a/src/misc/json.h b/src/misc/json.h
index 5cf6050d1..6310f2995 100644
--- a/src/misc/json.h
+++ b/src/misc/json.h
@@ -19,8 +19,6 @@
 #include <QtGlobal>
 
 #include "misc/fileutils.h"
-#include "misc/inheritancetraits.h"
-#include "misc/jsonexception.h"
 #include "misc/metaclass.h"
 #include "misc/swiftmiscexport.h"
 
diff --git a/src/misc/lockfree.h b/src/misc/lockfree.h
index cf6513ee0..5f048f4bb 100644
--- a/src/misc/lockfree.h
+++ b/src/misc/lockfree.h
@@ -6,22 +6,15 @@
 #ifndef SWIFT_MISC_LOCKFREE_H
 #define SWIFT_MISC_LOCKFREE_H
 
-#include <stddef.h>
-
 #include <memory>
 #include <tuple>
 #include <type_traits>
 #include <utility>
 
-#include <QMetaType>
-#include <QMutex>
-#include <QMutexLocker>
 #include <QString>
 #include <QThread>
 #include <QtGlobal>
 
-#include "misc/swiftmiscexport.h"
-
 // http://www.drdobbs.com/lock-free-data-structures/184401865
 // http://en.cppreference.com/w/cpp/memory/shared_ptr/atomic
 
diff --git a/src/misc/logcategories.h b/src/misc/logcategories.h
index d5f38ee8d..c98856ec7 100644
--- a/src/misc/logcategories.h
+++ b/src/misc/logcategories.h
@@ -6,7 +6,6 @@
 #ifndef SWIFT_MISC_LOGCATEGORIES_H
 #define SWIFT_MISC_LOGCATEGORIES_H
 
-#include <QList>
 #include <QString>
 
 #include "misc/swiftmiscexport.h"
diff --git a/src/misc/logcategory.h b/src/misc/logcategory.h
index 29813f0fa..f38fe36f7 100644
--- a/src/misc/logcategory.h
+++ b/src/misc/logcategory.h
@@ -10,7 +10,6 @@
 #include <QMetaType>
 #include <QString>
 
-#include "misc/logcategories.h"
 #include "misc/metaclass.h"
 #include "misc/swiftmiscexport.h"
 #include "misc/valueobject.h"
diff --git a/src/misc/logcategorylist.h b/src/misc/logcategorylist.h
index 3de40091c..af0ef7715 100644
--- a/src/misc/logcategorylist.h
+++ b/src/misc/logcategorylist.h
@@ -15,12 +15,11 @@
 #include <QObject>
 #include <QString>
 #include <QStringList>
-#include <QThreadStorage>
 #include <QtGlobal>
 
 #include "misc/collection.h"
+#include "misc/logcategories.h"
 #include "misc/logcategory.h"
-#include "misc/mixin/mixincompare.h"
 #include "misc/sequence.h"
 #include "misc/swiftmiscexport.h"
 #include "misc/typetraits.h"
diff --git a/src/misc/logmessage.cpp b/src/misc/logmessage.cpp
index 1b7b08037..11438768c 100644
--- a/src/misc/logmessage.cpp
+++ b/src/misc/logmessage.cpp
@@ -5,6 +5,8 @@
 
 #include "misc/logmessage.h"
 
+#include <QLoggingCategory>
+
 namespace swift::misc
 {
 
diff --git a/src/misc/logmessage.h b/src/misc/logmessage.h
index a98886375..c60a40568 100644
--- a/src/misc/logmessage.h
+++ b/src/misc/logmessage.h
@@ -6,13 +6,8 @@
 
 //! \file
 
-#include <type_traits>
-
 #include <QDebug>
-#include <QList>
-#include <QLoggingCategory>
 
-#include "misc/integersequence.h"
 #include "misc/statusmessage.h"
 #include "misc/statusmessagelist.h"
 #include "misc/swiftmiscexport.h"
diff --git a/src/misc/mapbuilder.h b/src/misc/mapbuilder.h
index 00d0df009..3c9fcede7 100644
--- a/src/misc/mapbuilder.h
+++ b/src/misc/mapbuilder.h
@@ -15,7 +15,6 @@
 #include <QMap>
 
 #include "misc/range.h"
-#include "misc/swiftmiscexport.h"
 
 namespace swift::misc
 {
diff --git a/src/misc/metadatautils.h b/src/misc/metadatautils.h
index 0e46384a2..4a75ad028 100644
--- a/src/misc/metadatautils.h
+++ b/src/misc/metadatautils.h
@@ -6,8 +6,6 @@
 #ifndef SWIFT_MISC_METADATAUTILS_H
 #define SWIFT_MISC_METADATAUTILS_H
 
-#include <stddef.h>
-
 #include <QString>
 
 #include "misc/swiftmiscexport.h"
diff --git a/src/misc/mixin/mixindbus.h b/src/misc/mixin/mixindbus.h
index 6be1cc538..c3f338fa9 100644
--- a/src/misc/mixin/mixindbus.h
+++ b/src/misc/mixin/mixindbus.h
@@ -10,6 +10,7 @@
 
 #include <QDBusArgument>
 
+#include "misc/dbus.h"
 #include "misc/inheritancetraits.h"
 #include "misc/metaclass.h"
 #include "misc/typetraits.h"
diff --git a/src/misc/mixin/mixinjson.h b/src/misc/mixin/mixinjson.h
index f0a95981f..5d83e4c4c 100644
--- a/src/misc/mixin/mixinjson.h
+++ b/src/misc/mixin/mixinjson.h
@@ -6,20 +6,18 @@
 #ifndef SWIFT_MISC_MIXIN_MIXINJSON_H
 #define SWIFT_MISC_MIXIN_MIXINJSON_H
 
-#include <type_traits>
 #include <utility>
 
-#include <QByteArray>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonValue>
 #include <QJsonValueRef>
-#include <QStringList>
 #include <QtGlobal>
 
 #include "misc/inheritancetraits.h"
 #include "misc/json.h"
+#include "misc/jsonexception.h"
 
 namespace swift::misc
 {
diff --git a/src/misc/optional.h b/src/misc/optional.h
index a768e785e..b5d2a5002 100644
--- a/src/misc/optional.h
+++ b/src/misc/optional.h
@@ -10,8 +10,6 @@
 
 #include <QtGlobal>
 
-#include "misc/typetraits.h"
-
 namespace swift::misc
 {
 
diff --git a/src/misc/orderablelist.h b/src/misc/orderablelist.h
index 927e01ce2..5ae546168 100644
--- a/src/misc/orderablelist.h
+++ b/src/misc/orderablelist.h
@@ -8,8 +8,6 @@
 
 #include <QList>
 
-#include "misc/swiftmiscexport.h"
-
 namespace swift::misc
 {
     class IOrderable;
diff --git a/src/misc/platform.h b/src/misc/platform.h
index a826bfcf5..30b827cbd 100644
--- a/src/misc/platform.h
+++ b/src/misc/platform.h
@@ -6,7 +6,6 @@
 #ifndef SWIFT_MISC_PLATFORM_H
 #define SWIFT_MISC_PLATFORM_H
 
-#include <QMetaEnum>
 #include <QString>
 
 #include "misc/metaclass.h"
diff --git a/src/misc/platformset.h b/src/misc/platformset.h
index 3f30019ce..7a46ec95a 100644
--- a/src/misc/platformset.h
+++ b/src/misc/platformset.h
@@ -6,8 +6,6 @@
 #ifndef SWIFT_MISC_PLATFORMSET_H
 #define SWIFT_MISC_PLATFORMSET_H
 
-#include <tuple>
-
 #include <QMetaType>
 
 #include "misc/collection.h"
diff --git a/src/misc/predicates.h b/src/misc/predicates.h
index 16598ea4b..b035db3ea 100644
--- a/src/misc/predicates.h
+++ b/src/misc/predicates.h
@@ -6,8 +6,8 @@
 #ifndef SWIFT_MISC_PREDICATES_H
 #define SWIFT_MISC_PREDICATES_H
 
-#include <algorithm>
 #include <functional>
+#include <tuple>
 
 #include "misc/algorithm.h"
 
diff --git a/src/misc/propertyindexvariantmap.h b/src/misc/propertyindexvariantmap.h
index 3d62c2f69..24b94dacd 100644
--- a/src/misc/propertyindexvariantmap.h
+++ b/src/misc/propertyindexvariantmap.h
@@ -14,16 +14,12 @@
 #include <QMetaType>
 #include <QString>
 #include <QVariant>
-#include <QtDebug>
 #include <QtGlobal>
 
-#include "misc/inheritancetraits.h"
-#include "misc/mixin/mixincompare.h"
 #include "misc/mixin/mixindbus.h"
 #include "misc/mixin/mixinindex.h"
 #include "misc/mixin/mixinmetatype.h"
 #include "misc/mixin/mixinstring.h"
-#include "misc/predicates.h"
 #include "misc/propertyindex.h"
 #include "misc/propertyindexlist.h"
 #include "misc/swiftmiscexport.h"
diff --git a/src/misc/range.h b/src/misc/range.h
index fc3c43e56..3376fd779 100644
--- a/src/misc/range.h
+++ b/src/misc/range.h
@@ -7,7 +7,6 @@
 #define SWIFT_MISC_RANGE_H
 
 #include <algorithm>
-#include <initializer_list>
 #include <iterator>
 #include <type_traits>
 
@@ -17,7 +16,6 @@
 #include "misc/algorithm.h"
 #include "misc/iterator.h"
 #include "misc/predicates.h"
-#include "misc/swiftmiscexport.h"
 #include "misc/typetraits.h"
 
 namespace swift::misc
diff --git a/src/misc/rgbcolor.h b/src/misc/rgbcolor.h
index 809ae822f..d47b1caf0 100644
--- a/src/misc/rgbcolor.h
+++ b/src/misc/rgbcolor.h
@@ -6,8 +6,6 @@
 #ifndef SWIFT_MISC_RGBCOLOR_H
 #define SWIFT_MISC_RGBCOLOR_H
 
-#include <tuple>
-
 #include <QColor>
 #include <QMetaType>
 #include <QPixmap>
diff --git a/src/misc/setbuilder.h b/src/misc/setbuilder.h
index d29c099f8..b5dcdef25 100644
--- a/src/misc/setbuilder.h
+++ b/src/misc/setbuilder.h
@@ -14,9 +14,6 @@
 #include <QList>
 #include <QSet>
 #include <QStringList>
-#include <QVector>
-
-#include "misc/swiftmiscexport.h"
 
 namespace swift::misc
 {
diff --git a/src/misc/settingscache.h b/src/misc/settingscache.h
index d02129d4a..009cefca9 100644
--- a/src/misc/settingscache.h
+++ b/src/misc/settingscache.h
@@ -9,7 +9,6 @@
 #include <QObject>
 #include <QString>
 #include <QStringList>
-#include <QtDebug>
 
 #include "misc/statusmessage.h"
 #include "misc/swiftmiscexport.h"
diff --git a/src/misc/sharedstate/datalinkdbus.h b/src/misc/sharedstate/datalinkdbus.h
index 3c1453dad..ad9f64e95 100644
--- a/src/misc/sharedstate/datalinkdbus.h
+++ b/src/misc/sharedstate/datalinkdbus.h
@@ -7,6 +7,7 @@
 #define SWIFT_MISC_SHAREDSTATE_DATALINKDBUS_H
 
 #include <QSharedPointer>
+#include <QTimer>
 
 #include "misc/identifier.h"
 #include "misc/sharedstate/datalink.h"
diff --git a/src/misc/simulation/fscommon/aircraftcfgparser.h b/src/misc/simulation/fscommon/aircraftcfgparser.h
index 768421577..e273d47a3 100644
--- a/src/misc/simulation/fscommon/aircraftcfgparser.h
+++ b/src/misc/simulation/fscommon/aircraftcfgparser.h
@@ -6,8 +6,6 @@
 #ifndef SWIFT_MISC_SIMULATION_FSCOMMON_AIRCRAFTCFGPARSER_H
 #define SWIFT_MISC_SIMULATION_FSCOMMON_AIRCRAFTCFGPARSER_H
 
-#include <memory>
-
 #include <QObject>
 #include <QPointer>
 #include <QString>
diff --git a/src/misc/simulation/fscommon/fscommonutil.h b/src/misc/simulation/fscommon/fscommonutil.h
index f9de6bd29..11b542279 100644
--- a/src/misc/simulation/fscommon/fscommonutil.h
+++ b/src/misc/simulation/fscommon/fscommonutil.h
@@ -11,7 +11,6 @@
 #include <QSet>
 #include <QStringList>
 
-#include "misc/logcategories.h"
 #include "misc/simulation/aircraftmodellist.h"
 #include "misc/swiftmiscexport.h"
 
diff --git a/src/misc/simulation/fscommon/fsdirectories.cpp b/src/misc/simulation/fscommon/fsdirectories.cpp
index 50286bc0b..65c43acc4 100644
--- a/src/misc/simulation/fscommon/fsdirectories.cpp
+++ b/src/misc/simulation/fscommon/fsdirectories.cpp
@@ -11,7 +11,6 @@
 #include <QPair>
 #include <QSettings>
 #include <QStandardPaths>
-#include <QStringBuilder>
 #include <QStringList>
 #include <QTextStream>
 #include <QVariant>
@@ -21,7 +20,6 @@
 #include "misc/fileutils.h"
 #include "misc/logmessage.h"
 #include "misc/stringutils.h"
-#include "misc/swiftdirectories.h"
 
 using namespace swift::config;
 
diff --git a/src/misc/simulation/fscommon/fsdirectories.h b/src/misc/simulation/fscommon/fsdirectories.h
index acf4ea025..fbd3687cf 100644
--- a/src/misc/simulation/fscommon/fsdirectories.h
+++ b/src/misc/simulation/fscommon/fsdirectories.h
@@ -6,12 +6,9 @@
 #ifndef SWIFT_MISC_SIMULATION_FSDIRECTORIES_H
 #define SWIFT_MISC_SIMULATION_FSDIRECTORIES_H
 
-#include <atomic>
-
 #include <QSet>
 #include <QStringList>
 
-#include "misc/logcategories.h"
 #include "misc/swiftmiscexport.h"
 
 namespace swift::misc::simulation::fscommon
diff --git a/src/misc/simulation/fscommon/vpilotmodelruleset.cpp b/src/misc/simulation/fscommon/vpilotmodelruleset.cpp
index 2fa2597a0..edf7dad35 100644
--- a/src/misc/simulation/fscommon/vpilotmodelruleset.cpp
+++ b/src/misc/simulation/fscommon/vpilotmodelruleset.cpp
@@ -8,7 +8,6 @@
 #include <QList>
 #include <QSet>
 #include <QStringList>
-#include <Qt>
 
 #include "misc/range.h"
 #include "misc/simulation/aircraftmodel.h"
diff --git a/src/misc/simulation/fscommon/vpilotmodelruleset.h b/src/misc/simulation/fscommon/vpilotmodelruleset.h
index d29914f8a..2e9f8759f 100644
--- a/src/misc/simulation/fscommon/vpilotmodelruleset.h
+++ b/src/misc/simulation/fscommon/vpilotmodelruleset.h
@@ -11,7 +11,6 @@
 #include <QStringList>
 
 #include "misc/collection.h"
-#include "misc/mixin/mixincompare.h"
 #include "misc/sequence.h"
 #include "misc/simulation/aircraftmodellist.h"
 #include "misc/simulation/fscommon/vpilotmodelrule.h"
diff --git a/src/misc/simulation/fscommon/vpilotrulesreader.cpp b/src/misc/simulation/fscommon/vpilotrulesreader.cpp
index b21c7a58a..5558215b0 100644
--- a/src/misc/simulation/fscommon/vpilotrulesreader.cpp
+++ b/src/misc/simulation/fscommon/vpilotrulesreader.cpp
@@ -13,7 +13,6 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QFileInfoList>
-#include <QFlags>
 #include <QIODevice>
 #include <QReadLocker>
 #include <QStandardPaths>
diff --git a/src/misc/simulation/fsx/simconnectutilities.cpp b/src/misc/simulation/fsx/simconnectutilities.cpp
index c0dc008b9..f2853c6c8 100644
--- a/src/misc/simulation/fsx/simconnectutilities.cpp
+++ b/src/misc/simulation/fsx/simconnectutilities.cpp
@@ -3,16 +3,10 @@
 
 #include "misc/simulation/fsx/simconnectutilities.h"
 
-#include <QCoreApplication>
-#include <QFile>
 #include <QFlags>
-#include <QIODevice>
 #include <QLatin1String>
 #include <QMetaEnum>
 #include <QMetaObject>
-#include <QStandardPaths>
-#include <QStringBuilder>
-#include <QTextStream>
 
 #include "misc/stringutils.h"
 
diff --git a/src/misc/simulation/fsx/simconnectutilities.h b/src/misc/simulation/fsx/simconnectutilities.h
index dcb136bb3..f0fa3faa4 100644
--- a/src/misc/simulation/fsx/simconnectutilities.h
+++ b/src/misc/simulation/fsx/simconnectutilities.h
@@ -9,7 +9,6 @@
 #include <QMetaType>
 #include <QObject>
 #include <QSettings>
-#include <QSharedPointer>
 #include <QString>
 
 #include "misc/aviation/aircraftlights.h"
diff --git a/src/misc/simulation/interpolation/interpolationlogger.cpp b/src/misc/simulation/interpolation/interpolationlogger.cpp
index b27340307..1bb0adf17 100644
--- a/src/misc/simulation/interpolation/interpolationlogger.cpp
+++ b/src/misc/simulation/interpolation/interpolationlogger.cpp
@@ -8,13 +8,11 @@
 
 #include "config/buildconfig.h"
 #include "misc/aviation/callsign.h"
-#include "misc/aviation/heading.h"
 #include "misc/directoryutils.h"
 #include "misc/geo/kmlutils.h"
 #include "misc/logmessage.h"
 #include "misc/pq/angle.h"
 #include "misc/pq/length.h"
-#include "misc/pq/speed.h"
 #include "misc/pq/units.h"
 #include "misc/stringutils.h"
 #include "misc/swiftdirectories.h"
diff --git a/src/misc/simulation/interpolation/interpolationlogger.h b/src/misc/simulation/interpolation/interpolationlogger.h
index 622f78af0..da696b235 100644
--- a/src/misc/simulation/interpolation/interpolationlogger.h
+++ b/src/misc/simulation/interpolation/interpolationlogger.h
@@ -13,7 +13,6 @@
 #include "misc/aviation/aircraftpartslist.h"
 #include "misc/aviation/aircraftsituationchange.h"
 #include "misc/aviation/aircraftsituationlist.h"
-#include "misc/logcategories.h"
 #include "misc/simulation/interpolation/interpolationrenderingsetup.h"
 #include "misc/simulation/remoteaircraftprovider.h"
 
diff --git a/src/misc/simulation/interpolation/interpolationrenderingsetup.cpp b/src/misc/simulation/interpolation/interpolationrenderingsetup.cpp
index 458dafdb7..1c749d828 100644
--- a/src/misc/simulation/interpolation/interpolationrenderingsetup.cpp
+++ b/src/misc/simulation/interpolation/interpolationrenderingsetup.cpp
@@ -3,8 +3,6 @@
 
 #include "misc/simulation/interpolation/interpolationrenderingsetup.h"
 
-#include <QStringBuilder>
-
 #include "config/buildconfig.h"
 #include "misc/network/client.h"
 #include "misc/propertyindexvariantmap.h" // needed for mixin::Index::apply
diff --git a/src/misc/simulation/interpolation/interpolationstatus.cpp b/src/misc/simulation/interpolation/interpolationstatus.cpp
index 7e100add7..758b67b0f 100644
--- a/src/misc/simulation/interpolation/interpolationstatus.cpp
+++ b/src/misc/simulation/interpolation/interpolationstatus.cpp
@@ -3,6 +3,8 @@
 
 #include "misc/simulation/interpolation/interpolationstatus.h"
 
+#include "misc/aviation/aircraftsituation.h"
+
 using namespace swift::misc::aviation;
 
 namespace swift::misc::simulation
diff --git a/src/misc/simulation/interpolation/interpolationstatus.h b/src/misc/simulation/interpolation/interpolationstatus.h
index b29b5c1d5..73fba928e 100644
--- a/src/misc/simulation/interpolation/interpolationstatus.h
+++ b/src/misc/simulation/interpolation/interpolationstatus.h
@@ -8,9 +8,13 @@
 
 #include <QString>
 
-#include "misc/aviation/aircraftsituation.h"
 #include "misc/swiftmiscexport.h"
 
+namespace swift::misc::aviation
+{
+    class CAircraftSituation;
+}
+
 namespace swift::misc::simulation
 {
     //! Status of interpolation
diff --git a/src/misc/simulation/interpolation/interpolator.h b/src/misc/simulation/interpolation/interpolator.h
index ab1c3e74e..27d9d15a2 100644
--- a/src/misc/simulation/interpolation/interpolator.h
+++ b/src/misc/simulation/interpolation/interpolator.h
@@ -15,7 +15,6 @@
 #include "misc/aviation/aircraftsituation.h"
 #include "misc/aviation/aircraftsituationchange.h"
 #include "misc/aviation/callsign.h"
-#include "misc/logcategories.h"
 #include "misc/simulation/aircraftmodel.h"
 #include "misc/simulation/interpolation/interpolant.h"
 #include "misc/simulation/interpolation/interpolationlogger.h"
diff --git a/src/misc/simulation/interpolation/interpolatorpbh.h b/src/misc/simulation/interpolation/interpolatorpbh.h
index 71d5b46d9..a259b58c8 100644
--- a/src/misc/simulation/interpolation/interpolatorpbh.h
+++ b/src/misc/simulation/interpolation/interpolatorpbh.h
@@ -6,11 +6,15 @@
 #ifndef SWIFT_MISC_SIMULATION_INTERPOLATION_INTERPOLATORPBH_H
 #define SWIFT_MISC_SIMULATION_INTERPOLATION_INTERPOLATORPBH_H
 
-#include "misc/aviation/aircraftsituation.h"
 #include "misc/aviation/heading.h"
 #include "misc/pq/angle.h"
 #include "misc/pq/speed.h"
 
+namespace swift::misc::aviation
+{
+    class CAircraftSituation;
+}
+
 namespace swift::misc::simulation
 {
     //! Base class for Pitch-Bank-Heading interpolators
diff --git a/src/misc/slot.h b/src/misc/slot.h
index e3481c3d9..486e86444 100644
--- a/src/misc/slot.h
+++ b/src/misc/slot.h
@@ -13,6 +13,7 @@
 
 #include <QObject>
 #include <QPointer>
+#include <QTimer>
 #include <QtGlobal>
 
 #include "misc/invoke.h"
diff --git a/src/misc/stringutils.h b/src/misc/stringutils.h
index 9cd8bb870..c9479121e 100644
--- a/src/misc/stringutils.h
+++ b/src/misc/stringutils.h
@@ -8,13 +8,9 @@
 
 #include <algorithm>
 #include <atomic>
-#include <iosfwd>
-#include <string>
 
 #include <QByteArray>
-#include <QDataStream>
 #include <QDateTime>
-#include <QDebug>
 #include <QFlags>
 #include <QList>
 #include <QMap>
@@ -23,7 +19,6 @@
 #include <QString>
 #include <QStringRef>
 #include <QStringView>
-#include <QTextStream>
 #include <QtGlobal>
 
 #include "misc/range.h"
diff --git a/src/misc/swiftdirectories.h b/src/misc/swiftdirectories.h
index 30148ca3d..ba1191718 100644
--- a/src/misc/swiftdirectories.h
+++ b/src/misc/swiftdirectories.h
@@ -6,11 +6,7 @@
 #ifndef SWIFT_MISC_SWIFTDIRECTORIES_H
 #define SWIFT_MISC_SWIFTDIRECTORIES_H
 
-#include <QDateTime>
-#include <QDir>
 #include <QFileInfoList>
-#include <QMap>
-#include <QSet>
 #include <QString>
 
 #include "misc/swiftmiscexport.h"
diff --git a/src/misc/timestampobjectlist.h b/src/misc/timestampobjectlist.h
index c3ca4e535..03966a443 100644
--- a/src/misc/timestampobjectlist.h
+++ b/src/misc/timestampobjectlist.h
@@ -6,7 +6,6 @@
 #ifndef SWIFT_MISC_TIMESTAMPOBJECTLIST_H
 #define SWIFT_MISC_TIMESTAMPOBJECTLIST_H
 
-#include <QList>
 #include <QtGlobal>
 
 #include "config/buildconfig.h"
diff --git a/src/misc/tuple.h b/src/misc/tuple.h
index de9d589de..3135d3c6b 100644
--- a/src/misc/tuple.h
+++ b/src/misc/tuple.h
@@ -6,8 +6,6 @@
 #ifndef SWIFT_MISC_TUPLE_H
 #define SWIFT_MISC_TUPLE_H
 
-#include <stddef.h>
-
 #include <utility>
 
 //! \cond
diff --git a/src/misc/valuecache.h b/src/misc/valuecache.h
index 71f9e7e9f..8883bf767 100644
--- a/src/misc/valuecache.h
+++ b/src/misc/valuecache.h
@@ -35,7 +35,6 @@
 #include "misc/mixin/mixincompare.h"
 #include "misc/mixin/mixindatastream.h"
 #include "misc/mixin/mixindbus.h"
-#include "misc/mixin/mixinhash.h"
 #include "misc/mixin/mixinmetatype.h"
 #include "misc/propertyindexref.h"
 #include "misc/range.h"
diff --git a/src/misc/valuecacheprivate.h b/src/misc/valuecacheprivate.h
index d382b3d88..2cad0885d 100644
--- a/src/misc/valuecacheprivate.h
+++ b/src/misc/valuecacheprivate.h
@@ -7,7 +7,6 @@
 #define SWIFT_MISC_VALUECACHE_PRIVATE_H
 
 #include <QMap>
-#include <QMutex>
 #include <QObject>
 
 #include "misc/statusmessage.h"
diff --git a/src/misc/valueobject.h b/src/misc/valueobject.h
index 4fa86d08b..7bc4c5111 100644
--- a/src/misc/valueobject.h
+++ b/src/misc/valueobject.h
@@ -6,20 +6,10 @@
 #ifndef SWIFT_MISC_VALUEOBJECT_H
 #define SWIFT_MISC_VALUEOBJECT_H
 
-#include <iostream>
 #include <type_traits>
 
-#include <QDataStream>
-#include <QDebug>
-#include <QJsonObject>
-#include <QJsonValue>
-#include <QJsonValueRef>
-#include <QPixmap>
-#include <QString>
-#include <QtDBus/QDBusMetaType>
 #include <QtGlobal>
 
-#include "misc/metaclass.h"
 #include "misc/mixin/mixincompare.h"
 #include "misc/mixin/mixindatastream.h"
 #include "misc/mixin/mixindbus.h"
diff --git a/src/misc/weather/cloudlayer.cpp b/src/misc/weather/cloudlayer.cpp
index b652f1a27..3c74646db 100644
--- a/src/misc/weather/cloudlayer.cpp
+++ b/src/misc/weather/cloudlayer.cpp
@@ -5,8 +5,6 @@
 
 #include <QHash>
 
-#include "misc/propertyindexref.h"
-
 using namespace swift::misc::aviation;
 
 SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::weather, CCloudLayer)
diff --git a/src/misc/weather/cloudlayer.h b/src/misc/weather/cloudlayer.h
index 94f87c6a8..60b8454f5 100644
--- a/src/misc/weather/cloudlayer.h
+++ b/src/misc/weather/cloudlayer.h
@@ -8,6 +8,7 @@
 
 #include <QMetaType>
 #include <QString>
+#include <QVariant>
 
 #include "misc/aviation/altitude.h"
 #include "misc/metaclass.h"
diff --git a/src/misc/weather/cloudlayerlist.cpp b/src/misc/weather/cloudlayerlist.cpp
index e6f342fb7..fa9f0e304 100644
--- a/src/misc/weather/cloudlayerlist.cpp
+++ b/src/misc/weather/cloudlayerlist.cpp
@@ -4,7 +4,6 @@
 #include "misc/weather/cloudlayerlist.h"
 
 #include "misc/aviation/altitude.h"
-#include "misc/mixin/mixincompare.h"
 
 using namespace swift::misc::aviation;
 
diff --git a/src/misc/weather/cloudlayerlist.h b/src/misc/weather/cloudlayerlist.h
index 9ae55d52a..abf866167 100644
--- a/src/misc/weather/cloudlayerlist.h
+++ b/src/misc/weather/cloudlayerlist.h
@@ -6,9 +6,6 @@
 #ifndef SWIFT_MISC_WEATHER_CLOUDLAYERLIST_H
 #define SWIFT_MISC_WEATHER_CLOUDLAYERLIST_H
 
-#include <initializer_list>
-#include <tuple>
-
 #include <QMetaType>
 
 #include "misc/sequence.h"
diff --git a/src/misc/weather/metar.cpp b/src/misc/weather/metar.cpp
index 1df8d09c7..4ff197de6 100644
--- a/src/misc/weather/metar.cpp
+++ b/src/misc/weather/metar.cpp
@@ -3,7 +3,6 @@
 
 #include "misc/weather/metar.h"
 
-#include <QStringBuilder>
 #include <QtGlobal>
 
 #include "misc/pq/units.h"
diff --git a/src/misc/weather/metarlist.h b/src/misc/weather/metarlist.h
index 22ffa9c4d..38e20e9eb 100644
--- a/src/misc/weather/metarlist.h
+++ b/src/misc/weather/metarlist.h
@@ -11,7 +11,6 @@
 
 #include "misc/aviation/airporticaocode.h"
 #include "misc/collection.h"
-#include "misc/mixin/mixincompare.h"
 #include "misc/sequence.h"
 #include "misc/swiftmiscexport.h"
 #include "misc/weather/metar.h"
diff --git a/src/misc/weather/presentweather.h b/src/misc/weather/presentweather.h
index 6b5ef18fc..f96cd9418 100644
--- a/src/misc/weather/presentweather.h
+++ b/src/misc/weather/presentweather.h
@@ -6,13 +6,10 @@
 #ifndef SWIFT_MISC_WEATHER_PRESENTWEATHER_H
 #define SWIFT_MISC_WEATHER_PRESENTWEATHER_H
 
-#include <tuple>
-
 #include <QHash>
 #include <QMetaType>
 #include <QString>
 
-#include "misc/dictionary.h"
 #include "misc/metaclass.h"
 #include "misc/propertyindexref.h"
 #include "misc/swiftmiscexport.h"
diff --git a/src/misc/worker.h b/src/misc/worker.h
index 51e34ffa7..48edd2b67 100644
--- a/src/misc/worker.h
+++ b/src/misc/worker.h
@@ -13,26 +13,20 @@
 #include <memory>
 #include <type_traits>
 
-#include <QFuture>
 #include <QMetaObject>
 #include <QMetaType>
 #include <QMutex>
 #include <QMutexLocker>
 #include <QObject>
 #include <QPointer>
-#include <QSharedPointer>
 #include <QString>
 #include <QThread>
 #include <QTimer>
 #include <QVariant>
-#include <QWeakPointer>
 #include <QtGlobal>
 
-#include "misc/connectionguard.h"
 #include "misc/invoke.h"
-#include "misc/logcategories.h"
 #include "misc/promise.h"
-#include "misc/stacktrace.h"
 #include "misc/swiftmiscexport.h"
 
 namespace swift::misc
diff --git a/src/swiftlauncher/swiftlauncher.cpp b/src/swiftlauncher/swiftlauncher.cpp
index 582562d22..44f7ea22c 100644
--- a/src/swiftlauncher/swiftlauncher.cpp
+++ b/src/swiftlauncher/swiftlauncher.cpp
@@ -44,7 +44,6 @@ using namespace swift::gui::components;
 using namespace swift::core;
 using namespace swift::core::context;
 using namespace swift::core::data;
-using namespace swift::core::vatsim;
 using namespace swift::sound;
 using namespace swift::misc;
 using namespace swift::misc::db;