Clean up includes

2026-04-05 01:05:34 +08:00 · 2022-04-25 19:18:38 +02:00
parent 8386786386
commit c0efc9ea81
176 changed files with 123 additions and 302 deletions
--- a/src/blackmisc/atomicfile.cpp
+++ b/src/blackmisc/atomicfile.cpp
@@ -8,13 +8,11 @@

 #include "blackmisc/atomicfile.h"
 #include "blackmisc/algorithm.h"
-#include "blackmisc/stacktrace.h"

 #include <QDir>
 #include <QFileInfo>
 #include <QFlags>
 #include <QStringBuilder>
-#include <random>
 #include <type_traits>

 #if defined(Q_OS_POSIX)
--- a/src/blackmisc/audio/audiodeviceinfolist.cpp
+++ b/src/blackmisc/audio/audiodeviceinfolist.cpp
@@ -7,15 +7,11 @@
 */

 #include "blackmisc/audio/audiodeviceinfolist.h"
-#include "blackmisc/iterator.h"
-#include "blackmisc/range.h"
 #include "blackmisc/stringutils.h"

 #include <QString>
 #include <QAudioDeviceInfo>
-#include <QHostInfo>
 #include <algorithm>
-#include <tuple>

 BLACK_DEFINE_SEQUENCE_MIXINS(BlackMisc::Audio, CAudioDeviceInfo, CAudioDeviceInfoList)

--- a/src/blackmisc/audio/audiosettings.cpp
+++ b/src/blackmisc/audio/audiosettings.cpp
@@ -9,7 +9,6 @@
 #include "blackmisc/audio/audiosettings.h"
 #include "blackmisc/swiftdirectories.h"
 #include "blackmisc/fileutils.h"
-#include <QChar>
 #include <QtGlobal>
 #include <QStringBuilder>
 #include <QDir>
--- a/src/blackmisc/audio/audioutils.cpp
+++ b/src/blackmisc/audio/audioutils.cpp
@@ -10,7 +10,6 @@
 #include "blackmisc/audio/audioutils.h"

 #include <QProcess>
-#include <QStringList>
 #include <QAudioDeviceInfo>

 using namespace BlackConfig;
--- a/src/blackmisc/audio/notificationsounds.cpp
+++ b/src/blackmisc/audio/notificationsounds.cpp
@@ -12,8 +12,6 @@

 namespace BlackMisc::Audio
 {
-    constexpr CNotificationSounds::Notification CNotificationSounds::AllNotifications;
-    constexpr CNotificationSounds::Notification CNotificationSounds::DefaultNotifications;

    const QString &CNotificationSounds::flagToString(CNotificationSounds::NotificationFlag notification)
    {
--- a/src/blackmisc/audio/registermetadataaudio.cpp
+++ b/src/blackmisc/audio/registermetadataaudio.cpp
@@ -9,7 +9,6 @@
 #include "blackmisc/audio/registermetadataaudio.h"
 #include "blackmisc/audio/audio.h"
 #include "blackmisc/audio/ptt.h"
-#include "blackmisc/variant.h"
 #include <QDBusMetaType>

 namespace BlackMisc
--- a/src/blackmisc/audio/voicesetup.cpp
+++ b/src/blackmisc/audio/voicesetup.cpp
@@ -10,7 +10,6 @@
 #include "blackmisc/logcategories.h"
 #include "blackmisc/stringutils.h"
 #include "blackmisc/verify.h"
-#include "blackmisc/comparefunctions.h"

 #include <Qt>
 #include <QtGlobal>
--- a/src/blackmisc/aviation/adfsystem.h
+++ b/src/blackmisc/aviation/adfsystem.h
@@ -14,8 +14,6 @@
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/aviation/modulator.h"

-#include <stdexcept>
-
 namespace BlackMisc::Aviation
 {
    //! ADF system ("for NDBs")
--- a/src/blackmisc/aviation/aircraftcategory.cpp
+++ b/src/blackmisc/aviation/aircraftcategory.cpp
@@ -14,11 +14,7 @@
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/stringutils.h"

-#include <QChar>
-#include <QJsonValue>
-#include <QMultiMap>
 #include <QRegularExpression>
-#include <QRegularExpressionMatch>
 #include <QStringBuilder>
 #include <Qt>
 #include <QtGlobal>
--- a/src/blackmisc/aviation/aircraftcategory.h
+++ b/src/blackmisc/aviation/aircraftcategory.h
@@ -21,7 +21,7 @@
 #include <QJsonObject>
 #include <QMap>
 #include <QList>
-#include <QStringList>
+#include <QString>
 #include <QMetaType>

 BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftCategory)
--- a/src/blackmisc/aviation/aircraftcategorylist.cpp
+++ b/src/blackmisc/aviation/aircraftcategorylist.cpp
@@ -7,10 +7,8 @@
 */

 #include "blackmisc/aviation/aircraftcategorylist.h"
-#include "blackmisc/range.h"
 #include "blackmisc/setbuilder.h"

-#include <QJsonObject>
 #include <QJsonValue>
 #include <Qt>
 #include <QMap>
--- a/src/blackmisc/aviation/aircraftengine.cpp
+++ b/src/blackmisc/aviation/aircraftengine.cpp
@@ -9,7 +9,6 @@
 #include "blackmisc/aviation/aircraftengine.h"
 #include "blackmisc/stringutils.h"

-#include <QChar>
 #include <QtGlobal>

 BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftEngine)
--- a/src/blackmisc/aviation/aircraftenginelist.cpp
+++ b/src/blackmisc/aviation/aircraftenginelist.cpp
@@ -7,9 +7,7 @@
 */

 #include "blackmisc/aviation/aircraftenginelist.h"
-#include "blackmisc/range.h"

-#include <QJsonValue>
 #include <QString>
 #include <QtGlobal>

--- a/src/blackmisc/aviation/aircrafticaocode.cpp
+++ b/src/blackmisc/aviation/aircrafticaocode.cpp
@@ -16,10 +16,8 @@
 #include "blackmisc/pq/speed.h"

 #include <QChar>
-#include <QJsonValue>
 #include <QMultiMap>
 #include <QRegularExpression>
-#include <QRegularExpressionMatch>
 #include <QStringBuilder>
 #include <Qt>
 #include <QtGlobal>
--- a/src/blackmisc/aviation/aircrafticaocodelist.cpp
+++ b/src/blackmisc/aviation/aircrafticaocodelist.cpp
@@ -8,10 +8,8 @@

 #include "blackmisc/aviation/aircrafticaocodelist.h"
 #include "blackmisc/aviation/aircraftcategorylist.h"
-#include "blackmisc/range.h"
 #include "blackmisc/setbuilder.h"

-#include <QJsonObject>
 #include <QJsonValue>
 #include <Qt>

--- a/src/blackmisc/aviation/aircraftparts.cpp
+++ b/src/blackmisc/aviation/aircraftparts.cpp
@@ -11,14 +11,10 @@
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/propertyindex.h"
 #include "blackmisc/stringutils.h"
-#include "blackmisc/verify.h"
-#include "blackconfig/buildconfig.h"

 #include "QStringBuilder"
 #include <QtGlobal>

-using namespace BlackConfig;
-
 BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CAircraftParts)

 namespace BlackMisc::Aviation
