usage.c: remove reference to busybox.h

*: s/include "busybox.h"/include "libbb.h"

73 files changed, 76 insertions, 76 deletions

diff --git a/coreutils/basename.c b/coreutils/basename.c
index f4307d6ce..f59d7a8de 100644
--- a/coreutils/basename.c
+++ b/coreutils/basename.c
@@ -20,7 +20,7 @@
  * 3) Save some space by using strcmp().  Calling strncmp() here was silly.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* This is a NOFORK applet. Be very careful! */
 
diff --git a/coreutils/cal.c b/coreutils/cal.c
index 3d617916e..ce910bc63 100644
--- a/coreutils/cal.c
+++ b/coreutils/cal.c
@@ -17,7 +17,7 @@
  * Major size reduction... over 50% (>1.5k) on i386.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
 #define	THURSDAY		4		/* for reformation */
 #define	SATURDAY		6		/* 1 Jan 1 was a Saturday */
diff --git a/coreutils/cat.c b/coreutils/cat.c
index ed3f33650..64e697eb3 100644
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -10,7 +10,7 @@
 /* BB_AUDIT SUSv3 compliant */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/cat.html */
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* This is a NOFORK applet. Be very careful! */
 
diff --git a/coreutils/catv.c b/coreutils/catv.c
index 826e0e9a6..2d2229f7f 100644
--- a/coreutils/catv.c
+++ b/coreutils/catv.c
@@ -10,7 +10,7 @@
 /* See "Cat -v considered harmful" at
  * http://cm.bell-labs.com/cm/cs/doc/84/kp.ps.gz */
 
-#include "busybox.h"
+#include "libbb.h"
 
 int catv_main(int argc, char **argv);
 int catv_main(int argc, char **argv)
diff --git a/coreutils/chgrp.c b/coreutils/chgrp.c
index 48014ecdf..90a1cfe2b 100644
--- a/coreutils/chgrp.c
+++ b/coreutils/chgrp.c
@@ -11,7 +11,7 @@
 /* BB_AUDIT GNU defects - unsupported long options. */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/chgrp.html */
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* This is a NOEXEC applet. Be very careful! */
 
diff --git a/coreutils/chmod.c b/coreutils/chmod.c
index aa3625877..52cc40d97 100644
--- a/coreutils/chmod.c
+++ b/coreutils/chmod.c
@@ -14,7 +14,7 @@
 /* BB_AUDIT GNU defects - unsupported long options. */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/chmod.html */
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* This is a NOEXEC applet. Be very careful! */
 
diff --git a/coreutils/chown.c b/coreutils/chown.c
index 71ba81247..7579e1735 100644
--- a/coreutils/chown.c
+++ b/coreutils/chown.c
@@ -11,7 +11,7 @@
 /* BB_AUDIT GNU defects - unsupported long options. */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/chown.html */
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* This is a NOEXEC applet. Be very careful! */
 
diff --git a/coreutils/chroot.c b/coreutils/chroot.c
index 874ee917e..192daa894 100644
--- a/coreutils/chroot.c
+++ b/coreutils/chroot.c
@@ -9,7 +9,7 @@
 
 /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
 
-#include "busybox.h"
+#include "libbb.h"
 
 int chroot_main(int argc, char **argv);
 int chroot_main(int argc, char **argv)
diff --git a/coreutils/cksum.c b/coreutils/cksum.c
index 70febdf3a..865bea0ee 100644
--- a/coreutils/cksum.c
+++ b/coreutils/cksum.c
@@ -6,7 +6,7 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */
 
-#include "busybox.h"
+#include "libbb.h"
 
 int cksum_main(int argc, char **argv);
 int cksum_main(int argc, char **argv)
