diff --git a/win32port/win32helpers/gettimeofday.h b/win32port/win32helpers/gettimeofday.h
index 223ceeed..133a41c0 100644
--- a/win32port/win32helpers/gettimeofday.h
+++ b/win32port/win32helpers/gettimeofday.h
@@ -1,28 +1,31 @@
-#ifndef _GET_TIME_OF_DAY_H
-#define _GET_TIME_OF_DAY_H
-
-#ifdef  __MINGW64__
-#else
-#ifdef  __MINGW32__
-#else
-#include < time.h >
-#endif
-#endif
-
-#include <windows.h> //I've ommited context line.
-#if defined(_MSC_VER) || defined(_MSC_EXTENSIONS)
-  #define DELTA_EPOCH_IN_MICROSECS  11644473600000000Ui64
-#else
-  #define DELTA_EPOCH_IN_MICROSECS  11644473600000000ULL
-#endif
- 
-struct timezone 
-{
-  int  tz_minuteswest; /* minutes W of Greenwich */
-  int  tz_dsttime;     /* type of dst correction */
-};
- 
-int gettimeofday(struct timeval *tv, struct timezone *tz);
-
-
-#endif
+#ifndef _GET_TIME_OF_DAY_H
+#define _GET_TIME_OF_DAY_H
+
+#ifdef  __MINGW64__
+#else
+#ifdef  __MINGW32__
+#else
+#include < time.h >
+#endif
+#endif
+
+#include <windows.h> //I've ommited context line.
+#if defined(_MSC_VER) || defined(_MSC_EXTENSIONS)
+  #define DELTA_EPOCH_IN_MICROSECS  11644473600000000Ui64
+#else
+  #define DELTA_EPOCH_IN_MICROSECS  11644473600000000ULL
+#endif
+
+#ifndef _TIMEZONE_DEFINED 
+struct timezone 
+{
+  int  tz_minuteswest; /* minutes W of Greenwich */
+  int  tz_dsttime;     /* type of dst correction */
+};
+
+int gettimeofday(struct timeval *tv, struct timezone *tz);
+
+#endif
+
+
+#endif
\ No newline at end of file
diff --git a/win32port/win32helpers/websock-w32.h b/win32port/win32helpers/websock-w32.h
index 97848893..0413b856 100644
--- a/win32port/win32helpers/websock-w32.h
+++ b/win32port/win32helpers/websock-w32.h
@@ -51,8 +51,9 @@ typedef struct pollfd {
 typedef INT (WSAAPI *PFNWSAPOLL)(LPWSAPOLLFD fdarray, ULONG nfds, INT timeout);
 extern PFNWSAPOLL poll;
 
+#ifndef  __MINGW32__
 extern INT WSAAPI emulated_poll(LPWSAPOLLFD fdarray, ULONG nfds, INT timeout);
-
+#endif
 /* override configure because we are not using Makefiles */
 
 #define LWS_NO_FORK