diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 915f7cb87..44aa39d2b 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-17  Corinna Vinschen  <corinna@vinschen.de>
+
+	* fhandler_procnet.cc: Drop declaration of htonl and ntohs.  Include
+	asm/byteorder.h instead.
+
 2007-01-17  Corinna Vinschen  <corinna@vinschen.de>
 
 	* include/cygwin/in6.h: Drop inclusion of asm/byteorder.h.
diff --git a/winsup/cygwin/fhandler_procnet.cc b/winsup/cygwin/fhandler_procnet.cc
index d5cdde881..28fc2b2bf 100644
--- a/winsup/cygwin/fhandler_procnet.cc
+++ b/winsup/cygwin/fhandler_procnet.cc
@@ -22,7 +22,8 @@ details. */
 #define USE_SYS_TYPES_FD_SET
 #include <winsock2.h>
 #include <iphlpapi.h>
-#include "cygwin/in6.h"
+#include <asm/byteorder.h>
+#include <cygwin/in6.h>
 
 #define _COMPILING_NEWLIB
 #include <dirent.h>
@@ -34,9 +35,6 @@ details. */
 #define GAA_FLAG_INCLUDE_ALL_INTERFACES 0x0100
 #endif
 
-extern "C" unsigned long int htonl (unsigned long int);
-extern "C" unsigned short ntohs (unsigned short);
-
 static const int PROCNET_IFINET6 = 2;
 
 static const char * const process_listing[] =