usage.c: remove reference to busybox.h

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

applets/usage.c

@@ -2,7 +2,6 @@
 #include <unistd.h>
 
 #include "../include/autoconf.h"
-#include "../include/busybox.h"
 
 static const char usage_messages[] = ""
 #define MAKE_USAGE

archival/ar.c

@@ -14,7 +14,7 @@
  * http://www.unix-systems.org/single_unix_specification_v2/xcu/ar.html
  */
 
-#include "busybox.h"
+#include "libbb.h"
 #include "unarchive.h"
 
 static void header_verbose_list_ar(const file_header_t *file_header)

archival/bbunzip.c

@@ -5,7 +5,7 @@
  *  Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 #include "unarchive.h"
 
 enum {

archival/cpio.c

@@ -16,7 +16,7 @@
 #include <string.h>
 #include <unistd.h>
 #include "unarchive.h"
-#include "busybox.h"
+#include "libbb.h"
 
 #define CPIO_OPT_EXTRACT			0x01
 #define CPIO_OPT_TEST				0x02

archival/dpkg.c

@@ -24,7 +24,7 @@
  *
  */
 
-#include "busybox.h"
+#include "libbb.h"
 #include "unarchive.h"
 
 /* note: if you vary hash_prime sizes be aware,

archival/dpkg_deb.c

@@ -4,7 +4,7 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
-#include "busybox.h"
+#include "libbb.h"
 #include "unarchive.h"
 
 #define DPKG_DEB_OPT_CONTENTS	1

archival/gzip.c

@@ -39,7 +39,7 @@ gzip: bogus: No such file or directory
 aa:      85.1% -- replaced with aa.gz
 */
 
-#include "busybox.h"
+#include "libbb.h"
 
 
 /* ===========================================================================

archival/rpm.c

@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 #include "unarchive.h"
 
 #define RPM_HEADER_MAGIC        "\216\255\350"

archival/rpm2cpio.c

@@ -6,7 +6,7 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
-#include "busybox.h"
+#include "libbb.h"
 #include "unarchive.h"
 
 #define RPM_MAGIC "\355\253\356\333"

archival/tar.c

@@ -25,7 +25,7 @@
 
 #include <fnmatch.h>
 #include <getopt.h>
-#include "busybox.h"
+#include "libbb.h"
 #include "unarchive.h"
 
 #if ENABLE_FEATURE_TAR_CREATE

archival/unzip.c

@@ -24,7 +24,7 @@
  * - central directory
  */
 
-#include "busybox.h"
+#include "libbb.h"
 #include "unarchive.h"
 
 #define ZIP_FILEHEADER_MAGIC		SWAP_LE32(0x04034b50)

console-tools/chvt.c

@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* From <linux/vt.h> */
 enum {

console-tools/clear.c

@@ -12,7 +12,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "busybox.h"
+#include "libbb.h"
 
 
 int clear_main(int argc, char **argv);

console-tools/deallocvt.c

@@ -10,7 +10,7 @@
 
 /* no options, no getopt */
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* From <linux/vt.h> */
 enum { VT_DISALLOCATE = 0x5608 }; /* free memory associated to vt */

console-tools/dumpkmap.c

@@ -8,7 +8,7 @@
  *
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* From <linux/kd.h> */
 struct kbentry {

console-tools/loadfont.c

@@ -7,7 +7,7 @@
  * Loads the console font, and possibly the corresponding screen map(s).
  * (Adapted for busybox by Matej Vela.)
  */
-#include "busybox.h"
+#include "libbb.h"
 #include <sys/kd.h>
 
 enum {

console-tools/loadkmap.c

@@ -8,7 +8,7 @@
  *
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
 #define BINARY_KEYMAP_MAGIC "bkeymap"
 

console-tools/openvt.c

@@ -10,7 +10,7 @@
 
 /* getopt not needed */
 
-#include "busybox.h"
+#include "libbb.h"
 
 int openvt_main(int argc, char **argv);
 int openvt_main(int argc, char **argv)

console-tools/reset.c

@@ -13,7 +13,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include "busybox.h"
+#include "libbb.h"
 
 int reset_main(int argc, char **argv);
 int reset_main(int argc, char **argv)

console-tools/resize.c

@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 /* no options, no getopt */
-#include "busybox.h"
+#include "libbb.h"
 
 #define ESC "\033"
 

console-tools/setconsole.c

@@ -8,7 +8,7 @@
  */
 
 #include <getopt.h>
-#include "busybox.h"
+#include "libbb.h"
 
 #if ENABLE_FEATURE_SETCONSOLE_LONG_OPTIONS
 static const struct option setconsole_long_options[] = {

console-tools/setkeycodes.c

@@ -10,7 +10,7 @@
  */
 
 #include <sys/ioctl.h>
-#include "busybox.h"
+#include "libbb.h"
 
 
 /* From <linux/kd.h> */

console-tools/setlogcons.c

@@ -9,7 +9,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
 int setlogcons_main(int argc, char **argv);
 int setlogcons_main(int argc, char **argv)

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! */
 

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 */

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! */
 

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)

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! */
 

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! */
 

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! */
 

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)

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)

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)
 {

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)

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! */

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! */
 

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),

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! */
 

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)

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
 

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! */
 

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,

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

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)
 {

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' },

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.  */

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! */
 

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

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:"

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! */
 

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>

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' },

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! */
 

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! */
 

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! */
 

coreutils/ls.c

@@ -30,7 +30,7 @@
  */
 
 #include <getopt.h>
-#include "busybox.h"
+#include "libbb.h"
 
 /* This is a NOEXEC applet. Be very careful! */
 

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;
 

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! */
 

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);

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 };

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

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)

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)

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"