--- a/src/blackmisc/aviation/aircraftpartslist.cpp
+++ b/src/blackmisc/aviation/aircraftpartslist.cpp
@@ -9,8 +9,6 @@
 #include "blackmisc/aviation/aircraftparts.h"
 #include "blackmisc/aviation/aircraftpartslist.h"

-#include <tuple>
-
 BLACK_DEFINE_SEQUENCE_MIXINS(BlackMisc::Aviation, CAircraftParts, CAircraftPartsList)

 namespace BlackMisc::Aviation
--- a/src/blackmisc/aviation/aircraftsituationchangelist.cpp
+++ b/src/blackmisc/aviation/aircraftsituationchangelist.cpp
@@ -7,7 +7,6 @@
 */

 #include "blackmisc/aviation/aircraftsituationchangelist.h"
-#include <tuple>

 BLACK_DEFINE_SEQUENCE_MIXINS(BlackMisc::Aviation, CAircraftSituationChange, CAircraftSituationChangeList)

--- a/src/blackmisc/aviation/aircraftsituationlist.cpp
+++ b/src/blackmisc/aviation/aircraftsituationlist.cpp
@@ -10,10 +10,8 @@
 #include "blackmisc/geo/elevationplane.h"
 #include "blackmisc/math/mathutils.h"
 #include "blackmisc/pq/speed.h"
-#include "blackmisc/verify.h"

 #include <QList>
-#include <tuple>

 using namespace BlackMisc::Geo;
 using namespace BlackMisc::PhysicalQuantities;
--- a/src/blackmisc/aviation/airlineicaocode.cpp
+++ b/src/blackmisc/aviation/airlineicaocode.cpp
@@ -16,13 +16,9 @@
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/stringutils.h"
 #include "blackmisc/swiftdirectories.h"
-#include "blackmisc/directoryutils.h"
 #include "blackmisc/verify.h"
 #include "blackmisc/setbuilder.h"

-#include <QJsonValue>
-#include <QRegularExpression>
-#include <QRegularExpressionMatch>
 #include <QStringBuilder>
 #include <QDir>
 #include <Qt>
--- a/src/blackmisc/aviation/airlineicaocodelist.cpp
+++ b/src/blackmisc/aviation/airlineicaocodelist.cpp
@@ -9,10 +9,8 @@
 #include "blackmisc/aviation/airlineicaocodelist.h"
 #include "blackmisc/logcategories.h"
 #include "blackmisc/country.h"
-#include "blackmisc/range.h"
 #include "blackmisc/setbuilder.h"

-#include <QJsonObject>
 #include <QJsonValue>
 #include <QStringBuilder>

--- a/src/blackmisc/aviation/airporticaocode.cpp
+++ b/src/blackmisc/aviation/airporticaocode.cpp
@@ -12,7 +12,6 @@
 #include "blackmisc/mixin/mixincompare.h"
 #include "blackmisc/stringutils.h"

-#include <QRegularExpression>
 #include <Qt>
 #include <QtGlobal>

--- a/src/blackmisc/aviation/airportlist.cpp
+++ b/src/blackmisc/aviation/airportlist.cpp
@@ -8,11 +8,9 @@

 #include "blackmisc/aviation/airportlist.h"
 #include "blackmisc/mixin/mixincompare.h"
-#include "blackmisc/range.h"
 #include "blackmisc/setbuilder.h"

 #include <QString>
-#include <tuple>

 using namespace BlackMisc::PhysicalQuantities;

--- a/src/blackmisc/aviation/altitude.cpp
+++ b/src/blackmisc/aviation/altitude.cpp
@@ -13,7 +13,6 @@
 #include "blackmisc/math/mathutils.h"
 #include "blackmisc/fileutils.h"
 #include "blackmisc/swiftdirectories.h"
