diff --git a/ChangeLog b/ChangeLog
index 91242c573..67adb780a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-16  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/efi/api.h: Don't use call wrappers when compiled with
+	mingw or cygwin as API already matches.
+
 2013-12-16  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/lib/posix_wrap/errno.h: Undefine errno before redefining.
diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
index 956cce2de..c1c6981ed 100644
--- a/include/grub/efi/api.h
+++ b/include/grub/efi/api.h
@@ -1549,7 +1549,7 @@ struct grub_efi_block_io
 typedef struct grub_efi_block_io grub_efi_block_io_t;
 
 #if (GRUB_TARGET_SIZEOF_VOID_P == 4) || defined (__ia64__) \
-  || defined (__aarch64__)
+  || defined (__aarch64__) || defined (__MINGW64__) || defined (__CYGWIN__)
 
 #define efi_call_0(func)		func()
 #define efi_call_1(func, a)		func(a)