diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index aae0ea9e0..0897d5fe0 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-31  Corinna Vinschen  <corinna@vinschen.de>
+
+	* include/cygwin/if.h: Include cygwin/socket.h rather than sys/socket.h
+	to avoid circular dependency resulting in bogus compile time warnings.
+
 2013-05-28  Corinna Vinschen  <corinna@vinschen.de>
 
 	* fhandler_procsys.cc (fhandler_procsys::read): Just call
diff --git a/winsup/cygwin/include/cygwin/if.h b/winsup/cygwin/include/cygwin/if.h
index aa0c02b29..2cd6ac5f3 100644
--- a/winsup/cygwin/include/cygwin/if.h
+++ b/winsup/cygwin/include/cygwin/if.h
@@ -1,6 +1,6 @@
 /* cygwin/if.h
 
-   Copyright 1996, 2000, 2001, 2007, 2012 Red Hat, Inc.
+   Copyright 1996, 2000, 2001, 2007, 2012, 2013 Red Hat, Inc.
 
 This file is part of Cygwin.
 
@@ -16,7 +16,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 #include <sys/types.h>
-#include <sys/socket.h>
+#include <cygwin/socket.h>
 
 /* Standard interface flags. */
 #define IFF_UP           0x1             /* interface is up               */