diff --git a/src/gui/components/aboutdialog.cpp b/src/gui/components/aboutdialog.cpp
index b8476bc5a..cd3768405 100644
--- a/src/gui/components/aboutdialog.cpp
+++ b/src/gui/components/aboutdialog.cpp
@@ -8,6 +8,7 @@
 #include "gui/guiapplication.h"
 #include "gui/guiutility.h"
 #include "misc/fileutils.h"
+#include "misc/swiftdirectories.h"
 
 namespace swift::gui::components
 {
diff --git a/src/gui/components/flightplancomponent.h b/src/gui/components/flightplancomponent.h
index 1cb9abf45..0d77aaa2b 100644
--- a/src/gui/components/flightplancomponent.h
+++ b/src/gui/components/flightplancomponent.h
@@ -8,6 +8,7 @@
 
 #include <QFileDialog>
 #include <QListWidget>
+#include <QMenu>
 #include <QNetworkReply>
 #include <QObject>
 #include <QScopedPointer>
diff --git a/src/gui/components/hotkeydialog.h b/src/gui/components/hotkeydialog.h
index 756d218b8..5f3b719d2 100644
--- a/src/gui/components/hotkeydialog.h
+++ b/src/gui/components/hotkeydialog.h
@@ -6,6 +6,7 @@
 #ifndef SWIFT_GUI_COMPONENTS_HOTKEYDIALOG_H
 #define SWIFT_GUI_COMPONENTS_HOTKEYDIALOG_H
 
+#include <QComboBox>
 #include <QDialog>
 #include <QObject>
 #include <QScopedPointer>
diff --git a/src/gui/components/networkdetailscomponent.cpp b/src/gui/components/networkdetailscomponent.cpp
index 62d035a7d..01f7a7359 100644
--- a/src/gui/components/networkdetailscomponent.cpp
+++ b/src/gui/components/networkdetailscomponent.cpp
@@ -13,7 +13,6 @@
 #include "gui/uppercasevalidator.h"
 
 using namespace swift::misc::network;
-using namespace swift::misc::audio;
 using namespace swift::misc::aviation;
 using namespace swift::core;
 using namespace swift::core::data;
diff --git a/src/gui/components/settingsnetworkserverscomponent.cpp b/src/gui/components/settingsnetworkserverscomponent.cpp
index 02e72ba90..b3c19c1cc 100644
--- a/src/gui/components/settingsnetworkserverscomponent.cpp
+++ b/src/gui/components/settingsnetworkserverscomponent.cpp
@@ -28,7 +28,6 @@ using namespace swift::gui;
 using namespace swift::misc;
 using namespace swift::misc::network;
 using namespace swift::misc::aviation;
-using namespace swift::misc::audio;
 
 namespace swift::gui::components
 {
diff --git a/src/gui/editors/cockpitcomform.cpp b/src/gui/editors/cockpitcomform.cpp
index 92f8e58c8..b9e6896e1 100644
--- a/src/gui/editors/cockpitcomform.cpp
+++ b/src/gui/editors/cockpitcomform.cpp
@@ -15,7 +15,6 @@
 
 using namespace swift::misc;
 using namespace swift::misc::aviation;
-using namespace swift::misc::audio;
 using namespace swift::misc::physical_quantities;
 using namespace swift::misc::math;
 using namespace swift::misc::simulation;
diff --git a/src/gui/editors/serverform.cpp b/src/gui/editors/serverform.cpp
index d105708ed..7dc2b617c 100644
--- a/src/gui/editors/serverform.cpp
+++ b/src/gui/editors/serverform.cpp
@@ -13,7 +13,6 @@
 #include "misc/network/user.h"
 
 using namespace swift::misc;
-using namespace swift::misc::audio;
 using namespace swift::misc::network;
 
 namespace swift::gui::editors
diff --git a/src/gui/enableforviewbasedindicator.h b/src/gui/enableforviewbasedindicator.h
index 5a0f48076..3f908b093 100644
--- a/src/gui/enableforviewbasedindicator.h
+++ b/src/gui/enableforviewbasedindicator.h
@@ -6,6 +6,8 @@
 #ifndef SWIFT_GUI_ENABLEFORVIEWBASEDINDICATOR_H
 #define SWIFT_GUI_ENABLEFORVIEWBASEDINDICATOR_H
 
+#include <chrono>
+
 #include "gui/swiftguiexport.h"
 
 namespace swift::gui::views
diff --git a/src/gui/filters/aircraftmodelfilterdialog.cpp b/src/gui/filters/aircraftmodelfilterdialog.cpp
index 92469dd73..f4f409681 100644
--- a/src/gui/filters/aircraftmodelfilterdialog.cpp
+++ b/src/gui/filters/aircraftmodelfilterdialog.cpp
@@ -11,7 +11,6 @@
 using namespace swift::gui::models;
 using namespace swift::gui::filters;
 using namespace swift::misc::simulation;
-using namespace swift::misc::network;
 
 namespace swift::gui::filters
 {
diff --git a/src/gui/filters/airlineicaofilterbar.h b/src/gui/filters/airlineicaofilterbar.h
index a677cc0e4..48ecdf6e4 100644
--- a/src/gui/filters/airlineicaofilterbar.h
+++ b/src/gui/filters/airlineicaofilterbar.h
@@ -15,6 +15,7 @@
 #include "gui/models/modelfilter.h"
 #include "gui/swiftguiexport.h"
 #include "misc/aviation/airlineicaocode.h"
+#include "misc/aviation/airlineicaocodelist.h"
 
 namespace Ui
 {
@@ -23,10 +24,6 @@ namespace Ui
 namespace swift::misc
 {
     class CCountry;
-    namespace aviation
-    {
-        class CAirlineIcaoCodeList;
-    }
 } // namespace swift::misc
 namespace swift::gui::filters
 {
diff --git a/src/gui/filters/countryfilterbar.cpp b/src/gui/filters/countryfilterbar.cpp
index d97a679af..b679e80af 100644
--- a/src/gui/filters/countryfilterbar.cpp
+++ b/src/gui/filters/countryfilterbar.cpp
@@ -15,7 +15,6 @@
 using namespace swift::gui;
 using namespace swift::gui::models;
 using namespace swift::misc;
-using namespace swift::misc::network;
 
 namespace swift::gui::filters
 {
diff --git a/src/gui/filters/liveryfilterbar.h b/src/gui/filters/liveryfilterbar.h
index ca734b4f0..88cbbd1a1 100644
--- a/src/gui/filters/liveryfilterbar.h
+++ b/src/gui/filters/liveryfilterbar.h
@@ -14,6 +14,7 @@
 #include "gui/filters/filterwidget.h"
 #include "gui/models/modelfilter.h"
 #include "gui/swiftguiexport.h"
+#include "misc/aviation/liverylist.h"
 #include "misc/rgbcolor.h"
 
 namespace Ui
@@ -23,7 +24,6 @@ namespace Ui
 namespace swift::misc::aviation
 {
     class CLivery;
-    class CLiveryList;
 } // namespace swift::misc::aviation
 namespace swift::gui::filters
 {
diff --git a/src/gui/models/aircraftmodellistmodel.cpp b/src/gui/models/aircraftmodellistmodel.cpp
index 9d6f69bab..92cd78989 100644
--- a/src/gui/models/aircraftmodellistmodel.cpp
+++ b/src/gui/models/aircraftmodellistmodel.cpp
@@ -20,7 +20,6 @@
 using namespace swift::misc;
 using namespace swift::misc::simulation;
 using namespace swift::misc::aviation;
-using namespace swift::misc::network;
 using namespace swift::misc::physical_quantities;
 
 namespace swift::gui::models
diff --git a/src/gui/models/airlineicaolistmodel.h b/src/gui/models/airlineicaolistmodel.h
index 671ddb5d1..e01eef92c 100644
--- a/src/gui/models/airlineicaolistmodel.h
+++ b/src/gui/models/airlineicaolistmodel.h
@@ -8,13 +8,13 @@
 
 #include "gui/models/listmodeldbobjects.h"
 #include "gui/swiftguiexport.h"
+#include "misc/aviation/airlineicaocodelist.h"
 
 class QObject;
 
 namespace swift::misc::aviation
 {
     class CAirlineIcaoCode;
-    class CAirlineIcaoCodeList;
 } // namespace swift::misc::aviation
 
 namespace swift::gui::models
@@ -29,7 +29,7 @@ namespace swift::gui::models
         //! Constructor
         explicit CAirlineIcaoCodeListModel(QObject *parent = nullptr);
 
-        //! Destructor
+        //! DestructorCAirlineIcaoCodeList
         virtual ~CAirlineIcaoCodeListModel() {}
     };
 } // namespace swift::gui::models
diff --git a/src/gui/models/atcstationlistmodel.cpp b/src/gui/models/atcstationlistmodel.cpp
index 5765eec94..65261ed9a 100644
--- a/src/gui/models/atcstationlistmodel.cpp
+++ b/src/gui/models/atcstationlistmodel.cpp
@@ -25,7 +25,6 @@
 #include "misc/propertyindexvariantmap.h"
 
 using namespace swift::misc::physical_quantities;
-using namespace swift::misc::audio;
 using namespace swift::misc::aviation;
 using namespace swift::misc::network;
 
diff --git a/src/gui/models/interpolationsetupmodel.cpp b/src/gui/models/interpolationsetupmodel.cpp
index bf6b229e0..9bc027ea3 100644
--- a/src/gui/models/interpolationsetupmodel.cpp
+++ b/src/gui/models/interpolationsetupmodel.cpp
@@ -7,6 +7,7 @@
 #include <QtGlobal>
 
 #include "gui/models/columns.h"
+#include "misc/country.h"
 
 using namespace swift::misc;
 using namespace swift::misc::physical_quantities;
diff --git a/src/gui/models/liverylistmodel.h b/src/gui/models/liverylistmodel.h
index 8b2b95656..566919d16 100644
--- a/src/gui/models/liverylistmodel.h
+++ b/src/gui/models/liverylistmodel.h
@@ -8,13 +8,13 @@
 
 #include "gui/models/listmodeldbobjects.h"
 #include "gui/swiftguiexport.h"
+#include "misc/aviation/liverylist.h"
 
 class QObject;
 
 namespace swift::misc::aviation
 {
     class CLivery;
-    class CLiveryList;
 } // namespace swift::misc::aviation
 
 namespace swift::gui::models
diff --git a/src/gui/views/viewcallsignobjects.h b/src/gui/views/viewcallsignobjects.h
index 68652dac5..533723ac2 100644
--- a/src/gui/views/viewcallsignobjects.h
+++ b/src/gui/views/viewcallsignobjects.h
@@ -7,6 +7,7 @@
 #define SWIFT_GUI_VIEWS_VIEWCALLSIGNOBJECTS_H
 
 #include "gui/views/viewbase.h"
+#include "misc/aviation/callsignset.h"
 
 class QAction;
 class QIntValidator;
diff --git a/src/misc/stringutils.cpp b/src/misc/stringutils.cpp
index 5bed04538..13f7442ec 100644
--- a/src/misc/stringutils.cpp
+++ b/src/misc/stringutils.cpp
@@ -10,6 +10,7 @@
 #include <QChar>
 #include <QRegularExpression>
 #include <QStringBuilder>
+#include <QTimeZone>
 
 namespace swift::misc
 {