diff --git a/coreutils/cmp.c b/coreutils/cmp.c
index 80fab0b90..e5dda80ff 100644
--- a/coreutils/cmp.c
+++ b/coreutils/cmp.c
@@ -21,7 +21,7 @@
  *    in the '-l' case.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
 static FILE *cmp_xfopen_input(const char *filename)
 {
diff --git a/coreutils/comm.c b/coreutils/comm.c
index 28e3982f2..3be6760dc 100644
--- a/coreutils/comm.c
+++ b/coreutils/comm.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
 #define COMM_OPT_1 (1 << 0)
 #define COMM_OPT_2 (1 << 1)
diff --git a/coreutils/cp.c b/coreutils/cp.c
index 8c0937971..f98f281b5 100644
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -15,7 +15,7 @@
  * Size reduction.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 #include "libcoreutils/coreutils.h"
 
 /* This is a NOEXEC applet. Be very careful! */
diff --git a/coreutils/cut.c b/coreutils/cut.c
index b9ea3127c..084f7be37 100644
--- a/coreutils/cut.c
+++ b/coreutils/cut.c
@@ -9,7 +9,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* This is a NOEXEC applet. Be very careful! */
 
diff --git a/coreutils/date.c b/coreutils/date.c
index d2d77f413..57c826a3f 100644
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -10,7 +10,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
 */
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* This 'date' command supports only 2 time setting formats,
    all the GNU strftime stuff (its in libc, lets use it),
diff --git a/coreutils/dd.c b/coreutils/dd.c
index 5aee9dbb4..dd311d86a 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -9,7 +9,7 @@
  */
 
 #include <signal.h>  /* For FEATURE_DD_SIGNAL_HANDLING */
-#include "busybox.h"
+#include "libbb.h"
 
 /* This is a NOEXEC applet. Be very careful! */
 
diff --git a/coreutils/df.c b/coreutils/df.c
index 484cabb37..d455d27f6 100644
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -24,7 +24,7 @@
 #include <unistd.h>
 #include <mntent.h>
 #include <sys/vfs.h>
-#include "busybox.h"
+#include "libbb.h"
 
 #ifndef CONFIG_FEATURE_HUMAN_READABLE
 static long kscale(long b, long bs)
diff --git a/coreutils/diff.c b/coreutils/diff.c
index 09cacbde6..f6b045b2d 100644
--- a/coreutils/diff.c
+++ b/coreutils/diff.c
@@ -12,7 +12,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
 #define FSIZE_MAX 32768
 
diff --git a/coreutils/dirname.c b/coreutils/dirname.c
index 7c5484bfd..fd2c381c8 100644
--- a/coreutils/dirname.c
+++ b/coreutils/dirname.c
@@ -10,7 +10,7 @@
 /* BB_AUDIT SUSv3 compliant */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/dirname.html */
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* This is a NOFORK applet. Be very careful! */
 
diff --git a/coreutils/dos2unix.c b/coreutils/dos2unix.c
index 04c56ac9c..b053a0cbf 100644
--- a/coreutils/dos2unix.c
+++ b/coreutils/dos2unix.c
@@ -12,7 +12,7 @@
  * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
 */
 
-#include "busybox.h"
+#include "libbb.h"
 
 enum ConvType {
 	CT_UNIX2DOS = 1,
diff --git a/coreutils/du.c b/coreutils/du.c
index e95f3a2f1..cb3e715d9 100644
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -23,7 +23,7 @@
  * 4) Fixed busybox bug #1284 involving long overflow with human_readable.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
 #if ENABLE_FEATURE_HUMAN_READABLE
 # if ENABLE_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
diff --git a/coreutils/echo.c b/coreutils/echo.c
index 2de19c2e3..9aad2c2ba 100644
--- a/coreutils/echo.c
+++ b/coreutils/echo.c
@@ -23,7 +23,7 @@
  *    The previous version did not allow 4-digit octals.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
 int bb_echo(char **argv)
 {
diff --git a/coreutils/env.c b/coreutils/env.c
index 2a271f703..ad30f0193 100644
--- a/coreutils/env.c
+++ b/coreutils/env.c
@@ -29,11 +29,11 @@
  * - use xfunc_error_retval
  */
 
-#include "busybox.h"
-#include <errno.h>
 #include <getopt.h> /* struct option */
 extern char **environ;
 
+#include "libbb.h"
+
 #if ENABLE_FEATURE_ENV_LONG_OPTIONS
 static const struct option env_long_options[] = {
 	{ "ignore-environment", 0, NULL, 'i' },
diff --git a/coreutils/expr.c b/coreutils/expr.c
index b6bd383f6..46e18d190 100644
--- a/coreutils/expr.c
+++ b/coreutils/expr.c
@@ -25,7 +25,7 @@
 
 /* no getopt needed */
 
-#include "busybox.h"
+#include "libbb.h"
 #include "xregex.h"
 
 /* The kinds of value we can have.  */
diff --git a/coreutils/false.c b/coreutils/false.c
index 90d6a0162..07cf9e83e 100644
--- a/coreutils/false.c
+++ b/coreutils/false.c
@@ -10,7 +10,7 @@
 /* BB_AUDIT SUSv3 compliant */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/false.html */
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* This is a NOFORK applet. Be very careful! */
 
diff --git a/coreutils/fold.c b/coreutils/fold.c
index 4ce52cf0b..d5e3a4d72 100644
--- a/coreutils/fold.c
+++ b/coreutils/fold.c
@@ -10,7 +10,7 @@
    Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
 */
 
-#include "busybox.h"
+#include "libbb.h"
 
 static unsigned long flags;
 #define FLAG_COUNT_BYTES	1
diff --git a/coreutils/head.c b/coreutils/head.c
index ed1d01d52..1700af27a 100644
--- a/coreutils/head.c
+++ b/coreutils/head.c
@@ -11,7 +11,7 @@
 /* BB_AUDIT GNU compatible -c, -q, and -v options in 'fancy' configuration. */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/head.html */
 
-#include "busybox.h"
+#include "libbb.h"
 
 static const char head_opts[] =
 	"n:"
diff --git a/coreutils/hostid.c b/coreutils/hostid.c
index e14f6ca57..7d96651e7 100644
--- a/coreutils/hostid.c
+++ b/coreutils/hostid.c
@@ -9,7 +9,7 @@
 
 /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* This is a NOFORK applet. Be very careful! */
 
diff --git a/coreutils/id.c b/coreutils/id.c
index 8a604195d..064bd29d9 100644
--- a/coreutils/id.c
+++ b/coreutils/id.c
@@ -13,7 +13,7 @@
  * -Z option support: by Yuichi Nakamura <ynakam@hitachisoft.jp>
  */
 
-#include "busybox.h"
+#include "libbb.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/types.h>
diff --git a/coreutils/install.c b/coreutils/install.c
index ece5b955b..7f168d2fd 100644
--- a/coreutils/install.c
+++ b/coreutils/install.c
@@ -9,11 +9,12 @@
  *           owner/group, will probably modify bb_make_directory(...)
  */
 
-#include "busybox.h"
-#include "libcoreutils/coreutils.h"
 #include <libgen.h>
 #include <getopt.h> /* struct option */
 
+#include "libbb.h"
+#include "libcoreutils/coreutils.h"
+
 #if ENABLE_FEATURE_INSTALL_LONG_OPTIONS
 static const struct option install_long_options[] = {
 	{ "directory",           0, NULL, 'd' },
diff --git a/coreutils/length.c b/coreutils/length.c
index b3a9d4903..a310b3b2f 100644
--- a/coreutils/length.c
+++ b/coreutils/length.c
@@ -2,7 +2,7 @@
 
 /* BB_AUDIT SUSv3 N/A -- Apparently a busybox (obsolete?) extension. */
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* This is a NOFORK applet. Be very careful! */
 
diff --git a/coreutils/ln.c b/coreutils/ln.c
index fd4eacec2..93a283d41 100644
--- a/coreutils/ln.c
+++ b/coreutils/ln.c
@@ -11,7 +11,7 @@
 /* BB_AUDIT GNU options missing: -d, -F, -i, and -v. */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/ln.html */
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* This is a NOEXEC applet. Be very careful! */
 
diff --git a/coreutils/logname.c b/coreutils/logname.c
index aba6ce3c6..2e628bc14 100644
--- a/coreutils/logname.c
+++ b/coreutils/logname.c
@@ -20,7 +20,7 @@
  * a diagnostic message and an error return.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* This is a NOFORK applet. Be very careful! */
 
diff --git a/coreutils/ls.c b/coreutils/ls.c
index b9c07adf8..e2ed3ee1f 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -30,7 +30,7 @@
  */
 
 #include <getopt.h>
-#include "busybox.h"
+#include "libbb.h"
 
 /* This is a NOEXEC applet. Be very careful! */
 
diff --git a/coreutils/md5_sha1_sum.c b/coreutils/md5_sha1_sum.c
index a3818d519..4523fa4ec 100644
--- a/coreutils/md5_sha1_sum.c
+++ b/coreutils/md5_sha1_sum.c
@@ -6,7 +6,7 @@
  * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
 typedef enum { HASH_SHA1, HASH_MD5 } hash_algo_t;
 
diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index 5a6c9d077..60c03a1f9 100644
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -20,7 +20,7 @@
  */
 
 #include <getopt.h> /* struct option */
-#include "busybox.h"
+#include "libbb.h"
 
 /* This is a NOFORK applet. Be very careful! */
 
diff --git a/coreutils/mkfifo.c b/coreutils/mkfifo.c
index 7dcc50fa9..030c9d22f 100644
--- a/coreutils/mkfifo.c
+++ b/coreutils/mkfifo.c
@@ -10,7 +10,7 @@
 /* BB_AUDIT SUSv3 compliant */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/mkfifo.html */
 
-#include "busybox.h"
+#include "libbb.h"
 #include "libcoreutils/coreutils.h"
 
 int mkfifo_main(int argc, char **argv);
diff --git a/coreutils/mknod.c b/coreutils/mknod.c
index 6fa6d8353..415ef55c1 100644
--- a/coreutils/mknod.c
+++ b/coreutils/mknod.c
@@ -11,7 +11,7 @@
 
 #include <sys/sysmacros.h>  // For makedev
 
-#include "busybox.h"
+#include "libbb.h"
 #include "libcoreutils/coreutils.h"
 
 static const char modes_chars[] = { 'p', 'c', 'u', 'b', 0, 1, 1, 2 };
diff --git a/coreutils/mv.c b/coreutils/mv.c
index c08d2327c..ad36051f9 100644
--- a/coreutils/mv.c
+++ b/coreutils/mv.c
@@ -20,7 +20,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <getopt.h> /* struct option */
-#include "busybox.h"
+#include "libbb.h"
 #include "libcoreutils/coreutils.h"
 
 #if ENABLE_FEATURE_MV_LONG_OPTIONS
diff --git a/coreutils/nice.c b/coreutils/nice.c
index 328531528..8d77ae472 100644
--- a/coreutils/nice.c
+++ b/coreutils/nice.c
@@ -8,7 +8,7 @@
  */
 
 #include <sys/resource.h>
-#include "busybox.h"
+#include "libbb.h"
 
 int nice_main(int argc, char **argv);
 int nice_main(int argc, char **argv)
diff --git a/coreutils/nohup.c b/coreutils/nohup.c
index 6a6c70e13..22419b800 100644
--- a/coreutils/nohup.c
+++ b/coreutils/nohup.c
@@ -10,7 +10,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
 int nohup_main(int argc, char **argv);
 int nohup_main(int argc, char **argv)
diff --git a/coreutils/od.c b/coreutils/od.c
index 0de9def5a..00de080b6 100644
--- a/coreutils/od.c
+++ b/coreutils/od.c
@@ -12,7 +12,7 @@
  */
 
 
-#include "busybox.h"
+#include "libbb.h"
 #if ENABLE_DESKTOP
 /* This one provides -t (busybox's own build script needs it) */
 #include "od_bloaty.c"
diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c
index efdbf354a..325085626 100644
--- a/coreutils/od_bloaty.c
+++ b/coreutils/od_bloaty.c
@@ -49,8 +49,7 @@ diff -u -a std bbox >bbox.diff || { echo Different!; sleep 1; }
 
 */
 
-
-#include "busybox.h"
+#include "libbb.h"
 #include <getopt.h>
 
 #define assert(a) ((void)0)
diff --git a/coreutils/printenv.c b/coreutils/printenv.c
index 935f52df3..0e69ff217 100644
--- a/coreutils/printenv.c
+++ b/coreutils/printenv.c
@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "busybox.h"
+#include "libbb.h"
 extern char **environ;
 
 int printenv_main(int argc, char **argv);
diff --git a/coreutils/printf.c b/coreutils/printf.c
index a2a82d249..d0cf5a671 100644
--- a/coreutils/printf.c
+++ b/coreutils/printf.c
@@ -38,7 +38,7 @@
 
 //   19990508 Busy Boxed! Dave Cinege
 
-#include "busybox.h"
+#include "libbb.h"
 
 typedef void (*converter)(const char *arg, void *result);
 
diff --git a/coreutils/pwd.c b/coreutils/pwd.c
index a93b8f115..73a9d5be8 100644
--- a/coreutils/pwd.c
+++ b/coreutils/pwd.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* This is a NOFORK applet. Be very careful! */
 
diff --git a/coreutils/realpath.c b/coreutils/realpath.c
index b3f7e4957..7c5dc3b10 100644
--- a/coreutils/realpath.c
+++ b/coreutils/realpath.c
@@ -10,7 +10,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
 int realpath_main(int argc, char **argv);
 int realpath_main(int argc, char **argv)
diff --git a/coreutils/rm.c b/coreutils/rm.c
index e29073db8..cc2264770 100644
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -15,7 +15,7 @@
  * Size reduction.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* This is a NOFORK applet. Be very careful! */
 
diff --git a/coreutils/rmdir.c b/coreutils/rmdir.c
index 7f3253017..c1b89e427 100644
--- a/coreutils/rmdir.c
+++ b/coreutils/rmdir.c
@@ -11,7 +11,7 @@
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/rmdir.html */
 
 #include <libgen.h>
-#include "busybox.h"
+#include "libbb.h"
 
 /* This is a NOFORK applet. Be very careful! */
 
diff --git a/coreutils/seq.c b/coreutils/seq.c
index ef884d6ae..050c33317 100644
--- a/coreutils/seq.c
+++ b/coreutils/seq.c
@@ -7,7 +7,7 @@
  * Licensed under the GPL v2, see the file LICENSE in this tarball.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* This is a NOFORK applet. Be very careful! */
 
diff --git a/coreutils/sleep.c b/coreutils/sleep.c
index 592005bab..e9a30daf2 100644
--- a/coreutils/sleep.c
+++ b/coreutils/sleep.c
@@ -18,7 +18,7 @@
  * time suffixes for seconds, minutes, hours, and days.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* This is a NOFORK applet. Be very careful! */
 
diff --git a/coreutils/sort.c b/coreutils/sort.c
index 06a6cbf70..f41bd6329 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -12,7 +12,7 @@
  * http://www.opengroup.org/onlinepubs/007904975/utilities/sort.html
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* This is a NOEXEC applet. Be very careful! */
 
diff --git a/coreutils/split.c b/coreutils/split.c
index 10035e9ab..27f9cfdd6 100644
--- a/coreutils/split.c
+++ b/coreutils/split.c
@@ -9,7 +9,7 @@
  * SUSv3 requirements:
  * http://www.opengroup.org/onlinepubs/009695399/utilities/split.html
  */
-#include "busybox.h"
+#include "libbb.h"
 
 static const struct suffix_mult split_suffices[] = {
 #if ENABLE_FEATURE_SPLIT_FANCY
diff --git a/coreutils/stat.c b/coreutils/stat.c
index 16b8d1e44..9930d847d 100644
--- a/coreutils/stat.c
+++ b/coreutils/stat.c
@@ -13,7 +13,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* vars to control behavior */
 #define OPT_FILESYS		(1<<0)
diff --git a/coreutils/stty.c b/coreutils/stty.c
index 702cada63..488a7f8fb 100644
--- a/coreutils/stty.c
+++ b/coreutils/stty.c
@@ -21,7 +21,7 @@
 
    */
 
-#include "busybox.h"
+#include "libbb.h"
 
 #ifndef _POSIX_VDISABLE
 # define _POSIX_VDISABLE ((unsigned char) 0)
diff --git a/coreutils/sum.c b/coreutils/sum.c
index 9327ca55e..5799d142d 100644
--- a/coreutils/sum.c
+++ b/coreutils/sum.c
@@ -13,7 +13,7 @@
  * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
 enum { SUM_BSD, PRINT_NAME, SUM_SYSV };
 
diff --git a/coreutils/sync.c b/coreutils/sync.c
index e52ab768d..d562f3fc5 100644
--- a/coreutils/sync.c
+++ b/coreutils/sync.c
@@ -9,7 +9,7 @@
 
 /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* This is a NOFORK applet. Be very careful! */
 
diff --git a/coreutils/tail.c b/coreutils/tail.c
index 32df25914..e0d21ed34 100644
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@@ -24,7 +24,7 @@
  * 7) lseek attempted when count==0 even if arg was +0 (from top)
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
 static const struct suffix_mult tail_suffixes[] = {
 	{ "b", 512 },
diff --git a/coreutils/tee.c b/coreutils/tee.c
index 338232ce9..2160141c9 100644
--- a/coreutils/tee.c
+++ b/coreutils/tee.c
@@ -10,7 +10,7 @@
 /* BB_AUDIT SUSv3 compliant */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/tee.html */
 
-#include "busybox.h"
+#include "libbb.h"
 #include <signal.h>
 
 int tee_main(int argc, char **argv);
diff --git a/coreutils/test.c b/coreutils/test.c
index 70b392f38..df8387b14 100644
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -20,7 +20,7 @@
  *     "This program is in the Public Domain."
  */
 
-#include "busybox.h"
+#include "libbb.h"
 #include <setjmp.h>
 
 /* This is a NOEXEC applet. Be very careful! */
diff --git a/coreutils/touch.c b/coreutils/touch.c
index 5f81b2380..7b82339fc 100644
--- a/coreutils/touch.c
+++ b/coreutils/touch.c
@@ -17,7 +17,7 @@
  * Also, exiting on a failure was a bug.  All args should be processed.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* This is a NOFORK applet. Be very careful! */
 
diff --git a/coreutils/tr.c b/coreutils/tr.c
index 5d3dd4cd8..7e89e9a80 100644
--- a/coreutils/tr.c
+++ b/coreutils/tr.c
@@ -18,7 +18,7 @@
 /* http://www.opengroup.org/onlinepubs/009695399/utilities/tr.html
  * TODO: xdigit, graph, print
  */
-#include "busybox.h"
+#include "libbb.h"
 
 #define ASCII 0377
 
diff --git a/coreutils/true.c b/coreutils/true.c
index eee621331..9dcd69aa3 100644
--- a/coreutils/true.c
+++ b/coreutils/true.c
@@ -10,7 +10,7 @@
 /* BB_AUDIT SUSv3 compliant */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/true.html */
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* This is a NOFORK applet. Be very careful! */
 
diff --git a/coreutils/tty.c b/coreutils/tty.c
index d4c179fca..2c77c9960 100644
--- a/coreutils/tty.c
+++ b/coreutils/tty.c
@@ -10,7 +10,7 @@
 /* BB_AUDIT SUSv3 compliant */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/tty.html */
 
-#include "busybox.h"
+#include "libbb.h"
 
 int tty_main(int argc, char **argv);
 int tty_main(int argc, char **argv)
diff --git a/coreutils/uname.c b/coreutils/uname.c
index 2faa89321..d4188cdae 100644
--- a/coreutils/uname.c
+++ b/coreutils/uname.c
@@ -37,7 +37,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/utsname.h>
-#include "busybox.h"
+#include "libbb.h"
 
 typedef struct {
 	struct utsname name;
diff --git a/coreutils/uniq.c b/coreutils/uniq.c
index 11a731aaa..adc196b97 100644
--- a/coreutils/uniq.c
+++ b/coreutils/uniq.c
@@ -10,7 +10,7 @@
 /* BB_AUDIT SUSv3 compliant */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/uniq.html */
 
-#include "busybox.h"
+#include "libbb.h"
 
 static const char uniq_opts[] = "cdu" "f:s:" "cdu\0\1\2\4";
 
diff --git a/coreutils/usleep.c b/coreutils/usleep.c
index 2baf2bc87..e0cd56e54 100644
--- a/coreutils/usleep.c
+++ b/coreutils/usleep.c
@@ -9,7 +9,7 @@
 
 /* BB_AUDIT SUSv3 N/A -- Apparently a busybox extension. */
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* This is a NOFORK applet. Be very careful! */
 
diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c
index c195a3e6f..779710edd 100644
--- a/coreutils/uudecode.c
+++ b/coreutils/uudecode.c
@@ -12,7 +12,7 @@
  */
 
 
-#include "busybox.h"
+#include "libbb.h"
 
 static void read_stduu(FILE *src_stream, FILE *dst_stream)
 {
diff --git a/coreutils/uuencode.c b/coreutils/uuencode.c
index 3207d7296..9490474b9 100644
--- a/coreutils/uuencode.c
+++ b/coreutils/uuencode.c
@@ -8,7 +8,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
 
 #define SRC_BUF_SIZE	45  // This *MUST* be a multiple of 3
diff --git a/coreutils/watch.c b/coreutils/watch.c
index 60a4a71ce..2ad0564cd 100644
--- a/coreutils/watch.c
+++ b/coreutils/watch.c
@@ -11,7 +11,7 @@
 /* BB_AUDIT SUSv3 N/A */
 /* BB_AUDIT GNU defects -- only option -n is supported. */
 
-#include "busybox.h"
+#include "libbb.h"
 
 // procps 2.0.18:
 // watch [-d] [-n seconds]
diff --git a/coreutils/wc.c b/coreutils/wc.c
index 926b3ac19..04112c194 100644
--- a/coreutils/wc.c
+++ b/coreutils/wc.c
@@ -41,7 +41,7 @@
  * for which 'wc -c' should output '0'.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
 #ifdef CONFIG_LOCALE_SUPPORT
 #define isspace_given_isprint(c) isspace(c)
diff --git a/coreutils/who.c b/coreutils/who.c
index a5d3b02eb..546050aee 100644
--- a/coreutils/who.c
+++ b/coreutils/who.c
@@ -17,7 +17,7 @@
  *----------------------------------------------------------------------
  */
 
-#include "busybox.h"
+#include "libbb.h"
 #include <utmp.h>
 #include <time.h>
 
diff --git a/coreutils/whoami.c b/coreutils/whoami.c
index 25757f633..156516fa7 100644
--- a/coreutils/whoami.c
+++ b/coreutils/whoami.c
@@ -9,7 +9,7 @@
 
 /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* This is a NOFORK applet. Be very careful! */
 
diff --git a/coreutils/yes.c b/coreutils/yes.c
index 569764150..5529eab14 100644
--- a/coreutils/yes.c
+++ b/coreutils/yes.c
@@ -14,7 +14,7 @@
  * Size reductions and removed redundant applet name prefix from error messages.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* This is a NOFORK applet. Be very careful! */