diff --git a/fxg1a/dump.c b/fxg1a/dump.c
index cb6ed4c..94e8afa 100644
--- a/fxg1a/dump.c
+++ b/fxg1a/dump.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <string.h>
-#include <endian.h>
+#include <endianness.h>
 
 #include <fxg1a.h>
 #include <g1a.h>
diff --git a/fxg1a/edit.c b/fxg1a/edit.c
index 65bff39..bb14496 100644
--- a/fxg1a/edit.c
+++ b/fxg1a/edit.c
@@ -1,7 +1,7 @@
 #include <fxg1a.h>
 #include <stdio.h>
 #include <string.h>
-#include <endian.h>
+#include <endianness.h>
 
 /* sign(): Sign header by filling fixed fields and checksums */
 void sign(struct g1a *g1a, size_t size)
diff --git a/fxg1a/endianness.h b/fxg1a/endianness.h
new file mode 100644
index 0000000..30361e2
--- /dev/null
+++ b/fxg1a/endianness.h
@@ -0,0 +1,33 @@
+//---
+//	Cross-platform endianness conversion. (seriously?)
+//---
+
+#ifndef FX_ENDIANNESS
+#define FX_ENDIANNESS
+
+#if defined(__APPLE__)
+
+  #include <libkern/OSByteOrder.h>
+
+  #define htobe16(x) OSSwapHostToBigInt16(x)
+  #define htole16(x) OSSwapHostToLittleInt16(x)
+  #define be16toh(x) OSSwapBigToHostInt16(x)
+  #define le16toh(x) OSSwapLittleToHostInt16(x)
+
+  #define htobe32(x) OSSwapHostToBigInt32(x)
+  #define htole32(x) OSSwapHostToLittleInt32(x)
+  #define be32toh(x) OSSwapBigToHostInt32(x)
+  #define le32toh(x) OSSwapLittleToHostInt32(x)
+
+  #define htobe64(x) OSSwapHostToBigInt64(x)
+  #define htole64(x) OSSwapHostToLittleInt64(x)
+  #define be64toh(x) OSSwapBigToHostInt64(x)
+  #define le64toh(x) OSSwapLittleToHostInt64(x)
+
+#elif defined(__linux__)
+
+  #include <sys/types.h>
+
+#endif
+
+#endif /* FX_ENDIANNESS */
diff --git a/fxg1a/util.c b/fxg1a/util.c
index f84aca5..fa3e0cb 100644
--- a/fxg1a/util.c
+++ b/fxg1a/util.c
@@ -1,5 +1,5 @@
 #include <string.h>
-#include <endian.h>
+#include <endianness.h>
 #include <fxg1a.h>
 
 /*
diff --git a/fxos/endianness.h b/fxos/endianness.h
new file mode 100644
index 0000000..30361e2
--- /dev/null
+++ b/fxos/endianness.h
@@ -0,0 +1,33 @@
+//---
+//	Cross-platform endianness conversion. (seriously?)
+//---
+
+#ifndef FX_ENDIANNESS
+#define FX_ENDIANNESS
+
+#if defined(__APPLE__)
+
+  #include <libkern/OSByteOrder.h>
+
+  #define htobe16(x) OSSwapHostToBigInt16(x)
+  #define htole16(x) OSSwapHostToLittleInt16(x)
+  #define be16toh(x) OSSwapBigToHostInt16(x)
+  #define le16toh(x) OSSwapLittleToHostInt16(x)
+
+  #define htobe32(x) OSSwapHostToBigInt32(x)
+  #define htole32(x) OSSwapHostToLittleInt32(x)
+  #define be32toh(x) OSSwapBigToHostInt32(x)
+  #define le32toh(x) OSSwapLittleToHostInt32(x)
+
+  #define htobe64(x) OSSwapHostToBigInt64(x)
+  #define htole64(x) OSSwapHostToLittleInt64(x)
+  #define be64toh(x) OSSwapBigToHostInt64(x)
+  #define le64toh(x) OSSwapLittleToHostInt64(x)
+
+#elif defined(__linux__)
+
+  #include <sys/types.h>
+
+#endif
+
+#endif /* FX_ENDIANNESS */
diff --git a/fxos/info.c b/fxos/info.c
index 37bfde7..e751435 100644
--- a/fxos/info.c
+++ b/fxos/info.c
@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <endian.h>
+#include <endianness.h>
 
 char const *info_str =
 "Header information:\n"
diff --git a/fxos/os.c b/fxos/os.c
index cf374b2..6a39fc1 100644
--- a/fxos/os.c
+++ b/fxos/os.c
@@ -1,4 +1,4 @@
-#include <endian.h>
+#include <endianness.h>
 #include <string.h>
 
 #include <fxos.h>