From 1372e95c24d3ec786f43e7281663d93e981db67a Mon Sep 17 00:00:00 2001
From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Date: Wed, 27 Aug 2008 15:06:41 +0000
Subject: - remove a couple of duplicate includes

---
 ldso/libdl/libdl.c                            | 4 +---
 libc/misc/dirent/readdir64.c                  | 1 -
 libc/misc/dirent/readdir64_r.c                | 1 -
 libc/misc/time/time.c                         | 1 -
 libc/misc/wchar/wchar.c                       | 3 ---
 libc/stdlib/abort.c                           | 1 -
 libc/stdlib/getpt.c                           | 1 -
 libc/sysdeps/linux/common/sched_getaffinity.c | 1 -
 libc/sysdeps/linux/common/sched_setaffinity.c | 1 -
 libc/sysdeps/linux/common/stat64.c            | 1 -
 libc/sysdeps/linux/common/utimes.c            | 1 -
 libc/unistd/fpathconf.c                       | 3 ---
 libc/unistd/getpass.c                         | 1 -
 test/misc/bug-readdir1.c                      | 1 -
 utils/ldd.c                                   | 1 -
 15 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c
index ce588cc11..9681e581b 100644
--- a/ldso/libdl/libdl.c
+++ b/ldso/libdl/libdl.c
@@ -32,7 +32,7 @@
 
 #include <ldso.h>
 #include <stdio.h>
-#include <string.h>
+#include <string.h> /* Needed for 'strstr' prototype' */
 #include <stdbool.h>
 
 
@@ -77,8 +77,6 @@ extern char *_dl_debug;
  * the symbols that otherwise would have been loaded in from ldso... */
 
 #ifdef __SUPPORT_LD_DEBUG__
-/* Needed for 'strstr' prototype' */
-#include <string.h>
 char *_dl_debug  = 0;
 char *_dl_debug_symbols   = 0;
 char *_dl_debug_move      = 0;
diff --git a/libc/misc/dirent/readdir64.c b/libc/misc/dirent/readdir64.c
index 36dc35379..e8a29da96 100644
--- a/libc/misc/dirent/readdir64.c
+++ b/libc/misc/dirent/readdir64.c
@@ -6,7 +6,6 @@
 
 #include <_lfs_64.h>
 
-#include <dirent.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/libc/misc/dirent/readdir64_r.c b/libc/misc/dirent/readdir64_r.c
index 193d9196d..2958b1d1a 100644
--- a/libc/misc/dirent/readdir64_r.c
+++ b/libc/misc/dirent/readdir64_r.c
@@ -6,7 +6,6 @@
 
 #include <_lfs_64.h>
 
-#include <dirent.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/libc/misc/time/time.c b/libc/misc/time/time.c
index 2d980a068..ed135c580 100644
--- a/libc/misc/time/time.c
+++ b/libc/misc/time/time.c
@@ -2088,7 +2088,6 @@ libc_hidden_def(tzset)
 #endif
 
 #include <utime.h>
