diff --git a/src/blackmisc/algorithm.h b/src/blackmisc/algorithm.h
index 35b3b7975..1771f6c47 100644
--- a/src/blackmisc/algorithm.h
+++ b/src/blackmisc/algorithm.h
@@ -50,7 +50,6 @@ namespace BlackMisc
         //! \threadsafe
         inline std::mt19937 &defaultRandomGenerator()
         {
-            //! \fixme Qt 5.10: Use QRandomGenerator.
             static QThreadStorage<std::mt19937> rng;
             if (rng.hasLocalData()) { rng.setLocalData(std::mt19937(static_cast<std::mt19937::result_type>(QRandomGenerator::global()->generate()))); }
             return rng.localData();
diff --git a/src/blackmisc/aviation/aircrafticaocode.cpp b/src/blackmisc/aviation/aircrafticaocode.cpp
index fe5bca76f..da0cd22fa 100644
--- a/src/blackmisc/aviation/aircrafticaocode.cpp
+++ b/src/blackmisc/aviation/aircrafticaocode.cpp
@@ -22,7 +22,6 @@
 #include <QMultiMap>
 #include <QRegularExpression>
 #include <QRegularExpressionMatch>
-#include <QThreadStorage>
 #include <QStringBuilder>
 #include <Qt>
 #include <QtGlobal>
diff --git a/src/blackmisc/aviation/airlineicaocode.cpp b/src/blackmisc/aviation/airlineicaocode.cpp
index 1cc458b64..0696bd045 100644
--- a/src/blackmisc/aviation/airlineicaocode.cpp
+++ b/src/blackmisc/aviation/airlineicaocode.cpp
@@ -25,7 +25,6 @@
 #include <QJsonValue>
 #include <QRegularExpression>
 #include <QRegularExpressionMatch>
-#include <QThreadStorage>
 #include <QStringBuilder>
 #include <QDir>
 #include <Qt>
diff --git a/src/blackmisc/aviation/callsign.cpp b/src/blackmisc/aviation/callsign.cpp
index 1501c170e..db3ced583 100644
--- a/src/blackmisc/aviation/callsign.cpp
+++ b/src/blackmisc/aviation/callsign.cpp
@@ -13,7 +13,6 @@
 #include <QRegularExpression>
 #include <QRegularExpressionMatch>
 #include <QStringList>
-#include <QThreadStorage>
 #include <Qt>
 #include <QtGlobal>
 
diff --git a/src/blackmisc/loghandler.cpp b/src/blackmisc/loghandler.cpp
index 4c5cb6fe1..04ef52894 100644
--- a/src/blackmisc/loghandler.cpp
+++ b/src/blackmisc/loghandler.cpp
@@ -40,7 +40,6 @@ namespace BlackMisc
     }
 
     //! Qt message handler
-    //! \todo Qt 5.10: Use invokeMethod() overload taking pointer-to-member-function.
     void messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &message)
     {
         const CStatusMessage statusMessage(type, context, message);
diff --git a/src/blackmisc/math/mathutils.cpp b/src/blackmisc/math/mathutils.cpp
index ef55c0566..1ee8afe6f 100644
--- a/src/blackmisc/math/mathutils.cpp
+++ b/src/blackmisc/math/mathutils.cpp
@@ -10,7 +10,6 @@
 #include "blackmisc/math/mathutils.h"
 #include "blackmisc/verify.h"
 
-#include <QThreadStorage>
 #include <QTime>
 #include <QtGlobal>
 #include <algorithm>
diff --git a/src/blackmisc/network/user.cpp b/src/blackmisc/network/user.cpp
index d2197cdcb..76de89e4b 100644
--- a/src/blackmisc/network/user.cpp
+++ b/src/blackmisc/network/user.cpp
@@ -17,7 +17,6 @@
 #include <QChar>
 #include <QRegularExpression>
 #include <QRegularExpressionMatch>
-#include <QThreadStorage>
 #include <Qt>
 #include <QtGlobal>
 #include <QStringBuilder>
diff --git a/src/blackmisc/pq/pqstring.cpp b/src/blackmisc/pq/pqstring.cpp
index 342ff5138..b6d8b0a93 100644
--- a/src/blackmisc/pq/pqstring.cpp
+++ b/src/blackmisc/pq/pqstring.cpp
@@ -22,7 +22,6 @@
 
 #include <QLocale>
 #include <QRegularExpression>
-#include <QThreadStorage>
 #include <QtDebug>
 
 namespace BlackMisc