diff --git a/src/blackcore/webdataservices.h b/src/blackcore/webdataservices.h
index effece908..2652be576 100644
--- a/src/blackcore/webdataservices.h
+++ b/src/blackcore/webdataservices.h
@@ -29,6 +29,7 @@
 #include "blackmisc/network/urllist.h"
 #include "blackmisc/network/userlist.h"
 #include "blackmisc/network/voicecapabilities.h"
+#include "blackmisc/restricted.h"
 #include "blackmisc/simulation/aircraftmodel.h"
 #include "blackmisc/simulation/aircraftmodellist.h"
 #include "blackmisc/simulation/distributor.h"
diff --git a/src/swiftguistandard/main.cpp b/src/swiftguistandard/main.cpp
index a19f87532..2d249ae6c 100644
--- a/src/swiftguistandard/main.cpp
+++ b/src/swiftguistandard/main.cpp
@@ -7,14 +7,13 @@
  * contained in the LICENSE file.
  */
 
+#include "blackgui/enableforframelesswindow.h"
+#include "blackgui/guiapplication.h"
 #include "swiftguistd.h"
 #include "swiftguistdapplication.h"
-#include "blackgui/enableforframelesswindow.h"
 
-#include <QtGlobal>
+#include <stdlib.h>
 #include <QApplication>
-#include <QPushButton>
-#include <QProcessEnvironment>
 
 using namespace BlackGui;
 using namespace BlackMisc;
diff --git a/src/swiftguistandard/swiftguistd.cpp b/src/swiftguistandard/swiftguistd.cpp
index 5a1702d7e..4ef2b7540 100644
--- a/src/swiftguistandard/swiftguistd.cpp
+++ b/src/swiftguistandard/swiftguistd.cpp
@@ -7,27 +7,48 @@
  * contained in the LICENSE file.
  */
 
-#include "swiftguistd.h"
-#include "ui_swiftguistd.h"
-#include "blackgui/stylesheetutility.h"
-#include "blackgui/models/atcstationlistmodel.h"
+#include "blackcore/contextapplication.h"
+#include "blackcore/contextaudio.h"
+#include "blackcore/contextnetwork.h"
+#include "blackcore/network.h"
+#include "blackgui/components/infobarstatuscomponent.h"
 #include "blackgui/components/logcomponent.h"
 #include "blackgui/components/settingscomponent.h"
 #include "blackgui/guiapplication.h"
 #include "blackgui/guiutility.h"
-#include "blackcore/contextnetwork.h"
-#include "blackcore/contextapplication.h"
-#include "blackcore/contextownaircraft.h"
-#include "blackcore/network.h"
-#include "blackmisc/threadutils.h"
-#include "blackmisc/icon.h"
-#include "blackmisc/dbusserver.h"
-#include "blackmisc/logmessage.h"
+#include "blackgui/overlaymessagesframe.h"
 #include "blackmisc/audio/notificationsounds.h"
-#include <QMouseEvent>
+#include "blackmisc/icons.h"
+#include "blackmisc/logcategory.h"
+#include "blackmisc/logcategorylist.h"
+#include "blackmisc/logmessage.h"
+#include "blackmisc/threadutils.h"
+#include "ui_swiftguistd.h"
+
+#include "swiftguistd.h"
+#include <QAction>
+#include <QDateTime>
+#include <QIcon>
+#include <QStackedWidget>
+#include <QStyle>
+#include <QWidget>
+#include <Qt>
+#include <QtGlobal>
+
+class QCloseEvent;
+class QEvent;
+class QMouseEvent;
+
+class QWidget;
+
+namespace BlackGui
+{
+    class CEnableForFramelessWindow;
+    class IMainWindowAccess;
+}
+namespace BlackMisc { class CIdentifiable; }
 
 using namespace BlackCore;
-using namespace BlackSound;
 using namespace BlackMisc;
 using namespace BlackGui;
 using namespace BlackGui::Components;
diff --git a/src/swiftguistandard/swiftguistd.h b/src/swiftguistandard/swiftguistd.h
index 625457a06..1c4ce605b 100644
--- a/src/swiftguistandard/swiftguistd.h
+++ b/src/swiftguistandard/swiftguistd.h
@@ -16,29 +16,33 @@
 #pragma push_macro("interface")
 #undef interface
 
