diff --git a/lib/setup.h b/lib/setup.h
index 2de894cef..42d6d01af 100644
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -298,6 +298,9 @@
 #  define struct_stat                struct _stat
 #endif
 
+#ifndef struct_stat
+#  define struct_stat struct stat
+#endif
 
 /* Below we define some functions. They should
    1. close a socket
diff --git a/src/main.c b/src/main.c
index 6c149cfb6..3127f0937 100644
--- a/src/main.c
+++ b/src/main.c
@@ -238,6 +238,10 @@ typedef enum {
 #  define struct_stat                struct _stat
 #endif
 
+#ifndef struct_stat
+#  define struct_stat struct stat
+#endif
+
 #ifdef CURL_DOES_CONVERSIONS
 #ifdef HAVE_ICONV
 iconv_t inbound_cd  = (iconv_t)-1;