-#include "blackmisc/directoryutils.h"
 #include "blackmisc/stringutils.h"
 #include "blackmisc/comparefunctions.h"
 #include "blackmisc/iconlist.h"
--- a/src/blackmisc/aviation/atcstationlist.cpp
+++ b/src/blackmisc/aviation/atcstationlist.cpp
@@ -10,8 +10,6 @@
 #include "blackmisc/aviation/callsign.h"
 #include "blackmisc/aviation/comsystem.h"
 #include "blackmisc/mixin/mixincompare.h"
-#include "blackmisc/iterator.h"
-#include "blackmisc/network/user.h"
 #include "blackmisc/predicates.h"
 #include "blackmisc/range.h"

--- a/src/blackmisc/aviation/callsignset.cpp
+++ b/src/blackmisc/aviation/callsignset.cpp
@@ -8,10 +8,8 @@

 #include "blackmisc/aviation/callsignset.h"
 #include "blackmisc/containerbase.h"
-#include "blackmisc/dbus.h"

 #include <QDBusMetaType>
-#include <QJsonObject>
 #include <QString>

 BLACK_DEFINE_COLLECTION_MIXINS(BlackMisc::Aviation, CCallsign, CCallsignSet)
--- a/src/blackmisc/aviation/comsystem.cpp
+++ b/src/blackmisc/aviation/comsystem.cpp
@@ -8,11 +8,9 @@

 #include "blackmisc/aviation/comsystem.h"
 #include "blackmisc/math/mathutils.h"
-#include "blackmisc/dbus.h"
 #include "blackmisc/stringutils.h"

 #include <QDBusMetaType>
-#include <QtDebug>
 #include <QtGlobal>

 using namespace BlackMisc::PhysicalQuantities;
--- a/src/blackmisc/aviation/flightplan.cpp
+++ b/src/blackmisc/aviation/flightplan.cpp
@@ -8,7 +8,6 @@

 #include "blackmisc/aviation/flightplan.h"
 #include "blackmisc/aviation/airlineicaocode.h"
-#include "blackmisc/aviation/flightplan.h"
 #include "blackmisc/aviation/altitude.h"
 #include "blackmisc/pq/time.h"
 #include "blackmisc/pq/speed.h"
--- a/src/blackmisc/aviation/flightplanlist.cpp
+++ b/src/blackmisc/aviation/flightplanlist.cpp
@@ -7,13 +7,6 @@
 */

 #include "blackmisc/aviation/flightplanlist.h"
-#include "blackmisc/mixin/mixincompare.h"
-#include "blackmisc/iterator.h"
-#include "blackmisc/predicates.h"
-#include "blackmisc/range.h"
-
-#include <QString>
-#include <QtGlobal>

 BLACK_DEFINE_SEQUENCE_MIXINS(BlackMisc::Aviation, CFlightPlan, CFlightPlanList)

--- a/src/blackmisc/aviation/livery.cpp
+++ b/src/blackmisc/aviation/livery.cpp
@@ -20,7 +20,6 @@
 #include <QJsonValue>
 #include <Qt>
 #include <QtGlobal>
-#include <tuple>
 #include <QStringBuilder>

 using namespace BlackMisc;
--- a/src/blackmisc/aviation/liverylist.cpp
+++ b/src/blackmisc/aviation/liverylist.cpp
@@ -10,9 +10,6 @@
 #include "blackmisc/predicates.h"
 #include "blackmisc/range.h"

-#include <QtGlobal>
-#include <tuple>
-
 using namespace BlackMisc::Aviation;

 BLACK_DEFINE_SEQUENCE_MIXINS(BlackMisc::Aviation, CLivery, CLiveryList)
--- a/src/blackmisc/aviation/modulator.cpp
+++ b/src/blackmisc/aviation/modulator.cpp
@@ -10,7 +10,6 @@
 #include "blackmisc/aviation/comsystem.h"
 #include "blackmisc/aviation/navsystem.h"
 #include "blackmisc/aviation/adfsystem.h"
-#include "blackmisc/math/mathutils.h"
 #include "blackmisc/pq/units.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/comparefunctions.h"
--- a/src/blackmisc/aviation/registermetadataaviation.cpp
+++ b/src/blackmisc/aviation/registermetadataaviation.cpp
@@ -8,7 +8,6 @@

 #include "blackmisc/aviation/registermetadataaviation.h"
 #include "blackmisc/aviation/aviation.h"
-#include "blackmisc/variant.h"

 namespace BlackMisc
 {
--- a/src/blackmisc/aviation/transponder.cpp
+++ b/src/blackmisc/aviation/transponder.cpp
@@ -11,7 +11,6 @@

 #include <QRegularExpression>
 #include <Qt>
-#include <QtDebug>

 BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CTransponder)

--- a/src/blackmisc/compressutils.cpp
+++ b/src/blackmisc/compressutils.cpp
@@ -9,7 +9,6 @@
 #include "blackmisc/compressutils.h"
 #include "blackmisc/fileutils.h"
 #include "blackmisc/swiftdirectories.h"
-#include "blackmisc/directoryutils.h"
 #include "blackmisc/stringutils.h"
 #include "blackconfig/buildconfig.h"

--- a/src/blackmisc/countrylist.cpp
+++ b/src/blackmisc/countrylist.cpp
@@ -7,9 +7,7 @@
 */

 #include "blackmisc/countrylist.h"
-#include "blackmisc/range.h"

-#include <QJsonObject>
 #include <QJsonValue>
 #include <QRegularExpression>
 #include <Qt>