+#include "blackcore/actionbind.h"
+#include "blackcore/network.h"
 #include "blackgui/components/maininfoareacomponent.h"
 #include "blackgui/components/navigatordialog.h"
-#include "blackgui/components/transpondermodeselector.h"
-#include "blackgui/models/atcstationlistmodel.h"
-#include "blackgui/models/serverlistmodel.h"
-#include "blackgui/models/userlistmodel.h"
-#include "blackgui/models/statusmessagelistmodel.h"
 #include "blackgui/enableforframelesswindow.h"
-#include "blackgui/managedstatusbar.h"
 #include "blackgui/mainwindowaccess.h"
-#include "blackcore/contextallinterfaces.h"
-#include "blackcore/actionbind.h"
-#include "blackmisc/network/textmessage.h"
-#include "blackmisc/loghandler.h"
+#include "blackgui/managedstatusbar.h"
+#include "blackmisc/audio/notificationsounds.h"
 #include "blackmisc/identifiable.h"
-#include "blacksound/soundgenerator.h"
-#include <QMainWindow>
-#include <QTextEdit>
-#include <QTableView>
-#include <QItemSelection>
-#include <QLabel>
-#include <QTimer>
+#include "blackmisc/loghandler.h"
+#include "blackmisc/simulation/simulatedaircraft.h"
+#include "blackmisc/statusmessage.h"
 
+#include <QMainWindow>
+#include <QObject>
+#include <QScopedPointer>
+#include <QSize>
+#include <QString>
+
+class QAction;
+class QCloseEvent;
+class QEvent;
+class QMouseEvent;
+class QTimer;
+class QWidget;
+
+namespace BlackMisc { namespace Aviation { class CAltitude; } }
 namespace Ui { class SwiftGuiStd; }
 
 //! swift GUI
diff --git a/src/swiftguistandard/swiftguistdaircraft.cpp b/src/swiftguistandard/swiftguistdaircraft.cpp
index a28f6e81f..76c1c69f5 100644
--- a/src/swiftguistandard/swiftguistdaircraft.cpp
+++ b/src/swiftguistandard/swiftguistdaircraft.cpp
@@ -7,11 +7,20 @@
  * contained in the LICENSE file.
  */
 
-#include "swiftguistd.h"
-#include "blackgui/models/atcstationlistmodel.h"
+#include "blackcore/contextownaircraft.h"
 #include "blackgui/guiapplication.h"
-#include "blackmisc/dbusserver.h"
-#include "blackcore/contextnetwork.h"
+#include "blackmisc/compare.h"
+#include "blackmisc/geo/coordinategeodetic.h"
+#include "blackmisc/geo/latitude.h"
+#include "blackmisc/geo/longitude.h"
+#include "blackmisc/pq/length.h"
+#include "blackmisc/pq/units.h"
+#include "blackmisc/simulation/simulatedaircraft.h"
+#include "swiftguistd.h"
+
+#include <QString>
+
+namespace BlackMisc { namespace Aviation { class CAltitude; } }
 
 using namespace BlackCore;
 using namespace BlackMisc;
diff --git a/src/swiftguistandard/swiftguistdapplication.cpp b/src/swiftguistandard/swiftguistdapplication.cpp
index b98e6d2ed..ead7d2d31 100644
--- a/src/swiftguistandard/swiftguistdapplication.cpp
+++ b/src/swiftguistandard/swiftguistdapplication.cpp
@@ -8,8 +8,13 @@
  */
 
 #include "swiftguistdapplication.h"
+#include "blackcore/application.h"
+#include "blackcore/corefacadeconfig.h"
 #include "blackcore/coremodeenums.h"
 #include "blackmisc/dbusserver.h"
+#include "blackmisc/icons.h"
+
+#include <QtGlobal>
 
 using namespace BlackMisc;
 using namespace BlackCore;
diff --git a/src/swiftguistandard/swiftguistdapplication.h b/src/swiftguistandard/swiftguistdapplication.h
index 65994c084..3d4712b21 100644
--- a/src/swiftguistandard/swiftguistdapplication.h
+++ b/src/swiftguistandard/swiftguistdapplication.h
@@ -13,7 +13,11 @@
 #define SWIFTGUISTDAPPLICATION_H
 
 #include "blackgui/guiapplication.h"
