Don't include closeout.h or version-etc.h explicitly. Now, they're included via sys2.h.

diff --git a/src/chgrp.c b/src/chgrp.c
index a75bc90..14e14ca 100644 (file)
--- a/src/chgrp.c
+++ b/src/chgrp.c
@@ -24,11 +24,9 @@
 #include <getopt.h>
 
 #include "system.h"
-#include "closeout.h"
 #include "error.h"
 #include "group-member.h"
 #include "savedir.h"
-#include "version-etc.h"
 #include "xstrtoul.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */

diff --git a/src/chmod.c b/src/chmod.c
index e220963..06f2020 100644 (file)
--- a/src/chmod.c
+++ b/src/chmod.c
@@ -23,12 +23,10 @@
 #include <sys/types.h>
 
 #include "system.h"
-#include "closeout.h"
 #include "error.h"
 #include "filemode.h"
 #include "modechange.h"
 #include "savedir.h"
-#include "version-etc.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "chmod"

diff --git a/src/chown.c b/src/chown.c
index e462931..9ca3c76 100644 (file)
--- a/src/chown.c
+++ b/src/chown.c
@@ -36,11 +36,9 @@
 #include <getopt.h>
 
 #include "system.h"
-#include "closeout.h"
 #include "error.h"
 #include "lchown.h"
 #include "savedir.h"
-#include "version-etc.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "chown"

diff --git a/src/cp.c b/src/cp.c
index 153ef22..88bd20a 100644 (file)
--- a/src/cp.c
+++ b/src/cp.c
@@ -30,13 +30,11 @@
 #include "system.h"
 #include "argmatch.h"
 #include "backupfile.h"
-#include "closeout.h"
 #include "copy.h"
 #include "cp-hash.h"
 #include "error.h"
 #include "dirname.h"
 #include "path-concat.h"
-#include "version-etc.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "cp"

diff --git a/src/dd.c b/src/dd.c
index aee46aa..5d449f6 100644 (file)
--- a/src/dd.c
+++ b/src/dd.c
@@ -30,7 +30,6 @@
 #include <getopt.h>
 
 #include "system.h"
-#include "closeout.h"
 #include "error.h"
 #include "human.h"
 #include "long-options.h"

diff --git a/src/df.c b/src/df.c
index 0d3a89c..41b2b64 100644 (file)
--- a/src/df.c
+++ b/src/df.c
@@ -29,14 +29,12 @@
 #include <assert.h>
 
 #include "system.h"
-#include "closeout.h"
 #include "dirname.h"
 #include "error.h"
 #include "fsusage.h"
 #include "human.h"
 #include "mountlist.h"
 #include "save-cwd.h"
-#include "version-etc.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "df"

diff --git a/src/dircolors.c b/src/dircolors.c
index bc90124..88c2ec3 100644 (file)
--- a/src/dircolors.c
+++ b/src/dircolors.c
@@ -26,12 +26,10 @@
 #include <stdio.h>
 
 #include "system.h"
-#include "closeout.h"
 #include "dircolors.h"
 #include "error.h"
 #include "getline.h"
 #include "obstack.h"
-#include "version-etc.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "dircolors"

diff --git a/src/du.c b/src/du.c
index 526f9b0..8f5ea14 100644 (file)
--- a/src/du.c
+++ b/src/du.c
@@ -52,13 +52,11 @@
 #include <assert.h>
 
 #include "system.h"
-#include "closeout.h"
 #include "error.h"
 #include "exclude.h"
 #include "human.h"
 #include "save-cwd.h"
 #include "savedir.h"
-#include "version-etc.h"
 #include "xstrtol.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */

diff --git a/src/install.c b/src/install.c
index e8872e4..5dcdf03 100644 (file)
--- a/src/install.c
+++ b/src/install.c
@@ -73,7 +73,6 @@
 
 #include "system.h"
 #include "backupfile.h"
-#include "closeout.h"
 #include "error.h"
 #include "cp-hash.h"
 #include "copy.h"
@@ -81,7 +80,6 @@
 #include "makepath.h"
 #include "modechange.h"
 #include "path-concat.h"
-#include "version-etc.h"
 #include "xstrtol.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */

diff --git a/src/ln.c b/src/ln.c
index 57f4b31..e23cd26 100644 (file)
--- a/src/ln.c
+++ b/src/ln.c
@@ -28,10 +28,8 @@
 
 #include "system.h"
 #include "backupfile.h"
-#include "closeout.h"
 #include "dirname.h"
 #include "error.h"
-#include "version-etc.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "ln"

