diff --git a/src/corelib/tools/qmargins.h b/src/corelib/tools/qmargins.h
index 2d494f4417..0b4f74e9dd 100644
--- a/src/corelib/tools/qmargins.h
+++ b/src/corelib/tools/qmargins.h
@@ -6,6 +6,9 @@
 
 #include <QtCore/qnamespace.h>
 
+#include <QtCore/q20type_traits.h>
+#include <QtCore/q23utility.h>
+
 QT_BEGIN_NAMESPACE
 
 class QMarginsF;
@@ -66,17 +69,17 @@ private:
     template <std::size_t I,
               typename M,
               std::enable_if_t<(I < 4), bool> = true,
-              std::enable_if_t<std::is_same_v<std::decay_t<M>, QMargins>, bool> = true>
+              std::enable_if_t<std::is_same_v<q20::remove_cvref_t<M>, QMargins>, bool> = true>
     friend constexpr decltype(auto) get(M &&m) noexcept
     {
         if constexpr (I == 0)
-            return (std::forward<M>(m).m_left);
+            return q23::forward_like<M>(m.m_left);
         else if constexpr (I == 1)
-            return (std::forward<M>(m).m_top);
+            return q23::forward_like<M>(m.m_top);
         else if constexpr (I == 2)
-            return (std::forward<M>(m).m_right);
+            return q23::forward_like<M>(m.m_right);
         else if constexpr (I == 3)
-            return (std::forward<M>(m).m_bottom);
+            return q23::forward_like<M>(m.m_bottom);
     }
 };
 
@@ -315,17 +318,17 @@ private:
     template <std::size_t I,
               typename M,
               std::enable_if_t<(I < 4), bool> = true,
-              std::enable_if_t<std::is_same_v<std::decay_t<M>, QMarginsF>, bool> = true>
+              std::enable_if_t<std::is_same_v<q20::remove_cvref_t<M>, QMarginsF>, bool> = true>
     friend constexpr decltype(auto) get(M &&m) noexcept
     {
         if constexpr (I == 0)
-            return (std::forward<M>(m).m_left);
+            return q23::forward_like<M>(m.m_left);
         else if constexpr (I == 1)
-            return (std::forward<M>(m).m_top);
+            return q23::forward_like<M>(m.m_top);
         else if constexpr (I == 2)
-            return (std::forward<M>(m).m_right);
+            return q23::forward_like<M>(m.m_right);
         else if constexpr (I == 3)
-            return (std::forward<M>(m).m_bottom);
+            return q23::forward_like<M>(m.m_bottom);
     }
 };
 
diff --git a/src/corelib/tools/qpoint.h b/src/corelib/tools/qpoint.h
index 48c5e91f62..425948966d 100644
--- a/src/corelib/tools/qpoint.h
+++ b/src/corelib/tools/qpoint.h
@@ -6,6 +6,9 @@
 
 #include <QtCore/qnamespace.h>
 
+#include <QtCore/q20type_traits.h>
+#include <QtCore/q23utility.h>
+
 #if defined(Q_OS_DARWIN) || defined(Q_QDOC)
 struct CGPoint;
 #endif
@@ -86,13 +89,13 @@ private:
     template <std::size_t I,
               typename P,
               std::enable_if_t<(I < 2), bool> = true,
-              std::enable_if_t<std::is_same_v<std::decay_t<P>, QPoint>, bool> = true>
+              std::enable_if_t<std::is_same_v<q20::remove_cvref_t<P>, QPoint>, bool> = true>
     friend constexpr decltype(auto) get(P &&p) noexcept
     {
         if constexpr (I == 0)
-            return (std::forward<P>(p).xp);
+            return q23::forward_like<P>(p.xp);
         else if constexpr (I == 1)
-            return (std::forward<P>(p).yp);
+            return q23::forward_like<P>(p.yp);
     }
 };
 
@@ -283,13 +286,13 @@ private:
     template <std::size_t I,
               typename P,
               std::enable_if_t<(I < 2), bool> = true,
-              std::enable_if_t<std::is_same_v<std::decay_t<P>, QPointF>, bool> = true>
+              std::enable_if_t<std::is_same_v<q20::remove_cvref_t<P>, QPointF>, bool> = true>
     friend constexpr decltype(auto) get(P &&p) noexcept
     {
         if constexpr (I == 0)
-            return (std::forward<P>(p).xp);
+            return q23::forward_like<P>(p.xp);
         else if constexpr (I == 1)
-            return (std::forward<P>(p).yp);
+            return q23::forward_like<P>(p.yp);
     }
 };
 
