diff --git a/src/blackmisc/audio/audiodeviceinfolist.h b/src/blackmisc/audio/audiodeviceinfolist.h
index 40ab7fec4..4659b2b1f 100644
--- a/src/blackmisc/audio/audiodeviceinfolist.h
+++ b/src/blackmisc/audio/audiodeviceinfolist.h
@@ -15,7 +15,6 @@
 #include "blackmisc/identifier.h"
 #include "blackmisc/collection.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/blackmiscexport.h"
 
 #include <QMetaType>
diff --git a/src/blackmisc/audio/audiosettings.h b/src/blackmisc/audio/audiosettings.h
index 8d42a2995..60ca8c16c 100644
--- a/src/blackmisc/audio/audiosettings.h
+++ b/src/blackmisc/audio/audiosettings.h
@@ -17,7 +17,6 @@
 #include "blackmisc/metaclass.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QString>
diff --git a/src/blackmisc/audio/registermetadataaudio.cpp b/src/blackmisc/audio/registermetadataaudio.cpp
index 10dc84210..6eb49df90 100644
--- a/src/blackmisc/audio/registermetadataaudio.cpp
+++ b/src/blackmisc/audio/registermetadataaudio.cpp
@@ -9,6 +9,7 @@
 #include "registermetadataaudio.h"
 #include "audio.h"
 #include "ptt.h"
+#include "blackmisc/variant.h"
 #include <QDBusMetaType>
 
 namespace BlackMisc
diff --git a/src/blackmisc/aviation/aircraftcategory.cpp b/src/blackmisc/aviation/aircraftcategory.cpp
index d002108f8..dae48aa7d 100644
--- a/src/blackmisc/aviation/aircraftcategory.cpp
+++ b/src/blackmisc/aviation/aircraftcategory.cpp
@@ -12,7 +12,6 @@
 #include "blackmisc/logcategories.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessage.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/stringutils.h"
 
 #include <QChar>
diff --git a/src/blackmisc/aviation/aircraftcategory.h b/src/blackmisc/aviation/aircraftcategory.h
index c79692536..3f662845f 100644
--- a/src/blackmisc/aviation/aircraftcategory.h
+++ b/src/blackmisc/aviation/aircraftcategory.h
@@ -16,7 +16,6 @@
 #include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/blackmiscexport.h"
 
 #include <QJsonObject>
diff --git a/src/blackmisc/aviation/aircraftcategorylist.h b/src/blackmisc/aviation/aircraftcategorylist.h
index c5c7465dd..4a8005315 100644
--- a/src/blackmisc/aviation/aircraftcategorylist.h
+++ b/src/blackmisc/aviation/aircraftcategorylist.h
@@ -15,7 +15,6 @@
 #include "blackmisc/db/datastoreobjectlist.h"
 #include "blackmisc/collection.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/blackmiscexport.h"
 
 #include <QJsonArray>
diff --git a/src/blackmisc/aviation/aircraftenginelist.h b/src/blackmisc/aviation/aircraftenginelist.h
index 51d88ff3b..713013977 100644
--- a/src/blackmisc/aviation/aircraftenginelist.h
+++ b/src/blackmisc/aviation/aircraftenginelist.h
@@ -17,7 +17,6 @@
 #include "blackmisc/collection.h"
 #include "blackmisc/json.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 
 #include <QJsonObject>
 #include <QMetaType>
diff --git a/src/blackmisc/aviation/aircrafticaocode.cpp b/src/blackmisc/aviation/aircrafticaocode.cpp
index f845c0dab..f9933d7c1 100644
--- a/src/blackmisc/aviation/aircrafticaocode.cpp
+++ b/src/blackmisc/aviation/aircrafticaocode.cpp
@@ -14,7 +14,6 @@
 #include "blackmisc/logcategories.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessage.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/stringutils.h"
 
 #include <QChar>
diff --git a/src/blackmisc/aviation/aircrafticaocode.h b/src/blackmisc/aviation/aircrafticaocode.h
index 8ca2712bf..9e7197dd9 100644
--- a/src/blackmisc/aviation/aircrafticaocode.h
+++ b/src/blackmisc/aviation/aircrafticaocode.h
@@ -19,7 +19,6 @@
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessagelist.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QJsonObject>
 #include <QMetaType>
diff --git a/src/blackmisc/aviation/aircrafticaocodelist.h b/src/blackmisc/aviation/aircrafticaocodelist.h
index 9f7c026b9..27e4b8835 100644
--- a/src/blackmisc/aviation/aircrafticaocodelist.h
+++ b/src/blackmisc/aviation/aircrafticaocodelist.h
@@ -16,7 +16,6 @@
 #include "blackmisc/collection.h"
 #include "blackmisc/db/datastoreobjectlist.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 
 #include <QJsonArray>
 #include <QMetaType>
diff --git a/src/blackmisc/aviation/aircraftlights.cpp b/src/blackmisc/aviation/aircraftlights.cpp
index 29746fcb9..7a3e6e468 100644
--- a/src/blackmisc/aviation/aircraftlights.cpp
+++ b/src/blackmisc/aviation/aircraftlights.cpp
@@ -10,7 +10,6 @@
 #include "blackmisc/aviation/aircraftsituation.h"
 #include "blackmisc/stringutils.h"
 #include "blackmisc/comparefunctions.h"
-#include "blackmisc/variant.h"
 #include <QStringBuilder>
 
 using namespace BlackMisc::PhysicalQuantities;
diff --git a/src/blackmisc/aviation/aircraftlights.h b/src/blackmisc/aviation/aircraftlights.h
index c659ded97..bf1b41aa6 100644
--- a/src/blackmisc/aviation/aircraftlights.h
+++ b/src/blackmisc/aviation/aircraftlights.h
@@ -15,7 +15,6 @@
 #include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QString>
diff --git a/src/blackmisc/aviation/aircraftparts.h b/src/blackmisc/aviation/aircraftparts.h
index 223845146..da0e565c5 100644
--- a/src/blackmisc/aviation/aircraftparts.h
+++ b/src/blackmisc/aviation/aircraftparts.h
@@ -18,7 +18,6 @@
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/timestampbased.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QString>
diff --git a/src/blackmisc/aviation/aircraftpartslist.h b/src/blackmisc/aviation/aircraftpartslist.h
index f94d564dd..5a8b994b3 100644
--- a/src/blackmisc/aviation/aircraftpartslist.h
+++ b/src/blackmisc/aviation/aircraftpartslist.h
@@ -17,7 +17,6 @@
 #include "blackmisc/sequence.h"
 #include "blackmisc/aviation/aircraftparts.h"
 #include "blackmisc/timestampobjectlist.h"
-#include "blackmisc/variant.h"
 #include <QHash>
 #include <QMetaType>
 
diff --git a/src/blackmisc/aviation/aircraftsituation.cpp b/src/blackmisc/aviation/aircraftsituation.cpp
index 9bd7e9a6d..3454b0658 100644
--- a/src/blackmisc/aviation/aircraftsituation.cpp
+++ b/src/blackmisc/aviation/aircraftsituation.cpp
@@ -15,7 +15,6 @@
 #include "blackmisc/pq/units.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/comparefunctions.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/verify.h"
 #include "blackmisc/stringutils.h"
 #include "blackconfig/buildconfig.h"
diff --git a/src/blackmisc/aviation/aircraftsituation.h b/src/blackmisc/aviation/aircraftsituation.h
index 9650566f4..d577e334f 100644
--- a/src/blackmisc/aviation/aircraftsituation.h
+++ b/src/blackmisc/aviation/aircraftsituation.h
@@ -27,7 +27,6 @@
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/timestampbased.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QString>
diff --git a/src/blackmisc/aviation/aircraftsituationchange.cpp b/src/blackmisc/aviation/aircraftsituationchange.cpp
index 049cdd136..508bf2dd4 100644
--- a/src/blackmisc/aviation/aircraftsituationchange.cpp
+++ b/src/blackmisc/aviation/aircraftsituationchange.cpp
@@ -15,7 +15,6 @@
 #include "blackmisc/math/mathutils.h"
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/propertyindexref.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/verify.h"
 #include "blackmisc/stringutils.h"
 #include "blackconfig/buildconfig.h"