--- a/src/blackmisc/crashinfo.cpp
+++ b/src/blackmisc/crashinfo.cpp
@@ -10,7 +10,6 @@
 #include "blackmisc/fileutils.h"
 #include "blackmisc/worker.h"

-#include <QFile>
 #include <QStringBuilder>

 BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc, CCrashInfo)
--- a/src/blackmisc/datacache.cpp
+++ b/src/blackmisc/datacache.cpp
@@ -22,7 +22,6 @@
 #include <QIODevice>
 #include <QJsonDocument>
 #include <QJsonValue>
-#include <QJsonValuePtr>
 #include <QMutexLocker>
 #include <QStandardPaths>
 #include <QTimer>
--- a/src/blackmisc/dbusserver.cpp
+++ b/src/blackmisc/dbusserver.cpp
@@ -9,14 +9,12 @@
 #include "blackmisc/dbusserver.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/network/networkutils.h"
-#include "blackmisc/processctrl.h"
 #include "blackmisc/statusmessage.h"

 #include <QDBusServer>
 #include <QMetaClassInfo>
 #include <QMetaObject>
 #include <QStringList>
-#include <QThread>
 #include <QtGlobal>

 using namespace BlackMisc::Network;
--- a/src/blackmisc/directories.cpp
+++ b/src/blackmisc/directories.cpp
@@ -8,7 +8,6 @@

 #include "blackmisc/directories.h"
 #include "blackmisc/swiftdirectories.h"
-#include "blackmisc/directoryutils.h"
 #include <QFileInfo>
 #include <QDir>

--- a/src/blackmisc/directoryutils.cpp
+++ b/src/blackmisc/directoryutils.cpp
@@ -12,7 +12,6 @@
 #include "blackmisc/fileutils.h"
 #include "blackmisc/stringutils.h"
 #include "blackmisc/network/ping.h"
-#include "blackmisc/range.h"
 #include "blackmisc/setbuilder.h"
 #include "blackconfig/buildconfig.h"
 #include <QCoreApplication>
@@ -21,7 +20,6 @@
 #include <QSet>
 #include <QDateTime>
 #include <QRegularExpression>
-#include <QStandardPaths>

 using namespace BlackConfig;
 using namespace BlackMisc::Network;
--- a/src/blackmisc/filelogger.cpp
+++ b/src/blackmisc/filelogger.cpp
@@ -8,17 +8,13 @@

 #include "blackmisc/filelogger.h"
 #include "blackmisc/swiftdirectories.h"
-#include "blackmisc/directoryutils.h"
 #include "blackconfig/buildconfig.h"

 #include <QCoreApplication>
 #include <QDateTime>
-#include <QVersionNumber>
 #include <QDir>
 #include <QFileInfo>
-#include <QFlags>
 #include <QIODevice>
-#include <QLatin1String>
 #include <QString>
 #include <QStringBuilder>
 #include <QtGlobal>
--- a/src/blackmisc/fileutils.cpp
+++ b/src/blackmisc/fileutils.cpp
@@ -15,14 +15,12 @@
 #include <QDateTime>
 #include <QFile>
 #include <QFileInfo>
-#include <QFlags>
 #include <QIODevice>
 #include <QList>
 #include <QLockFile>
 #include <QRegularExpression>
 #include <QTextStream>
 #include <QtGlobal>
-#include <QMap>
 #include <algorithm>
 #include <QStringBuilder>

--- a/src/blackmisc/geo/coordinategeodetic.cpp
+++ b/src/blackmisc/geo/coordinategeodetic.cpp
@@ -8,10 +8,8 @@

 #include "blackmisc/geo/coordinategeodetic.h"
 #include "blackmisc/logmessage.h"
-#include "blackmisc/propertyindexref.h"
 #include "blackmisc/verify.h"

-#include <QByteArray>
 #include <QtGlobal>
 #include <QStringBuilder>
 #include <cmath>
--- a/src/blackmisc/geo/coordinategeodetic.h
+++ b/src/blackmisc/geo/coordinategeodetic.h
@@ -11,24 +11,22 @@
 #ifndef BLACKMISC_GEO_COORDINATEGEODETIC_H
 #define BLACKMISC_GEO_COORDINATEGEODETIC_H

-#include "blackmisc/aviation/altitude.h"
-#include "blackmisc/geo/latitude.h"
-#include "blackmisc/geo/longitude.h"
+#include "blackmisc/metaclass.h"
+#include "blackmisc/math/mathutils.h"
 #include "blackmisc/pq/angle.h"
 #include "blackmisc/pq/length.h"
 #include "blackmisc/pq/units.h"
-#include "blackmisc/math/mathutils.h"
-#include "blackmisc/metaclass.h"
+#include "blackmisc/aviation/altitude.h"
+#include "blackmisc/geo/latitude.h"
+
+#include "blackmisc/geo/longitude.h"
 #include "blackmisc/propertyindexref.h"
-#include "blackmisc/mixin/mixinstring.h"
 #include "blackmisc/valueobject.h"
-#include "blackmisc/mixin/mixinmetatype.h"
-#include "blackmisc/stringutils.h"
 #include "blackmisc/blackmiscexport.h"

-#include <QMetaType>
-#include <QString>
+
 #include <QVector3D>
+#include <QString>
 #include <array>

 BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Geo, CCoordinateGeodetic)
--- a/src/blackmisc/geo/coordinategeodeticlist.cpp
+++ b/src/blackmisc/geo/coordinategeodeticlist.cpp
@@ -7,11 +7,7 @@
 */

 #include "blackmisc/geo/coordinategeodeticlist.h"
