diff --git a/samples/blackmisc/main.cpp b/samples/blackmisc/main.cpp
index 077e7e716..87bdeef27 100644
--- a/samples/blackmisc/main.cpp
+++ b/samples/blackmisc/main.cpp
@@ -7,15 +7,18 @@
  * contained in the LICENSE file.
  */
 
+#include "blackcore/application.h"
+#include "samplesalgorithm.h"
 #include "sampleschangeobject.h"
-#include "samplesmetadata.h"
 #include "samplescontainer.h"
 #include "samplesjson.h"
+#include "samplesmetadata.h"
 #include "samplesperformance.h"
-#include "samplesalgorithm.h"
-#include "blackcore/application.h"
-#include "blackmisc/registermetadata.h"
-#include "blackmisc/pq/pq.h"
+
+#include <stdio.h>
+#include <QCoreApplication>
+#include <QString>
+#include <QTextStream>
 
 //! \file
 //! \ingroup sampleblackmisc
diff --git a/samples/blackmisc/samplesalgorithm.cpp b/samples/blackmisc/samplesalgorithm.cpp
index 70f9dedd9..e3a280f83 100644
--- a/samples/blackmisc/samplesalgorithm.cpp
+++ b/samples/blackmisc/samplesalgorithm.cpp
@@ -12,10 +12,19 @@
 
 #include "samplesalgorithm.h"
 #include "blackmisc/algorithm.h"
+#include "blackmisc/iterator.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/collection.h"
+#include "blackmisc/stringutils.h"
+
+#include <QChar>
 #include <QDebug>
+#include <QList>
 #include <QString>
+#include <QStringList>
+#include <QTypeInfo>
+#include <QtDebug>
+#include <algorithm>
+#include <cmath>
 #include <numeric>
 
 namespace BlackSample
diff --git a/samples/blackmisc/sampleschangeobject.cpp b/samples/blackmisc/sampleschangeobject.cpp
index f656faed9..7fa05d7af 100644
--- a/samples/blackmisc/sampleschangeobject.cpp
+++ b/samples/blackmisc/sampleschangeobject.cpp
@@ -11,15 +11,20 @@
 //! \ingroup sampleblackmisc
 
 #include "sampleschangeobject.h"
-#include "blackmisc/pq/constants.h"
-#include "blackmisc/aviation/heading.h"
-#include "blackmisc/aviation/comsystem.h"
-#include "blackmisc/aviation/navsystem.h"
-#include "blackmisc/aviation/transponder.h"
+#include "blackmisc/aviation/atcstation.h"
 #include "blackmisc/aviation/atcstationlist.h"
-#include "blackmisc/propertyindexallclasses.h"
+#include "blackmisc/aviation/callsign.h"
+#include "blackmisc/geo/coordinategeodetic.h"
+#include "blackmisc/network/user.h"
+#include "blackmisc/pq/frequency.h"
+#include "blackmisc/pq/length.h"
+#include "blackmisc/pq/units.h"
 #include "blackmisc/predicates.h"
-#include <QDebug>
+#include "blackmisc/propertyindexvariantmap.h"
+#include "blackmisc/variant.h"
+
+#include <QDateTime>
+#include <QtDebug>
 
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;
diff --git a/samples/blackmisc/samplescontainer.cpp b/samples/blackmisc/samplescontainer.cpp
index a270cf5f9..ca8495df8 100644
--- a/samples/blackmisc/samplescontainer.cpp
+++ b/samples/blackmisc/samplescontainer.cpp
@@ -11,10 +11,24 @@
 //! \ingroup sampleblackmisc
 
 #include "samplescontainer.h"
+#include "blackmisc/aviation/atcstation.h"
 #include "blackmisc/aviation/atcstationlist.h"
-#include "blackmisc/propertyindexallclasses.h"
+#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/units.h"
+#include "blackmisc/propertyindexlist.h"
+#include "blackmisc/propertyindexvariantmap.h"
+#include "blackmisc/range.h"
+#include "blackmisc/stringutils.h"
+#include "blackmisc/variant.h"
+
+#include <QDateTime>
 #include <QDebug>
-#include <QMetaType>
+#include <QtDebug>
 
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;
diff --git a/samples/blackmisc/samplesjson.cpp b/samples/blackmisc/samplesjson.cpp
index 7a526e607..3806b2337 100644
--- a/samples/blackmisc/samplesjson.cpp
+++ b/samples/blackmisc/samplesjson.cpp
@@ -11,10 +11,33 @@
 //! \ingroup sampleblackmisc
 
 #include "samplesjson.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/atcstationlist.h"
+#include "blackmisc/aviation/callsign.h"
+#include "blackmisc/aviation/comsystem.h"
+#include "blackmisc/aviation/heading.h"
+#include "blackmisc/aviation/transponder.h"
+#include "blackmisc/geo/coordinategeodetic.h"
+#include "blackmisc/network/user.h"
+#include "blackmisc/pq/angle.h"
+#include "blackmisc/pq/frequency.h"
+#include "blackmisc/pq/length.h"
+#include "blackmisc/pq/speed.h"
+#include "blackmisc/pq/units.h"
 #include "blackmisc/simulation/simulatedaircraft.h"
+#include "blackmisc/stringutils.h"
+
+#include <stdio.h>
+#include <QDateTime>
+#include <QDebug>
 #include <QJsonDocument>
+#include <QJsonObject>
 #include <QTextStream>
