diff --git a/src/blackmisc/aviation/aircraftenginelist.cpp b/src/blackmisc/aviation/aircraftenginelist.cpp
index ffe3ddf02..3c456fbbe 100644
--- a/src/blackmisc/aviation/aircraftenginelist.cpp
+++ b/src/blackmisc/aviation/aircraftenginelist.cpp
@@ -18,7 +18,6 @@ namespace BlackMisc
 {
     namespace Aviation
     {
-
         CAircraftEngineList::CAircraftEngineList(std::initializer_list<bool> enginesOnOff)
         {
             int no = 1; // engines 1 based
diff --git a/src/blackmisc/aviation/aircraftenginelist.h b/src/blackmisc/aviation/aircraftenginelist.h
index 19c6d0b05..2a6a5f4fc 100644
--- a/src/blackmisc/aviation/aircraftenginelist.h
+++ b/src/blackmisc/aviation/aircraftenginelist.h
@@ -32,8 +32,8 @@ namespace BlackMisc
         //! Value object encapsulating a list of aircraft engines.
         class BLACKMISC_EXPORT CAircraftEngineList :
             public CSequence<CAircraftEngine>,
-            public BlackMisc::Mixin::MetaType<CAircraftEngineList>,
-            public BlackMisc::Mixin::JsonOperators<CAircraftEngineList>
+            public Mixin::MetaType<CAircraftEngineList>,
+            public Mixin::JsonOperators<CAircraftEngineList>
         {
         public:
             BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CAircraftEngineList)
diff --git a/src/blackmisc/aviation/aircrafticaocodelist.h b/src/blackmisc/aviation/aircrafticaocodelist.h
index a824c7272..7e63dfd32 100644
--- a/src/blackmisc/aviation/aircrafticaocodelist.h
+++ b/src/blackmisc/aviation/aircrafticaocodelist.h
@@ -13,7 +13,6 @@
 #define BLACKMISC_AVIATION_AIRCRAFTICAOCODELIST_H
 
 #include "aircrafticaocode.h"
-#include "blackmisc/aviation/aircrafticaocode.h"
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/collection.h"
 #include "blackmisc/db/datastoreobjectlist.h"
diff --git a/src/blackmisc/network/clientlist.h b/src/blackmisc/network/clientlist.h
index b40210a82..fb6f77d88 100644
--- a/src/blackmisc/network/clientlist.h
+++ b/src/blackmisc/network/clientlist.h
@@ -27,7 +27,7 @@ namespace BlackMisc
         //! Value object encapsulating a list of voice rooms.
         class BLACKMISC_EXPORT CClientList :
             public CSequence<CClient>,
-            public BlackMisc::Aviation::ICallsignObjectList<BlackMisc::Network::CClient, BlackMisc::Network::CClientList>,
+            public BlackMisc::Aviation::ICallsignObjectList<CClient, CClientList>,
             public BlackMisc::Mixin::MetaType<CClientList>
         {
         public: