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 a75bc90f04420c96753734202d229541f8edd9dd..14e14cab251c644fa8f13de3ab011fa6d76ceb0b 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 e2209630792a34cab04698367baf55ef356bae6d..06f2020d36d3b7e224e4ba68943dea0ec4a82357 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 e462931f47cca564fdacca662d38de32fb048453..9ca3c7680cb0d172246f721dba2d13b618571443 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 153ef22bdc45087b34dea4bb472e095698907d4d..88bd20addb8a1deeffa899116586edb8824878d0 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 aee46aafc4cd9d95d18e4cde832593ee2dac9ef1..5d449f6fa1eb7d7303ab4bfe9b54b24dd0d69c0d 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 0d3a89c02bd782ad431eec47259ffb3991d91a1f..41b2b647a2dffbcc41b57eef1a121bb3395a119e 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 bc9012465b1ab526686f6f0eeba474f146fecbe3..88c2ec3134b25ff0df2926b89f19f0aadf280782 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 526f9b08d3090abe2865f7fd12497c31f6472a87..8f5ea142273f6af7859943c72bc01382043ece55 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 e8872e43e54f44832773f91720e57b99e7e1859f..5dcdf031a1a4f42db5574eadb65aa7c6f995eee4 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 57f4b315237fe1fdd3e2fa40737c4ef0f01adf74..e23cd26ada0df518805041dbed0528080963ee7e 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 b56050e45b9118fabd97c8265f4bfb44eb8c08f5..cc37308e9ca54520b355dccbe73b840b3ae89478 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 ba2e1eb0068536e40f4536b0cefe7d77a86f8786..ecbe0f280abb174d86337263fbb496e24af1be89 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 f933e7750852a2b7368154edcc410e92a3224ee6..c34626947ad323b93fd221967167491605ac27ea 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 ac5be3d0e8f62145211ff7677e8d969d073f098c..9b01e09fbf9d1b86e66d3df0ce84d50b1507aeae 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 fe9c865211c616d67166ef9a2e3d4b45b81b0bf1..af80fbe92f666f9db64d3256a483b601b22c9000 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 fa255864e486d964fa6d9a7b9c93b5f997b533a9..4c99d82b5db079f2386c2ba5519061ffe54086d2 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 2a584a6f2ba4f4a9f103d1b959a6ab45b44728e2..d791aafe7444b5891d83a95f90a9ef9f152d5176 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 54605ee43988f40b2ba0ff6bc005159468cf0c45..01727b8b4d247013346c750c584a31651328f27b 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 7489255099edc63bd31b33dcb07350538baf18b1..05ff72155600ee2d44c6208ebfceecbf1910cb01 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 fc1e67ac8cbc870d64bf8e1029602f181a0957b4..b2c24824a7a3e9ff61ac8777544b4f1bbb8ae108 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 eda5f3e8e37f8416f512b0dd906d32838d82fe44..9140493d9daa13a14ebbbbd1a9b25097e79332d1 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"