Fix BlackMisc header includes

* Include only what is used
* Use forward declaration when possible
* Sorted includes

refs #630

src/blackmisc/aviation/aircraftengine.cpp

@@ -7,9 +7,12 @@
  * contained in the LICENSE file.
  */
 
-#include "aircraftengine.h"
+#include "blackmisc/aviation/aircraftengine.h"
 #include "blackmisc/stringutils.h"
 
+#include <QChar>
+#include <QtGlobal>
+
 namespace BlackMisc
 {
     namespace Aviation

src/blackmisc/aviation/aircraftengine.h

@@ -13,8 +13,12 @@
 #define BLACKMISC_AVIATION_AIRCRAFTENGINES_H
 
 #include "blackmisc/blackmiscexport.h"
+#include "blackmisc/metaclass.h"
 #include "blackmisc/valueobject.h"
 
+#include <QMetaType>
+#include <QString>
+
 namespace BlackMisc
 {
     namespace Aviation

src/blackmisc/aviation/aircraftenginelist.cpp

@@ -7,7 +7,12 @@
  * contained in the LICENSE file.
  */
 
-#include "aircraftenginelist.h"
+#include "blackmisc/aviation/aircraftenginelist.h"
+#include "blackmisc/range.h"
+
+#include <QJsonValue>
+#include <QString>
+#include <QtGlobal>
 
 namespace BlackMisc
 {

src/blackmisc/aviation/aircraftenginelist.h

@@ -12,11 +12,18 @@
 #ifndef BLACKMISC_AVIATION_AIRCRAFTENGINELIST_H
 #define BLACKMISC_AVIATION_AIRCRAFTENGINELIST_H
 
-#include "aircraftengine.h"
+#include "blackmisc/aviation/aircraftengine.h"
+#include "blackmisc/aviation/aircraftengine.h"
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/collection.h"
+#include "blackmisc/json.h"
 #include "blackmisc/sequence.h"
+#include "blackmisc/variant.h"
+
+#include <QJsonObject>
+#include <QMetaType>
 #include <initializer_list>
+#include <tuple>
 
 namespace BlackMisc
 {

src/blackmisc/aviation/aircrafticaocode.cpp

@@ -8,14 +8,22 @@
  */
 
 #include "blackmisc/aviation/aircrafticaocode.h"
-#include "blackmisc/aviation/airlineicaocode.h"
-#include "blackmisc/propertyindex.h"
-#include "blackmisc/variant.h"
-#include "blackmisc/datastoreutility.h"
 #include "blackmisc/comparefunctions.h"
-#include <tuple>
-#include <QThreadStorage>
+#include "blackmisc/datastoreutility.h"
+#include "blackmisc/logcategory.h"
+#include "blackmisc/logcategorylist.h"
+#include "blackmisc/propertyindex.h"
+#include "blackmisc/statusmessage.h"
+#include "blackmisc/variant.h"
+
+#include <QChar>
+#include <QJsonValue>
+#include <QMultiMap>
 #include <QRegularExpression>
+#include <QRegularExpressionMatch>
+#include <QThreadStorage>
+#include <Qt>
+#include <QtGlobal>
 
 using namespace BlackMisc;
 

src/blackmisc/aviation/aircrafticaocode.h

@@ -13,16 +13,22 @@
 #define BLACKMISC_AVIATION_AIRCRAFTICAOCODE_H
 
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/valueobject.h"
-#include "blackmisc/propertyindex.h"
 #include "blackmisc/datastore.h"
+#include "blackmisc/metaclass.h"
+#include "blackmisc/propertyindex.h"
 #include "blackmisc/statusmessagelist.h"
+#include "blackmisc/valueobject.h"
+#include "blackmisc/variant.h"
+
+#include <QJsonObject>
+#include <QMetaType>
+#include <QString>
+#include <QStringList>
 
 namespace BlackMisc
 {
     namespace Aviation
     {
-        class CAirlineIcaoCode;
 
         //! Value object for ICAO classification
         class BLACKMISC_EXPORT CAircraftIcaoCode :

src/blackmisc/aviation/aircrafticaocodelist.cpp

@@ -7,7 +7,12 @@
  * contained in the LICENSE file.
  */
 
-#include "aircrafticaocodelist.h"
+#include "blackmisc/aviation/aircrafticaocodelist.h"
+#include "blackmisc/range.h"
+
+#include <QJsonObject>
+#include <QJsonValue>
+#include <Qt>
 
 namespace BlackMisc
 {

src/blackmisc/aviation/aircrafticaocodelist.h

@@ -13,11 +13,18 @@
 #define BLACKMISC_AVIATION_AIRCRAFTICAOCODELIST_H
 
 #include "aircrafticaocode.h"
+#include "blackmisc/aviation/aircrafticaocode.h"
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/datastoreobjectlist.h"
 #include "blackmisc/collection.h"
+#include "blackmisc/datastoreobjectlist.h"
 #include "blackmisc/sequence.h"
-#include <initializer_list>
+#include "blackmisc/variant.h"
+
+#include <QJsonArray>
+#include <QMetaType>
+#include <QString>
+#include <QStringList>
+#include <tuple>
 
 namespace BlackMisc
 {

src/blackmisc/aviation/aircraftlights.cpp

@@ -7,9 +7,9 @@
  * contained in the LICENSE file.
  */
 
-#include "aircraftlights.h"
-#include "blackmisc/variant.h"
+#include "blackmisc/aviation/aircraftlights.h"
 #include "blackmisc/stringutils.h"
+#include "blackmisc/variant.h"
 
 using namespace BlackMisc;
 

src/blackmisc/aviation/aircraftlights.h

@@ -13,8 +13,13 @@
 #define BLACKMISC_AVIATION_AIRCRAFTLIGHTS_H
 
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/valueobject.h"
+#include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindex.h"
+#include "blackmisc/valueobject.h"
+#include "blackmisc/variant.h"
+
+#include <QMetaType>
+#include <QString>
 
 namespace BlackMisc
 {

src/blackmisc/aviation/aircraftparts.cpp

@@ -7,9 +7,11 @@
  * contained in the LICENSE file.
  */
 
-#include "aircraftparts.h"
-#include "blackmisc/stringutils.h"
+#include "blackmisc/aviation/aircraftparts.h"
 #include "blackmisc/comparefunctions.h"
+#include "blackmisc/stringutils.h"
+
+#include <QtGlobal>
 
 using namespace BlackMisc;
 

src/blackmisc/aviation/aircraftparts.h

@@ -12,12 +12,18 @@
 #ifndef BLACKMISC_AVIATION_AIRCRAFTPARTS_H
 #define BLACKMISC_AVIATION_AIRCRAFTPARTS_H
 
-#include "blackmisc/blackmiscexport.h"
-#include "blackmisc/valueobject.h"
-#include "blackmisc/timestampbased.h"
-#include "blackmisc/propertyindex.h"
-#include "blackmisc/aviation/aircraftlights.h"
+#include "blackmisc/aviation/aircraftengine.h"
 #include "blackmisc/aviation/aircraftenginelist.h"
+#include "blackmisc/aviation/aircraftlights.h"
+#include "blackmisc/blackmiscexport.h"
+#include "blackmisc/metaclass.h"
+#include "blackmisc/propertyindex.h"
+#include "blackmisc/timestampbased.h"
+#include "blackmisc/valueobject.h"
+#include "blackmisc/variant.h"
+
+#include <QMetaType>
+#include <QString>
 
 namespace BlackMisc
 {

src/blackmisc/aviation/aircraftpartslist.cpp

@@ -7,7 +7,10 @@
  * contained in the LICENSE file.
  */
 
-#include "aircraftpartslist.h"
+#include "blackmisc/aviation/aircraftparts.h"
+#include "blackmisc/aviation/aircraftpartslist.h"
+
+#include <tuple>
 
 namespace BlackMisc
 {

src/blackmisc/aviation/aircraftpartslist.h

@@ -12,16 +12,21 @@
 #ifndef BLACKMISC_AVIATION_AIRCRAFTPARTSLIST_H
 #define BLACKMISC_AVIATION_AIRCRAFTPARTSLIST_H
 
-#include "blackmisc/blackmiscexport.h"
 #include "aircraftparts.h"
+#include "blackmisc/blackmiscexport.h"
+#include "blackmisc/collection.h"
+#include "blackmisc/sequence.h"
 #include "blackmisc/timestampobjectlist.h"
-#include "blackmisc/aviation/callsignobjectlist.h"
-#include <QDateTime>
+#include "blackmisc/variant.h"
+
+#include <QMetaType>
 
 namespace BlackMisc
 {
     namespace Aviation
     {
+        class CAircraftParts;
+
         //! Value object encapsulating a list of aircraft parts.
         class BLACKMISC_EXPORT CAircraftPartsList :
             public CSequence<CAircraftParts>,

src/blackmisc/aviation/aircraftsituation.cpp

@@ -8,9 +8,13 @@
  */
 
 #include "blackmisc/aviation/aircraftsituation.h"
+#include "blackmisc/pq/physicalquantity.h"
+#include "blackmisc/pq/units.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/variant.h"
 
+#include <QtGlobal>
+
 using namespace BlackMisc;
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Geo;

src/blackmisc/aviation/aircraftsituation.h

@@ -12,15 +12,26 @@
 #ifndef BLACKMISC_AVIATION_AIRCRAFTSITUATION_H
 #define BLACKMISC_AVIATION_AIRCRAFTSITUATION_H
 
+#include "blackmisc/aviation/altitude.h"
+#include "blackmisc/aviation/callsign.h"
+#include "blackmisc/aviation/heading.h"
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/geo/coordinategeodetic.h"
-#include "blackmisc/timestampbased.h"
-#include "blackmisc/aviation/altitude.h"
-#include "blackmisc/aviation/heading.h"
-#include "blackmisc/aviation/callsign.h"
+#include "blackmisc/geo/latitude.h"
+#include "blackmisc/geo/longitude.h"
+#include "blackmisc/metaclass.h"
+#include "blackmisc/pq/angle.h"
+#include "blackmisc/pq/length.h"
 #include "blackmisc/pq/speed.h"
+#include "blackmisc/propertyindex.h"
+#include "blackmisc/timestampbased.h"
 #include "blackmisc/valueobject.h"
-#include <QDateTime>
+#include "blackmisc/variant.h"
+
+#include <QMetaType>
+#include <QString>
+#include <QVector3D>
+#include <array>
 
 namespace BlackMisc
 {

src/blackmisc/aviation/aircraftsituationlist.cpp

@@ -8,7 +8,10 @@
  */
 
 #include "blackmisc/aviation/aircraftsituationlist.h"
-#include "blackmisc/predicates.h"
+#include "blackmisc/aviation/aircraftsituation.h"
+#include "blackmisc/metaclassprivate.h"
+
+#include <tuple>
 
 using namespace BlackMisc::PhysicalQuantities;
 

src/blackmisc/aviation/aircraftsituationlist.h

@@ -12,16 +12,22 @@
 #ifndef BLACKMISC_AVIATION_AIRCRAFTSITUATIONLIST_H
 #define BLACKMISC_AVIATION_AIRCRAFTSITUATIONLIST_H
 
-#include "blackmisc/blackmiscexport.h"
 #include "blackmisc/aviation/aircraftsituation.h"
 #include "blackmisc/aviation/callsignobjectlist.h"
-#include "blackmisc/timestampobjectlist.h"
+#include "blackmisc/blackmiscexport.h"
+#include "blackmisc/collection.h"
 #include "blackmisc/sequence.h"
+#include "blackmisc/timestampobjectlist.h"
+#include "blackmisc/variant.h"
+
+#include <QMetaType>
 
 namespace BlackMisc
 {
     namespace Aviation
     {
+        class CAircraftSituation;
+
         //! Value object encapsulating a list of aircraft situations
         class BLACKMISC_EXPORT CAircraftSituationList :
             public CSequence<CAircraftSituation>,

src/blackmisc/aviation/airlineicaocode.cpp

@@ -8,14 +8,22 @@
  */
 
 #include "blackmisc/aviation/airlineicaocode.h"
-#include "blackmisc/propertyindex.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/datastoreutility.h"
-#include <tuple>
-#include <QThreadStorage>
+#include "blackmisc/icons.h"
+#include "blackmisc/logcategory.h"
+#include "blackmisc/logcategorylist.h"
+#include "blackmisc/propertyindex.h"
+#include "blackmisc/statusmessage.h"
+#include "blackmisc/stringutils.h"
+#include "blackmisc/variant.h"
+
+#include <QJsonValue>
 #include <QRegularExpression>
-#include "blackmisc/logmessage.h"
+#include <QRegularExpressionMatch>
+#include <QThreadStorage>
+#include <Qt>
+#include <QtGlobal>
 
 using namespace BlackMisc;
 

src/blackmisc/aviation/airlineicaocode.h

@@ -15,9 +15,16 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/country.h"
 #include "blackmisc/datastore.h"
-#include "blackmisc/valueobject.h"
+#include "blackmisc/icon.h"
+#include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/statusmessagelist.h"
+#include "blackmisc/valueobject.h"
+#include "blackmisc/variant.h"
+
+#include <QJsonObject>
+#include <QMetaType>
+#include <QString>
 
 namespace BlackMisc
 {

src/blackmisc/aviation/airlineicaocodelist.cpp

@@ -7,7 +7,12 @@
  * contained in the LICENSE file.
  */
 
-#include "airlineicaocodelist.h"
+#include "blackmisc/aviation/airlineicaocodelist.h"
+#include "blackmisc/country.h"
+#include "blackmisc/range.h"
+
+#include <QJsonObject>
+#include <QJsonValue>
 
 namespace BlackMisc
 {

src/blackmisc/aviation/airlineicaocodelist.h

@@ -13,11 +13,18 @@
 #define BLACKMISC_AVIATION_AIRLINEICAOCODELIST_H
 
 #include "airlineicaocode.h"
+#include "blackmisc/aviation/airlineicaocode.h"
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/datastoreobjectlist.h"
 #include "blackmisc/collection.h"
+#include "blackmisc/datastoreobjectlist.h"
 #include "blackmisc/sequence.h"
-#include <initializer_list>
+#include "blackmisc/variant.h"
+
+#include <QJsonArray>
+#include <QMetaType>
+#include <QString>
+#include <QStringList>
+#include <tuple>
 
 namespace BlackMisc
 {

src/blackmisc/aviation/airport.cpp

@@ -8,9 +8,14 @@
  */
 
 #include "blackmisc/aviation/airport.h"
+#include "blackmisc/pq/angle.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/variant.h"
 
+#include <QCoreApplication>
+#include <Qt>
+#include <QtGlobal>
+
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Geo;
 

src/blackmisc/aviation/airport.h

@@ -12,10 +12,21 @@
 #ifndef BLACKMISC_AVIATION_AIRPORT_H
 #define BLACKMISC_AVIATION_AIRPORT_H
 
-#include "blackmisc/blackmiscexport.h"
 #include "blackmisc/aviation/airporticaocode.h"
+#include "blackmisc/blackmiscexport.h"
 #include "blackmisc/geo/coordinategeodetic.h"
+#include "blackmisc/geo/latitude.h"
+#include "blackmisc/geo/longitude.h"
+#include "blackmisc/metaclass.h"
+#include "blackmisc/pq/length.h"
 #include "blackmisc/propertyindex.h"
+#include "blackmisc/valueobject.h"
+#include "blackmisc/variant.h"
+
+#include <QMetaType>
+#include <QString>
+#include <QVector3D>
+#include <array>
 
 namespace BlackMisc
 {

src/blackmisc/aviation/airporticaocode.cpp

@@ -1,4 +1,9 @@
 #include "blackmisc/aviation/airporticaocode.h"
+#include "blackmisc/compare.h"
+
+#include <QRegExp>
+#include <Qt>
+#include <QtGlobal>
 
 namespace BlackMisc
 {

src/blackmisc/aviation/airporticaocode.h

@@ -13,8 +13,15 @@
 #define BLACKMISC_AVIATION_AIRPORTICAOCODE_H
 
 #include "blackmisc/blackmiscexport.h"
+#include "blackmisc/metaclass.h"
+#include "blackmisc/metaclassprivate.h"
+#include "blackmisc/propertyindex.h"
 #include "blackmisc/valueobject.h"
 
+#include <QMetaType>
+#include <QString>
+#include <tuple>
+
 namespace BlackMisc
 {
     namespace Aviation

src/blackmisc/aviation/airportlist.cpp

@@ -8,7 +8,12 @@
  */
 
 #include "blackmisc/aviation/airportlist.h"
-#include "blackmisc/predicates.h"
+#include "blackmisc/compare.h"
+#include "blackmisc/metaclassprivate.h"
+#include "blackmisc/range.h"
+
+#include <QString>
+#include <tuple>
 
 using namespace BlackMisc::PhysicalQuantities;
 

src/blackmisc/aviation/airportlist.h

@@ -12,15 +12,15 @@
 #ifndef BLACKMISC_AVIATION_AIRPORTLIST_H
 #define BLACKMISC_AVIATION_AIRPORTLIST_H
 
-#include "blackmisc/blackmiscexport.h"
 #include "blackmisc/aviation/airport.h"
-#include "blackmisc/geo/geoobjectlist.h"
+#include "blackmisc/aviation/airporticaocode.h"
+#include "blackmisc/blackmiscexport.h"
 #include "blackmisc/collection.h"
-#include "blackmisc/sequence.h"
 #include "blackmisc/geo/geoobjectlist.h"
-#include <QObject>
-#include <QString>
-#include <QList>
+#include "blackmisc/sequence.h"
+#include "blackmisc/variant.h"
+
+#include <QMetaType>
 
 namespace BlackMisc
 {

src/blackmisc/aviation/altitude.cpp

@@ -8,8 +8,13 @@
  */
 
 #include "blackmisc/aviation/altitude.h"
-#include "blackmisc/pq/pqstring.h"
 #include "blackmisc/iconlist.h"
+#include "blackmisc/icons.h"
+#include "blackmisc/pq/measurementunit.h"
+#include "blackmisc/pq/pqstring.h"
+
+#include <Qt>
+#include <QtGlobal>
 
 using BlackMisc::PhysicalQuantities::CLength;
 using BlackMisc::PhysicalQuantities::CLengthUnit;

src/blackmisc/aviation/altitude.h

@@ -13,8 +13,20 @@
 #define BLACKMISC_AVIATION_ALTITUDE_H
 
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/pq/length.h"
+#include "blackmisc/compare.h"
+#include "blackmisc/dbus.h"
+#include "blackmisc/dictionary.h"
+#include "blackmisc/icon.h"
 #include "blackmisc/metaclass.h"
+#include "blackmisc/pq/length.h"
+#include "blackmisc/pq/pqstring.h"
+#include "blackmisc/pq/units.h"
+#include "blackmisc/propertyindexvariantmap.h"
+#include "blackmisc/stringutils.h"
+#include "blackmisc/variant.h"
+
+#include <QMetaType>
+#include <QString>
 
 namespace BlackMisc
 {

src/blackmisc/aviation/atcstation.cpp

@@ -8,12 +8,18 @@
  */
 
 #include "blackmisc/aviation/atcstation.h"
-#include "blackmisc/aviation/comsystem.h"
 #include "blackmisc/audio/voiceroom.h"
-#include "blackmisc/icon.h"
+#include "blackmisc/aviation/comsystem.h"
+#include "blackmisc/compare.h"
+#include "blackmisc/metaclassprivate.h"
+#include "blackmisc/pq/physicalquantity.h"
+#include "blackmisc/pq/units.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/variant.h"
 
+#include <QCoreApplication>
+#include <QtGlobal>
+
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Geo;
 using namespace BlackMisc::Network;

src/blackmisc/aviation/atcstation.h

@@ -12,19 +12,30 @@
 #ifndef BLACKMISC_AVIATION_ATCSTATION_H
 #define BLACKMISC_AVIATION_ATCSTATION_H
 
-#include "blackmisc/blackmiscexport.h"
 #include "blackmisc/audio/voiceroom.h"
+#include "blackmisc/aviation/callsign.h"
 #include "blackmisc/aviation/comsystem.h"
 #include "blackmisc/aviation/informationmessage.h"
-#include "blackmisc/aviation/callsign.h"
-#include "blackmisc/network/user.h"
+#include "blackmisc/blackmiscexport.h"
 #include "blackmisc/geo/coordinategeodetic.h"
+#include "blackmisc/geo/latitude.h"
+#include "blackmisc/geo/longitude.h"
+#include "blackmisc/icon.h"
+#include "blackmisc/metaclass.h"
+#include "blackmisc/network/user.h"
 #include "blackmisc/pq/frequency.h"
 #include "blackmisc/pq/length.h"
 #include "blackmisc/pq/time.h"
+#include "blackmisc/propertyindex.h"
+#include "blackmisc/valueobject.h"
+#include "blackmisc/variant.h"
+
 #include <QDateTime>
-#include <QMap>
-#include <functional>
+#include <QMetaType>
+#include <QString>
+#include <QVector3D>
+#include <array>
+#include <tuple>
 
 namespace BlackMisc
 {

src/blackmisc/aviation/atcstationlist.cpp

@@ -8,7 +8,17 @@
  */
 
 #include "blackmisc/aviation/atcstationlist.h"
+#include "blackmisc/aviation/callsign.h"
+#include "blackmisc/aviation/comsystem.h"
+#include "blackmisc/compare.h"
+#include "blackmisc/iterator.h"
+#include "blackmisc/metaclassprivate.h"
+#include "blackmisc/network/user.h"
 #include "blackmisc/predicates.h"
+#include "blackmisc/range.h"
+
+#include <QString>
+#include <QtGlobal>
 
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Network;

src/blackmisc/aviation/atcstationlist.h

@@ -12,21 +12,23 @@
 #ifndef BLACKMISC_AVIATION_ATCSTATIONLIST_H
 #define BLACKMISC_AVIATION_ATCSTATIONLIST_H
 
-#include "blackmisc/blackmiscexport.h"
-#include "blackmisc/geo/geoobjectlist.h"
-#include "blackmisc/network/userlist.h"
 #include "blackmisc/aviation/atcstation.h"
 #include "blackmisc/aviation/callsignobjectlist.h"
+#include "blackmisc/blackmiscexport.h"
 #include "blackmisc/collection.h"
+#include "blackmisc/geo/geoobjectlist.h"
+#include "blackmisc/network/userlist.h"
 #include "blackmisc/sequence.h"
-#include <QObject>
-#include <QString>
-#include <QList>
+#include "blackmisc/variant.h"
+
+#include <QMetaType>
 
 namespace BlackMisc
 {
     namespace Aviation
     {
+        class CComSystem;
+
         //! Value object for a list of ATC stations.
         class BLACKMISC_EXPORT CAtcStationList :
             public CSequence<CAtcStation>,

src/blackmisc/aviation/callsign.cpp

@@ -8,10 +8,17 @@
  */
 
 #include "blackmisc/aviation/callsign.h"
+#include "blackmisc/compare.h"
 #include "blackmisc/iconlist.h"
+#include "blackmisc/icons.h"
 
-#include <QThreadStorage>
+#include <QRegExp>
 #include <QRegularExpression>
+#include <QRegularExpressionMatch>
+#include <QStringList>
+#include <QThreadStorage>
+#include <Qt>
+#include <QtGlobal>
 
 namespace BlackMisc
 {

src/blackmisc/aviation/callsign.h

@@ -13,9 +13,18 @@
 #define BLACKMISC_AVIATION_CALLSIGN_H
 
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/valueobject.h"
-#include "blackmisc/propertyindex.h"
 #include "blackmisc/icon.h"
+#include "blackmisc/metaclass.h"
+#include "blackmisc/metaclassprivate.h"
+#include "blackmisc/propertyindex.h"
+#include "blackmisc/valueobject.h"
+#include "blackmisc/variant.h"
+
+#include <QMetaType>
+#include <QString>
+#include <tuple>
+
+class QStringList;
 
 namespace BlackMisc
 {

src/blackmisc/aviation/callsignobjectlist.cpp

@@ -8,12 +8,15 @@
  */
 
 #include "blackmisc/aviation/callsignobjectlist.h"
+#include "blackmisc/aviation/callsign.h"
 #include "blackmisc/predicates.h"
 #include "blackmisc/aviation/atcstationlist.h"
 #include "blackmisc/aviation/aircraftsituationlist.h"
-#include "blackmisc/aviation/aircraftpartslist.h"
-#include "blackmisc/network/clientlist.h"
+#include "blackmisc/simulation/simulatedaircraft.h"
 #include "blackmisc/simulation/simulatedaircraftlist.h"
+#include "blackmisc/network/clientlist.h"
+
+#include <QtGlobal>
 
 namespace BlackMisc
 {

src/blackmisc/aviation/callsignobjectlist.h

@@ -12,12 +12,9 @@
 #ifndef BLACKMISC_AVIATION_CALLSIGNOBJECTLIST_H
 #define BLACKMISC_AVIATION_CALLSIGNOBJECTLIST_H
 
-#include "blackmisc/collection.h"
-#include "blackmisc/sequence.h"
 #include "blackmisc/aviation/callsignset.h"
-#include "blackmisc/propertyindexlist.h"
 #include "blackmisc/propertyindexvariantmap.h"
-#include <QList>
+
 #include <QHash>
 
 namespace BlackMisc
@@ -27,8 +24,6 @@ namespace BlackMisc
     {
         class CAircraftSituation;
         class CAircraftSituationList;
-        class CAircraftParts;
-        class CAircraftPartsList;
         class CAircraft;
         class CAircraftList;
         class CAtcStation;

src/blackmisc/aviation/callsignset.cpp

@@ -8,7 +8,13 @@
  */
 
 #include "blackmisc/aviation/callsignset.h"
-#include "blackmisc/predicates.h"
+#include "blackmisc/containerbase.h"
+#include "blackmisc/dbus.h"
+#include "blackmisc/variant.h"
+
+#include <QDBusMetaType>
+#include <QJsonObject>
+#include <QString>
 
 namespace BlackMisc
 {

src/blackmisc/aviation/callsignset.h

@@ -12,11 +12,15 @@
 #ifndef BLACKMISC_AVIATION_CALLSIGNSET_H
 #define BLACKMISC_AVIATION_CALLSIGNSET_H
 
-#include "blackmisc/blackmiscexport.h"
 #include "blackmisc/aviation/callsign.h"
+#include "blackmisc/blackmiscexport.h"
 #include "blackmisc/collection.h"
+#include "blackmisc/compare.h"
+#include "blackmisc/metaclassprivate.h"
 #include "blackmisc/sequence.h"
-#include <QObject>
+
+#include <QMetaType>
+#include <tuple>
 
 namespace BlackMisc
 {

src/blackmisc/aviation/comsystem.cpp

@@ -8,6 +8,12 @@
  */
 
 #include "blackmisc/aviation/comsystem.h"
+#include "blackmisc/dbus.h"
+#include "blackmisc/math/mathutils.h"
+
+#include <QDBusMetaType>
+#include <QtDebug>
+#include <QtGlobal>
 
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Math;

src/blackmisc/aviation/comsystem.h

@@ -12,8 +12,23 @@
 #ifndef BLACKMISC_AVIATION_COMSYSTEM_H
 #define BLACKMISC_AVIATION_COMSYSTEM_H
 
-#include "blackmisc/blackmiscexport.h"
 #include "blackmisc/aviation/modulator.h"
+#include "blackmisc/blackmiscexport.h"
+#include "blackmisc/dictionary.h"
+#include "blackmisc/json.h"
+#include "blackmisc/metaclass.h"
+#include "blackmisc/pq/constants.h"
+#include "blackmisc/pq/frequency.h"
+#include "blackmisc/pq/physicalquantity.h"
+#include "blackmisc/pq/units.h"
+#include "blackmisc/propertyindexvariantmap.h"
+#include "blackmisc/variant.h"
+
+#include <QHash>
+#include <QJsonObject>
+#include <QMetaType>
+#include <QString>
+#include <tuple>
 
 namespace BlackMisc
 {

src/blackmisc/aviation/flightplan.cpp

@@ -9,6 +9,7 @@
 
 #include "blackmisc/aviation/flightplan.h"
 #include "blackmisc/iconlist.h"
+#include "blackmisc/icons.h"
 
 namespace BlackMisc
 {

src/blackmisc/aviation/flightplan.h

@@ -12,13 +12,21 @@
 #ifndef BLACKMISC_AVIATION_FLIGHTPLAN_H
 #define BLACKMISC_AVIATION_FLIGHTPLAN_H
 
-#include "blackmisc/blackmiscexport.h"
-#include "blackmisc/valueobject.h"
-#include "blackmisc/aviation/altitude.h"
 #include "blackmisc/aviation/airporticaocode.h"
-#include "blackmisc/pq/time.h"
+#include "blackmisc/aviation/altitude.h"
+#include "blackmisc/blackmiscexport.h"
+#include "blackmisc/icon.h"
+#include "blackmisc/metaclass.h"
 #include "blackmisc/pq/speed.h"
+#include "blackmisc/pq/time.h"
+#include "blackmisc/pq/units.h"
+#include "blackmisc/valueobject.h"
+
 #include <QDateTime>
+#include <QMetaType>
+#include <QString>
+#include <QTime>
+#include <QtGlobal>
 
 namespace BlackMisc
 {

src/blackmisc/aviation/heading.cpp

@@ -9,6 +9,8 @@
 
 #include "blackmisc/aviation/heading.h"
 
+#include <QCoreApplication>
+
 using BlackMisc::PhysicalQuantities::CAngle;
 using BlackMisc::PhysicalQuantities::CAngleUnit;
 

src/blackmisc/aviation/heading.h

@@ -13,8 +13,19 @@
 #define BLACKMISC_AVIATION_HEADING_H
 
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/pq/angle.h"
+#include "blackmisc/compare.h"
+#include "blackmisc/dbus.h"
+#include "blackmisc/dictionary.h"
+#include "blackmisc/json.h"
 #include "blackmisc/metaclass.h"
+#include "blackmisc/pq/angle.h"
+#include "blackmisc/pq/units.h"
+#include "blackmisc/propertyindexvariantmap.h"
+#include "blackmisc/stringutils.h"
+#include "blackmisc/variant.h"
+
+#include <QMetaType>
+#include <QString>
 
 namespace BlackMisc
 {

src/blackmisc/aviation/informationmessage.h

@@ -13,9 +13,13 @@
 #define BLACKMISC_AVIATION_INFORMATIONMESSAGE_H
 
 #include "blackmisc/blackmiscexport.h"
+#include "blackmisc/metaclass.h"
 #include "blackmisc/valueobject.h"
-#include <QString>
+
 #include <QDateTime>
+#include <QMetaType>
+#include <QString>
+#include <QtGlobal>
 
 namespace BlackMisc
 {

src/blackmisc/aviation/livery.cpp

@@ -8,14 +8,24 @@
  */
 
 #include "blackmisc/aviation/livery.h"
-#include "blackmisc/datastoreutility.h"
-#include "blackmisc/propertyindex.h"
-#include "blackmisc/variant.h"
+#include "blackmisc/compare.h"
 #include "blackmisc/comparefunctions.h"
+#include "blackmisc/datastoreutility.h"
+#include "blackmisc/logcategory.h"
+#include "blackmisc/logcategorylist.h"
+#include "blackmisc/propertyindex.h"
+#include "blackmisc/statusmessage.h"
+#include "blackmisc/stringutils.h"
+#include "blackmisc/variant.h"
+
+#include <QCoreApplication>
+#include <QJsonValue>
+#include <Qt>
+#include <QtGlobal>
+#include <tuple>
 
 using namespace BlackMisc;
 using namespace BlackMisc::PhysicalQuantities;
-using namespace BlackMisc::Geo;
 
 namespace BlackMisc
 {

src/blackmisc/aviation/livery.h

@@ -12,12 +12,19 @@
 #ifndef BLACKMISC_AVIATION_LIVERY_H
 #define BLACKMISC_AVIATION_LIVERY_H
 
-#include "blackmisc/blackmiscexport.h"
 #include "blackmisc/aviation/airlineicaocode.h"
-#include "blackmisc/geo/coordinategeodetic.h"
-#include "blackmisc/rgbcolor.h"
-#include "blackmisc/propertyindex.h"
+#include "blackmisc/blackmiscexport.h"
 #include "blackmisc/datastore.h"
+#include "blackmisc/metaclass.h"
+#include "blackmisc/propertyindex.h"
+#include "blackmisc/rgbcolor.h"
+#include "blackmisc/statusmessagelist.h"
+#include "blackmisc/valueobject.h"
+#include "blackmisc/variant.h"
+
+#include <QJsonObject>
+#include <QMetaType>
+#include <QString>
 
 namespace BlackMisc
 {

src/blackmisc/aviation/liverylist.cpp

@@ -8,7 +8,12 @@
  */
 
 #include "blackmisc/aviation/liverylist.h"
+#include "blackmisc/metaclassprivate.h"
 #include "blackmisc/predicates.h"
+#include "blackmisc/range.h"
+
+#include <QtGlobal>
+#include <tuple>
 
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Aviation;

src/blackmisc/aviation/liverylist.h

@@ -12,9 +12,16 @@
 #ifndef BLACKMISC_AVIATION_LIVERYLIST_H
 #define BLACKMISC_AVIATION_LIVERYLIST_H
 
-#include "blackmisc/blackmiscexport.h"
-#include "blackmisc/datastoreobjectlist.h"
+#include "blackmisc/aviation/airlineicaocode.h"
 #include "blackmisc/aviation/livery.h"
+#include "blackmisc/blackmiscexport.h"
+#include "blackmisc/collection.h"
+#include "blackmisc/datastoreobjectlist.h"
+#include "blackmisc/sequence.h"
+#include "blackmisc/variant.h"
+
+#include <QMetaType>
+#include <QString>
 #include <QStringList>
 
 namespace BlackMisc

src/blackmisc/aviation/modulator.cpp

@@ -8,11 +8,15 @@
  */
 
 #include "blackmisc/aviation/modulator.h"
+#include "blackmisc/math/mathutils.h"
+#include "blackmisc/pq/units.h"
+#include "blackmisc/propertyindex.h"
+#include "blackmisc/variant.h"
 #include "blackmisc/aviation/comsystem.h"
 #include "blackmisc/aviation/navsystem.h"
 #include "blackmisc/aviation/adfsystem.h"
-#include "blackmisc/propertyindex.h"
-#include "blackmisc/variant.h"
+
+#include <QtGlobal>
 
 using BlackMisc::PhysicalQuantities::CFrequency;
 using BlackMisc::PhysicalQuantities::CFrequencyUnit;

src/blackmisc/aviation/modulator.h

@@ -13,8 +13,6 @@
 #define BLACKMISC_AVIATION_MODULATORUNIT_H
 
 #include "blackmisc/propertyindex.h"
-#include "blackmisc/math/mathutils.h"
-#include "blackmisc/pq/constants.h"
 #include "blackmisc/pq/frequency.h"
 
 namespace BlackMisc

src/blackmisc/aviation/registermetadataaviation.h

@@ -9,11 +9,11 @@
 
 //! \file
 
-#include "blackmisc/blackmiscexport.h"
-
 #ifndef BLACKMISC_AVIATION_REGISTERMETADATAAVIATION_H
 #define BLACKMISC_AVIATION_REGISTERMETADATAAVIATION_H
 
+#include "blackmisc/blackmiscexport.h"
+
 namespace BlackMisc
 {
     namespace Aviation

src/blackmisc/aviation/selcal.cpp

@@ -8,6 +8,12 @@
  */
 
 #include "blackmisc/aviation/selcal.h"
+#include "blackmisc/pq/frequency.h"
+#include "blackmisc/pq/units.h"
+
+#include <QStringList>
+#include <Qt>
+#include <QtGlobal>
 
 using namespace BlackMisc::PhysicalQuantities;
 

src/blackmisc/aviation/selcal.h

@@ -13,9 +13,24 @@
 #define BLACKMISC_AVIATION_SELCAL_H
 
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/pq/frequency.h"
+#include "blackmisc/metaclass.h"
 #include "blackmisc/valueobject.h"
 
+#include <QChar>
+#include <QList>
+#include <QMetaType>
+#include <QString>
+
+class QStringList;
+
+namespace BlackMisc
+{
+    namespace PhysicalQuantities
+    {
+        class CFrequency;
+    }
+}
+
 namespace BlackMisc
 {
     namespace Aviation

src/blackmisc/aviation/track.cpp

@@ -9,6 +9,8 @@
 
 #include "blackmisc/aviation/track.h"
 
+#include <QCoreApplication>
+
 using BlackMisc::PhysicalQuantities::CAngle;
 using BlackMisc::PhysicalQuantities::CAngleUnit;
 

src/blackmisc/aviation/track.h

@@ -13,8 +13,20 @@
 #define BLACKMISC_AVIATION_TRACK_H
 
 #include "blackmisc/blackmiscexport.h"
-#include "blackmisc/pq/angle.h"
+#include "blackmisc/compare.h"
+#include "blackmisc/dbus.h"
+#include "blackmisc/dictionary.h"
+#include "blackmisc/json.h"
 #include "blackmisc/metaclass.h"
+#include "blackmisc/pq/angle.h"
+#include "blackmisc/pq/units.h"
+#include "blackmisc/propertyindexvariantmap.h"
+#include "blackmisc/stringutils.h"
+#include "blackmisc/variant.h"
+
+#include <QMetaType>
+#include <QString>
+#include <QtGlobal>
 
 namespace BlackMisc
 {

src/blackmisc/aviation/transponder.cpp

@@ -11,6 +11,10 @@
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/variant.h"
 
+#include <QRegExp>
+#include <Qt>
+#include <QtDebug>
+
 namespace BlackMisc
 {
     namespace Aviation

src/blackmisc/aviation/transponder.h

@@ -13,7 +13,17 @@
 #define BLACKMISC_AVIATION_TRANSPONDER_H
 
 #include "blackmisc/blackmiscexport.h"
+#include "blackmisc/dictionary.h"
+#include "blackmisc/metaclass.h"
+#include "blackmisc/propertyindex.h"
 #include "blackmisc/valueobject.h"
+#include "blackmisc/variant.h"
+
+#include <QHash>
+#include <QMetaType>
+#include <QString>
+#include <QtGlobal>
+#include <tuple>
 
 namespace BlackMisc
 {