Remove extra include directives. No code changes.

* defs.h: Include <signal.h> unconditionally.
Other files were doing it unconditionally, so no harm done.
* bjm.c: Remove system includes which are already included by defs.h.
* pathtrace.c: Likewise.
* process.c: Likewise.
* signal.c: Likewise.
* strace.c: Likewise.
* stream.c: Likewise.
* syscall.c: Likewise.
* system.c: Likewise.
* util.c: Likewise.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/bjm.c b/bjm.c
index b5eb52aee0f90baa8933f6b86b60377b1833850c..b5e21f9952c9af536a29c25b033fa8f22ca77ea5 100644 (file)
--- a/bjm.c
+++ b/bjm.c
@@ -33,13 +33,10 @@
 
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <sys/time.h>
 #include <sys/wait.h>
 #include <sys/resource.h>
 #include <sys/utsname.h>
 #include <sys/user.h>
-#include <sys/syscall.h>
-#include <signal.h>
 
 /* Bits of module.flags.  */
 

diff --git a/defs.h b/defs.h
index 6da3edfd642629c83ccffa9380fd8d9972a7c549..050d908feb8384e3cb78a1204cf2a43892a8b674 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -58,9 +58,7 @@
 #ifdef STDC_HEADERS
 # include <stddef.h>
 #endif
-#ifdef HAVE_SIGINFO_T
-# include <signal.h>
-#endif
+#include <signal.h>
 
 /* Configuration section */
 #ifndef MAX_QUALS

diff --git a/pathtrace.c b/pathtrace.c
index 91a55dc930b9d15e5097b2265b78b88ceb405085..cb31a7363f1e2b95d97592ee47a22adac1789034 100644 (file)
--- a/pathtrace.c
+++ b/pathtrace.c
@@ -28,7 +28,6 @@
 
 #include "defs.h"
 
-#include <ctype.h>
 #include <sys/param.h>
 
 #ifdef HAVE_POLL_H

diff --git a/process.c b/process.c
index 5a0aae2b641bd6d783c9fef83c3057081e5802ea..41179cd1ccb009e95560c8730c2398750ee774b8 100644 (file)
--- a/process.c
+++ b/process.c
@@ -41,13 +41,10 @@
 
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <sys/time.h>
 #include <sys/wait.h>
 #include <sys/resource.h>
 #include <sys/utsname.h>
 #include <sys/user.h>
-#include <sys/syscall.h>
-#include <signal.h>
 
 #ifdef HAVE_SYS_REG_H
 # include <sys/reg.h>

diff --git a/signal.c b/signal.c
index dc0064b76886fceafc59d15fb5a450204296c253..97c8d1d14111f93720c9d8a3589a07a3dc1cc145 100644 (file)
--- a/signal.c
+++ b/signal.c
@@ -36,7 +36,6 @@
 #include "defs.h"
 
 #include <stdint.h>
-#include <signal.h>
 #include <sys/user.h>
 #include <fcntl.h>
 

diff --git a/strace.c b/strace.c
index f05cf30048481b135807fd2bd3e87f5ca9126f01..c285656ee57675b364f250089db30cfdd5ec32b6 100644 (file)
--- a/strace.c
+++ b/strace.c
@@ -32,10 +32,7 @@
 
 #include "defs.h"
 
-#include <sys/types.h>
 #include <stdarg.h>
-#include <signal.h>
-#include <errno.h>
 #include <sys/param.h>
 #include <fcntl.h>
 #include <sys/resource.h>
@@ -43,10 +40,8 @@
 #include <sys/stat.h>
 #include <pwd.h>
 #include <grp.h>
-#include <string.h>
 #include <dirent.h>
 #include <sys/utsname.h>
-#include <asm/unistd.h>
 #if defined(IA64)
 # include <asm/ptrace_offsets.h>
 #endif

diff --git a/stream.c b/stream.c
index c635352397303084dcebfd67a775b4b7e68e864c..c5d7f6507ef85d15a0347adfca46da3a6b5c9a99 100644 (file)
--- a/stream.c
+++ b/stream.c
@@ -29,7 +29,6 @@
  */
 
 #include "defs.h"
-#include <sys/syscall.h>
 
 #ifdef HAVE_POLL_H
 #include <poll.h>

diff --git a/syscall.c b/syscall.c
index 2b6d6777d0ea0905cd32576fe27914280f18a79e..546a8c41e6f51824eb3b2ed3d88139fe6e61c640 100644 (file)
--- a/syscall.c
+++ b/syscall.c
@@ -35,11 +35,7 @@
 
 #include "defs.h"
 
-#include <signal.h>
-#include <time.h>
-#include <errno.h>
 #include <sys/user.h>
-#include <sys/syscall.h>
 #include <sys/param.h>
 
 #ifdef HAVE_SYS_REG_H

diff --git a/system.c b/system.c
index c44a0168350b908f77d63dd59543ac191313d1a3..4fdfa6f3e518b7e0c5ce7588b6067531765da0d4 100644 (file)
--- a/system.c
+++ b/system.c
@@ -68,7 +68,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <sys/syscall.h>
 
 #ifdef HAVE_LINUX_CAPABILITY_H
 #include <linux/capability.h>

diff --git a/util.c b/util.c
index 59665b7074219b17a0dfa24e1fe04ed0f889dee7..33e4288f6029c1c2bedfe35574df010417fddecf 100644 (file)
--- a/util.c
+++ b/util.c
@@ -35,8 +35,6 @@
 
 #include "defs.h"
 
-#include <signal.h>
-#include <sys/syscall.h>
 #include <sys/user.h>
 #include <sys/param.h>
 #include <fcntl.h>
@@ -1162,7 +1160,6 @@ printcall(struct tcb *tcp)
 
 #include "syscall.h"
 
-#include <sys/syscall.h>
 #ifndef CLONE_PTRACE
 # define CLONE_PTRACE    0x00002000
 #endif