#ifndef _MONO_IOLAYER_IOLAYER_H_
#define _MONO_IOLAYER_IOLAYER_H_
-#include <config.h>
-
-#if defined(PLATFORM_WIN32)
+#if defined(__WIN32__) || defined(_WIN32)
/* Native win32 */
-#define UNICODE
-#define _UNICODE
#define __USE_W32_SOCKETS
-#include <w32api.h>
+#if (_WIN32_WINNT < 0x0502)
+/* GetProcessId is available on Windows XP SP1 and later.
+ * Windows SDK declares it unconditionally.
+ * MinGW declares for Windows XP and later.
+ * Declare as __GetProcessId for unsupported targets. */
+#define GetProcessId __GetProcessId
+#endif
+#include <winsock2.h>
#include <windows.h>
+#include <winbase.h>
#include <ws2tcpip.h>
+#include <psapi.h>
+#include <shlobj.h>
+#include <mswsock.h>
+#if (_WIN32_WINNT < 0x0502)
+#undef GetProcessId
+#endif
#else /* EVERYONE ELSE */
#include "mono/io-layer/wapi.h"
#include "mono/io-layer/uglify.h"
-#endif /* PLATFORM_WIN32 */
-
-#ifdef HAVE_SYS_FILIO_H
-#include <sys/filio.h> /* defines FIONBIO and FIONREAD */
-#endif
-#ifdef HAVE_SYS_SOCKIO_H
-#include <sys/sockio.h> /* defines SIOCATMARK */
-#endif
+#endif /* HOST_WIN32 */
#endif /* _MONO_IOLAYER_IOLAYER_H_ */