diff --git a/src/blackmisc/logcategorylist.h b/src/blackmisc/logcategorylist.h
index ce5d6385a..a39cfe285 100644
--- a/src/blackmisc/logcategorylist.h
+++ b/src/blackmisc/logcategorylist.h
@@ -116,7 +116,7 @@ namespace BlackMisc
             {
                 CLogCategoryList list;
                 list.appendCategoriesFromMemberFunction(tag<T>(), THasGetLogCategories<T>());
-                list.appendCategoriesFromMetaType(tag<T>(), std::integral_constant<bool, QMetaTypeId<T>::Defined>());
+                list.appendCategoriesFromMetaType(tag<T>(), std::bool_constant<QMetaTypeId<T>::Defined>());
                 list.appendCategoriesFromMetaObject(tag<T>(), std::is_base_of<QObject, T>());
                 if (list.isEmpty()) { list.push_back(CLogCategories::uncategorized()); }
                 return list;
diff --git a/src/blackmisc/metaclass.h b/src/blackmisc/metaclass.h
index 0db0a868d..d3205f499 100644
--- a/src/blackmisc/metaclass.h
+++ b/src/blackmisc/metaclass.h
@@ -130,7 +130,7 @@ namespace BlackMisc
     struct MetaFlags : public std::integral_constant<quint64, F>
     {
         //! Implicit conversion to std::false_type (if F is zero) or std::true_type (if F is non-zero).
-        constexpr operator std::integral_constant<bool, static_cast<bool>(F)>() const { return {}; }
+        constexpr operator std::bool_constant<static_cast<bool>(F)>() const { return {}; }
     };
 
     /*!
diff --git a/src/blackmisc/mixin/mixincompare.h b/src/blackmisc/mixin/mixincompare.h
index f0fdfc08d..5ba85d395 100644
--- a/src/blackmisc/mixin/mixincompare.h
+++ b/src/blackmisc/mixin/mixincompare.h
@@ -70,7 +70,7 @@ namespace BlackMisc
             template <typename T, typename Flags>
             static bool membersEqual(const T &a, const T &b, Flags)
             {
-                return membersEqual(a, b, std::integral_constant<bool, static_cast<bool>(Flags::value & CaseInsensitiveComparison)>());
+                return membersEqual(a, b, std::bool_constant<static_cast<bool>(Flags::value & CaseInsensitiveComparison)>());
             }
             template <typename T>
             static bool membersEqual(const T &a, const T &b, std::true_type) { return a.compare(b, Qt::CaseInsensitive) == 0; }
@@ -135,7 +135,7 @@ namespace BlackMisc
             template <typename T, typename Flags>
             static bool membersLess(bool &io_greaterThan, const T &a, const T &b, Flags)
             {
-                using CaseInsensitive = std::integral_constant<bool, static_cast<bool>(Flags::value & CaseInsensitiveComparison)>;
+                using CaseInsensitive = std::bool_constant<static_cast<bool>(Flags::value & CaseInsensitiveComparison)>;
                 if (io_greaterThan) { return false; }
                 io_greaterThan = membersLess(b, a, CaseInsensitive());
                 return membersLess(a, b, CaseInsensitive());
@@ -171,7 +171,7 @@ namespace BlackMisc
             template <typename T, typename Flags>
             static int membersCompare(const T &a, const T &b, Flags)
             {
-                using CaseInsensitive = std::integral_constant<bool, static_cast<bool>(Flags::value & CaseInsensitiveComparison)>;
+                using CaseInsensitive = std::bool_constant<static_cast<bool>(Flags::value & CaseInsensitiveComparison)>;
                 return membersCompare(a, b, CaseInsensitive(), THasCompare<T, T>());
             }
             template <typename T, typename U>
diff --git a/src/blackmisc/mixin/mixindbus.h b/src/blackmisc/mixin/mixindbus.h
index f05b76d52..eb86d550a 100644
--- a/src/blackmisc/mixin/mixindbus.h
+++ b/src/blackmisc/mixin/mixindbus.h
@@ -95,7 +95,7 @@ namespace BlackMisc
                 constexpr auto meta = introspect<Derived>().without(MetaFlags<DisabledForMarshalling>());
                 meta.forEachMember([ &, this ](auto member)
                 {
-                    using lossless = std::integral_constant<bool, member.has(MetaFlags<LosslessMarshalling>())>;
+                    using lossless = std::bool_constant<member.has(MetaFlags<LosslessMarshalling>())>;
                     Private::marshallMember(arg, member.in(*this->derived()), lossless());
                 });
             }
@@ -107,7 +107,7 @@ namespace BlackMisc
                 constexpr auto meta = introspect<Derived>().without(MetaFlags<DisabledForMarshalling>());
                 meta.forEachMember([ &, this ](auto member)
                 {
-                    using lossless = std::integral_constant<bool, member.has(MetaFlags<LosslessMarshalling>())>;
+                    using lossless = std::bool_constant<member.has(MetaFlags<LosslessMarshalling>())>;
                     Private::unmarshallMember(arg, member.in(*this->derived()), lossless());
                 });
             }
diff --git a/src/blackmisc/variantprivate.h b/src/blackmisc/variantprivate.h
index a9e159f0a..5cf7d992d 100644
--- a/src/blackmisc/variantprivate.h
+++ b/src/blackmisc/variantprivate.h
@@ -171,7 +171,7 @@ namespace BlackMisc
             }
             virtual int getMetaTypeId() const override
             {
-                return maybeGetMetaTypeId(std::integral_constant<bool, QMetaTypeId<T>::Defined> {});
+                return maybeGetMetaTypeId(std::bool_constant<QMetaTypeId<T>::Defined> {});
             }
             virtual const void *upCastTo(const void *object, int metaTypeId) const override
             {