3 files changed, 4 insertions, 5 deletions
diff --git a/src/arch/i386/boot/multiboot.c b/src/arch/i386/boot/multiboot.c
index af9b625877..31e9e4aa4f 100644
--- a/src/arch/i386/boot/multiboot.c
+++ b/src/arch/i386/boot/multiboot.c
@@ -23,8 +23,6 @@
 #include <device/resource.h>
 #include <console/console.h>
 
-typedef unsigned long long u64;
-
 static struct multiboot_mmap_entry *mb_mem;
 struct multiboot_info *mbi;
 
diff --git a/src/arch/i386/include/arch/acpi.h b/src/arch/i386/include/arch/acpi.h
index beb1d5f5b5..d31517e518 100644
--- a/src/arch/i386/include/arch/acpi.h
+++ b/src/arch/i386/include/arch/acpi.h
@@ -18,7 +18,6 @@
 #if HAVE_ACPI_TABLES==1
 
 #include <stdint.h>
-typedef unsigned long long u64;
 
 #define RSDP_SIG              "RSD PTR "  /* RSDT Pointer signature */
 #define RSDP_NAME             "RSDP"
diff --git a/src/arch/i386/include/stdint.h b/src/arch/i386/include/stdint.h
index d117fc4640..7f6b94037f 100644
--- a/src/arch/i386/include/stdint.h
+++ b/src/arch/i386/include/stdint.h
@@ -65,11 +65,13 @@ typedef long int           intmax_t;
 typedef unsigned long int  uintmax_t;
 #endif
 
-#undef __HAVE_LONG_LONG__
-
 typedef uint8_t u8;
 typedef uint16_t u16;
 typedef uint32_t u32;
+#if __HAVE_LONG_LONG__
+typedef uint64_t u64;
+#endif
 
+#undef __HAVE_LONG_LONG__
 
 #endif /* I386_STDINT_H */