diff --git a/cppcheck.supp b/cppcheck.supp
index 7cb061761..544db8237 100644
--- a/cppcheck.supp
+++ b/cppcheck.supp
@@ -46,6 +46,7 @@ returnDanglingLifetime:src/blackmisc/iterator.h
 unreadVariable:tests/blackcore/testreaders/testreaders.cpp
 unknownMacro:src/blackmisc/aviation/altitude.h
 unknownMacro:src/blackmisc/geo/elevationplane.h
+unknownMacro:src/blackmisc/identifier.cpp
 unknownMacro:tests/blackmisc/testsharedstate/testsharedstate.h
 ctuArrayIndex:src/xswiftbus/libxplanemp/src/XPMPPlaneRenderer.cpp
 
diff --git a/src/blackcore/data/globalsetup.cpp b/src/blackcore/data/globalsetup.cpp
index 3e5176d56..dcdad865a 100644
--- a/src/blackcore/data/globalsetup.cpp
+++ b/src/blackcore/data/globalsetup.cpp
@@ -28,6 +28,8 @@ using namespace BlackMisc;
 using namespace BlackMisc::Json;
 using namespace BlackMisc::Network;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackCore::Data, CGlobalSetup)
+
 namespace BlackCore::Data
 {
     CGlobalSetup::CGlobalSetup() :
diff --git a/src/blackcore/data/globalsetup.h b/src/blackcore/data/globalsetup.h
index c2b14cac6..ed16b3b39 100644
--- a/src/blackcore/data/globalsetup.h
+++ b/src/blackcore/data/globalsetup.h
@@ -26,6 +26,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackCore::Data, CGlobalSetup)
+
 namespace BlackCore::Data
 {
     //! Global settings for readers, debug flags, etc.
diff --git a/src/blackcore/data/launchersetup.cpp b/src/blackcore/data/launchersetup.cpp
index bd3c1d27d..a167737c3 100644
--- a/src/blackcore/data/launchersetup.cpp
+++ b/src/blackcore/data/launchersetup.cpp
@@ -11,6 +11,8 @@
 
 using namespace BlackMisc;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackCore::Data, CLauncherSetup)
+
 namespace BlackCore::Data
 {
     QString CLauncherSetup::convertToQString(bool i18n) const
diff --git a/src/blackcore/data/launchersetup.h b/src/blackcore/data/launchersetup.h
index b762e40b6..b8ff57287 100644
--- a/src/blackcore/data/launchersetup.h
+++ b/src/blackcore/data/launchersetup.h
@@ -17,6 +17,8 @@
 #include "blackmisc/valueobject.h"
 #include "blackmisc/variant.h"
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackCore::Data, CLauncherSetup)
+
 namespace BlackCore::Data
 {
     //! Launcher setup
diff --git a/src/blackcore/data/vatsimsetup.cpp b/src/blackcore/data/vatsimsetup.cpp
index 81a51cffa..34f2fc81b 100644
--- a/src/blackcore/data/vatsimsetup.cpp
+++ b/src/blackcore/data/vatsimsetup.cpp
@@ -12,6 +12,8 @@
 using namespace BlackMisc;
 using namespace BlackMisc::Network;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackCore::Data, CVatsimSetup)
+
 namespace BlackCore::Data
 {
     CVatsimSetup::CVatsimSetup() :
diff --git a/src/blackcore/data/vatsimsetup.h b/src/blackcore/data/vatsimsetup.h
index 9efdb7041..797c4b90c 100644
--- a/src/blackcore/data/vatsimsetup.h
+++ b/src/blackcore/data/vatsimsetup.h
@@ -25,6 +25,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackCore::Data, CVatsimSetup)
+
 namespace BlackCore::Data
 {
     //! VATSIM data (servers, URLs) cached as last known good setup.
diff --git a/src/blackcore/db/databasereaderconfig.cpp b/src/blackcore/db/databasereaderconfig.cpp
index f7809f220..cca3c6e61 100644
--- a/src/blackcore/db/databasereaderconfig.cpp
+++ b/src/blackcore/db/databasereaderconfig.cpp
@@ -17,6 +17,8 @@ using namespace BlackMisc::Db;
 using namespace BlackMisc::Network;
 using namespace BlackMisc::PhysicalQuantities;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackCore::Db, CDatabaseReaderConfig)