-#include <sys/time.h>
 
 int utimes(const char *filename, register const struct timeval *tvp)
 {
diff --git a/libc/misc/wchar/wchar.c b/libc/misc/wchar/wchar.c
index 48f072125..1a6586e91 100644
--- a/libc/misc/wchar/wchar.c
+++ b/libc/misc/wchar/wchar.c
@@ -1564,10 +1564,7 @@ size_t weak_function iconv(iconv_t cd, char **__restrict inbuf,
 /**********************************************************************/
 #ifdef L_iconv_main
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-#include <wchar.h>
 #include <iconv.h>
 #include <stdarg.h>
 #include <libgen.h>
diff --git a/libc/stdlib/abort.c b/libc/stdlib/abort.c
index e2c9962f2..b71512f33 100644
--- a/libc/stdlib/abort.c
+++ b/libc/stdlib/abort.c
@@ -19,7 +19,6 @@ Cambridge, MA 02139, USA.  */
 /* Hacked up for uClibc by Erik Andersen */
 
 #include <features.h>
-#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/libc/stdlib/getpt.c b/libc/stdlib/getpt.c
index 1b5de7c16..b07fde6fe 100644
--- a/libc/stdlib/getpt.c
+++ b/libc/stdlib/getpt.c
@@ -32,7 +32,6 @@ libc_hidden_proto(open)
 libc_hidden_proto(close)
 
 #if !defined __ASSUME_DEVPTS__
-# include <sys/statfs.h>
 
 /* Constant that identifies the `devpts' filesystem.  */
 # define DEVPTS_SUPER_MAGIC	0x1cd1
diff --git a/libc/sysdeps/linux/common/sched_getaffinity.c b/libc/sysdeps/linux/common/sched_getaffinity.c
index 5c801c68f..678571239 100644
--- a/libc/sysdeps/linux/common/sched_getaffinity.c
+++ b/libc/sysdeps/linux/common/sched_getaffinity.c
@@ -25,7 +25,6 @@
 
 #include <string.h>
 #include <sys/param.h>
-#include <sys/types.h>
 
 /* Experimentally off - libc_hidden_proto(memset) */
 
diff --git a/libc/sysdeps/linux/common/sched_setaffinity.c b/libc/sysdeps/linux/common/sched_setaffinity.c
index c687970f1..7a854a819 100644
--- a/libc/sysdeps/linux/common/sched_setaffinity.c
+++ b/libc/sysdeps/linux/common/sched_setaffinity.c
@@ -28,7 +28,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/param.h>
-#include <sys/types.h>
 #include <alloca.h>
 
 libc_hidden_proto(getpid)
diff --git a/libc/sysdeps/linux/common/stat64.c b/libc/sysdeps/linux/common/stat64.c
index 1a0865686..ee4260d03 100644
--- a/libc/sysdeps/linux/common/stat64.c
+++ b/libc/sysdeps/linux/common/stat64.c
@@ -15,7 +15,6 @@ libc_hidden_proto(stat64)
 
 # define __NR___syscall_stat64 __NR_stat64
 # include <unistd.h>
-# include <sys/stat.h>
 # include "xstatconv.h"
 
 static __inline__ _syscall2(int, __syscall_stat64,
diff --git a/libc/sysdeps/linux/common/utimes.c b/libc/sysdeps/linux/common/utimes.c
index 83ddb7381..37909a7b3 100644
--- a/libc/sysdeps/linux/common/utimes.c
+++ b/libc/sysdeps/linux/common/utimes.c
@@ -17,7 +17,6 @@ libc_hidden_proto(utimes)
 _syscall2(int, utimes, const char *, file, const struct timeval *, tvp);
 #else
 #include <stdlib.h>
-#include <sys/time.h>
 
 libc_hidden_proto(utime)
 
diff --git a/libc/unistd/fpathconf.c b/libc/unistd/fpathconf.c
index d7378630d..7b0457c75 100644
--- a/libc/unistd/fpathconf.c
+++ b/libc/unistd/fpathconf.c
@@ -20,10 +20,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <limits.h>
-#include <sys/statfs.h>
-#include <errno.h>
 #include <stddef.h>
-#include <limits.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/statfs.h>
diff --git a/libc/unistd/getpass.c b/libc/unistd/getpass.c
index f17a1d71d..d1100b308 100644
--- a/libc/unistd/getpass.c
+++ b/libc/unistd/getpass.c
@@ -20,7 +20,6 @@
 #include <string.h>
 #include <termios.h>
 #include <unistd.h>
-#include <string.h>
 
 #if defined __USE_BSD || (defined __USE_XOPEN && !defined __USE_XOPEN2K)
 
diff --git a/test/misc/bug-readdir1.c b/test/misc/bug-readdir1.c
index 4c3521dbb..a8594a82e 100644
--- a/test/misc/bug-readdir1.c
+++ b/test/misc/bug-readdir1.c
@@ -1,6 +1,5 @@
 #include <dirent.h>
 #include <errno.h>
-#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/utils/ldd.c b/utils/ldd.c
index 4a05d32d9..7818c3713 100644
--- a/utils/ldd.c
+++ b/utils/ldd.c
@@ -22,7 +22,6 @@
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <sys/types.h>
 #include <sys/wait.h>
 
 #include "bswap.h"
-- 
cgit v1.2.3