diff --git a/util/cbfstool/test.c b/util/cbfstool/test.c
index 2426e3e7..b63522c8 100644
--- a/util/cbfstool/test.c
+++ b/util/cbfstool/test.c
@@ -8,6 +8,22 @@
 #include <string.h>
 #include <commonlib/bsd/helpers.h>

+#if defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+#define le64toh(x) (x)
+#define le32toh(x) (x)
+#define le16toh(x) (x)
+#define htole64(x) (x)
+#define htole32(x) (x)
+#define htole16(x) (x)
+#else
+#define le64toh(x) (__builtin_bswap64(x))
+#define le32toh(x) (__builtin_bswap32(x))
+#define le16toh(x) (__builtin_bswap16(x))
+#define htole64(x) (__builtin_bswap64(x))
+#define htole32(x) (__builtin_bswap32(x))
+#define htole16(x) (__builtin_bswap16(x))
+#endif
+
 static enum test_status { pass = EXIT_SUCCESS, fail = EXIT_FAILURE } status;

 static struct fmap *fmap_create_test(void)