Fix BlackGui header includes

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

refs #598

src/blackgui/views/aircrafticaoview.cpp

@@ -7,8 +7,9 @@
  * contained in the LICENSE file.
  */
 
-#include "aircrafticaoview.h"
-#include <QHeaderView>
+#include "blackgui/models/aircrafticaolistmodel.h"
+#include "blackgui/views/aircrafticaoview.h"
+#include "blackgui/views/viewbase.h"
 
 using namespace BlackMisc;
 using namespace BlackGui::Models;

src/blackgui/views/aircrafticaoview.h

@@ -13,8 +13,19 @@
 #define BLACKGUI_AIRCRAFTICAOVIEW_H
 
 #include "blackgui/blackguiexport.h"
-#include "viewdbobjects.h"
-#include "../models/aircrafticaolistmodel.h"
+#include "blackgui/models/aircrafticaolistmodel.h"
+#include "blackgui/views/viewdbobjects.h"
+
+class QWidget;
+
+namespace BlackMisc
+{
+    namespace Aviation
+    {
+        class CAircraftIcaoCode;
+        class CAircraftIcaoCodeList;
+    }
+}
 
 namespace BlackGui
 {

src/blackgui/views/aircraftmodelview.cpp

@@ -7,20 +7,32 @@
  * contained in the LICENSE file.
  */
 
-#include "aircraftmodelview.h"
-#include "blackmisc/aviation/aircrafticaocodelist.h"
-#include "blackmisc/aviation/airlineicaocodelist.h"
-#include "blackmisc/aviation/liverylist.h"
-#include "blackmisc/simulation/distributorlist.h"
-#include "blackmisc/simulation/simulatorinfolist.h"
-#include "blackgui/shortcut.h"
+#include "blackgui/filters/aircraftmodelfilterdialog.h"
 #include "blackgui/guiapplication.h"
 #include "blackgui/guiutility.h"
-#include "blackgui/filters/aircraftmodelfilterdialog.h"
-#include <QHeaderView>
+#include "blackgui/menus/menuaction.h"
+#include "blackgui/shortcut.h"
+#include "blackgui/views/aircraftmodelview.h"
+#include "blackgui/views/viewbase.h"
+#include "blackmisc/aviation/aircrafticaocode.h"
+#include "blackmisc/aviation/aircrafticaocodelist.h"
+#include "blackmisc/aviation/airlineicaocodelist.h"
+#include "blackmisc/aviation/livery.h"
+#include "blackmisc/aviation/liverylist.h"
+#include "blackmisc/icons.h"
+#include "blackmisc/simulation/aircraftmodel.h"
+#include "blackmisc/simulation/distributorlist.h"
+#include "blackmisc/simulation/simulatorinfolist.h"
+#include "blackmisc/statusmessagelist.h"
+#include "blackmisc/variant.h"
+
+#include <QAction>
+#include <QDropEvent>
+#include <QMap>
 #include <QShortcut>
-#include <iostream>
-#include <memory>
+#include <QString>
+#include <QWidget>
+#include <QtGlobal>
 
 using namespace BlackMisc;
 using namespace BlackMisc::Simulation;

src/blackgui/views/aircraftmodelview.h

@@ -13,12 +13,40 @@
 #define BLACKGUI_AIRCRAFTMODELVIEW_H
 
 #include "blackgui/blackguiexport.h"
-#include "blackgui/filters/aircraftmodelfilterdialog.h"
 #include "blackgui/models/aircraftmodellistmodel.h"
-#include "viewdbobjects.h"
+#include "blackgui/views/viewdbobjects.h"
+#include "blackmisc/aviation/airlineicaocode.h"
+#include "blackmisc/propertyindexvariantmap.h"
+#include "blackmisc/simulation/aircraftmodellist.h"
+#include "blackmisc/simulation/distributor.h"
+#include "blackmisc/simulation/simulatorinfo.h"
+#include "blackmisc/statusmessage.h"
+
+#include <QBrush>
+#include <QFlags>
+#include <QMetaType>
+#include <QObject>
+#include <QStringList>
+#include <Qt>
+
+class QDropEvent;
+class QWidget;
+
+namespace BlackMisc
+{
+    namespace Aviation
+    {
+        class CAircraftIcaoCode;
+        class CLivery;
+    }
+}
+namespace BlackMisc { namespace Simulation { class CAircraftModel; } }
 
 namespace BlackGui
 {
+    namespace Filters { class CAircraftModelFilterDialog; }
+    namespace Menus { class CMenuActions; }
+
     namespace Views
     {
         //! Aircraft view

src/blackgui/views/airlineicaoview.cpp

@@ -7,8 +7,9 @@
  * contained in the LICENSE file.
  */
 
-#include "airlineicaoview.h"
-#include <QHeaderView>
+#include "blackgui/models/airlineicaolistmodel.h"
+#include "blackgui/views/airlineicaoview.h"
+#include "blackgui/views/viewbase.h"
 
 using namespace BlackMisc;
 using namespace BlackGui::Models;

src/blackgui/views/airlineicaoview.h

@@ -13,8 +13,19 @@
 #define BLACKGUI_AIRLINEICAOVIEW_H
 
 #include "blackgui/blackguiexport.h"
-#include "viewdbobjects.h"
-#include "../models/airlineicaolistmodel.h"
+#include "blackgui/models/airlineicaolistmodel.h"
+#include "blackgui/views/viewdbobjects.h"
+
+class QWidget;
+
+namespace BlackMisc
+{
+    namespace Aviation
+    {
+        class CAirlineIcaoCode;
+        class CAirlineIcaoCodeList;
+    }
+}
 
 namespace BlackGui
 {

src/blackgui/views/airportview.cpp

@@ -7,8 +7,8 @@
  * contained in the LICENSE file.
  */
 
-#include "airportview.h"
-#include <QHeaderView>
+#include "blackgui/models/airportlistmodel.h"
+#include "blackgui/views/airportview.h"
 
 using namespace BlackMisc;
 using namespace BlackGui::Models;

src/blackgui/views/airportview.h

@@ -13,8 +13,13 @@
 #define BLACKGUI_AIRPORTVIEW_H
 
 #include "blackgui/blackguiexport.h"
-#include "viewbase.h"
-#include "../models/airportlistmodel.h"
+#include "blackgui/models/airportlistmodel.h"
+#include "blackgui/views/viewbase.h"
+#include "blackmisc/aviation/airportlist.h"
+
+class QWidget;
+
+namespace BlackMisc { namespace Aviation { class CAirport; } }
 
 namespace BlackGui
 {

src/blackgui/views/atcstationview.cpp

@@ -7,11 +7,16 @@
  * contained in the LICENSE file.
  */
 
-#include "atcstationview.h"
+#include "blackgui/menus/menuaction.h"
+#include "blackgui/models/atcstationlistmodel.h"
+#include "blackgui/views/atcstationview.h"
 #include "blackmisc/aviation/atcstationlist.h"
-#include "blackmisc/testing.h"
+#include "blackmisc/aviation/callsign.h"
 #include "blackmisc/buildconfig.h"
-#include <QHeaderView>
+#include "blackmisc/icons.h"
+
+#include <QFlags>
+#include <QtGlobal>
 
 using namespace BlackMisc;
 using namespace BlackMisc::Aviation;

src/blackgui/views/atcstationview.h

@@ -7,17 +7,31 @@
  * contained in the LICENSE file.
  */
 
+//! \file
+
 #ifndef BLACKGUI_ATCSTATIONVIEW_H
 #define BLACKGUI_ATCSTATIONVIEW_H
 
-//! \file
-
 #include "blackgui/blackguiexport.h"
-#include "viewbase.h"
-#include "../models/atcstationlistmodel.h"
+#include "blackgui/models/atcstationlistmodel.h"
+#include "blackgui/views/viewbase.h"
+#include "blackmisc/aviation/atcstation.h"
+#include "blackmisc/aviation/atcstationlist.h"
+#include "blackmisc/aviation/comsystem.h"
+#include "blackmisc/pq/frequency.h"
+
+#include <QList>
+#include <QObject>
+
+class QAction;
+class QWidget;
+
+namespace BlackMisc { namespace Aviation { class CCallsign; } }
 
 namespace BlackGui
 {
+    namespace Menus { class CMenuActions; }
+
     namespace Views
     {
         //! ATC stations view

src/blackgui/views/checkboxdelegate.cpp

@@ -7,8 +7,16 @@
  * contained in the LICENSE file.
  */
 
-#include "checkboxdelegate.h"
-#include "../stylesheetutility.h"
+#include "blackgui/stylesheetutility.h"
+#include "blackgui/views/checkboxdelegate.h"
+
+#include <QAbstractItemModel>
+#include <QCheckBox>
+#include <QModelIndex>
+#include <QVariant>
+#include <QWidget>
+#include <Qt>
+#include <QtGlobal>
 
 using namespace BlackGui;
 

src/blackgui/views/checkboxdelegate.h

@@ -13,8 +13,16 @@
 #define BLACKGUI_CCOLUMNCHECKBOXDELEGATE_H
 
 #include "blackgui/blackguiexport.h"
+
 #include <QItemDelegate>
-#include <QCheckBox>
+#include <QObject>
+#include <QString>
+#include <QStyleOptionViewItem>
+
+class QAbstractItemModel;
+class QModelIndex;
+class QStyleOptionViewItem;
+class QWidget;
 
 namespace BlackGui
 {

src/blackgui/views/clientview.cpp

@@ -7,9 +7,8 @@
  * contained in the LICENSE file.
  */
 
-#include "clientview.h"
-#include <QHeaderView>
-#include <QDebug>
+#include "blackgui/models/clientlistmodel.h"
+#include "blackgui/views/clientview.h"
 
 using namespace BlackMisc;
 using namespace BlackGui::Models;

src/blackgui/views/clientview.h

@@ -7,14 +7,19 @@
  * contained in the LICENSE file.
  */
 
+//! \file
+
 #ifndef BLACKGUI_CLIENTVIEW_H
 #define BLACKGUI_CLIENTVIEW_H
 
-//! \file
-
 #include "blackgui/blackguiexport.h"
-#include "viewbase.h"
-#include "../models/clientlistmodel.h"
+#include "blackgui/models/clientlistmodel.h"
+#include "blackgui/views/viewbase.h"
+#include "blackmisc/network/clientlist.h"
+
+class QWidget;
+
+namespace BlackMisc { namespace Network { class CClient; } }
 
 namespace BlackGui
 {

src/blackgui/views/countryview.cpp

@@ -7,8 +7,7 @@
  * contained in the LICENSE file.
  */
 
-#include "countryview.h"
-#include <QHeaderView>
+#include "blackgui/views/countryview.h"
 
 using namespace BlackGui::Models;
 

src/blackgui/views/countryview.h

@@ -12,9 +12,14 @@
 #ifndef BLACKGUI_COUNTRYVIEW_H
 #define BLACKGUI_COUNTRYVIEW_H
 
-#include "viewbase.h"
 #include "blackgui/blackguiexport.h"
 #include "blackgui/models/countrylistmodel.h"
+#include "blackgui/views/viewbase.h"
+#include "blackmisc/countrylist.h"
+
+class QWidget;
+
+namespace BlackMisc { class CCountry; }
 
 namespace BlackGui
 {

src/blackgui/views/distributorview.cpp

@@ -7,8 +7,9 @@
  * contained in the LICENSE file.
  */
 
-#include "distributorview.h"
-#include <QHeaderView>
+#include "blackgui/models/distributorlistmodel.h"
+#include "blackgui/views/distributorview.h"
+#include "blackgui/views/viewbase.h"
 
 using namespace BlackGui::Models;
 

src/blackgui/views/distributorview.h

@@ -13,8 +13,20 @@
 #define BLACKGUI_DISTRIBUTORVIEW_H
 
 #include "blackgui/blackguiexport.h"
-#include "viewdbobjects.h"
-#include "../models/distributorlistmodel.h"
+#include "blackgui/models/distributorlistmodel.h"
+#include "blackgui/views/viewdbobjects.h"
+
+class QString;
+class QWidget;
+
+namespace BlackMisc
+{
+    namespace Simulation
+    {
+        class CDistributor;
+        class CDistributorList;
+    }
+}
 
 namespace BlackGui
 {

src/blackgui/views/identifierview.cpp

@@ -7,8 +7,8 @@
  * contained in the LICENSE file.
  */
 
-#include "identifierview.h"
-#include <QHeaderView>
+#include "blackgui/models/identifierlistmodel.h"
+#include "blackgui/views/identifierview.h"
 
 using namespace BlackMisc;
 using namespace BlackGui::Models;

src/blackgui/views/identifierview.h

@@ -13,8 +13,13 @@
 #define BLACKGUI_IDENTIFIERVIEW_H
 
 #include "blackgui/blackguiexport.h"
-#include "viewbase.h"
-#include "../models/identifierlistmodel.h"
+#include "blackgui/models/identifierlistmodel.h"
+#include "blackgui/views/viewbase.h"
+#include "blackmisc/identifierlist.h"
+
+class QWidget;
+
+namespace BlackMisc { class CIdentifier; }
 
 namespace BlackGui
 {

src/blackgui/views/liveryview.cpp

@@ -7,8 +7,8 @@
  * contained in the LICENSE file.
  */
 
-#include "liveryview.h"
-#include <QHeaderView>
+#include "blackgui/views/liveryview.h"
+#include "blackgui/views/viewbase.h"
 
 using namespace BlackGui::Models;
 

src/blackgui/views/liveryview.h

@@ -12,9 +12,20 @@
 #ifndef BLACKGUI_LIVERYVIEW_H
 #define BLACKGUI_LIVERYVIEW_H
 
-#include "viewdbobjects.h"
 #include "blackgui/blackguiexport.h"
 #include "blackgui/models/liverylistmodel.h"
+#include "blackgui/views/viewdbobjects.h"
+
+class QWidget;
+
+namespace BlackMisc
+{
+    namespace Aviation
+    {
+        class CLivery;
+        class CLiveryList;
+    }
+}
 
 namespace BlackGui
 {

src/blackgui/views/namevariantpairview.cpp

@@ -7,8 +7,10 @@
  * contained in the LICENSE file.
  */
 
-#include "namevariantpairview.h"
-#include <QHeaderView>
+#include "blackgui/models/namevariantpairlistmodel.h"
+#include "blackgui/views/namevariantpairview.h"
+
+#include <QtGlobal>
 
 using namespace BlackMisc;
 using namespace BlackGui::Models;

src/blackgui/views/namevariantpairview.h

@@ -13,8 +13,17 @@
 #define BLACKGUI_NAMEVARIANTPAIRVIEW_H
 
 #include "blackgui/blackguiexport.h"
-#include "viewbase.h"
-#include "../models/namevariantpairlistmodel.h"
+#include "blackgui/models/namevariantpairlistmodel.h"
+#include "blackgui/views/viewbase.h"
+#include "blackmisc/icon.h"
+#include "blackmisc/namevariantpairlist.h"
+#include "blackmisc/variant.h"
+
+#include <QString>
+
+class QWidget;
+
+namespace BlackMisc { class CNameVariantPair; }
 
 namespace BlackGui
 {

src/blackgui/views/serverview.cpp

@@ -7,8 +7,9 @@
  * contained in the LICENSE file.
  */
 
-#include "serverview.h"
-#include <QHeaderView>
+#include "blackgui/models/serverlistmodel.h"
+#include "blackgui/views/serverview.h"
+
 
 using namespace BlackMisc;
 using namespace BlackGui::Models;

src/blackgui/views/serverview.h

@@ -13,8 +13,13 @@
 #define BLACKGUI_SERVERVIEW_H
 
 #include "blackgui/blackguiexport.h"
-#include "viewbase.h"
-#include "../models/serverlistmodel.h"
+#include "blackgui/models/serverlistmodel.h"
+#include "blackgui/views/viewbase.h"
+#include "blackmisc/network/serverlist.h"
+
+class QWidget;
+
+namespace BlackMisc { namespace Network { class CServer; } }
 
 namespace BlackGui
 {

src/blackgui/views/simulatedaircraftview.cpp

@@ -7,9 +7,15 @@
  * contained in the LICENSE file.
  */
 
-#include "simulatedaircraftview.h"
+#include "blackgui/models/simulatedaircraftlistmodel.h"
+#include "blackgui/menus/menuaction.h"
+#include "blackgui/views/simulatedaircraftview.h"
+#include "blackmisc/aviation/callsign.h"
 #include "blackmisc/buildconfig.h"
-#include <QHeaderView>
+#include "blackmisc/icons.h"
+#include "blackmisc/simulation/simulatedaircraft.h"
+
+#include <QtGlobal>
 
 using namespace BlackMisc;
 using namespace BlackMisc::Simulation;

src/blackgui/views/simulatedaircraftview.h

@@ -13,12 +13,24 @@
 #define BLACKGUI_SIMULATEDAIRCRAFTVIEW_H
 
 #include "blackgui/blackguiexport.h"
-#include "viewbase.h"
-#include "../models/simulatedaircraftlistmodel.h"
-#include <QMenu>
+#include "blackgui/models/simulatedaircraftlistmodel.h"
+#include "blackgui/views/viewbase.h"
+#include "blackmisc/simulation/simulatedaircraftlist.h"
+
+#include <QObject>
+
+class QWidget;
+
+namespace BlackMisc
+{
+    namespace Aviation { class CCallsign; }
+    namespace Simulation { class CSimulatedAircraft; }
+}
 
 namespace BlackGui
 {
+    namespace Menus { class CMenuActions; }
+
     namespace Views
     {
         //! Aircraft view

src/blackgui/views/statusmessageview.cpp

@@ -7,9 +7,10 @@
  * contained in the LICENSE file.
  */
 
-#include "statusmessageview.h"
-#include <QHeaderView>
-#include <QMenu>
+#include "blackgui/models/statusmessagelistmodel.h"
+#include "blackgui/views/statusmessageview.h"
+
+#include <QFlags>
 
 using namespace BlackMisc;
 using namespace BlackGui::Models;

src/blackgui/views/statusmessageview.h

@@ -7,14 +7,20 @@
  * contained in the LICENSE file.
  */
 
+//! \file
+
 #ifndef BLACKGUI_STATUSMESSAGEVIEW_H
 #define BLACKGUI_STATUSMESSAGEVIEW_H
 
-//! \file
-
 #include "blackgui/blackguiexport.h"
-#include "viewbase.h"
-#include "../models/statusmessagelistmodel.h"
+#include "blackgui/models/statusmessagelistmodel.h"
+#include "blackgui/views/viewbase.h"
+#include "blackmisc/statusmessage.h"
+#include "blackmisc/statusmessagelist.h"
+
+#include <QObject>
+
+class QWidget;
 
 namespace BlackGui
 {

src/blackgui/views/textmessageview.cpp

@@ -7,8 +7,10 @@
  * contained in the LICENSE file.
  */
 
-#include "textmessageview.h"
-#include <QHeaderView>
+#include "blackgui/models/textmessagelistmodel.h"
+#include "blackgui/views/textmessageview.h"
+
+#include <QtGlobal>
 
 using namespace BlackMisc;
 using namespace BlackGui::Models;

src/blackgui/views/textmessageview.h

@@ -13,8 +13,13 @@
 #define BLACKGUI_TEXTMESSAGEVIEW_H
 
 #include "blackgui/blackguiexport.h"
-#include "viewbase.h"
-#include "../models/textmessagelistmodel.h"
+#include "blackgui/models/textmessagelistmodel.h"
+#include "blackgui/views/viewbase.h"
+#include "blackmisc/network/textmessagelist.h"
+
+class QWidget;
+
+namespace BlackMisc { namespace Network { class CTextMessage; } }
 
 namespace BlackGui
 {

src/blackgui/views/userview.cpp

@@ -7,8 +7,10 @@
  * contained in the LICENSE file.
  */
 
-#include "userview.h"
-#include <QHeaderView>
+#include "blackgui/models/userlistmodel.h"
+#include "blackgui/views/userview.h"
+
+#include <QtGlobal>
 
 using namespace BlackMisc;
 using namespace BlackGui::Models;

src/blackgui/views/userview.h

@@ -13,8 +13,12 @@
 #define BLACKGUI_USERVIEW_H
 
 #include "blackgui/blackguiexport.h"
-#include "viewbase.h"
-#include "../models/userlistmodel.h"
+#include "blackgui/models/userlistmodel.h"
+#include "blackgui/views/viewbase.h"
+#include "blackmisc/network/userlist.h"
+
+class QWidget;
+namespace BlackMisc { namespace Network { class CUser; } }
 
 namespace BlackGui
 {

src/blackgui/views/viewbase.cpp

@@ -7,28 +7,75 @@
  * contained in the LICENSE file.
  */
 
-#include "viewbase.h"
-#include "blackmisc/fileutils.h"
-#include "blackmisc/buildconfig.h"
+#include "blackgui/dockwidgetinfoarea.h"
+#include "blackgui/filters/filterdialog.h"
+#include "blackgui/filters/filterwidget.h"
+#include "blackgui/guiapplication.h"
+#include "blackgui/guiutility.h"
+#include "blackgui/loadindicator.h"
 #include "blackgui/models/allmodels.h"
 #include "blackgui/menus/menuaction.h"
-#include "blackgui/stylesheetutility.h"
-#include "blackgui/guiutility.h"
-#include "blackgui/guiapplication.h"
+#include "blackgui/menus/menudelegate.h"
 #include "blackgui/shortcut.h"
-#include "blackcore/registermetadata.h"
-#include <QHeaderView>
-#include <QModelIndex>
-#include <QTime>
+#include "blackgui/views/viewbase.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/buildconfig.h"
+#include "blackmisc/country.h"
+#include "blackmisc/countrylist.h"
+#include "blackmisc/fileutils.h"
+#include "blackmisc/icons.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/propertyindexvariantmap.h"
+#include "blackmisc/propertyindexlist.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/statusmessagelist.h"
+#include "blackmisc/worker.h"
+
 #include <QAction>
-#include <QSortFilterProxyModel>
 #include <QDialog>
-#include <QLabel>
-#include <QMovie>
-#include <QPainter>
-#include <QShortcut>
+#include <QDragEnterEvent>
+#include <QDragLeaveEvent>
+#include <QDragMoveEvent>
 #include <QFileDialog>
-#include <QDir>
+#include <QFontMetrics>
+#include <QHeaderView>
+#include <QItemSelectionModel>
+#include <QList>
+#include <QMenu>
+#include <QMetaObject>
+#include <QMetaType>
+#include <QModelIndex>
+#include <QPalette>
+#include <QPoint>
+#include <QRect>
+#include <QShortcut>
+#include <QVariant>
+#include <QWidget>
 #include <limits>
 
 using namespace BlackMisc;

src/blackgui/views/viewbase.h

@@ -12,29 +12,58 @@
 #ifndef BLACKGUI_VIEWBASE_H
 #define BLACKGUI_VIEWBASE_H
 
-#include "blackgui/components/enablefordockwidgetinfoarea.h"
-#include "blackgui/filters/filterdialog.h"
-#include "blackgui/filters/filterwidget.h"
-#include "blackgui/models/modelfilter.h"
-#include "blackgui/menus/menudelegate.h"
-#include "blackgui/menus/menuaction.h"
-#include "blackgui/loadindicator.h"
 #include "blackgui/blackguiexport.h"
-#include "blackmisc/icons.h"
-#include "blackmisc/worker.h"
-#include "blackmisc/variant.h"
+#include "blackgui/components/enablefordockwidgetinfoarea.h"
+#include "blackgui/menus/menuaction.h"
+#include "blackgui/models/modelfilter.h"
+#include "blackmisc/namevariantpair.h"
+#include "blackmisc/namevariantpairlist.h"
 #include "blackmisc/propertyindex.h"
-#include <QTableView>
-#include <QWizardPage>
+#include "blackmisc/propertyindexvariantmap.h"
+#include "blackmisc/statusmessage.h"
+#include "blackmisc/variant.h"
+
+#include <QAbstractItemView>
+#include <QFlags>
 #include <QHeaderView>
-#include <QMenu>
-#include <QPoint>
-#include <QFont>
-#include <QList>
-#include <QMultiMap>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QMap>
+#include <QModelIndexList>
+#include <QObject>
+#include <QString>
+#include <QTableView>
+#include <Qt>
+#include <QtGlobal>
+#include <memory>
+
+class QDragEnterEvent;
+class QDragLeaveEvent;
+class QDragMoveEvent;
+class QFont;
+class QItemSelectionModel;
+class QMimeData;
+class QModelIndex;
+class QPaintEvent;
+class QPoint;
+class QShowEvent;
+class QWidget;
+
+namespace BlackMisc { class CWorker; }
 
 namespace BlackGui
 {
+    class CDockWidgetInfoArea;
+    class CLoadIndicator;
+
+    namespace Filters
+    {
+        class CFilterDialog;
+        class CFilterWidget;
+    }
+
+    namespace Menus { class IMenuDelegate; }
+
     namespace Views
     {
         //! Non templated base class, allows Q_OBJECT and signals / slots to be used

src/blackgui/views/viewdbobjects.cpp

@@ -7,12 +7,14 @@
  * contained in the LICENSE file.
  */
 
-#include "viewdbobjects.h"
-#include "blackgui/models/allmodels.h"
+#include "blackgui/menus/menuaction.h"
+#include "blackgui/views/viewdbobjects.h"
+#include "blackmisc/icons.h"
+
 #include <QAction>
-#include <QWidgetAction>
-#include <QLineEdit>
 #include <QIntValidator>
+#include <QLineEdit>
+#include <QWidgetAction>
 
 using namespace BlackMisc;
 using namespace BlackGui;

src/blackgui/views/viewdbobjects.h

@@ -12,12 +12,35 @@
 #ifndef BLACKGUI_VIEWDBOBJECTS_H
 #define BLACKGUI_VIEWDBOBJECTS_H
 
-#include "blackgui/blackguiexport.h"
-#include "viewbase.h"
-#include <QMenu>
+#include "blackgui/models/aircrafticaolistmodel.h"
+#include "blackgui/models/aircraftmodellistmodel.h"
+#include "blackgui/models/airlineicaolistmodel.h"
+#include "blackgui/models/countrylistmodel.h"
+#include "blackgui/models/distributorlistmodel.h"
+#include "blackgui/models/liverylistmodel.h"
+#include "blackgui/views/viewbase.h"
+#include "blackmisc/aviation/aircrafticaocodelist.h"
+#include "blackmisc/aviation/airlineicaocodelist.h"
+#include "blackmisc/aviation/liverylist.h"
+#include "blackmisc/countrylist.h"
+#include "blackmisc/simulation/aircraftmodellist.h"
+#include "blackmisc/simulation/distributor.h"
+#include "blackmisc/simulation/distributorlist.h"
+
+#include <QList>
+#include <QObject>
+#include <QString>
+#include <QtGlobal>
+
+class QAction;
+class QIntValidator;
+class QLineEdit;
+class QWidget;
 
 namespace BlackGui
 {
+    namespace Menus { class CMenuActions; }
+
     namespace Views
     {
         //! Base class for views with DB objects