diff --git a/AK/Format.cpp b/AK/Format.cpp
index a4823b8e755..aad9a12dabf 100644
--- a/AK/Format.cpp
+++ b/AK/Format.cpp
@@ -182,13 +182,18 @@ void Formatter<T, typename EnableIf<IsIntegral<T>::value>::Type>::format(StringB
 
 template struct Formatter<StringView>;
 template struct Formatter<String>;
-template struct Formatter<u8, void>;
-template struct Formatter<u16, void>;
-template struct Formatter<u32, void>;
-template struct Formatter<u64, void>;
-template struct Formatter<i8, void>;
-template struct Formatter<i16, void>;
-template struct Formatter<i32, void>;
-template struct Formatter<i64, void>;
+template struct Formatter<unsigned char, void>;
+template struct Formatter<unsigned short, void>;
+template struct Formatter<unsigned int, void>;
+template struct Formatter<unsigned long, void>;
+template struct Formatter<unsigned long long, void>;
+template struct Formatter<char, void>;
+template struct Formatter<short, void>;
+template struct Formatter<int, void>;
+template struct Formatter<long, void>;
+template struct Formatter<long long, void>;
+
+// C++ is weird.
+template struct Formatter<signed char, void>;
 
 } // namespace AK
diff --git a/AK/NeverDestroyed.h b/AK/NeverDestroyed.h
index 361f5190433..64035a759a2 100644
--- a/AK/NeverDestroyed.h
+++ b/AK/NeverDestroyed.h
@@ -27,7 +27,7 @@
 #pragma once
 
 #include <AK/Noncopyable.h>
-#include <AK/StdLibExtras.h>
+#include <AK/Types.h>
 
 namespace AK {
 
diff --git a/AK/StdLibExtras.h b/AK/StdLibExtras.h
index 68a662bd9a2..9de44d09639 100644
--- a/AK/StdLibExtras.h
+++ b/AK/StdLibExtras.h
@@ -26,11 +26,6 @@
 
 #pragma once
 
-typedef __UINT64_TYPE__ u64;
-typedef __UINT32_TYPE__ u32;
-typedef __UINT16_TYPE__ u16;
-typedef __UINT8_TYPE__ u8;
-
 #define UNUSED_PARAM(x) (void)x
 
 inline constexpr unsigned round_up_to_power_of_two(unsigned value, unsigned power_of_two)
@@ -461,16 +456,19 @@ template<typename T>
 struct __IsIntegral : FalseType {
 };
 template<>
-struct __IsIntegral<u8> : TrueType {
+struct __IsIntegral<unsigned char> : TrueType {
 };
 template<>
-struct __IsIntegral<u16> : TrueType {
+struct __IsIntegral<unsigned short> : TrueType {
 };
 template<>
-struct __IsIntegral<u32> : TrueType {
+struct __IsIntegral<unsigned int> : TrueType {
 };
 template<>
-struct __IsIntegral<u64> : TrueType {
+struct __IsIntegral<unsigned long> : TrueType {
+};
+template<>
+struct __IsIntegral<unsigned long long> : TrueType {
 };
 template<typename T>
 using IsIntegral = __IsIntegral<typename MakeUnsigned<typename RemoveCV<T>::Type>::Type>;
diff --git a/AK/Tests/TestFormat.cpp b/AK/Tests/TestFormat.cpp
index 90d682e9db1..4e4a284ae51 100644
--- a/AK/Tests/TestFormat.cpp
+++ b/AK/Tests/TestFormat.cpp
@@ -43,7 +43,7 @@ TEST_CASE(format_integers)
     EXPECT_EQ(AK::format("{}", -17), "-17");
     EXPECT_EQ(AK::format("{:04}", 13), "0013");
     EXPECT_EQ(AK::format("{:08x}", 4096), "00001000");
-    // EXPECT_EQ(AK::format("{}", 0x1111222233334444ull), "1111222233334444");
+    EXPECT_EQ(AK::format("{:x}", 0x1111222233334444ull), "1111222233334444");
 }
 
 TEST_CASE(reorder_format_arguments)