diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3162cb3ebd1b86c01f439e897d6c8a686f4603d4..aecab81681f1b6c9af752b891ce0d32a570661c9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,6 +15,9 @@ check_include_files("link.h" HAVE_LINK_H)
 check_include_files("unwind.h" HAVE_UNWIND_H)
 check_include_files("sys/resource.h" HAVE_GETRUSAGE)
 
+include(TestBigEndian)
+test_big_endian(HAVE_BIG_ENDIAN)
+
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
                ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 
diff --git a/src/config.h.in b/src/config.h.in
index 07b9d54eb1a294959f91bab9b62e32d82ce7ac17..03346215ee05299e67a8caac370eafe6b226730c 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -16,3 +16,5 @@
 #cmakedefine HAVE_UNWIND_H @HAVE_UNWIND_H@
 
 #cmakedefine HAVE_GETRUSAGE @HAVE_GETRUSAGE@
+
+#cmakedefine HAVE_BIG_ENDIAN @HAVE_BIG_ENDIAN@
diff --git a/src/util_hash.c b/src/util_hash.c
index a70cbb02ec0ef302816ac38ecf59485f7eb8458f..f68b3f2e346d86afbc316222399c09aea20a05f2 100644
--- a/src/util_hash.c
+++ b/src/util_hash.c
@@ -42,63 +42,21 @@
  * -------------------------------------------------------------------------------
  */
 
-#define _POSIX_C_SOURCE 200112L
+#include "config.h"
 
-#include <stdint.h> /* defines uint32_t etc */
-
-#include <sys/param.h> /* attempt to define endianness */
-
-#if (defined(__APPLE__) && defined(__MACH__))
-
-#if (defined(__DARWIN_BYTE_ORDER) \
-     && (__DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN))
-#define HASH_LITTLE_ENDIAN 1
-#define HASH_BIG_ENDIAN 0
-#else
-#define HASH_LITTLE_ENDIAN 0
-#define HASH_BIG_ENDIAN 1
-#endif
+#include "util_hash.h"
 
-#elif defined(_AIX)
+#include <stddef.h>
+#include <stdint.h>
 
-#if (defined(BYTE_ORDER) && (BYTE_ORDER == LITTLE_ENDIAN))
-#define HASH_LITTLE_ENDIAN 1
-#define HASH_BIG_ENDIAN 0
-#else
+#ifdef HAVE_BIG_ENDIAN
 #define HASH_LITTLE_ENDIAN 0
 #define HASH_BIG_ENDIAN 1
-#endif
-
-#elif defined(__linux)
-
-#include <endian.h>
-
-#if (defined(__BYTE_ORDER) && (__BYTE_ORDER == __LITTLE_ENDIAN))
-#define HASH_LITTLE_ENDIAN 1
-#define HASH_BIG_ENDIAN 0
 #else
-#define HASH_LITTLE_ENDIAN 0
-#define HASH_BIG_ENDIAN 1
-#endif
-
-#elif defined(_SX)
-
-#define HASH_LITTLE_ENDIAN 0
-#define HASH_BIG_ENDIAN 1
-
-#elif defined(__NEC__)
-
 #define HASH_LITTLE_ENDIAN 1
 #define HASH_BIG_ENDIAN 0
-
-#else
-
-#error "Couldn't determine endianness."
-
 #endif
 
-#include "util_hash.h"
-
 #define rot(x, k) (((x) << (k)) | ((x) >> (32 - (k))))
 
 /*
diff --git a/src/util_hash.h b/src/util_hash.h
index 154c9302a565ebea1004e1071a285b1ef04cde72..9499d606ec5bb52c968e7c6dcd3c176c8274d1d8 100644
--- a/src/util_hash.h
+++ b/src/util_hash.h
@@ -12,6 +12,7 @@
 #ifndef UTIL_HASH_H
 #define UTIL_HASH_H
 
+#include <stddef.h>
 #include <stdint.h>
 
 #ifdef __cplusplus