diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index aca51ddb0..f91fe4d7c 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-02  Yaakov Selkowitz  <yselkowitz@users.sourceforge.net>
+
+	* include/netdb.h: #include <inttypes.h>, <netinet/in.h>,
+	and <sys/socket.h> per SUSv3.
+
 2009-04-01  Corinna Vinschen  <corinna@vinschen.de>
 
 	* strfuncs.cc (sys_cp_mbstowcs): Check if ASCII SO is followed by at
diff --git a/winsup/cygwin/include/netdb.h b/winsup/cygwin/include/netdb.h
index ffa2f8792..1a6d241f6 100644
--- a/winsup/cygwin/include/netdb.h
+++ b/winsup/cygwin/include/netdb.h
@@ -63,8 +63,11 @@
 extern "C" {
 #endif
 
-#include <stdint.h>
-#include <cygwin/socket.h>
+#include <inttypes.h>
+#include <sys/socket.h>
+#ifndef __INSIDE_CYGWIN_NET__
+#include <netinet/in.h>
+#endif
 
 /*
  * Structures returned by network data base library.  All addresses are