@@ -21,47 +21,115 @@
 @class OFMutableArray;
 
 #define OF_BACKTRACE_SIZE 32
 
 #if defined(_WIN32) && defined(OF_HAVE_SOCKETS)
-# define EADDRINUSE WSAEADDRINUSE
-# define EADDRNOTAVAIL WSAEADDRNOTAVAIL
-# define EAFNOSUPPORT WSAEAFNOSUPPORT
-# define EALREADY WSAEALREADY
-# define ECONNABORTED WSAECONNABORTED
-# define ECONNABORTED WSAECONNABORTED
-# define ECONNREFUSED WSAECONNREFUSED
-# define ECONNRESET WSAECONNRESET
-# define ECONNRESET WSAECONNRESET
-# define EDESTADDRREQ WSAEDESTADDRREQ
-# define EDQUOT WSAEDQUOT
-# define EHOSTDOWN WSAEHOSTDOWN
-# define EHOSTUNREACH WSAEHOSTUNREACH
-# define EINPROGRESS WSAEINPROGRESS
-# define EISCONN WSAEISCONN
-# define ELOOP WSAELOOP
-# define EMSGSIZE WSAEMSGSIZE
-# define ENETDOWN WSAENETDOWN
-# define ENETRESET WSAENETRESET
-# define ENETUNREACH WSAENETUNREACH
-# define ENOBUFS WSAENOBUFS
-# define ENOPROTOOPT WSAENOPROTOOPT
-# define ENOTCONN WSAENOTCONN
-# define ENOTSOCK WSAENOTSOCK
-# define EOPNOTSUPP WSAEOPNOTSUPP
-# define EPFNOSUPPORT WSAEPFNOSUPPORT
-# define EPROCLIM WSAEPROCLIM
-# define EPROTONOSUPPORT WSAEPROTONOSUPPORT
-# define EPROTOTYPE WSAEPROTOTYPE
-# define EREMOTE WSAEREMOTE
-# define ESHUTDOWN WSAESHUTDOWN
-# define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT
-# define ESTALE WSAESTALE
-# define ETIMEDOUT WSAETIMEDOUT
-# define ETOOMANYREFS WSAETOOMANYREFS
-# define EUSERS WSAEUSERS
-# define EWOULDBLOCK WSAEWOULDBLOCK
+# ifndef EADDRINUSE
+#  define EADDRINUSE WSAEADDRINUSE
+# endif
+# ifndef EADDRNOTAVAIL
+#  define EADDRNOTAVAIL WSAEADDRNOTAVAIL
+# endif
+# ifndef EAFNOSUPPORT
+#  define EAFNOSUPPORT WSAEAFNOSUPPORT
+# endif
+# ifndef EALREADY
+#  define EALREADY WSAEALREADY
+# endif
+# ifndef ECONNABORTED
+#  define ECONNABORTED WSAECONNABORTED
+# endif
+# ifndef ECONNREFUSED
+#  define ECONNREFUSED WSAECONNREFUSED
+# endif
+# ifndef ECONNRESET
+#  define ECONNRESET WSAECONNRESET
+# endif
+# ifndef EDESTADDRREQ
+#  define EDESTADDRREQ WSAEDESTADDRREQ
+# endif
+# ifndef EDQUOT
+#  define EDQUOT WSAEDQUOT
+# endif
+# ifndef EHOSTDOWN
+#  define EHOSTDOWN WSAEHOSTDOWN
+# endif
+# ifndef EHOSTUNREACH
+#  define EHOSTUNREACH WSAEHOSTUNREACH
+# endif
+# ifndef EINPROGRESS
+#  define EINPROGRESS WSAEINPROGRESS
+# endif
+# ifndef EISCONN
+#  define EISCONN WSAEISCONN
+# endif
+# ifndef ELOOP
+#  define ELOOP WSAELOOP
+# endif
+# ifndef EMSGSIZE
+#  define EMSGSIZE WSAEMSGSIZE
+# endif
+# ifndef ENETDOWN
+#  define ENETDOWN WSAENETDOWN
+# endif
+# ifndef ENETRESET
+#  define ENETRESET WSAENETRESET
+# endif
+# ifndef ENETUNREACH
+#  define ENETUNREACH WSAENETUNREACH
+# endif
+# ifndef ENOBUFS
+#  define ENOBUFS WSAENOBUFS
+# endif
+# ifndef ENOPROTOOPT
+#  define ENOPROTOOPT WSAENOPROTOOPT
+# endif
+# ifndef ENOTCONN
+#  define ENOTCONN WSAENOTCONN
+# endif
+# ifndef ENOTSOCK
+#  define ENOTSOCK WSAENOTSOCK
+# endif
+# ifndef EOPNOTSUPP
+#  define EOPNOTSUPP WSAEOPNOTSUPP
+# endif
+# ifndef EPFNOSUPPORT
+#  define EPFNOSUPPORT WSAEPFNOSUPPORT
+# endif
+# ifndef EPROCLIM
+#  define EPROCLIM WSAEPROCLIM
+# endif
+# ifndef EPROTONOSUPPORT
+#  define EPROTONOSUPPORT WSAEPROTONOSUPPORT
+# endif
+# ifndef EPROTOTYPE
+#  define EPROTOTYPE WSAEPROTOTYPE
+# endif
+# ifndef EREMOTE
+#  define EREMOTE WSAEREMOTE
+# endif
+# ifndef ESHUTDOWN
+#  define ESHUTDOWN WSAESHUTDOWN
+# endif
+# ifndef ESOCKTNOSUPPORT
+#  define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT
+# endif
+# ifndef ESTALE
+#  define ESTALE WSAESTALE
+# endif
+# ifndef ETIMEDOUT
+#  define ETIMEDOUT WSAETIMEDOUT
+# endif
+# ifndef ETOOMANYREFS
+#  define ETOOMANYREFS WSAETOOMANYREFS
+# endif
+# ifndef EUSERS
+#  define EUSERS WSAEUSERS
+# endif
+# ifndef EWOULDBLOCK
+#  define EWOULDBLOCK WSAEWOULDBLOCK
+# endif
 extern int of_wsaerr_to_errno(int);
 #endif
 
 /*!
  * @brief The base class for all exceptions in ObjFW