diff --git a/inc/aarch64/efibind.h b/inc/aarch64/efibind.h
index 1454422..d6b5d0f 100644
--- a/inc/aarch64/efibind.h
+++ b/inc/aarch64/efibind.h
@@ -57,7 +57,7 @@ typedef char       CHAR8;
 typedef int8_t     INT8;
 
 #undef VOID
-#define VOID    void
+typedef void       VOID;
 
 typedef int64_t    INTN;
 typedef uint64_t   UINTN;
diff --git a/inc/arm/efibind.h b/inc/arm/efibind.h
index d391b14..8c578df 100644
--- a/inc/arm/efibind.h
+++ b/inc/arm/efibind.h
@@ -65,7 +65,7 @@ typedef char       CHAR8;
 typedef int8_t     INT8;
 
 #undef VOID
-#define VOID    void
+typedef void       VOID;
 
 typedef int32_t    INTN;
 typedef uint32_t   UINTN;
diff --git a/inc/ia32/efibind.h b/inc/ia32/efibind.h
index 6b0e6b4..718e8d1 100644
--- a/inc/ia32/efibind.h
+++ b/inc/ia32/efibind.h
@@ -107,7 +107,7 @@ typedef char       CHAR8;
 typedef int8_t     INT8;
 
 #undef VOID
-#define VOID    void
+typedef void       VOID;
 
 
 typedef int32_t    INTN;
diff --git a/inc/ia64/efibind.h b/inc/ia64/efibind.h
index 254afd6..1d2745b 100644
--- a/inc/ia64/efibind.h
+++ b/inc/ia64/efibind.h
@@ -91,7 +91,7 @@ typedef char       CHAR8;
 typedef int8_t     INT8;
 
 #undef VOID
-#define VOID    void
+typedef void       VOID;
 
 
 typedef int64_t    INTN;
diff --git a/inc/mips64el/efibind.h b/inc/mips64el/efibind.h
index 4f7430f..cf77ddc 100644
--- a/inc/mips64el/efibind.h
+++ b/inc/mips64el/efibind.h
@@ -59,7 +59,7 @@ typedef char       CHAR8;
 typedef int8_t     INT8;
 
 #undef VOID
-#define VOID    void
+typedef void       VOID;
 
 typedef int64_t    INTN;
 typedef uint64_t   UINTN;
diff --git a/inc/riscv64/efibind.h b/inc/riscv64/efibind.h
index 22a12d4..4fdf81d 100644
--- a/inc/riscv64/efibind.h
+++ b/inc/riscv64/efibind.h
@@ -38,7 +38,7 @@ typedef wchar_t                 CHAR16;
 typedef uint8_t                 BOOLEAN;
 #endif
 #undef VOID
-#define VOID                    void
+typedef void                    VOID;
 typedef int64_t                 INTN;
 typedef uint64_t                UINTN;
 
diff --git a/inc/x86_64/efibind.h b/inc/x86_64/efibind.h
index 152e0ca..e454ed2 100644
--- a/inc/x86_64/efibind.h
+++ b/inc/x86_64/efibind.h
@@ -117,7 +117,7 @@ typedef char       CHAR8;
 typedef int8_t     INT8;
 
 #undef VOID
-#define VOID    void
+typedef void       VOID;
 
 
 typedef int64_t    INTN;