diff --git a/REUSE.toml b/REUSE.toml
index 1eff3eca1..eb6d58c34 100644
--- a/REUSE.toml
+++ b/REUSE.toml
@@ -230,7 +230,7 @@ SPDX-License-Identifier = "CC0-1.0"
 [[annotations]]
 path = "src/sound/share/sounds/pttclick.wav"
 precedence = "aggregate"
-SPDX-FileCopyrightText = "Clicking 4 by bernhoftbret -- https://freesound.org/s/655157/ -- License: Creative Commons 0; Modified by swift contributors"
+SPDX-FileCopyrightText = "Copyright (C) swift Project Community / Contributors"
 SPDX-License-Identifier = "CC0-1.0"
 
 [[annotations]]
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 5fb6b8bf5..0fcf70052 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -3,7 +3,6 @@
 
 add_library(gui SHARED
         showhidebar.cpp
-        foreignwindows.h
         dockwidget.cpp
         labelandicon.cpp
         altitudeedit.cpp
@@ -34,11 +33,9 @@ add_library(gui SHARED
         models/distributorfilter.cpp
         models/columns.h
         models/aircraftsituationchangelistmodel.h
-        models/windlayerlistmodel.h
         models/actionhotkeylistmodel.cpp
         models/listmodelbaseaviation.cpp
         models/interpolationsetupmodel.cpp
-        models/windlayerlistmodel.cpp
         models/matchingstatisticsmodel.h
         models/modelfilter.cpp
         models/aircrafticaolistmodel.cpp
@@ -82,7 +79,6 @@ add_library(gui SHARED
         models/clientlistmodel.cpp
         models/aircrafticaofilter.h
         models/atcstationlistmodel.cpp
-        models/cloudlayerlistmodel.cpp
         models/simulatedaircraftlistmodel.h
         models/statusmessagelistmodel.h
         models/aircraftcategorytreemodel.cpp
@@ -105,7 +101,6 @@ add_library(gui SHARED
         models/applicationinfolistmodel.h
         models/identifierlistmodel.h
         models/modelfilter.h
-        models/cloudlayerlistmodel.h
         models/userlistmodel.cpp
         models/airportlistmodel.cpp
         models/actionhotkeylistmodel.h
@@ -116,16 +111,13 @@ add_library(gui SHARED
         models/atcstationlistmodel.h
         enableforviewbasedindicator.h
         pluginconfigwindow.h
-        views/cloudlayerview.cpp
         views/interpolationsetupview.cpp
         views/userview.h
         views/aircraftcategorytreeview.h
-        views/windlayerview.h
         views/viewtimestampobjects.cpp
         views/aircrafticaoview.h
         views/viewbase.h
         views/viewbasemisc.cpp
-        views/windlayerview.cpp
         views/distributorview.h
         views/checkboxdelegate.cpp
         views/viewbaseproxystyle.cpp
@@ -171,7 +163,6 @@ add_library(gui SHARED
         views/aircraftmodelstatisticsdialog.ui
         views/aircraftmodelstatisticsdialog.h
         views/audiodeviceinfoview.cpp
-        views/viewbaseweather.cpp
         views/clientview.cpp
         views/viewbaseitemdelegate.cpp
         views/aircraftsituationchangeview.cpp
@@ -199,7 +190,6 @@ add_library(gui SHARED
         views/radarview.cpp
         views/liveryview.cpp
         views/viewbasesimulation.cpp
-        views/cloudlayerview.h
         views/countryview.cpp
         views/liveryview.h
         views/flightplandialog.cpp
@@ -803,7 +793,6 @@ add_library(gui SHARED
         elidedpushbutton.h
         enableforframelesswindow.cpp
         overlaymessages.cpp
-        foreignwindows.cpp
         stylesheetutility.cpp
         dropbase.h
         eventfilter.cpp
diff --git a/src/gui/altitudeedit.cpp b/src/gui/altitudeedit.cpp
index c4ed09597..5e124492c 100644
--- a/src/gui/altitudeedit.cpp
+++ b/src/gui/altitudeedit.cpp
@@ -3,7 +3,6 @@
 
 #include "altitudeedit.h"
 
-#include <QMessageBox>
 #include <QRegularExpressionValidator>
 
 using namespace swift::misc;
diff --git a/src/gui/altitudeedit.h b/src/gui/altitudeedit.h
index a527661eb..8dded1e98 100644
--- a/src/gui/altitudeedit.h
+++ b/src/gui/altitudeedit.h
@@ -7,7 +7,6 @@
 #define SWIFT_GUI_ALTITUDEEDIT_H
 
 #include <QLineEdit>
-#include <QRegularExpression>
 
 #include "gui/swiftguiexport.h"
 #include "misc/aviation/altitude.h"
diff --git a/src/gui/components/dbownmodelscomponent.cpp b/src/gui/components/dbownmodelscomponent.cpp
index ed9faac0f..69687e37a 100644
--- a/src/gui/components/dbownmodelscomponent.cpp
+++ b/src/gui/components/dbownmodelscomponent.cpp
@@ -310,10 +310,7 @@ namespace swift::gui::components
             QPointer<CDbOwnModelsComponent> ownModelsComp(qobject_cast<CDbOwnModelsComponent *>(this->parent()));
             Q_ASSERT_X(ownModelsComp, Q_FUNC_INFO, "Cannot access parent");
 
-            if (m_loadActions.isEmpty())
-            {
-                m_loadActions = QList<QAction *>({ nullptr, nullptr, nullptr, nullptr, nullptr, nullptr });
-            }
+            if (m_loadActions.isEmpty()) { m_loadActions = QList<QAction *>(sims.numberSimulators(), nullptr); }
             menuActions.addMenuSimulator();
             if (sims.isFSX())
             {
@@ -413,9 +410,8 @@ namespace swift::gui::components
             {
                 if (m_reloadActions.isEmpty())
                 {
-                    m_reloadActions =
-                        QList<QAction *>({ nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
-                                           nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr });
+                    // Two reload actions per simulator
+                    m_reloadActions = QList<QAction *>(sims.numberSimulators() * 2, nullptr);
                 }
                 menuActions.addMenu(CIcons::refresh16(), "Force model reload",
                                     CMenuAction::pathSimulatorModelsReload());
@@ -623,8 +619,7 @@ namespace swift::gui::components
 
             if (m_clearCacheActions.isEmpty())
             {
-                m_clearCacheActions =
-                    QList<QAction *>({ nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr });
+                m_clearCacheActions = QList<QAction *>(sims.numberSimulators(), nullptr);
             }
             menuActions.addMenu(CIcons::delete16(), "Clear model caches", CMenuAction::pathSimulatorModelsClearCache());
             if (sims.isFSX())
diff --git a/src/gui/copyxswiftbusdialog.cpp b/src/gui/copyxswiftbusdialog.cpp
index 2a832ef8d..9acfd0732 100644
--- a/src/gui/copyxswiftbusdialog.cpp
+++ b/src/gui/copyxswiftbusdialog.cpp
@@ -8,7 +8,6 @@
 #include "config/buildconfig.h"
 #include "core/context/contextsimulator.h"
 #include "gui/guiapplication.h"
-#include "misc/directoryutils.h"
 #include "misc/simulation/xplane/xplaneutil.h"
 #include "misc/swiftdirectories.h"
 
diff --git a/src/gui/dockwidget.cpp b/src/gui/dockwidget.cpp
index f83186fcf..610c82f28 100644
--- a/src/gui/dockwidget.cpp
+++ b/src/gui/dockwidget.cpp
@@ -12,7 +12,6 @@
 #include <QPointer>
 #include <QScopedPointer>
 #include <QScreen>
-#include <QSettings>
 #include <QSizePolicy>
 #include <QStatusBar>
 #include <QStyle>
diff --git a/src/gui/dropbase.h b/src/gui/dropbase.h
index b98aaf846..636701c96 100644
--- a/src/gui/dropbase.h
+++ b/src/gui/dropbase.h
@@ -4,7 +4,6 @@
 #ifndef SWIFT_GUI_DROPBASE_H
 #define SWIFT_GUI_DROPBASE_H
 
-#include <QFileInfo>
 #include <QList>
 #include <QMimeData>
 
diff --git a/src/gui/enableforframelesswindow.cpp b/src/gui/enableforframelesswindow.cpp
index 4865f0180..235b8e87c 100644
--- a/src/gui/enableforframelesswindow.cpp
+++ b/src/gui/enableforframelesswindow.cpp
@@ -21,7 +21,6 @@
 #include <QWidget>
 #include <QtGlobal>
 
-#include "gui/foreignwindows.h"
 #include "gui/guiutility.h"
 #include "misc/icons.h"
 #include "misc/stringutils.h"
diff --git a/src/gui/filters/statusmessagefilterbar.h b/src/gui/filters/statusmessagefilterbar.h
index 6c661e243..d42156dce 100644
--- a/src/gui/filters/statusmessagefilterbar.h
+++ b/src/gui/filters/statusmessagefilterbar.h
@@ -6,8 +6,6 @@
 #ifndef SWIFT_GUI_FILTERS_STATUSMESSAGEFILTERBAR_H
 #define SWIFT_GUI_FILTERS_STATUSMESSAGEFILTERBAR_H
 
-#include <QFrame>
-
 #include "gui/filters/filterwidget.h"
 #include "gui/models/modelfilter.h"
 #include "misc/statusmessagelist.h"
diff --git a/src/gui/foreignwindows.cpp b/src/gui/foreignwindows.cpp
deleted file mode 100644
index fc5bd3de4..000000000
--- a/src/gui/foreignwindows.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (C) 2014 swift Project Community / Contributors
-// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
-
-#include "gui/foreignwindows.h"
-
-#include <QWidget>
-#include <QWindow>
-#include <QtGlobal>
-
-#include "gui/windowfinder.h"
-
-using namespace swift::misc::simulation;
-
-namespace swift::gui
-{
-    QScopedPointer<IWindowFinder> CForeignWindows::m_windowFinder(IWindowFinder::create());
-
-    QWindow *CForeignWindows::getFS9Window()
-    {
-        if (!m_windowFinder) { return nullptr; }
-        QWindow *simulatorWindow = m_windowFinder->findForeignWindow("", "FS98MAIN");
-        return simulatorWindow;
-    }
-
-    QWindow *CForeignWindows::getFSXWindow()
-    {
-        if (!m_windowFinder) { return nullptr; }
-        QWindow *simulatorWindow = m_windowFinder->findForeignWindow("", "FS98MAIN");
-        return simulatorWindow;
-    }
-
-    QWindow *CForeignWindows::getP3DWindow()
-    {
-        if (!m_windowFinder) { return nullptr; }
-        QWindow *simulatorWindow = m_windowFinder->findForeignWindow("", "FS98MAIN");
-        return simulatorWindow;
-    }
-
-    QWindow *CForeignWindows::getXPlaneWindow()
-    {
-        QWindow *simulatorWindow = nullptr;
-
-        // FIXME:
-        // Use datarefs Sim/operation/windows/system window via xswiftbus to grab the OS's native window handle
-        // http://www.xsquawkbox.net/xpsdk/mediawiki/sim%252Foperation%252Fwindows%252Fsystem_window
-        // For the time being, use IWindowFinder.
-        // The if condition is to prevent a crash on Linux/MacOS.
-        if (!m_windowFinder.isNull()) simulatorWindow = m_windowFinder->findForeignWindow("X-System", "");
-        return simulatorWindow;
-    }
-
-    QWindow *CForeignWindows::getFirstFoundSimulatorWindow()
-    {
-        QWindow *w = CForeignWindows::getP3DWindow();
-        if (w) { return w; }
-        w = CForeignWindows::getXPlaneWindow();
-        if (w) { return w; }
-        w = CForeignWindows::getFSXWindow();
-        if (w) { return w; }
-        w = CForeignWindows::getFS9Window();
-        return w;
-    }
-
-    QWindow *CForeignWindows::getSimulatorWindow(const CSimulatorInfo &simulator)
-    {
-        switch (simulator.getSimulator())
-        {
-        case CSimulatorInfo::FS9: return CForeignWindows::getFS9Window();
-        case CSimulatorInfo::FSX: return CForeignWindows::getFSXWindow();
-        case CSimulatorInfo::P3D: return CForeignWindows::getP3DWindow();
-        case CSimulatorInfo::XPLANE: return CForeignWindows::getXPlaneWindow();
-        default: break;
-        }
-        return nullptr;
-    }
-
-    bool CForeignWindows::setSimulatorAsParent(QWindow *simulatorWindow, QWidget *child)
-    {
-        if (!simulatorWindow) { return false; }
-        if (!child) { return false; }
-
-        // If visible, hide it during the reparent. Otherwise setting the parent will have no effect.
-        const bool isVisible = child->isVisible();
-        if (isVisible) { child->hide(); }
-
-        QWindow *childWindow = child->windowHandle();
-        Q_ASSERT_X(
-            childWindow, Q_FUNC_INFO,
-            "Native resources for child widget have not yet been allocated. Did you call QWidget::show() before?");
-
-        childWindow->setTransientParent(simulatorWindow);
-
-        // If it was visible before, make it visible again
-        if (isVisible) { child->show(); }
-        return true;
-    }
-
-    bool CForeignWindows::unsetSimulatorAsParent(QWidget *child)
-    {
-        if (!child) { return false; }
-        if (!child->windowHandle()) { return false; }
-        if (!child->windowHandle()->transientParent()) { return false; }
-        child->windowHandle()->setTransientParent(nullptr);
-        return true;
-    }
-} // namespace swift::gui
diff --git a/src/gui/foreignwindows.h b/src/gui/foreignwindows.h
deleted file mode 100644
index 1b135f6c1..000000000
--- a/src/gui/foreignwindows.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (C) 2014 swift Project Community / Contributors
-// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
-
-//! \file
-
-#ifndef SWIFT_GUI_FOREIGNWINDOWS_H
-#define SWIFT_GUI_FOREIGNWINDOWS_H
-
-#include <QScopedPointer>
-
-#include "gui/swiftguiexport.h"
-#include "misc/simulation/simulatorinfo.h"
-
-class QWidget;
-class QWindow;
-
-namespace swift::gui
-{
-    class IWindowFinder;
-
-    //! Foreign windows
-    class SWIFT_GUI_EXPORT CForeignWindows
-    {
-    public:
-        //! FS9 window
-        static QWindow *getFS9Window();
-
-        //! FSX window
-        static QWindow *getFSXWindow();
-
-        //! P3D window
-        static QWindow *getP3DWindow();
-
-        //! X-Plane window
-        static QWindow *getXPlaneWindow();
-
-        //! First simulator window found
-        static QWindow *getFirstFoundSimulatorWindow();
-
-        //! Simulator window
-        static QWindow *getSimulatorWindow(const swift::misc::simulation::CSimulatorInfo &simulator);
-
-        //! Set simulator as transient parent for child widget
-        static bool setSimulatorAsParent(QWindow *simulatorWindow, QWidget *child);
-
-        //! Unset the parent
-        static bool unsetSimulatorAsParent(QWidget *child);
-
-    private:
-        //! Constructor, use static methods only
-        CForeignWindows() {}
-
-        static QScopedPointer<IWindowFinder> m_windowFinder;
-    };
-} // namespace swift::gui
-
-#endif // SWIFT_GUI_FOREIGNWINDOWS_H
diff --git a/src/gui/guiactionbind.h b/src/gui/guiactionbind.h
index 94e6bb9f8..1bb82e9c6 100644
--- a/src/gui/guiactionbind.h
+++ b/src/gui/guiactionbind.h
@@ -9,7 +9,6 @@
 #include <QList>
 #include <QMenu>
 #include <QPushButton>
-#include <QScopedPointer>
 #include <QToolButton>
 
 #include "core/actionbind.h"
diff --git a/src/gui/guiapplication.h b/src/gui/guiapplication.h
index 2948e21b3..e7b0b4337 100644
--- a/src/gui/guiapplication.h
+++ b/src/gui/guiapplication.h
@@ -25,7 +25,6 @@
 #include "gui/stylesheetutility.h"
 #include "gui/swiftguiexport.h"
 #include "misc/icons.h"
-#include "misc/network/networkutils.h"
 #include "misc/statusmessage.h"
 
 class QMenu;
diff --git a/src/gui/levelmeter.cpp b/src/gui/levelmeter.cpp
index c41cbb42a..b538fdf80 100644
--- a/src/gui/levelmeter.cpp
+++ b/src/gui/levelmeter.cpp
@@ -4,8 +4,6 @@
 
 #include "gui/levelmeter.h"
 
-#include <math.h>
-
 #include <QPainter>
 #include <QRect>
 #include <QSizePolicy>
diff --git a/src/gui/loginmodebuttons.h b/src/gui/loginmodebuttons.h
index 7ccea17ed..03ffa5ac0 100644
--- a/src/gui/loginmodebuttons.h
+++ b/src/gui/loginmodebuttons.h
@@ -11,7 +11,6 @@
 #include <QScopedPointer>
 
 #include "gui/swiftguiexport.h"
-#include "misc/network/connectionstatus.h"
 #include "misc/network/loginmode.h"
 
 namespace Ui
diff --git a/src/gui/menus/aircraftmodelmenus.cpp b/src/gui/menus/aircraftmodelmenus.cpp
index 793d8d0e5..bf158c7b9 100644
--- a/src/gui/menus/aircraftmodelmenus.cpp
+++ b/src/gui/menus/aircraftmodelmenus.cpp
@@ -13,9 +13,7 @@
 #include "gui/guiapplication.h"
 #include "misc/icons.h"
 #include "misc/logmessage.h"
-#include "misc/simulation/aircraftmodelutils.h"
 #include "misc/simulation/modelconverterx.h"
-#include "misc/verify.h"
 
 using namespace swift::config;
 using namespace swift::misc;
diff --git a/src/gui/menus/aircraftmodelmenus.h b/src/gui/menus/aircraftmodelmenus.h
index b312a1ceb..218804f87 100644
--- a/src/gui/menus/aircraftmodelmenus.h
+++ b/src/gui/menus/aircraftmodelmenus.h
@@ -4,7 +4,6 @@
 #ifndef SWIFT_GUI_MENUS_AIRCRAFTMODELMENUS_H
 #define SWIFT_GUI_MENUS_AIRCRAFTMODELMENUS_H
 
-#include <QMenu>
 #include <QObject>
 
 #include "gui/menus/menudelegate.h"
diff --git a/src/gui/menus/fontmenus.cpp b/src/gui/menus/fontmenus.cpp
index 272fee33f..8610ccbd6 100644
--- a/src/gui/menus/fontmenus.cpp
+++ b/src/gui/menus/fontmenus.cpp
@@ -7,7 +7,6 @@
 
 #include "gui/guiapplication.h"
 #include "gui/shortcut.h"
-#include "misc/verify.h"
 
 using namespace swift::misc;
 using namespace swift::gui::components;
diff --git a/src/gui/menus/fontmenus.h b/src/gui/menus/fontmenus.h
index 1c30bf6d8..b84966da2 100644
--- a/src/gui/menus/fontmenus.h
+++ b/src/gui/menus/fontmenus.h
@@ -9,8 +9,6 @@
 #include "gui/components/settingsfontdialog.h"
 #include "gui/menus/menudelegate.h"
 #include "gui/overlaymessagesframe.h"
-#include "gui/views/aircraftmodelview.h"
-#include "misc/simulation/aircraftmodelinterfaces.h"
 
 class QAction;
 class QShortcut;
diff --git a/src/gui/menus/menuaction.cpp b/src/gui/menus/menuaction.cpp
index 78cc73b14..f650a6bef 100644
--- a/src/gui/menus/menuaction.cpp
+++ b/src/gui/menus/menuaction.cpp
@@ -15,7 +15,6 @@
 #include "gui/guiapplication.h"
 #include "misc/icons.h"
 #include "misc/slot.h"
-#include "misc/verify.h"
 
 using namespace swift::misc;
 
diff --git a/src/gui/models/actionhotkeylistmodel.h b/src/gui/models/actionhotkeylistmodel.h
index c70cbf8a4..0b0c67216 100644
--- a/src/gui/models/actionhotkeylistmodel.h
+++ b/src/gui/models/actionhotkeylistmodel.h
@@ -7,7 +7,6 @@
 #define SWIFT_GUI_MODELS_ACTIONHOTKEYLISTMODEL_H
 
 #include <QAbstractTableModel>
-#include <QModelIndex>
 #include <QObject>
 #include <QVariant>
 #include <Qt>
diff --git a/src/gui/models/actionmodel.h b/src/gui/models/actionmodel.h
index 4943a2c65..0da81e12d 100644
--- a/src/gui/models/actionmodel.h
+++ b/src/gui/models/actionmodel.h
@@ -7,7 +7,6 @@
 #define SWIFT_GUI_MODELS_ACTIONMODEL_H
 
 #include <QAbstractItemModel>
-#include <QModelIndex>
 #include <QObject>
 #include <QScopedPointer>
 #include <QVariant>
@@ -15,6 +14,8 @@
 
 #include "gui/swiftguiexport.h"
 
+class QModelIndex;
+
 namespace swift::gui::models
 {
     class CActionItem;
diff --git a/src/gui/models/aircraftcategorylistmodel.h b/src/gui/models/aircraftcategorylistmodel.h
index 4f45d6af5..00ac58d52 100644
--- a/src/gui/models/aircraftcategorylistmodel.h
+++ b/src/gui/models/aircraftcategorylistmodel.h
@@ -8,7 +8,6 @@
 
 #include "gui/models/listmodeldbobjects.h"
 #include "gui/swiftguiexport.h"
-#include "misc/aviation/aircraftcategory.h"
 #include "misc/aviation/aircraftcategorylist.h"
 
 namespace swift::gui::models
diff --git a/src/gui/models/aircrafticaolistmodel.h b/src/gui/models/aircrafticaolistmodel.h
index 30ae44664..084f88fda 100644
--- a/src/gui/models/aircrafticaolistmodel.h
+++ b/src/gui/models/aircrafticaolistmodel.h
@@ -8,7 +8,6 @@
 
 #include "gui/models/listmodeldbobjects.h"
 #include "gui/swiftguiexport.h"
-#include "misc/aviation/aircrafticaocode.h"
 #include "misc/aviation/aircrafticaocodelist.h"
 
 namespace swift::gui::models
diff --git a/src/gui/models/aircraftpartslistmodel.h b/src/gui/models/aircraftpartslistmodel.h
index dca7c2e04..a843aa424 100644
--- a/src/gui/models/aircraftpartslistmodel.h
+++ b/src/gui/models/aircraftpartslistmodel.h
@@ -6,8 +6,6 @@
 #ifndef SWIFT_GUI_MODELS_AIRCRAFTPARTSLISTMODEL_H
 #define SWIFT_GUI_MODELS_AIRCRAFTPARTSLISTMODEL_H
 
-#include <QVariant>
-
 #include "gui/models/listmodeltimestampobjects.h"
 #include "gui/swiftguiexport.h"
 #include "misc/aviation/aircraftpartslist.h"
diff --git a/src/gui/models/aircraftsituationchangelistmodel.h b/src/gui/models/aircraftsituationchangelistmodel.h
index fbec9d65e..81c07336b 100644
--- a/src/gui/models/aircraftsituationchangelistmodel.h
+++ b/src/gui/models/aircraftsituationchangelistmodel.h
@@ -6,8 +6,6 @@
 #ifndef SWIFT_GUI_MODELS_AIRCRAFTSITUATIONCHANGELISTMODEL_H
 #define SWIFT_GUI_MODELS_AIRCRAFTSITUATIONCHANGELISTMODEL_H
 
-#include <QVariant>
-
 #include "gui/models/listmodeltimestampobjects.h"
 #include "gui/swiftguiexport.h"
 #include "misc/aviation/aircraftsituationchangelist.h"
diff --git a/src/gui/models/aircraftsituationlistmodel.h b/src/gui/models/aircraftsituationlistmodel.h
index 74513d47c..846baa768 100644
--- a/src/gui/models/aircraftsituationlistmodel.h
+++ b/src/gui/models/aircraftsituationlistmodel.h
@@ -6,8 +6,6 @@
 #ifndef SWIFT_GUI_MODELS_AIRCRAFTSITUATIONLISTMODEL_H
 #define SWIFT_GUI_MODELS_AIRCRAFTSITUATIONLISTMODEL_H
 
-#include <QVariant>
-
 #include "gui/models/listmodeltimestampobjects.h"
 #include "gui/swiftguiexport.h"
 #include "misc/aviation/aircraftsituationlist.h"
diff --git a/src/gui/models/airportlistmodel.h b/src/gui/models/airportlistmodel.h
index 198057671..034d770b5 100644
--- a/src/gui/models/airportlistmodel.h
+++ b/src/gui/models/airportlistmodel.h
@@ -8,7 +8,6 @@
 
 #include "gui/models/listmodelbase.h"
 #include "gui/swiftguiexport.h"
-#include "misc/aviation/airport.h"
 #include "misc/aviation/airportlist.h"
 
 class QObject;
diff --git a/src/gui/models/allmodels.h b/src/gui/models/allmodels.h
index 62126dfb4..205b3d3b2 100644
--- a/src/gui/models/allmodels.h
+++ b/src/gui/models/allmodels.h
@@ -17,7 +17,6 @@
 #include "gui/models/atcstationlistmodel.h"
 #include "gui/models/audiodeviceinfolistmodel.h"
 #include "gui/models/clientlistmodel.h"
-#include "gui/models/cloudlayerlistmodel.h"
 #include "gui/models/countrylistmodel.h"
 #include "gui/models/distributorlistmodel.h"
 #include "gui/models/identifierlistmodel.h"
@@ -30,6 +29,5 @@
 #include "gui/models/statusmessagelistmodel.h"
 #include "gui/models/textmessagelistmodel.h"
 #include "gui/models/userlistmodel.h"
-#include "gui/models/windlayerlistmodel.h"
 
 #endif // SWIFT_GUI_MODELS_ALLMODELS_H
diff --git a/src/gui/models/cloudlayerlistmodel.cpp b/src/gui/models/cloudlayerlistmodel.cpp
deleted file mode 100644
index 9d39176b9..000000000
--- a/src/gui/models/cloudlayerlistmodel.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors
-// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
-
-#include "gui/models/cloudlayerlistmodel.h"
-
-#include <Qt>
-#include <QtGlobal>
-
-#include "gui/models/columnformatters.h"
-
-using namespace swift::misc;
-using namespace swift::misc::physical_quantities;
-using namespace swift::misc::weather;
-
-namespace swift::gui::models
-{
-
-    //! Relative Humidity
-    class CPrecipitationRateFormatter : public CDefaultFormatter
-    {
-    public:
-        //! Constructor
-        CPrecipitationRateFormatter(int alignment = alignDefault()) : CDefaultFormatter(alignment, false, roleDisplay())
-        {}
-
-        //! \copydoc CDefaultFormatter::displayRole
-        virtual CVariant displayRole(const CVariant &dataCVariant) const override
-        {
-            if (dataCVariant.canConvert<double>())
-            {
-                double rate = dataCVariant.value<double>();
-                QString formattedString = QString::number(rate) + " mm/h";
-                return formattedString;
-            }
-            Q_ASSERT_X(false, "CPrecipitationRateFormatter", "no double value");
-            return CVariant();
-        }
-    };
-
-    //! Precipitation
-    class CPrecipitationFormatter : public CDefaultFormatter
-    {
-    public:
-        //! Constructor
-        CPrecipitationFormatter(int alignment = alignDefault()) : CDefaultFormatter(alignment, false, roleDisplay()) {}
-
-        //! \copydoc CDefaultFormatter::displayRole
-        virtual CVariant displayRole(const CVariant &dataCVariant) const override
-        {
-            if (dataCVariant.canConvert<CCloudLayer::Precipitation>())
-            {
-                CCloudLayer::Precipitation precipitation = dataCVariant.value<CCloudLayer::Precipitation>();
-                switch (precipitation)
-                {
-                case CCloudLayer::PrecipitationUnknown: return QString("Unknown");
-                case CCloudLayer::NoPrecipitation: return QString("None");
-                case CCloudLayer::Rain: return QString("Rain");
-                case CCloudLayer::Snow: return QString("Snow");
-                }
-            }
-            Q_ASSERT_X(false, "CPrecipitationFormatter", "no CCloudLayer::Precipitation value");
-            return CVariant();
-        }
-    };
-
-    //! Clouds
-    class CCloudsFormatter : public CDefaultFormatter
-    {
-    public:
-        //! Constructor
-        CCloudsFormatter(int alignment = alignDefault()) : CDefaultFormatter(alignment, false, roleDisplay()) {}
-
-        //! \copydoc CDefaultFormatter::displayRole
-        virtual CVariant displayRole(const CVariant &dataCVariant) const override
-        {
-            if (dataCVariant.canConvert<CCloudLayer::Clouds>())
-            {
-                CCloudLayer::Clouds clouds = dataCVariant.value<CCloudLayer::Clouds>();
-                switch (clouds)
-                {
-                case CCloudLayer::NoClouds: return QString("None");
-                case CCloudLayer::Cirrus: return QString("Cirrus");
-                case CCloudLayer::Stratus: return QString("Stratus");
-                case CCloudLayer::Cumulus: return QString("Cumulus");
-                case CCloudLayer::Thunderstorm: return QString("Thunderstorm");
-                case CCloudLayer::CloudsUnknown: return QString("N/A");
-                }
-            }
-            Q_ASSERT_X(false, "CCloudsFormatter", "no CCloudLayer::Clouds value");
-            return CVariant();
-        }
-    };
-
-    //! Relative Humidity
-    class CCoverageFormatter : public CDefaultFormatter
-    {
-    public:
-        //! Constructor
-        CCoverageFormatter(int alignment = alignDefault()) : CDefaultFormatter(alignment, false, roleDisplay()) {}
-
-        //! \copydoc CDefaultFormatter::displayRole
-        virtual CVariant displayRole(const CVariant &dataCVariant) const override
-        {
-            if (dataCVariant.canConvert<int>())
-            {
-                int coverage = dataCVariant.value<int>();
-                QString formattedString = QString::number(coverage) + " %";
-                return formattedString;
-            }
-            Q_ASSERT_X(false, "CCoverageFormatter", "no int value");
-            return CVariant();
-        }
-    };
-
-    CCloudLayerListModel::CCloudLayerListModel(QObject *parent) : CListModelBase("CloudLayerListModel", parent)
-    {
-        this->m_columns.addColumn(CColumn("base", CCloudLayer::IndexBase, new CAltitudeFormatter()));
-        this->m_columns.addColumn(CColumn("top", CCloudLayer::IndexTop, new CAltitudeFormatter()));
-        this->m_columns.addColumn(
-            CColumn("precipitation rate", CCloudLayer::IndexPrecipitationRate, new CPrecipitationRateFormatter()));
-        this->m_columns.addColumn(
-            CColumn("precipitation", CCloudLayer::IndexPrecipitation, new CPrecipitationFormatter()));
-        this->m_columns.addColumn(CColumn("clouds", CCloudLayer::IndexClouds, new CCloudsFormatter()));
-        this->m_columns.addColumn(CColumn("coverage", CCloudLayer::IndexCoveragePercent, new CCoverageFormatter()));
-
-        // default sort order
-        this->setSortColumnByPropertyIndex(CCloudLayer::IndexBase);
-        this->m_sortOrder = Qt::AscendingOrder;
-
-        // force strings for translation in resource files
-        (void)QT_TRANSLATE_NOOP("ModelCloudLayerList", "base");
-        (void)QT_TRANSLATE_NOOP("ModelCloudLayerList", "top");
-        (void)QT_TRANSLATE_NOOP("ModelCloudLayerList", "precipitation rate");
-        (void)QT_TRANSLATE_NOOP("ModelCloudLayerList", "precipitation");
-        (void)QT_TRANSLATE_NOOP("ModelCloudLayerList", "clouds");
-        (void)QT_TRANSLATE_NOOP("ModelCloudLayerList", "coverage");
-    }
-} // namespace swift::gui::models
diff --git a/src/gui/models/cloudlayerlistmodel.h b/src/gui/models/cloudlayerlistmodel.h
deleted file mode 100644
index c7d0bf1b7..000000000
--- a/src/gui/models/cloudlayerlistmodel.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors
-// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
-
-//! \file
-
-#ifndef SWIFT_GUI_MODELS_CLOUDLAYERLISTMODEL_H
-#define SWIFT_GUI_MODELS_CLOUDLAYERLISTMODEL_H
-
-#include "gui/models/listmodelbase.h"
-#include "gui/swiftguiexport.h"
-#include "misc/weather/cloudlayer.h"
-#include "misc/weather/cloudlayerlist.h"
-
-class QObject;
-
-namespace swift::gui::models
-{
-    //! Cloud layer list model
-    class SWIFT_GUI_EXPORT CCloudLayerListModel : public CListModelBase<swift::misc::weather::CCloudLayerList, false>
-    {
-        Q_OBJECT
-
-    public:
-        //! Constructor
-        explicit CCloudLayerListModel(QObject *parent = nullptr);
-
-        //! Destructor
-        virtual ~CCloudLayerListModel() {}
-    };
-} // namespace swift::gui::models
-#endif // SWIFT_GUI_MODELS_CLOUDLAYERLISTMODEL_H
diff --git a/src/gui/models/columnformatters.h b/src/gui/models/columnformatters.h
index 40f5f3490..2965d9731 100644
--- a/src/gui/models/columnformatters.h
+++ b/src/gui/models/columnformatters.h
@@ -8,7 +8,6 @@
 
 #include <QFlags>
 #include <QList>
-#include <QPixmap>
 #include <QString>
 #include <Qt>
 #include <QtGlobal>
diff --git a/src/gui/models/countrylistmodel.h b/src/gui/models/countrylistmodel.h
index 6474716f5..3fe057fda 100644
--- a/src/gui/models/countrylistmodel.h
+++ b/src/gui/models/countrylistmodel.h
@@ -10,15 +10,10 @@
 
 #include "gui/models/listmodeldbobjects.h"
 #include "gui/swiftguiexport.h"
+#include "misc/countrylist.h"
 
 class QObject;
 
-namespace swift::misc
-{
-    class CCountry;
-    class CCountryList;
-} // namespace swift::misc
-
 namespace swift::gui::models
 {
     //! Country list model
diff --git a/src/gui/models/identifierlistmodel.h b/src/gui/models/identifierlistmodel.h
index 549f0b608..b69394f40 100644
--- a/src/gui/models/identifierlistmodel.h
+++ b/src/gui/models/identifierlistmodel.h
@@ -8,7 +8,6 @@
 
 #include "gui/models/listmodelbase.h"
 #include "gui/swiftguiexport.h"
-#include "misc/identifier.h"
 #include "misc/identifierlist.h"
 
 namespace swift::gui::models
diff --git a/src/gui/models/listmodelcallsignobjects.h b/src/gui/models/listmodelcallsignobjects.h
index 529819313..6b62776d9 100644
--- a/src/gui/models/listmodelcallsignobjects.h
+++ b/src/gui/models/listmodelcallsignobjects.h
@@ -7,7 +7,6 @@
 #define SWIFT_GUI_MODELS_LISTMODELCALLSIGNOBJECTS_H
 
 #include <QColor>
-#include <QList>
 #include <QString>
 #include <QVariant>
 #include <Qt>
diff --git a/src/gui/models/listmodeltimestampobjects.h b/src/gui/models/listmodeltimestampobjects.h
index a39c252f1..3c2d1a8d0 100644
--- a/src/gui/models/listmodeltimestampobjects.h
+++ b/src/gui/models/listmodeltimestampobjects.h
@@ -7,8 +7,6 @@
 #define SWIFT_GUI_MODELS_LISTMODELTIMESTAMPOBJECTS_H
 
 #include <QString>
-#include <QVariant>
-#include <Qt>
 
 #include "gui/models/listmodelbase.h"
 
diff --git a/src/gui/models/modelfilter.cpp b/src/gui/models/modelfilter.cpp
index b5b801751..00fee62f9 100644
--- a/src/gui/models/modelfilter.cpp
+++ b/src/gui/models/modelfilter.cpp
@@ -5,7 +5,23 @@
 
 #include <QtGlobal>
 
+#include "misc/aviation/aircrafticaocodelist.h"
+#include "misc/aviation/airlineicaocodelist.h"
+#include "misc/aviation/airportlist.h"
+#include "misc/aviation/atcstationlist.h"
+#include "misc/aviation/liverylist.h"
+#include "misc/countrylist.h"
+#include "misc/identifierlist.h"
 #include "misc/logmessage.h"
+#include "misc/namevariantpairlist.h"
+#include "misc/network/clientlist.h"
+#include "misc/network/serverlist.h"
+#include "misc/network/textmessagelist.h"
+#include "misc/network/userlist.h"
+#include "misc/simulation/aircraftmodellist.h"
+#include "misc/simulation/distributorlist.h"
+#include "misc/simulation/simulatedaircraftlist.h"
+#include "misc/statusmessagelist.h"
 
 using namespace swift::misc;
 
diff --git a/src/gui/models/modelfilter.h b/src/gui/models/modelfilter.h
index d7d6883c7..cc017df82 100644
--- a/src/gui/models/modelfilter.h
+++ b/src/gui/models/modelfilter.h
@@ -11,22 +11,6 @@
 #include <QString>
 #include <Qt>
 
-#include "misc/aviation/aircrafticaocodelist.h"
-#include "misc/aviation/airlineicaocodelist.h"
-#include "misc/aviation/airportlist.h"
-#include "misc/aviation/atcstationlist.h"
-#include "misc/aviation/liverylist.h"
-#include "misc/countrylist.h"
-#include "misc/identifierlist.h"
-#include "misc/namevariantpairlist.h"
-#include "misc/network/clientlist.h"
-#include "misc/network/serverlist.h"
-#include "misc/network/textmessagelist.h"
-#include "misc/network/userlist.h"
-#include "misc/simulation/aircraftmodellist.h"
-#include "misc/simulation/distributorlist.h"
-#include "misc/simulation/simulatedaircraftlist.h"
-#include "misc/statusmessagelist.h"
 #include "misc/variant.h"
 
 namespace swift::gui::models
diff --git a/src/gui/models/windlayerlistmodel.cpp b/src/gui/models/windlayerlistmodel.cpp
deleted file mode 100644
index 397e2eefe..000000000
--- a/src/gui/models/windlayerlistmodel.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors
-// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
-
-#include "windlayerlistmodel.h"
-
-#include <Qt>
-#include <QtGlobal>
-
-#include "gui/models/columnformatters.h"
-
-using namespace swift::misc;
-using namespace swift::misc::physical_quantities;
-using namespace swift::misc::weather;
-
-namespace swift::gui::models
-{
-    CWindLayerListModel::CWindLayerListModel(QObject *parent) : CListModelBase("WindLayerListModel", parent)
-    {
-        m_columns.addColumn(CColumn("level", CWindLayer::IndexLevel, new CAltitudeFormatter()));
-        m_columns.addColumn(CColumn("direction", CWindLayer::IndexDirection, new CAngleDegreeFormatter()));
-        m_columns.addColumn(CColumn("speed", CWindLayer::IndexSpeed, new CSpeedKtsFormatter()));
-        m_columns.addColumn(CColumn("gust speed", CWindLayer::IndexGustSpeed, new CSpeedKtsFormatter()));
-
-        // default sort order
-        this->setSortColumnByPropertyIndex(CWindLayer::IndexLevel);
-        m_sortOrder = Qt::AscendingOrder;
-
-        // force strings for translation in resource files
-        (void)QT_TRANSLATE_NOOP("ModelWindLayerList", "level");
-        (void)QT_TRANSLATE_NOOP("ModelWindLayerList", "direction");
-        (void)QT_TRANSLATE_NOOP("ModelWindLayerList", "speed");
-        (void)QT_TRANSLATE_NOOP("ModelWindLayerList", "gust speed");
-    }
-} // namespace swift::gui::models
diff --git a/src/gui/models/windlayerlistmodel.h b/src/gui/models/windlayerlistmodel.h
deleted file mode 100644
index 5f35a5ee1..000000000
--- a/src/gui/models/windlayerlistmodel.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors
-// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
-
-//! \file
-
-#ifndef SWIFT_GUI_MODELS_WINDLAYERLISTMODEL_H
-#define SWIFT_GUI_MODELS_WINDLAYERLISTMODEL_H
-
-#include "gui/models/listmodelbase.h"
-#include "gui/swiftguiexport.h"
-#include "misc/weather/windlayer.h"
-#include "misc/weather/windlayerlist.h"
-
-class QObject;
-
-namespace swift::gui::models
-{
-    //! Wind layer list model
-    class SWIFT_GUI_EXPORT CWindLayerListModel : public CListModelBase<swift::misc::weather::CWindLayerList, false>
-    {
-        Q_OBJECT
-
-    public:
-        //! Constructor
-        explicit CWindLayerListModel(QObject *parent = nullptr);
-
-        //! Destructor
-        virtual ~CWindLayerListModel() {}
-    };
-} // namespace swift::gui::models
-#endif // SWIFT_GUI_MODELS_WINDLAYERLISTMODEL_H
diff --git a/src/gui/overlaymessages.cpp b/src/gui/overlaymessages.cpp
index 2991f64ee..220c25165 100644
--- a/src/gui/overlaymessages.cpp
+++ b/src/gui/overlaymessages.cpp
@@ -12,7 +12,6 @@
 #include <QPushButton>
 #include <QSize>
 #include <QStackedWidget>
-#include <QStyle>
 #include <QTextEdit>
 #include <QToolButton>
 #include <Qt>
diff --git a/src/gui/pluginconfigwindow.cpp b/src/gui/pluginconfigwindow.cpp
index 5b3c6e1a8..d324133dc 100644
--- a/src/gui/pluginconfigwindow.cpp
+++ b/src/gui/pluginconfigwindow.cpp
@@ -3,8 +3,6 @@
 
 #include "gui/pluginconfigwindow.h"
 
-#include <QApplication>
-#include <QStyle>
 #include <Qt>
 #include <QtGlobal>
 
diff --git a/src/gui/plugindetailswindow.cpp b/src/gui/plugindetailswindow.cpp
index 83620e513..e0efb6a2d 100644
--- a/src/gui/plugindetailswindow.cpp
+++ b/src/gui/plugindetailswindow.cpp
@@ -3,11 +3,9 @@
 
 #include "gui/plugindetailswindow.h"
 
-#include <QApplication>
 #include <QFont>
 #include <QLabel>
 #include <QPushButton>
-#include <QStyle>
 #include <Qt>
 #include <QtGlobal>
 
diff --git a/src/gui/splashscreen.cpp b/src/gui/splashscreen.cpp
index e7a01b56f..0420cdd2a 100644
--- a/src/gui/splashscreen.cpp
+++ b/src/gui/splashscreen.cpp
@@ -3,6 +3,7 @@
 
 #include "splashscreen.h"
 
+#include <QPainter>
 #include <QtMath>
 
 using namespace swift::misc;
diff --git a/src/gui/splashscreen.h b/src/gui/splashscreen.h
index 5b5813018..c83ef5ddb 100644
--- a/src/gui/splashscreen.h
+++ b/src/gui/splashscreen.h
@@ -7,8 +7,6 @@
 #define SWIFT_GUI_SPLASHSCREEN_H
 
 #include <QFont>
-#include <QLabel>
-#include <QPainter>
 #include <QPixmap>
 #include <QSplashScreen>
 #include <QTimer>
diff --git a/src/gui/stylesheetutility.cpp b/src/gui/stylesheetutility.cpp
index fce4e1ef2..6287587f6 100644
--- a/src/gui/stylesheetutility.cpp
+++ b/src/gui/stylesheetutility.cpp
@@ -4,7 +4,6 @@
 #include "gui/stylesheetutility.h"
 
 #include <QAbstractScrollArea>
-#include <QCoreApplication>
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
@@ -21,7 +20,6 @@
 #include <QtGlobal>
 
 #include "config/buildconfig.h"
-#include "misc/directoryutils.h"
 #include "misc/fileutils.h"
 #include "misc/logmessage.h"
 #include "misc/swiftdirectories.h"
diff --git a/src/gui/stylesheetutility.h b/src/gui/stylesheetutility.h
index 53e0b1d51..1a8b46da0 100644
--- a/src/gui/stylesheetutility.h
+++ b/src/gui/stylesheetutility.h
@@ -9,15 +9,11 @@
 #include <QFileSystemWatcher>
 #include <QMap>
 #include <QObject>
-#include <QScopedPointer>
-#include <QSettings>
 #include <QString>
 #include <QStringList>
 #include <QStyle>
 
 #include "gui/swiftguiexport.h"
-#include "misc/digestsignal.h"
-#include "misc/logcategories.h"
 
 class QFont;
 class QWidget;
diff --git a/src/gui/systemtraywindow.h b/src/gui/systemtraywindow.h
index 1bb632978..d7d10626d 100644
--- a/src/gui/systemtraywindow.h
+++ b/src/gui/systemtraywindow.h
@@ -7,7 +7,6 @@
 #define SWIFT_GUI_ENABLEFORSYSTEMTRAY_H
 
 #include <QFlag>
-#include <QFlags>
 #include <QIcon>
 #include <QMainWindow>
 #include <QObject>
diff --git a/src/gui/views/aircraftcategorytreeview.cpp b/src/gui/views/aircraftcategorytreeview.cpp
index e8879952a..a0988fba0 100644
--- a/src/gui/views/aircraftcategorytreeview.cpp
+++ b/src/gui/views/aircraftcategorytreeview.cpp
@@ -4,12 +4,9 @@
 #include "gui/views/aircraftcategorytreeview.h"
 
 #include <QAction>
-#include <QFlags>
 #include <QMenu>
 #include <QModelIndex>
-#include <QtGlobal>
 
-#include "config/buildconfig.h"
 #include "gui/menus/menuaction.h"
 #include "gui/models/aircraftcategorytreemodel.h"
 #include "misc/icons.h"
diff --git a/src/gui/views/aircraftmodelstatisticsdialog.cpp b/src/gui/views/aircraftmodelstatisticsdialog.cpp
index 302e78da2..af7e63226 100644
--- a/src/gui/views/aircraftmodelstatisticsdialog.cpp
+++ b/src/gui/views/aircraftmodelstatisticsdialog.cpp
@@ -6,13 +6,11 @@
 #include <QDesktopServices>
 #include <QPushButton>
 #include <QStringBuilder>
-#include <QStringList>
 #include <QUrl>
 
 #include "ui_aircraftmodelstatisticsdialog.h"
 
 #include "gui/guiapplication.h"
-#include "misc/aviation/aircrafticaocodelist.h"
 #include "misc/simulation/aircraftmodelutils.h"
 
 using namespace swift::misc::aviation;
diff --git a/src/gui/views/aircraftmodelview.h b/src/gui/views/aircraftmodelview.h
index 415068649..9bc8a6c2c 100644
--- a/src/gui/views/aircraftmodelview.h
+++ b/src/gui/views/aircraftmodelview.h
@@ -7,7 +7,6 @@
 #define SWIFT_GUI_AIRCRAFTMODELVIEW_H
 
 #include <QBrush>
-#include <QFlags>
 #include <QMetaType>
 #include <QObject>
 #include <QStringList>
@@ -17,7 +16,6 @@
 #include "gui/swiftguiexport.h"
 #include "gui/views/viewdbobjects.h"
 #include "misc/aviation/airlineicaocode.h"
-#include "misc/propertyindexvariantmap.h"
 #include "misc/simulation/aircraftmodellist.h"
 #include "misc/simulation/distributor.h"
 #include "misc/simulation/simulatorinfo.h"
diff --git a/src/gui/views/aircraftsituationchangeview.h b/src/gui/views/aircraftsituationchangeview.h
index 2cd6bc1bb..2e4e340e2 100644
--- a/src/gui/views/aircraftsituationchangeview.h
+++ b/src/gui/views/aircraftsituationchangeview.h
@@ -9,7 +9,6 @@
 #include "gui/models/aircraftsituationchangelistmodel.h"
 #include "gui/swiftguiexport.h"
 #include "gui/views/viewtimestampobjects.h"
-#include "misc/aviation/aircraftsituationchangelist.h"
 
 class QWidget;
 
diff --git a/src/gui/views/atcstationtreeview.cpp b/src/gui/views/atcstationtreeview.cpp
index 5c8f3f859..0932e921c 100644
--- a/src/gui/views/atcstationtreeview.cpp
+++ b/src/gui/views/atcstationtreeview.cpp
@@ -4,12 +4,10 @@
 #include "gui/views/atcstationtreeview.h"
 
 #include <QAction>
-#include <QFlags>
 #include <QMenu>
 #include <QModelIndex>
 #include <QtGlobal>
 
-#include "config/buildconfig.h"
 #include "gui/menus/menuaction.h"
 #include "gui/models/atcstationtreemodel.h"
 #include "misc/aviation/atcstationlist.h"
diff --git a/src/gui/views/atcstationview.cpp b/src/gui/views/atcstationview.cpp
index 29b0471d4..bdd44f82c 100644
--- a/src/gui/views/atcstationview.cpp
+++ b/src/gui/views/atcstationview.cpp
@@ -9,7 +9,6 @@
 #include "config/buildconfig.h"
 #include "gui/menus/menuaction.h"
 #include "gui/models/atcstationlistmodel.h"
-#include "misc/aviation/atcstationlist.h"
 #include "misc/aviation/callsign.h"
 #include "misc/icons.h"
 
diff --git a/src/gui/views/atcstationview.h b/src/gui/views/atcstationview.h
index 65d4bbb6c..a6a852f51 100644
--- a/src/gui/views/atcstationview.h
+++ b/src/gui/views/atcstationview.h
@@ -13,7 +13,6 @@
 #include "gui/swiftguiexport.h"
 #include "gui/views/viewcallsignobjects.h"
 #include "misc/aviation/atcstation.h"
-#include "misc/aviation/atcstationlist.h"
 #include "misc/aviation/comsystem.h"
 #include "misc/pq/frequency.h"
 
diff --git a/src/gui/views/clientview.h b/src/gui/views/clientview.h
index fdfcb93d1..a601dac21 100644
--- a/src/gui/views/clientview.h
+++ b/src/gui/views/clientview.h
@@ -9,7 +9,6 @@
 #include "gui/models/clientlistmodel.h"
 #include "gui/swiftguiexport.h"
 #include "gui/views/viewbase.h"
-#include "misc/network/clientlist.h"
 
 namespace swift::misc::network
 {
diff --git a/src/gui/views/cloudlayerview.cpp b/src/gui/views/cloudlayerview.cpp
deleted file mode 100644
index a0d3bb727..000000000
--- a/src/gui/views/cloudlayerview.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
-// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
-
-#include "gui/views/cloudlayerview.h"
-
-#include "gui/models/cloudlayerlistmodel.h"
-
-using namespace swift::misc;
-using namespace swift::gui::models;
-
-namespace swift::gui::views
-{
-    CCloudLayerView::CCloudLayerView(QWidget *parent) : CViewBase(parent)
-    {
-        this->standardInit(new CCloudLayerListModel(this));
-    }
-} // namespace swift::gui::views
diff --git a/src/gui/views/cloudlayerview.h b/src/gui/views/cloudlayerview.h
deleted file mode 100644
index 75b8e681f..000000000
--- a/src/gui/views/cloudlayerview.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors
-// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
-
-//! \file
-
-#ifndef SWIFT_GUI_CLOUDLAYERVIEW_H
-#define SWIFT_GUI_CLOUDLAYERVIEW_H
-
-#include "gui/models/cloudlayerlistmodel.h"
-#include "gui/swiftguiexport.h"
-#include "gui/views/viewbase.h"
-
-class QWidget;
-
-namespace swift::misc::weather
-{
-    class CCloudLayer;
-}
-
-namespace swift::gui::views
-{
-    //! Airports view
-    class SWIFT_GUI_EXPORT CCloudLayerView : public CViewBase<models::CCloudLayerListModel>
-    {
-        Q_OBJECT
-
-    public:
-        //! Constructor
-        explicit CCloudLayerView(QWidget *parent = nullptr);
-    };
-} // namespace swift::gui::views
-#endif // SWIFT_GUI_CLOUDLAYERVIEW_H
diff --git a/src/gui/views/countryview.h b/src/gui/views/countryview.h
index 1fd9c1cbe..9d965958e 100644
--- a/src/gui/views/countryview.h
+++ b/src/gui/views/countryview.h
@@ -9,7 +9,6 @@
 #include "gui/models/countrylistmodel.h"
 #include "gui/swiftguiexport.h"
 #include "gui/views/viewbase.h"
-#include "misc/countrylist.h"
 
 namespace swift::gui::views
 {
diff --git a/src/gui/views/identifierview.h b/src/gui/views/identifierview.h
index 444422193..07765d657 100644
--- a/src/gui/views/identifierview.h
+++ b/src/gui/views/identifierview.h
@@ -9,7 +9,6 @@
 #include "gui/models/identifierlistmodel.h"
 #include "gui/swiftguiexport.h"
 #include "gui/views/viewbase.h"
-#include "misc/identifierlist.h"
 
 namespace swift::misc
 {
diff --git a/src/gui/views/matchingstatisticsview.h b/src/gui/views/matchingstatisticsview.h
index c4b1cafdd..9270cb142 100644
--- a/src/gui/views/matchingstatisticsview.h
+++ b/src/gui/views/matchingstatisticsview.h
@@ -9,7 +9,6 @@
 #include "gui/models/matchingstatisticsmodel.h"
 #include "gui/swiftguiexport.h"
 #include "gui/views/viewbase.h"
-#include "misc/network/serverlist.h"
 
 class QWidget;
 
diff --git a/src/gui/views/namevariantpairview.h b/src/gui/views/namevariantpairview.h
index af5fc2ec3..e6716fc1c 100644
--- a/src/gui/views/namevariantpairview.h
+++ b/src/gui/views/namevariantpairview.h
@@ -12,7 +12,6 @@
 #include "gui/swiftguiexport.h"
 #include "gui/views/viewbase.h"
 #include "misc/icon.h"
-#include "misc/namevariantpairlist.h"
 #include "misc/variant.h"
 
 namespace swift::misc
diff --git a/src/gui/views/textmessageview.h b/src/gui/views/textmessageview.h
index c1f2be95b..1154d4582 100644
--- a/src/gui/views/textmessageview.h
+++ b/src/gui/views/textmessageview.h
@@ -9,7 +9,6 @@
 #include "gui/models/textmessagelistmodel.h"
 #include "gui/swiftguiexport.h"
 #include "gui/views/viewbase.h"
-#include "misc/network/textmessagelist.h"
 
 namespace swift::misc::network
 {
diff --git a/src/gui/views/userview.h b/src/gui/views/userview.h
index 60876cee2..4ae4a681c 100644
--- a/src/gui/views/userview.h
+++ b/src/gui/views/userview.h
@@ -9,7 +9,6 @@
 #include "gui/models/userlistmodel.h"
 #include "gui/swiftguiexport.h"
 #include "gui/views/viewbase.h"
-#include "misc/network/userlist.h"
 
 namespace swift::misc::network
 {
diff --git a/src/gui/views/viewbaseproxystyle.h b/src/gui/views/viewbaseproxystyle.h
index f4dee422b..ec9af5865 100644
--- a/src/gui/views/viewbaseproxystyle.h
+++ b/src/gui/views/viewbaseproxystyle.h
@@ -7,9 +7,7 @@
 #define SWIFT_GUI_VIEWBASE_PROXYSTYLE_H
 
 #include <QPainter>
-#include <QPen>
 #include <QProxyStyle>
-#include <QStyleOptionViewItem>
 
 namespace swift::gui::views
 {
diff --git a/src/gui/views/viewbaseweather.cpp b/src/gui/views/viewbaseweather.cpp
deleted file mode 100644
index 9b01cee03..000000000
--- a/src/gui/views/viewbaseweather.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (C) 2018 swift Project Community / Contributors
-// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
-
-#include "viewbase.cpp"
-
-namespace swift::gui::views
-{
-    template class CViewBase<swift::gui::models::CCloudLayerListModel>;
-    template class CViewBase<swift::gui::models::CWindLayerListModel>;
-} // namespace swift::gui::views
diff --git a/src/gui/views/viewcallsignobjects.h b/src/gui/views/viewcallsignobjects.h
index 7137ae617..68652dac5 100644
--- a/src/gui/views/viewcallsignobjects.h
+++ b/src/gui/views/viewcallsignobjects.h
@@ -6,11 +6,6 @@
 #ifndef SWIFT_GUI_VIEWS_VIEWCALLSIGNOBJECTS_H
 #define SWIFT_GUI_VIEWS_VIEWCALLSIGNOBJECTS_H
 
-#include <QObject>
-#include <QSet>
-#include <QString>
-#include <QtGlobal>
-
 #include "gui/views/viewbase.h"
 
 class QAction;
diff --git a/src/gui/views/viewdbobjects.h b/src/gui/views/viewdbobjects.h
index 9f274a804..2471ef81f 100644
--- a/src/gui/views/viewdbobjects.h
+++ b/src/gui/views/viewdbobjects.h
@@ -6,10 +6,7 @@
 #ifndef SWIFT_GUI_VIEWS_VIEWDBOBJECTS_H
 #define SWIFT_GUI_VIEWS_VIEWDBOBJECTS_H
 
-#include <QObject>
 #include <QSet>
-#include <QString>
-#include <QtGlobal>
 
 #include "gui/views/viewbase.h"
 
diff --git a/src/gui/views/viewtimestampobjects.h b/src/gui/views/viewtimestampobjects.h
index 9dc72a161..5c2d229cb 100644
--- a/src/gui/views/viewtimestampobjects.h
+++ b/src/gui/views/viewtimestampobjects.h
@@ -6,10 +6,6 @@
 #ifndef SWIFT_GUI_VIEWS_VIEWTIMESTAMPOBJECTS_H
 #define SWIFT_GUI_VIEWS_VIEWTIMESTAMPOBJECTS_H
 
-#include <QObject>
-#include <QString>
-#include <QtGlobal>
-
 #include "gui/views/viewbase.h"
 
 namespace swift::gui
diff --git a/src/gui/views/windlayerview.cpp b/src/gui/views/windlayerview.cpp
deleted file mode 100644
index e7628b039..000000000
--- a/src/gui/views/windlayerview.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
-// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
-
-#include "gui/views/windlayerview.h"
-
-#include "gui/models/windlayerlistmodel.h"
-
-using namespace swift::misc;
-using namespace swift::gui::models;
-
-namespace swift::gui::views
-{
-    CWindLayerView::CWindLayerView(QWidget *parent) : CViewBase(parent)
-    {
-        this->standardInit(new CWindLayerListModel(this));
-    }
-} // namespace swift::gui::views
diff --git a/src/gui/views/windlayerview.h b/src/gui/views/windlayerview.h
deleted file mode 100644
index 1c9fbadef..000000000
--- a/src/gui/views/windlayerview.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// SPDX-FileCopyrightText: Copyright (C) 2016 swift Project Community / Contributors
-// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
-
-//! \file
-
-#ifndef SWIFT_GUI_WINDLAYERVIEW_H
-#define SWIFT_GUI_WINDLAYERVIEW_H
-
-#include "gui/models/windlayerlistmodel.h"
-#include "gui/swiftguiexport.h"
-#include "gui/views/viewbase.h"
-
-class QWidget;
-
-namespace swift::misc::weather
-{
-    class CWindLayer;
-}
-namespace swift::gui::views
-{
-    //! Wind layer view
-    class SWIFT_GUI_EXPORT CWindLayerView : public CViewBase<models::CWindLayerListModel>
-    {
-        Q_OBJECT
-
-    public:
-        //! Constructor
-        explicit CWindLayerView(QWidget *parent = nullptr);
-    };
-} // namespace swift::gui::views
-#endif // SWIFT_GUI_WINDLAYERVIEW_H
diff --git a/src/sound/share/sounds/pttclick.wav b/src/sound/share/sounds/pttclick.wav
index d71538dfc..1de38ef17 100644
Binary files a/src/sound/share/sounds/pttclick.wav and b/src/sound/share/sounds/pttclick.wav differ
diff --git a/src/swiftguistandard/swiftguistd.h b/src/swiftguistandard/swiftguistd.h
index 12e23267d..bdb25c392 100644
--- a/src/swiftguistandard/swiftguistd.h
+++ b/src/swiftguistandard/swiftguistd.h
@@ -240,12 +240,6 @@ class SwiftGuiStd :
     //! Menu item clicked
     void onMenuClicked();
 
-    //! Attach the simulator window
-    void attachSimulatorWindow();
-
-    //! Detach simulator window
-    void detachSimulatorWindow();
-
     //! Kicked from network
     void onKickedFromNetwork(const QString &kickMessage);
 
diff --git a/src/swiftguistandard/swiftguistdmenus.cpp b/src/swiftguistandard/swiftguistdmenus.cpp
index ea6cdccca..623a7eb73 100644
--- a/src/swiftguistandard/swiftguistdmenus.cpp
+++ b/src/swiftguistandard/swiftguistdmenus.cpp
@@ -18,7 +18,6 @@
 #include "gui/components/maininfoareacomponent.h"
 #include "gui/components/settingscomponent.h"
 #include "gui/copyxswiftbusdialog.h"
-#include "gui/foreignwindows.h"
 #include "gui/guiactionbind.h"
 #include "gui/guiapplication.h"
 #include "misc/aviation/altitude.h"
@@ -86,26 +85,6 @@ void SwiftGuiStd::onMenuClicked()
     }
 }
 
-void SwiftGuiStd::attachSimulatorWindow()
-{
-    this->activateWindow(); // attaching requires active window
-    QWindow *w = CForeignWindows::getFirstFoundSimulatorWindow();
-    if (!w)
-    {
-        CLogMessage(this).warning(u"No simulator window found");
-        return;
-    }
-    const bool a = CForeignWindows::setSimulatorAsParent(w, this);
-    if (a) { CLogMessage(this).info(u"Attached to simulator"); }
-    else { CLogMessage(this).warning(u"No simulator window found"); }
-}
-
-void SwiftGuiStd::detachSimulatorWindow()
-{
-    if (CForeignWindows::unsetSimulatorAsParent(this)) { CLogMessage(this).info(u"Detached simulator window"); }
-    else { CLogMessage(this).info(u"No simulator window to detach"); }
-}
-
 void SwiftGuiStd::initMenus()
 {
     Q_ASSERT_X(ui->menu_InfoAreas, Q_FUNC_INFO, "No menu");
@@ -114,13 +93,6 @@ void SwiftGuiStd::initMenus()
     sGui->addMenuFile(*ui->menu_File);
     sGui->addMenuInternals(*ui->menu_Internals);
     sGui->addMenuWindow(*ui->menu_Window);
-    ui->menu_Window->addSeparator();
-    QAction *a = ui->menu_Window->addAction("Attach simulator window");
-    bool c = connect(a, &QAction::triggered, this, &SwiftGuiStd::attachSimulatorWindow);
-    Q_ASSERT_X(c, Q_FUNC_INFO, "connect failed");
-    a = ui->menu_Window->addAction("Detach simulator window");
-    c = connect(a, &QAction::triggered, this, &SwiftGuiStd::detachSimulatorWindow);
-    Q_ASSERT_X(c, Q_FUNC_INFO, "connect failed");
 
     sGui->addMenuHelp(*ui->menu_Help);
     ui->menu_InfoAreas->addActions(ui->comp_MainInfoArea->getInfoAreaSelectActions(true, ui->menu_InfoAreas));
@@ -130,7 +102,7 @@ void SwiftGuiStd::initMenus()
         QAction *act = new QAction(CIcons::swift16(), "Copy xswiftbus dialog");
         ui->menu_File->insertAction(ui->menu_File->actions().at(5), act);
         // clang-format off
-        c = connect(act, &QAction::triggered, this,
+        bool c = connect(act, &QAction::triggered, this,
             [=] { this->copyXSwiftBusDialog(false); }, Qt::QueuedConnection);
         // clang-format on
         Q_ASSERT_X(c, Q_FUNC_INFO, "connect failed");