diff --git a/tests/blackcore/expect.cpp b/tests/blackcore/expect.cpp
index 613c00cbc..6fa159db1 100644
--- a/tests/blackcore/expect.cpp
+++ b/tests/blackcore/expect.cpp
@@ -15,9 +15,11 @@
  */
 
 #include "expect.h"
+
 #include <QCoreApplication>
+#include <QEventLoop>
+#include <QTest>
 #include <QTimer>
-#include <QtTest/QtTest>
 
 namespace BlackCoreTest
 {
diff --git a/tests/blackcore/expect.h b/tests/blackcore/expect.h
index 635504240..3c4583b24 100644
--- a/tests/blackcore/expect.h
+++ b/tests/blackcore/expect.h
@@ -10,11 +10,14 @@
 #ifndef BLACKCORETEST_EXPECT_H
 #define BLACKCORETEST_EXPECT_H
 
-#include <QObject>
 #include <QMetaMethod>
+#include <QMetaObject>
+#include <QObject>
 #include <QPointer>
-#include <QVector>
 #include <QSet>
+#include <QString>
+#include <QVector>
+#include <QtGlobal>
 #include <functional>
 
 //! \cond PRIVATE_TESTS
@@ -172,6 +175,7 @@ namespace BlackCoreTest
 
         // Helper traits class. Given T is a pointer-to-member-of-U, ClassOf<T>::type is U.
         template <class T> struct ClassOf;
+
         template <class U, class R> struct ClassOf<R U::*> { using type = U; };
 
         // Given T is a pointer-to-member-of-U, subject<T>() returns Expect's subject casted to U*.
diff --git a/tests/blackcore/main.cpp b/tests/blackcore/main.cpp
index 46628cefb..56e4b24bf 100644
--- a/tests/blackcore/main.cpp
+++ b/tests/blackcore/main.cpp
@@ -16,8 +16,9 @@
 
 #include "testblackcoremain.h"
 #include "blackcore/application.h"
+
 #include <QCoreApplication>
-#include <QDebug>
+#include <QtGlobal>
 
 using namespace BlackCoreTest;
 
diff --git a/tests/blackcore/testblackcoremain.cpp b/tests/blackcore/testblackcoremain.cpp
index 475f79768..f924db963 100644
--- a/tests/blackcore/testblackcoremain.cpp
+++ b/tests/blackcore/testblackcoremain.cpp
@@ -16,8 +16,10 @@
 
 #include "testblackcoremain.h"
 #include "testinterpolator.h"
-#include "testreaders.h"
 #include "testnetwork.h"
+#include "testreaders.h"
+
+#include <QtTest>
 
 namespace BlackCoreTest
 {
diff --git a/tests/blackcore/testblackcoremain.h b/tests/blackcore/testblackcoremain.h
index 8dfbd1a37..21904e41f 100644
--- a/tests/blackcore/testblackcoremain.h
+++ b/tests/blackcore/testblackcoremain.h
@@ -17,8 +17,6 @@
  * \ingroup testblackcore
  */
 
-#include <QtTest/QtTest>
-
 namespace BlackCoreTest
 {
 
diff --git a/tests/blackcore/testinterpolator.cpp b/tests/blackcore/testinterpolator.cpp
index 89d7ea5d4..09a8aafc6 100644
--- a/tests/blackcore/testinterpolator.cpp
+++ b/tests/blackcore/testinterpolator.cpp
@@ -15,9 +15,35 @@
  */
 
 #include "testinterpolator.h"
+#include "blackcore/interpolator.h"
 #include "blackcore/interpolatorlinear.h"
+#include "blackmisc/aviation/aircraftengine.h"
+#include "blackmisc/aviation/aircraftenginelist.h"
+#include "blackmisc/aviation/aircraftlights.h"
+#include "blackmisc/aviation/aircraftpartslist.h"
+#include "blackmisc/aviation/aircraftsituationlist.h"
+#include "blackmisc/aviation/altitude.h"
+#include "blackmisc/aviation/callsign.h"
+#include "blackmisc/aviation/heading.h"
+#include "blackmisc/compare.h"
+#include "blackmisc/geo/coordinategeodetic.h"
+#include "blackmisc/geo/latitude.h"
+#include "blackmisc/geo/longitude.h"
+#include "blackmisc/pq/angle.h"
+#include "blackmisc/pq/length.h"
+#include "blackmisc/pq/physicalquantity.h"
+#include "blackmisc/pq/speed.h"
+#include "blackmisc/pq/units.h"
+#include "blackmisc/simulation/remoteaircraftprovider.h"
 #include "blackmisc/simulation/remoteaircraftproviderdummy.h"
+
+#include <QCoreApplication>
+#include <QDebug>
+#include <QEventLoop>
 #include <QScopedPointer>
+#include <QTest>
+#include <QTime>
+#include <QtDebug>
 
 using namespace BlackCore;
 using namespace BlackMisc::Aviation;
diff --git a/tests/blackcore/testinterpolator.h b/tests/blackcore/testinterpolator.h
index 8eb4c91b8..39c0b13e4 100644
--- a/tests/blackcore/testinterpolator.h
+++ b/tests/blackcore/testinterpolator.h
@@ -17,10 +17,13 @@
  * \ingroup testblackcore
  */
 
-#include "blackmisc/aviation/aircraftsituation.h"
 #include "blackmisc/aviation/aircraftparts.h"
+#include "blackmisc/aviation/aircraftsituation.h"
 
-#include <QtTest/QtTest>
+#include <QObject>
+#include <QtGlobal>
+
+namespace BlackMisc { namespace Aviation { class CCallsign; } }
 
 namespace BlackCoreTest
 {
diff --git a/tests/blackcore/testnetwork.cpp b/tests/blackcore/testnetwork.cpp
index 905177d22..5ed42f23e 100644
--- a/tests/blackcore/testnetwork.cpp
+++ b/tests/blackcore/testnetwork.cpp
@@ -16,7 +16,22 @@
 
 #include "testnetwork.h"
 #include "expect.h"
+#include "blackcore/network.h"
+#include "blackmisc/aviation/aircrafticaocode.h"
+#include "blackmisc/aviation/airlineicaocode.h"
+#include "blackmisc/aviation/callsign.h"
 #include "blackmisc/network/networkutils.h"
+#include "blackmisc/network/server.h"
+#include "blackmisc/network/url.h"
+#include "blackmisc/network/user.h"
+#include "blackmisc/pq/time.h"
+#include "blackmisc/simulation/simulatedaircraft.h"
+#include "blackmisc/stringutils.h"
+
+#include <QString>
+#include <QTest>
+#include <QThread>
+#include <QtDebug>
 
 using namespace BlackCore;
 using namespace BlackMisc;
diff --git a/tests/blackcore/testnetwork.h b/tests/blackcore/testnetwork.h
index 9596a1c1a..f890fd454 100644
--- a/tests/blackcore/testnetwork.h
+++ b/tests/blackcore/testnetwork.h
@@ -15,9 +15,13 @@
 //! \ingroup testblackcore
 
 #include "blackcore/networkvatlib.h"
-#include "blackcore/data/globalsetup.h"
 #include "blackmisc/simulation/ownaircraftproviderdummy.h"
-#include <QtTest/QtTest>
+
+#include <stdbool.h>
+#include <QObject>
+
+namespace BlackCore { class INetwork; }
+namespace BlackMisc { namespace Network { class CServer; } }
 
 namespace BlackCoreTest
 {
diff --git a/tests/blackcore/testreaders.cpp b/tests/blackcore/testreaders.cpp
index 5b6af29e2..d25d528b2 100644
--- a/tests/blackcore/testreaders.cpp
+++ b/tests/blackcore/testreaders.cpp
@@ -13,12 +13,26 @@
 
 #include "testreaders.h"
 #include "blackcore/application.h"
-#include "blackmisc/network/networkutils.h"
+#include "blackcore/data/globalsetup.h"
+#include "blackcore/icaodatareader.h"
+#include "blackcore/modeldatareader.h"
 #include "blackmisc/aviation/aircrafticaocode.h"
+#include "blackmisc/aviation/aircrafticaocodelist.h"
 #include "blackmisc/aviation/airlineicaocode.h"
+#include "blackmisc/aviation/airlineicaocodelist.h"
+#include "blackmisc/aviation/livery.h"
+#include "blackmisc/network/entityflags.h"
+#include "blackmisc/network/networkutils.h"
+#include "blackmisc/simulation/aircraftmodel.h"
+#include "blackmisc/simulation/aircraftmodellist.h"
+
+#include <QDateTime>
+#include <QDebug>
+#include <QTest>
+#include <QString>
+#include <QtDebug>
 
 using namespace BlackCore;
-using namespace BlackCore::Settings;
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::Simulation;
diff --git a/tests/blackcore/testreaders.h b/tests/blackcore/testreaders.h
index 76cf80d0a..037db6281 100644
--- a/tests/blackcore/testreaders.h
+++ b/tests/blackcore/testreaders.h
@@ -14,10 +14,16 @@
 //! \file
 //! \ingroup testblackcore
 
-#include "blackcore/networkvatlib.h"
-#include "blackcore/modeldatareader.h"
-#include "blackcore/icaodatareader.h"
-#include <QtTest/QtTest>
+#include "blackmisc/network/url.h"
+
+#include <stdbool.h>
+#include <QObject>
+
+namespace BlackCore
+{
+    class CIcaoDataReader;
+    class CModelDataReader;
+}
 
 namespace BlackCoreTest
 {
diff --git a/tests/blackgui/main.cpp b/tests/blackgui/main.cpp
index db6a6c4a2..8e41b7eb6 100644
--- a/tests/blackgui/main.cpp
+++ b/tests/blackgui/main.cpp
@@ -15,8 +15,9 @@
  */
 
 #include "testblackguimain.h"
+
 #include <QCoreApplication>
-#include <QDebug>
+#include <QtGlobal>
 
 using namespace BlackCoreTest;
 
diff --git a/tests/blackgui/testblackguimain.cpp b/tests/blackgui/testblackguimain.cpp
index a2ddcacd8..fcbad97df 100644
--- a/tests/blackgui/testblackguimain.cpp
+++ b/tests/blackgui/testblackguimain.cpp
@@ -17,6 +17,8 @@
 #include "testblackguimain.h"
 #include "testutils.h"
 
+#include <QtTest>
+
 namespace BlackCoreTest
 {
     /*
diff --git a/tests/blackgui/testblackguimain.h b/tests/blackgui/testblackguimain.h
index 299c8b064..b3a4ff12e 100644
--- a/tests/blackgui/testblackguimain.h
+++ b/tests/blackgui/testblackguimain.h
@@ -17,8 +17,6 @@
 #ifndef BLACKCORETEST_TESTMAIN_H
 #define BLACKCORETEST_TESTMAIN_H
 
-#include <QtTest/QtTest>
-
 namespace BlackCoreTest
 {
 
diff --git a/tests/blackgui/testutils.cpp b/tests/blackgui/testutils.cpp
index d1e6ad486..24de4ec1b 100644
--- a/tests/blackgui/testutils.cpp
+++ b/tests/blackgui/testutils.cpp
@@ -17,6 +17,8 @@
 #include "testutils.h"
 #include "blackgui/guiutility.h"
 
+#include <QtTest>
+
 using namespace BlackGui;
 
 namespace BlackCoreTest
diff --git a/tests/blackgui/testutils.h b/tests/blackgui/testutils.h
index 6dbfc26ed..1919b8cf7 100644
--- a/tests/blackgui/testutils.h
+++ b/tests/blackgui/testutils.h
@@ -17,8 +17,7 @@
 #ifndef BLACKCORETEST_TESTUTILS_H
 #define BLACKCORETEST_TESTUTILS_H
 
-#include "blackgui/guiutility.h"
-#include <QtTest/QtTest>
+#include <QObject>
 
 namespace BlackCoreTest
 {
diff --git a/tests/blackmisc/main.cpp b/tests/blackmisc/main.cpp
index 0a0b3c050..5818db194 100644
--- a/tests/blackmisc/main.cpp
+++ b/tests/blackmisc/main.cpp
@@ -16,8 +16,9 @@
 
 #include "testblackmiscmain.h"
 #include "blackmisc/registermetadata.h"
+
 #include <QCoreApplication>
-#include <QDebug>
+#include <QtGlobal>
 
 using namespace BlackMiscTest;
 
diff --git a/tests/blackmisc/testaviation.cpp b/tests/blackmisc/testaviation.cpp
index 44e849344..e7daee1e3 100644
--- a/tests/blackmisc/testaviation.cpp
+++ b/tests/blackmisc/testaviation.cpp
@@ -15,19 +15,33 @@
  */
 
 #include "testaviation.h"
-#include "blackmisc/pq/constants.h"
-#include "blackmisc/aviation/heading.h"
-#include "blackmisc/aviation/informationmessage.h"
+#include "blackmisc/aviation/aircrafticaocode.h"
 #include "blackmisc/aviation/aircraftsituation.h"
+#include "blackmisc/aviation/airlineicaocode.h"
+#include "blackmisc/aviation/altitude.h"
+#include "blackmisc/aviation/atcstation.h"
+#include "blackmisc/aviation/callsign.h"
 #include "blackmisc/aviation/callsignset.h"
 #include "blackmisc/aviation/comsystem.h"
+#include "blackmisc/aviation/heading.h"
+#include "blackmisc/aviation/informationmessage.h"
 #include "blackmisc/aviation/navsystem.h"
 #include "blackmisc/aviation/transponder.h"
-#include "blackmisc/aviation/aircrafticaocode.h"
-#include "blackmisc/aviation/airlineicaocode.h"
-#include "blackmisc/aviation/atcstation.h"
-#include "blackmisc/network/user.h"
+#include "blackmisc/compare.h"
+#include "blackmisc/geo/coordinategeodetic.h"
+#include "blackmisc/geo/latitude.h"
+#include "blackmisc/geo/longitude.h"
 #include "blackmisc/network/server.h"
+#include "blackmisc/network/user.h"
+#include "blackmisc/pq/angle.h"
+#include "blackmisc/pq/frequency.h"
+#include "blackmisc/pq/length.h"
+#include "blackmisc/pq/physicalquantity.h"
+#include "blackmisc/pq/units.h"
+
+#include <QDateTime>
+#include <QString>
+#include <QTest>
 
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::PhysicalQuantities;
diff --git a/tests/blackmisc/testaviation.h b/tests/blackmisc/testaviation.h
index 3281f7e6f..af08add5d 100644
--- a/tests/blackmisc/testaviation.h
+++ b/tests/blackmisc/testaviation.h
@@ -17,7 +17,7 @@
  * \ingroup testblackmisc
  */
 
-#include <QtTest/QtTest>
+#include <QObject>
 
 namespace BlackMiscTest
 {
diff --git a/tests/blackmisc/testblackmiscmain.cpp b/tests/blackmisc/testblackmiscmain.cpp
index dc5fa9e22..65e170752 100644
--- a/tests/blackmisc/testblackmiscmain.cpp
+++ b/tests/blackmisc/testblackmiscmain.cpp
@@ -14,17 +14,19 @@
  * \ingroup testblackmisc
  */
 
-#include "testphysicalquantities.h"
 #include "testaviation.h"
+#include "testblackmiscmain.h"
+#include "testcontainers.h"
 #include "testgeo.h"
 #include "testidentifier.h"
-#include "testcontainers.h"
-#include "testvariantandmap.h"
 #include "testinput.h"
-#include "testvaluecache.h"
-#include "testblackmiscmain.h"
-#include "testweather.h"
 #include "testmath.h"
+#include "testphysicalquantities.h"
+#include "testvaluecache.h"
+#include "testvariantandmap.h"
+#include "testweather.h"
+
+#include <QTest>
 
 namespace BlackMiscTest
 {
diff --git a/tests/blackmisc/testblackmiscmain.h b/tests/blackmisc/testblackmiscmain.h
index e536a099c..dd2c54f90 100644
--- a/tests/blackmisc/testblackmiscmain.h
+++ b/tests/blackmisc/testblackmiscmain.h
@@ -17,8 +17,6 @@
  * \ingroup testblackmisc
  */
 
-#include <QtTest/QtTest>
-
 namespace BlackMiscTest
 {
     /*!
diff --git a/tests/blackmisc/testcontainers.cpp b/tests/blackmisc/testcontainers.cpp
index a87818535..e7ed08406 100644
--- a/tests/blackmisc/testcontainers.cpp
+++ b/tests/blackmisc/testcontainers.cpp
@@ -16,17 +16,30 @@
 
 #include "testcontainers.h"
 #include "testvalueobject.h"
-#include "blackmisc/registermetadata.h"
-#include "blackmisc/collection.h"
-#include "blackmisc/sequence.h"
-#include "blackmisc/aviation/callsignset.h"
+#include "blackmisc/aviation/aircraftsituation.h"
 #include "blackmisc/aviation/aircraftsituationlist.h"
+#include "blackmisc/aviation/callsign.h"
+#include "blackmisc/aviation/callsignset.h"
+#include "blackmisc/collection.h"
 #include "blackmisc/dictionary.h"
+#include "blackmisc/iterator.h"
+#include "blackmisc/range.h"
+#include "blackmisc/registermetadata.h"
+#include "blackmisc/sequence.h"
+
+#include <QDateTime>
+#include <QJsonObject>
 #include <QList>
-#include <QVector>
 #include <QSet>
-#include <vector>
+#include <QString>
+#include <QTest>
+#include <QVector>
+#include <QtGlobal>
+#include <algorithm>
+#include <iterator>
 #include <set>
+#include <vector>
+
 
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;
diff --git a/tests/blackmisc/testcontainers.h b/tests/blackmisc/testcontainers.h
index d57881981..1831c8e1f 100644
--- a/tests/blackmisc/testcontainers.h
+++ b/tests/blackmisc/testcontainers.h
@@ -17,7 +17,7 @@
  * \ingroup testblackmisc
  */
 
-#include <QtTest/QtTest>
+#include <QObject>
 
 namespace BlackMiscTest
 {
diff --git a/tests/blackmisc/testgeo.cpp b/tests/blackmisc/testgeo.cpp
index 952918ab9..3ba0f57a5 100644
--- a/tests/blackmisc/testgeo.cpp
+++ b/tests/blackmisc/testgeo.cpp
@@ -15,8 +15,12 @@
  */
 
 #include "testgeo.h"
+#include "blackmisc/geo/earthangle.h"
 #include "blackmisc/geo/latitude.h"
-#include "blackmisc/geo/longitude.h"
+#include "blackmisc/pq/physicalquantity.h"
+#include "blackmisc/pq/units.h"
+
+#include <QTest>
 
 using namespace BlackMisc::Geo;
 using namespace BlackMisc::PhysicalQuantities;
diff --git a/tests/blackmisc/testgeo.h b/tests/blackmisc/testgeo.h
index e3946c771..a821dde45 100644
--- a/tests/blackmisc/testgeo.h
+++ b/tests/blackmisc/testgeo.h
@@ -17,7 +17,7 @@
  * \ingroup testblackmisc
  */
 
-#include <QtTest/QtTest>
+#include <QObject>
 
 namespace BlackMiscTest
 {
diff --git a/tests/blackmisc/testidentifier.cpp b/tests/blackmisc/testidentifier.cpp
index fac523a63..781876943 100644
--- a/tests/blackmisc/testidentifier.cpp
+++ b/tests/blackmisc/testidentifier.cpp
@@ -15,7 +15,11 @@
  */
 
 #include "testidentifier.h"
-#include "blackmisc/identifierlist.h"
+#include "blackmisc/compare.h"
+#include "blackmisc/identifier.h"
+
+#include <QString>
+#include <QTest>
 
 using namespace BlackMisc;
 
diff --git a/tests/blackmisc/testidentifier.h b/tests/blackmisc/testidentifier.h
index ed1d4183b..466463eb5 100644
--- a/tests/blackmisc/testidentifier.h
+++ b/tests/blackmisc/testidentifier.h
@@ -18,7 +18,8 @@
  */
 
 #include "blackmisc/identifiable.h"
-#include <QtTest/QtTest>
+
+#include <QObject>
 
 namespace BlackMiscTest
 {
diff --git a/tests/blackmisc/testinput.cpp b/tests/blackmisc/testinput.cpp
index ad2265d54..db1e777ea 100644
--- a/tests/blackmisc/testinput.cpp
+++ b/tests/blackmisc/testinput.cpp
@@ -15,9 +15,17 @@
  */
 
 #include "testinput.h"
-#include "blackmisc/input/keyboardkey.h"
-#include "blackmisc/input/hotkeycombination.h"
+#include "blackmisc/compare.h"
+#include "blackmisc/identifier.h"
+#include "blackmisc/input/actionhotkey.h"
 #include "blackmisc/input/actionhotkeylist.h"
+#include "blackmisc/input/hotkeycombination.h"
+#include "blackmisc/input/keyboardkey.h"
+#include "blackmisc/input/keycodes.h"
+#include "blackmisc/variant.h"
+
+#include <QString>
+#include <QTest>
 
 using namespace BlackMisc;
 using namespace BlackMisc::Input;
diff --git a/tests/blackmisc/testinput.h b/tests/blackmisc/testinput.h
index c5d81ec00..de27f012d 100644
--- a/tests/blackmisc/testinput.h
+++ b/tests/blackmisc/testinput.h
@@ -17,7 +17,7 @@
  * \ingroup testblackmisc
  */
 
-#include <QtTest/QtTest>
+#include <QObject>
 
 namespace BlackMiscTest
 {
diff --git a/tests/blackmisc/testmath.cpp b/tests/blackmisc/testmath.cpp
index 22669ae09..054745446 100644
--- a/tests/blackmisc/testmath.cpp
+++ b/tests/blackmisc/testmath.cpp
@@ -17,6 +17,8 @@
 #include "testmath.h"
 #include "blackmisc/math/mathutils.h"
 
+#include <QTest>
+
 using namespace BlackMisc::Math;
 
 namespace BlackMiscTest
diff --git a/tests/blackmisc/testmath.h b/tests/blackmisc/testmath.h
index 600bcd055..0d83c897f 100644
--- a/tests/blackmisc/testmath.h
+++ b/tests/blackmisc/testmath.h
@@ -17,7 +17,7 @@
  * \ingroup testblackmisc
  */
 
-#include <QtTest/QtTest>
+#include <QObject>
 
 namespace BlackMiscTest
 {
diff --git a/tests/blackmisc/testphysicalquantities.cpp b/tests/blackmisc/testphysicalquantities.cpp
index 7e83f5f6d..4a1bab0dd 100644
--- a/tests/blackmisc/testphysicalquantities.cpp
+++ b/tests/blackmisc/testphysicalquantities.cpp
@@ -15,6 +15,26 @@
  */
 
 #include "testphysicalquantities.h"
+#include "blackmisc/math/mathutils.h"
+#include "blackmisc/pq/acceleration.h"
+#include "blackmisc/pq/angle.h"
+#include "blackmisc/pq/constants.h"
+#include "blackmisc/pq/frequency.h"
+#include "blackmisc/pq/length.h"
+#include "blackmisc/pq/mass.h"
+#include "blackmisc/pq/measurementunit.h"
+#include "blackmisc/pq/physicalquantity.h"
+#include "blackmisc/pq/pqstring.h"
+#include "blackmisc/pq/pressure.h"
+#include "blackmisc/pq/speed.h"
+#include "blackmisc/pq/temperature.h"
+#include "blackmisc/pq/time.h"
+#include "blackmisc/pq/units.h"
+#include "blackmisc/variant.h"
+
+#include <QString>
+#include <QtGlobal>
+#include <QTest>
 
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Math;
diff --git a/tests/blackmisc/testphysicalquantities.h b/tests/blackmisc/testphysicalquantities.h
index 228af308b..843e2d6eb 100644
--- a/tests/blackmisc/testphysicalquantities.h
+++ b/tests/blackmisc/testphysicalquantities.h
@@ -17,8 +17,7 @@
  * \ingroup testblackmisc
  */
 
-#include <QtTest/QtTest>
-#include "blackmisc/pq/constants.h"
+#include <QObject>
 
 namespace BlackMiscTest
 {
diff --git a/tests/blackmisc/testvaluecache.cpp b/tests/blackmisc/testvaluecache.cpp
index f084c835d..434766006 100644
--- a/tests/blackmisc/testvaluecache.cpp
+++ b/tests/blackmisc/testvaluecache.cpp
@@ -15,12 +15,35 @@
  */
 
 #include "testvaluecache.h"
-#include "blackmisc/worker.h"
-#include "blackmisc/identifier.h"
+#include "blackmisc/aviation/atcstation.h"
 #include "blackmisc/aviation/atcstationlist.h"
+#include "blackmisc/dictionary.h"
+#include "blackmisc/identifier.h"
+#include "blackmisc/simulation/simulatedaircraft.h"
 #include "blackmisc/simulation/simulatedaircraftlist.h"
+#include "blackmisc/statusmessage.h"
+#include "blackmisc/variant.h"
+#include "blackmisc/variantmap.h"
+#include "blackmisc/worker.h"
 
+#include <QCoreApplication>
+#include <QDateTime>
+#include <QDir>
+#include <QFileInfo>
+#include <QFlags>
+#include <QJsonObject>
+#include <QJsonValue>
+#include <QList>
+#include <QMetaObject>
+#include <QRegularExpression>
+#include <QString>
+#include <QTest>
+#include <QThread>
+#include <QTimer>
+#include <QtDebug>
+#include <chrono>
 #include <future>
+#include <ratio>
 
 namespace BlackMiscTest
 {
diff --git a/tests/blackmisc/testvaluecache.h b/tests/blackmisc/testvaluecache.h
index 1f92e1d47..b827d2cf3 100644
--- a/tests/blackmisc/testvaluecache.h
+++ b/tests/blackmisc/testvaluecache.h
@@ -18,7 +18,8 @@
  */
 
 #include "blackmisc/valuecache.h"
-#include <QtTest/QtTest>
+
+#include <QObject>
 #include <future>
 
 namespace BlackMiscTest
diff --git a/tests/blackmisc/testvalueobject.cpp b/tests/blackmisc/testvalueobject.cpp
index 0cd5548d1..7656f1f9d 100644
--- a/tests/blackmisc/testvalueobject.cpp
+++ b/tests/blackmisc/testvalueobject.cpp
@@ -15,7 +15,6 @@
  */
 
 #include "testvalueobject.h"
-#include <tuple>
 
 namespace BlackMisc
 {
diff --git a/tests/blackmisc/testvalueobject.h b/tests/blackmisc/testvalueobject.h
index cf69615f2..fd60a0602 100644
--- a/tests/blackmisc/testvalueobject.h
+++ b/tests/blackmisc/testvalueobject.h
@@ -16,12 +16,23 @@
  * \file
  * \ingroup testblackmisc
  */
-
-#include "blackmisc/propertyindex.h"
-#include "blackmisc/sequence.h"
 #include "blackmisc/collection.h"
 #include "blackmisc/dictionary.h"
+#include "blackmisc/metaclass.h"
+#include "blackmisc/propertyindex.h"
+#include "blackmisc/sequence.h"
 #include "blackmisc/valueobject.h"
+#include "blackmisc/variant.h"
+
+#include <QDBusArgument>
+#include <QHash>
+#include <QMap>
+#include <QMetaType>
+#include <QString>
+#include <type_traits>
+
+class QJsonArray;
+class QJsonValueRef;
 
 namespace BlackMisc
 {
diff --git a/tests/blackmisc/testvariantandmap.cpp b/tests/blackmisc/testvariantandmap.cpp
index c5bf665cb..0d409d6bc 100644
--- a/tests/blackmisc/testvariantandmap.cpp
+++ b/tests/blackmisc/testvariantandmap.cpp
@@ -16,10 +16,19 @@
 
 #include "testvariantandmap.h"
 #include "blackmisc/aviation/atcstation.h"
-#include "blackmisc/propertyindexallclasses.h"
-#include <QList>
-#include <QString>
-#include <vector>
+#include "blackmisc/aviation/callsign.h"
+#include "blackmisc/compare.h"
+#include "blackmisc/geo/coordinategeodetic.h"
+#include "blackmisc/network/user.h"
+#include "blackmisc/pq/frequency.h"
+#include "blackmisc/pq/length.h"
+#include "blackmisc/pq/physicalquantity.h"
+#include "blackmisc/pq/units.h"
+#include "blackmisc/propertyindexvariantmap.h"
+#include "blackmisc/variant.h"
+
+#include <QDateTime>
+#include <QTest>
 
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;
diff --git a/tests/blackmisc/testvariantandmap.h b/tests/blackmisc/testvariantandmap.h
index f38e24792..2f4a35dc8 100644
--- a/tests/blackmisc/testvariantandmap.h
+++ b/tests/blackmisc/testvariantandmap.h
@@ -17,9 +17,7 @@
  * \ingroup testblackmisc
  */
 
-#include "blackmisc/pq/constants.h"
-#include "blackmisc/aviation/atcstation.h"
-#include <QtTest/QtTest>
+#include <QObject>
 
 namespace BlackMiscTest
 {
diff --git a/tests/blackmisc/testweather.cpp b/tests/blackmisc/testweather.cpp
index 274022dc1..edadb313f 100644
--- a/tests/blackmisc/testweather.cpp
+++ b/tests/blackmisc/testweather.cpp
@@ -15,12 +15,32 @@
  */
 
 #include "testweather.h"
-#include "blackmisc/weather/metardecoder.h"
+#include "blackmisc/aviation/airporticaocode.h"
+#include "blackmisc/aviation/altitude.h"
+#include "blackmisc/compare.h"
+#include "blackmisc/pq/angle.h"
+#include "blackmisc/pq/length.h"
+#include "blackmisc/pq/physicalquantity.h"
+#include "blackmisc/pq/pressure.h"
+#include "blackmisc/pq/speed.h"
+#include "blackmisc/pq/temperature.h"
+#include "blackmisc/pq/time.h"
+#include "blackmisc/pq/units.h"
+#include "blackmisc/weather/cloudlayer.h"
 #include "blackmisc/weather/cloudlayerlist.h"
+#include "blackmisc/weather/metar.h"
+#include "blackmisc/weather/metardecoder.h"
+#include "blackmisc/weather/presentweather.h"
+#include "blackmisc/weather/presentweatherlist.h"
+#include "blackmisc/weather/temperaturelayer.h"
 #include "blackmisc/weather/temperaturelayerlist.h"
+#include "blackmisc/weather/visibilitylayer.h"
 #include "blackmisc/weather/visibilitylayerlist.h"
+#include "blackmisc/weather/windlayer.h"
 #include "blackmisc/weather/windlayerlist.h"
 
+#include <QTest>
+
 using namespace BlackMisc::Weather;
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::PhysicalQuantities;
diff --git a/tests/blackmisc/testweather.h b/tests/blackmisc/testweather.h
index 2833bd5c6..b38e1bb65 100644
--- a/tests/blackmisc/testweather.h
+++ b/tests/blackmisc/testweather.h
@@ -17,7 +17,7 @@
  * \ingroup testblackmisc
  */
 
-#include <QtTest/QtTest>
+#include <QObject>
 
 namespace BlackMiscTest
 {