diff --git a/include/elfhacks.h b/include/elfhacks.h
index d1be8e2c..3d9417f2 100644
--- a/include/elfhacks.h
+++ b/include/elfhacks.h
@@ -28,9 +28,10 @@
 
   Pyry Haulos <pyry.haulos@gmail.com>
 */
-
+#pragma once
 #include <elf.h>
 #include <link.h>
+#include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -38,10 +39,9 @@ extern "C" {
 
 #define __PUBLIC __attribute__ ((visibility ("default")))
 
-#ifdef __x86_64__
+#if UINTPTR_MAX == 0xffffffffffffffff
 # define __elf64
-#endif
-#ifdef __i386__
+#else
 # define __elf32
 #endif