diff --git a/src/blackgui/views/aircrafticaoview.cpp b/src/blackgui/views/aircrafticaoview.cpp
index 67cafee68..9a59aecf2 100644
--- a/src/blackgui/views/aircrafticaoview.cpp
+++ b/src/blackgui/views/aircrafticaoview.cpp
@@ -7,7 +7,6 @@
  * contained in the LICENSE file.
  */
 
-#include "blackgui/models/aircrafticaolistmodel.h"
 #include "blackgui/views/aircrafticaoview.h"
 #include "blackgui/views/viewbase.h"
 
diff --git a/src/blackgui/views/aircrafticaoview.h b/src/blackgui/views/aircrafticaoview.h
index 5cf4bc6a8..b4f365d80 100644
--- a/src/blackgui/views/aircrafticaoview.h
+++ b/src/blackgui/views/aircrafticaoview.h
@@ -9,23 +9,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_AIRCRAFTICAOVIEW_H
-#define BLACKGUI_AIRCRAFTICAOVIEW_H
+#ifndef BLACKGUI_VIEWS_AIRCRAFTICAOVIEW_H
+#define BLACKGUI_VIEWS_AIRCRAFTICAOVIEW_H
 
-#include "blackgui/blackguiexport.h"
 #include "blackgui/models/aircrafticaolistmodel.h"
 #include "blackgui/views/viewdbobjects.h"