diff --git a/src/corelib/tools/qsize.h b/src/corelib/tools/qsize.h
index 71066c35c0..dac2a48908 100644
--- a/src/corelib/tools/qsize.h
+++ b/src/corelib/tools/qsize.h
@@ -8,6 +8,9 @@
 #include <QtCore/qhashfunctions.h>
 #include <QtCore/qmargins.h>
 
+#include <QtCore/q20type_traits.h>
+#include <QtCore/q23utility.h>
+
 #if defined(Q_OS_DARWIN) || defined(Q_QDOC)
 struct CGSize;
 #endif
@@ -83,13 +86,13 @@ private:
     template <std::size_t I,
               typename S,
               std::enable_if_t<(I < 2), bool> = true,
-              std::enable_if_t<std::is_same_v<std::decay_t<S>, QSize>, bool> = true>
+              std::enable_if_t<std::is_same_v<q20::remove_cvref_t<S>, QSize>, bool> = true>
     friend constexpr decltype(auto) get(S &&s) noexcept
     {
         if constexpr (I == 0)
-            return (std::forward<S>(s).wd);
+            return q23::forward_like<S>(s.wd);
         else if constexpr (I == 1)
-            return (std::forward<S>(s).ht);
+            return q23::forward_like<S>(s.ht);
     }
 };
 Q_DECLARE_TYPEINFO(QSize, Q_RELOCATABLE_TYPE);
@@ -272,13 +275,13 @@ private:
     template <std::size_t I,
               typename S,
               std::enable_if_t<(I < 2), bool> = true,
-              std::enable_if_t<std::is_same_v<std::decay_t<S>, QSizeF>, bool> = true>
+              std::enable_if_t<std::is_same_v<q20::remove_cvref_t<S>, QSizeF>, bool> = true>
     friend constexpr decltype(auto) get(S &&s) noexcept
     {
         if constexpr (I == 0)
-            return (std::forward<S>(s).wd);
+            return q23::forward_like<S>(s.wd);
         else if constexpr (I == 1)
-            return (std::forward<S>(s).ht);
+            return q23::forward_like<S>(s.ht);
     }
 };
 Q_DECLARE_TYPEINFO(QSizeF, Q_RELOCATABLE_TYPE);
diff --git a/src/gui/math3d/qvectornd.h b/src/gui/math3d/qvectornd.h
index 0f3ce758a8..639b8f0e5a 100644
--- a/src/gui/math3d/qvectornd.h
+++ b/src/gui/math3d/qvectornd.h
@@ -10,6 +10,9 @@
 #include <QtCore/qrect.h>
 #include <QtCore/qmath.h>
 
+#include <QtCore/q20type_traits.h>
+#include <QtCore/q23utility.h>
+
 QT_BEGIN_NAMESPACE
 
 class QVector2D;
@@ -145,10 +148,10 @@ private:
     template <std::size_t I,
               typename V,
               std::enable_if_t<(I < 2), bool> = true,
-              std::enable_if_t<std::is_same_v<std::decay_t<V>, QVector2D>, bool> = true>
+              std::enable_if_t<std::is_same_v<q20::remove_cvref_t<V>, QVector2D>, bool> = true>
     friend constexpr decltype(auto) get(V &&vec) noexcept
     {
-        return (std::forward<V>(vec).v[I]);
+        return q23::forward_like<V>(vec.v[I]);
     }
 };
 
@@ -304,10 +307,10 @@ private:
     template <std::size_t I,
               typename V,
               std::enable_if_t<(I < 3), bool> = true,
-              std::enable_if_t<std::is_same_v<std::decay_t<V>, QVector3D>, bool> = true>
+              std::enable_if_t<std::is_same_v<q20::remove_cvref_t<V>, QVector3D>, bool> = true>
     friend constexpr decltype(auto) get(V &&vec) noexcept
     {
-        return (std::forward<V>(vec).v[I]);
+        return q23::forward_like<V>(vec.v[I]);
     }
 };
 
@@ -456,10 +459,10 @@ private:
     template <std::size_t I,
               typename V,
               std::enable_if_t<(I < 4), bool> = true,
-              std::enable_if_t<std::is_same_v<std::decay_t<V>, QVector4D>, bool> = true>
+              std::enable_if_t<std::is_same_v<q20::remove_cvref_t<V>, QVector4D>, bool> = true>
     friend constexpr decltype(auto) get(V &&vec) noexcept
     {
-        return (std::forward<V>(vec).v[I]);
+        return q23::forward_like<V>(vec.v[I]);
     }
 };