diff --git a/src/common/Rect.hxx b/src/common/Rect.hxx
index 4b6c3ed4e..e0c56d2c0 100644
--- a/src/common/Rect.hxx
+++ b/src/common/Rect.hxx
@@ -39,13 +39,12 @@ struct Point
   explicit constexpr Point(Int32 x1, Int32 y1) : x{x1}, y{y1} { }
   explicit Point(string_view p) {
     char c = '\0';
-    istringstream buf(string{p});  // TODO: fixed in C++20
+    istringstream buf(string{p});  // TODO: fixed in C++23
     buf >> x >> c >> y;
     if(c != 'x')
       x = y = 0;
   }
-  bool operator==(const Point& p) const { return x == p.x && y == p.y; }
-  bool operator!=(const Point& p) const { return !(*this == p);        }
+  std::strong_ordering operator<=>(const Point& p) const = default;
 
   friend ostream& operator<<(ostream& os, const Point& p) {
     os << p.x << "x" << p.y;
@@ -62,7 +61,7 @@ struct Size
   explicit constexpr Size(uInt32 w1, uInt32 h1) : w{w1}, h{h1} { }
   explicit Size(string_view s) {
     char c = '\0';
-    istringstream buf(string{s});  // TODO: fixed in C++20
+    istringstream buf(string{s});  // TODO: fixed in C++23
     buf >> w >> c >> h;
     if(c != 'x')
       w = h = 0;
@@ -74,6 +73,7 @@ struct Size
     h = BSPF::clamp(h, lower_h, upper_h);
   }
 
+  // TODO: can this be replaced by <=> operator?
   bool operator==(const Size& s) const { return w == s.w && h == s.h; }
   bool operator< (const Size& s) const { return w <  s.w && h <  s.h; }
   bool operator> (const Size& s) const { return w >  s.w || h >  s.h; }
@@ -175,10 +175,7 @@ public:
     return r.left != x || r.top != y;
   }
 
-  bool operator==(const Rect& r) const {
-    return top == r.top && left == r.left && bottom == r.bottom && right == r.right;
-  }
-  bool operator!=(const Rect& r) const { return !(*this == r); }
+  std::strong_ordering operator<=>(const Rect& r) const = default;
 
   friend ostream& operator<<(ostream& os, const Rect& r) {
     os << r.point() << "," << r.size();
diff --git a/src/common/Variant.hxx b/src/common/Variant.hxx
index e5bd0ecfc..69df7e9e0 100644
--- a/src/common/Variant.hxx
+++ b/src/common/Variant.hxx
@@ -70,7 +70,7 @@ class Variant
     Common::Point toPoint() const { return Common::Point(data); }
 
     // Comparison
-    bool operator<=>(const Variant& v) const = default;
+    std::strong_ordering operator<=>(const Variant& v) const = default;
 
     friend ostream& operator<<(ostream& os, const Variant& v) {
       return os << v.data;
diff --git a/src/common/bspf.hxx b/src/common/bspf.hxx
index 906746c4b..4fd5fd3b0 100644
--- a/src/common/bspf.hxx
+++ b/src/common/bspf.hxx
@@ -41,6 +41,7 @@ using uInt64 = uint64_t;
 // types: cout, cerr, string, ostream, istream, etc.
 #include <array>
 #include <algorithm>
+#include <compare>
 #include <iostream>
 #include <fstream>
 #include <functional>