-#include "math/mathutils.h"
-
-#include <QJsonValue>
-#include <QString>
-#include <QtGlobal>
+#include "blackmisc/math/mathutils.h"

 using namespace BlackMisc::Math;
 using namespace BlackMisc::PhysicalQuantities;
--- a/src/blackmisc/geo/coordinategeodeticlist.h
+++ b/src/blackmisc/geo/coordinategeodeticlist.h
@@ -15,14 +15,16 @@
 #include "blackmisc/geo/coordinategeodetic.h"
 #include "blackmisc/geo/geoobjectlist.h"

+#include "blackmisc/pq/length.h"
+
+#include "blackmisc/mixin/mixinmetatype.h"
+#include "blackmisc/mixin/mixinjson.h"
+
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/collection.h"
-#include "blackmisc/json.h"
 #include "blackmisc/sequence.h"

-#include <QJsonObject>
 #include <QMetaType>
-#include <initializer_list>

 BLACK_DECLARE_SEQUENCE_MIXINS(BlackMisc::Geo, CCoordinateGeodetic, CCoordinateGeodeticList)

--- a/src/blackmisc/geo/earthangle.cpp
+++ b/src/blackmisc/geo/earthangle.cpp
@@ -14,7 +14,6 @@
 #include <QRegularExpression>
 #include <Qt>
 #include <QtGlobal>
-#include <QtMath>

 using namespace BlackMisc::PhysicalQuantities;

--- a/src/blackmisc/geo/registermetadatageo.cpp
+++ b/src/blackmisc/geo/registermetadatageo.cpp
@@ -8,7 +8,6 @@

 #include "blackmisc/geo/registermetadatageo.h"
 #include "blackmisc/geo/geo.h"
-#include "blackmisc/variant.h"

 namespace BlackMisc
 {
--- a/src/blackmisc/iconlist.cpp
+++ b/src/blackmisc/iconlist.cpp
@@ -8,8 +8,6 @@

 #include "blackmisc/iconlist.h"
 #include "blackmisc/containerbase.h"
-#include "blackmisc/dbus.h"
-#include "blackmisc/range.h"
 #include <QDBusMetaType>

 BLACK_DEFINE_SEQUENCE_MIXINS(BlackMisc, CIcon, CIconList)
--- a/src/blackmisc/icons.cpp
+++ b/src/blackmisc/icons.cpp
@@ -10,7 +10,6 @@

 #include "blackmisc/icons.h"
 #include "blackmisc/swiftdirectories.h"
-#include "blackmisc/directoryutils.h"
 #include "blackmisc/fileutils.h"
 #include "blackmisc/threadutils.h"

--- a/src/blackmisc/identifierlist.cpp
+++ b/src/blackmisc/identifierlist.cpp
@@ -9,8 +9,7 @@
 #include "blackmisc/identifierlist.h"
 #include "blackmisc/mixin/mixincompare.h"

-#include <QString>
-#include <tuple>
+#include <QStringList>

 BLACK_DEFINE_SEQUENCE_MIXINS(BlackMisc, CIdentifier, CIdentifierList)

--- a/src/blackmisc/identifierset.cpp
+++ b/src/blackmisc/identifierset.cpp
@@ -8,9 +8,6 @@

 #include "blackmisc/identifierset.h"

-#include <QString>
-#include <tuple>
-
 BLACK_DEFINE_COLLECTION_MIXINS(BlackMisc, CIdentifier, CIdentifierSet)

 namespace BlackMisc
--- a/src/blackmisc/identifierset.h
+++ b/src/blackmisc/identifierset.h
@@ -14,6 +14,8 @@
 #include "blackmisc/identifier.h"
 #include "blackmisc/collection.h"
 #include "blackmisc/blackmiscexport.h"
+
+#include <QStringList>
 #include <QMetaType>

 BLACK_DECLARE_COLLECTION_MIXINS(BlackMisc, CIdentifier, CIdentifierSet)
--- a/src/blackmisc/input/hotkeycombination.cpp
+++ b/src/blackmisc/input/hotkeycombination.cpp
@@ -8,12 +8,10 @@

 #include "blackmisc/input/hotkeycombination.h"
 #include "blackmisc/mixin/mixincompare.h"
-#include "blackmisc/iterator.h"

 #include <QStringList>
 #include <QtGlobal>
 #include <algorithm>
-#include <tuple>

 BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Input, CHotkeyCombination)

--- a/src/blackmisc/input/registermetadatainput.cpp
+++ b/src/blackmisc/input/registermetadatainput.cpp
@@ -8,7 +8,6 @@

 #include "blackmisc/input/registermetadatainput.h"
 #include "blackmisc/input/input.h"
-#include "blackmisc/variant.h"

 #include <QDBusMetaType>

--- a/src/blackmisc/json.cpp
+++ b/src/blackmisc/json.cpp
@@ -12,7 +12,6 @@

 #include <QDateTime>
 #include <QJsonDocument>
-#include <QList>
 #include <QStringList>

 using namespace BlackMisc;
--- a/src/blackmisc/logcategorylist.cpp
+++ b/src/blackmisc/logcategorylist.cpp
@@ -8,7 +8,6 @@

 #include "blackmisc/logcategorylist.h"
 #include "blackmisc/containerbase.h"
-#include "blackmisc/dbus.h"
 #include "blackmisc/iterator.h"
 #include "blackmisc/range.h"

--- a/src/blackmisc/loghandler.cpp
+++ b/src/blackmisc/loghandler.cpp
@@ -27,7 +27,6 @@
 #include <Qt>
 #include <QtDebug>
 #include <algorithm>
