diff --git a/libcxx/CREDITS.TXT b/libcxx/CREDITS.TXT
--- a/libcxx/CREDITS.TXT
+++ b/libcxx/CREDITS.TXT
@@ -113,6 +113,10 @@
 E: jroelofS@jroelofs.com
 D: Remote testing, Newlib port, baremetal/single-threaded support.
 
+N: Kent Ross
+E: k@mad.cash
+D: C++20 language feature support
+
 N: Jonathan Sauer
 D: Minor patches, mostly related to constexpr
 
@@ -149,11 +153,11 @@
 E: xingxue@ca.ibm.com
 D: AIX port
 
-N: Zhihao Yuan
-E: lichray@gmail.com
-D: Standard compatibility fixes.
-
 N: Jeffrey Yasskin
 E: jyasskin@gmail.com
 E: jyasskin@google.com
 D: Linux fixes.
+
+N: Zhihao Yuan
+E: lichray@gmail.com
+D: Standard compatibility fixes.
diff --git a/libcxx/include/compare b/libcxx/include/compare
--- a/libcxx/include/compare
+++ b/libcxx/include/compare
@@ -123,7 +123,6 @@
 #include <__compare/common_comparison_category.h>
 #include <__compare/ordering.h>
 #include <__config>
-#include <type_traits>
 
 #ifndef _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
 #pragma GCC system_header