diff --git a/src/swiftcore/main.cpp b/src/swiftcore/main.cpp
index c1e2d55b9..5e6926778 100644
--- a/src/swiftcore/main.cpp
+++ b/src/swiftcore/main.cpp
@@ -7,18 +7,16 @@
  * contained in the LICENSE file.
  */
 
-#include "swiftcore.h"
+#include "blackcore/corefacadeconfig.h"
 #include "blackgui/guiapplication.h"
-#include "blackgui/stylesheetutility.h"
-#include "blackgui/guiutility.h"
-#include "blackcore/contextapplication.h"
-#include "blackcore/contextapplicationimpl.h"
-#include "blackmisc/dbusserver.h"
 #include "blackmisc/icons.h"
-#include "blackmisc/worker.h"
-#include "blackmisc/network/networkutils.h"
-#include <QMessageBox>
+#include "swiftcore.h"
+
+#include <stdlib.h>
 #include <QApplication>
+#include <QString>
+#include <QSystemTrayIcon>
+#include <Qt>
 
 using namespace BlackMisc;
 using namespace BlackCore;
diff --git a/src/swiftcore/swiftcore.cpp b/src/swiftcore/swiftcore.cpp
index be74b4233..1975db956 100644
--- a/src/swiftcore/swiftcore.cpp
+++ b/src/swiftcore/swiftcore.cpp
@@ -8,16 +8,27 @@
  */
 
 #include "swiftcore.h"
-#include "ui_swiftcore.h"
-#include "blackmisc/icon.h"
-#include "blackmisc/loghandler.h"
-#include "blackmisc/dbusserver.h"
+#include "blackcore/corefacade.h"
+#include "blackgui/components/commandinput.h"
+#include "blackgui/components/coreinfoareacomponent.h"
+#include "blackgui/components/logcomponent.h"
 #include "blackgui/guiapplication.h"
 #include "blackgui/stylesheetutility.h"
-#include "blackgui/components/logcomponent.h"
-#include <QMenu>
-#include <QMessageBox>
-#include <QCloseEvent>
+#include "blackmisc/dbusserver.h"
+#include "blackmisc/icons.h"
+#include "blackmisc/loghandler.h"
+#include "blackmisc/logpattern.h"
+#include "ui_swiftcore.h"
+
+#include <QFlags>
+#include <QGroupBox>
+#include <QIcon>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QRadioButton>
+#include <QtGlobal>
+
+class QWidget;
 
 using namespace BlackMisc;
 using namespace BlackCore;
diff --git a/src/swiftcore/swiftcore.h b/src/swiftcore/swiftcore.h
index 4eac221ec..c6422e327 100644
--- a/src/swiftcore/swiftcore.h
+++ b/src/swiftcore/swiftcore.h
@@ -12,13 +12,16 @@
 #ifndef SWIFTCORE_H
 #define SWIFTCORE_H
 
-#include "blackgui/systemtraywindow.h"
 #include "blackgui/mainwindowaccess.h"
-#include "blackcore/corefacade.h"
-#include "blackmisc/statusmessage.h"
+#include "blackgui/systemtraywindow.h"
 #include "blackmisc/identifiable.h"
+#include "blackmisc/statusmessage.h"
 
+#include <QObject>
 #include <QScopedPointer>
+#include <QString>
+
+class QWidget;
 
 namespace Ui { class CSwiftCore; }