-#include <tuple>

 #ifdef Q_OS_WIN
 #include <windows.h>
--- a/src/blackmisc/logpattern.cpp
+++ b/src/blackmisc/logpattern.cpp
@@ -13,9 +13,7 @@

 #include <QHash>
 #include <QList>
-#include <QStringList>
 #include <algorithm>
-#include <tuple>

 namespace BlackMisc
 {
--- a/src/blackmisc/logpattern.h
+++ b/src/blackmisc/logpattern.h
@@ -28,9 +28,9 @@
 #include <QMetaType>
 #include <QSet>
 #include <QString>
+#include <QStringList>
 #include <QtGlobal>

-class QStringList;
 template <class Key, class T> class QHash;

 namespace BlackMisc
--- a/src/blackmisc/math/mathutils.cpp
+++ b/src/blackmisc/math/mathutils.cpp
@@ -11,7 +11,6 @@

 #include <QTime>
 #include <QtGlobal>
-#include <algorithm>
 #include <cmath>
 #include <cstdlib>
 #include <limits>
--- a/src/blackmisc/namevariantpair.cpp
+++ b/src/blackmisc/namevariantpair.cpp
@@ -8,7 +8,6 @@

 #include "blackmisc/namevariantpair.h"
 #include "blackmisc/propertyindexvariantmap.h"
-#include <tuple>

 BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc, CNameVariantPair)

--- a/src/blackmisc/namevariantpairlist.cpp
+++ b/src/blackmisc/namevariantpairlist.cpp
@@ -9,8 +9,6 @@
 #include "blackmisc/namevariantpairlist.h"
 #include "blackmisc/range.h"

-#include <tuple>
-
 BLACK_DEFINE_SEQUENCE_MIXINS(BlackMisc, CNameVariantPair, CNameVariantPairList)

 namespace BlackMisc
--- a/src/blackmisc/network/authenticateduser.cpp
+++ b/src/blackmisc/network/authenticateduser.cpp
@@ -8,11 +8,9 @@

 #include "blackmisc/network/authenticateduser.h"
 #include "blackmisc/icons.h"
-#include "blackmisc/logcategories.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessage.h"

-#include <QJsonArray>
 #include <QJsonValue>
 #include <QStringBuilder>
 #include <QtGlobal>
--- a/src/blackmisc/network/client.cpp
+++ b/src/blackmisc/network/client.cpp
@@ -16,7 +16,6 @@
 #include <QString>
 #include <QStringBuilder>
 #include <QStringList>
-#include <tuple>

 BLACK_DEFINE_VALUEOBJECT_MIXINS(BlackMisc::Network, CClient)

--- a/src/blackmisc/network/fsdsetup.cpp
+++ b/src/blackmisc/network/fsdsetup.cpp
@@ -7,14 +7,13 @@
 */

 #include "blackmisc/network/fsdsetup.h"
-#include "blackmisc/logcategories.h"
+#include "blackmisc/logcategorylist.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/stringutils.h"
 #include "blackmisc/verify.h"
 #include "blackmisc/comparefunctions.h"

-#include <Qt>
 #include <QtGlobal>

 using namespace BlackMisc;
--- a/src/blackmisc/network/networkutils.cpp
+++ b/src/blackmisc/network/networkutils.cpp
@@ -14,9 +14,7 @@
 #include <QAbstractSocket>
 #include <QDateTime>
 #include <QMetaEnum>
-#include <QDebug>
 #include <QHostAddress>
-#include <QJsonDocument>
 #include <QList>
 #include <QProcess>
 #include <QNetworkAddressEntry>
@@ -34,10 +32,8 @@
 #include <QUrl>
 #include <QUrlQuery>
 #include <QStringBuilder>
-#include <QEventLoop>
 #include <QVariant>
 #include <QtDebug>
-#include <QTimer>
 #include <QRegularExpression>

 using namespace BlackConfig;
--- a/src/blackmisc/network/rawfsdmessage.cpp
+++ b/src/blackmisc/network/rawfsdmessage.cpp
@@ -7,12 +7,10 @@
 */

 #include "blackmisc/network/rawfsdmessage.h"
-#include "blackmisc/logcategories.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/stringutils.h"

-#include <Qt>
 #include <QtGlobal>

 using namespace BlackMisc;
--- a/src/blackmisc/network/registermetadatanetwork.cpp
+++ b/src/blackmisc/network/registermetadatanetwork.cpp
@@ -8,7 +8,6 @@

 #include "blackmisc/network/registermetadatanetwork.h"
 #include "blackmisc/network/network.h"