+
 namespace BlackCore::Db
 {
     CDatabaseReaderConfig::CDatabaseReaderConfig(CEntityFlags::Entity entities, CDbFlags::DataRetrievalMode retrievalFlags, const CTime &cacheLifetime) :
diff --git a/src/blackcore/db/databasereaderconfig.h b/src/blackcore/db/databasereaderconfig.h
index d74ada037..b827925a4 100644
--- a/src/blackcore/db/databasereaderconfig.h
+++ b/src/blackcore/db/databasereaderconfig.h
@@ -26,6 +26,8 @@
 #include <QTimer>
 #include <QtGlobal>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackCore::Db, CDatabaseReaderConfig)
+
 namespace BlackCore::Db
 {
     //! Details how to read a certain entity
diff --git a/src/blackcore/vatsim/vatsimsettings.cpp b/src/blackcore/vatsim/vatsimsettings.cpp
index 756b6e616..e0f1fc9e8 100644
--- a/src/blackcore/vatsim/vatsimsettings.cpp
+++ b/src/blackcore/vatsim/vatsimsettings.cpp
@@ -11,6 +11,9 @@
 using namespace BlackMisc;
 using namespace BlackMisc::PhysicalQuantities;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackCore::Vatsim, CReaderSettings)
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackCore::Vatsim, CRawFsdMessageSettings)
+
 namespace BlackCore::Vatsim
 {
     CReaderSettings::CReaderSettings()
diff --git a/src/blackcore/vatsim/vatsimsettings.h b/src/blackcore/vatsim/vatsimsettings.h
index de314da3c..554817124 100644
--- a/src/blackcore/vatsim/vatsimsettings.h
+++ b/src/blackcore/vatsim/vatsimsettings.h
@@ -20,6 +20,9 @@
 #include "blackmisc/directoryutils.h"
 #include "blackmisc/fileutils.h"
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackCore::Vatsim, CReaderSettings)
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackCore::Vatsim, CRawFsdMessageSettings)
+
 namespace BlackCore::Vatsim
 {
     /*!
diff --git a/src/blackgui/settings/atcstationssettings.cpp b/src/blackgui/settings/atcstationssettings.cpp
index ce07756c1..c16e9218e 100644
--- a/src/blackgui/settings/atcstationssettings.cpp
+++ b/src/blackgui/settings/atcstationssettings.cpp
@@ -10,6 +10,8 @@
 
 using namespace BlackMisc;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackGui::Settings, CAtcStationsSettings)
+
 namespace BlackGui::Settings
 {
     CAtcStationsSettings::CAtcStationsSettings()
diff --git a/src/blackgui/settings/atcstationssettings.h b/src/blackgui/settings/atcstationssettings.h
index 75970dad0..975c57c4a 100644
--- a/src/blackgui/settings/atcstationssettings.h
+++ b/src/blackgui/settings/atcstationssettings.h
@@ -15,6 +15,8 @@
 #include "blackmisc/settingscache.h"
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackGui::Settings, CAtcStationsSettings)
+
 namespace BlackGui::Settings
 {
     //! How to display ATC stations
diff --git a/src/blackgui/settings/dockwidgetsettings.cpp b/src/blackgui/settings/dockwidgetsettings.cpp
index 091cba80f..0b9411521 100644
--- a/src/blackgui/settings/dockwidgetsettings.cpp
+++ b/src/blackgui/settings/dockwidgetsettings.cpp
@@ -14,6 +14,8 @@
 using namespace BlackMisc;
 using namespace BlackGui;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackGui::Settings, CDockWidgetSettings)
+
 namespace BlackGui::Settings
 {
     CDockWidgetSettings::CDockWidgetSettings()
diff --git a/src/blackgui/settings/dockwidgetsettings.h b/src/blackgui/settings/dockwidgetsettings.h
index e4d429225..b80234659 100644
--- a/src/blackgui/settings/dockwidgetsettings.h
+++ b/src/blackgui/settings/dockwidgetsettings.h
@@ -21,6 +21,8 @@
 #include <QString>
 #include <QMetaType>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackGui::Settings, CDockWidgetSettings)
+
 namespace BlackGui::Settings
 {
     //! Settings for dockwidget
diff --git a/src/blackgui/settings/guisettings.cpp b/src/blackgui/settings/guisettings.cpp
index e37bb5008..d194977b3 100644
--- a/src/blackgui/settings/guisettings.cpp
+++ b/src/blackgui/settings/guisettings.cpp
@@ -11,6 +11,8 @@
 
 using namespace BlackMisc;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackGui::Settings, CGeneralGuiSettings)
+
 namespace BlackGui::Settings
 {
     CGeneralGuiSettings::CGeneralGuiSettings()
diff --git a/src/blackgui/settings/guisettings.h b/src/blackgui/settings/guisettings.h
index 0f603b895..edba3ee7b 100644
--- a/src/blackgui/settings/guisettings.h
+++ b/src/blackgui/settings/guisettings.h
@@ -18,6 +18,8 @@
 #include <QString>
 #include <QAbstractItemView>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackGui::Settings, CGeneralGuiSettings)
+
 namespace BlackGui::Settings
 {
     //! General GUI settings
diff --git a/src/blackgui/settings/navigatorsettings.cpp b/src/blackgui/settings/navigatorsettings.cpp
index 3e9c1bf1f..ab7a91cd9 100644
--- a/src/blackgui/settings/navigatorsettings.cpp
+++ b/src/blackgui/settings/navigatorsettings.cpp
@@ -14,6 +14,8 @@
 using namespace BlackMisc;
 using namespace BlackGui;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackGui::Settings, CNavigatorSettings)
+
 namespace BlackGui::Settings
 {
     CNavigatorSettings::CNavigatorSettings()
diff --git a/src/blackgui/settings/navigatorsettings.h b/src/blackgui/settings/navigatorsettings.h
index 3d153d21e..0863b02d9 100644
--- a/src/blackgui/settings/navigatorsettings.h
+++ b/src/blackgui/settings/navigatorsettings.h
@@ -20,6 +20,8 @@
 #include <QString>
 #include <QMetaType>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackGui::Settings, CNavigatorSettings)
+
 namespace BlackGui::Settings
 {
     //! Settings for navigator bar
diff --git a/src/blackgui/settings/textmessagesettings.cpp b/src/blackgui/settings/textmessagesettings.cpp
index 01d4cc74c..d64b89f91 100644
--- a/src/blackgui/settings/textmessagesettings.cpp
+++ b/src/blackgui/settings/textmessagesettings.cpp
@@ -14,6 +14,8 @@ using namespace BlackMisc;
 using namespace BlackMisc::Network;
 using namespace BlackMisc::Simulation;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackGui::Settings, CTextMessageSettings)
+
 namespace BlackGui::Settings
 {
     CTextMessageSettings::CTextMessageSettings()
diff --git a/src/blackgui/settings/textmessagesettings.h b/src/blackgui/settings/textmessagesettings.h
index bba53110f..760736f62 100644
--- a/src/blackgui/settings/textmessagesettings.h
+++ b/src/blackgui/settings/textmessagesettings.h
@@ -15,6 +15,8 @@
 #include "blackmisc/settingscache.h"
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackGui::Settings, CTextMessageSettings)
+
 namespace BlackMisc
 {
     namespace Simulation { class CSimulatedAircraft; }
diff --git a/src/blackgui/settings/viewupdatesettings.cpp b/src/blackgui/settings/viewupdatesettings.cpp
index a59ed59ff..3903796b5 100644
--- a/src/blackgui/settings/viewupdatesettings.cpp
+++ b/src/blackgui/settings/viewupdatesettings.cpp
@@ -15,6 +15,8 @@ using namespace BlackMisc;
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackGui;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackGui::Settings, CViewUpdateSettings)
+
 namespace BlackGui::Settings
 {
     CViewUpdateSettings::CViewUpdateSettings()
diff --git a/src/blackgui/settings/viewupdatesettings.h b/src/blackgui/settings/viewupdatesettings.h
index 284220119..229493841 100644
--- a/src/blackgui/settings/viewupdatesettings.h
+++ b/src/blackgui/settings/viewupdatesettings.h
@@ -21,6 +21,8 @@
 #include <QString>
 #include <QMetaType>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackGui::Settings, CViewUpdateSettings)
+
 namespace BlackGui::Settings
 {
     //! Settings about view update rates
diff --git a/src/blackmisc/applicationinfo.cpp b/src/blackmisc/applicationinfo.cpp
index 54f88eedc..5de45d442 100644
--- a/src/blackmisc/applicationinfo.cpp
+++ b/src/blackmisc/applicationinfo.cpp
@@ -16,6 +16,8 @@
 
 using namespace BlackConfig;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc, CApplicationInfo)
+
 namespace BlackMisc
 {
     CApplicationInfo::CApplicationInfo() {}
diff --git a/src/blackmisc/applicationinfo.h b/src/blackmisc/applicationinfo.h
index 61ad408af..5e6203291 100644
--- a/src/blackmisc/applicationinfo.h
+++ b/src/blackmisc/applicationinfo.h
@@ -16,6 +16,8 @@
 #include <QMetaType>
 #include <QFlags>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc, CApplicationInfo)
+
 namespace BlackMisc
 {
     /*!
diff --git a/src/blackmisc/audio/audiodeviceinfo.cpp b/src/blackmisc/audio/audiodeviceinfo.cpp
index 0f4c0d7da..f9bb54f94 100644
--- a/src/blackmisc/audio/audiodeviceinfo.cpp
+++ b/src/blackmisc/audio/audiodeviceinfo.cpp
@@ -16,6 +16,8 @@
 #include <QtGlobal>
 #include <QAudioDeviceInfo>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Audio, CAudioDeviceInfo)
+
 namespace BlackMisc::Audio
 {
     CAudioDeviceInfo::CAudioDeviceInfo() :
diff --git a/src/blackmisc/audio/audiodeviceinfo.h b/src/blackmisc/audio/audiodeviceinfo.h
index dc0e771fc..ed4babbb9 100644
--- a/src/blackmisc/audio/audiodeviceinfo.h
+++ b/src/blackmisc/audio/audiodeviceinfo.h
@@ -20,6 +20,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Audio, CAudioDeviceInfo)
+
 namespace BlackMisc::Audio
 {
     /*!
diff --git a/src/blackmisc/audio/audiosettings.cpp b/src/blackmisc/audio/audiosettings.cpp
index 9b33a63af..da08aea3b 100644
--- a/src/blackmisc/audio/audiosettings.cpp
+++ b/src/blackmisc/audio/audiosettings.cpp
@@ -16,6 +16,8 @@
 
 using namespace BlackMisc::Audio;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Audio, CSettings)
+
 namespace BlackMisc::Audio
 {
     int CSettings::fixOutVolume(int v)
diff --git a/src/blackmisc/audio/audiosettings.h b/src/blackmisc/audio/audiosettings.h
index 625475b95..53c237835 100644
--- a/src/blackmisc/audio/audiosettings.h
+++ b/src/blackmisc/audio/audiosettings.h
@@ -21,6 +21,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Audio, CSettings)
+
 namespace BlackMisc::Audio
 {
     //! Value object encapsulating information of audio related settings.
diff --git a/src/blackmisc/audio/voicesetup.cpp b/src/blackmisc/audio/voicesetup.cpp
index 49958d78a..80d9f4db8 100644
--- a/src/blackmisc/audio/voicesetup.cpp
+++ b/src/blackmisc/audio/voicesetup.cpp
@@ -15,6 +15,8 @@
 #include <Qt>
 #include <QtGlobal>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Audio, CVoiceSetup)
+
 namespace BlackMisc::Audio
 {
     QString CVoiceSetup::convertToQString(bool i18n) const
diff --git a/src/blackmisc/audio/voicesetup.h b/src/blackmisc/audio/voicesetup.h
index 4a9d917e7..c439270d4 100644
--- a/src/blackmisc/audio/voicesetup.h
+++ b/src/blackmisc/audio/voicesetup.h
@@ -21,6 +21,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Audio, CVoiceSetup)
+
 namespace BlackMisc::Audio
 {
     //! Value object for a voice setup
diff --git a/src/blackmisc/aviation/aircraftcategory.cpp b/src/blackmisc/aviation/aircraftcategory.cpp
index ddeb544fb..77d9b5b11 100644
--- a/src/blackmisc/aviation/aircraftcategory.cpp
+++ b/src/blackmisc/aviation/aircraftcategory.cpp
@@ -26,6 +26,8 @@
 using namespace BlackMisc;
 using namespace BlackMisc::Db;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftCategory)
+
 namespace BlackMisc::Aviation
 {
     CAircraftCategory::CAircraftCategory(const QString &name, const QString &description, const QString &path, bool assignable) :
diff --git a/src/blackmisc/aviation/aircraftcategory.h b/src/blackmisc/aviation/aircraftcategory.h
index 63b38333a..946b8d50c 100644
--- a/src/blackmisc/aviation/aircraftcategory.h
+++ b/src/blackmisc/aviation/aircraftcategory.h
@@ -24,6 +24,8 @@
 #include <QStringList>
 #include <QMetaType>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftCategory)
+
 namespace BlackMisc::Aviation
 {
     //! Value object for aircraft categories
diff --git a/src/blackmisc/aviation/aircraftengine.cpp b/src/blackmisc/aviation/aircraftengine.cpp
index 191cf5477..af1147ba8 100644
--- a/src/blackmisc/aviation/aircraftengine.cpp
+++ b/src/blackmisc/aviation/aircraftengine.cpp
@@ -12,6 +12,8 @@
 #include <QChar>
 #include <QtGlobal>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftEngine)
+
 namespace BlackMisc::Aviation
 {
     CAircraftEngine::CAircraftEngine(int number, bool on) : m_number(number), m_on(on)
diff --git a/src/blackmisc/aviation/aircraftengine.h b/src/blackmisc/aviation/aircraftengine.h
index 4e3407639..c3defa2a7 100644
--- a/src/blackmisc/aviation/aircraftengine.h
+++ b/src/blackmisc/aviation/aircraftengine.h
@@ -18,6 +18,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftEngine)
+
 namespace BlackMisc::Aviation
 {
     //! Value object encapsulating information about aircraft's engines
diff --git a/src/blackmisc/aviation/aircrafticaocode.cpp b/src/blackmisc/aviation/aircrafticaocode.cpp
index 3f557c025..798f94e82 100644
--- a/src/blackmisc/aviation/aircrafticaocode.cpp
+++ b/src/blackmisc/aviation/aircrafticaocode.cpp
@@ -28,6 +28,8 @@ using namespace BlackMisc;
 using namespace BlackMisc::Db;
 using namespace BlackMisc::PhysicalQuantities;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftIcaoCode)
+
 namespace BlackMisc::Aviation
 {
     CAircraftIcaoCode::CAircraftIcaoCode(const QString &icao, const QString &combinedType) :
diff --git a/src/blackmisc/aviation/aircrafticaocode.h b/src/blackmisc/aviation/aircrafticaocode.h
index 6d78322f2..7b4ea9c2f 100644
--- a/src/blackmisc/aviation/aircrafticaocode.h
+++ b/src/blackmisc/aviation/aircrafticaocode.h
@@ -25,6 +25,8 @@
 #include <QString>
 #include <QStringList>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftIcaoCode)
+
 namespace BlackMisc::Aviation
 {
     //! Value object for ICAO classification
diff --git a/src/blackmisc/aviation/aircraftlights.cpp b/src/blackmisc/aviation/aircraftlights.cpp
index 4d7249a7d..36a47d49c 100644
--- a/src/blackmisc/aviation/aircraftlights.cpp
+++ b/src/blackmisc/aviation/aircraftlights.cpp
@@ -11,6 +11,8 @@
 #include "blackmisc/comparefunctions.h"
 #include <QStringBuilder>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftLights)
+
 namespace BlackMisc::Aviation
 {
     CAircraftLights::CAircraftLights(bool strobeOn, bool landingOn, bool taxiOn, bool beaconOn, bool navOn, bool logoOn)
diff --git a/src/blackmisc/aviation/aircraftlights.h b/src/blackmisc/aviation/aircraftlights.h
index 54082d0b7..6c565bba8 100644
--- a/src/blackmisc/aviation/aircraftlights.h
+++ b/src/blackmisc/aviation/aircraftlights.h
@@ -19,6 +19,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftLights)
+
 namespace BlackMisc::Aviation
 {
     //! Value object encapsulating information about aircraft's lights
diff --git a/src/blackmisc/aviation/aircraftparts.cpp b/src/blackmisc/aviation/aircraftparts.cpp
index 0f6560c4b..2dd814acb 100644
--- a/src/blackmisc/aviation/aircraftparts.cpp
+++ b/src/blackmisc/aviation/aircraftparts.cpp
@@ -19,6 +19,8 @@
 
 using namespace BlackConfig;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftParts)
+
 namespace BlackMisc::Aviation
 {
     CAircraftParts::CAircraftParts(int flapsPercent) : m_flapsPercentage(flapsPercent) {}
diff --git a/src/blackmisc/aviation/aircraftparts.h b/src/blackmisc/aviation/aircraftparts.h
index bbaae220b..7fc7ed2e8 100644
--- a/src/blackmisc/aviation/aircraftparts.h
+++ b/src/blackmisc/aviation/aircraftparts.h
@@ -22,6 +22,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftParts)
+
 namespace BlackMisc::Aviation
 {
     //! Value object encapsulating information of aircraft's parts
diff --git a/src/blackmisc/aviation/aircraftsituation.cpp b/src/blackmisc/aviation/aircraftsituation.cpp
index f3fae0dc7..8f37ae577 100644
--- a/src/blackmisc/aviation/aircraftsituation.cpp
+++ b/src/blackmisc/aviation/aircraftsituation.cpp
@@ -17,6 +17,7 @@
 #include "blackmisc/verify.h"
 #include "blackmisc/stringutils.h"
 #include "blackconfig/buildconfig.h"
+#include "blackmisc/propertyindexvariantmap.h" // needed for Mixin::Index::apply
 
 #include "QStringBuilder"
 #include <QtGlobal>
@@ -25,6 +26,8 @@ using namespace BlackMisc::Geo;
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackConfig;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftSituation)
+
 namespace BlackMisc::Aviation
 {
     const CLength &CAircraftSituation::allowedAltitudeDeviation()
diff --git a/src/blackmisc/aviation/aircraftsituation.h b/src/blackmisc/aviation/aircraftsituation.h
index 309b4161e..afdb1c756 100644
--- a/src/blackmisc/aviation/aircraftsituation.h
+++ b/src/blackmisc/aviation/aircraftsituation.h
@@ -33,6 +33,8 @@
 #include <QVector3D>
 #include <array>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftSituation)
+
 namespace BlackMisc
 {
     namespace Geo { class CElevationPlane; }
diff --git a/src/blackmisc/aviation/aircraftsituationchange.cpp b/src/blackmisc/aviation/aircraftsituationchange.cpp
index 8cec580cb..53a265add 100644
--- a/src/blackmisc/aviation/aircraftsituationchange.cpp
+++ b/src/blackmisc/aviation/aircraftsituationchange.cpp
@@ -27,6 +27,8 @@ using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Math;
 using namespace BlackConfig;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftSituationChange)
+
 namespace BlackMisc::Aviation
 {
     void CAircraftSituationChange::registerMetadata()
diff --git a/src/blackmisc/aviation/aircraftsituationchange.h b/src/blackmisc/aviation/aircraftsituationchange.h
index dcdfa6d45..78a79362c 100644
--- a/src/blackmisc/aviation/aircraftsituationchange.h
+++ b/src/blackmisc/aviation/aircraftsituationchange.h
@@ -21,6 +21,8 @@
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/blackmiscexport.h"
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftSituationChange)
+
 namespace BlackMisc
 {
     namespace Simulation
diff --git a/src/blackmisc/aviation/airlineicaocode.cpp b/src/blackmisc/aviation/airlineicaocode.cpp
index b0fa3d35f..13ca9c649 100644
--- a/src/blackmisc/aviation/airlineicaocode.cpp
+++ b/src/blackmisc/aviation/airlineicaocode.cpp
@@ -31,6 +31,8 @@
 using namespace BlackMisc;
 using namespace BlackMisc::Db;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAirlineIcaoCode)
+
 namespace BlackMisc::Aviation
 {
     CAirlineIcaoCode::CAirlineIcaoCode(const QString &airlineDesignator)
diff --git a/src/blackmisc/aviation/airlineicaocode.h b/src/blackmisc/aviation/airlineicaocode.h
index ecdf5fd3a..9c13033d1 100644
--- a/src/blackmisc/aviation/airlineicaocode.h
+++ b/src/blackmisc/aviation/airlineicaocode.h
@@ -25,6 +25,8 @@
 #include <QMap>
 #include <QSet>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAirlineIcaoCode)
+
 namespace BlackMisc::Aviation
 {
     class CCallsign;
diff --git a/src/blackmisc/aviation/airport.cpp b/src/blackmisc/aviation/airport.cpp
index 2c69d9e42..de680bacb 100644
--- a/src/blackmisc/aviation/airport.cpp
+++ b/src/blackmisc/aviation/airport.cpp
@@ -20,6 +20,8 @@ using namespace BlackMisc;
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Geo;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAirport)
+
 namespace BlackMisc::Aviation
 {
     CAirport::CAirport()
diff --git a/src/blackmisc/aviation/airport.h b/src/blackmisc/aviation/airport.h
index 2874e9f8d..f53d97a9f 100644
--- a/src/blackmisc/aviation/airport.h
+++ b/src/blackmisc/aviation/airport.h
@@ -28,6 +28,8 @@
 #include <QVector3D>
 #include <array>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAirport)
+
 namespace BlackMisc::Aviation
 {
     //! Value object encapsulating information about an airpot.
diff --git a/src/blackmisc/aviation/airporticaocode.cpp b/src/blackmisc/aviation/airporticaocode.cpp
index 9d578f362..9f416ba58 100644
--- a/src/blackmisc/aviation/airporticaocode.cpp
+++ b/src/blackmisc/aviation/airporticaocode.cpp
@@ -16,6 +16,8 @@
 #include <Qt>
 #include <QtGlobal>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAirportIcaoCode)
+
 namespace BlackMisc::Aviation
 {
     QString CAirportIcaoCode::convertToQString(bool /** i18n **/) const