+#include <QtDebug>
 
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;
diff --git a/samples/blackmisc/samplesmetadata.cpp b/samples/blackmisc/samplesmetadata.cpp
index 5df78f683..4c858cb7b 100644
--- a/samples/blackmisc/samplesmetadata.cpp
+++ b/samples/blackmisc/samplesmetadata.cpp
@@ -11,16 +11,11 @@
 //! \ingroup sampleblackmisc
 
 #include "samplesmetadata.h"
-#include "blackmisc/registermetadata.h"
 #include "blackmisc/metadatautils.h"
-#include "blackmisc/aviation/atcstationlist.h"
-#include <QDebug>
-#include <QMetaType>
+#include "blackmisc/registermetadata.h"
 
-using namespace BlackMisc::Aviation;
-using namespace BlackMisc::PhysicalQuantities;
-using namespace BlackMisc::Geo;
-using namespace BlackMisc::Network;
+#include <stdio.h>
+#include <QTextStream>
 
 namespace BlackSample
 {
diff --git a/samples/blackmisc/samplesperformance.cpp b/samples/blackmisc/samplesperformance.cpp
index f42e1a8cb..dd50f681b 100644
--- a/samples/blackmisc/samplesperformance.cpp
+++ b/samples/blackmisc/samplesperformance.cpp
@@ -11,17 +11,35 @@
 //! \ingroup sampleblackmisc
 
 #include "samplesperformance.h"
+#include "blackmisc/aviation/aircraftsituation.h"
 #include "blackmisc/aviation/aircraftsituationlist.h"
-#include "blackmisc/geo/coordinategeodetic.h"
 #include "blackmisc/aviation/altitude.h"
+#include "blackmisc/aviation/atcstation.h"
+#include "blackmisc/aviation/atcstationlist.h"
+#include "blackmisc/aviation/callsign.h"
+#include "blackmisc/geo/coordinategeodetic.h"
+#include "blackmisc/pq/units.h"
 #include "blackmisc/testing.h"
 
+#include <QDateTime>
+#include <QHash>
+#include <QList>
+#include <QRegExp>
+#include <QRegularExpression>
+#include <QRegularExpressionMatch>
+#include <QString>
+#include <QStringList>
+#include <QTextStream>
+#include <QTime>
+#include <QVector>
+#include <Qt>
+#include <algorithm>
+#include <iterator>
+
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::Geo;
 using namespace BlackMisc::PhysicalQuantities;
 
-#include <QRegularExpression>
-
 namespace BlackSample
 {
     int CSamplesPerformance::samplesMisc(QTextStream &out)
diff --git a/samples/blackmisc/samplesperformance.h b/samples/blackmisc/samplesperformance.h
index 24f05eb07..df0756c23 100644
--- a/samples/blackmisc/samplesperformance.h
+++ b/samples/blackmisc/samplesperformance.h
@@ -14,7 +14,11 @@
 #define BLACKSAMPLE_SAMPLESPERFORMANCE_H
 
 #include "blackmisc/aviation/aircraftsituationlist.h"
+
 #include <QTextStream>
+#include <QtGlobal>
+
+class QTextStream;
 
 namespace BlackSample
 {
diff --git a/samples/blackmiscdbus/main.cpp b/samples/blackmiscdbus/main.cpp
index 2ec1aeae0..ad7500b3b 100644
--- a/samples/blackmiscdbus/main.cpp
+++ b/samples/blackmiscdbus/main.cpp
@@ -10,15 +10,20 @@
 //! \file
 //! \ingroup sampleblackmiscdbus
 
+#include "blackmisc/dbusserver.h"
 #include "blackmisc/registermetadata.h"
 #include "servicetool.h"
-#include "blackmisc/dbusserver.h"
-#include <QDBusMetaType>
-#include <QDBusServer>
-#include <QtDBus/qdbusabstractinterface.h>
-#include <QtDBus/qdbusconnection.h>
+
+#include <stdio.h>
 #include <QCoreApplication>
-#include <QList>
+#include <QDBusServer>
+#include <QDebug>
+#include <QRegExp>
+#include <QString>
+#include <QStringList>
+#include <QTextStream>
+#include <Qt>
+#include <QtDebug>
 
 //! main
 int main(int argc, char *argv[])
diff --git a/samples/blackmiscdbus/servicetool.cpp b/samples/blackmiscdbus/servicetool.cpp
index b852d76c1..7ada997b1 100644
--- a/samples/blackmiscdbus/servicetool.cpp
+++ b/samples/blackmiscdbus/servicetool.cpp
@@ -13,11 +13,63 @@
 #include "servicetool.h"
 #include "testservice.h"
 #include "testserviceinterface.h"
+#include "blackmisc/aviation/aircrafticaocode.h"
+#include "blackmisc/aviation/aircraftsituation.h"
+#include "blackmisc/aviation/airport.h"
+#include "blackmisc/aviation/altitude.h"
+#include "blackmisc/aviation/atcstation.h"
+#include "blackmisc/aviation/comsystem.h"
+#include "blackmisc/aviation/track.h"
+#include "blackmisc/aviation/transponder.h"
+#include "blackmisc/compare.h"
 #include "blackmisc/dbusserver.h"
+#include "blackmisc/geo/coordinategeodetic.h"
+#include "blackmisc/iterator.h"
+#include "blackmisc/network/client.h"
+#include "blackmisc/network/server.h"
+#include "blackmisc/network/user.h"
+#include "blackmisc/pq/constants.h"
+#include "blackmisc/pq/frequency.h"
+#include "blackmisc/pq/length.h"
+#include "blackmisc/pq/speed.h"
+#include "blackmisc/pq/units.h"
+#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexvariantmap.h"
+#include "blackmisc/sequence.h"
+#include "blackmisc/simulation/aircraftmodel.h"
+#include "blackmisc/simulation/fscommon/aircraftcfgentries.h"
+#include "blackmisc/simulation/simulatedaircraft.h"
+#include "blackmisc/simulation/simulatorplugininfo.h"
+#include "blackmisc/stringutils.h"
+#include "blackmisc/variant.h"
+#include "blackmisc/variantlist.h"
 
-#include <QTextStream>
-#include <QString>
+#include <stdio.h>
+#include <stdlib.h>
+#include <QChar>
+#include <QDBusConnection>
+#include <QDBusConnectionInterface>
+#include <QDBusError>
+#include <QDBusMessage>
+#include <QDBusObjectPath>
+#include <QDBusPendingReply>
+#include <QDBusReply>
+#include <QDBusVariant>
+#include <QDateTime>
+#include <QDebug>
 #include <QElapsedTimer>
+#include <QFlags>
+#include <QLatin1Char>
+#include <QList>
+#include <QObject>
+#include <QProcess>
+#include <QString>
+#include <QTextStream>
+#include <QThread>
+#include <QVariant>
+#include <QtDebug>
+
+class QDBusObjectPath;
 
 using namespace BlackMisc;
 using namespace BlackMisc::Simulation;
diff --git a/samples/blackmiscdbus/servicetool.h b/samples/blackmiscdbus/servicetool.h
index 5786d6cda..3a98fa148 100644
--- a/samples/blackmiscdbus/servicetool.h
+++ b/samples/blackmiscdbus/servicetool.h
@@ -13,16 +13,26 @@
 #ifndef BLACKSAMPLE_SERVICETOOL_H
 #define BLACKSAMPLE_SERVICETOOL_H
 
-#include "blackmisc/aviation/atcstationlist.h"
 #include "blackmisc/aviation/airportlist.h"
+#include "blackmisc/aviation/atcstationlist.h"
+#include "blackmisc/aviation/callsign.h"
 #include "blackmisc/network/clientlist.h"
 #include "blackmisc/simulation/fscommon/aircraftcfgentrieslist.h"
+
 #include <QCoreApplication>
-#include <QProcess>
-#include <QDBusConnection>
+#include <QDBusArgument>
+#include <QString>
+#include <QStringList>
+#include <QtGlobal>
+
+class QDBusConnection;
+class QObject;
+class QProcess;
 
 namespace BlackMisc { class CDBusServer; }
-namespace BlackSample {
+
+namespace BlackSample
+{
 	
     class Testservice; // forward declaration
 
diff --git a/samples/blackmiscdbus/testservice.cpp b/samples/blackmiscdbus/testservice.cpp
index bb8886259..bc061750f 100644
--- a/samples/blackmiscdbus/testservice.cpp
+++ b/samples/blackmiscdbus/testservice.cpp
@@ -11,6 +11,21 @@
 //! \ingroup sampleblackmiscdbus
 
 #include "testservice.h"
+#include "servicetool.h"
+#include "blackmisc/aviation/callsign.h"
+#include "blackmisc/aviation/comsystem.h"
+#include "blackmisc/aviation/track.h"
+#include "blackmisc/dbus.h"
+#include "blackmisc/pq/frequency.h"
+#include "blackmisc/pq/units.h"
+#include "blackmisc/stringutils.h"
+
+#include <QDBusArgument>
+#include <QDBusObjectPath>
+#include <QDebug>
+#include <QVariant>
+#include <QtDebug>
+#include <QtGlobal>
 
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;
diff --git a/samples/blackmiscdbus/testservice.h b/samples/blackmiscdbus/testservice.h
index e25f59e1c..5e765bb8e 100644
--- a/samples/blackmiscdbus/testservice.h
+++ b/samples/blackmiscdbus/testservice.h
@@ -17,19 +17,44 @@
 #pragma push_macro("interface")
 #undef interface
 
-#include "blackmisc/aviation/aviation.h"
-#include "blackmisc/network/network.h"
-#include "blackmisc/pq/pq.h"
+#include "blackmisc/aviation/aircrafticaocode.h"
+#include "blackmisc/aviation/aircraftsituation.h"
+#include "blackmisc/aviation/airportlist.h"
+#include "blackmisc/aviation/altitude.h"
+#include "blackmisc/aviation/atcstation.h"
+#include "blackmisc/aviation/atcstationlist.h"
+#include "blackmisc/aviation/transponder.h"
+#include "blackmisc/geo/coordinategeodetic.h"
+#include "blackmisc/network/client.h"
+#include "blackmisc/network/clientlist.h"
+#include "blackmisc/network/user.h"
+#include "blackmisc/pq/length.h"
+#include "blackmisc/pq/speed.h"
+#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexvariantmap.h"
+#include "blackmisc/simulation/fscommon/aircraftcfgentrieslist.h"
+#include "blackmisc/simulation/simulatedaircraft.h"
 #include "blackmisc/simulation/simulatedaircraftlist.h"
 #include "blackmisc/simulation/simulatorplugininfo.h"
-#include "blackmisc/math/math.h"
-#include "blackmisc/simulation/fscommon/aircraftcfgentrieslist.h"
-#include "servicetool.h"
+#include "blackmisc/variant.h"
+
+#include <QList>
 #include <QObject>
-#include <QDebug>
-#include <QDBusVariant>
-#include <QDBusConnection>
-#include <QDBusObjectPath>
+#include <QString>
+#include <QVariantList>
+
+class QDBusObjectPath;
+class QVariant;
+
+namespace BlackMisc
+{
+    namespace Aviation
+    {
+        class CCallsign;
+        class CComSystem;
+        class CTrack;
+    }
+}
 
 //! DBus interface for test service
 #define BLACKSAMPLE_TESTSERVICE_INTERFACENAME "blackmisctest.testservice"
diff --git a/samples/blackmiscdbus/testserviceinterface.cpp b/samples/blackmiscdbus/testserviceinterface.cpp
index cd10db752..8bb6f2eac 100644
--- a/samples/blackmiscdbus/testserviceinterface.cpp
+++ b/samples/blackmiscdbus/testserviceinterface.cpp
@@ -12,6 +12,8 @@
 
 #include "testserviceinterface.h"
 
+class QDBusConnection;
+
 namespace BlackSample
 {
     TestServiceInterface::TestServiceInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
diff --git a/samples/blackmiscdbus/testserviceinterface.h b/samples/blackmiscdbus/testserviceinterface.h
index f50594f7c..852d25d8d 100644
--- a/samples/blackmiscdbus/testserviceinterface.h
+++ b/samples/blackmiscdbus/testserviceinterface.h
@@ -13,23 +13,48 @@
 #ifndef BLACKSAMPLE_TESTSERVICE_INTERFACE_H
 #define BLACKSAMPLE_TESTSERVICE_INTERFACE_H
 
+#include "blackmisc/aviation/aircrafticaocode.h"
+#include "blackmisc/aviation/aircraftsituation.h"
+#include "blackmisc/aviation/airportlist.h"
+#include "blackmisc/aviation/altitude.h"
+#include "blackmisc/aviation/atcstation.h"
 #include "blackmisc/aviation/atcstationlist.h"
+#include "blackmisc/aviation/callsign.h"
+#include "blackmisc/aviation/comsystem.h"
 #include "blackmisc/aviation/track.h"
 #include "blackmisc/aviation/transponder.h"
-#include "blackmisc/aviation/airportlist.h"
+#include "blackmisc/geo/coordinategeodetic.h"
+#include "blackmisc/network/client.h"
+#include "blackmisc/network/clientlist.h"
+#include "blackmisc/network/user.h"
+#include "blackmisc/pq/length.h"
+#include "blackmisc/pq/speed.h"
+#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexvariantmap.h"
 #include "blackmisc/simulation/fscommon/aircraftcfgentrieslist.h"
+#include "blackmisc/simulation/simulatedaircraft.h"
 #include "blackmisc/simulation/simulatedaircraftlist.h"
 #include "blackmisc/simulation/simulatorplugininfo.h"
-#include "blackmisc/network/clientlist.h"
 #include "blackmisc/variantlist.h"
-#include <QtCore/QObject>
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
-#include <QtDBus/QtDBus>
+
+#include <QDBusAbstractInterface>
+#include <QDBusPendingCall>
+#include <QDBusPendingReply>
+#include <QLatin1String>
+#include <QList>
+#include <QObject>
+#include <QString>
+#include <QVariant>
+
+class QDBusConnection;
+class QDBusObjectPath;
+class QDBusVariant;
+
+namespace BlackMisc
+{
+    class CVariant;
+    namespace Simulation { namespace FsCommon { class CAircraftCfgEntriesList; } }
+}
 
 namespace BlackSample
 {
diff --git a/samples/blackmiscquantities/main.cpp b/samples/blackmiscquantities/main.cpp
index ccd5a40fc..616b4bb15 100644
--- a/samples/blackmiscquantities/main.cpp
+++ b/samples/blackmiscquantities/main.cpp
@@ -10,11 +10,16 @@
 //! \file
 //! \ingroup sampleblackmiscquantities
 
-#include "samplesphysicalquantities.h"
 #include "samplesaviation.h"
 #include "samplesgeo.h"
+#include "samplesphysicalquantities.h"
 #include "blackcore/application.h"
+
+#include <stdio.h>
+#include <QCoreApplication>
+#include <QIODevice>
 #include <QTextStream>
+#include <QtGlobal>
 
 using namespace BlackMisc;
 using namespace BlackSample;
diff --git a/samples/blackmiscquantities/samplesaviation.cpp b/samples/blackmiscquantities/samplesaviation.cpp
index 6abec65f2..b9631de16 100644
--- a/samples/blackmiscquantities/samplesaviation.cpp
+++ b/samples/blackmiscquantities/samplesaviation.cpp
@@ -11,17 +11,27 @@
 //! \ingroup sampleblackmiscquantities
 
 #include "samplesaviation.h"
-#include "blackmisc/pq/constants.h"
-#include "blackmisc/aviation/heading.h"
+#include "blackmisc/aviation/airporticaocode.h"
+#include "blackmisc/aviation/altitude.h"
+#include "blackmisc/aviation/atcstation.h"
+#include "blackmisc/aviation/atcstationlist.h"
+#include "blackmisc/aviation/callsign.h"
 #include "blackmisc/aviation/comsystem.h"
+#include "blackmisc/aviation/heading.h"
 #include "blackmisc/aviation/navsystem.h"
 #include "blackmisc/aviation/transponder.h"
-#include "blackmisc/aviation/atcstationlist.h"
-#include "blackmisc/aviation/flightplan.h"
-#include "blackmisc/aviation/airporticaocode.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/units.h"
+#include "blackmisc/range.h"
+#include "blackmisc/stringutils.h"
 
-
-#include <QDebug>
+#include <QDateTime>
+#include <QString>
+#include <QTextStream>
 
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;
diff --git a/samples/blackmiscquantities/samplesaviation.h b/samples/blackmiscquantities/samplesaviation.h
index 302a77651..be815f3a4 100644
--- a/samples/blackmiscquantities/samplesaviation.h
+++ b/samples/blackmiscquantities/samplesaviation.h
@@ -13,7 +13,7 @@
 #ifndef BLACKSAMPLE_SAMPLESAVIATION_H
 #define BLACKSAMPLE_SAMPLESAVIATION_H
 
-#include <QTextStream>
+class QTextStream;
 
 namespace BlackSample
 {
diff --git a/samples/blackmiscquantities/samplesgeo.cpp b/samples/blackmiscquantities/samplesgeo.cpp
index 7c38b6434..96494c978 100644
--- a/samples/blackmiscquantities/samplesgeo.cpp
+++ b/samples/blackmiscquantities/samplesgeo.cpp
@@ -11,10 +11,19 @@
 //! \ingroup sampleblackmiscquantities
 
 #include "samplesgeo.h"
-#include "blackmisc/geo/coordinategeodetic.h"
 #include "blackmisc/aviation/altitude.h"
+#include "blackmisc/geo/coordinategeodetic.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 "blackmisc/stringutils.h"
 
+#include <QString>
+#include <QTextStream>
+#include <QVector3D>
+
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::PhysicalQuantities;
diff --git a/samples/blackmiscquantities/samplesgeo.h b/samples/blackmiscquantities/samplesgeo.h
index cbb2a0d7f..f065b0991 100644
--- a/samples/blackmiscquantities/samplesgeo.h
+++ b/samples/blackmiscquantities/samplesgeo.h
@@ -13,8 +13,7 @@
 #ifndef BLACKSAMPLE_SAMPLESGEO_H
 #define BLACKSAMPLE_SAMPLESGEO_H
 
-#include "blackmisc/pq/constants.h"
-#include <QTextStream>
+class QTextStream;
 
 namespace BlackSample
 {
diff --git a/samples/blackmiscquantities/samplesphysicalquantities.cpp b/samples/blackmiscquantities/samplesphysicalquantities.cpp
index ca261dfd8..4ef7fb7fa 100644
--- a/samples/blackmiscquantities/samplesphysicalquantities.cpp
+++ b/samples/blackmiscquantities/samplesphysicalquantities.cpp
@@ -11,7 +11,21 @@
 //! \ingroup sampleblackmiscquantities
 
 #include "samplesphysicalquantities.h"
-#include "blackmisc/variant.h"
+#include "blackmisc/pq/acceleration.h"
+#include "blackmisc/pq/angle.h"
+#include "blackmisc/pq/frequency.h"
+#include "blackmisc/pq/length.h"
+#include "blackmisc/pq/mass.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/stringutils.h"
+
+#include <QString>
+#include <QTextStream>
 
 using namespace BlackMisc;
 using namespace BlackMisc::PhysicalQuantities;
diff --git a/samples/blackmiscquantities/samplesphysicalquantities.h b/samples/blackmiscquantities/samplesphysicalquantities.h
index 47c272e2c..ad42b17e5 100644
--- a/samples/blackmiscquantities/samplesphysicalquantities.h
+++ b/samples/blackmiscquantities/samplesphysicalquantities.h
@@ -13,8 +13,7 @@
 #ifndef BLACKSAMPLE_SAMPLESPHYSICALQUANTITIES_H
 #define BLACKSAMPLE_SAMPLESPHYSICALQUANTITIES_H
 
-#include "blackmisc/pq/constants.h"
-#include <QTextStream>
+class QTextStream;
 
 namespace BlackSample
 {
diff --git a/samples/blackmiscsim/main.cpp b/samples/blackmiscsim/main.cpp
index 6bc73ec14..eaf026b37 100644
--- a/samples/blackmiscsim/main.cpp
+++ b/samples/blackmiscsim/main.cpp
@@ -7,19 +7,22 @@
  * contained in the LICENSE file.
  */
 
-#include "blackcore/application.h"
+//! \file
+//! \ingroup sampleblackmiscsim
+
 #include "samplesfscommon.h"
 #include "samplesfsx.h"
 #include "samplesmodelmapping.h"
 #include "samplesvpilotrules.h"
+#include "blackcore/application.h"
 
+#include <stdio.h>
+#include <stdlib.h>
 #include <QCoreApplication>
+#include <QString>
 #include <QTextStream>
-#include <QDebug>
 #include <QTime>
-
-//! \file
-//! \ingroup sampleblackmiscsim
+#include <QtGlobal>
 
 //! main
 int main(int argc, char *argv[])
diff --git a/samples/blackmiscsim/samplesfscommon.cpp b/samples/blackmiscsim/samplesfscommon.cpp
index f4ae5581f..b792106c6 100644
--- a/samples/blackmiscsim/samplesfscommon.cpp
+++ b/samples/blackmiscsim/samplesfscommon.cpp
@@ -16,13 +16,13 @@
 #include "blackmisc/simulation/fscommon/aircraftcfgparser.h"
 #include "blackmisc/simulation/simulatorinfo.h"
 
-
-#include <QDebug>
-#include <QFuture>
-#include <QTime>
-#include <QTextStream>
-#include <QTemporaryFile>
+#include <QByteArray>
 #include <QJsonDocument>
+#include <QString>
+#include <QTemporaryFile>
+#include <QTextStream>
+#include <QTime>
+#include <QtGlobal>
 
 using namespace BlackMisc;
 using namespace BlackMisc::Simulation;
diff --git a/samples/blackmiscsim/samplesfscommon.h b/samples/blackmiscsim/samplesfscommon.h
index 4df9cefd6..21923d9a4 100644
--- a/samples/blackmiscsim/samplesfscommon.h
+++ b/samples/blackmiscsim/samplesfscommon.h
@@ -13,7 +13,7 @@
 #ifndef BLACKSAMPLE_SAMPLESFSCOMMON_H
 #define BLACKSAMPLE_SAMPLESFSCOMMON_H
 
-#include <QTextStream>
+class QTextStream;
 
 namespace BlackSample
 {
diff --git a/samples/blackmiscsim/samplesfsx.cpp b/samples/blackmiscsim/samplesfsx.cpp
index b4d097dca..13791d923 100644
--- a/samples/blackmiscsim/samplesfsx.cpp
+++ b/samples/blackmiscsim/samplesfsx.cpp
@@ -11,9 +11,10 @@
 //! \ingroup sampleblackmiscsim
 
 #include "samplesfsx.h"
-#include "blackmisc/simulation/fsx/simconnectutilities.h"
 #include "blackmisc/registermetadata.h"
-#include <QDebug>
+#include "blackmisc/simulation/fsx/simconnectutilities.h"
+
+#include <QTextStream>
 
 using namespace BlackMisc::Simulation::Fsx;
 
diff --git a/samples/blackmiscsim/samplesfsx.h b/samples/blackmiscsim/samplesfsx.h
index 6e14338cd..d54ade1b3 100644
--- a/samples/blackmiscsim/samplesfsx.h
+++ b/samples/blackmiscsim/samplesfsx.h
@@ -13,7 +13,7 @@
 #ifndef BLACKSAMPLE_SAMPLESFSX_H
 #define BLACKSAMPLE_SAMPLESFSX_H
 
-#include <QTextStream>
+class QTextStream;
 
 namespace BlackSample
 {
diff --git a/samples/blackmiscsim/samplesmodelmapping.cpp b/samples/blackmiscsim/samplesmodelmapping.cpp
index a0725f818..8fd426042 100644
--- a/samples/blackmiscsim/samplesmodelmapping.cpp
+++ b/samples/blackmiscsim/samplesmodelmapping.cpp
@@ -12,15 +12,21 @@
 
 #include "samplesmodelmapping.h"
 #include "blackcore/aircraftmatcher.h"
-#include "blackmisc/registermetadata.h"
-#include "blackmisc/stringutils.h"
+#include "blackmisc/aviation/aircrafticaocode.h"
+#include "blackmisc/aviation/airlineicaocode.h"
 #include "blackmisc/sampleutils.h"
+#include "blackmisc/simulation/aircraftmodellist.h"
+#include "blackmisc/simulation/aircraftmodelloader.h"
+#include "blackmisc/simulation/fscommon/aircraftcfgentrieslist.h"
 #include "blackmisc/simulation/fscommon/aircraftcfgparser.h"
 #include "blackmisc/simulation/fscommon/vpilotrulesreader.h"
+#include "blackmisc/simulation/simulatorinfo.h"
+#include "blackmisc/stringutils.h"
 
-#include <QDebug>
-#include <memory>
-#include <utility>
+#include <QFlags>
+#include <QString>
+#include <QStringList>
+#include <QTextStream>
 
 using namespace BlackCore;
 using namespace BlackMisc;
diff --git a/samples/blackmiscsim/samplesmodelmapping.h b/samples/blackmiscsim/samplesmodelmapping.h
index aca160336..db9d29907 100644
--- a/samples/blackmiscsim/samplesmodelmapping.h
+++ b/samples/blackmiscsim/samplesmodelmapping.h
@@ -13,7 +13,7 @@
 #ifndef BLACKSAMPLE_SAMPLESMODELMAPPING_H
 #define BLACKSAMPLE_SAMPLESMODELMAPPING_H
 
-#include <QTextStream>
+class QTextStream;
 
 namespace BlackSample
 {
diff --git a/samples/blackmiscsim/samplesvpilotrules.cpp b/samples/blackmiscsim/samplesvpilotrules.cpp
index 14753d006..5ad661dc8 100644
--- a/samples/blackmiscsim/samplesvpilotrules.cpp
+++ b/samples/blackmiscsim/samplesvpilotrules.cpp
@@ -11,13 +11,15 @@
 //! \ingroup sampleblackmiscsim
 
 #include "samplesvpilotrules.h"
-#include "blackmisc/simulation/fscommon/vpilotrulesreader.h"
 #include "blackmisc/registermetadata.h"
+#include "blackmisc/simulation/fscommon/vpilotmodelruleset.h"
+#include "blackmisc/simulation/fscommon/vpilotrulesreader.h"
 #include "blackmisc/stringutils.h"
-#include "blackmisc/sampleutils.h"
 
-#include <QDebug>
 #include <QScopedPointer>
+#include <QStringList>
+#include <QTextStream>
+#include <QtGlobal>
 
 using namespace BlackMisc;
 using namespace BlackMisc::Simulation;
diff --git a/samples/blackmiscsim/samplesvpilotrules.h b/samples/blackmiscsim/samplesvpilotrules.h
index 75a3a1465..a492ac0e0 100644
--- a/samples/blackmiscsim/samplesvpilotrules.h
+++ b/samples/blackmiscsim/samplesvpilotrules.h
@@ -13,7 +13,7 @@
 #ifndef BLACKSAMPLE_SAMPLESVPILOTRULES_H
 #define BLACKSAMPLE_SAMPLESVPILOTRULES_H
 
-#include <QTextStream>
+class QTextStream;
 
 namespace BlackSample
 {
diff --git a/samples/cliclient/client.cpp b/samples/cliclient/client.cpp
index 16cee756d..fc8aa0d40 100644
--- a/samples/cliclient/client.cpp
+++ b/samples/cliclient/client.cpp
@@ -12,8 +12,34 @@
 
 #include "client.h"
 #include "blackcore/networkvatlib.h"
-#include <iostream>
+#include "blackmisc/aviation/aircrafticaocode.h"
+#include "blackmisc/aviation/aircraftsituation.h"
+#include "blackmisc/aviation/airlineicaocode.h"
+#include "blackmisc/aviation/airporticaocode.h"
+#include "blackmisc/aviation/altitude.h"
+#include "blackmisc/aviation/callsign.h"
+#include "blackmisc/aviation/comsystem.h"
+#include "blackmisc/aviation/flightplan.h"
+#include "blackmisc/aviation/heading.h"
+#include "blackmisc/aviation/transponder.h"
+#include "blackmisc/network/client.h"
+#include "blackmisc/network/server.h"
+#include "blackmisc/network/user.h"
+#include "blackmisc/pq/angle.h"
+#include "blackmisc/pq/speed.h"
+#include "blackmisc/pq/units.h"
+#include "blackmisc/simulation/ownaircraftproviderdummy.h"
+#include "blackmisc/simulation/simulatedaircraft.h"
+#include "blackmisc/stringutils.h"
+
+#include <stdbool.h>
+#include <QDateTime>
+#include <QIODevice>
+#include <QList>
 #include <QStringList>
+#include <QTextStream>
+#include <iostream>
+#include <string>
 
 using namespace BlackCore;
 using namespace BlackMisc;
diff --git a/samples/cliclient/client.h b/samples/cliclient/client.h
index a349eb563..d69bcb3c8 100644
--- a/samples/cliclient/client.h
+++ b/samples/cliclient/client.h
@@ -14,13 +14,38 @@
 #define BLACKSAMPLE_CLICLIENT_CLIENT_H
 
 #include "blackcore/network.h"
-#include "blackmisc/simulation/ownaircraftproviderdummy.h"
+#include "blackmisc/geo/coordinategeodetic.h"
 #include "blackmisc/identifiable.h"
-#include <QObject>
-#include <QTextStream>
+#include "blackmisc/network/textmessagelist.h"
+#include "blackmisc/pq/frequency.h"
+#include "blackmisc/pq/length.h"
+#include "blackmisc/pq/time.h"
+#include "blackmisc/simulation/ownaircraftprovider.h"
+
 #include <QMap>
+#include <QObject>
+#include <QString>
+#include <QStringList>
+#include <QtGlobal>
 #include <functional>
 
+class QTextStream;
+
+namespace BlackMisc
+{
+    namespace Aviation
+    {
+        class CCallsign;
+        class CComSystem;
+        class CFlightPlan;
+        class CInformationMessage;
+        class CTransponder;
+    }
+    namespace Network { class CServer; }
+    namespace Simulation { class CSimulatedAircraft; }
+}
+template <class T> class QVector;
+
 namespace BlackSample
 {
 
diff --git a/samples/cliclient/main.cpp b/samples/cliclient/main.cpp
index bda493dcf..321d3ddab 100644
--- a/samples/cliclient/main.cpp
+++ b/samples/cliclient/main.cpp
@@ -10,12 +10,12 @@
 //! \file
 //! \ingroup samplecliclient
 
-#include "blackcore/networkvatlib.h"
-#include "blackmisc/loghandler.h"
-#include "client.h"
 #include "reader.h"
+#include "client.h"
+#include "blackmisc/loghandler.h"
+
 #include <QCoreApplication>
-#include <QTextCodec>
+#include <QObject>
 
 using namespace BlackSample;
 
diff --git a/samples/cliclient/reader.cpp b/samples/cliclient/reader.cpp
index 76371dbe8..d5f530862 100644
--- a/samples/cliclient/reader.cpp
+++ b/samples/cliclient/reader.cpp
@@ -11,7 +11,13 @@
 //! \ingroup samplecliclient
 
 #include "reader.h"
+
+#include <stdio.h>
+#include <QByteArray>
 #include <QFile>
+#include <QFlags>
+#include <QIODevice>
+#include <QtGlobal>
 
 namespace BlackSample
 {
diff --git a/samples/cliclient/reader.h b/samples/cliclient/reader.h
index 172961d57..ab5dc772c 100644
--- a/samples/cliclient/reader.h
+++ b/samples/cliclient/reader.h
@@ -13,8 +13,9 @@
 #ifndef BLACKSAMPLE_CLICLIENT_LINEREADER_H
 #define BLACKSAMPLE_CLICLIENT_LINEREADER_H
 
-#include <QThread>
+#include <QObject>
 #include <QString>
+#include <QThread>
 
 namespace BlackSample
 {
diff --git a/samples/hotkey/main.cpp b/samples/hotkey/main.cpp
index 128d4fc78..230dad081 100644
--- a/samples/hotkey/main.cpp
+++ b/samples/hotkey/main.cpp
@@ -12,6 +12,7 @@
 
 #include "blackgui/components/settingshotkeycomponent.h"
 #include "blackgui/guiapplication.h"
+
 #include <QApplication>
 
 using namespace BlackGui;
diff --git a/samples/weatherdata/main.cpp b/samples/weatherdata/main.cpp
index 01163ffb8..4a709782b 100644
--- a/samples/weatherdata/main.cpp
+++ b/samples/weatherdata/main.cpp
@@ -10,13 +10,15 @@
 //! \file
 //! \ingroup sampleweatherdata
 
+#include "blackmisc/loghandler.h"
+#include "blackmisc/registermetadata.h"
 #include "reader.h"
 #include "weatherdataprinter.h"
-#include "blackmisc/registermetadata.h"
-#include "blackmisc/loghandler.h"
+
+#include <stdio.h>
 #include <QCoreApplication>
+#include <QObject>
 #include <QTextStream>
-#include <QFile>
 
 using namespace BlackMisc;
 using namespace BlackMisc::PhysicalQuantities;
diff --git a/samples/weatherdata/reader.cpp b/samples/weatherdata/reader.cpp
index d2503b1a2..014fb7452 100644
--- a/samples/weatherdata/reader.cpp
+++ b/samples/weatherdata/reader.cpp
@@ -11,8 +11,20 @@
 //! \ingroup sampleweatherdata
 
 #include "reader.h"
+#include "blackmisc/geo/latitude.h"
+#include "blackmisc/geo/longitude.h"
+#include "blackmisc/pq/units.h"
+
+#include <stdio.h>
+#include <QByteArray>
 #include <QFile>
+#include <QFlags>
+#include <QIODevice>
 #include <QRegularExpression>
+#include <QRegularExpressionMatch>
+#include <QString>
+#include <QTextStream>
+#include <QtGlobal>
 
 using namespace BlackMisc::Geo;
 using namespace BlackMisc::PhysicalQuantities;
diff --git a/samples/weatherdata/reader.h b/samples/weatherdata/reader.h
index e084f2efd..afa38657d 100644
--- a/samples/weatherdata/reader.h
+++ b/samples/weatherdata/reader.h
@@ -14,8 +14,9 @@
 //! \ingroup sampleweatherdata
 
 #include "blackmisc/geo/coordinategeodetic.h"
+
+#include <QObject>
 #include <QThread>
-#include <QString>
 
 /*!
  * Class reading line input and triggering commands
diff --git a/samples/weatherdata/weatherdataprinter.cpp b/samples/weatherdata/weatherdataprinter.cpp
index 08ab8b037..2f793a64c 100644
--- a/samples/weatherdata/weatherdataprinter.cpp
+++ b/samples/weatherdata/weatherdataprinter.cpp
@@ -6,6 +6,7 @@
  * including this file, may be copied, modified, propagated, or distributed except according to the terms
  * contained in the LICENSE file.
  */
+
 //! \file
 //! \ingroup sampleweatherdata
 
@@ -13,6 +14,28 @@
 #include "blackmisc/logmessage.h"
 #include <QTextStream>
 
+#include "weatherdataprinter.h"
+#include "blackmisc/aviation/altitude.h"
+#include "blackmisc/geo/latitude.h"
+#include "blackmisc/geo/longitude.h"
+#include "blackmisc/pq/angle.h"
+#include "blackmisc/pq/physicalquantity.h"
+#include "blackmisc/pq/pressure.h"
+#include "blackmisc/pq/speed.h"
+#include "blackmisc/pq/temperature.h"
+#include "blackmisc/range.h"
+#include "blackmisc/sequence.h"
+#include "blackmisc/weather/cloudlayer.h"
+#include "blackmisc/weather/cloudlayerlist.h"
+#include "blackmisc/weather/gridpoint.h"
+#include "blackmisc/weather/temperaturelayer.h"
+#include "blackmisc/weather/temperaturelayerlist.h"
+#include "blackmisc/weather/windlayer.h"
+#include "blackmisc/weather/windlayerlist.h"
+
+#include <stdio.h>
+#include <QTextStream>
+
 using namespace BlackMisc;
 using namespace BlackMisc::Weather;
 using namespace BlackMisc::Geo;
diff --git a/samples/weatherdata/weatherdataprinter.h b/samples/weatherdata/weatherdataprinter.h
index 8419e942f..85f998c23 100644
--- a/samples/weatherdata/weatherdataprinter.h
+++ b/samples/weatherdata/weatherdataprinter.h
@@ -13,11 +13,10 @@
 //! \file
 //! \ingroup sampleweatherdata
 
-#include "blackcore/pluginmanagerweatherdata.h"
-#include "blackcore/weatherdata.h"
 #include "blackcore/weathermanager.h"
-#include "blackmisc/geo/latitude.h"
-#include "blackmisc/geo/longitude.h"
+#include "blackmisc/geo/coordinategeodetic.h"
+#include "blackmisc/weather/weathergrid.h"
+
 #include <QObject>
 
 /*!