diff --git a/src/swiftdata/main.cpp b/src/swiftdata/main.cpp
index 86a67c124..6928bc5fe 100644
--- a/src/swiftdata/main.cpp
+++ b/src/swiftdata/main.cpp
@@ -7,18 +7,14 @@
  * contained in the LICENSE file.
  */
 
-#include "swiftdata.h"
+#include "blackcore/webreaderflags.h"
 #include "blackgui/guiapplication.h"
-#include "blackcore/application.h"
 #include "blackmisc/icons.h"
-#include "blackmisc/worker.h"
-#include "blackmisc/network/networkutils.h"
-#include "blackmisc/loghandler.h"
-#include "blackmisc/filelogger.h"
-#include "blackgui/stylesheetutility.h"
+#include "swiftdata.h"
 
+#include <stdlib.h>
 #include <QApplication>
-#include <QMessageBox>
+#include <QtGlobal>
 
 using namespace BlackMisc;
 using namespace BlackCore;
diff --git a/src/swiftdata/swiftdata.cpp b/src/swiftdata/swiftdata.cpp
index dd3fb2f3c..8a8e1fb36 100644
--- a/src/swiftdata/swiftdata.cpp
+++ b/src/swiftdata/swiftdata.cpp
@@ -8,20 +8,24 @@
  */
 
 #include "swiftdata.h"
-#include "ui_swiftdata.h"
-#include "blackgui/guiapplication.h"
+#include "blackcore/application.h"
+#include "blackcore/data/globalsetup.h"
 #include "blackgui/components/datamaininfoareacomponent.h"
-#include "blackgui/components/datainfoareacomponent.h"
 #include "blackgui/components/dbmappingcomponent.h"
 #include "blackgui/components/logcomponent.h"
+#include "blackgui/guiapplication.h"
 #include "blackgui/stylesheetutility.h"
-#include "blackcore/webdataservices.h"
-#include "blackmisc/network/entityflags.h"
-#include "blackmisc/icon.h"
 #include "blackmisc/loghandler.h"
-#include <QMenu>
-#include <QMessageBox>
-#include <QCloseEvent>
+#include "blackmisc/logpattern.h"
+#include "blackmisc/network/url.h"
+#include "ui_swiftdata.h"
+
+#include <QAction>
+#include <QString>
+#include <QStyle>
+#include <QtGlobal>
+
+class QWidget;
 
 using namespace BlackMisc;
 using namespace BlackMisc::Network;
diff --git a/src/swiftdata/swiftdata.h b/src/swiftdata/swiftdata.h
index 506487106..b69ed594a 100644
--- a/src/swiftdata/swiftdata.h
+++ b/src/swiftdata/swiftdata.h
@@ -12,17 +12,19 @@
 #ifndef SWIFTDATA_H
 #define SWIFTDATA_H
 
-#include "blackgui/systemtraywindow.h"
-#include "blackgui/managedstatusbar.h"
-#include "blackgui/mainwindowaccess.h"
-#include "blackcore/corefacade.h"
-#include "blackcore/data/globalsetup.h"
 #include "blackcore/data/updateinfo.h"
-#include "blackcore/setupreader.h"
-#include "blackmisc/statusmessage.h"
+#include "blackgui/mainwindowaccess.h"
+#include "blackgui/managedstatusbar.h"
+#include "blackmisc/datacache.h"
 #include "blackmisc/identifiable.h"
+#include "blackmisc/statusmessage.h"
+
+#include <QMainWindow>
+#include <QObject>
 #include <QScopedPointer>
 
+class QWidget;
+
 namespace Ui { class CSwiftData; }
 namespace BlackCore { class CWebDataServices; }
 
diff --git a/src/swiftdata/swiftdatamenus.cpp b/src/swiftdata/swiftdatamenus.cpp
index 6a4531b5e..f2b0cd67d 100644
--- a/src/swiftdata/swiftdatamenus.cpp
+++ b/src/swiftdata/swiftdatamenus.cpp
@@ -7,25 +7,22 @@
  * contained in the LICENSE file.
  */
 
+#include "blackgui/components/datainfoareacomponent.h"
+#include "blackgui/components/datamaininfoareacomponent.h"
+#include "blackgui/components/dbmappingcomponent.h"
+#include "blackgui/guiapplication.h"
+#include "blackmisc/buildconfig.h"
+#include "blackmisc/icons.h"
 #include "swiftdata.h"
 #include "ui_swiftdata.h"
-#include "blackgui/components/dbmappingcomponent.h"
-#include "blackgui/components/datainfoareacomponent.h"
-#include "blackgui/components/logcomponent.h"
-#include "blackgui/guiapplication.h"
-#include "blackmisc/datacache.h"
-#include "blackmisc/settingscache.h"
-#include "blackcore/webdataservices.h"
-#include "blackmisc/statusmessagelist.h"
-#include "blackmisc/logmessage.h"
-#include "blackmisc/buildconfig.h"
-#include "blackmisc/metadatautils.h"
-#include <QPoint>
-#include <QMenu>
-#include <QDesktopServices>
-#include <QProcess>
-#include <QFontDialog>
+
+#include <QAction>
 #include <QDir>
+#include <QMenu>
+#include <QObject>
+#include <QScopedPointer>
+#include <QString>
+#include <QtGlobal>
 
 using namespace BlackGui;
 using namespace BlackCore;