diff --git a/ChangeLog b/ChangeLog
index 06a9226267..5caf36829a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Oct 28 13:29:14 +0100 2008 Jim Meyering <meyering@redhat.com>
+
+	include netinet etc #ifndef HAVE_WINSOCK2_H
+
 Tue Oct 28 13:29:13 +0100 2008 Jim Meyering <meyering@redhat.com>
 
 	* src/remote_internal.c (remoteFindDaemonPath) [!WIN32]: Don't compile.
diff --git a/src/remote_internal.c b/src/remote_internal.c
index c483ebf621..e6dcfcfe06 100644
--- a/src/remote_internal.c
+++ b/src/remote_internal.c
@@ -36,6 +36,13 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
+#ifndef HAVE_WINSOCK2_H		/* Unix & Cygwin. */
+# include <sys/un.h>
+# include <net/if.h>
+# include <netinet/in.h>
+# include <netinet/tcp.h>
+#endif
+
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #endif