diff --git a/Libraries/LibC/endian.h b/Libraries/LibC/endian.h
index 0b71a6af40..aa5306050b 100644
--- a/Libraries/LibC/endian.h
+++ b/Libraries/LibC/endian.h
@@ -18,6 +18,21 @@ __BEGIN_DECLS
 
 #include <stdint.h>
 
+static __inline uint16_t __bswap16(uint16_t x)
+{
+	return __builtin_bswap16(x);
+}
+
+static __inline uint32_t __bswap32(uint32_t x)
+{
+	return __builtin_bswap32(x)
+}
+
+static __inline uint64_t __bswap64(uint64_t x)
+{
+	return __builtin_bswap64(x)
+}
+
 #define LITTLE_ENDIAN	__LITTLE_ENDIAN
 #define BIG_ENDIAN	__BIG_ENDIAN
 #define PDP_ENDIAN	__PDP_ENDIAN
@@ -33,16 +48,34 @@ __BEGIN_DECLS
 #define htole64(x) (uint64_t)(x)
 #define le64toh(x) (uint64_t)(x)
 #define letoh64(x) (uint64_t)(x)
+#define htobe16(x) __bswap16(x)
+#define be16toh(x) __bswap16(x)
+#define betoh16(x) __bswap16(x)
+#define htobe32(x) __bswap32(x)
+#define be32toh(x) __bswap32(x)
+#define betoh32(x) __bswap32(x)
+#define htobe64(x) __bswap64(x)
+#define be64toh(x) __bswap64(x)
+#define betoh64(x) __bswap64(x)
 #else
-#define htobe16(x) (uint16_t)(x)
-#define be16toh(x) (uint16_t)(x)
-#define betoh16(x) (uint16_t)(x)
-#define htobe32(x) (uint32_t)(x)
-#define be32toh(x) (uint32_t)(x)
-#define betoh32(x) (uint32_t)(x)
-#define htobe64(x) (uint64_t)(x)
-#define be64toh(x) (uint64_t)(x)
-#define betoh64(x) (uint64_t)(x)
+#define ltobe16(x) (uint16_t)(x)
+#define le16toh(x) (uint16_t)(x)
+#define letoh16(x) (uint16_t)(x)
+#define htole32(x) (uint32_t)(x)
+#define le32toh(x) (uint32_t)(x)
+#define letoh32(x) (uint32_t)(x)
+#define htole64(x) (uint64_t)(x)
+#define le64toh(x) (uint64_t)(x)
+#define letoh64(x) (uint64_t)(x)
+#define htole16(x) __bswap16(x)
+#define le16toh(x) __bswap16(x)
+#define letoh16(x) __bswap16(x)
+#define htole32(x) __bswap32(x)
+#define le32toh(x) __bswap32(x)
+#define letoh32(x) __bswap32(x)
+#define htole64(x) __bswap64(x)
+#define le64toh(x) __bswap64(x)
+#define letoh64(x) __bswap64(x)
 #endif
 
 #endif