From 275be87be71dab9b00a67bd5010f8acf7255ce04 Mon Sep 17 00:00:00 2001
From: Glenn L McGrath <bug1@ihug.co.nz>
Date: Mon, 16 Dec 2002 07:37:21 +0000
Subject: [PATCH] Only included headers that are used.

---
 networking/libiproute/ipaddress.c  | 21 +++++++--------------
 networking/libiproute/iplink.c     | 20 ++++++++------------
 networking/libiproute/iproute.c    | 16 ++++------------
 networking/libiproute/iptunnel.c   | 17 +++++++----------
 networking/libiproute/libnetlink.c | 13 ++++---------
 networking/libiproute/ll_addr.c    | 11 -----------
 networking/libiproute/ll_map.c     |  9 ++-------
 networking/libiproute/ll_proto.c   | 10 ----------
 networking/libiproute/ll_types.c   | 12 ------------
 networking/libiproute/rt_names.c   |  6 +-----
 networking/libiproute/rtm_map.c    |  6 ------
 networking/libiproute/utils.c      |  9 ---------
 12 files changed, 33 insertions(+), 117 deletions(-)

diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c
index 6bba6e077..2821f2e8d 100644
--- a/networking/libiproute/ipaddress.c
+++ b/networking/libiproute/ipaddress.c
@@ -12,31 +12,24 @@
  *	Laszlo Valko <valko@linux.karinthy.hu> 990223: address label must be zero terminated
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <string.h>
+
 #include <fnmatch.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <arpa/inet.h>
 
 #define sysinfo kernel_sysinfo
-#include <linux/netdevice.h>
 #include <linux/if_arp.h>
-#include <linux/sockios.h>
 #undef sysinfo
 
 #include "rt_names.h"
 #include "utils.h"
-#include "ll_map.h"
-#include "ip_common.h"
 
