Fix BlackGui header includes

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

refs #598

src/blackgui/models/actionhotkeylistmodel.cpp

@@ -7,7 +7,14 @@
  * contained in the LICENSE file.
  */
 
-#include "actionhotkeylistmodel.h"
+#include "blackgui/models/actionhotkeylistmodel.h"
+#include "blackmisc/identifier.h"
+#include "blackmisc/input/actionhotkey.h"
+#include "blackmisc/input/hotkeycombination.h"
+#include "blackmisc/sequence.h"
+
+#include <QString>
+#include <QtGlobal>
 
 using namespace BlackMisc;
 using namespace BlackMisc::Input;

src/blackgui/models/actionhotkeylistmodel.h

@@ -14,7 +14,14 @@
 
 #include "blackgui/blackguiexport.h"
 #include "blackmisc/input/actionhotkeylist.h"
+
 #include <QAbstractTableModel>
+#include <QModelIndex>
+#include <QObject>
+#include <QVariant>
+#include <Qt>
+
+class QModelIndex;
 
 namespace BlackGui
 {

src/blackgui/models/actionitem.cpp

@@ -1,5 +1,7 @@
-#include "actionitem.h"
 
+#include "blackgui/models/actionitem.h"
+
+#include <QtAlgorithms>
 
 namespace BlackGui
 {

src/blackgui/models/actionitem.h

@@ -12,8 +12,8 @@
 #ifndef BLACKGUI_ACTIONITEM_H
 #define BLACKGUI_ACTIONITEM_H
 
+#include <QList>
 #include <QString>
-#include <QVariant>
 
 namespace BlackGui
 {

src/blackgui/models/actionmodel.cpp

@@ -7,9 +7,13 @@
  * contained in the LICENSE file.
  */
 
-#include "actionmodel.h"
-#include "actionitem.h"
 #include "blackcore/inputmanager.h"
+#include "blackgui/models/actionitem.h"
+#include "blackgui/models/actionmodel.h"
+
+#include <QString>
+#include <QStringList>
+#include <QtGlobal>
 
 namespace BlackGui
 {

src/blackgui/models/actionmodel.h

@@ -13,9 +13,13 @@
 #define BLACKGUI_ACTIONMODEL_H
 
 #include "blackgui/blackguiexport.h"
-#include "blackcore/actionbind.h"
+
 #include <QAbstractItemModel>
+#include <QModelIndex>
+#include <QObject>
 #include <QScopedPointer>
+#include <QVariant>
+#include <Qt>
 
 namespace BlackGui
 {

src/blackgui/models/aircrafticaofilter.cpp

@@ -7,7 +7,7 @@
  * contained in the LICENSE file.
  */
 
-#include "aircrafticaofilter.h"
+#include "blackgui/models/aircrafticaofilter.h"
 #include "blackmisc/aviation/aircrafticaocode.h"
 
 using namespace BlackMisc::Aviation;

src/blackgui/models/aircrafticaofilter.h

@@ -16,6 +16,8 @@
 #include "blackgui/models/modelfilter.h"
 #include "blackmisc/aviation/aircrafticaocodelist.h"
 
+#include <QString>
+
 namespace BlackGui
 {
     namespace Models

src/blackgui/models/aircrafticaolistmodel.cpp

@@ -7,9 +7,15 @@
  * contained in the LICENSE file.
  */
 
-#include "aircrafticaolistmodel.h"
-#include <QMetaProperty>
-#include <QBrush>
+#include "blackgui/models/aircrafticaolistmodel.h"
+#include "blackgui/models/columnformatters.h"
+#include "blackgui/models/columns.h"
+#include "blackmisc/aviation/aircrafticaocode.h"
+#include "blackmisc/datastore.h"
+#include "blackmisc/timestampbased.h"
+
+#include <Qt>
+#include <QtGlobal>
 
 using namespace BlackMisc::Aviation;
 

src/blackgui/models/aircrafticaolistmodel.h

@@ -13,9 +13,11 @@
 #define BLACKGUI_AIRCRAFTICAOLISTMODEL_H
 
 #include "blackgui/blackguiexport.h"
-#include <QAbstractItemModel>
-#include "blackmisc/aviation/aircrafticaocodelist.h"
 #include "blackgui/models/listmodeldbobjects.h"
+#include "blackmisc/aviation/aircrafticaocode.h"
+#include "blackmisc/aviation/aircrafticaocodelist.h"
+
+class QObject;
 
 namespace BlackGui
 {

src/blackgui/models/aircraftmodelfilter.cpp

@@ -7,7 +7,10 @@
  * contained in the LICENSE file.
  */
 
-#include "aircraftmodelfilter.h"
+#include "blackgui/models/aircraftmodelfilter.h"
+#include "blackmisc/aviation/aircrafticaocode.h"
+#include "blackmisc/aviation/airlineicaocode.h"
+#include "blackmisc/aviation/livery.h"
 #include "blackmisc/simulation/aircraftmodel.h"
 
 using namespace BlackMisc::Simulation;

src/blackgui/models/aircraftmodelfilter.h

@@ -13,8 +13,13 @@
 #define BLACKGUI_AIRCRAFTMODELFILTER_H
 
 #include "blackgui/blackguiexport.h"
-#include "modelfilter.h"
+#include "blackgui/models/modelfilter.h"
+#include "blackmisc/simulation/aircraftmodel.h"
 #include "blackmisc/simulation/aircraftmodellist.h"
+#include "blackmisc/simulation/distributor.h"
+#include "blackmisc/simulation/simulatorinfo.h"
+
+#include <QString>
 
 namespace BlackGui
 {

src/blackgui/models/aircraftmodellistmodel.cpp

@@ -7,8 +7,20 @@
  * contained in the LICENSE file.
  */
 
-#include "aircraftmodellistmodel.h"
-#include "blackmisc/icons.h"
+#include "blackgui/models/aircraftmodellistmodel.h"
+#include "blackgui/models/columnformatters.h"
+#include "blackgui/models/columns.h"
+#include "blackmisc/aviation/aircrafticaocode.h"
+#include "blackmisc/aviation/airlineicaocode.h"
+#include "blackmisc/aviation/livery.h"
+#include "blackmisc/datastore.h"
+#include "blackmisc/orderable.h"
+#include "blackmisc/simulation/aircraftmodel.h"
+#include "blackmisc/simulation/distributor.h"
+#include "blackmisc/timestampbased.h"
+
+#include <QtDebug>
+#include <QtGlobal>
 
 using namespace BlackMisc;
 using namespace BlackMisc::Simulation;

src/blackgui/models/aircraftmodellistmodel.h

@@ -15,9 +15,16 @@
 #include "blackgui/blackguiexport.h"
 #include "blackgui/models/listmodeldbobjects.h"
 #include "blackmisc/simulation/aircraftmodellist.h"
-#include <QStringList>
-#include <QAbstractItemModel>
+
 #include <QBrush>
+#include <QStringList>
+#include <QVariant>
+#include <Qt>
+
+class QModelIndex;
+class QObject;
+
+namespace BlackMisc { namespace Simulation { class CAircraftModel; } }
 
 namespace BlackGui
 {

src/blackgui/models/airlineicaofilter.cpp

@@ -7,7 +7,7 @@
  * contained in the LICENSE file.
  */
 
-#include "airlineicaofilter.h"
+#include "blackgui/models/airlineicaofilter.h"
 #include "blackmisc/aviation/airlineicaocode.h"
 
 using namespace BlackMisc::Aviation;

src/blackgui/models/airlineicaofilter.h

@@ -16,6 +16,8 @@
 #include "blackgui/models/modelfilter.h"
 #include "blackmisc/aviation/airlineicaocodelist.h"
 
+#include <QString>
+
 namespace BlackGui
 {
     namespace Models

src/blackgui/models/airlineicaolistmodel.cpp

@@ -7,9 +7,17 @@
  * contained in the LICENSE file.
  */
 
-#include "airlineicaolistmodel.h"
-#include <QMetaProperty>
-#include <QBrush>
+#include "blackgui/models/airlineicaolistmodel.h"
+#include "blackgui/models/columnformatters.h"
+#include "blackgui/models/columns.h"
+#include "blackmisc/aviation/airlineicaocode.h"
+#include "blackmisc/country.h"
+#include "blackmisc/datastore.h"
+#include "blackmisc/propertyindexvariantmap.h"
+#include "blackmisc/timestampbased.h"
+
+#include <Qt>
+#include <QtGlobal>
 
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;

src/blackgui/models/airlineicaolistmodel.h

@@ -13,10 +13,19 @@
 #define BLACKGUI_AIRLINEICAOLISTMODEL_H
 
 #include "blackgui/blackguiexport.h"
-#include <QAbstractItemModel>
-#include "blackmisc/aviation/airlineicaocodelist.h"
 #include "blackgui/models/listmodeldbobjects.h"
 
+class QObject;
+
+namespace BlackMisc
+{
+    namespace Aviation
+    {
+        class CAirlineIcaoCode;
+        class CAirlineIcaoCodeList;
+    }
+}
+
 namespace BlackGui
 {
     namespace Models

src/blackgui/models/airportlistmodel.cpp

@@ -7,9 +7,15 @@
  * contained in the LICENSE file.
  */
 
-#include "airportlistmodel.h"
-#include <QMetaProperty>
-#include <QBrush>
+#include "blackgui/models/airportlistmodel.h"
+#include "blackgui/models/columnformatters.h"
+#include "blackgui/models/columns.h"
+#include "blackmisc/geo/coordinategeodetic.h"
+#include "blackmisc/pq/length.h"
+#include "blackmisc/pq/units.h"
+
+#include <Qt>
+#include <QtGlobal>
 
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::Geo;

src/blackgui/models/airportlistmodel.h

@@ -13,9 +13,11 @@
 #define BLACKGUI_AIRPORTLISTMODEL_H
 
 #include "blackgui/blackguiexport.h"
-#include "blackmisc/aviation/airportlist.h"
 #include "blackgui/models/listmodelbase.h"
-#include <QAbstractItemModel>
+#include "blackmisc/aviation/airport.h"
+#include "blackmisc/aviation/airportlist.h"
+
+class QObject;
 
 namespace BlackGui
 {

src/blackgui/models/atcstationlistmodel.cpp

@@ -7,9 +7,29 @@
  * contained in the LICENSE file.
  */
 
-#include "atcstationlistmodel.h"
+#include "blackgui/models/atcstationlistmodel.h"
+#include "blackgui/models/columnformatters.h"
+#include "blackgui/models/columns.h"
 #include "blackmisc/audio/voiceroom.h"
+#include "blackmisc/aviation/callsign.h"
+#include "blackmisc/compare.h"
+#include "blackmisc/icon.h"
 #include "blackmisc/network/user.h"
+#include "blackmisc/pq/frequency.h"
+#include "blackmisc/pq/length.h"
+#include "blackmisc/pq/units.h"
+#include "blackmisc/propertyindexvariantmap.h"
+
+#include <QDateTime>
+#include <QList>
+#include <QMap>
+#include <QModelIndex>
+#include <QStandardItem>
+#include <QStandardItemModel>
+#include <QString>
+#include <Qt>
+#include <QtDebug>
+#include <QtGlobal>
 
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Audio;

src/blackgui/models/atcstationlistmodel.h

@@ -13,10 +13,13 @@
 #define BLACKGUI_ATCLISTMODEL_H
 
 #include "blackgui/blackguiexport.h"
-#include "blackmisc/aviation/atcstationlist.h"
 #include "blackgui/models/listmodelbase.h"
-#include <QAbstractItemModel>
-#include <QStandardItemModel>
+#include "blackmisc/aviation/atcstation.h"
+#include "blackmisc/aviation/atcstationlist.h"
+
+#include <QObject>
+
+class QStandardItemModel;
 
 namespace BlackGui
 {

src/blackgui/models/clientlistmodel.cpp

@@ -7,10 +7,17 @@
  * contained in the LICENSE file.
  */
 
-#include "clientlistmodel.h"
-#include "blackmisc/icons.h"
-#include <QMetaProperty>
-#include <QBrush>
+#include "blackgui/models/clientlistmodel.h"
+#include "blackgui/models/columnformatters.h"
+#include "blackgui/models/columns.h"
+#include "blackmisc/compare.h"
+#include "blackmisc/network/user.h"
+#include "blackmisc/propertyindex.h"
+#include "blackmisc/propertyindexvariantmap.h"
+#include "blackmisc/simulation/aircraftmodel.h"
+
+#include <Qt>
+#include <QtGlobal>
 
 using namespace BlackMisc;
 using namespace BlackMisc::Simulation;

src/blackgui/models/clientlistmodel.h

@@ -13,9 +13,14 @@
 #define BLACKGUI_CLIENTLISTMODEL_H
 
 #include "blackgui/blackguiexport.h"
-#include <QAbstractItemModel>
-#include "blackmisc/network/clientlist.h"
 #include "blackgui/models/listmodelbase.h"
+#include "blackmisc/network/client.h"
+#include "blackmisc/network/clientlist.h"
+
+#include <QVariant>
+
+class QModelIndex;
+class QObject;
 
 namespace BlackGui
 {

src/blackgui/models/columnformatters.cpp

@@ -7,13 +7,20 @@
  * contained in the LICENSE file.
  */
 
-#include "columnformatters.h"
-#include "blackmisc/geo/latitude.h"
+#include "blackgui/models/columnformatters.h"
 #include "blackmisc/aviation/altitude.h"
-#include "blackmisc/rgbcolor.h"
-#include "blackmisc/variant.h"
+#include "blackmisc/aviation/comsystem.h"
 #include "blackmisc/iconlist.h"
 #include "blackmisc/icons.h"
+#include "blackmisc/rgbcolor.h"
+#include "blackmisc/variant.h"
+
+#include <QDate>
+#include <QDateTime>
+#include <QImage>
+#include <QMetaType>
+#include <QTime>
+#include <QVariant>
 
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;

src/blackgui/models/columnformatters.h

@@ -14,12 +14,21 @@
 
 #include "blackgui/blackguiexport.h"
 #include "blackgui/led.h"
-#include "blackmisc/pq/pq.h"
-#include "blackmisc/aviation/comsystem.h"
 #include "blackmisc/icon.h"
-#include <QDateTime>
-#include <QDate>
-#include <QTime>
+#include "blackmisc/icons.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/variant.h"
+
+#include <QFlags>
+#include <QList>
+#include <QPixmap>
+#include <QString>
+#include <Qt>
+#include <QtGlobal>
 
 namespace BlackGui
 {

src/blackgui/models/columns.cpp

@@ -7,8 +7,12 @@
  * contained in the LICENSE file.
  */
 
-#include "columns.h"
+#include "blackgui/models/columns.h"
+#include "blackmisc/compare.h"
+
+#include <QByteArray>
 #include <QCoreApplication>
+#include <QModelIndex>
 
 using namespace BlackMisc;
 

src/blackgui/models/columns.h

@@ -13,13 +13,17 @@
 #define BLACKGUI_COLUMNS_H
 
 #include "blackgui/blackguiexport.h"
-#include "blackmisc/collection.h"
+#include "blackgui/models/columnformatters.h"
 #include "blackmisc/propertyindex.h"
-#include "columnformatters.h"
-#include <QModelIndex>
+#include "blackmisc/variant.h"
+
+#include <QList>
 #include <QObject>
-#include <QHash>
-#include <QScopedPointer>
+#include <QSharedPointer>
+#include <QString>
+#include <QtGlobal>
+
+class QModelIndex;
 
 namespace BlackGui
 {

src/blackgui/models/countryfilter.cpp

@@ -7,7 +7,7 @@
  * contained in the LICENSE file.
  */
 
-#include "countryfilter.h"
+#include "blackgui/models/countryfilter.h"
 #include "blackmisc/country.h"
 
 using namespace BlackMisc;

src/blackgui/models/countryfilter.h

@@ -16,6 +16,8 @@
 #include "blackgui/models/modelfilter.h"
 #include "blackmisc/countrylist.h"
 
+#include <QString>
+
 namespace BlackGui
 {
     namespace Models

src/blackgui/models/countrylistmodel.cpp

@@ -7,8 +7,14 @@
  * contained in the LICENSE file.
  */
 
-#include "countrylistmodel.h"
-#include <QMetaProperty>
+#include "blackgui/models/columns.h"
+#include "blackgui/models/countrylistmodel.h"
+#include "blackmisc/country.h"
+#include "blackmisc/propertyindexvariantmap.h"
+#include "blackmisc/timestampbased.h"
+
+#include <Qt>
+#include <QtGlobal>
 
 using namespace BlackMisc;
 

src/blackgui/models/countrylistmodel.h

@@ -13,9 +13,17 @@
 #define BLACKGUI_COUNTRYLISTMODEL_H
 
 #include "blackgui/blackguiexport.h"
-#include "blackmisc/countrylist.h"
 #include "blackgui/models/listmodeldbobjects.h"
-#include <QAbstractItemModel>
+
+#include <QString>
+
+class QObject;
+
+namespace BlackMisc
+{
+    class CCountry;
+    class CCountryList;
+}
 
 namespace BlackGui
 {

src/blackgui/models/distributorlistmodel.cpp

@@ -7,9 +7,17 @@
  * contained in the LICENSE file.
  */
 
-#include "distributorlistmodel.h"
-#include <QMetaProperty>
-#include <QBrush>
+#include "blackgui/models/columns.h"
+#include "blackgui/models/distributorlistmodel.h"
+#include "blackmisc/datastore.h"
+#include "blackmisc/propertyindexvariantmap.h"
+#include "blackmisc/simulation/distributor.h"
+#include "blackmisc/simulation/simulatorinfo.h"
+#include "blackmisc/timestampbased.h"
+
+#include <Qt>
+#include <QtDebug>
+#include <QtGlobal>
 
 using namespace BlackMisc::Simulation;
 

src/blackgui/models/distributorlistmodel.h

@@ -13,9 +13,14 @@
 #define BLACKGUI_DISTRIBUTORLISTMODEL_H
 
 #include "blackgui/blackguiexport.h"
-#include "blackmisc/simulation/distributorlist.h"
 #include "blackgui/models/listmodeldbobjects.h"
-#include <QAbstractItemModel>
+#include "blackmisc/simulation/distributorlist.h"
+
+#include <QString>
+
+class QObject;
+
+namespace BlackMisc { namespace Simulation { class CDistributor; } }
 
 namespace BlackGui
 {

src/blackgui/models/identifierlistmodel.cpp

@@ -7,9 +7,12 @@
  * contained in the LICENSE file.
  */
 
-#include "identifierlistmodel.h"
-#include <QMetaProperty>
-#include <QBrush>
+#include "blackgui/models/columnformatters.h"
+#include "blackgui/models/columns.h"
+#include "blackgui/models/identifierlistmodel.h"
+#include "blackmisc/timestampbased.h"
+
+#include <QtGlobal>
 
 using namespace BlackMisc;
 

src/blackgui/models/identifierlistmodel.h

@@ -13,9 +13,11 @@
 #define BLACKGUI_IDENTIFIERLISTMODEL_H
 
 #include "blackgui/blackguiexport.h"
-#include "blackmisc/identifierlist.h"
 #include "blackgui/models/listmodelbase.h"
-#include <QAbstractItemModel>
+#include "blackmisc/identifier.h"
+#include "blackmisc/identifierlist.h"
+
+class QObject;
 
 namespace BlackGui
 {

src/blackgui/models/listmodelbase.cpp

@@ -10,16 +10,54 @@
 // Drag and drop docu:
 // http://doc.qt.io/qt-5/model-view-programming.html#using-drag-and-drop-with-item-views
 
-#include "listmodelbase.h"
-#include "allmodelcontainers.h"
 #include "blackgui/guiutility.h"
-#include "blackmisc/verify.h"
+#include "blackgui/models/columnformatters.h"
+#include "blackgui/models/listmodelbase.h"
+#include "blackmisc/aviation/aircrafticaocode.h"
+#include "blackmisc/aviation/aircrafticaocodelist.h"
+#include "blackmisc/aviation/airlineicaocode.h"
+#include "blackmisc/aviation/airlineicaocodelist.h"
+#include "blackmisc/aviation/airport.h"
+#include "blackmisc/aviation/airportlist.h"
+#include "blackmisc/aviation/atcstation.h"
+#include "blackmisc/aviation/atcstationlist.h"
+#include "blackmisc/aviation/livery.h"
+#include "blackmisc/aviation/liverylist.h"
+#include "blackmisc/compare.h"
+#include "blackmisc/country.h"
+#include "blackmisc/countrylist.h"
+#include "blackmisc/identifier.h"
+#include "blackmisc/identifierlist.h"
+#include "blackmisc/namevariantpair.h"
+#include "blackmisc/namevariantpairlist.h"
+#include "blackmisc/network/client.h"
+#include "blackmisc/network/clientlist.h"
+#include "blackmisc/network/server.h"
+#include "blackmisc/network/serverlist.h"
+#include "blackmisc/network/textmessage.h"
+#include "blackmisc/network/textmessagelist.h"
+#include "blackmisc/network/user.h"
+#include "blackmisc/network/userlist.h"
+#include "blackmisc/predicates.h"
+#include "blackmisc/propertyindex.h"
+#include "blackmisc/sequence.h"
+#include "blackmisc/simulation/aircraftmodel.h"
+#include "blackmisc/simulation/aircraftmodellist.h"
+#include "blackmisc/simulation/distributor.h"
+#include "blackmisc/simulation/distributorlist.h"
+#include "blackmisc/simulation/simulatedaircraft.h"
+#include "blackmisc/simulation/simulatedaircraftlist.h"
+#include "blackmisc/statusmessage.h"
+#include "blackmisc/statusmessagelist.h"
 #include "blackmisc/variant.h"
-#include "blackmisc/json.h"
-#include "blackmisc/logmessage.h"
-#include "blackmisc/comparefunctions.h"
-#include <QMimeData>
+#include "blackmisc/verify.h"
+#include "blackmisc/worker.h"
+
+#include <QFlags>
 #include <QJsonDocument>
+#include <QList>
+#include <QMimeData>
+#include <QtGlobal>
 
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;

src/blackgui/models/listmodelbase.h

@@ -13,17 +13,31 @@
 #define BLACKGUI_LISTMODELBASE_H
 
 #include "blackgui/blackguiexport.h"
+#include "blackgui/dropbase.h"
 #include "blackgui/models/columns.h"
 #include "blackgui/models/modelfilter.h"
-#include "blackgui/dropbase.h"
-#include "blackmisc/worker.h"
 #include "blackmisc/digestsignal.h"
+#include "blackmisc/variant.h"
+
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QModelIndex>
+#include <QModelIndexList>
+#include <QObject>
 #include <QStandardItemModel>
-#include <QThread>
+#include <QString>
+#include <QStringList>
+#include <QVariant>
+#include <QVector>
+#include <Qt>
 #include <memory>
-#include <iostream>
 #include <type_traits>
 
+class QMimeData;
+class QModelIndex;
+
+namespace BlackMisc { class CWorker; }
+
 namespace BlackGui
 {
     namespace Models

src/blackgui/models/listmodeldbobjects.cpp

@@ -7,9 +7,11 @@
  * contained in the LICENSE file.
  */
 
-#include "listmodeldbobjects.h"
-#include "allmodelcontainers.h"
-#include "blackmisc/datastoreobjectlist.h"
+#include "blackgui/models/listmodeldbobjects.h"
+#include "blackmisc/orderable.h"
+
+#include <QBrush>
+#include <QModelIndex>
 #include <type_traits>
 
 using namespace BlackMisc;

src/blackgui/models/listmodeldbobjects.h

@@ -12,8 +12,28 @@
 #ifndef BLACKGUI_LISTMODELDBOBJECTS_H
 #define BLACKGUI_LISTMODELDBOBJECTS_H
 
-#include "listmodelbase.h"
-#include "blackgui/blackguiexport.h"
+#include "blackgui/models/listmodelbase.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/aviation/liverylist.h"
+#include "blackmisc/country.h"
+#include "blackmisc/countrylist.h"
+#include "blackmisc/simulation/aircraftmodel.h"
+#include "blackmisc/simulation/aircraftmodellist.h"
+#include "blackmisc/simulation/distributor.h"
+#include "blackmisc/simulation/distributorlist.h"
+
+#include <QColor>
+#include <QList>
+#include <QString>
+#include <QVariant>
+#include <Qt>
+
+class QModelIndex;
+class QObject;
 
 namespace BlackGui
 {

src/blackgui/models/liveryfilter.cpp

@@ -7,8 +7,9 @@
  * contained in the LICENSE file.
  */
 
-#include "liveryfilter.h"
-#include "blackmisc/aviation/aircrafticaocode.h"
+#include "blackgui/models/liveryfilter.h"
+#include "blackmisc/aviation/airlineicaocode.h"
+#include "blackmisc/aviation/livery.h"
 
 using namespace BlackMisc::Aviation;
 

src/blackgui/models/liveryfilter.h

@@ -15,6 +15,9 @@
 #include "blackgui/blackguiexport.h"
 #include "blackgui/models/modelfilter.h"
 #include "blackmisc/aviation/liverylist.h"
+#include "blackmisc/rgbcolor.h"
+
+#include <QString>
 
 namespace BlackGui
 {

src/blackgui/models/liverylistmodel.cpp

@@ -7,10 +7,17 @@
  * contained in the LICENSE file.
  */
 
-#include "liverylistmodel.h"
-#include "blackmisc/rgbcolor.h"
-#include <QMetaProperty>
-#include <QBrush>
+#include "blackgui/models/columnformatters.h"
+#include "blackgui/models/columns.h"
+#include "blackgui/models/liverylistmodel.h"
+#include "blackmisc/aviation/airlineicaocode.h"
+#include "blackmisc/aviation/livery.h"
+#include "blackmisc/country.h"
+#include "blackmisc/datastore.h"
+#include "blackmisc/propertyindexvariantmap.h"
+#include "blackmisc/timestampbased.h"
+
+#include <QtGlobal>
 
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;

src/blackgui/models/liverylistmodel.h

@@ -13,9 +13,18 @@
 #define BLACKGUI_LIVERYLISTMODEL_H
 
 #include "blackgui/blackguiexport.h"
-#include "blackmisc/aviation/liverylist.h"
 #include "blackgui/models/listmodeldbobjects.h"
-#include <QAbstractItemModel>
+
+class QObject;
+
+namespace BlackMisc
+{
+    namespace Aviation
+    {
+        class CLivery;
+        class CLiveryList;
+    }
+}
 
 namespace BlackGui
 {

src/blackgui/models/modelfilter.cpp

@@ -7,8 +7,9 @@
  * contained in the LICENSE file.
  */
 
-#include "modelfilter.h"
-#include "blackgui/models/allmodels.h"
+#include "blackgui/models/modelfilter.h"
+
+#include <QtGlobal>
 
 namespace BlackGui
 {

src/blackgui/models/modelfilter.h

@@ -12,8 +12,25 @@
 #ifndef BLACKGUI_LISTMODELFILTER_H
 #define BLACKGUI_LISTMODELFILTER_H
 
-#include "blackgui/blackguiexport.h"
+#include "blackmisc/aviation/aircrafticaocodelist.h"
+#include "blackmisc/aviation/airlineicaocodelist.h"
+#include "blackmisc/aviation/airportlist.h"
+#include "blackmisc/aviation/atcstationlist.h"
+#include "blackmisc/aviation/liverylist.h"
+#include "blackmisc/countrylist.h"
+#include "blackmisc/identifierlist.h"
+#include "blackmisc/namevariantpairlist.h"
+#include "blackmisc/network/clientlist.h"
+#include "blackmisc/network/serverlist.h"
+#include "blackmisc/network/textmessagelist.h"
+#include "blackmisc/network/userlist.h"
+#include "blackmisc/simulation/aircraftmodellist.h"
+#include "blackmisc/simulation/distributorlist.h"
+#include "blackmisc/simulation/simulatedaircraftlist.h"
+#include "blackmisc/statusmessagelist.h"
+
 #include <QString>
+#include <Qt>
 #include <memory>
 
 namespace BlackGui

src/blackgui/models/namevariantpairlistmodel.cpp

@@ -7,7 +7,16 @@
  * contained in the LICENSE file.
  */
 
-#include "namevariantpairlistmodel.h"
+#include "blackgui/models/columnformatters.h"
+#include "blackgui/models/columns.h"
+#include "blackgui/models/namevariantpairlistmodel.h"
+#include "blackmisc/compare.h"
+#include "blackmisc/namevariantpair.h"
+#include "blackmisc/propertyindexvariantmap.h"
+
+#include <QModelIndex>
+#include <Qt>
+#include <QtGlobal>
 
 using namespace BlackMisc;
 

src/blackgui/models/namevariantpairlistmodel.h

@@ -13,10 +13,19 @@
 #define BLACKGUI_NAMEVARIANTLISTMODEL_H
 
 #include "blackgui/blackguiexport.h"
-#include "blackmisc/namevariantpairlist.h"
 #include "blackgui/models/listmodelbase.h"
-#include <QAbstractItemModel>
-#include <QMap>
+#include "blackmisc/namevariantpairlist.h"
+#include "blackmisc/variant.h"
+
+#include <QString>
+
+class QObject;
+
+namespace BlackMisc
+{
+    class CIcon;
+    class CNameVariantPair;
+}
 
 namespace BlackGui
 {

src/blackgui/models/serverlistmodel.cpp

@@ -7,9 +7,12 @@
  * contained in the LICENSE file.
  */
 
-#include "serverlistmodel.h"
-#include <QMetaProperty>
-#include <QBrush>
+#include "blackgui/models/columns.h"
+#include "blackgui/models/serverlistmodel.h"
+#include "blackmisc/network/server.h"
+#include "blackmisc/network/user.h"
+
+#include <QtGlobal>
 
 using namespace BlackMisc::Network;
 

src/blackgui/models/serverlistmodel.h

@@ -13,9 +13,12 @@
 #define BLACKGUI_SERVERLISTMODEL_H
 
 #include "blackgui/blackguiexport.h"
-#include "blackmisc/network/serverlist.h"
 #include "blackgui/models/listmodelbase.h"
-#include <QAbstractItemModel>
+#include "blackmisc/network/serverlist.h"
+
+class QObject;
+
+namespace BlackMisc { namespace Network { class CServer; } }
 
 namespace BlackGui
 {

src/blackgui/models/simulatedaircraftlistmodel.cpp

@@ -7,9 +7,21 @@
  * contained in the LICENSE file.
  */
 
-#include "simulatedaircraftlistmodel.h"
-#include "blackmisc/network/user.h"
+#include "blackgui/models/columnformatters.h"
+#include "blackgui/models/columns.h"
+#include "blackgui/models/simulatedaircraftlistmodel.h"
 #include "blackmisc/aviation/aircraftsituation.h"
+#include "blackmisc/aviation/callsign.h"
+#include "blackmisc/aviation/comsystem.h"
+#include "blackmisc/aviation/modulator.h"
+#include "blackmisc/aviation/transponder.h"
+#include "blackmisc/network/user.h"
+#include "blackmisc/simulation/aircraftmodel.h"
+#include "blackmisc/simulation/simulatedaircraft.h"
+
+#include <Qt>
+#include <QtDebug>
+#include <QtGlobal>
 
 using namespace BlackMisc::Simulation;
 using namespace BlackMisc::Aviation;

src/blackgui/models/simulatedaircraftlistmodel.h

@@ -13,10 +13,12 @@
 #define BLACKGUI_SIMULATEDAIRCRAFTLISTMODEL_H
 
 #include "blackgui/blackguiexport.h"
-#include "blackmisc/simulation/simulatedaircraftlist.h"
 #include "blackgui/models/listmodelbase.h"
-#include <QAbstractItemModel>
-#include <QDBusConnection>
+#include "blackmisc/simulation/simulatedaircraftlist.h"
+
+class QObject;
+
+namespace BlackMisc { namespace Simulation { class CSimulatedAircraft; } }
 
 namespace BlackGui
 {

src/blackgui/models/statusmessagelistmodel.cpp

@@ -7,11 +7,14 @@
  * contained in the LICENSE file.
  */
 
-#include "statusmessagelistmodel.h"
-#include "blackmisc/icon.h"
-#include <QMetaProperty>
-#include <QBrush>
-#include <QIcon>
+#include "blackgui/models/columnformatters.h"
+#include "blackgui/models/columns.h"
+#include "blackgui/models/statusmessagelistmodel.h"
+#include "blackmisc/propertyindexvariantmap.h"
+#include "blackmisc/timestampbased.h"
+
+#include <Qt>
+#include <QtGlobal>
 
 using namespace BlackMisc;
 

src/blackgui/models/statusmessagelistmodel.h

@@ -13,10 +13,11 @@
 #define BLACKGUI_STATUSMESSAGELISTMODEL_H
 
 #include "blackgui/blackguiexport.h"
-#include <QAbstractItemModel>
-#include <QDBusConnection>
-#include "blackmisc/statusmessagelist.h"
 #include "blackgui/models/listmodelbase.h"
+#include "blackmisc/statusmessage.h"
+#include "blackmisc/statusmessagelist.h"
+
+class QObject;
 
 namespace BlackGui
 {

src/blackgui/models/textmessagelistmodel.cpp

@@ -7,7 +7,17 @@
  * contained in the LICENSE file.
  */
 
-#include "textmessagelistmodel.h"
+#include "blackgui/models/columnformatters.h"
+#include "blackgui/models/columns.h"
+#include "blackgui/models/textmessagelistmodel.h"
+#include "blackmisc/aviation/callsign.h"
+#include "blackmisc/network/textmessage.h"
+#include "blackmisc/propertyindexvariantmap.h"
+#include "blackmisc/timestampbased.h"
+
+#include <Qt>
+#include <QtDebug>
+#include <QtGlobal>
 
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Network;

src/blackgui/models/textmessagelistmodel.h

@@ -13,11 +13,12 @@
 #define BLACKGUI_TEXTMESSAGELISTMODEL_H
 
 #include "blackgui/blackguiexport.h"
-#include "blackmisc/network/textmessagelist.h"
 #include "blackgui/models/listmodelbase.h"
-#include <QAbstractItemModel>
-#include <QStandardItemModel>
-#include <QDBusConnection>
+#include "blackmisc/network/textmessagelist.h"
+
+class QObject;
+
+namespace BlackMisc { namespace Network { class CTextMessage; } }
 
 namespace BlackGui
 {

src/blackgui/models/userlistmodel.cpp

@@ -7,9 +7,15 @@
  * contained in the LICENSE file.
  */
 
-#include "userlistmodel.h"
-#include <QMetaProperty>
-#include <QBrush>
+#include "blackgui/models/columns.h"
+#include "blackgui/models/userlistmodel.h"
+#include "blackmisc/aviation/airporticaocode.h"
+#include "blackmisc/aviation/callsign.h"
+#include "blackmisc/propertyindexvariantmap.h"
+
+#include <Qt>
+#include <QtDebug>
+#include <QtGlobal>
 
 using namespace BlackMisc::Network;
 using namespace BlackMisc::Aviation;

src/blackgui/models/userlistmodel.h

@@ -13,9 +13,11 @@
 #define BLACKGUI_USERLISTMODEL_H
 
 #include "blackgui/blackguiexport.h"
-#include <QAbstractItemModel>
-#include "blackmisc/network/userlist.h"
 #include "blackgui/models/listmodelbase.h"
+#include "blackmisc/network/user.h"
+#include "blackmisc/network/userlist.h"
+
+class QObject;
 
 namespace BlackGui
 {