-
-class QWidget;
-
-namespace BlackMisc
-{
-    namespace Aviation
-    {
-        class CAircraftIcaoCode;
-        class CAircraftIcaoCodeList;
-    }
-}
+#include "blackgui/blackguiexport.h"
 
 namespace BlackGui
 {
diff --git a/src/blackgui/views/aircraftpartsview.h b/src/blackgui/views/aircraftpartsview.h
index fd80d13bf..86fca458e 100644
--- a/src/blackgui/views/aircraftpartsview.h
+++ b/src/blackgui/views/aircraftpartsview.h
@@ -15,9 +15,6 @@
 #include "blackgui/views/viewtimestampobjects.h"
 #include "blackgui/models/aircraftpartslistmodel.h"
 #include "blackgui/blackguiexport.h"
-#include "blackmisc/aviation/aircraftpartslist.h"
-
-class QWidget;
 
 namespace BlackGui
 {
diff --git a/src/blackgui/views/aircraftsituationview.h b/src/blackgui/views/aircraftsituationview.h
index b8fcb0efe..12a245496 100644
--- a/src/blackgui/views/aircraftsituationview.h
+++ b/src/blackgui/views/aircraftsituationview.h
@@ -15,9 +15,6 @@
 #include "blackgui/views/viewtimestampobjects.h"
 #include "blackgui/models/aircraftsituationlistmodel.h"
 #include "blackgui/blackguiexport.h"
-#include "blackmisc/aviation/aircraftsituationlist.h"
-
-class QWidget;
 
 namespace BlackGui
 {
diff --git a/src/blackgui/views/airportview.h b/src/blackgui/views/airportview.h
index bb3d73b1a..d29fdc1d8 100644
--- a/src/blackgui/views/airportview.h
+++ b/src/blackgui/views/airportview.h
@@ -9,17 +9,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_AIRPORTVIEW_H
-#define BLACKGUI_AIRPORTVIEW_H
+#ifndef BLACKGUI_VIEWS_AIRPORTVIEW_H
+#define BLACKGUI_VIEWS_AIRPORTVIEW_H
 
 #include "blackgui/blackguiexport.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
 {
diff --git a/src/blackgui/views/atcstationtreeview.h b/src/blackgui/views/atcstationtreeview.h
index 5cf574095..84b9ff192 100644
--- a/src/blackgui/views/atcstationtreeview.h
+++ b/src/blackgui/views/atcstationtreeview.h
@@ -9,8 +9,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_ATCSTATIONTREEVIEW_H
-#define BLACKGUI_ATCSTATIONTREEVIEW_H
+#ifndef BLACKGUI_VIEWS_ATCSTATIONTREEVIEW_H
+#define BLACKGUI_VIEWS_ATCSTATIONTREEVIEW_H
 
 #include "blackgui/blackguiexport.h"
 #include "blackmisc/aviation/atcstationlist.h"
diff --git a/src/blackgui/views/clientview.h b/src/blackgui/views/clientview.h
index 8027424ac..a1bc32c17 100644
--- a/src/blackgui/views/clientview.h
+++ b/src/blackgui/views/clientview.h
@@ -9,18 +9,15 @@
 
 //! \file
 
-#ifndef BLACKGUI_CLIENTVIEW_H
-#define BLACKGUI_CLIENTVIEW_H
+#ifndef BLACKGUI_VIEWS_CLIENTVIEW_H
+#define BLACKGUI_VIEWS_CLIENTVIEW_H
 
 #include "blackgui/blackguiexport.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
 {
     namespace Views
diff --git a/src/blackgui/views/countryview.h b/src/blackgui/views/countryview.h
index d2c3a7059..889a9cc4c 100644
--- a/src/blackgui/views/countryview.h
+++ b/src/blackgui/views/countryview.h
@@ -17,8 +17,6 @@
 #include "blackgui/blackguiexport.h"
 #include "blackmisc/countrylist.h"
 
-class QWidget;
-
 namespace BlackGui
 {
     namespace Views
diff --git a/src/blackgui/views/distributorview.h b/src/blackgui/views/distributorview.h
index 14f9bcc44..c789087b0 100644
--- a/src/blackgui/views/distributorview.h
+++ b/src/blackgui/views/distributorview.h
@@ -9,8 +9,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_DISTRIBUTORVIEW_H
-#define BLACKGUI_DISTRIBUTORVIEW_H
+#ifndef BLACKGUI_VIEWS_DISTRIBUTORVIEW_H
+#define BLACKGUI_VIEWS_DISTRIBUTORVIEW_H
 
 #include "blackgui/blackguiexport.h"
 #include "blackgui/models/distributorlistmodel.h"
diff --git a/src/blackgui/views/liveryview.h b/src/blackgui/views/liveryview.h
index 19fe40bd3..f27b0bd63 100644
--- a/src/blackgui/views/liveryview.h
+++ b/src/blackgui/views/liveryview.h
@@ -9,23 +9,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_LIVERYVIEW_H
-#define BLACKGUI_LIVERYVIEW_H
+#ifndef BLACKGUI_VIEWS_LIVERYVIEW_H
+#define BLACKGUI_VIEWS_LIVERYVIEW_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;
-    }
-}
+#include "blackgui/models/liverylistmodel.h"
+#include "blackgui/blackguiexport.h"
 
 namespace BlackGui
 {
diff --git a/src/blackgui/views/statusmessageview.h b/src/blackgui/views/statusmessageview.h
index 808cde679..52b497fec 100644
--- a/src/blackgui/views/statusmessageview.h
+++ b/src/blackgui/views/statusmessageview.h
@@ -9,14 +9,14 @@
 
 //! \file
 
-#ifndef BLACKGUI_STATUSMESSAGEVIEW_H
-#define BLACKGUI_STATUSMESSAGEVIEW_H
+#ifndef BLACKGUI_VIEWS_STATUSMESSAGEVIEW_H
+#define BLACKGUI_VIEWS_STATUSMESSAGEVIEW_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/statusmessagelistmodel.h"
 #include "blackgui/views/viewbase.h"
-#include "blackmisc/statusmessage.h"
+#include "blackgui/models/statusmessagelistmodel.h"
 #include "blackmisc/statusmessagelist.h"
+#include "blackmisc/statusmessage.h"
+#include "blackgui/blackguiexport.h"
 
 #include <QObject>
 
diff --git a/src/blackgui/views/temperaturelayerview.h b/src/blackgui/views/temperaturelayerview.h
index 0afbddd52..c498a4a5f 100644
--- a/src/blackgui/views/temperaturelayerview.h
+++ b/src/blackgui/views/temperaturelayerview.h
@@ -9,17 +9,14 @@
 
 //! \file
 
-#ifndef BLACKGUI_TEMPERATURELAYERVIEW_H
-#define BLACKGUI_TEMPERATURELAYERVIEW_H
+#ifndef BLACKGUI_VIEWS_TEMPERATURELAYERVIEW_H
+#define BLACKGUI_VIEWS_TEMPERATURELAYERVIEW_H
 
 #include "blackgui/blackguiexport.h"
 #include "blackgui/models/temperaturelayerlistmodel.h"
 #include "blackgui/views/viewbase.h"
 
-class QWidget;
-
 namespace BlackMisc { namespace Weather { class CTemperatureLayer; } }
-
 namespace BlackGui
 {
     namespace Views
diff --git a/src/blackgui/views/textmessageview.h b/src/blackgui/views/textmessageview.h
index c22929937..0b98b9590 100644
--- a/src/blackgui/views/textmessageview.h
+++ b/src/blackgui/views/textmessageview.h
@@ -12,12 +12,10 @@
 #ifndef BLACKGUI_TEXTMESSAGEVIEW_H
 #define BLACKGUI_TEXTMESSAGEVIEW_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/textmessagelistmodel.h"
 #include "blackgui/views/viewbase.h"
+#include "blackgui/models/textmessagelistmodel.h"
 #include "blackmisc/network/textmessagelist.h"
-
-class QWidget;
+#include "blackgui/blackguiexport.h"
 
 namespace BlackMisc { namespace Network { class CTextMessage; } }
 namespace BlackGui
diff --git a/src/blackgui/views/userview.h b/src/blackgui/views/userview.h
index 3476396c0..f22e6f375 100644
--- a/src/blackgui/views/userview.h
+++ b/src/blackgui/views/userview.h
@@ -12,9 +12,9 @@
 #ifndef BLACKGUI_USERVIEW_H
 #define BLACKGUI_USERVIEW_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/userlistmodel.h"
 #include "blackgui/views/viewbase.h"
+#include "blackgui/models/userlistmodel.h"
+#include "blackgui/blackguiexport.h"
 #include "blackmisc/network/userlist.h"
 
 namespace BlackMisc { namespace Network { class CUser; } }
@@ -47,6 +47,6 @@ namespace BlackGui
             void requestTextMessage();
         };
     }
-}
+} // ns
 
 #endif // guard
diff --git a/src/blackgui/views/viewbaseitemdelegate.h b/src/blackgui/views/viewbaseitemdelegate.h
index 15508a4ec..c8eefa398 100644
--- a/src/blackgui/views/viewbaseitemdelegate.h
+++ b/src/blackgui/views/viewbaseitemdelegate.h
@@ -9,8 +9,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_VIEWBASE_ITEMDELEGATE_H
-#define BLACKGUI_VIEWBASE_ITEMDELEGATE_H
+#ifndef BLACKGUI_VIEWS_ITEMDELEGATE_H
+#define BLACKGUI_VIEWS_ITEMDELEGATE_H
 
 #include <QStyledItemDelegate>
 
@@ -43,4 +43,5 @@ namespace BlackGui
         };
     } // namespace
 } // namespace
+
 #endif // guard