-#include "busybox.h"
+#include "libbb.h"
 
 static struct
 {
diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c
index 33f38918a..ef4d6b9a5 100644
--- a/networking/libiproute/iplink.c
+++ b/networking/libiproute/iplink.c
@@ -10,28 +10,24 @@
  *
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <fcntl.h>
-#include <errno.h>
+#include <sys/ioctl.h>
 #include <sys/socket.h>
+
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
 #include <linux/if.h>
 #include <linux/if_packet.h>
 #include <linux/if_ether.h>
 #include <linux/sockios.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <linux/sockios.h>
 
 #include "rt_names.h"
 #include "utils.h"
 #include "ip_common.h"
 
-#include "busybox.h"
+#include "libbb.h"
 
 static int do_link;
 
diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c
index f29a5158a..114fb6c90 100644
--- a/networking/libiproute/iproute.c
+++ b/networking/libiproute/iproute.c
@@ -15,23 +15,15 @@
  * Kunihiro Ishiguro <kunihiro@zebra.org> 001102: rtnh_ifindex was not initialized
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <fcntl.h>
-#include <string.h>
-#include <sys/time.h>
 #include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <arpa/inet.h>
-#include <linux/in_route.h>
+
+#include <stdlib.h>
+#include <string.h>
 
 #include "rt_names.h"
 #include "utils.h"
 
-#include "busybox.h"
+#include "libbb.h"
 
 #ifndef RTAX_RTTVAR
 #define RTAX_RTTVAR RTAX_HOPS
diff --git a/networking/libiproute/iptunnel.c b/networking/libiproute/iptunnel.c
index 58ec7cce6..3d73ca81c 100644
--- a/networking/libiproute/iptunnel.c
+++ b/networking/libiproute/iptunnel.c
@@ -16,26 +16,23 @@
  * Phil Karn <karn@ka9q.ampr.org>	990408:	"pmtudisc" flag
  */
 
-#include <stdio.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <syslog.h>
-#include <fcntl.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <arpa/inet.h>
 
-#include <linux/if.h>
+#include <arpa/inet.h>
+#include <netinet/ip.h>
+
 #include <linux/if_arp.h>
 #include <linux/if_tunnel.h>
 
 #include "rt_names.h"
 #include "utils.h"
 
-#include "busybox.h"
+#include "libbb.h"
 
 static int do_ioctl_get_ifindex(char *dev)
 {
diff --git a/networking/libiproute/libnetlink.c b/networking/libiproute/libnetlink.c
index 99672382a..fbc555dfe 100644
--- a/networking/libiproute/libnetlink.c
+++ b/networking/libiproute/libnetlink.c
@@ -10,18 +10,13 @@
  *
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <fcntl.h>
-#include <net/if_arp.h>
 #include <sys/socket.h>
-#include <netinet/in.h>
-#include <string.h>
+
 #include <errno.h>
+#include <stdio.h>
+#include <string.h>
 #include <time.h>
-#include <sys/uio.h>
+#include <unistd.h>
 
 #include "libnetlink.h"
 #include "libbb.h"
diff --git a/networking/libiproute/ll_addr.c b/networking/libiproute/ll_addr.c
index 19b31366c..551484cf6 100644
--- a/networking/libiproute/ll_addr.c
+++ b/networking/libiproute/ll_addr.c
@@ -9,21 +9,10 @@
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <string.h>
 
-#include <linux/netdevice.h>
 #include <linux/if_arp.h>
-#include <linux/sockios.h>
 
 #include "utils.h"
 #include "libbb.h"
diff --git a/networking/libiproute/ll_map.c b/networking/libiproute/ll_map.c
index e5a95e6a4..b7a828421 100644
--- a/networking/libiproute/ll_map.c
+++ b/networking/libiproute/ll_map.c
@@ -11,16 +11,11 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <fcntl.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
 #include <string.h>
+#include <stdlib.h>
+#include <netinet/in.h>
 
 #include "libnetlink.h"
-#include "ll_map.h"
 
 struct idxmap
 {
diff --git a/networking/libiproute/ll_proto.c b/networking/libiproute/ll_proto.c
index 394338aea..d7b1dedfc 100644
--- a/networking/libiproute/ll_proto.c
+++ b/networking/libiproute/ll_proto.c
@@ -10,20 +10,10 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <string.h>
 
-#include <linux/netdevice.h>
 #include <linux/if_arp.h>
-#include <linux/sockios.h>
 
 #include "utils.h"
 
diff --git a/networking/libiproute/ll_types.c b/networking/libiproute/ll_types.c
index f14583634..925d60ddc 100644
--- a/networking/libiproute/ll_types.c
+++ b/networking/libiproute/ll_types.c
@@ -8,22 +8,10 @@
  *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
-
 #include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <netinet/in.h>
 #include <arpa/inet.h>
-#include <string.h>
 
-#include <linux/netdevice.h>
 #include <linux/if_arp.h>
-#include <linux/sockios.h>
 
 char * ll_type_n2a(int type, char *buf, int len)
 {
diff --git a/networking/libiproute/rt_names.c b/networking/libiproute/rt_names.c
index 2a7d85cdb..d503645b0 100644
--- a/networking/libiproute/rt_names.c
+++ b/networking/libiproute/rt_names.c
@@ -8,14 +8,10 @@
  *
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
-
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <fcntl.h>
 #include <string.h>
-#include <sys/time.h>
+
 #include <stdint.h>
 
 static void rtnl_tab_initialize(char *file, char **tab, int size)
diff --git a/networking/libiproute/rtm_map.c b/networking/libiproute/rtm_map.c
index 21e818b4a..5f6a9e69c 100644
--- a/networking/libiproute/rtm_map.c
+++ b/networking/libiproute/rtm_map.c
@@ -10,14 +10,8 @@
  *
  */
 
-#include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <fcntl.h>
 #include <string.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
 
 #include "rt_names.h"
 #include "utils.h"
diff --git a/networking/libiproute/utils.c b/networking/libiproute/utils.c
index 9ae21b464..63084e15e 100644
--- a/networking/libiproute/utils.c
+++ b/networking/libiproute/utils.c
@@ -14,19 +14,10 @@
  * Rani Assaf <rani@magic.metawire.com> 980929:	resolve addresses
  */
 
-#include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <fcntl.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
 #include <string.h>
-#include <netdb.h>
 #include <arpa/inet.h>
-#include <resolv.h>
 
-#include "./linux/pkt_sched.h"
 #include "utils.h"
 #include "libbb.h"