diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index ebca081f8..0cabdd6c3 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+Wed Oct  4 23:10:27 2000  Christopher Faylor <cgf@cygnus.com>
+
+	* include/netinet/tcp.h: Remove winsock.h include.
+	* include/sys/cygwin.h: Move windows specific reference within
+	conditional.
+
 Thu Oct  5  1:13:00 2000  Corinna Vinschen <corinna@vinschen.de>
 
 	* include/sys/mman.h: Add missing MAP_FAILED macro.
diff --git a/winsup/cygwin/include/netinet/tcp.h b/winsup/cygwin/include/netinet/tcp.h
index b3401cd3b..f1ef70107 100644
--- a/winsup/cygwin/include/netinet/tcp.h
+++ b/winsup/cygwin/include/netinet/tcp.h
@@ -1,6 +1,6 @@
 #ifndef _NETINET_TCP_H
 #define _NETINET_TCP_H
 
-#include <winsock.h>
+/* Maybe add some definitions, someday */
 
 #endif
diff --git a/winsup/cygwin/include/sys/cygwin.h b/winsup/cygwin/include/sys/cygwin.h
index bf3fee92c..1c3c1e136 100644
--- a/winsup/cygwin/include/sys/cygwin.h
+++ b/winsup/cygwin/include/sys/cygwin.h
@@ -42,10 +42,6 @@ struct __cygwin_perfile
   unsigned flags;
 };
 
-#ifdef _PATH_PASSWD
-extern HANDLE cygwin_logon_user (const struct passwd *, const char *);
-#endif
-
 /* External interface stuff */
 
 typedef enum
@@ -94,6 +90,10 @@ enum
 };
 
 #ifdef WINVER
+#ifdef _PATH_PASSWD
+extern HANDLE cygwin_logon_user (const struct passwd *, const char *);
+#endif
+
 /* This lives in the app and is initialized before jumping into the DLL.
    It should only contain stuff which the user's process needs to see, or
    which is needed before the user pointer is initialized, or is needed to