Don't include dirname.h, since system.h does it now.

17 files changed, 4 insertions, 19 deletions

diff --git a/src/basename.c b/src/basename.c
index 05fbb66db..f2617b1ea 100644
--- a/src/basename.c
+++ b/src/basename.c
@@ -32,7 +32,6 @@
 
 #include "system.h"
 #include "long-options.h"
-#include "dirname.h"
 #include "error.h"
 #include "quote.h"
 
diff --git a/src/chmod.c b/src/chmod.c
index 0a7ab5e1a..29611366c 100644
--- a/src/chmod.c
+++ b/src/chmod.c
@@ -24,7 +24,6 @@
 
 #include "system.h"
 #include "dev-ino.h"
-#include "dirname.h"
 #include "error.h"
 #include "filemode.h"
 #include "modechange.h"
diff --git a/src/copy.c b/src/copy.c
index e1406f7c2..f8b0ee678 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -35,7 +35,6 @@
 #include "buffer-lcm.h"
 #include "copy.h"
 #include "cp-hash.h"
-#include "dirname.h"
 #include "euidaccess.h"
 #include "error.h"
 #include "fcntl--.h"
diff --git a/src/cp.c b/src/cp.c
index c1751cf74..8ef115373 100644
--- a/src/cp.c
+++ b/src/cp.c
@@ -28,7 +28,6 @@
 #include "copy.h"
 #include "cp-hash.h"
 #include "error.h"
-#include "dirname.h"
 #include "filenamecat.h"
 #include "lchmod.h"
 #include "quote.h"
diff --git a/src/df.c b/src/df.c
index 7d7bf1b18..61a0b40f4 100644
--- a/src/df.c
+++ b/src/df.c
@@ -26,7 +26,6 @@
 
 #include "system.h"
 #include "canonicalize.h"
-#include "dirname.h"
 #include "error.h"
 #include "fsusage.h"
 #include "human.h"
diff --git a/src/dircolors.c b/src/dircolors.c
index 4f09ae2d5..fc9319b60 100644
--- a/src/dircolors.c
+++ b/src/dircolors.c
@@ -24,7 +24,6 @@
 
 #include "system.h"
 #include "dircolors.h"
-#include "dirname.h"
 #include "error.h"
 #include "getline.h"
 #include "obstack.h"
diff --git a/src/dirname.c b/src/dirname.c
index 31a3726b2..2253391ce 100644
--- a/src/dirname.c
+++ b/src/dirname.c
@@ -1,6 +1,6 @@
 /* dirname -- strip suffix from file name
 
-   Copyright (C) 1990-1997, 1999-2002, 2004, 2005 Free Software
+   Copyright (C) 1990-1997, 1999-2002, 2004, 2005, 2006 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -27,7 +27,6 @@
 #include "system.h"
 #include "long-options.h"
 #include "error.h"
-#include "dirname.h"
 #include "quote.h"
 
 /* The official name of this program (e.g., no `g' prefix).  */
diff --git a/src/du.c b/src/du.c
index bb6d1ec22..5f4e796db 100644
--- a/src/du.c
+++ b/src/du.c
@@ -31,7 +31,6 @@
 #include <assert.h>
 #include "system.h"
 #include "argmatch.h"
-#include "dirname.h" /* for strip_trailing_slashes */
 #include "error.h"
 #include "exclude.h"
 #include "fprintftime.h"
diff --git a/src/install.c b/src/install.c
index d8ec97af0..78fa28e0b 100644
--- a/src/install.c
+++ b/src/install.c
@@ -30,7 +30,6 @@
 #include "error.h"
 #include "cp-hash.h"
 #include "copy.h"
-#include "dirname.h"
 #include "filenamecat.h"
 #include "mkancesdirs.h"
 #include "mkdir-p.h"
diff --git a/src/ln.c b/src/ln.c
index c5445704e..46d583465 100644
--- a/src/ln.c
+++ b/src/ln.c
@@ -25,7 +25,6 @@
 #include "system.h"
 #include "same.h"
 #include "backupfile.h"
-#include "dirname.h"
 #include "error.h"
 #include "filenamecat.h"
 #include "quote.h"
diff --git a/src/ls.c b/src/ls.c
index b33edb3bb..573f5f581 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -82,7 +82,6 @@
 #include "acl.h"
 #include "argmatch.h"
 #include "dev-ino.h"
-#include "dirname.h"
 #include "dirfd.h"
 #include "error.h"
 #include "filenamecat.h"
diff --git a/src/mkdir.c b/src/mkdir.c
index 447cafc56..852bc3e15 100644
--- a/src/mkdir.c
+++ b/src/mkdir.c
@@ -23,7 +23,6 @@
 #include <sys/types.h>
 
 #include "system.h"
-#include "dirname.h"
 #include "error.h"
 #include "lchmod.h"
 #include "mkdir-p.h"
diff --git a/src/mv.c b/src/mv.c
index 44e935e13..e32cbcc97 100644
--- a/src/mv.c
+++ b/src/mv.c
@@ -28,7 +28,6 @@
 #include "backupfile.h"
 #include "copy.h"
 #include "cp-hash.h"
-#include "dirname.h"
 #include "error.h"
 #include "filenamecat.h"
 #include "quote.h"
diff --git a/src/rmdir.c b/src/rmdir.c
index 2d94fcda8..39063b4c7 100644
--- a/src/rmdir.c
+++ b/src/rmdir.c
@@ -1,5 +1,7 @@
 /* rmdir -- remove directories
-   Copyright (C) 90, 91, 1995-2002, 2004, 2005 Free Software Foundation, Inc.
+
+   Copyright (C) 90, 91, 1995-2002, 2004, 2005, 2006 Free Software
+   Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -28,7 +30,6 @@
 #include <sys/types.h>
 
 #include "system.h"
-#include "dirname.h"
 #include "error.h"
 #include "quotearg.h"
 
diff --git a/src/shred.c b/src/shred.c
index 1f041cb68..d3b1c4a9c 100644
--- a/src/shred.c
+++ b/src/shred.c
@@ -95,7 +95,6 @@
 
 #include "system.h"
 #include "xstrtol.h"
-#include "dirname.h"
 #include "error.h"
 #include "fcntl--.h"
 #include "getpagesize.h"
diff --git a/src/split.c b/src/split.c
index 1ecb6b39c..1f0f3d727 100644
--- a/src/split.c
+++ b/src/split.c
@@ -28,7 +28,6 @@
 #include <sys/types.h>
 
 #include "system.h"
-#include "dirname.h"
 #include "error.h"
 #include "fd-reopen.h"
 #include "fcntl--.h"
diff --git a/src/su.c b/src/su.c
index ddd267755..70828b8fd 100644
--- a/src/su.c
+++ b/src/su.c
@@ -60,7 +60,6 @@
 #define getusershell _getusershell_sys_proto_
 
 #include "system.h"
-#include "dirname.h"
 #include "getpass.h"
 
 #undef getusershell