diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index e1e6a585c..25d39969b 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-12  Corinna Vinschen  <corinna@vinschen.de>
+
+	* fhandler_socket.cc: Drop defining _BSDTYPES_DEFINED before including
+	winsup.h.
+
 2015-03-12  Takashi Yano  <takashi.yano@nifty.ne.jp>
 
 	* fhandler_tty.cc (fhandler_pty_master::close): Add code to make slave
diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc
index 59561bc58..1b28e5220 100644
--- a/winsup/cygwin/fhandler_socket.cc
+++ b/winsup/cygwin/fhandler_socket.cc
@@ -14,9 +14,7 @@
 #define  __INSIDE_CYGWIN_NET__
 #define USE_SYS_TYPES_FD_SET
 
-#define _BSDTYPES_DEFINED
 #include "winsup.h"
-#undef _BSDTYPES_DEFINED
 #ifdef __x86_64__
 /* 2014-04-24: Current Mingw headers define sockaddr_in6 using u_long (8 byte)
    because a redefinition for LP64 systems is missing.  This leads to a wrong