-#include "blackcore/corefacadeconfig.h"
+
+#include <QCommandLineOption>
+#include <QCoreApplication>
+#include <QObject>
+#include <QString>
 
 /*!
  * Specialized GUI application for swift pilot client.
diff --git a/src/swiftguistandard/swiftguistdinit.cpp b/src/swiftguistandard/swiftguistdinit.cpp
index 44fcb7a25..963253633 100644
--- a/src/swiftguistandard/swiftguistdinit.cpp
+++ b/src/swiftguistandard/swiftguistdinit.cpp
@@ -7,21 +7,43 @@
  * contained in the LICENSE file.
  */
 
+#include "blackcore/contextnetwork.h"
+#include "blackgui/components/aircraftcomponent.h"
+#include "blackgui/components/atcstationcomponent.h"
+#include "blackgui/components/cockpitcomponent.h"
+#include "blackgui/components/flightplancomponent.h"
+#include "blackgui/components/logcomponent.h"
+#include "blackgui/components/logincomponent.h"
+#include "blackgui/components/maininfoareacomponent.h"
+#include "blackgui/components/mainkeypadareacomponent.h"
+#include "blackgui/components/mappingcomponent.h"
+#include "blackgui/components/navigatordialog.h"
+#include "blackgui/components/settingscomponent.h"
+#include "blackgui/components/textmessagecomponent.h"
+#include "blackgui/components/usercomponent.h"
+#include "blackgui/dockwidgetinfobar.h"
+#include "blackgui/guiapplication.h"
+#include "blackgui/managedstatusbar.h"
+#include "blackgui/overlaymessagesframe.h"
+#include "blackgui/stylesheetutility.h"
+#include "blackmisc/buildconfig.h"
+#include "blackmisc/loghandler.h"
+#include "blackmisc/logmessage.h"
+#include "blackmisc/logpattern.h"
+#include "blackmisc/statusmessage.h"
 #include "swiftguistd.h"
 #include "ui_swiftguistd.h"
-#include "blackcore/contextallinterfaces.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/guiutility.h"
-#include "blackgui/components/allmaininfoareacomponents.h"
-#include "blackgui/models/atcstationlistmodel.h"
-#include "blackmisc/dbusserver.h"
-#include "blackmisc/icons.h"
-#include "blackmisc/aviation/selcal.h"
-#include "blackmisc/buildconfig.h"
-#include "blackmisc/logmessage.h"
-#include <QSizeGrip>
+
+#include <QAction>
 #include <QHBoxLayout>
-#include <QPushButton>
+#include <QScopedPointer>
+#include <QStackedWidget>
+#include <QStatusBar>
+#include <QString>
+#include <QTimer>
+#include <QVBoxLayout>
+
+class QHBoxLayout;
 
 using namespace BlackCore;
 using namespace BlackMisc;
diff --git a/src/swiftguistandard/swiftguistdmenus.cpp b/src/swiftguistandard/swiftguistdmenus.cpp
index 313e01c55..f96968cad 100644
--- a/src/swiftguistandard/swiftguistdmenus.cpp
+++ b/src/swiftguistandard/swiftguistdmenus.cpp
@@ -7,22 +7,20 @@
  * contained in the LICENSE file.
  */
 
+#include "blackgui/components/maininfoareacomponent.h"
+#include "blackgui/components/settingscomponent.h"
+#include "blackgui/guiapplication.h"
+#include "blackmisc/aviation/altitude.h"
+#include "blackmisc/pq/units.h"
 #include "swiftguistd.h"
 #include "ui_swiftguistd.h"
-#include "blackcore/application.h"
-#include "blackgui/guiapplication.h"
-#include "blackgui/components/settingscomponent.h"
-#include "blackgui/components/logcomponent.h"
-#include "blackmisc/statusmessagelist.h"
-#include "blackmisc/metadatautils.h"
-#include "blackmisc/aviation/altitude.h"
-#include "blackmisc/logmessage.h"
-#include <QPoint>
+
+#include <QAction>
 #include <QMenu>
-#include <QDesktopServices>
-#include <QProcess>
-#include <QFontDialog>
-#include <QDir>
+#include <QObject>
+#include <QScopedPointer>
+#include <QStackedWidget>
+#include <QtGlobal>
 
 using namespace BlackGui;
 using namespace BlackCore;