diff --git a/options/ansi/include/bits/ansi/timespec.h b/options/ansi/include/bits/ansi/timespec.h
index cb0dfcf6ce..70d06eebe1 100644
--- a/options/ansi/include/bits/ansi/timespec.h
+++ b/options/ansi/include/bits/ansi/timespec.h
@@ -4,7 +4,6 @@
 
 #include <bits/ansi/time_t.h>
 #include <bits/field-padding.h>
-#include <endian.h>
 
 struct timespec {
 	time_t tv_sec;
diff --git a/options/internal/include/bits/field-padding.h b/options/internal/include/bits/field-padding.h
index d58257ff47..441984588c 100644
--- a/options/internal/include/bits/field-padding.h
+++ b/options/internal/include/bits/field-padding.h
@@ -1,11 +1,15 @@
 #ifndef MLIBC_FIELD_PADDING_H
 #define MLIBC_FIELD_PADDING_H
 
-#include <endian.h>
+#ifdef __GNUC__
 
 #define __MLIBC_FIELD_PADDED(T, F, PT) \
-  PT : (sizeof(PT)-sizeof(T))*8*(BYTE_ORDER == BIG_ENDIAN); \
+  PT : (sizeof(PT)-sizeof(T))*8*(__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__); \
   T F; \
-  PT : (sizeof(PT)-sizeof(T))*8*(BYTE_ORDER == LITTLE_ENDIAN)
+  PT : (sizeof(PT)-sizeof(T))*8*(__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+
+#else
+#error "Unsupported compiler"
+#endif
 
 #endif