diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 6c73c0ccf..915f7cb87 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-17  Corinna Vinschen  <corinna@vinschen.de>
+
+	* include/cygwin/in6.h: Drop inclusion of asm/byteorder.h.
+	* fhandler_procnet.cc: Declare htonl and ntohs here.
+
 2007-01-17  Corinna Vinschen  <corinna@vinschen.de>
 
 	* Makefile.in (DLL_OFILES): Add fhandler_procnet.o.
diff --git a/winsup/cygwin/fhandler_procnet.cc b/winsup/cygwin/fhandler_procnet.cc
index e5026ef88..d5cdde881 100644
--- a/winsup/cygwin/fhandler_procnet.cc
+++ b/winsup/cygwin/fhandler_procnet.cc
@@ -34,6 +34,9 @@ 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[] =
diff --git a/winsup/cygwin/include/cygwin/in6.h b/winsup/cygwin/include/cygwin/in6.h
index febd8dc73..bdb812c99 100644
--- a/winsup/cygwin/include/cygwin/in6.h
+++ b/winsup/cygwin/include/cygwin/in6.h
@@ -13,8 +13,6 @@ details. */
 #ifndef _CYGWIN_IN6_H
 #define _CYGWIN_IN6_H
 
-#include <asm/byteorder.h>
-
 #define INET6_ADDRSTRLEN 46
 
 #define IN6_ARE_ADDR_EQUAL(a, b) \