diff --git a/src/blackcore/airspace_analyzer.h b/src/blackcore/airspace_analyzer.h
index 2c62b54e4..282bb5406 100644
--- a/src/blackcore/airspace_analyzer.h
+++ b/src/blackcore/airspace_analyzer.h
@@ -22,6 +22,7 @@
 #include "blackmisc/aviation/callsign.h"
 #include <QObject>
 #include <QHash>
+#include <QReadWriteLock>
 
 namespace BlackCore
 {
diff --git a/src/blackcore/plugin_manager.cpp b/src/blackcore/plugin_manager.cpp
index f9a21ef26..53db4466e 100644
--- a/src/blackcore/plugin_manager.cpp
+++ b/src/blackcore/plugin_manager.cpp
@@ -14,6 +14,8 @@
 #include <QDir>
 #include <QDirIterator>
 #include <QLibrary>
+#include <QPluginLoader>
+#include <QStringBuilder>
 
 using namespace BlackMisc;
 
diff --git a/src/blackcore/plugin_manager_simulator.cpp b/src/blackcore/plugin_manager_simulator.cpp
index 46d8a1803..a30adfd75 100644
--- a/src/blackcore/plugin_manager_simulator.cpp
+++ b/src/blackcore/plugin_manager_simulator.cpp
@@ -9,6 +9,7 @@
 
 #include "plugin_manager_simulator.h"
 #include "simulator.h"
+#include <QStringBuilder>
 
 namespace BlackCore
 {
diff --git a/src/blackgui/components/corestatuscomponent.h b/src/blackgui/components/corestatuscomponent.h
index 3d8c749f8..b6e862618 100644
--- a/src/blackgui/components/corestatuscomponent.h
+++ b/src/blackgui/components/corestatuscomponent.h
@@ -7,6 +7,8 @@
  * contained in the LICENSE file.
  */
 
+//! \file
+
 #ifndef BLACKGUI_COMPONENTS_CORESTATUSCOMPONENT_H
 #define BLACKGUI_COMPONENTS_CORESTATUSCOMPONENT_H
 
diff --git a/src/blackgui/models/atcstationlistmodel.h b/src/blackgui/models/atcstationlistmodel.h
index 394f4a772..92230207e 100644
--- a/src/blackgui/models/atcstationlistmodel.h
+++ b/src/blackgui/models/atcstationlistmodel.h
@@ -17,7 +17,6 @@
 #include "blackgui/models/listmodelbase.h"
 #include <QAbstractItemModel>
 #include <QStandardItemModel>
-#include <QDBusConnection>
 
 namespace BlackGui
 {
@@ -26,7 +25,6 @@ namespace BlackGui
         //! ATC list model
         class BLACKGUI_EXPORT CAtcStationListModel : public CListModelBase<BlackMisc::Aviation::CAtcStation, BlackMisc::Aviation::CAtcStationList>
         {
-
         public:
             //! What kind of stations
             enum AtcStationMode
diff --git a/src/blackgui/views/simulatedaircraftview.cpp b/src/blackgui/views/simulatedaircraftview.cpp
index 089781051..0fedc03c1 100644
--- a/src/blackgui/views/simulatedaircraftview.cpp
+++ b/src/blackgui/views/simulatedaircraftview.cpp
@@ -51,7 +51,7 @@ namespace BlackGui
                 CSimulatedAircraft aircraft(selectedObject());
                 Q_ASSERT(!aircraft.getCallsign().isEmpty());
                 menu.addAction(CIcons::appTextMessages16(), "Show text messages", this, SLOT(ps_requestTextMessage()));
-                if (m_withMenuEnable)       { menu.addAction(CIcons::appAircrafts16(), aircraft.isEnabled() ? "Disable aircraft" : "Enabled aircraft", this, SLOT(ps_enableAircraft())); }
+                if (m_withMenuEnable)       { menu.addAction(CIcons::appAircraft16(), aircraft.isEnabled() ? "Disable aircraft" : "Enabled aircraft", this, SLOT(ps_enableAircraft())); }
                 if (m_withMenuHighlight)    { menu.addAction(CIcons::appSimulator16(), "Highlight in simulator", this, SLOT(ps_highlightInSimulator())); }
                 if (m_withMenuFastPosition) { menu.addAction(CIcons::globe16(), aircraft.fastPositionUpdates() ? "Normal updates" : "Fast position updates", this, SLOT(ps_fastPositionUpdates())); }
                 menu.addSeparator();
diff --git a/src/blackmisc/aviation/callsign.cpp b/src/blackmisc/aviation/callsign.cpp
index f3d7cccb1..32d2a5d56 100644
--- a/src/blackmisc/aviation/callsign.cpp
+++ b/src/blackmisc/aviation/callsign.cpp
@@ -10,6 +10,9 @@
 #include "blackmisc/aviation/callsign.h"
 #include "blackmisc/iconlist.h"
 
+#include <QThreadStorage>
+#include <QRegularExpression>
+
 namespace BlackMisc
 {
     namespace Aviation
diff --git a/src/blackmisc/loghandler.h b/src/blackmisc/loghandler.h
index 63eb7aef4..c7531620c 100644
--- a/src/blackmisc/loghandler.h
+++ b/src/blackmisc/loghandler.h
@@ -18,6 +18,8 @@
 #include <QObject>
 #include <QMap>
 #include <QPointer>
+#include <QThread>
+#include <QMetaMethod>
 
 namespace BlackMisc
 {
diff --git a/src/blackmisc/sampleutils.cpp b/src/blackmisc/sampleutils.cpp
index 484d39232..7402ea752 100644
--- a/src/blackmisc/sampleutils.cpp
+++ b/src/blackmisc/sampleutils.cpp
@@ -11,7 +11,6 @@
 
 namespace BlackMisc
 {
-
     QString CSampleUtils::selectDirectory(const QStringList &directoryOptions, QTextStream &streamOut, QTextStream &streamIn)
     {
         Q_ASSERT(!directoryOptions.isEmpty());
diff --git a/src/blackmisc/simulation/airspaceaircraftsnapshot.cpp b/src/blackmisc/simulation/airspaceaircraftsnapshot.cpp
index 5c1dfc133..79aee9905 100644
--- a/src/blackmisc/simulation/airspaceaircraftsnapshot.cpp
+++ b/src/blackmisc/simulation/airspaceaircraftsnapshot.cpp
@@ -8,6 +8,7 @@
  */
 
 #include "airspaceaircraftsnapshot.h"
+#include <QThread>
 
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::PhysicalQuantities;
diff --git a/src/blackmisc/simulation/simulatorsetup.h b/src/blackmisc/simulation/simulatorsetup.h
index 955a00cca..c2b7e5653 100644
--- a/src/blackmisc/simulation/simulatorsetup.h
+++ b/src/blackmisc/simulation/simulatorsetup.h
@@ -25,7 +25,6 @@ namespace BlackMisc
         //! Those are set up at runtime and represent information about the simulator (like a small registry)
         class BLACKMISC_EXPORT CSimulatorSetup : public CValueObject<CSimulatorSetup>
         {
-
         public:
             //! Specific values
             enum ColumnIndex