-#include "blackmisc/variant.h"

 namespace BlackMisc
 {
--- a/src/blackmisc/network/remotefilelist.cpp
+++ b/src/blackmisc/network/remotefilelist.cpp
@@ -10,9 +10,7 @@
 #include "blackmisc/network/remotefile.h"
 #include "blackmisc/json.h"

-#include <QJsonObject>
 #include <QJsonValue>
-#include <tuple>

 BLACK_DEFINE_SEQUENCE_MIXINS(BlackMisc::Network, CRemoteFile, CRemoteFileList)

--- a/src/blackmisc/network/rolelist.cpp
+++ b/src/blackmisc/network/rolelist.cpp
@@ -9,9 +9,7 @@
 #include "blackmisc/network/role.h"
 #include "blackmisc/network/rolelist.h"

-#include <QJsonObject>
 #include <QJsonValue>
-#include <tuple>

 BLACK_DEFINE_SEQUENCE_MIXINS(BlackMisc::Network, CRole, CRoleList)

--- a/src/blackmisc/network/serverlist.cpp
+++ b/src/blackmisc/network/serverlist.cpp
@@ -7,7 +7,6 @@
 */

 #include "blackmisc/network/serverlist.h"
-#include <tuple>

 BLACK_DEFINE_SEQUENCE_MIXINS(BlackMisc::Network, CServer, CServerList)

--- a/src/blackmisc/network/textmessagelist.cpp
+++ b/src/blackmisc/network/textmessagelist.cpp
@@ -7,13 +7,10 @@
 */

 #include "blackmisc/network/textmessagelist.h"
-#include "blackmisc/iterator.h"
 #include "blackmisc/network/textmessage.h"
 #include "blackmisc/range.h"

-#include <QtGlobal>
 #include <algorithm>
-#include <tuple>

 using namespace BlackMisc::PhysicalQuantities;
 using namespace BlackMisc::Aviation;
--- a/src/blackmisc/network/urllist.cpp
+++ b/src/blackmisc/network/urllist.cpp
@@ -12,7 +12,6 @@
 #include "blackmisc/stringutils.h"

 #include <QtGlobal>
-#include <tuple>

 using namespace BlackMisc::Math;

--- a/src/blackmisc/network/urllog.cpp
+++ b/src/blackmisc/network/urllog.cpp
@@ -12,7 +12,6 @@
 #include "blackmisc/stringutils.h"

 #include <QJsonValue>
-#include <QPair>
 #include <QtGlobal>

 #include <atomic>
--- a/src/blackmisc/network/userlist.cpp
+++ b/src/blackmisc/network/userlist.cpp
@@ -8,9 +8,6 @@

 #include "blackmisc/network/userlist.h"

-#include <QString>
-#include <tuple>
-
 BLACK_DEFINE_SEQUENCE_MIXINS(BlackMisc::Network, CUser, CUserList)

 namespace BlackMisc::Network
--- a/src/blackmisc/pixmap.cpp
+++ b/src/blackmisc/pixmap.cpp
@@ -9,7 +9,6 @@
 #include "blackmisc/pixmap.h"

 #include <QBuffer>
-#include <QFile>
 #include <QIODevice>
 #include <QReadLocker>
 #include <QWriteLocker>
--- a/src/blackmisc/platform.cpp
+++ b/src/blackmisc/platform.cpp
@@ -8,12 +8,10 @@

 #include "blackmisc/platform.h"
 #include "blackmisc/icons.h"
-#include "blackmisc/stringutils.h"
 #include "blackmisc/comparefunctions.h"
 #include "blackconfig/buildconfig.h"

 #include <QJsonValue>
-#include <Qt>
 #include <QtGlobal>

 using namespace BlackConfig;
--- a/src/blackmisc/platformset.cpp
+++ b/src/blackmisc/platformset.cpp
@@ -10,10 +10,8 @@

 #include "blackmisc/platformset.h"
 #include "blackmisc/containerbase.h"
-#include "blackmisc/dbus.h"

 #include <QDBusMetaType>
-#include <QJsonObject>
 #include <QString>

 BLACK_DEFINE_COLLECTION_MIXINS(BlackMisc, CPlatform, CPlatformSet)
--- a/src/blackmisc/processctrl.cpp
+++ b/src/blackmisc/processctrl.cpp
@@ -9,10 +9,10 @@
 #include "blackmisc/processctrl.h"
 #include "blackmisc/logmessage.h"
 #include <QStringBuilder>
-#include <array>

 #ifdef Q_OS_WIN
 #include <windows.h>
+#include <array>
 #endif

 namespace BlackMisc
--- a/src/blackmisc/propertyindexlist.cpp
+++ b/src/blackmisc/propertyindexlist.cpp
@@ -8,9 +8,6 @@

 #include "blackmisc/propertyindexlist.h"

-#include <QString>
-#include <tuple>
-
 BLACK_DEFINE_SEQUENCE_MIXINS(BlackMisc, CPropertyIndex, CPropertyIndexList)

 namespace BlackMisc
--- a/src/blackmisc/propertyindexvariantmap.cpp
+++ b/src/blackmisc/propertyindexvariantmap.cpp
@@ -12,7 +12,6 @@
 #include "blackmisc/dictionary.h"

 #include <QHash>
-#include <tuple>

 namespace BlackMisc
 {
--- a/src/blackmisc/registermetadata.cpp
+++ b/src/blackmisc/registermetadata.cpp
@@ -21,7 +21,6 @@
 #include "blackmisc/applicationinfolist.h"
 #include "blackmisc/countrylist.h"
 #include "blackmisc/crashsettings.h"
-#include "blackmisc/dbus.h"
 #include "blackmisc/directories.h"
 #include "blackmisc/iconlist.h"
 #include "blackmisc/identifierlist.h"
@@ -38,7 +37,6 @@
 #include "blackmisc/sequence.h"
 #include "blackmisc/statusmessagelist.h"
 #include "blackmisc/valuecache.h"
-#include "blackmisc/valueobject.h"
 #include "blackmisc/variantlist.h"
 #include "blackmisc/variantmap.h"

--- a/src/blackmisc/rgbcolor.cpp
+++ b/src/blackmisc/rgbcolor.cpp
@@ -17,7 +17,6 @@
 #include <QPixmap>
 #include <QSize>
 #include <QStringBuilder>
-#include <Qt>
 #include <QtGlobal>

 using namespace BlackMisc;
--- a/src/blackmisc/settingscache.cpp
+++ b/src/blackmisc/settingscache.cpp
@@ -7,7 +7,6 @@
 */

 #include "blackmisc/settingscache.h"
-#include "blackmisc/directoryutils.h"
 #include "blackmisc/logmessage.h"

 #include <QStandardPaths>
--- a/src/blackmisc/simplecommandparser.cpp
+++ b/src/blackmisc/simplecommandparser.cpp
@@ -12,8 +12,6 @@

 #include <QList>
 #include <QSet>
-#include <Qt>
-#include <QtGlobal>
 #include <QStringBuilder>
 #include <algorithm>

--- a/src/blackmisc/simulation/matchingscript.cpp
+++ b/src/blackmisc/simulation/matchingscript.cpp
@@ -7,7 +7,7 @@
 */

 #include "blackmisc/simulation/matchingscript.h"
-#include "stringutils.h"
+#include "blackmisc/stringutils.h"

 using namespace BlackMisc::Aviation;

--- a/src/blackmisc/stacktrace.cpp
+++ b/src/blackmisc/stacktrace.cpp
@@ -8,14 +8,12 @@

 #include "blackmisc/stacktrace.h"

-#include <stdlib.h>
 #include <QByteArray>
 #include <QLatin1String>
 #include <QStringBuilder>
 #include <QMutexLocker>
 #include <array>
 #include <cstdlib>
-#include <mutex>

 #if defined(Q_CC_MSVC)
 #   include <Windows.h>
--- a/src/blackmisc/statusexception.cpp
+++ b/src/blackmisc/statusexception.cpp
@@ -9,7 +9,6 @@
 #include "blackmisc/statusexception.h"

 #include <QReadLocker>
-#include <QString>
 #include <QWriteLocker>

 namespace BlackMisc
--- a/src/blackmisc/statusmessagelist.cpp
+++ b/src/blackmisc/statusmessagelist.cpp
@@ -10,15 +10,11 @@

 #include "blackmisc/statusmessagelist.h"
 #include "blackmisc/propertyindexlist.h"
-#include "blackmisc/mixin/mixincompare.h"
-#include "blackmisc/range.h"

-#include <QJsonObject>
 #include <QJsonValue>
 #include <QString>
 #include <QStringBuilder>
 #include <QStringList>
-#include <tuple>

 BLACK_DEFINE_SEQUENCE_MIXINS(BlackMisc, CStatusMessage, CStatusMessageList)

--- a/src/blackmisc/swiftdirectories.cpp
+++ b/src/blackmisc/swiftdirectories.cpp
@@ -18,7 +18,6 @@
 #include <QDir>
 #include <QUrl>
 #include <QSet>
-#include <QDateTime>
 #include <QRegularExpression>
 #include <QStandardPaths>

--- a/src/blackmisc/threadutils.cpp
+++ b/src/blackmisc/threadutils.cpp
@@ -12,8 +12,6 @@
 #include <QObject>
 #include <QThread>
 #include <QtGlobal>
-#include <QPointer>
-#include <QTimer>
 #include <thread>
 #include <sstream>

--- a/src/blackmisc/timestampbased.cpp
+++ b/src/blackmisc/timestampbased.cpp
@@ -12,9 +12,7 @@
 #include "blackmisc/verify.h"

 #include <QByteArray>
-#include <QDate>
-#include <QTime>
-#include <Qt>
+#include <QDateTime>

 namespace BlackMisc
 {
--- a/src/blackmisc/valuecache.cpp
+++ b/src/blackmisc/valuecache.cpp
@@ -11,7 +11,6 @@
 #include "blackmisc/valuecache.h"
 #include "blackmisc/atomicfile.h"
 #include "blackmisc/swiftdirectories.h"
-#include "blackmisc/directoryutils.h"
 #include "blackmisc/identifier.h"
 #include "blackmisc/lockfree.h"
 #include "blackmisc/logcategories.h"
@@ -32,7 +31,6 @@
 #include <QStandardPaths>
 #include <QThread>
 #include <Qt>
-#include <algorithm>
 #include <atomic>
 #include <exception>
 #include <functional>
--- a/src/blackmisc/variant.cpp
+++ b/src/blackmisc/variant.cpp
@@ -10,14 +10,11 @@

 #include "blackmisc/variant.h"
 #include "blackmisc/imageutils.h"
-#include "blackmisc/dictionary.h"
 #include "blackmisc/logmessage.h"
 #include "blackmisc/propertyindexref.h"
 #include "blackmisc/statusmessage.h"
 #include "blackmisc/stringutils.h"

-#include <QByteArray>
-#include <QChar>
 #include <QDBusArgument>
 #include <QDBusVariant>
 #include <QDate>
@@ -25,7 +22,7 @@
 #include <QHash>
 #include <QJsonArray>
 #include <QJsonValue>
-#include <QStringList>
+#include <QString>
 #include <QTime>
 #include <Qt>
 #include <QtDebug>
--- a/src/blackmisc/variantlist.cpp
+++ b/src/blackmisc/variantlist.cpp
@@ -8,7 +8,6 @@

 #include "blackmisc/variantlist.h"
 #include <algorithm>
-#include <iterator>

 BLACK_DEFINE_SEQUENCE_MIXINS(BlackMisc, CVariant, CVariantList)

--- a/src/blackmisc/worker.cpp
+++ b/src/blackmisc/worker.cpp
@@ -14,7 +14,6 @@
 #include <future>
 #include <QTimer>
 #include <QPointer>
-#include <QCoreApplication>

 #ifdef Q_OS_WIN32
 #include <Windows.h>