reverted:
--- wireless-tools-29/wireless.10.h
+++ wireless-tools-29.orig/wireless.10.h
@@ -51,7 +51,7 @@
 /***************************** INCLUDES *****************************/
 
 #include <linux/types.h>		/* for "caddr_t" et al		*/
+#include <linux/socket.h>		/* for "struct sockaddr" et al	*/
-#include <sys/socket.h>		/* for "struct sockaddr" et al	*/
 #include <linux/if.h>			/* for IFNAMSIZ and co... */
 
 /**************************** CONSTANTS ****************************/
reverted:
--- wireless-tools-29/wireless.11.h
+++ wireless-tools-29.orig/wireless.11.h
@@ -51,7 +51,7 @@
 /***************************** INCLUDES *****************************/
 
 #include <linux/types.h>		/* for "caddr_t" et al		*/
+#include <linux/socket.h>		/* for "struct sockaddr" et al	*/
-#include <sys/socket.h>		/* for "struct sockaddr" et al	*/
 #include <linux/if.h>			/* for IFNAMSIZ and co... */
 
 /**************************** CONSTANTS ****************************/
reverted:
--- wireless-tools-29/wireless.12.h
+++ wireless-tools-29.orig/wireless.12.h
@@ -51,7 +51,7 @@
 /***************************** INCLUDES *****************************/
 
 #include <linux/types.h>		/* for "caddr_t" et al		*/
+#include <linux/socket.h>		/* for "struct sockaddr" et al	*/
-#include <sys/socket.h>		/* for "struct sockaddr" et al	*/
 #include <linux/if.h>			/* for IFNAMSIZ and co... */
 
 /**************************** CONSTANTS ****************************/
reverted:
--- wireless-tools-29/wireless.13.h
+++ wireless-tools-29.orig/wireless.13.h
@@ -65,7 +65,7 @@
 /***************************** INCLUDES *****************************/
 
 #include <linux/types.h>		/* for "caddr_t" et al		*/
+#include <linux/socket.h>		/* for "struct sockaddr" et al	*/
-#include <sys/socket.h>		/* for "struct sockaddr" et al	*/
 #include <linux/if.h>			/* for IFNAMSIZ and co... */
 
 /***************************** VERSION *****************************/
reverted:
--- wireless-tools-29/wireless.14.h
+++ wireless-tools-29.orig/wireless.14.h
@@ -70,7 +70,7 @@
 /***************************** INCLUDES *****************************/
 
 #include <linux/types.h>		/* for "caddr_t" et al		*/
+#include <linux/socket.h>		/* for "struct sockaddr" et al	*/
-#include <sys/socket.h>		/* for "struct sockaddr" et al	*/
 #include <linux/if.h>			/* for IFNAMSIZ and co... */
 
 /***************************** VERSION *****************************/
reverted:
--- wireless-tools-29/wireless.15.h
+++ wireless-tools-29.orig/wireless.15.h
@@ -70,7 +70,7 @@
 /***************************** INCLUDES *****************************/
 
 #include <linux/types.h>		/* for "caddr_t" et al		*/
+#include <linux/socket.h>		/* for "struct sockaddr" et al	*/
-#include <sys/socket.h>		/* for "struct sockaddr" et al	*/
 #include <linux/if.h>			/* for IFNAMSIZ and co... */
 
 /***************************** VERSION *****************************/
reverted:
--- wireless-tools-29/wireless.16.h
+++ wireless-tools-29.orig/wireless.16.h
@@ -72,7 +72,7 @@
 /* To minimise problems in user space, I might remove those headers
  * at some point. Jean II */
 #include <linux/types.h>		/* for "caddr_t" et al		*/
+#include <linux/socket.h>		/* for "struct sockaddr" et al	*/
-#include <sys/socket.h>		/* for "struct sockaddr" et al	*/
 #include <linux/if.h>			/* for IFNAMSIZ and co... */
 
 /***************************** VERSION *****************************/
reverted:
--- wireless-tools-29/wireless.18.h
+++ wireless-tools-29.orig/wireless.18.h
@@ -72,7 +72,7 @@
 /* To minimise problems in user space, I might remove those headers
  * at some point. Jean II */
 #include <linux/types.h>		/* for "caddr_t" et al		*/
+#include <linux/socket.h>		/* for "struct sockaddr" et al	*/
-#include <sys/socket.h>		/* for "struct sockaddr" et al	*/
 #include <linux/if.h>			/* for IFNAMSIZ and co... */
 
 /***************************** VERSION *****************************/
reverted:
--- wireless-tools-29/wireless.17.h
+++ wireless-tools-29.orig/wireless.17.h
@@ -72,7 +72,7 @@
 /* To minimise problems in user space, I might remove those headers
  * at some point. Jean II */
 #include <linux/types.h>		/* for "caddr_t" et al		*/
+#include <linux/socket.h>		/* for "struct sockaddr" et al	*/
-#include <sys/socket.h>		/* for "struct sockaddr" et al	*/
 #include <linux/if.h>			/* for IFNAMSIZ and co... */
 
 /***************************** VERSION *****************************/
reverted:
--- wireless-tools-29/wireless.21.h
+++ wireless-tools-29.orig/wireless.21.h
@@ -74,7 +74,7 @@
  * To know which includes to use in user-space, check iwlib.h. */
 #ifdef __KERNEL__
 #include <linux/types.h>		/* for "caddr_t" et al		*/
+#include <linux/socket.h>		/* for "struct sockaddr" et al	*/
-#include <sys/socket.h>			/* for "struct sockaddr" et al	*/
 #include <linux/if.h>			/* for IFNAMSIZ and co... */
 #endif	/* __KERNEL__ */
 
reverted:
--- wireless-tools-29/wireless.22.h
+++ wireless-tools-29.orig/wireless.22.h
@@ -74,7 +74,7 @@
  * To know which includes to use in user-space, check iwlib.h. */
 #ifdef __KERNEL__
 #include <linux/types.h>		/* for "caddr_t" et al		*/
+#include <linux/socket.h>		/* for "struct sockaddr" et al	*/
-#include <sys/socket.h>			/* for "struct sockaddr" et al	*/
 #include <linux/if.h>			/* for IFNAMSIZ and co... */
 #endif	/* __KERNEL__ */
 
diff -u wireless-tools-29/debian/changelog wireless-tools-29/debian/changelog
--- wireless-tools-29/debian/changelog
+++ wireless-tools-29/debian/changelog
@@ -1,3 +1,13 @@
+wireless-tools (29-1ubuntu2) hardy; urgency=low
+
+  * Dropped change:
+    - Don't diverge unnecessarily from upstream on socket.h header
+      inclusions, this only applies to ancient versions of the
+      wireless.h header that won't be shipped in the binary packages
+      (current versions of the header have a proper #ifdef __KERNEL__ guard)
+
+ -- Steve Langasek <vorlon@debian.org>  Wed, 28 Nov 2007 16:49:17 -0800
+
 wireless-tools (29-1ubuntu1) hardy; urgency=low
 
   * Merge from debian unstable, remaining changes: