diff --git a/tests/unit/bswap.h b/tests/unit/bswap.h
deleted file mode 100644
index 832badab..00000000
--- a/tests/unit/bswap.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copy from google/cityhash:src/city.cc (MIT)
-
-#ifdef _MSC_VER
-
-#include <stdlib.h>
-#define bswap_32(x) _byteswap_ulong(x)
-#define bswap_64(x) _byteswap_uint64(x)
-
-#elif defined(__APPLE__)
-
-// Mac OS X / Darwin features
-#include <libkern/OSByteOrder.h>
-#define bswap_32(x) OSSwapInt32(x)
-#define bswap_64(x) OSSwapInt64(x)
-
-#elif defined(__sun) || defined(sun)
-
-#include <sys/byteorder.h>
-#define bswap_32(x) BSWAP_32(x)
-#define bswap_64(x) BSWAP_64(x)
-
-#elif defined(__FreeBSD__)
-
-#include <sys/endian.h>
-#define bswap_32(x) bswap32(x)
-#define bswap_64(x) bswap64(x)
-
-#elif defined(__OpenBSD__)
-
-#include <sys/types.h>
-#define bswap_32(x) swap32(x)
-#define bswap_64(x) swap64(x)
-
-#elif defined(__NetBSD__)
-
-#include <sys/types.h>
-#include <machine/bswap.h>
-#if defined(__BSWAP_RENAME) && !defined(__bswap_32)
-#define bswap_32(x) bswap32(x)
-#define bswap_64(x) bswap64(x)
-#endif
-
-#else
-
-#include <byteswap.h>
-
-#endif
\ No newline at end of file
diff --git a/tests/unit/unicorn_test.h b/tests/unit/unicorn_test.h
index 3d32843f..dbc17a27 100644
--- a/tests/unit/unicorn_test.h
+++ b/tests/unit/unicorn_test.h
@@ -6,7 +6,24 @@
 #include <unicorn/unicorn.h>
 #include "acutest.h"
 #include "endian.h"
-#include "bswap.h"
+
+// Copied from glibc-2.29
+
+/* Swap bytes in 32 bit value.  */
+#define bswap_32(x) \
+     ((((x) & 0xff000000u) >> 24) | (((x) & 0x00ff0000u) >>  8) |	      \
+      (((x) & 0x0000ff00u) <<  8) | (((x) & 0x000000ffu) << 24))
+
+/* Swap bytes in 64 bit value.  */
+#define bswap_64(x) \
+      ((((x) & 0xff00000000000000ull) >> 56)				      \
+      | (((x) & 0x00ff000000000000ull) >> 40)				      \
+      | (((x) & 0x0000ff0000000000ull) >> 24)				      \
+      | (((x) & 0x000000ff00000000ull) >> 8)				      \
+      | (((x) & 0x00000000ff000000ull) << 8)				      \
+      | (((x) & 0x0000000000ff0000ull) << 24)				      \
+      | (((x) & 0x000000000000ff00ull) << 40)				      \
+      | (((x) & 0x00000000000000ffull) << 56))
 
 /**
  * Assert that err matches expect