diff --git a/src/blackmisc/aviation/aircraftsituationchange.h b/src/blackmisc/aviation/aircraftsituationchange.h
index 0f0ce8b17..5a5fbc83e 100644
--- a/src/blackmisc/aviation/aircraftsituationchange.h
+++ b/src/blackmisc/aviation/aircraftsituationchange.h
@@ -18,7 +18,6 @@
 #include "blackmisc/metaclass.h"
 #include "blackmisc/timestampbased.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/blackmiscexport.h"
 
diff --git a/src/blackmisc/aviation/aircraftsituationchangelist.h b/src/blackmisc/aviation/aircraftsituationchangelist.h
index 1221f4a40..4b30a90a7 100644
--- a/src/blackmisc/aviation/aircraftsituationchangelist.h
+++ b/src/blackmisc/aviation/aircraftsituationchangelist.h
@@ -16,7 +16,6 @@
 #include "blackmisc/sequence.h"
 #include "blackmisc/aviation/aircraftsituationchange.h"
 #include "blackmisc/timestampobjectlist.h"
-#include "blackmisc/variant.h"
 
 namespace BlackMisc
 {
diff --git a/src/blackmisc/aviation/aircraftsituationlist.h b/src/blackmisc/aviation/aircraftsituationlist.h
index b0c9ccaa6..96a51ff98 100644
--- a/src/blackmisc/aviation/aircraftsituationlist.h
+++ b/src/blackmisc/aviation/aircraftsituationlist.h
@@ -19,7 +19,6 @@
 #include "blackmisc/collection.h"
 #include "blackmisc/sequence.h"
 #include "blackmisc/timestampobjectlist.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QList>
diff --git a/src/blackmisc/aviation/airlineicaocode.cpp b/src/blackmisc/aviation/airlineicaocode.cpp
index 3920b87dc..8e74a6d6d 100644
--- a/src/blackmisc/aviation/airlineicaocode.cpp
+++ b/src/blackmisc/aviation/airlineicaocode.cpp
@@ -18,7 +18,6 @@
 #include "blackmisc/stringutils.h"
 #include "blackmisc/swiftdirectories.h"
 #include "blackmisc/directoryutils.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/verify.h"
 
 #include <QJsonValue>
diff --git a/src/blackmisc/aviation/airlineicaocode.h b/src/blackmisc/aviation/airlineicaocode.h
index 05f1a99b9..38421352b 100644
--- a/src/blackmisc/aviation/airlineicaocode.h
+++ b/src/blackmisc/aviation/airlineicaocode.h
@@ -18,7 +18,6 @@
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessagelist.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QJsonObject>
 #include <QMetaType>
diff --git a/src/blackmisc/aviation/airlineicaocodelist.h b/src/blackmisc/aviation/airlineicaocodelist.h
index fb657db3e..888c4b359 100644
--- a/src/blackmisc/aviation/airlineicaocodelist.h
+++ b/src/blackmisc/aviation/airlineicaocodelist.h
@@ -17,7 +17,6 @@
 #include "blackmisc/collection.h"
 #include "blackmisc/db/datastoreobjectlist.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 
 #include <QJsonArray>
 #include <QMetaType>
diff --git a/src/blackmisc/aviation/airport.cpp b/src/blackmisc/aviation/airport.cpp
index 2cde9451a..3713e1d6a 100644
--- a/src/blackmisc/aviation/airport.cpp
+++ b/src/blackmisc/aviation/airport.cpp
@@ -9,7 +9,6 @@
 #include "blackmisc/aviation/airport.h"
 #include "blackmisc/pq/angle.h"
 #include "blackmisc/propertyindexref.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/stringutils.h"
 
 #include <QCoreApplication>
diff --git a/src/blackmisc/aviation/airport.h b/src/blackmisc/aviation/airport.h
index c7ef81823..8dc96e7c1 100644
--- a/src/blackmisc/aviation/airport.h
+++ b/src/blackmisc/aviation/airport.h
@@ -22,7 +22,6 @@
 #include "blackmisc/country.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QString>
diff --git a/src/blackmisc/aviation/airportlist.h b/src/blackmisc/aviation/airportlist.h
index 85d35214d..1be54c322 100644
--- a/src/blackmisc/aviation/airportlist.h
+++ b/src/blackmisc/aviation/airportlist.h
@@ -18,7 +18,6 @@
 #include "blackmisc/db/datastoreobjectlist.h"
 #include "blackmisc/geo/geoobjectlist.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 
diff --git a/src/blackmisc/aviation/atcstation.cpp b/src/blackmisc/aviation/atcstation.cpp
index 86f3044d9..485cd3ddb 100644
--- a/src/blackmisc/aviation/atcstation.cpp
+++ b/src/blackmisc/aviation/atcstation.cpp
@@ -12,7 +12,6 @@
 #include "blackmisc/pq/physicalquantity.h"
 #include "blackmisc/pq/units.h"
 #include "blackmisc/propertyindexref.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/stringutils.h"
 
diff --git a/src/blackmisc/aviation/atcstation.h b/src/blackmisc/aviation/atcstation.h
index d50ffc382..b0d067d10 100644
--- a/src/blackmisc/aviation/atcstation.h
+++ b/src/blackmisc/aviation/atcstation.h
@@ -25,7 +25,6 @@
 #include "blackmisc/pq/time.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QDateTime>
 #include <QMetaType>
diff --git a/src/blackmisc/aviation/atcstationlist.h b/src/blackmisc/aviation/atcstationlist.h
index 10a18538d..09f980d28 100644
--- a/src/blackmisc/aviation/atcstationlist.h
+++ b/src/blackmisc/aviation/atcstationlist.h
@@ -20,7 +20,6 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/collection.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QHash>
diff --git a/src/blackmisc/aviation/callsign.h b/src/blackmisc/aviation/callsign.h
index 7320648b6..059289cec 100644
--- a/src/blackmisc/aviation/callsign.h
+++ b/src/blackmisc/aviation/callsign.h
@@ -15,7 +15,6 @@
 #include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 #include <QMetaType>
 #include <QString>
 #include <tuple>
diff --git a/src/blackmisc/aviation/callsignset.cpp b/src/blackmisc/aviation/callsignset.cpp
index 4cc271f3d..f01b0584c 100644
--- a/src/blackmisc/aviation/callsignset.cpp
+++ b/src/blackmisc/aviation/callsignset.cpp
@@ -9,7 +9,6 @@
 #include "blackmisc/aviation/callsignset.h"
 #include "blackmisc/containerbase.h"
 #include "blackmisc/dbus.h"
-#include "blackmisc/variant.h"
 
 #include <QDBusMetaType>
 #include <QJsonObject>
diff --git a/src/blackmisc/aviation/flightplanlist.h b/src/blackmisc/aviation/flightplanlist.h
index 3e4d6ad70..858c2472d 100644
--- a/src/blackmisc/aviation/flightplanlist.h
+++ b/src/blackmisc/aviation/flightplanlist.h
@@ -16,7 +16,6 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/collection.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 #include <QMetaType>
 
 namespace BlackMisc
diff --git a/src/blackmisc/aviation/livery.cpp b/src/blackmisc/aviation/livery.cpp
index ddfe3800d..b48fcdd11 100644
--- a/src/blackmisc/aviation/livery.cpp
+++ b/src/blackmisc/aviation/livery.cpp
@@ -15,7 +15,6 @@
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/stringutils.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/verify.h"
 
 #include <QCoreApplication>
diff --git a/src/blackmisc/aviation/livery.h b/src/blackmisc/aviation/livery.h
index 4f39829de..b1445e1ae 100644
--- a/src/blackmisc/aviation/livery.h
+++ b/src/blackmisc/aviation/livery.h
@@ -19,7 +19,6 @@
 #include "blackmisc/rgbcolor.h"
 #include "blackmisc/statusmessagelist.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QMap>
 #include <QJsonObject>
diff --git a/src/blackmisc/aviation/liverylist.h b/src/blackmisc/aviation/liverylist.h
index b38194a17..d854651ab 100644
--- a/src/blackmisc/aviation/liverylist.h
+++ b/src/blackmisc/aviation/liverylist.h
@@ -17,7 +17,6 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/collection.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QString>
diff --git a/src/blackmisc/aviation/modulator.cpp b/src/blackmisc/aviation/modulator.cpp
index 2663ecf71..147ba9f20 100644
--- a/src/blackmisc/aviation/modulator.cpp
+++ b/src/blackmisc/aviation/modulator.cpp
@@ -13,7 +13,6 @@
 #include "blackmisc/math/mathutils.h"
 #include "blackmisc/pq/units.h"
 #include "blackmisc/propertyindexref.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/comparefunctions.h"
 #include <QtGlobal>
 #include <type_traits>
diff --git a/src/blackmisc/aviation/registermetadataaviation.cpp b/src/blackmisc/aviation/registermetadataaviation.cpp
index 935a73a06..0345f35c2 100644
--- a/src/blackmisc/aviation/registermetadataaviation.cpp
+++ b/src/blackmisc/aviation/registermetadataaviation.cpp
@@ -8,6 +8,7 @@
 
 #include "registermetadataaviation.h"
 #include "aviation.h"
+#include "blackmisc/variant.h"
 
 namespace BlackMisc
 {
diff --git a/src/blackmisc/aviation/transponder.cpp b/src/blackmisc/aviation/transponder.cpp
index 3be42e938..b4d0a82c0 100644
--- a/src/blackmisc/aviation/transponder.cpp
+++ b/src/blackmisc/aviation/transponder.cpp
@@ -8,7 +8,6 @@
 
 #include "blackmisc/aviation/transponder.h"
 #include "blackmisc/propertyindexref.h"
-#include "blackmisc/variant.h"
 
 #include <QRegularExpression>
 #include <Qt>
diff --git a/src/blackmisc/aviation/transponder.h b/src/blackmisc/aviation/transponder.h
index 239e80123..6a1f18191 100644
--- a/src/blackmisc/aviation/transponder.h
+++ b/src/blackmisc/aviation/transponder.h
@@ -16,7 +16,6 @@
 #include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QHash>
 #include <QMetaType>
diff --git a/src/blackmisc/country.h b/src/blackmisc/country.h
index 17d3128ad..42e848407 100644
--- a/src/blackmisc/country.h
+++ b/src/blackmisc/country.h
@@ -15,7 +15,6 @@
 #include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/blackmiscexport.h"
 
 #include <QJsonObject>
diff --git a/src/blackmisc/countrylist.h b/src/blackmisc/countrylist.h
index c39551e13..934ff8f4d 100644
--- a/src/blackmisc/countrylist.h
+++ b/src/blackmisc/countrylist.h
@@ -16,7 +16,6 @@
 #include "blackmisc/collection.h"
 #include "blackmisc/country.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 
 #include <QJsonArray>
 #include <QMetaType>
diff --git a/src/blackmisc/datacache.h b/src/blackmisc/datacache.h
index 094326861..261568822 100644
--- a/src/blackmisc/datacache.h
+++ b/src/blackmisc/datacache.h
@@ -19,7 +19,6 @@
 #include "blackmisc/logcategories.h"
 #include "blackmisc/valuecache.h"
 #include "blackmisc/valuecacheprivate.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/variantmap.h"
 #include "blackmisc/worker.h"
 
diff --git a/src/blackmisc/db/artifactlist.h b/src/blackmisc/db/artifactlist.h
index 669454cfc..da97a81d6 100644
--- a/src/blackmisc/db/artifactlist.h
+++ b/src/blackmisc/db/artifactlist.h
@@ -19,7 +19,6 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/collection.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 #include <QSet>
 #include <QString>
 
diff --git a/src/blackmisc/db/datastore.h b/src/blackmisc/db/datastore.h
index 962ce5693..2d11f86bf 100644
--- a/src/blackmisc/db/datastore.h
+++ b/src/blackmisc/db/datastore.h
@@ -12,7 +12,6 @@
 #define BLACKMISC_DB_DATASTORE_H
 
 #include "blackmisc/timestampbased.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/blackmiscexport.h"
 #include "blackconfig/buildconfig.h"
diff --git a/src/blackmisc/db/datastoreobjectlist.cpp b/src/blackmisc/db/datastoreobjectlist.cpp
index 7cdb0f002..b52ef4689 100644
--- a/src/blackmisc/db/datastoreobjectlist.cpp
+++ b/src/blackmisc/db/datastoreobjectlist.cpp
@@ -20,7 +20,6 @@
 #include "blackmisc/predicates.h"
 #include "blackmisc/countrylist.h"
 #include "blackmisc/json.h"
-#include "blackmisc/variantprivate.h"
 
 #include <QJsonObject>
 #include <QJsonValue>
diff --git a/src/blackmisc/db/distribution.h b/src/blackmisc/db/distribution.h
index 4cb1ac63b..ff5bd68d9 100644
--- a/src/blackmisc/db/distribution.h
+++ b/src/blackmisc/db/distribution.h
@@ -18,7 +18,6 @@
 #include "blackmisc/settingscache.h"
 #include "blackmisc/dictionary.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QVersionNumber>
diff --git a/src/blackmisc/db/distributionlist.h b/src/blackmisc/db/distributionlist.h
index 7c0fc12e2..d11aba433 100644
--- a/src/blackmisc/db/distributionlist.h
+++ b/src/blackmisc/db/distributionlist.h
@@ -17,7 +17,6 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/collection.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 #include <QSet>
 #include <QString>
 
diff --git a/src/blackmisc/db/registermetadatadb.cpp b/src/blackmisc/db/registermetadatadb.cpp
index fa73c98af..61ae23260 100644
--- a/src/blackmisc/db/registermetadatadb.cpp
+++ b/src/blackmisc/db/registermetadatadb.cpp
@@ -8,6 +8,7 @@
 
 #include "registermetadatadb.h"
 #include "db.h"
+#include "blackmisc/variant.h"
 
 namespace BlackMisc
 {
diff --git a/src/blackmisc/geo/coordinategeodetic.cpp b/src/blackmisc/geo/coordinategeodetic.cpp
index 260edcb43..fab73c749 100644
--- a/src/blackmisc/geo/coordinategeodetic.cpp
+++ b/src/blackmisc/geo/coordinategeodetic.cpp
@@ -9,7 +9,6 @@
 #include "blackmisc/geo/coordinategeodetic.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/propertyindexref.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/verify.h"
 
 #include <QByteArray>
diff --git a/src/blackmisc/geo/coordinategeodeticlist.h b/src/blackmisc/geo/coordinategeodeticlist.h
index 0d195604f..ed74b377e 100644
--- a/src/blackmisc/geo/coordinategeodeticlist.h
+++ b/src/blackmisc/geo/coordinategeodeticlist.h
@@ -19,7 +19,6 @@
 #include "blackmisc/collection.h"
 #include "blackmisc/json.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 
 #include <QJsonObject>
 #include <QMetaType>
diff --git a/src/blackmisc/geo/registermetadatageo.cpp b/src/blackmisc/geo/registermetadatageo.cpp
index 9bf3ba208..38b7201b6 100644
--- a/src/blackmisc/geo/registermetadatageo.cpp
+++ b/src/blackmisc/geo/registermetadatageo.cpp
@@ -8,6 +8,7 @@
 
 #include "registermetadatageo.h"
 #include "geo.h"
+#include "blackmisc/variant.h"
 
 namespace BlackMisc
 {
diff --git a/src/blackmisc/iconlist.cpp b/src/blackmisc/iconlist.cpp
index 10896a1e1..6b1020a36 100644
--- a/src/blackmisc/iconlist.cpp
+++ b/src/blackmisc/iconlist.cpp
@@ -10,7 +10,6 @@
 #include "blackmisc/containerbase.h"
 #include "blackmisc/dbus.h"
 #include "blackmisc/range.h"
-#include "blackmisc/variant.h"
 #include <QDBusMetaType>
 
 namespace BlackMisc
diff --git a/src/blackmisc/iconlist.h b/src/blackmisc/iconlist.h
index 1162ff352..91aac2487 100644
--- a/src/blackmisc/iconlist.h
+++ b/src/blackmisc/iconlist.h
@@ -17,7 +17,6 @@
 #include "blackmisc/icon.h"
 #include "blackmisc/icons.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h" // removing this line causes a clang undefined symbol error
 
 #include <QJsonObject>
 #include <QMetaType>
diff --git a/src/blackmisc/identifierlist.h b/src/blackmisc/identifierlist.h
index 1e54fdb40..5b5727fb9 100644
--- a/src/blackmisc/identifierlist.h
+++ b/src/blackmisc/identifierlist.h
@@ -14,7 +14,6 @@
 #include "blackmisc/identifier.h"
 #include "blackmisc/sequence.h"
 #include "blackmisc/timestampobjectlist.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/blackmiscexport.h"
 #include <QMetaType>
 
diff --git a/src/blackmisc/identifierset.h b/src/blackmisc/identifierset.h
index 57b68992b..1af2cd247 100644
--- a/src/blackmisc/identifierset.h
+++ b/src/blackmisc/identifierset.h
@@ -13,7 +13,6 @@
 
 #include "blackmisc/identifier.h"
 #include "blackmisc/collection.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/blackmiscexport.h"
 #include <QMetaType>
 
diff --git a/src/blackmisc/input/actionhotkey.h b/src/blackmisc/input/actionhotkey.h
index 7652ca86f..896a9277c 100644
--- a/src/blackmisc/input/actionhotkey.h
+++ b/src/blackmisc/input/actionhotkey.h
@@ -15,7 +15,6 @@
 #include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/identifier.h"
 #include "blackmisc/blackmiscexport.h"
 
diff --git a/src/blackmisc/input/actionhotkeylist.h b/src/blackmisc/input/actionhotkeylist.h
index 0942ef49a..2780717f6 100644
--- a/src/blackmisc/input/actionhotkeylist.h
+++ b/src/blackmisc/input/actionhotkeylist.h
@@ -15,7 +15,6 @@
 #include "blackmisc/collection.h"
 #include "blackmisc/input/actionhotkey.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QString>
diff --git a/src/blackmisc/input/joystickbutton.cpp b/src/blackmisc/input/joystickbutton.cpp
index 2d44888f0..e8ebcff0f 100644
--- a/src/blackmisc/input/joystickbutton.cpp
+++ b/src/blackmisc/input/joystickbutton.cpp
@@ -7,7 +7,6 @@
  */
 
 #include "blackmisc/input/joystickbutton.h"
-#include "blackmisc/variant.h"
 
 namespace BlackMisc
 {
diff --git a/src/blackmisc/input/joystickbutton.h b/src/blackmisc/input/joystickbutton.h
index e2d58577b..282c2557b 100644
--- a/src/blackmisc/input/joystickbutton.h
+++ b/src/blackmisc/input/joystickbutton.h
@@ -15,7 +15,6 @@
 #include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QString>
diff --git a/src/blackmisc/input/joystickbuttonlist.h b/src/blackmisc/input/joystickbuttonlist.h
index 36c41ca87..8e3cc8f53 100644
--- a/src/blackmisc/input/joystickbuttonlist.h
+++ b/src/blackmisc/input/joystickbuttonlist.h
@@ -15,7 +15,6 @@
 #include "blackmisc/collection.h"
 #include "blackmisc/input/joystickbutton.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <initializer_list>
diff --git a/src/blackmisc/input/keyboardkey.cpp b/src/blackmisc/input/keyboardkey.cpp
index b3d1baff0..ee843479d 100644
--- a/src/blackmisc/input/keyboardkey.cpp
+++ b/src/blackmisc/input/keyboardkey.cpp
@@ -14,7 +14,6 @@
 #include <QtGlobal>
 
 #include "blackmisc/propertyindexref.h"
-#include "blackmisc/variant.h"
 
 namespace BlackMisc
 {
diff --git a/src/blackmisc/input/keyboardkey.h b/src/blackmisc/input/keyboardkey.h
index 9d37adcc9..bfc5a142a 100644
--- a/src/blackmisc/input/keyboardkey.h
+++ b/src/blackmisc/input/keyboardkey.h
@@ -16,7 +16,6 @@
 #include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QList>
 #include <QMetaType>
diff --git a/src/blackmisc/input/keyboardkeylist.h b/src/blackmisc/input/keyboardkeylist.h
index 410371658..01209dafb 100644
--- a/src/blackmisc/input/keyboardkeylist.h
+++ b/src/blackmisc/input/keyboardkeylist.h
@@ -15,7 +15,6 @@
 #include "blackmisc/collection.h"
 #include "blackmisc/input/keyboardkey.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 
 #include <QStringList>
 #include <QMetaType>
diff --git a/src/blackmisc/input/registermetadatainput.cpp b/src/blackmisc/input/registermetadatainput.cpp
index 6367ff01c..e5355508c 100644
--- a/src/blackmisc/input/registermetadatainput.cpp
+++ b/src/blackmisc/input/registermetadatainput.cpp
@@ -8,6 +8,7 @@
 
 #include "registermetadatainput.h"
 #include "input.h"
+#include "blackmisc/variant.h"
 
 #include <QDBusMetaType>
 
diff --git a/src/blackmisc/logcategorylist.cpp b/src/blackmisc/logcategorylist.cpp
index fe7b07534..f10f380b9 100644
--- a/src/blackmisc/logcategorylist.cpp
+++ b/src/blackmisc/logcategorylist.cpp
@@ -11,7 +11,6 @@
 #include "blackmisc/dbus.h"
 #include "blackmisc/iterator.h"
 #include "blackmisc/range.h"
-#include "blackmisc/variant.h"
 
 #include <QDBusMetaType>
 #include <QList>
diff --git a/src/blackmisc/logpattern.h b/src/blackmisc/logpattern.h
index 81b1d53f3..8bfff6b41 100644
--- a/src/blackmisc/logpattern.h
+++ b/src/blackmisc/logpattern.h
@@ -22,6 +22,7 @@
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/mixin/mixinstring.h"
 #include "blackmisc/mixin/mixinmetatype.h"
+#include "blackmisc/variant.h"
 
 #include <QDBusArgument>
 #include <QMetaType>
diff --git a/src/blackmisc/mixin/mixinindex.h b/src/blackmisc/mixin/mixinindex.h
index 262dce9ae..8ae354c78 100644
--- a/src/blackmisc/mixin/mixinindex.h
+++ b/src/blackmisc/mixin/mixinindex.h
@@ -15,8 +15,6 @@
 #include "blackmisc/inheritancetraits.h"
 #include "blackmisc/predicates.h"
 #include "blackmisc/propertyindexref.h"
-#include "blackmisc/variant.h"
-
 #include <QDBusArgument>
 #include <QList>
 #include <QMap>
diff --git a/src/blackmisc/network/authenticateduser.cpp b/src/blackmisc/network/authenticateduser.cpp
index b5e627640..e334ab41d 100644
--- a/src/blackmisc/network/authenticateduser.cpp
+++ b/src/blackmisc/network/authenticateduser.cpp
@@ -11,7 +11,6 @@
 #include "blackmisc/logcategories.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessage.h"
-#include "blackmisc/variant.h"
 
 #include <QJsonArray>
 #include <QJsonValue>
diff --git a/src/blackmisc/network/authenticateduser.h b/src/blackmisc/network/authenticateduser.h
index e26b02837..a712dd3fa 100644
--- a/src/blackmisc/network/authenticateduser.h
+++ b/src/blackmisc/network/authenticateduser.h
@@ -19,7 +19,6 @@
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessagelist.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QJsonObject>
 #include <QMetaType>
diff --git a/src/blackmisc/network/client.h b/src/blackmisc/network/client.h
index dc8314e19..4a4930078 100644
--- a/src/blackmisc/network/client.h
+++ b/src/blackmisc/network/client.h
@@ -19,7 +19,6 @@
 #include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 #include <QMetaType>
 #include <QString>
 
diff --git a/src/blackmisc/network/clientlist.h b/src/blackmisc/network/clientlist.h
index fe2b011d6..1759c9686 100644
--- a/src/blackmisc/network/clientlist.h
+++ b/src/blackmisc/network/clientlist.h
@@ -15,7 +15,6 @@
 #include "blackmisc/collection.h"
 #include "blackmisc/network/client.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/blackmiscexport.h"
 #include <QMap>
 #include <QMetaType>
diff --git a/src/blackmisc/network/ecosystem.h b/src/blackmisc/network/ecosystem.h
index 48acc30fb..4ecda1488 100644
--- a/src/blackmisc/network/ecosystem.h
+++ b/src/blackmisc/network/ecosystem.h
@@ -13,7 +13,6 @@
 
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QString>
diff --git a/src/blackmisc/network/ecosystemlist.h b/src/blackmisc/network/ecosystemlist.h
index df4dcd435..060f68b42 100644
--- a/src/blackmisc/network/ecosystemlist.h
+++ b/src/blackmisc/network/ecosystemlist.h
@@ -15,7 +15,6 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/collection.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 #include <QStringList>
 #include <QMetaType>
 
diff --git a/src/blackmisc/network/fsdsetup.cpp b/src/blackmisc/network/fsdsetup.cpp
index 7cd27c875..ce6833d46 100644
--- a/src/blackmisc/network/fsdsetup.cpp
+++ b/src/blackmisc/network/fsdsetup.cpp
@@ -11,7 +11,6 @@
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/stringutils.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/verify.h"
 #include "blackmisc/comparefunctions.h"
 
diff --git a/src/blackmisc/network/rawfsdmessage.cpp b/src/blackmisc/network/rawfsdmessage.cpp
index faa42408c..b5aac5517 100644
--- a/src/blackmisc/network/rawfsdmessage.cpp
+++ b/src/blackmisc/network/rawfsdmessage.cpp
@@ -11,7 +11,6 @@
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/stringutils.h"
-#include "blackmisc/variant.h"
 
 #include <Qt>
 #include <QtGlobal>
diff --git a/src/blackmisc/network/rawfsdmessage.h b/src/blackmisc/network/rawfsdmessage.h
index 1b10e2781..5ecac284c 100644
--- a/src/blackmisc/network/rawfsdmessage.h
+++ b/src/blackmisc/network/rawfsdmessage.h
@@ -13,7 +13,6 @@
 
 #include "blackmisc/timestampbased.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/blackmiscexport.h"
diff --git a/src/blackmisc/network/rawfsdmessagelist.h b/src/blackmisc/network/rawfsdmessagelist.h
index fe20bb9f5..e15dd0472 100644
--- a/src/blackmisc/network/rawfsdmessagelist.h
+++ b/src/blackmisc/network/rawfsdmessagelist.h
@@ -15,7 +15,6 @@
 #include "blackmisc/timestampobjectlist.h"
 #include "blackmisc/collection.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/blackmiscexport.h"
 
 #include <QMetaType>
diff --git a/src/blackmisc/network/registermetadatanetwork.cpp b/src/blackmisc/network/registermetadatanetwork.cpp
index f9b4406d8..8b73c6e9b 100644
--- a/src/blackmisc/network/registermetadatanetwork.cpp
+++ b/src/blackmisc/network/registermetadatanetwork.cpp
@@ -8,6 +8,7 @@
 
 #include "registermetadatanetwork.h"
 #include "network.h"
+#include "blackmisc/variant.h"
 
 namespace BlackMisc
 {
diff --git a/src/blackmisc/network/remotefile.h b/src/blackmisc/network/remotefile.h
index 03699ea7e..f773735cc 100644
--- a/src/blackmisc/network/remotefile.h
+++ b/src/blackmisc/network/remotefile.h
@@ -17,7 +17,6 @@
 #include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QJsonObject>
 #include <QMetaType>
diff --git a/src/blackmisc/network/remotefilelist.h b/src/blackmisc/network/remotefilelist.h
index bb63c9c1e..0f2233fc0 100644
--- a/src/blackmisc/network/remotefilelist.h
+++ b/src/blackmisc/network/remotefilelist.h
@@ -15,7 +15,6 @@
 #include "blackmisc/collection.h"
 #include "blackmisc/network/remotefile.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 
 #include <QJsonArray>
 #include <QMetaType>
diff --git a/src/blackmisc/network/role.h b/src/blackmisc/network/role.h
index 80c3e0665..3e5d60e7f 100644
--- a/src/blackmisc/network/role.h
+++ b/src/blackmisc/network/role.h
@@ -16,7 +16,6 @@
 #include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QJsonObject>
 #include <QMetaType>
diff --git a/src/blackmisc/network/rolelist.h b/src/blackmisc/network/rolelist.h
index 4fcdc6f4b..c73ddf550 100644
--- a/src/blackmisc/network/rolelist.h
+++ b/src/blackmisc/network/rolelist.h
@@ -15,7 +15,6 @@
 #include "blackmisc/collection.h"
 #include "blackmisc/network/role.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 
 #include <QJsonArray>
 #include <QMetaType>
diff --git a/src/blackmisc/network/server.cpp b/src/blackmisc/network/server.cpp
index 54dd4e46c..e04706b30 100644
--- a/src/blackmisc/network/server.cpp
+++ b/src/blackmisc/network/server.cpp
@@ -13,7 +13,6 @@
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/obfuscation.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/verify.h"
 
 #include <Qt>
diff --git a/src/blackmisc/network/server.h b/src/blackmisc/network/server.h
index fa01cfc23..316be461c 100644
--- a/src/blackmisc/network/server.h
+++ b/src/blackmisc/network/server.h
@@ -22,7 +22,6 @@
 #include "blackmisc/statusmessagelist.h"
 #include "blackmisc/timestampbased.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QString>
diff --git a/src/blackmisc/network/serverlist.h b/src/blackmisc/network/serverlist.h
index c39ad9afd..c68a57720 100644
--- a/src/blackmisc/network/serverlist.h
+++ b/src/blackmisc/network/serverlist.h
@@ -15,7 +15,6 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/collection.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QString>
diff --git a/src/blackmisc/network/settings/networksettings.h b/src/blackmisc/network/settings/networksettings.h
index 0a73b416a..75052d913 100644
--- a/src/blackmisc/network/settings/networksettings.h
+++ b/src/blackmisc/network/settings/networksettings.h
@@ -14,7 +14,6 @@
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/metaclass.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/blackmiscexport.h"
 
 #include <QJsonObject>
diff --git a/src/blackmisc/network/textmessage.h b/src/blackmisc/network/textmessage.h
index f6b50c00a..9bc688975 100644
--- a/src/blackmisc/network/textmessage.h
+++ b/src/blackmisc/network/textmessage.h
@@ -20,7 +20,6 @@
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/timestampbased.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QPixmap>
diff --git a/src/blackmisc/network/textmessagelist.h b/src/blackmisc/network/textmessagelist.h
index 8ae5b8b71..7aa1f10d4 100644
--- a/src/blackmisc/network/textmessagelist.h
+++ b/src/blackmisc/network/textmessagelist.h
@@ -18,7 +18,6 @@
 #include "blackmisc/pq/frequency.h"
 #include "blackmisc/sequence.h"
 #include "blackmisc/timestampobjectlist.h"
-#include "blackmisc/variant.h"
 
 #include <QList>
 #include <QMetaType>
diff --git a/src/blackmisc/network/url.h b/src/blackmisc/network/url.h
index e19461b20..65c99b0a8 100644
--- a/src/blackmisc/network/url.h
+++ b/src/blackmisc/network/url.h
@@ -14,7 +14,6 @@
 #include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/blackmiscexport.h"
 
 #include <QJsonObject>
diff --git a/src/blackmisc/network/urllist.h b/src/blackmisc/network/urllist.h
index 74e24c8f2..5e283427e 100644
--- a/src/blackmisc/network/urllist.h
+++ b/src/blackmisc/network/urllist.h
@@ -15,7 +15,6 @@
 #include "blackmisc/collection.h"
 #include "blackmisc/network/url.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QString>
diff --git a/src/blackmisc/network/urlloglist.h b/src/blackmisc/network/urlloglist.h
index 00c2ddb99..5e2689207 100644
--- a/src/blackmisc/network/urlloglist.h
+++ b/src/blackmisc/network/urlloglist.h
@@ -16,7 +16,6 @@
 #include "blackmisc/timestampobjectlist.h"
 #include "blackmisc/collection.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 #include <QNetworkReply>
 
 namespace BlackMisc
diff --git a/src/blackmisc/network/user.cpp b/src/blackmisc/network/user.cpp
index 65e15bd4c..c8d893451 100644
--- a/src/blackmisc/network/user.cpp
+++ b/src/blackmisc/network/user.cpp
@@ -11,7 +11,6 @@
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/stringutils.h"
-#include "blackmisc/variant.h"
 
 #include <QChar>
 #include <QRegularExpression>
diff --git a/src/blackmisc/network/user.h b/src/blackmisc/network/user.h
index 39087d8ce..38f3e6272 100644
--- a/src/blackmisc/network/user.h
+++ b/src/blackmisc/network/user.h
@@ -18,7 +18,6 @@
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessagelist.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/blackmiscexport.h"
 
 #include <QMetaType>
diff --git a/src/blackmisc/network/userlist.h b/src/blackmisc/network/userlist.h
index 782d2051a..a382e7f0a 100644
--- a/src/blackmisc/network/userlist.h
+++ b/src/blackmisc/network/userlist.h
@@ -15,7 +15,6 @@
 #include "blackmisc/network/user.h"
 #include "blackmisc/collection.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/blackmiscexport.h"
 
 #include <QMetaType>
diff --git a/src/blackmisc/orderable.cpp b/src/blackmisc/orderable.cpp
index 024df1112..b636fc75c 100644
--- a/src/blackmisc/orderable.cpp
+++ b/src/blackmisc/orderable.cpp
@@ -8,7 +8,6 @@
 
 #include "blackmisc/orderable.h"
 #include "blackmisc/comparefunctions.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/verify.h"
 
 #include <QByteArray>
diff --git a/src/blackmisc/orderable.h b/src/blackmisc/orderable.h
index 7dcea4c57..a2cf86990 100644
--- a/src/blackmisc/orderable.h
+++ b/src/blackmisc/orderable.h
@@ -13,8 +13,8 @@
 
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/propertyindexref.h"
-#include "blackmisc/variant.h"
 
+#include <QVariant>
 #include <QString>
 
 namespace BlackMisc
diff --git a/src/blackmisc/platform.h b/src/blackmisc/platform.h
index 5b8b87050..d20b71bd8 100644
--- a/src/blackmisc/platform.h
+++ b/src/blackmisc/platform.h
@@ -15,7 +15,6 @@
 #include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaEnum>
 #include <QString>
diff --git a/src/blackmisc/platformset.cpp b/src/blackmisc/platformset.cpp
index 4509e273c..b38b13ba1 100644
--- a/src/blackmisc/platformset.cpp
+++ b/src/blackmisc/platformset.cpp
@@ -11,7 +11,6 @@
 #include "blackmisc/platformset.h"
 #include "blackmisc/containerbase.h"
 #include "blackmisc/dbus.h"
-#include "blackmisc/variant.h"
 
 #include <QDBusMetaType>
 #include <QJsonObject>
diff --git a/src/blackmisc/pq/physicalquantity.cpp b/src/blackmisc/pq/physicalquantity.cpp
index 5386f282b..67369dbd0 100644
--- a/src/blackmisc/pq/physicalquantity.cpp
+++ b/src/blackmisc/pq/physicalquantity.cpp
@@ -23,7 +23,6 @@
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/stringutils.h"
 #include "blackmisc/dictionary.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/verify.h"
 
 #include <QCoreApplication>
diff --git a/src/blackmisc/propertyindexlist.h b/src/blackmisc/propertyindexlist.h
index f8f53e3ac..71c5d4b1b 100644
--- a/src/blackmisc/propertyindexlist.h
+++ b/src/blackmisc/propertyindexlist.h
@@ -15,7 +15,6 @@
 #include "blackmisc/collection.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 
diff --git a/src/blackmisc/rgbcolor.h b/src/blackmisc/rgbcolor.h
index 68a9dd1ab..1935a7af4 100644
--- a/src/blackmisc/rgbcolor.h
+++ b/src/blackmisc/rgbcolor.h
@@ -15,7 +15,6 @@
 #include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QColor>
 #include <QMetaType>
diff --git a/src/blackmisc/sharedstate/dbus/duplex.h b/src/blackmisc/sharedstate/dbus/duplex.h
index 74a5cd21e..e439dc68e 100644
--- a/src/blackmisc/sharedstate/dbus/duplex.h
+++ b/src/blackmisc/sharedstate/dbus/duplex.h
@@ -14,6 +14,7 @@
 #include "blackmisc/genericdbusinterface.h"
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/promise.h"
+#include "blackmisc/variant.h"
 #include <QObject>
 #include <QFuture>
 #include <QMap>
@@ -26,7 +27,6 @@
 
 namespace BlackMisc
 {
-    class CVariant;
     class CVariantList;
 
     namespace SharedState
diff --git a/src/blackmisc/simulation/aircraftmodel.h b/src/blackmisc/simulation/aircraftmodel.h
index 6a1bb6180..5d83e2b09 100644
--- a/src/blackmisc/simulation/aircraftmodel.h
+++ b/src/blackmisc/simulation/aircraftmodel.h
@@ -22,7 +22,6 @@
 #include "blackmisc/db/datastore.h"
 #include "blackmisc/statusmessagelist.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/dictionary.h"
 #include "blackmisc/memotable.h"
 #include "blackmisc/metaclass.h"
diff --git a/src/blackmisc/simulation/aircraftmodellist.h b/src/blackmisc/simulation/aircraftmodellist.h
index 78caee5df..f123f7620 100644
--- a/src/blackmisc/simulation/aircraftmodellist.h
+++ b/src/blackmisc/simulation/aircraftmodellist.h
@@ -25,7 +25,6 @@
 #include "blackmisc/orderablelist.h"
 #include "blackmisc/sequence.h"
 #include "blackmisc/statusmessagelist.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/blackmiscexport.h"
 
 #include <QJsonArray>
diff --git a/src/blackmisc/simulation/airspaceaircraftsnapshot.h b/src/blackmisc/simulation/airspaceaircraftsnapshot.h
index 3ae8a43bb..1d4262622 100644
--- a/src/blackmisc/simulation/airspaceaircraftsnapshot.h
+++ b/src/blackmisc/simulation/airspaceaircraftsnapshot.h
@@ -19,7 +19,6 @@
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/simulation/simulatedaircraftlist.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QDateTime>
 #include <QMetaType>
diff --git a/src/blackmisc/simulation/distributor.h b/src/blackmisc/simulation/distributor.h
index 0a21a4b7b..9efc336aa 100644
--- a/src/blackmisc/simulation/distributor.h
+++ b/src/blackmisc/simulation/distributor.h
@@ -18,7 +18,6 @@
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessagelist.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/blackmiscexport.h"
 
 #include <QJsonObject>
diff --git a/src/blackmisc/simulation/distributorlist.h b/src/blackmisc/simulation/distributorlist.h
index 7481fbfbb..58a31e6d5 100644
--- a/src/blackmisc/simulation/distributorlist.h
+++ b/src/blackmisc/simulation/distributorlist.h
@@ -17,7 +17,6 @@
 #include "blackmisc/collection.h"
 #include "blackmisc/orderablelist.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QString>
diff --git a/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp b/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp
index 3b08e6d4a..f4e8a5e78 100644
--- a/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp
+++ b/src/blackmisc/simulation/fscommon/aircraftcfgentries.cpp
@@ -11,7 +11,6 @@
 #include "blackmisc/aviation/livery.h"
 #include "blackmisc/simulation/distributor.h"
 #include "blackmisc/simulation/fscommon/aircraftcfgentries.h"
-#include "blackmisc/variant.h"
 
 #include <QDir>
 #include <QFile>
diff --git a/src/blackmisc/simulation/fscommon/aircraftcfgentries.h b/src/blackmisc/simulation/fscommon/aircraftcfgentries.h
index be563bf25..e3a644c65 100644
--- a/src/blackmisc/simulation/fscommon/aircraftcfgentries.h
+++ b/src/blackmisc/simulation/fscommon/aircraftcfgentries.h
@@ -17,7 +17,6 @@
 #include "blackmisc/simulation/aircraftmodel.h"
 #include "blackmisc/timestampbased.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QString>
diff --git a/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.h b/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.h
index ef4bb974b..8bdcafdfa 100644
--- a/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.h
+++ b/src/blackmisc/simulation/fscommon/aircraftcfgentrieslist.h
@@ -17,7 +17,6 @@
 #include "blackmisc/simulation/aircraftmodellist.h"
 #include "blackmisc/simulation/fscommon/aircraftcfgentries.h"
 #include "blackmisc/simulation/simulatorinfo.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QString>
diff --git a/src/blackmisc/simulation/fscommon/vpilotmodelrule.h b/src/blackmisc/simulation/fscommon/vpilotmodelrule.h
index b66e4c34b..d8aedc727 100644
--- a/src/blackmisc/simulation/fscommon/vpilotmodelrule.h
+++ b/src/blackmisc/simulation/fscommon/vpilotmodelrule.h
@@ -17,7 +17,6 @@
 #include "blackmisc/simulation/aircraftmodel.h"
 #include "blackmisc/timestampbased.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QString>
diff --git a/src/blackmisc/simulation/fscommon/vpilotmodelruleset.h b/src/blackmisc/simulation/fscommon/vpilotmodelruleset.h
index 2fdfcb72d..0395fb94b 100644
--- a/src/blackmisc/simulation/fscommon/vpilotmodelruleset.h
+++ b/src/blackmisc/simulation/fscommon/vpilotmodelruleset.h
@@ -21,7 +21,6 @@
 #include "blackmisc/sequence.h"
 #include "blackmisc/simulation/aircraftmodellist.h"
 #include "blackmisc/simulation/fscommon/vpilotmodelrule.h"
-#include "blackmisc/variant.h"
 
 namespace BlackMisc
 {
diff --git a/src/blackmisc/simulation/interpolationsetuplist.h b/src/blackmisc/simulation/interpolationsetuplist.h
index 17530d9c8..1d5161461 100644
--- a/src/blackmisc/simulation/interpolationsetuplist.h
+++ b/src/blackmisc/simulation/interpolationsetuplist.h
@@ -16,7 +16,6 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/collection.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 
 namespace BlackMisc
 {
diff --git a/src/blackmisc/simulation/matchingstatisticsentry.h b/src/blackmisc/simulation/matchingstatisticsentry.h
index 8abb56bc5..97014d0f1 100644
--- a/src/blackmisc/simulation/matchingstatisticsentry.h
+++ b/src/blackmisc/simulation/matchingstatisticsentry.h
@@ -14,7 +14,6 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/valueobject.h"
 #include "blackmisc/timestampbased.h"
-#include "blackmisc/variant.h"
 
 namespace BlackMisc
 {
diff --git a/src/blackmisc/simulation/registermetadatasimulation.cpp b/src/blackmisc/simulation/registermetadatasimulation.cpp
index 744eb64a4..50af1f3b3 100644
--- a/src/blackmisc/simulation/registermetadatasimulation.cpp
+++ b/src/blackmisc/simulation/registermetadatasimulation.cpp
@@ -8,6 +8,7 @@
 
 #include "registermetadatasimulation.h"
 #include "simulation.h"
+#include "blackmisc/variant.h"
 
 using namespace BlackMisc::Simulation;
 using namespace BlackMisc::Simulation::Fsx;
diff --git a/src/blackmisc/simulation/simulatedaircraft.h b/src/blackmisc/simulation/simulatedaircraft.h
index b2c5bb992..811be51aa 100644
--- a/src/blackmisc/simulation/simulatedaircraft.h
+++ b/src/blackmisc/simulation/simulatedaircraft.h
@@ -32,7 +32,6 @@
 #include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QString>
diff --git a/src/blackmisc/simulation/simulatedaircraftlist.h b/src/blackmisc/simulation/simulatedaircraftlist.h
index b0840e47b..34714b6ff 100644
--- a/src/blackmisc/simulation/simulatedaircraftlist.h
+++ b/src/blackmisc/simulation/simulatedaircraftlist.h
@@ -19,7 +19,6 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/collection.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 #include <QMetaType>
 
 namespace BlackMisc
diff --git a/src/blackmisc/simulation/simulatorinfolist.h b/src/blackmisc/simulation/simulatorinfolist.h
index 4edc20ae2..87199f536 100644
--- a/src/blackmisc/simulation/simulatorinfolist.h
+++ b/src/blackmisc/simulation/simulatorinfolist.h
@@ -15,7 +15,6 @@
 #include "blackmisc/collection.h"
 #include "blackmisc/sequence.h"
 #include "blackmisc/simulation/simulatorinfo.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 
diff --git a/src/blackmisc/simulation/simulatorinternals.h b/src/blackmisc/simulation/simulatorinternals.h
index c8e39852d..896bdd009 100644
--- a/src/blackmisc/simulation/simulatorinternals.h
+++ b/src/blackmisc/simulation/simulatorinternals.h
@@ -18,7 +18,6 @@
 #include "blackmisc/namevariantpairlist.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QHash>
 #include <QMetaType>
diff --git a/src/blackmisc/simulation/simulatorplugininfolist.h b/src/blackmisc/simulation/simulatorplugininfolist.h
index 0ee8fe833..30b633ead 100644
--- a/src/blackmisc/simulation/simulatorplugininfolist.h
+++ b/src/blackmisc/simulation/simulatorplugininfolist.h
@@ -16,7 +16,6 @@
 #include "blackmisc/simulation/simulatorplugininfo.h"
 #include "blackmisc/collection.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QString>
diff --git a/src/blackmisc/simulation/xplane/navdatareference.h b/src/blackmisc/simulation/xplane/navdatareference.h
index 33f825170..e411f26cd 100644
--- a/src/blackmisc/simulation/xplane/navdatareference.h
+++ b/src/blackmisc/simulation/xplane/navdatareference.h
@@ -22,7 +22,6 @@
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/sequence.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QString>
diff --git a/src/blackmisc/statusmessagelist.h b/src/blackmisc/statusmessagelist.h
index 26941bf81..b6ff2f26a 100644
--- a/src/blackmisc/statusmessagelist.h
+++ b/src/blackmisc/statusmessagelist.h
@@ -18,7 +18,6 @@
 #include "blackmisc/sequence.h"
 #include "blackmisc/timestampobjectlist.h"
 #include "blackmisc/orderablelist.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/blackmiscexport.h"
 
 #include <QJsonArray>
diff --git a/src/blackmisc/timestampbased.cpp b/src/blackmisc/timestampbased.cpp
index 9642a5a73..eca126f5c 100644
--- a/src/blackmisc/timestampbased.cpp
+++ b/src/blackmisc/timestampbased.cpp
@@ -9,7 +9,6 @@
 #include "blackmisc/timestampbased.h"
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/stringutils.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/verify.h"
 
 #include <QByteArray>
diff --git a/src/blackmisc/timestampbased.h b/src/blackmisc/timestampbased.h
index 3ea258dbf..6870840a4 100644
--- a/src/blackmisc/timestampbased.h
+++ b/src/blackmisc/timestampbased.h
@@ -13,10 +13,10 @@
 
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/propertyindexref.h"
-#include "blackmisc/variant.h"
 
 #include <QDateTime>
 #include <QString>
+#include <QVariant>
 #include <QtGlobal>
 
 namespace BlackMisc
diff --git a/src/blackmisc/weather/cloudlayer.cpp b/src/blackmisc/weather/cloudlayer.cpp
index 30f2d1e9f..ff93e239d 100644
--- a/src/blackmisc/weather/cloudlayer.cpp
+++ b/src/blackmisc/weather/cloudlayer.cpp
@@ -8,7 +8,6 @@
 
 #include "blackmisc/weather/cloudlayer.h"
 #include "blackmisc/propertyindexref.h"
-#include "blackmisc/variant.h"
 
 #include <QHash>
 
diff --git a/src/blackmisc/weather/cloudlayer.h b/src/blackmisc/weather/cloudlayer.h
index 2c8c54976..d476501c5 100644
--- a/src/blackmisc/weather/cloudlayer.h
+++ b/src/blackmisc/weather/cloudlayer.h
@@ -16,7 +16,6 @@
 #include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QString>
diff --git a/src/blackmisc/weather/cloudlayerlist.h b/src/blackmisc/weather/cloudlayerlist.h
index a147f5d86..5f8a72967 100644
--- a/src/blackmisc/weather/cloudlayerlist.h
+++ b/src/blackmisc/weather/cloudlayerlist.h
@@ -13,7 +13,6 @@
 
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/weather/cloudlayer.h"
 
 #include <QMetaType>
diff --git a/src/blackmisc/weather/gridpoint.cpp b/src/blackmisc/weather/gridpoint.cpp
index 49140edc5..d3ec9149c 100644
--- a/src/blackmisc/weather/gridpoint.cpp
+++ b/src/blackmisc/weather/gridpoint.cpp
@@ -8,7 +8,6 @@
 
 #include "blackmisc/weather/gridpoint.h"
 #include "blackmisc/propertyindexref.h"
-#include "blackmisc/variant.h"
 
 #include <QtDebug>
 
diff --git a/src/blackmisc/weather/gridpoint.h b/src/blackmisc/weather/gridpoint.h
index 6098df99f..46adcae12 100644
--- a/src/blackmisc/weather/gridpoint.h
+++ b/src/blackmisc/weather/gridpoint.h
@@ -22,7 +22,6 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/metaclass.h"
 
 #include <QMetaType>
diff --git a/src/blackmisc/weather/metarlist.h b/src/blackmisc/weather/metarlist.h
index aeb9faa97..f1a9dcf57 100644
--- a/src/blackmisc/weather/metarlist.h
+++ b/src/blackmisc/weather/metarlist.h
@@ -16,7 +16,6 @@
 #include "blackmisc/collection.h"
 #include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/weather/metar.h"
 
 #include <QMetaType>
diff --git a/src/blackmisc/weather/presentweather.cpp b/src/blackmisc/weather/presentweather.cpp
index b00acbc94..5c0257181 100644
--- a/src/blackmisc/weather/presentweather.cpp
+++ b/src/blackmisc/weather/presentweather.cpp
@@ -8,7 +8,6 @@
 
 #include "blackmisc/weather/presentweather.h"
 #include "blackmisc/propertyindexref.h"
-#include "blackmisc/variant.h"
 
 namespace BlackMisc
 {
diff --git a/src/blackmisc/weather/presentweather.h b/src/blackmisc/weather/presentweather.h
index 1bd008f80..ff60b79e3 100644
--- a/src/blackmisc/weather/presentweather.h
+++ b/src/blackmisc/weather/presentweather.h
@@ -16,7 +16,6 @@
 #include "blackmisc/metaclass.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QHash>
 #include <QMetaType>
diff --git a/src/blackmisc/weather/presentweatherlist.h b/src/blackmisc/weather/presentweatherlist.h
index 7ce7b8fd2..3ec784f0c 100644
--- a/src/blackmisc/weather/presentweatherlist.h
+++ b/src/blackmisc/weather/presentweatherlist.h
@@ -13,7 +13,6 @@
 
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/weather/presentweather.h"
 #include "presentweather.h"
 
diff --git a/src/blackmisc/weather/registermetadataweather.cpp b/src/blackmisc/weather/registermetadataweather.cpp
index b47b20cbd..9a26a4c56 100644
--- a/src/blackmisc/weather/registermetadataweather.cpp
+++ b/src/blackmisc/weather/registermetadataweather.cpp
@@ -8,8 +8,8 @@
 
 #include "registermetadataweather.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/weather/weather.h"
+#include "blackmisc/variant.h"
 
 namespace BlackMisc
 {
diff --git a/src/blackmisc/weather/temperaturelayer.cpp b/src/blackmisc/weather/temperaturelayer.cpp
index 295608cb9..fa65fc6ad 100644
--- a/src/blackmisc/weather/temperaturelayer.cpp
+++ b/src/blackmisc/weather/temperaturelayer.cpp
@@ -8,7 +8,6 @@
 
 #include "blackmisc/weather/temperaturelayer.h"
 #include "blackmisc/propertyindexref.h"
-#include "blackmisc/variant.h"
 
 using namespace BlackMisc::Aviation;
 using namespace BlackMisc::PhysicalQuantities;
diff --git a/src/blackmisc/weather/temperaturelayer.h b/src/blackmisc/weather/temperaturelayer.h
index 20973d717..204d5e74c 100644
--- a/src/blackmisc/weather/temperaturelayer.h
+++ b/src/blackmisc/weather/temperaturelayer.h
@@ -18,7 +18,6 @@
 #include "blackmisc/pq/units.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QString>
diff --git a/src/blackmisc/weather/temperaturelayerlist.h b/src/blackmisc/weather/temperaturelayerlist.h
index 9b82ae40b..a28d00b6d 100644
--- a/src/blackmisc/weather/temperaturelayerlist.h
+++ b/src/blackmisc/weather/temperaturelayerlist.h
@@ -13,7 +13,6 @@
 
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/weather/temperaturelayer.h"
 #include "temperaturelayer.h"
 
diff --git a/src/blackmisc/weather/visibilitylayer.cpp b/src/blackmisc/weather/visibilitylayer.cpp
index 421a356dc..f91859a28 100644
--- a/src/blackmisc/weather/visibilitylayer.cpp
+++ b/src/blackmisc/weather/visibilitylayer.cpp
@@ -8,7 +8,6 @@
 
 #include "blackmisc/weather/visibilitylayer.h"
 #include "blackmisc/propertyindexref.h"
-#include "blackmisc/variant.h"
 
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Aviation;
diff --git a/src/blackmisc/weather/visibilitylayer.h b/src/blackmisc/weather/visibilitylayer.h
index 496f6ebc0..d59a63069 100644
--- a/src/blackmisc/weather/visibilitylayer.h
+++ b/src/blackmisc/weather/visibilitylayer.h
@@ -18,7 +18,6 @@
 #include "blackmisc/pq/units.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QString>
diff --git a/src/blackmisc/weather/visibilitylayerlist.h b/src/blackmisc/weather/visibilitylayerlist.h
index 26bf7622d..09a30c704 100644
--- a/src/blackmisc/weather/visibilitylayerlist.h
+++ b/src/blackmisc/weather/visibilitylayerlist.h
@@ -13,7 +13,6 @@
 
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/weather/visibilitylayer.h"
 
 #include <QMetaType>
diff --git a/src/blackmisc/weather/weatherdataplugininfolist.h b/src/blackmisc/weather/weatherdataplugininfolist.h
index 961ebcc52..6b7eb91ce 100644
--- a/src/blackmisc/weather/weatherdataplugininfolist.h
+++ b/src/blackmisc/weather/weatherdataplugininfolist.h
@@ -14,7 +14,6 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/collection.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/weather/weatherdataplugininfo.h"
 
 #include <QMetaType>
diff --git a/src/blackmisc/weather/weathergrid.h b/src/blackmisc/weather/weathergrid.h
index d06cc2136..1413edd26 100644
--- a/src/blackmisc/weather/weathergrid.h
+++ b/src/blackmisc/weather/weathergrid.h
@@ -14,7 +14,6 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/pq/length.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/weather/gridpoint.h"
 #include "blackmisc/weather/weatherscenario.h"
 
diff --git a/src/blackmisc/weather/windlayer.cpp b/src/blackmisc/weather/windlayer.cpp
index 1720e2259..ec3bf9b86 100644
--- a/src/blackmisc/weather/windlayer.cpp
+++ b/src/blackmisc/weather/windlayer.cpp
@@ -9,7 +9,6 @@
 #include "blackmisc/weather/windlayer.h"
 #include "blackmisc/pq/physicalquantity.h"
 #include "blackmisc/propertyindexref.h"
-#include "blackmisc/variant.h"
 
 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Aviation;
diff --git a/src/blackmisc/weather/windlayer.h b/src/blackmisc/weather/windlayer.h
index dae562d31..4be01600d 100644
--- a/src/blackmisc/weather/windlayer.h
+++ b/src/blackmisc/weather/windlayer.h
@@ -18,7 +18,6 @@
 #include "blackmisc/pq/speed.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/variant.h"
 
 #include <QMetaType>
 #include <QString>
diff --git a/src/blackmisc/weather/windlayerlist.h b/src/blackmisc/weather/windlayerlist.h
index 5e6891d01..ce5159399 100644
--- a/src/blackmisc/weather/windlayerlist.h
+++ b/src/blackmisc/weather/windlayerlist.h
@@ -13,7 +13,6 @@
 
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/sequence.h"
-#include "blackmisc/variant.h"
 #include "blackmisc/weather/windlayer.h"
 
 #include <QMetaType>