diff --git a/src/blackmisc/aviation/airporticaocode.h b/src/blackmisc/aviation/airporticaocode.h
index ea9df432e..310834c85 100644
--- a/src/blackmisc/aviation/airporticaocode.h
+++ b/src/blackmisc/aviation/airporticaocode.h
@@ -20,6 +20,8 @@
 #include <QString>
 #include <tuple>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAirportIcaoCode)
+
 namespace BlackMisc::Aviation
 {
     //! Value object encapsulating information of airport ICAO data.
diff --git a/src/blackmisc/aviation/atcstation.cpp b/src/blackmisc/aviation/atcstation.cpp
index dbfe3e368..2b54e8f21 100644
--- a/src/blackmisc/aviation/atcstation.cpp
+++ b/src/blackmisc/aviation/atcstation.cpp
@@ -14,6 +14,7 @@
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/stringutils.h"
+#include "blackmisc/propertyindexvariantmap.h" // needed for Mixin::Index::apply
 
 #include <QCoreApplication>
 #include <QtGlobal>
@@ -24,6 +25,8 @@ using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Geo;
 using namespace BlackMisc::Network;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAtcStation)
+
 namespace BlackMisc::Aviation
 {
     CAtcStation::CAtcStation()
diff --git a/src/blackmisc/aviation/atcstation.h b/src/blackmisc/aviation/atcstation.h
index 5333e6532..4d397b01a 100644
--- a/src/blackmisc/aviation/atcstation.h
+++ b/src/blackmisc/aviation/atcstation.h
@@ -33,6 +33,8 @@
 #include <array>
 #include <tuple>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAtcStation)
+
 namespace BlackMisc::Aviation
 {
     //! Value object encapsulating information about an ATC station.
diff --git a/src/blackmisc/aviation/callsign.cpp b/src/blackmisc/aviation/callsign.cpp
index f556fa532..568882267 100644
--- a/src/blackmisc/aviation/callsign.cpp
+++ b/src/blackmisc/aviation/callsign.cpp
@@ -17,6 +17,8 @@
 #include <Qt>
 #include <QtGlobal>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CCallsign)
+
 namespace BlackMisc::Aviation
 {
     CCallsign::CCallsign(const QString &callsign, CCallsign::TypeHint hint)
diff --git a/src/blackmisc/aviation/callsign.h b/src/blackmisc/aviation/callsign.h
index f62400769..7c5814930 100644
--- a/src/blackmisc/aviation/callsign.h
+++ b/src/blackmisc/aviation/callsign.h
@@ -22,6 +22,8 @@
 
 class QStringList;
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CCallsign)
+
 namespace BlackMisc
 {
     class CStatusMessageList;
diff --git a/src/blackmisc/aviation/flightplan.cpp b/src/blackmisc/aviation/flightplan.cpp
index 27a28ef78..5f7c572e2 100644
--- a/src/blackmisc/aviation/flightplan.cpp
+++ b/src/blackmisc/aviation/flightplan.cpp
@@ -16,6 +16,7 @@
 #include "blackmisc/fileutils.h"
 #include "blackmisc/stringutils.h"
 #include "blackmisc/json.h"
+#include "blackmisc/propertyindexvariantmap.h" // needed for Mixin::Index::apply
 
 #include <QFile>
 #include <QDateTime>
@@ -27,6 +28,9 @@
 using namespace BlackMisc::Network;
 using namespace BlackMisc::PhysicalQuantities;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CFlightPlanRemarks)
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CFlightPlan)
+
 namespace BlackMisc::Aviation
 {
     CFlightPlanRemarks::CFlightPlanRemarks()
diff --git a/src/blackmisc/aviation/flightplan.h b/src/blackmisc/aviation/flightplan.h
index 58a71f217..fe22b9c43 100644
--- a/src/blackmisc/aviation/flightplan.h
+++ b/src/blackmisc/aviation/flightplan.h
@@ -35,6 +35,9 @@
 #include <QTime>
 #include <QtGlobal>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CFlightPlanRemarks)
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CFlightPlan)
+
 namespace BlackMisc::Aviation
 {
     //! Flight plan remarks, parsed values
diff --git a/src/blackmisc/aviation/informationmessage.cpp b/src/blackmisc/aviation/informationmessage.cpp
index 8372f0d63..43c4858bc 100644
--- a/src/blackmisc/aviation/informationmessage.cpp
+++ b/src/blackmisc/aviation/informationmessage.cpp
@@ -9,6 +9,8 @@
 #include "blackmisc/aviation/informationmessage.h"
 #include "blackmisc/comparefunctions.h"
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CInformationMessage)
+
 namespace BlackMisc::Aviation
 {
     QString CInformationMessage::convertToQString(bool i18n) const
diff --git a/src/blackmisc/aviation/informationmessage.h b/src/blackmisc/aviation/informationmessage.h
index 0d08ae7c1..5097e6952 100644
--- a/src/blackmisc/aviation/informationmessage.h
+++ b/src/blackmisc/aviation/informationmessage.h
@@ -22,6 +22,8 @@
 #include <QString>
 #include <QtGlobal>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CInformationMessage)
+
 namespace BlackMisc::Aviation
 {
     //! Value object encapsulating information message (ATIS, METAR, TAF)
diff --git a/src/blackmisc/aviation/livery.cpp b/src/blackmisc/aviation/livery.cpp
index 7d2b25414..63291ceb6 100644
--- a/src/blackmisc/aviation/livery.cpp
+++ b/src/blackmisc/aviation/livery.cpp
@@ -26,6 +26,8 @@
 using namespace BlackMisc;
 using namespace BlackMisc::Db;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CLivery)
+
 namespace BlackMisc::Aviation
 {
     CLivery::CLivery()
diff --git a/src/blackmisc/aviation/livery.h b/src/blackmisc/aviation/livery.h
index a5b768691..25dca7866 100644
--- a/src/blackmisc/aviation/livery.h
+++ b/src/blackmisc/aviation/livery.h
@@ -25,6 +25,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CLivery)
+
 namespace BlackMisc::Aviation
 {
     //! Value object encapsulating information about an airpot.
diff --git a/src/blackmisc/aviation/selcal.cpp b/src/blackmisc/aviation/selcal.cpp
index 7219b1232..414850442 100644
--- a/src/blackmisc/aviation/selcal.cpp
+++ b/src/blackmisc/aviation/selcal.cpp
@@ -16,6 +16,8 @@
 
 using namespace BlackMisc::PhysicalQuantities;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CSelcal)
+
 namespace BlackMisc::Aviation
 {
     QString CSelcal::convertToQString(bool /** i18n **/) const
diff --git a/src/blackmisc/aviation/selcal.h b/src/blackmisc/aviation/selcal.h
index 7fedc6313..d324d67c9 100644
--- a/src/blackmisc/aviation/selcal.h
+++ b/src/blackmisc/aviation/selcal.h
@@ -22,6 +22,8 @@
 
 class QStringList;
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CSelcal)
+
 namespace BlackMisc
 {
     namespace PhysicalQuantities { class CFrequency; }
diff --git a/src/blackmisc/aviation/simbriefdata.cpp b/src/blackmisc/aviation/simbriefdata.cpp
index 5e24e05fc..9b165b2c4 100644
--- a/src/blackmisc/aviation/simbriefdata.cpp
+++ b/src/blackmisc/aviation/simbriefdata.cpp
@@ -12,6 +12,8 @@
 
 using namespace BlackMisc::Network;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CSimBriefData)
+
 namespace BlackMisc::Aviation
 {
     const QStringList &CSimBriefData::getLogCategories()
diff --git a/src/blackmisc/aviation/simbriefdata.h b/src/blackmisc/aviation/simbriefdata.h
index 345408df0..562aacdb0 100644
--- a/src/blackmisc/aviation/simbriefdata.h
+++ b/src/blackmisc/aviation/simbriefdata.h
@@ -20,6 +20,8 @@
 #include <QString>
 #include <QtGlobal>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CSimBriefData)
+
 namespace BlackMisc::Aviation
 {
     //! Value object for a flight plan
diff --git a/src/blackmisc/aviation/transponder.cpp b/src/blackmisc/aviation/transponder.cpp
index 4e64eeb4f..66224cf1d 100644
--- a/src/blackmisc/aviation/transponder.cpp
+++ b/src/blackmisc/aviation/transponder.cpp
@@ -13,6 +13,8 @@
 #include <Qt>
 #include <QtDebug>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CTransponder)
+
 namespace BlackMisc::Aviation
 {
     void CTransponder::registerMetadata()
diff --git a/src/blackmisc/aviation/transponder.h b/src/blackmisc/aviation/transponder.h
index 741fe85d3..5865579d5 100644
--- a/src/blackmisc/aviation/transponder.h
+++ b/src/blackmisc/aviation/transponder.h
@@ -23,6 +23,8 @@
 #include <QtGlobal>
 #include <tuple>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CTransponder)
+
 namespace BlackMisc::Aviation
 {
     //! Transponder
diff --git a/src/blackmisc/country.cpp b/src/blackmisc/country.cpp
index 5a671c9fa..17a73e40f 100644
--- a/src/blackmisc/country.cpp
+++ b/src/blackmisc/country.cpp
@@ -14,6 +14,8 @@
 #include <QtGlobal>
 #include <QStringBuilder>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc, CCountry)
+
 namespace BlackMisc
 {
     CCountry::CCountry(const QString &iso, const QString &name) :
diff --git a/src/blackmisc/country.h b/src/blackmisc/country.h
index 42e848407..aea025f9a 100644
--- a/src/blackmisc/country.h
+++ b/src/blackmisc/country.h
@@ -21,6 +21,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc, CCountry)
+
 namespace BlackMisc
 {
     /*!
diff --git a/src/blackmisc/crashinfo.cpp b/src/blackmisc/crashinfo.cpp
index 367f7cc33..af865ef28 100644
--- a/src/blackmisc/crashinfo.cpp
+++ b/src/blackmisc/crashinfo.cpp
@@ -13,6 +13,8 @@
 #include <QFile>
 #include <QStringBuilder>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc, CCrashInfo)
+
 namespace BlackMisc
 {
     CCrashInfo::CCrashInfo() {}
diff --git a/src/blackmisc/crashinfo.h b/src/blackmisc/crashinfo.h
index 514af3b0c..3e0f00d32 100644
--- a/src/blackmisc/crashinfo.h
+++ b/src/blackmisc/crashinfo.h
@@ -14,6 +14,8 @@
 #include "blackmisc/valueobject.h"
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc, CCrashInfo)
+
 namespace BlackMisc
 {
     /*!
diff --git a/src/blackmisc/crashsettings.cpp b/src/blackmisc/crashsettings.cpp
index 52c528607..6fed49bf4 100644
--- a/src/blackmisc/crashsettings.cpp
+++ b/src/blackmisc/crashsettings.cpp
@@ -12,6 +12,8 @@
 
 #include <QStringBuilder>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Settings, CCrashSettings)
+
 namespace BlackMisc::Settings
 {
     CCrashSettings::CCrashSettings() {}
diff --git a/src/blackmisc/crashsettings.h b/src/blackmisc/crashsettings.h
index 093f0554c..1ab97d5c0 100644
--- a/src/blackmisc/crashsettings.h
+++ b/src/blackmisc/crashsettings.h
@@ -13,6 +13,8 @@
 
 #include "blackmisc/valueobject.h"
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Settings, CCrashSettings)
+
 namespace BlackMisc::Settings
 {
     /*!
diff --git a/src/blackmisc/db/artifact.cpp b/src/blackmisc/db/artifact.cpp
index 693568d5a..5e1bbaca7 100644
--- a/src/blackmisc/db/artifact.cpp
+++ b/src/blackmisc/db/artifact.cpp
@@ -15,6 +15,8 @@
 using namespace BlackConfig;
 using namespace BlackMisc::Network;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Db, CArtifact)
+
 namespace BlackMisc::Db
 {
     CArtifact::CArtifact()
diff --git a/src/blackmisc/db/artifact.h b/src/blackmisc/db/artifact.h
index d7cdf45d9..3b1708a16 100644
--- a/src/blackmisc/db/artifact.h
+++ b/src/blackmisc/db/artifact.h
@@ -18,6 +18,8 @@
 #include "blackmisc/network/remotefile.h"
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Db, CArtifact)
+
 namespace BlackMisc::Db
 {
     //! Artifacts ("our software" products)
diff --git a/src/blackmisc/db/dbinfo.cpp b/src/blackmisc/db/dbinfo.cpp
index b7de249cf..e43200dec 100644
--- a/src/blackmisc/db/dbinfo.cpp
+++ b/src/blackmisc/db/dbinfo.cpp
@@ -12,6 +12,8 @@
 
 using namespace BlackMisc::Network;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Db, CDbInfo)
+
 namespace BlackMisc::Db
 {
     CDbInfo::CDbInfo(int key, const QString &tableName, int entries) :
diff --git a/src/blackmisc/db/dbinfo.h b/src/blackmisc/db/dbinfo.h
index 45cb1a3d1..a8ee05ea5 100644
--- a/src/blackmisc/db/dbinfo.h
+++ b/src/blackmisc/db/dbinfo.h
@@ -16,6 +16,8 @@
 #include "blackmisc/valueobject.h"
 #include "blackmisc/blackmiscexport.h"
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Db, CDbInfo)
+
 namespace BlackMisc::Db
 {
     /*!
diff --git a/src/blackmisc/db/distribution.cpp b/src/blackmisc/db/distribution.cpp
index 0a6d49ebe..99d805050 100644
--- a/src/blackmisc/db/distribution.cpp
+++ b/src/blackmisc/db/distribution.cpp
@@ -14,6 +14,8 @@ using namespace BlackConfig;
 using namespace BlackMisc;
 using namespace BlackMisc::Network;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Db, CDistribution)
+
 namespace BlackMisc::Db
 {
     CDistribution::CDistribution()
diff --git a/src/blackmisc/db/distribution.h b/src/blackmisc/db/distribution.h
index 72c6eac9e..3ae644e28 100644
--- a/src/blackmisc/db/distribution.h
+++ b/src/blackmisc/db/distribution.h
@@ -23,6 +23,8 @@
 #include <QVersionNumber>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Db, CDistribution)
+
 namespace BlackMisc::Db
 {
     //! Distributions for channel
diff --git a/src/blackmisc/db/updateinfo.cpp b/src/blackmisc/db/updateinfo.cpp
index 4feba339e..022b24d3d 100644
--- a/src/blackmisc/db/updateinfo.cpp
+++ b/src/blackmisc/db/updateinfo.cpp
@@ -16,6 +16,8 @@
 
 using namespace BlackConfig;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Db, CUpdateInfo)
+
 namespace BlackMisc::Db
 {
     CUpdateInfo::CUpdateInfo(const CArtifactList &artifacts, const CDistributionList &distributions) :
diff --git a/src/blackmisc/db/updateinfo.h b/src/blackmisc/db/updateinfo.h
index ee1139969..c4fc8dc38 100644
--- a/src/blackmisc/db/updateinfo.h
+++ b/src/blackmisc/db/updateinfo.h
@@ -17,6 +17,8 @@
 #include "blackmisc/valueobject.h"
 #include <QStringList>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Db, CUpdateInfo)
+
 namespace BlackMisc::Db
 {
     //! Update info, i.e. artifacts and distributions
diff --git a/src/blackmisc/directories.cpp b/src/blackmisc/directories.cpp
index 99ba27a93..16026ec81 100644
--- a/src/blackmisc/directories.cpp
+++ b/src/blackmisc/directories.cpp
@@ -12,6 +12,8 @@
 #include <QFileInfo>
 #include <QDir>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc, CDirectories)
+
 namespace BlackMisc
 {
     QString CDirectories::getFlightPlanDirectoryOrDefault() const
diff --git a/src/blackmisc/directories.h b/src/blackmisc/directories.h
index 25c1e5476..003f48beb 100644
--- a/src/blackmisc/directories.h
+++ b/src/blackmisc/directories.h
@@ -18,6 +18,8 @@
 
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc, CDirectories)
+
 namespace BlackMisc
 {
     /*!
diff --git a/src/blackmisc/geo/coordinategeodetic.cpp b/src/blackmisc/geo/coordinategeodetic.cpp
index b01fde379..207dc28da 100644
--- a/src/blackmisc/geo/coordinategeodetic.cpp
+++ b/src/blackmisc/geo/coordinategeodetic.cpp
@@ -20,6 +20,8 @@ using namespace BlackMisc::Aviation;
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Math;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Geo, CCoordinateGeodetic)
+
 namespace BlackMisc::Geo
 {
     ICoordinateGeodetic::~ICoordinateGeodetic()
diff --git a/src/blackmisc/geo/coordinategeodetic.h b/src/blackmisc/geo/coordinategeodetic.h
index fcd4496ef..7185a16f7 100644
--- a/src/blackmisc/geo/coordinategeodetic.h
+++ b/src/blackmisc/geo/coordinategeodetic.h
@@ -31,6 +31,8 @@
 #include <QVector3D>
 #include <array>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Geo, CCoordinateGeodetic)
+
 namespace BlackMisc
 {
     namespace Geo
diff --git a/src/blackmisc/identifier.cpp b/src/blackmisc/identifier.cpp
index 5c4fe20a6..ab3a0454e 100644
--- a/src/blackmisc/identifier.cpp
+++ b/src/blackmisc/identifier.cpp
@@ -16,6 +16,8 @@
 #include <QSysInfo>
 #include <QStringBuilder>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc, CIdentifier)
+
 //! \private Escape characters not allowed in dbus paths
 QString toDBusPath(const QString &s)
 {
diff --git a/src/blackmisc/identifier.h b/src/blackmisc/identifier.h
index 24947182e..054b6f17d 100644
--- a/src/blackmisc/identifier.h
+++ b/src/blackmisc/identifier.h
@@ -22,6 +22,8 @@
 #include <QUuid>
 #include <QtGlobal>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc, CIdentifier)
+
 namespace BlackMisc
 {
     /*!
diff --git a/src/blackmisc/input/actionhotkey.cpp b/src/blackmisc/input/actionhotkey.cpp
index 57c061b87..c4d20f9f2 100644
--- a/src/blackmisc/input/actionhotkey.cpp
+++ b/src/blackmisc/input/actionhotkey.cpp
@@ -9,6 +9,8 @@
 #include "blackmisc/input/actionhotkey.h"
 #include <QStringBuilder>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Input, CActionHotkey)
+
 namespace BlackMisc::Input
 {
     CActionHotkey::CActionHotkey(const QString &action) :
diff --git a/src/blackmisc/input/actionhotkey.h b/src/blackmisc/input/actionhotkey.h
index ac6eedda6..c2d15f449 100644
--- a/src/blackmisc/input/actionhotkey.h
+++ b/src/blackmisc/input/actionhotkey.h
@@ -21,6 +21,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Input, CActionHotkey)
+
 namespace BlackMisc::Input
 {
     //! Value object encapsulating a action hotkey
diff --git a/src/blackmisc/input/hotkeycombination.cpp b/src/blackmisc/input/hotkeycombination.cpp
index f43601fad..afc9ee28a 100644
--- a/src/blackmisc/input/hotkeycombination.cpp
+++ b/src/blackmisc/input/hotkeycombination.cpp
@@ -15,6 +15,8 @@
 #include <algorithm>
 #include <tuple>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Input, CHotkeyCombination)
+
 namespace BlackMisc::Input
 {
     CHotkeyCombination::CHotkeyCombination(CKeyboardKey key) : CHotkeyCombination(CKeyboardKeyList { key })
diff --git a/src/blackmisc/input/hotkeycombination.h b/src/blackmisc/input/hotkeycombination.h
index 21f4dde1f..3e5ea84e7 100644
--- a/src/blackmisc/input/hotkeycombination.h
+++ b/src/blackmisc/input/hotkeycombination.h
@@ -22,6 +22,8 @@
 #include <QMetaType>
 #include <QStringList>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Input, CHotkeyCombination)
+
 namespace BlackMisc::Input
 {
     //! Value object representing hotkey sequence
diff --git a/src/blackmisc/input/joystickbutton.cpp b/src/blackmisc/input/joystickbutton.cpp
index cd2e73159..dae1d45ad 100644
--- a/src/blackmisc/input/joystickbutton.cpp
+++ b/src/blackmisc/input/joystickbutton.cpp
@@ -8,6 +8,8 @@
 
 #include "blackmisc/input/joystickbutton.h"
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Input, CJoystickButton)
+
 namespace BlackMisc::Input
 {
     CJoystickButton::CJoystickButton(const QString &deviceName, int index) :
diff --git a/src/blackmisc/input/joystickbutton.h b/src/blackmisc/input/joystickbutton.h
index 2ce269399..ce2d83bb1 100644
--- a/src/blackmisc/input/joystickbutton.h
+++ b/src/blackmisc/input/joystickbutton.h
@@ -20,6 +20,8 @@
 #include <QString>
 #include <QtGlobal>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Input, CJoystickButton)
+
 namespace BlackMisc::Input
 {
     //! Value object representing a joystick button
diff --git a/src/blackmisc/input/keyboardkey.cpp b/src/blackmisc/input/keyboardkey.cpp
index 42cc55aca..e3c0ae8db 100644
--- a/src/blackmisc/input/keyboardkey.cpp
+++ b/src/blackmisc/input/keyboardkey.cpp
@@ -15,6 +15,8 @@
 
 #include "blackmisc/propertyindexref.h"
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Input, CKeyboardKey)
+
 namespace BlackMisc::Input
 {
     CKeyboardKey::CKeyboardKey() :
diff --git a/src/blackmisc/input/keyboardkey.h b/src/blackmisc/input/keyboardkey.h
index 33473ca69..d03e52929 100644
--- a/src/blackmisc/input/keyboardkey.h
+++ b/src/blackmisc/input/keyboardkey.h
@@ -21,6 +21,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Input, CKeyboardKey)
+
 namespace BlackMisc::Input
 {
     //! Value object representing a keyboard key.
diff --git a/src/blackmisc/logcategory.cpp b/src/blackmisc/logcategory.cpp
index 4725b5ec1..41aa8022e 100644
--- a/src/blackmisc/logcategory.cpp
+++ b/src/blackmisc/logcategory.cpp
@@ -10,6 +10,8 @@
 
 #include <QtGlobal>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc, CLogCategory)
+
 namespace BlackMisc
 {
     QString CLogCategory::convertToQString(bool i18n) const
diff --git a/src/blackmisc/logcategory.h b/src/blackmisc/logcategory.h
index 8d3e548ae..4cd17fe7c 100644
--- a/src/blackmisc/logcategory.h
+++ b/src/blackmisc/logcategory.h
@@ -20,6 +20,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc, CLogCategory)
+
 namespace BlackMisc
 {
     /*!
diff --git a/src/blackmisc/namevariantpair.cpp b/src/blackmisc/namevariantpair.cpp
index 1a458e552..f7ce6565d 100644
--- a/src/blackmisc/namevariantpair.cpp
+++ b/src/blackmisc/namevariantpair.cpp
@@ -10,6 +10,8 @@
 #include "blackmisc/propertyindexvariantmap.h"
 #include <tuple>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc, CNameVariantPair)
+
 namespace BlackMisc
 {
     CNameVariantPair::CNameVariantPair(const QString &name, const CVariant &variant, const CIcon &icon)
diff --git a/src/blackmisc/namevariantpair.h b/src/blackmisc/namevariantpair.h
index eb444ddec..6babf6c6d 100644
--- a/src/blackmisc/namevariantpair.h
+++ b/src/blackmisc/namevariantpair.h
@@ -20,6 +20,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc, CNameVariantPair)
+
 namespace BlackMisc
 {
     //! Value / variant pair
diff --git a/src/blackmisc/network/authenticateduser.cpp b/src/blackmisc/network/authenticateduser.cpp
index b5c0ac73b..954d7f263 100644
--- a/src/blackmisc/network/authenticateduser.cpp
+++ b/src/blackmisc/network/authenticateduser.cpp
@@ -17,6 +17,8 @@
 #include <QStringBuilder>
 #include <QtGlobal>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Network, CAuthenticatedUser)
+
 namespace BlackMisc::Network
 {
     CAuthenticatedUser::CAuthenticatedUser()
diff --git a/src/blackmisc/network/authenticateduser.h b/src/blackmisc/network/authenticateduser.h
index ef8dce2e6..6c3a32f1d 100644
--- a/src/blackmisc/network/authenticateduser.h
+++ b/src/blackmisc/network/authenticateduser.h
@@ -25,11 +25,13 @@
 #include <QString>
 #include <QStringList>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Network, CAuthenticatedUser)
+
 namespace BlackMisc::Network
 {
     /*!
-    * Value object encapsulating information of an authentiated user.
-    */
+     * Value object encapsulating information of an authentiated user.
+     */
     class BLACKMISC_EXPORT CAuthenticatedUser :
         public CValueObject<CAuthenticatedUser>,
         public BlackMisc::Db::IDatastoreObjectWithIntegerKey
diff --git a/src/blackmisc/network/client.cpp b/src/blackmisc/network/client.cpp
index f225398ce..72c1f9de5 100644
--- a/src/blackmisc/network/client.cpp
+++ b/src/blackmisc/network/client.cpp
@@ -10,6 +10,7 @@
 #include "blackmisc/aviation/callsign.h"
 #include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/iconlist.h"
+#include "blackmisc/propertyindexvariantmap.h" // needed for Mixin::Index::apply
 
 #include <QPixmap>
 #include <QString>
@@ -17,6 +18,8 @@
 #include <QStringList>
 #include <tuple>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Network, CClient)
+
 namespace BlackMisc::Network
 {
     QString CClient::convertToQString(bool i18n) const
diff --git a/src/blackmisc/network/client.h b/src/blackmisc/network/client.h
index eccc2f3c4..64135c0ab 100644
--- a/src/blackmisc/network/client.h
+++ b/src/blackmisc/network/client.h
@@ -22,6 +22,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Network, CClient)
+
 namespace BlackMisc::Network
 {
     //! Another client software.
diff --git a/src/blackmisc/network/connectionstatus.cpp b/src/blackmisc/network/connectionstatus.cpp
index 661867a14..b7b165764 100644
--- a/src/blackmisc/network/connectionstatus.cpp
+++ b/src/blackmisc/network/connectionstatus.cpp
@@ -8,6 +8,8 @@
 
 #include "blackmisc/network/connectionstatus.h"
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Network, CConnectionStatus)
+
 namespace BlackMisc::Network
 {
     QString CConnectionStatus::convertToQString(bool i18n) const
diff --git a/src/blackmisc/network/connectionstatus.h b/src/blackmisc/network/connectionstatus.h
index bf70fcdf8..7f8b76d52 100644
--- a/src/blackmisc/network/connectionstatus.h
+++ b/src/blackmisc/network/connectionstatus.h
@@ -14,6 +14,8 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/valueobject.h"
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Network, CConnectionStatus)
+
 namespace BlackMisc::Network
 {
     //! Value object encapsulating information about a connection status
diff --git a/src/blackmisc/network/ecosystem.cpp b/src/blackmisc/network/ecosystem.cpp
index 1cec1766a..2b66011c4 100644
--- a/src/blackmisc/network/ecosystem.cpp
+++ b/src/blackmisc/network/ecosystem.cpp
@@ -11,6 +11,8 @@
 #include "blackmisc/verify.h"
 #include "blackmisc/comparefunctions.h"
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Network, CEcosystem)
+
 namespace BlackMisc::Network
 {
     QString CEcosystem::convertToQString(bool i18n) const
diff --git a/src/blackmisc/network/ecosystem.h b/src/blackmisc/network/ecosystem.h
index 7f2ece821..7d9d75ff1 100644
--- a/src/blackmisc/network/ecosystem.h
+++ b/src/blackmisc/network/ecosystem.h
@@ -17,6 +17,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Network, CEcosystem)
+
 namespace BlackMisc::Network
 {
     //! Ecosystem of server belonging together.
diff --git a/src/blackmisc/network/facilitytype.cpp b/src/blackmisc/network/facilitytype.cpp
index 0f0ea5468..460de6938 100644
--- a/src/blackmisc/network/facilitytype.cpp
+++ b/src/blackmisc/network/facilitytype.cpp
@@ -8,6 +8,8 @@
 
 #include "blackmisc/network/facilitytype.h"
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Network, CFacilityType)
+
 namespace BlackMisc::Network
 {
     QString CFacilityType::convertToQString(bool i18n) const
diff --git a/src/blackmisc/network/facilitytype.h b/src/blackmisc/network/facilitytype.h
index 8dec81cdc..ee6e6c6b4 100644
--- a/src/blackmisc/network/facilitytype.h
+++ b/src/blackmisc/network/facilitytype.h
@@ -14,6 +14,8 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/valueobject.h"
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Network, CFacilityType)
+
 namespace BlackMisc::Network
 {
     //! Value object encapsulating the ATC facility type, e.g. TWR, DEP, APP
diff --git a/src/blackmisc/network/fsdsetup.cpp b/src/blackmisc/network/fsdsetup.cpp
index 31351bde3..51a09825d 100644
--- a/src/blackmisc/network/fsdsetup.cpp
+++ b/src/blackmisc/network/fsdsetup.cpp
@@ -19,6 +19,8 @@
 
 using namespace BlackMisc;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Network, CFsdSetup)
+
 namespace BlackMisc::Network
 {
     CFsdSetup::CFsdSetup(SendReceiveDetails sendReceive) : m_sendReceive(sendReceive)
diff --git a/src/blackmisc/network/fsdsetup.h b/src/blackmisc/network/fsdsetup.h
index 8479a3e42..300a0923e 100644
--- a/src/blackmisc/network/fsdsetup.h
+++ b/src/blackmisc/network/fsdsetup.h
@@ -20,6 +20,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Network, CFsdSetup)
+
 namespace BlackMisc::Network
 {
     //! Value object for a FSD setup
diff --git a/src/blackmisc/network/loginmode.cpp b/src/blackmisc/network/loginmode.cpp
index f3ec1d298..77ab31975 100644
--- a/src/blackmisc/network/loginmode.cpp
+++ b/src/blackmisc/network/loginmode.cpp
@@ -8,6 +8,8 @@
 
 #include "blackmisc/network/loginmode.h"
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Network, CLoginMode)
+
 namespace BlackMisc::Network
 {
     QString CLoginMode::convertToQString(bool i18n) const
diff --git a/src/blackmisc/network/loginmode.h b/src/blackmisc/network/loginmode.h
index 0e133b0fa..eedc8f665 100644
--- a/src/blackmisc/network/loginmode.h
+++ b/src/blackmisc/network/loginmode.h
@@ -14,6 +14,8 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/valueobject.h"
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Network, CLoginMode)
+
 namespace BlackMisc::Network
 {
     //! Value object encapsulating information about login mode
diff --git a/src/blackmisc/network/rawfsdmessage.cpp b/src/blackmisc/network/rawfsdmessage.cpp
index f2f239dca..7e9cec991 100644
--- a/src/blackmisc/network/rawfsdmessage.cpp
+++ b/src/blackmisc/network/rawfsdmessage.cpp
@@ -17,6 +17,8 @@
 
 using namespace BlackMisc;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Network, CRawFsdMessage)
+
 namespace BlackMisc::Network
 {
     CRawFsdMessage::CRawFsdMessage(const QString &rawMessage)
diff --git a/src/blackmisc/network/rawfsdmessage.h b/src/blackmisc/network/rawfsdmessage.h
index ff339a145..6163f8adf 100644
--- a/src/blackmisc/network/rawfsdmessage.h
+++ b/src/blackmisc/network/rawfsdmessage.h
@@ -21,6 +21,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Network, CRawFsdMessage)
+
 namespace BlackMisc::Network
 {
     //! Value object for a raw FSD message
diff --git a/src/blackmisc/network/remotefile.cpp b/src/blackmisc/network/remotefile.cpp
index 7c07f35c8..0bde4cc76 100644
--- a/src/blackmisc/network/remotefile.cpp
+++ b/src/blackmisc/network/remotefile.cpp
@@ -11,6 +11,8 @@
 #include <QJsonValue>
 #include <QtGlobal>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Network, CRemoteFile)
+
 namespace BlackMisc::Network
 {
     CRemoteFile::CRemoteFile(const QString &name, const QString &description)
diff --git a/src/blackmisc/network/remotefile.h b/src/blackmisc/network/remotefile.h
index cc84ce0db..1dc8a635b 100644
--- a/src/blackmisc/network/remotefile.h
+++ b/src/blackmisc/network/remotefile.h
@@ -22,6 +22,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Network, CRemoteFile)
+
 namespace BlackMisc::Network
 {
     /*!
diff --git a/src/blackmisc/network/role.cpp b/src/blackmisc/network/role.cpp
index 9e6c189b2..e8bd6eeb9 100644
--- a/src/blackmisc/network/role.cpp
+++ b/src/blackmisc/network/role.cpp
@@ -11,6 +11,8 @@
 #include <QtGlobal>
 #include <QStringBuilder>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Network, CRole)
+
 namespace BlackMisc::Network
 {
     CRole::CRole(const QString &name, const QString &description)
diff --git a/src/blackmisc/network/role.h b/src/blackmisc/network/role.h
index 9195dba46..38e480025 100644
--- a/src/blackmisc/network/role.h
+++ b/src/blackmisc/network/role.h
@@ -21,6 +21,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Network, CRole)
+
 namespace BlackMisc::Network
 {
     /*!
diff --git a/src/blackmisc/network/server.cpp b/src/blackmisc/network/server.cpp
index 2f53ba0eb..6ac588dab 100644
--- a/src/blackmisc/network/server.cpp
+++ b/src/blackmisc/network/server.cpp
@@ -20,6 +20,8 @@
 
 using namespace BlackMisc::Audio;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Network, CServer)
+
 namespace BlackMisc::Network
 {
     const QList<int> &CServer::allServerTypes()
diff --git a/src/blackmisc/network/server.h b/src/blackmisc/network/server.h
index f0f7eeef5..3f2c2749a 100644
--- a/src/blackmisc/network/server.h
+++ b/src/blackmisc/network/server.h
@@ -26,6 +26,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Network, CServer)
+
 namespace BlackMisc::Network
 {
     //! Value object encapsulating information of a server
diff --git a/src/blackmisc/network/settings/networksettings.cpp b/src/blackmisc/network/settings/networksettings.cpp
index d27b3a104..92f395fe2 100644
--- a/src/blackmisc/network/settings/networksettings.cpp
+++ b/src/blackmisc/network/settings/networksettings.cpp
@@ -12,6 +12,8 @@
 #include <QtGlobal>
 #include <QStringBuilder>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Network::Settings, CNetworkSettings)
+
 namespace BlackMisc::Network::Settings
 {
     QString CNetworkSettings::convertToQString(bool i18n) const
diff --git a/src/blackmisc/network/settings/networksettings.h b/src/blackmisc/network/settings/networksettings.h
index 11343285a..92385efc2 100644
--- a/src/blackmisc/network/settings/networksettings.h
+++ b/src/blackmisc/network/settings/networksettings.h
@@ -20,6 +20,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Network::Settings, CNetworkSettings)
+
 namespace BlackMisc::Network::Settings
 {
     //! Network settings
diff --git a/src/blackmisc/network/textmessage.cpp b/src/blackmisc/network/textmessage.cpp
index 713f4a1f0..b7ee0cb2f 100644
--- a/src/blackmisc/network/textmessage.cpp
+++ b/src/blackmisc/network/textmessage.cpp
@@ -21,6 +21,8 @@
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::PhysicalQuantities;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Network, CTextMessage)
+
 namespace BlackMisc::Network
 {
     CTextMessage::CTextMessage(const QString &message, const CFrequency &frequency, const CCallsign &senderCallsign)
diff --git a/src/blackmisc/network/textmessage.h b/src/blackmisc/network/textmessage.h
index f48109fcd..37a05afd4 100644
--- a/src/blackmisc/network/textmessage.h
+++ b/src/blackmisc/network/textmessage.h
@@ -25,6 +25,8 @@
 #include <QPixmap>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Network, CTextMessage)
+
 namespace BlackMisc::Network
 {
     /*!
diff --git a/src/blackmisc/network/url.cpp b/src/blackmisc/network/url.cpp
index e26562a8f..70612da2c 100644
--- a/src/blackmisc/network/url.cpp
+++ b/src/blackmisc/network/url.cpp
@@ -14,6 +14,8 @@
 #include <QPair>
 #include <QtGlobal>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Network, CUrl)
+
 namespace BlackMisc::Network
 {
     CUrl::CUrl(const QString &fullUrl)
diff --git a/src/blackmisc/network/url.h b/src/blackmisc/network/url.h
index 1dff52f30..bfd62a8b8 100644
--- a/src/blackmisc/network/url.h
+++ b/src/blackmisc/network/url.h
@@ -22,6 +22,8 @@
 #include <QString>
 #include <QUrl>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Network, CUrl)
+
 namespace BlackMisc::Network
 {
     //! Value object encapsulating information of a location,
diff --git a/src/blackmisc/network/urllog.cpp b/src/blackmisc/network/urllog.cpp
index 755dd1bd4..73826cc92 100644
--- a/src/blackmisc/network/urllog.cpp
+++ b/src/blackmisc/network/urllog.cpp
@@ -17,6 +17,8 @@
 
 #include <atomic>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Network, CUrlLog)
+
 namespace BlackMisc::Network
 {
     CUrlLog::CUrlLog(const CUrl &url) :
diff --git a/src/blackmisc/network/urllog.h b/src/blackmisc/network/urllog.h
index 07b181439..ecd6a052b 100644
--- a/src/blackmisc/network/urllog.h
+++ b/src/blackmisc/network/urllog.h
@@ -20,6 +20,8 @@
 #include <QJsonObject>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Network, CUrlLog)
+
 namespace BlackMisc::Network
 {
     //! Information about accessing one URL over the network
diff --git a/src/blackmisc/network/user.cpp b/src/blackmisc/network/user.cpp
index 664f21acd..b49cf8fa6 100644
--- a/src/blackmisc/network/user.cpp
+++ b/src/blackmisc/network/user.cpp
@@ -11,6 +11,7 @@
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/stringutils.h"
+#include "blackmisc/propertyindexvariantmap.h" // needed for Mixin::Index::apply
 
 #include <QChar>
 #include <QRegularExpression>
@@ -21,6 +22,8 @@
 
 using namespace BlackMisc::Aviation;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Network, CUser)
+
 namespace BlackMisc::Network
 {
     CUser::CUser(const CCallsign &callsign)
diff --git a/src/blackmisc/network/user.h b/src/blackmisc/network/user.h
index ea5cb69ec..885b4d6ee 100644
--- a/src/blackmisc/network/user.h
+++ b/src/blackmisc/network/user.h
@@ -23,6 +23,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Network, CUser)
+
 namespace BlackMisc::Network
 {
     /*!
diff --git a/src/blackmisc/network/voicecapabilities.cpp b/src/blackmisc/network/voicecapabilities.cpp
index 7c4376717..747f08bf4 100644
--- a/src/blackmisc/network/voicecapabilities.cpp
+++ b/src/blackmisc/network/voicecapabilities.cpp
@@ -15,6 +15,8 @@
 
 using namespace BlackMisc;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Network, CVoiceCapabilities)
+
 namespace BlackMisc::Network
 {
     CVoiceCapabilities::CVoiceCapabilities(const QString &flightPlanRemarks)
diff --git a/src/blackmisc/network/voicecapabilities.h b/src/blackmisc/network/voicecapabilities.h
index 19f9c8d35..067eb41ce 100644
--- a/src/blackmisc/network/voicecapabilities.h
+++ b/src/blackmisc/network/voicecapabilities.h
@@ -14,6 +14,8 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/valueobject.h"
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Network, CVoiceCapabilities)
+
 namespace BlackMisc::Network
 {
     //! Value object encapsulating information for voice capabilities.
diff --git a/src/blackmisc/pixmap.cpp b/src/blackmisc/pixmap.cpp
index fd614c816..acfeee251 100644
--- a/src/blackmisc/pixmap.cpp
+++ b/src/blackmisc/pixmap.cpp
@@ -16,6 +16,8 @@
 #include <QtGlobal>
 #include <tuple>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc, CPixmap)
+
 namespace BlackMisc
 {
     CPixmap::CPixmap(const QPixmap &pixmap) : m_pixmap(pixmap), m_hasCachedPixmap(true)
diff --git a/src/blackmisc/pixmap.h b/src/blackmisc/pixmap.h
index a3152657d..064525651 100644
--- a/src/blackmisc/pixmap.h
+++ b/src/blackmisc/pixmap.h
@@ -21,6 +21,8 @@
 #include <QReadWriteLock>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc, CPixmap)
+
 namespace BlackMisc
 {
     class CStatusMessage;
diff --git a/src/blackmisc/platform.cpp b/src/blackmisc/platform.cpp
index d473494a2..9f528856e 100644
--- a/src/blackmisc/platform.cpp
+++ b/src/blackmisc/platform.cpp
@@ -18,6 +18,8 @@
 
 using namespace BlackConfig;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc, CPlatform)
+
 namespace BlackMisc
 {
     CPlatform::CPlatform(const QString &p) : m_platform(stringToPlatform(p))
diff --git a/src/blackmisc/platform.h b/src/blackmisc/platform.h
index d20b71bd8..f0ada0fbe 100644
--- a/src/blackmisc/platform.h
+++ b/src/blackmisc/platform.h
@@ -19,6 +19,8 @@
 #include <QMetaEnum>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc, CPlatform)
+
 namespace BlackMisc
 {
     /*!
diff --git a/src/blackmisc/pq/pqstring.cpp b/src/blackmisc/pq/pqstring.cpp
index e24a8a426..df81390d1 100644
--- a/src/blackmisc/pq/pqstring.cpp
+++ b/src/blackmisc/pq/pqstring.cpp
@@ -23,6 +23,8 @@
 #include <QRegularExpression>
 #include <QtDebug>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::PhysicalQuantities, CPqString)
+
 namespace BlackMisc::PhysicalQuantities
 {
     QString CPqString::convertToQString(bool /** i18n **/) const
diff --git a/src/blackmisc/pq/pqstring.h b/src/blackmisc/pq/pqstring.h
index ccbc52385..a497cddcb 100644
--- a/src/blackmisc/pq/pqstring.h
+++ b/src/blackmisc/pq/pqstring.h
@@ -19,6 +19,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::PhysicalQuantities, CPqString)
+
 namespace BlackMisc::PhysicalQuantities
 {
     /*!
diff --git a/src/blackmisc/processinfo.cpp b/src/blackmisc/processinfo.cpp
index 79d6cb5e8..c3d33a709 100644
--- a/src/blackmisc/processinfo.cpp
+++ b/src/blackmisc/processinfo.cpp
@@ -21,6 +21,8 @@
 #include <psapi.h>
 #endif
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc, CProcessInfo)
+
 namespace BlackMisc
 {
 
diff --git a/src/blackmisc/processinfo.h b/src/blackmisc/processinfo.h
index 68465833d..685cfdb8d 100644
--- a/src/blackmisc/processinfo.h
+++ b/src/blackmisc/processinfo.h
@@ -15,6 +15,8 @@
 #include <QCoreApplication>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc, CProcessInfo)
+
 namespace BlackMisc
 {
     /*!
diff --git a/src/blackmisc/rgbcolor.cpp b/src/blackmisc/rgbcolor.cpp
index b81756500..626bc7388 100644
--- a/src/blackmisc/rgbcolor.cpp
+++ b/src/blackmisc/rgbcolor.cpp
@@ -22,6 +22,8 @@
 
 using namespace BlackMisc;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc, CRgbColor)
+
 namespace BlackMisc
 {
     CRgbColor::CRgbColor(const QString &color, bool isName)
diff --git a/src/blackmisc/rgbcolor.h b/src/blackmisc/rgbcolor.h
index fa70e2416..56f12aa89 100644
--- a/src/blackmisc/rgbcolor.h
+++ b/src/blackmisc/rgbcolor.h
@@ -22,6 +22,8 @@
 #include <QString>
 #include <tuple>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc, CRgbColor)
+
 namespace BlackMisc
 {
     /*!
diff --git a/src/blackmisc/sharedstate/passiveobserver.cpp b/src/blackmisc/sharedstate/passiveobserver.cpp
index 5682cd398..f55dfb584 100644
--- a/src/blackmisc/sharedstate/passiveobserver.cpp
+++ b/src/blackmisc/sharedstate/passiveobserver.cpp
@@ -10,6 +10,8 @@
 
 #include "blackmisc/sharedstate/passiveobserver.h"
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::SharedState, CAnyMatch)
+
 namespace BlackMisc::SharedState
 {
     void CPassiveObserver::setEventSubscription(const CVariant &param)
diff --git a/src/blackmisc/sharedstate/passiveobserver.h b/src/blackmisc/sharedstate/passiveobserver.h
index 631411940..2fe41b804 100644
--- a/src/blackmisc/sharedstate/passiveobserver.h
+++ b/src/blackmisc/sharedstate/passiveobserver.h
@@ -18,6 +18,8 @@
 #include <QSharedPointer>
 #include <QMutex>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::SharedState, CAnyMatch)
+
 namespace BlackMisc::SharedState
 {
     class CActiveObserver;
diff --git a/src/blackmisc/simulation/aircraftmatchersetup.cpp b/src/blackmisc/simulation/aircraftmatchersetup.cpp
index 7a770a44a..858450467 100644
--- a/src/blackmisc/simulation/aircraftmatchersetup.cpp
+++ b/src/blackmisc/simulation/aircraftmatchersetup.cpp
@@ -10,6 +10,8 @@
 #include "blackmisc/stringutils.h"
 #include <QStringBuilder>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Simulation, CAircraftMatcherSetup)
+
 namespace BlackMisc::Simulation
 {
     CAircraftMatcherSetup::CAircraftMatcherSetup()
diff --git a/src/blackmisc/simulation/aircraftmatchersetup.h b/src/blackmisc/simulation/aircraftmatchersetup.h
index 3282a23e9..cf26e39b5 100644
--- a/src/blackmisc/simulation/aircraftmatchersetup.h
+++ b/src/blackmisc/simulation/aircraftmatchersetup.h
@@ -14,6 +14,8 @@
 #include "blackmisc/valueobject.h"
 #include "blackmisc/blackmiscexport.h"
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Simulation, CAircraftMatcherSetup)
+
 namespace BlackMisc::Simulation
 {
     //! Matcher settings
diff --git a/src/blackmisc/simulation/aircraftmodel.cpp b/src/blackmisc/simulation/aircraftmodel.cpp
index d4e69e5d7..80278ad67 100644
--- a/src/blackmisc/simulation/aircraftmodel.cpp
+++ b/src/blackmisc/simulation/aircraftmodel.cpp
@@ -32,6 +32,8 @@ using namespace BlackMisc::Aviation;
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Db;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Simulation, CAircraftModel)
+
 namespace BlackMisc::Simulation
 {
     void CAircraftModel::registerMetadata()
diff --git a/src/blackmisc/simulation/aircraftmodel.h b/src/blackmisc/simulation/aircraftmodel.h
index 5d83e2b09..bbbd9995c 100644
--- a/src/blackmisc/simulation/aircraftmodel.h
+++ b/src/blackmisc/simulation/aircraftmodel.h
@@ -41,6 +41,8 @@
 #include <QDir>
 #include <tuple>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Simulation, CAircraftModel)
+
 namespace BlackMisc
 {
     class CIcon;
diff --git a/src/blackmisc/simulation/airspaceaircraftsnapshot.cpp b/src/blackmisc/simulation/airspaceaircraftsnapshot.cpp
index b42a2bc5c..79fc7df24 100644
--- a/src/blackmisc/simulation/airspaceaircraftsnapshot.cpp
+++ b/src/blackmisc/simulation/airspaceaircraftsnapshot.cpp
@@ -16,6 +16,8 @@
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::PhysicalQuantities;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Simulation, CAirspaceAircraftSnapshot)
+
 namespace BlackMisc::Simulation
 {
     CAirspaceAircraftSnapshot::CAirspaceAircraftSnapshot()
diff --git a/src/blackmisc/simulation/airspaceaircraftsnapshot.h b/src/blackmisc/simulation/airspaceaircraftsnapshot.h
index 332c536c2..bb7cb7a46 100644
--- a/src/blackmisc/simulation/airspaceaircraftsnapshot.h
+++ b/src/blackmisc/simulation/airspaceaircraftsnapshot.h
@@ -25,6 +25,8 @@
 #include <QString>
 #include <QtGlobal>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Simulation, CAirspaceAircraftSnapshot)
+
 namespace BlackMisc::Simulation
 {
     //! Current situation in the skies analyzed.
diff --git a/src/blackmisc/simulation/distributor.cpp b/src/blackmisc/simulation/distributor.cpp
index 0739b9ec5..4d1c9ad7e 100644
--- a/src/blackmisc/simulation/distributor.cpp
+++ b/src/blackmisc/simulation/distributor.cpp
@@ -16,6 +16,8 @@
 #include <QStringBuilder>
 #include <QtGlobal>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Simulation, CDistributor)
+
 namespace BlackMisc::Simulation
 {
     CDistributor::CDistributor() { }
diff --git a/src/blackmisc/simulation/distributor.h b/src/blackmisc/simulation/distributor.h
index e03207dfc..8b7477f49 100644
--- a/src/blackmisc/simulation/distributor.h
+++ b/src/blackmisc/simulation/distributor.h
@@ -26,6 +26,8 @@
 #include <QSet>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Simulation, CDistributor)
+
 namespace BlackMisc::Simulation
 {
     //! Value object encapsulating information of software distributor.
diff --git a/src/blackmisc/simulation/distributorlistpreferences.cpp b/src/blackmisc/simulation/distributorlistpreferences.cpp
index f35a7f6a3..f46435fe9 100644
--- a/src/blackmisc/simulation/distributorlistpreferences.cpp
+++ b/src/blackmisc/simulation/distributorlistpreferences.cpp
@@ -10,6 +10,8 @@
 
 #include <QtGlobal>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Simulation, CDistributorListPreferences)
+
 namespace BlackMisc::Simulation
 {
     CDistributorListPreferences::CDistributorListPreferences() { }
diff --git a/src/blackmisc/simulation/distributorlistpreferences.h b/src/blackmisc/simulation/distributorlistpreferences.h
index 3fc998c62..5bbbfec4b 100644
--- a/src/blackmisc/simulation/distributorlistpreferences.h
+++ b/src/blackmisc/simulation/distributorlistpreferences.h
@@ -24,6 +24,8 @@
 #include <QString>
 #include <tuple>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Simulation, CDistributorListPreferences)
+
 namespace BlackMisc::Simulation
 {
     //! Preferences for distributors
diff --git a/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp b/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp
index b3b0152ae..eff64dcf4 100644
--- a/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp
+++ b/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp
@@ -20,6 +20,8 @@ using namespace BlackMisc;
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::Simulation;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Simulation::FsCommon, CAircraftCfgEntries)
+
 namespace BlackMisc::Simulation::FsCommon
 {
     CAircraftCfgEntries::CAircraftCfgEntries(const QString &fileName, int index, const QString &title, const QString &atcType, const QString &atcModel, const QString &atcParkingCode, const QString &description) :
diff --git a/src/blackmisc/simulation/fscommon/aircraftcfgentries.h b/src/blackmisc/simulation/fscommon/aircraftcfgentries.h
index e68024a5b..f7378dec9 100644
--- a/src/blackmisc/simulation/fscommon/aircraftcfgentries.h
+++ b/src/blackmisc/simulation/fscommon/aircraftcfgentries.h
@@ -21,6 +21,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Simulation::FsCommon, CAircraftCfgEntries)
+
 namespace BlackMisc::Simulation::FsCommon
 {
     //! Set of aircraft.cfg entries representing an aircraft (FSX)
diff --git a/src/blackmisc/simulation/fscommon/vpilotmodelrule.cpp b/src/blackmisc/simulation/fscommon/vpilotmodelrule.cpp
index 770d51eff..70485bf58 100644
--- a/src/blackmisc/simulation/fscommon/vpilotmodelrule.cpp
+++ b/src/blackmisc/simulation/fscommon/vpilotmodelrule.cpp
@@ -18,6 +18,8 @@
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::Simulation;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Simulation::FsCommon, CVPilotModelRule)
+
 namespace BlackMisc::Simulation::FsCommon
 {
     CVPilotModelRule::CVPilotModelRule() { }
diff --git a/src/blackmisc/simulation/fscommon/vpilotmodelrule.h b/src/blackmisc/simulation/fscommon/vpilotmodelrule.h
index 30a4de74b..4b23b3135 100644
--- a/src/blackmisc/simulation/fscommon/vpilotmodelrule.h
+++ b/src/blackmisc/simulation/fscommon/vpilotmodelrule.h
@@ -22,6 +22,8 @@
 #include <QString>
 #include <QtGlobal>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Simulation::FsCommon, CVPilotModelRule)
+
 namespace BlackMisc::Simulation::FsCommon
 {
     //! Value object encapsulating information of software distributor.
diff --git a/src/blackmisc/simulation/interpolationrenderingsetup.cpp b/src/blackmisc/simulation/interpolationrenderingsetup.cpp
index db79abf12..1596f0098 100644
--- a/src/blackmisc/simulation/interpolationrenderingsetup.cpp
+++ b/src/blackmisc/simulation/interpolationrenderingsetup.cpp
@@ -11,6 +11,7 @@
 #include "blackmisc/stringutils.h"
 #include "blackmisc/verify.h"
 #include "blackconfig/buildconfig.h"
+#include "blackmisc/propertyindexvariantmap.h" // needed for Mixin::Index::apply
 #include <QStringBuilder>
 
 using namespace BlackConfig;
@@ -18,6 +19,9 @@ using namespace BlackMisc::Aviation;
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Network;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Simulation, CInterpolationAndRenderingSetupGlobal)
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Simulation, CInterpolationAndRenderingSetupPerCallsign)
+
 namespace BlackMisc::Simulation
 {
     CInterpolationAndRenderingSetupBase::CInterpolationAndRenderingSetupBase()
diff --git a/src/blackmisc/simulation/interpolationrenderingsetup.h b/src/blackmisc/simulation/interpolationrenderingsetup.h
index fb0513506..d4758ba2c 100644
--- a/src/blackmisc/simulation/interpolationrenderingsetup.h
+++ b/src/blackmisc/simulation/interpolationrenderingsetup.h
@@ -19,6 +19,9 @@
 #include "blackmisc/valueobject.h"
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Simulation, CInterpolationAndRenderingSetupGlobal)
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Simulation, CInterpolationAndRenderingSetupPerCallsign)
+
 namespace BlackMisc
 {
     namespace Network { class CClient; }
diff --git a/src/blackmisc/simulation/matchingstatisticsentry.cpp b/src/blackmisc/simulation/matchingstatisticsentry.cpp
index 9dad35eff..78d0a6759 100644
--- a/src/blackmisc/simulation/matchingstatisticsentry.cpp
+++ b/src/blackmisc/simulation/matchingstatisticsentry.cpp
@@ -9,6 +9,8 @@
 #include "blackmisc/simulation/matchingstatisticsentry.h"
 #include "blackmisc/comparefunctions.h"
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Simulation, CMatchingStatisticsEntry)
+
 namespace BlackMisc::Simulation
 {
     CMatchingStatisticsEntry::CMatchingStatisticsEntry() { }
diff --git a/src/blackmisc/simulation/matchingstatisticsentry.h b/src/blackmisc/simulation/matchingstatisticsentry.h
index e7ef46971..3dfcec983 100644
--- a/src/blackmisc/simulation/matchingstatisticsentry.h
+++ b/src/blackmisc/simulation/matchingstatisticsentry.h
@@ -15,6 +15,8 @@
 #include "blackmisc/valueobject.h"
 #include "blackmisc/timestampbased.h"
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Simulation, CMatchingStatisticsEntry)
+
 namespace BlackMisc::Simulation
 {
     //! Value object for a matching statistics entry.
diff --git a/src/blackmisc/simulation/settings/modelsettings.cpp b/src/blackmisc/simulation/settings/modelsettings.cpp
index 6bef33544..f2ef79b9c 100644
--- a/src/blackmisc/simulation/settings/modelsettings.cpp
+++ b/src/blackmisc/simulation/settings/modelsettings.cpp
@@ -9,6 +9,8 @@
 #include "blackmisc/simulation/settings/modelsettings.h"
 #include "blackmisc/stringutils.h"
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Simulation::Settings, CModelSettings)
+
 namespace BlackMisc::Simulation::Settings
 {
     CModelSettings::CModelSettings()
diff --git a/src/blackmisc/simulation/settings/modelsettings.h b/src/blackmisc/simulation/settings/modelsettings.h
index 0ca92b284..17c151cec 100644
--- a/src/blackmisc/simulation/settings/modelsettings.h
+++ b/src/blackmisc/simulation/settings/modelsettings.h
@@ -16,6 +16,8 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/propertyindexref.h"
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Simulation::Settings, CModelSettings)
+
 namespace BlackMisc::Simulation::Settings
 {
     //! Settings for models
diff --git a/src/blackmisc/simulation/settings/simulatorsettings.cpp b/src/blackmisc/simulation/settings/simulatorsettings.cpp
index b5e05760d..010d50e7f 100644
--- a/src/blackmisc/simulation/settings/simulatorsettings.cpp
+++ b/src/blackmisc/simulation/settings/simulatorsettings.cpp
@@ -22,6 +22,10 @@ using namespace BlackMisc::Simulation::FsCommon;
 using namespace BlackMisc::Simulation::XPlane;
 using namespace BlackMisc::Simulation::Flightgear;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Simulation::Settings, CSimulatorSettings)
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Simulation::Settings, CFsxP3DSettings)
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Simulation::Settings, CSimulatorMessagesSettings)
+
 namespace BlackMisc::Simulation::Settings
 {
     const QString &CSimulatorSettings::cgSourceAsString(CSimulatorSettings::CGSource source)
diff --git a/src/blackmisc/simulation/settings/simulatorsettings.h b/src/blackmisc/simulation/settings/simulatorsettings.h
index 1c0705322..6bca4b1d4 100644
--- a/src/blackmisc/simulation/settings/simulatorsettings.h
+++ b/src/blackmisc/simulation/settings/simulatorsettings.h
@@ -25,6 +25,10 @@
 #include <QStringList>
 #include <QObject>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Simulation::Settings, CSimulatorSettings)
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Simulation::Settings, CFsxP3DSettings)
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Simulation::Settings, CSimulatorMessagesSettings)
+
 namespace BlackMisc::Simulation::Settings
 {
     //! Settings for simulator
diff --git a/src/blackmisc/simulation/settings/swiftpluginsettings.cpp b/src/blackmisc/simulation/settings/swiftpluginsettings.cpp
index 46738ada9..b56a91c96 100644
--- a/src/blackmisc/simulation/settings/swiftpluginsettings.cpp
+++ b/src/blackmisc/simulation/settings/swiftpluginsettings.cpp
@@ -9,6 +9,8 @@
 #include "blackmisc/simulation/settings/swiftpluginsettings.h"
 #include "blackmisc/stringutils.h"
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Simulation::Settings, CSwiftPluginSettings)
+
 namespace BlackMisc::Simulation::Settings
 {
     CSwiftPluginSettings::CSwiftPluginSettings()
diff --git a/src/blackmisc/simulation/settings/swiftpluginsettings.h b/src/blackmisc/simulation/settings/swiftpluginsettings.h
index e5b986e90..48290d97b 100644
--- a/src/blackmisc/simulation/settings/swiftpluginsettings.h
+++ b/src/blackmisc/simulation/settings/swiftpluginsettings.h
@@ -17,6 +17,8 @@
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/blackmiscexport.h"
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Simulation::Settings, CSwiftPluginSettings)
+
 namespace BlackMisc::Simulation::Settings
 {
     //! Settings for models
diff --git a/src/blackmisc/simulation/settings/xswiftbussettings.cpp b/src/blackmisc/simulation/settings/xswiftbussettings.cpp
index 8cbde0e20..6f06be9ed 100644
--- a/src/blackmisc/simulation/settings/xswiftbussettings.cpp
+++ b/src/blackmisc/simulation/settings/xswiftbussettings.cpp
@@ -9,6 +9,8 @@
 #include "blackmisc/simulation/settings/xswiftbussettings.h"
 #include "blackmisc/simulation/settings/xswiftbussettingsqtfree.inc"
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Simulation::Settings, CXSwiftBusSettings)
+
 namespace BlackMisc::Simulation::Settings
 {
     CXSwiftBusSettings::CXSwiftBusSettings() { }
diff --git a/src/blackmisc/simulation/settings/xswiftbussettings.h b/src/blackmisc/simulation/settings/xswiftbussettings.h
index 79cb60e27..2f9f69c1c 100644
--- a/src/blackmisc/simulation/settings/xswiftbussettings.h
+++ b/src/blackmisc/simulation/settings/xswiftbussettings.h
@@ -20,6 +20,8 @@
 
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Simulation::Settings, CXSwiftBusSettings)
+
 namespace BlackMisc::Simulation::Settings
 {
     //! XSwiftBus settings
diff --git a/src/blackmisc/simulation/simulatedaircraft.cpp b/src/blackmisc/simulation/simulatedaircraft.cpp
index 05902e845..9c3713ae8 100644
--- a/src/blackmisc/simulation/simulatedaircraft.cpp
+++ b/src/blackmisc/simulation/simulatedaircraft.cpp
@@ -21,6 +21,8 @@ using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::Network;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Simulation, CSimulatedAircraft)
+
 namespace BlackMisc::Simulation
 {
     CSimulatedAircraft::CSimulatedAircraft()
diff --git a/src/blackmisc/simulation/simulatedaircraft.h b/src/blackmisc/simulation/simulatedaircraft.h
index 311b9ab0f..4700b6a17 100644
--- a/src/blackmisc/simulation/simulatedaircraft.h
+++ b/src/blackmisc/simulation/simulatedaircraft.h
@@ -39,6 +39,8 @@
 #include <QtGlobal>
 #include <array>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Simulation, CSimulatedAircraft)
+
 namespace BlackMisc
 {
     namespace Aviation
diff --git a/src/blackmisc/simulation/simulatorinfo.cpp b/src/blackmisc/simulation/simulatorinfo.cpp
index 2c612eba7..202d8e308 100644
--- a/src/blackmisc/simulation/simulatorinfo.cpp
+++ b/src/blackmisc/simulation/simulatorinfo.cpp
@@ -26,6 +26,8 @@ using namespace BlackMisc::Db;
 using namespace BlackMisc::Simulation::FsCommon;
 using namespace BlackMisc::Simulation::XPlane;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Simulation, CSimulatorInfo)
+
 namespace BlackMisc::Simulation
 {
     CSimulatorInfo::CSimulatorInfo()
diff --git a/src/blackmisc/simulation/simulatorinfo.h b/src/blackmisc/simulation/simulatorinfo.h
index 9c78ba8d7..fc38d2242 100644
--- a/src/blackmisc/simulation/simulatorinfo.h
+++ b/src/blackmisc/simulation/simulatorinfo.h
@@ -26,6 +26,8 @@
 #include <QMultiMap>
 #include <QStringList>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Simulation, CSimulatorInfo)
+
 namespace BlackMisc::Simulation
 {
     //! Simple hardcoded info about the corresponding simulator.
diff --git a/src/blackmisc/simulation/simulatorinternals.cpp b/src/blackmisc/simulation/simulatorinternals.cpp
index b6a88f589..5a98b0f07 100644
--- a/src/blackmisc/simulation/simulatorinternals.cpp
+++ b/src/blackmisc/simulation/simulatorinternals.cpp
@@ -12,6 +12,8 @@
 #include <QDBusMetaType>
 #include <QJsonObject>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Simulation, CSimulatorInternals)
+
 namespace BlackMisc::Simulation
 {
     void CSimulatorInternals::setValue(const QString &name, const QString &value)
diff --git a/src/blackmisc/simulation/simulatorinternals.h b/src/blackmisc/simulation/simulatorinternals.h
index 48f319623..078873345 100644
--- a/src/blackmisc/simulation/simulatorinternals.h
+++ b/src/blackmisc/simulation/simulatorinternals.h
@@ -24,6 +24,8 @@
 #include <QString>
 #include <tuple>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Simulation, CSimulatorInternals)
+
 namespace BlackMisc::Simulation
 {
     //! Simulator internals for flight simulators.
diff --git a/src/blackmisc/simulation/simulatorplugininfo.cpp b/src/blackmisc/simulation/simulatorplugininfo.cpp
index 0d0b9a735..b562795c6 100644
--- a/src/blackmisc/simulation/simulatorplugininfo.cpp
+++ b/src/blackmisc/simulation/simulatorplugininfo.cpp
@@ -14,6 +14,8 @@
 using namespace BlackConfig;
 using namespace BlackMisc;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Simulation, CSimulatorPluginInfo)
+
 namespace BlackMisc::Simulation
 {
     CSimulatorPluginInfo::CSimulatorPluginInfo(const QString &identifier, const QString &name, const QString &simulator, const QString &description, bool valid) :
diff --git a/src/blackmisc/simulation/simulatorplugininfo.h b/src/blackmisc/simulation/simulatorplugininfo.h
index 1653905af..d30e2d576 100644
--- a/src/blackmisc/simulation/simulatorplugininfo.h
+++ b/src/blackmisc/simulation/simulatorplugininfo.h
@@ -20,6 +20,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Simulation, CSimulatorPluginInfo)
+
 namespace BlackMisc::Simulation
 {
     //! Describing a simulator plugin
diff --git a/src/blackmisc/simulation/xplane/navdatareference.cpp b/src/blackmisc/simulation/xplane/navdatareference.cpp
index de239ae1c..ccb7d939a 100644
--- a/src/blackmisc/simulation/xplane/navdatareference.cpp
+++ b/src/blackmisc/simulation/xplane/navdatareference.cpp
@@ -12,6 +12,8 @@
 
 #include <QtGlobal>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Simulation::XPlane, CNavDataReference)
+
 namespace BlackMisc::Simulation::XPlane
 {
     CNavDataReference::CNavDataReference() = default;
diff --git a/src/blackmisc/simulation/xplane/navdatareference.h b/src/blackmisc/simulation/xplane/navdatareference.h
index b89698532..09b55f241 100644
--- a/src/blackmisc/simulation/xplane/navdatareference.h
+++ b/src/blackmisc/simulation/xplane/navdatareference.h
@@ -29,6 +29,8 @@
 #include <array>
 #include <tuple>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Simulation::XPlane, CNavDataReference)
+
 namespace BlackMisc::Simulation::XPlane
 {
     /*!
diff --git a/src/blackmisc/statusmessage.cpp b/src/blackmisc/statusmessage.cpp
index 3061852b8..c862b6a0c 100644
--- a/src/blackmisc/statusmessage.cpp
+++ b/src/blackmisc/statusmessage.cpp
@@ -17,6 +17,8 @@
 #include <QStringBuilder>
 #include <QThreadStorage>
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc, CStatusMessage)
+
 namespace BlackMisc
 {
     namespace Private
diff --git a/src/blackmisc/statusmessage.h b/src/blackmisc/statusmessage.h
index 5548a9e85..01c035195 100644
--- a/src/blackmisc/statusmessage.h
+++ b/src/blackmisc/statusmessage.h
@@ -23,6 +23,8 @@
 
 #include <QReadWriteLock>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc, CStatusMessage)
+
 namespace BlackMisc
 {
     namespace Private
diff --git a/src/blackmisc/valueobject.h b/src/blackmisc/valueobject.h
index 69d193ce4..8cab6df82 100644
--- a/src/blackmisc/valueobject.h
+++ b/src/blackmisc/valueobject.h
@@ -35,6 +35,48 @@
 #include <type_traits>
 #include <iostream>
 
+//! \cond
+#define BLACK_TEMPLATE_VALUEOBJECT_MIXINS(Namespace, Class, Extern)     \
+    namespace Namespace { class Class; }                                \
+    namespace BlackMisc::Private                                        \
+    {                                                                   \
+        Extern template struct CValueObjectMetaInfo<Namespace::Class>;  \
+        Extern template struct MetaTypeHelper<Namespace::Class>;        \
+    }                                                                   \
+    namespace BlackMisc::Mixin                                          \
+    {                                                                   \
+        Extern template class MetaType<Namespace::Class>;               \
+        Extern template class HashByMetaClass<Namespace::Class>;        \
+        Extern template class DBusByMetaClass<Namespace::Class>;        \
+        Extern template class DataStreamByMetaClass<Namespace::Class>;  \
+        Extern template class JsonByMetaClass<Namespace::Class>;        \
+        Extern template class EqualsByMetaClass<Namespace::Class>;      \
+        Extern template class LessThanByMetaClass<Namespace::Class>;    \
+        Extern template class CompareByMetaClass<Namespace::Class>;     \
+        Extern template class String<Namespace::Class>;                 \
+        Extern template class Index<Namespace::Class>;                  \
+        Extern template class Icon<Namespace::Class>;                   \
+    }
+//! \endcond
+
+/*!
+ * \def BLACK_DECLARE_VALUEOBJECT_MIXINS
+ * Explicit template declaration of mixins for a CValueObject subclass
+ * to be placed near the top of the header that defines the class
+ */
+
+/*!
+ * \def BLACK_DEFINE_VALUEOBJECT_MIXINS
+ * Explicit template definition of mixins for a CValueObject subclass
+ */
+#if defined(Q_OS_WIN) && defined(Q_CC_GNU)
+#  define BLACK_DECLARE_VALUEOBJECT_MIXINS(Namespace, Class)
+#  define BLACK_DEFINE_VALUEOBJECT_MIXINS(Namespace, Class)
+#else
+#  define BLACK_DECLARE_VALUEOBJECT_MIXINS(Namespace, Class) BLACK_TEMPLATE_VALUEOBJECT_MIXINS(Namespace, Class, extern)
+#  define BLACK_DEFINE_VALUEOBJECT_MIXINS(Namespace, Class)  BLACK_TEMPLATE_VALUEOBJECT_MIXINS(Namespace, Class, )
+#endif
+
 namespace BlackMisc
 {
     /*!
diff --git a/src/blackmisc/weather/cloudlayer.cpp b/src/blackmisc/weather/cloudlayer.cpp
index f2313eb1d..4293122a6 100644
--- a/src/blackmisc/weather/cloudlayer.cpp
+++ b/src/blackmisc/weather/cloudlayer.cpp
@@ -13,6 +13,8 @@
 
 using namespace BlackMisc::Aviation;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Weather, CCloudLayer)
+
 namespace BlackMisc::Weather
 {
 
diff --git a/src/blackmisc/weather/cloudlayer.h b/src/blackmisc/weather/cloudlayer.h
index f654b0ec0..ca01dd414 100644
--- a/src/blackmisc/weather/cloudlayer.h
+++ b/src/blackmisc/weather/cloudlayer.h
@@ -20,6 +20,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Weather, CCloudLayer)
+
 namespace BlackMisc::Weather
 {
     /*!
diff --git a/src/blackmisc/weather/gridpoint.cpp b/src/blackmisc/weather/gridpoint.cpp
index 20ab4399f..1fa8d4442 100644
--- a/src/blackmisc/weather/gridpoint.cpp
+++ b/src/blackmisc/weather/gridpoint.cpp
@@ -15,6 +15,8 @@ using namespace BlackMisc::Aviation;
 using namespace BlackMisc::Geo;
 using namespace BlackMisc::PhysicalQuantities;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Weather, CGridPoint)
+
 namespace BlackMisc::Weather
 {
     CGridPoint::CGridPoint(const QString &identifier,
diff --git a/src/blackmisc/weather/gridpoint.h b/src/blackmisc/weather/gridpoint.h
index edfc4eac3..dc9d4df09 100644
--- a/src/blackmisc/weather/gridpoint.h
+++ b/src/blackmisc/weather/gridpoint.h
@@ -27,6 +27,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Weather, CGridPoint)
+
 namespace BlackMisc::Weather
 {
     /*!
diff --git a/src/blackmisc/weather/metar.cpp b/src/blackmisc/weather/metar.cpp
index d5cae6ba8..fd9b8f461 100644
--- a/src/blackmisc/weather/metar.cpp
+++ b/src/blackmisc/weather/metar.cpp
@@ -17,6 +17,8 @@
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Aviation;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Weather, CMetar)
+
 namespace BlackMisc::Weather
 {
     CMetar::CMetar()
diff --git a/src/blackmisc/weather/metar.h b/src/blackmisc/weather/metar.h
index dca136e23..0e7cd053a 100644
--- a/src/blackmisc/weather/metar.h
+++ b/src/blackmisc/weather/metar.h
@@ -26,6 +26,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Weather, CMetar)
+
 namespace BlackMisc::Weather
 {
     class CCloudLayer;
diff --git a/src/blackmisc/weather/presentweather.cpp b/src/blackmisc/weather/presentweather.cpp
index a9abb2636..75d3b4690 100644
--- a/src/blackmisc/weather/presentweather.cpp
+++ b/src/blackmisc/weather/presentweather.cpp
@@ -9,6 +9,8 @@
 #include "blackmisc/weather/presentweather.h"
 #include "blackmisc/propertyindexref.h"
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Weather, CPresentWeather)
+
 namespace BlackMisc::Weather
 {
 
diff --git a/src/blackmisc/weather/presentweather.h b/src/blackmisc/weather/presentweather.h
index 1bfcd3bc9..1be6541d1 100644
--- a/src/blackmisc/weather/presentweather.h
+++ b/src/blackmisc/weather/presentweather.h
@@ -22,6 +22,8 @@
 #include <QString>
 #include <tuple>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Weather, CPresentWeather)
+
 namespace BlackMisc::Weather
 {
     /*!
diff --git a/src/blackmisc/weather/temperaturelayer.cpp b/src/blackmisc/weather/temperaturelayer.cpp
index 1c0bac4c2..70a09f801 100644
--- a/src/blackmisc/weather/temperaturelayer.cpp
+++ b/src/blackmisc/weather/temperaturelayer.cpp
@@ -12,6 +12,8 @@
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::PhysicalQuantities;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Weather, CTemperatureLayer)
+
 namespace BlackMisc::Weather
 {
 
diff --git a/src/blackmisc/weather/temperaturelayer.h b/src/blackmisc/weather/temperaturelayer.h
index 30af43dd4..89349619b 100644
--- a/src/blackmisc/weather/temperaturelayer.h
+++ b/src/blackmisc/weather/temperaturelayer.h
@@ -22,6 +22,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Weather, CTemperatureLayer)
+
 namespace BlackMisc::Weather
 {
     /*!
diff --git a/src/blackmisc/weather/visibilitylayer.cpp b/src/blackmisc/weather/visibilitylayer.cpp
index 4ef273df3..96a72f86c 100644
--- a/src/blackmisc/weather/visibilitylayer.cpp
+++ b/src/blackmisc/weather/visibilitylayer.cpp
@@ -12,6 +12,8 @@
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Aviation;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Weather, CVisibilityLayer)
+
 namespace BlackMisc::Weather
 {
 
diff --git a/src/blackmisc/weather/visibilitylayer.h b/src/blackmisc/weather/visibilitylayer.h
index 2c30e2d07..6330b4848 100644
--- a/src/blackmisc/weather/visibilitylayer.h
+++ b/src/blackmisc/weather/visibilitylayer.h
@@ -22,6 +22,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Weather, CVisibilityLayer)
+
 namespace BlackMisc::Weather
 {
     /*!
diff --git a/src/blackmisc/weather/weatherdataplugininfo.cpp b/src/blackmisc/weather/weatherdataplugininfo.cpp
index c77b167b0..bf69ec870 100644
--- a/src/blackmisc/weather/weatherdataplugininfo.cpp
+++ b/src/blackmisc/weather/weatherdataplugininfo.cpp
@@ -13,6 +13,8 @@
 
 using namespace BlackMisc;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Weather, CWeatherDataPluginInfo)
+
 namespace BlackMisc::Weather
 {
     CWeatherDataPluginInfo::CWeatherDataPluginInfo(const QString &identifier, const QString &name, const QString &description, bool valid) :
diff --git a/src/blackmisc/weather/weatherdataplugininfo.h b/src/blackmisc/weather/weatherdataplugininfo.h
index 5d553a973..0b048d0bf 100644
--- a/src/blackmisc/weather/weatherdataplugininfo.h
+++ b/src/blackmisc/weather/weatherdataplugininfo.h
@@ -19,6 +19,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Weather, CWeatherDataPluginInfo)
+
 namespace BlackMisc::Weather
 {
     //! Describing a weather data plugin
diff --git a/src/blackmisc/weather/weatherscenario.cpp b/src/blackmisc/weather/weatherscenario.cpp
index ba353bbc6..05a119ea0 100644
--- a/src/blackmisc/weather/weatherscenario.cpp
+++ b/src/blackmisc/weather/weatherscenario.cpp
@@ -8,6 +8,8 @@
 
 #include "blackmisc/weather/weatherscenario.h"
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Weather, CWeatherScenario)
+
 namespace BlackMisc::Weather
 {
     void CWeatherScenario::registerMetadata()
diff --git a/src/blackmisc/weather/weatherscenario.h b/src/blackmisc/weather/weatherscenario.h
index 590a1f46a..014d78ca0 100644
--- a/src/blackmisc/weather/weatherscenario.h
+++ b/src/blackmisc/weather/weatherscenario.h
@@ -17,6 +17,8 @@
 #include <QMetaType>
 #include <QVector>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Weather, CWeatherScenario)
+
 namespace BlackMisc::Weather
 {
     /*!
diff --git a/src/blackmisc/weather/windlayer.cpp b/src/blackmisc/weather/windlayer.cpp
index e86a0ed39..93cd8a6db 100644
--- a/src/blackmisc/weather/windlayer.cpp
+++ b/src/blackmisc/weather/windlayer.cpp
@@ -13,6 +13,8 @@
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Aviation;
 
+BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Weather, CWindLayer)
+
 namespace BlackMisc::Weather
 {
 
diff --git a/src/blackmisc/weather/windlayer.h b/src/blackmisc/weather/windlayer.h
index d4e240d08..8279312ae 100644
--- a/src/blackmisc/weather/windlayer.h
+++ b/src/blackmisc/weather/windlayer.h
@@ -22,6 +22,8 @@
 #include <QMetaType>
 #include <QString>
 
+BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Weather, CWindLayer)
+
 namespace BlackMisc::Weather
 {
     /*!