diff --git a/src/ls.c b/src/ls.c
index b56050e..cc37308 100644 (file)
--- a/src/ls.c
+++ b/src/ls.c
@@ -69,7 +69,6 @@
 #include <fnmatch.h>
 
 #include "argmatch.h"
-#include "closeout.h"
 #include "error.h"
 #include "human.h"
 #include "filemode.h"
@@ -78,7 +77,6 @@
 #include "path-concat.h"
 #include "quotearg.h"
 #include "strverscmp.h"
-#include "version-etc.h"
 #include "xstrtol.h"
 
 #define PROGRAM_NAME (ls_mode == LS_LS ? "ls" \

diff --git a/src/mkdir.c b/src/mkdir.c
index ba2e1eb..ecbe0f2 100644 (file)
--- a/src/mkdir.c
+++ b/src/mkdir.c
@@ -23,11 +23,9 @@
 #include <sys/types.h>
 
 #include "system.h"
-#include "closeout.h"
 #include "error.h"
 #include "makepath.h"
 #include "modechange.h"
-#include "version-etc.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "mkdir"

diff --git a/src/mkfifo.c b/src/mkfifo.c
index f933e77..c346269 100644 (file)
--- a/src/mkfifo.c
+++ b/src/mkfifo.c
@@ -28,10 +28,8 @@
 #include <sys/types.h>
 
 #include "system.h"
-#include "closeout.h"
 #include "error.h"
 #include "modechange.h"
-#include "version-etc.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "mkfifo"

diff --git a/src/mknod.c b/src/mknod.c
index ac5be3d..9b01e09 100644 (file)
--- a/src/mknod.c
+++ b/src/mknod.c
@@ -33,11 +33,9 @@
 #include <sys/types.h>
 
 #include "system.h"
-#include "closeout.h"
 #include "error.h"
 #include "modechange.h"
 #include "xstrtol.h"
-#include "version-etc.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "mknod"

diff --git a/src/mv.c b/src/mv.c
index fe9c865..af80fbe 100644 (file)
--- a/src/mv.c
+++ b/src/mv.c
@@ -49,13 +49,11 @@
 
 #include "system.h"
 #include "backupfile.h"
-#include "closeout.h"
 #include "copy.h"
 #include "cp-hash.h"
 #include "error.h"
 #include "path-concat.h"
 #include "remove.h"
-#include "version-etc.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "mv"

diff --git a/src/remove.c b/src/remove.c
index fa25586..4c99d82 100644 (file)
--- a/src/remove.c
+++ b/src/remove.c
@@ -34,7 +34,6 @@ typedef enum {false = 0, true = 1} bool;
 
 #include "save-cwd.h"
 #include "system.h"
-#include "closeout.h"
 #include "error.h"
 #include "obstack.h"
 #include "hash.h"

diff --git a/src/rm.c b/src/rm.c
index 2a584a6..d791aaf 100644 (file)
--- a/src/rm.c
+++ b/src/rm.c
@@ -50,11 +50,9 @@
 #include <assert.h>
 
 #include "system.h"
-#include "closeout.h"
 #include "error.h"
 #include "remove.h"
 #include "save-cwd.h"
-#include "version-etc.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "rm"

diff --git a/src/rmdir.c b/src/rmdir.c
index 54605ee..01727b8 100644 (file)
--- a/src/rmdir.c
+++ b/src/rmdir.c
@@ -28,9 +28,7 @@
 #include <sys/types.h>
 
 #include "system.h"
-#include "closeout.h"
 #include "error.h"
-#include "version-etc.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "rmdir"

diff --git a/src/shred.c b/src/shred.c
index 7489255..05ff721 100644 (file)
--- a/src/shred.c
+++ b/src/shred.c
@@ -63,10 +63,8 @@
 #include <stdarg.h>            /* Used by pferror */
 
 #include "system.h"
-#include "closeout.h"
 #include "error.h"
 #include "xstrtoul.h"
-#include "version-etc.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "shred"

diff --git a/src/sync.c b/src/sync.c
index fc1e67a..b2c2482 100644 (file)
--- a/src/sync.c
+++ b/src/sync.c
@@ -22,7 +22,6 @@
 #include <sys/types.h>
 
 #include "system.h"
-#include "closeout.h"
 #include "error.h"
 #include "long-options.h"
 

diff --git a/src/touch.c b/src/touch.c
index eda5f3e..9140493 100644 (file)
--- a/src/touch.c
+++ b/src/touch.c
@@ -25,12 +25,10 @@
 
 #include "system.h"
 #include "argmatch.h"
-#include "closeout.h"
 #include "error.h"
 #include "getdate.h"
 #include "posixtm.h"
 #include "safe-read.h"
-#include "version-etc.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
 #define PROGRAM_NAME "touch"