coreutils/od_bloaty.c

@@ -49,8 +49,7 @@ diff -u -a std bbox >bbox.diff || { echo Different!; sleep 1; }
 
 */
 
-
+#include "libbb.h"
-#include "busybox.h"
 #include <getopt.h>
 
 #define assert(a) ((void)0)

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);

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);
 

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! */
 

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)

coreutils/rm.c

@@ -15,7 +15,7 @@
  * Size reduction.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
 /* This is a NOFORK applet. Be very careful! */
 

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! */
 

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! */
 

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! */
 

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! */
 

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

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)

coreutils/stty.c

@@ -21,7 +21,7 @@
 
    */
 
-#include "busybox.h"
+#include "libbb.h"
 
 #ifndef _POSIX_VDISABLE
 # define _POSIX_VDISABLE ((unsigned char) 0)

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 };
 

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! */
 

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 },

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);

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! */

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! */
 

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
 

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! */
 

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)

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;

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";
 

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! */
 

coreutils/uudecode.c

@@ -12,7 +12,7 @@
  */
 
 
-#include "busybox.h"
+#include "libbb.h"
 
 static void read_stduu(FILE *src_stream, FILE *dst_stream)
 {

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

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]

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)

coreutils/who.c

@@ -17,7 +17,7 @@
  *----------------------------------------------------------------------
  */
 
-#include "busybox.h"
+#include "libbb.h"
 #include <utmp.h>
 #include <time.h>
 

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! */
 

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! */
 

debianutils/mktemp.c

@@ -9,7 +9,7 @@
  * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>

debianutils/pipe_progress.c

@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>

debianutils/readlink.c

@@ -7,12 +7,10 @@
  * Licensed under GPL v2 or later, see file LICENSE in this tarball for details.
  */
 
-#include "busybox.h"
-#include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
 #include <getopt.h>
 
+#include "libbb.h"
+
 int readlink_main(int argc, char **argv);
 int readlink_main(int argc, char **argv)
 {

debianutils/run_parts.c

@@ -30,10 +30,10 @@
  * -u MASK		umask. Set the umask of the program executed to MASK.
  */
 
-
-#include "busybox.h"
 #include <getopt.h>
 
+#include "libbb.h"
+
 #if ENABLE_FEATURE_RUN_PARTS_LONG_OPTIONS
 static const struct option runparts_long_options[] = {
 	{ "arg",        1,      NULL,   'a' },