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

diff --git a/src/basename.c b/src/basename.c
index 05fbb66db981042a54357200d750e2ba48ddf6e6..f2617b1ea3bc8e312e4d160ce4f4a77ae8c8f062 100644 (file)
--- 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 0a7ab5e1a6eff004f8dc5133e05afc120cda5207..29611366c9f39378c4350fbf1ebe72ba4cab23d3 100644 (file)
--- 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 e1406f7c25a95e5f077d3b062185f35ade689a01..f8b0ee678ac546868302d1119f7a514daa720874 100644 (file)
--- 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 c1751cf74c8a466eb04605fa44d03d4a289c7504..8ef1153732c3373b860183c54ea427326867e1da 100644 (file)
--- 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 7d7bf1b187ab3e827ed060817595b4d0e1139849..61a0b40f4fed04dabeee1f2fe6f1a738659950e3 100644 (file)
--- 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 4f09ae2d5090ac7c722ad6694ee5a09df877d3ba..fc9319b60ed5b0b546a429e4b9c818daa53d6222 100644 (file)
--- 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 31a3726b21f7e9c71655c7e7f6e3ca5e08ee976b..2253391cea3fc906ca35468ddaf65794f96c4231 100644 (file)
--- 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 bb6d1ec22c446fae76d7432914af1a4385ab002d..5f4e796dbdcbf70dd08552b17d3715d86697615b 100644 (file)
--- 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 d8ec97af0bea8432a979f9c26b700037b7832e90..78fa28e0b5186333c575d45a5b9a7f903b4bcfa2 100644 (file)
--- 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 c5445704e2c5152423b305686cb9f0276e00a413..46d58346579b3cfb25018e62da2931991907a548 100644 (file)
--- 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 b33edb3bb6fd9eae5176f4a19361e67df4d92e4b..573f5f5816e2542478404b38cb246d40ebbcb2b2 100644 (file)
--- 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 447cafc566fd6f2f807f2b1cb95b9b317a6bb49a..852bc3e15462a5a2cf9e0d01587cb89a7f5208f0 100644 (file)
--- 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 44e935e13c04e1c4c031cfd454a8c0069c54c2bc..e32cbcc97aa156ca6dfb6ac2590a425f1e24d683 100644 (file)
--- 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 2d94fcda8cae8ea5a5c593708c704052c7c81c43..39063b4c738887ca78ad8e91361366f05d17bf58 100644 (file)
--- 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 1f041cb68fbdf7701e10518c565d572711eee3f8..d3b1c4a9ce7c3864edb71470fc2122c981442835 100644 (file)
--- 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 1ecb6b39c3ca1cf191c958e2f9ed756be174b007..1f0f3d7270bca0ab7cb122c20e3f820cdd27606a 100644 (file)
--- 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 ddd267755da6e5c1ca9d13f03adcbf03554454d4..70828b8fd8603a4f9c950a28fb164b98d80ac08d 100644 (file)
--- 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