diff --git a/efi_types.h b/efi_types.h
index c56fb5e..ff110e9 100644
--- a/efi_types.h
+++ b/efi_types.h
@@ -6,8 +6,8 @@ typedef char efi_int8_t;
 typedef unsigned char efi_uint8_t;
 typedef short efi_int16_t;
 typedef unsigned short efi_uint16_t;
-typedef efi_int efi_int32_t;
-typedef unsigned efi_int efi_uint32_t;
+typedef int efi_int32_t;
+typedef unsigned int efi_uint32_t;
 #if defined(_X64)
 typedef long efi_int64_t;
 typedef unsigned long efi_uint64_t;
diff --git a/efilib.h b/efilib.h
index 40e0750..5e79899 100644
--- a/efilib.h
+++ b/efilib.h
@@ -4,7 +4,7 @@
 #include "efi.h"
 #include "efi_st.h"
 
-#define EFI_ERROR(status) (((INTN)(status)) < 0)
+#define EFI_ERROR(status) (((EFI_INTN)(status)) < 0)
 
 #endif /* EFI_EFILIB_H */