224 files changed, 245 insertions, 712 deletions
diff --git a/Changelog b/Changelog
index b374845ed..930a7dfb1 100644
--- a/Changelog
+++ b/Changelog
@@ -32,6 +32,7 @@
        * Fixed chmod option parsing so things like 'chmod -r /tmp/file'
            now work (previously it thought -r was an option).  Doh!
        * Fixed tar handling of stdin and stdout
+        * Renamed "internal.h" to the more sensible "busybox.h"
        * Preliminary support for GNU HURD.
        * Tons of other bugfixes.
diff --git a/Makefile b/Makefile
index 469539095..5cb888689 100644
--- a/Makefile
+++ b/Makefile
@@ -177,7 +177,7 @@ busybox.links: Config.h
        - ./busybox.mkll | sort >$@
 nfsmount.o cmdedit.o: %.o: %.h
-$(OBJECTS): %.o: Config.h internal.h  %.c Makefile
+$(OBJECTS): %.o: Config.h busybox.h  %.c Makefile
 utility.o: loop.h
diff --git a/applets/busybox.c b/applets/busybox.c
index 17a4c447a..825f40e7c 100644
--- a/applets/busybox.c
+++ b/applets/busybox.c
@@ -1,5 +1,5 @@
 /* vi: set sw=4 ts=4: */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
@@ -369,7 +369,7 @@ const char *applet_name;
 #ifdef BB_FEATURE_INSTALLER
 /* 
 * directory table
- *              this should be consistent w/ the enum, internal.h::Location,
+ *              this should be consistent w/ the enum, busybox.h::Location,
 *              or else...
 */
 static char* install_dir[] = {
diff --git a/applets/usage.c b/applets/usage.c
index c4da08ad7..ae6cbaa7c 100644
--- a/applets/usage.c
+++ b/applets/usage.c
@@ -1,4 +1,4 @@
-#include "internal.h"
+#include "busybox.h"
 #if defined BB_AR
 const char ar_usage[] =
diff --git a/ar.c b/ar.c
index 59c3a7754..f3ba59b6a 100644
--- a/ar.c
+++ b/ar.c
@@ -35,7 +35,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <malloc.h>
-#include "internal.h"
+#include "busybox.h"
 #define BLOCK_SIZE 60
 #define PRESERVE_DATE 1 /* preserve original dates */
diff --git a/archival/ar.c b/archival/ar.c
index 59c3a7754..f3ba59b6a 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -35,7 +35,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <malloc.h>
-#include "internal.h"
+#include "busybox.h"
 #define BLOCK_SIZE 60
 #define PRESERVE_DATE 1 /* preserve original dates */
diff --git a/archival/gunzip.c b/archival/gunzip.c
index b27ebeda8..ee8693013 100644
--- a/archival/gunzip.c
+++ b/archival/gunzip.c
@@ -27,7 +27,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <getopt.h>
 /* These defines are very important for BusyBox.  Without these,
diff --git a/archival/gzip.c b/archival/gzip.c
index c0832680f..e518ffd16 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -29,7 +29,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #define BB_DECLARE_EXTERN
 #define bb_need_memory_exhausted
 #include "messages.c"
diff --git a/archival/tar.c b/archival/tar.c
index e4bdd0a6c..c14a6194d 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -36,7 +36,7 @@
 */
-#include "internal.h"
+#include "busybox.h"
 #define BB_DECLARE_EXTERN
 #define bb_need_io_error
 #define bb_need_name_longer_then_foo
diff --git a/basename.c b/basename.c
index 5b83eef49..4d9fc4ec0 100644
--- a/basename.c
+++ b/basename.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 extern int basename_main(int argc, char **argv)
diff --git a/busybox.c b/busybox.c
index 17a4c447a..825f40e7c 100644
--- a/busybox.c
+++ b/busybox.c
@@ -1,5 +1,5 @@
 /* vi: set sw=4 ts=4: */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
@@ -369,7 +369,7 @@ const char *applet_name;
 #ifdef BB_FEATURE_INSTALLER
 /* 
 * directory table
- *              this should be consistent w/ the enum, internal.h::Location,
+ *              this should be consistent w/ the enum, busybox.h::Location,
 *              or else...
 */
 static char* install_dir[] = {
diff --git a/cat.c b/cat.c
index d47f814cf..51f1d27a6 100644
--- a/cat.c
+++ b/cat.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 extern int cat_main(int argc, char **argv)
diff --git a/chmod_chown_chgrp.c b/chmod_chown_chgrp.c
index b347707ee..1ec7eec6c 100644
--- a/chmod_chown_chgrp.c
+++ b/chmod_chown_chgrp.c
@@ -22,7 +22,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #define BB_DECLARE_EXTERN
 #define bb_need_invalid_option
 #define bb_need_too_few_args
diff --git a/chroot.c b/chroot.c
index e8ce53973..f0a298104 100644
--- a/chroot.c
+++ b/chroot.c
@@ -22,7 +22,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
diff --git a/chvt.c b/chvt.c
index 87a1248fd..d4b16a05d 100644
--- a/chvt.c
+++ b/chvt.c
@@ -4,7 +4,7 @@
 *
 * busyboxed by Erik Andersen
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
diff --git a/clear.c b/clear.c
index dba105691..4a8e0450f 100644
--- a/clear.c
+++ b/clear.c
@@ -22,7 +22,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
diff --git a/cmdedit.c b/cmdedit.c
index 04abc938c..af29b059a 100644
--- a/cmdedit.c
+++ b/cmdedit.c
@@ -31,7 +31,7 @@
   terminal width. (more then one line.) However, history will.
 */
-#include "internal.h"
+#include "busybox.h"
 #ifdef BB_FEATURE_SH_COMMAND_EDITING
 #include <stdio.h>
diff --git a/console-tools/chvt.c b/console-tools/chvt.c
index 87a1248fd..d4b16a05d 100644
--- a/console-tools/chvt.c
+++ b/console-tools/chvt.c
@@ -4,7 +4,7 @@
 *
 * busyboxed by Erik Andersen
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
diff --git a/console-tools/clear.c b/console-tools/clear.c
index dba105691..4a8e0450f 100644
--- a/console-tools/clear.c
+++ b/console-tools/clear.c
@@ -22,7 +22,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
diff --git a/console-tools/deallocvt.c b/console-tools/deallocvt.c
index bb9632fde..65af79b77 100644
--- a/console-tools/deallocvt.c
+++ b/console-tools/deallocvt.c
@@ -3,7 +3,7 @@
 * disalloc.c - aeb - 940501 - Disallocate virtual terminal(s)
 * Renamed deallocvt.
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>
diff --git a/console-tools/dumpkmap.c b/console-tools/dumpkmap.c
index 13b7d8937..2d989dfc4 100644
--- a/console-tools/dumpkmap.c
+++ b/console-tools/dumpkmap.c
@@ -20,7 +20,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/console-tools/loadacm.c b/console-tools/loadacm.c
index 7f669bf08..826c2a33f 100644
--- a/console-tools/loadacm.c
+++ b/console-tools/loadacm.c
@@ -7,7 +7,7 @@
 * Peter Novodvorsky <petya@logic.ru>
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <memory.h>
diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c
index e93ca3186..d6eadc353 100644
--- a/console-tools/loadfont.c
+++ b/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 "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <string.h>
 #include <fcntl.h>
diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c
index 2321a1ede..3f8d726e0 100644
--- a/console-tools/loadkmap.c
+++ b/console-tools/loadkmap.c
@@ -20,7 +20,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/console-tools/reset.c b/console-tools/reset.c
index 6c4ae35ae..8e2c491e2 100644
--- a/console-tools/reset.c
+++ b/console-tools/reset.c
@@ -23,7 +23,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 extern int reset_main(int argc, char **argv)
diff --git a/console-tools/setkeycodes.c b/console-tools/setkeycodes.c
index 284ffa194..63c106333 100644
--- a/console-tools/setkeycodes.c
+++ b/console-tools/setkeycodes.c
@@ -22,7 +22,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
diff --git a/coreutils/basename.c b/coreutils/basename.c
index 5b83eef49..4d9fc4ec0 100644
--- a/coreutils/basename.c
+++ b/coreutils/basename.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 extern int basename_main(int argc, char **argv)
diff --git a/coreutils/cat.c b/coreutils/cat.c
index d47f814cf..51f1d27a6 100644
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 extern int cat_main(int argc, char **argv)
diff --git a/coreutils/chroot.c b/coreutils/chroot.c
index e8ce53973..f0a298104 100644
--- a/coreutils/chroot.c
+++ b/coreutils/chroot.c
@@ -22,7 +22,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
diff --git a/coreutils/cut.c b/coreutils/cut.c
index fec52d3d4..1d36a4e88 100644
--- a/coreutils/cut.c
+++ b/coreutils/cut.c
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
-#include "internal.h"
+#include "busybox.h"
 /* globals from other files */
diff --git a/coreutils/date.c b/coreutils/date.c
index 571a55625..2e99aea19 100644
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -20,7 +20,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #define BB_DECLARE_EXTERN
 #define bb_need_invalid_date
 #define bb_need_memory_exhausted
diff --git a/coreutils/dd.c b/coreutils/dd.c
index 697cb7e58..01441c314 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -29,7 +29,7 @@
 */
-#include "internal.h"
+#include "busybox.h"
 #include <features.h>
 #include <stdio.h>
 #include <fcntl.h>
diff --git a/coreutils/df.c b/coreutils/df.c
index d8f8b7739..8d6242c56 100644
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -22,7 +22,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <mntent.h>
 #include <sys/vfs.h>
diff --git a/coreutils/dirname.c b/coreutils/dirname.c
index e63fef30b..23f46be40 100644
--- a/coreutils/dirname.c
+++ b/coreutils/dirname.c
@@ -20,7 +20,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 extern int dirname_main(int argc, char **argv)
diff --git a/coreutils/dos2unix.c b/coreutils/dos2unix.c
index 9634687eb..c9f783f1a 100644
--- a/coreutils/dos2unix.c
+++ b/coreutils/dos2unix.c
@@ -22,7 +22,7 @@
  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 int dos2unix_main( int argc, char **argv ) {
diff --git a/coreutils/du.c b/coreutils/du.c
index 5a08abb78..408ad994c 100644
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -22,7 +22,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #define BB_DECLARE_EXTERN
 #define bb_need_name_too_long
 #include "messages.c"
@@ -163,7 +163,7 @@ int du_main(int argc, char **argv)
        return(0);
 }
-/* $Id: du.c,v 1.24 2000/07/17 16:17:19 proski Exp $ */
+/* $Id: du.c,v 1.25 2000/09/25 21:45:57 andersen Exp $ */
 /*
 Local Variables:
 c-file-style: "linux"
diff --git a/coreutils/echo.c b/coreutils/echo.c
index 924cdd40c..6890d95e0 100644
--- a/coreutils/echo.c
+++ b/coreutils/echo.c
@@ -22,7 +22,7 @@
 * Original copyright notice is retained at the end of this file.
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 extern int 
diff --git a/coreutils/expr.c b/coreutils/expr.c
index 9e3c04a11..670352eb6 100644
--- a/coreutils/expr.c
+++ b/coreutils/expr.c
@@ -33,7 +33,7 @@
 * One function can handle multiple operators all of equal precedence,
 * provided they all associate ((x op x) op x). */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/coreutils/head.c b/coreutils/head.c
index 58b3cae68..c232e1153 100644
--- a/coreutils/head.c
+++ b/coreutils/head.c
@@ -22,7 +22,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <errno.h>
 #include <stdio.h>
@@ -100,4 +100,4 @@ int head_main(int argc, char **argv)
        return(0);
 }
-/* $Id: head.c,v 1.13 2000/07/16 20:57:15 kraai Exp $ */
+/* $Id: head.c,v 1.14 2000/09/25 21:45:57 andersen Exp $ */
diff --git a/coreutils/hostid.c b/coreutils/hostid.c
index f1010a65d..47bd8d724 100644
--- a/coreutils/hostid.c
+++ b/coreutils/hostid.c
@@ -20,7 +20,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 extern int hostid_main(int argc, char **argv)
diff --git a/coreutils/id.c b/coreutils/id.c
index a1a17924c..fdfc33cdc 100644
--- a/coreutils/id.c
+++ b/coreutils/id.c
@@ -20,7 +20,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <pwd.h>
diff --git a/coreutils/length.c b/coreutils/length.c
index cf4fb1c07..14d15c81c 100644
--- a/coreutils/length.c
+++ b/coreutils/length.c
@@ -1,5 +1,5 @@
 /* vi: set sw=4 ts=4: */
-#include "internal.h"
+#include "busybox.h"
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/coreutils/ln.c b/coreutils/ln.c
index d5f44ea4c..8ef8d05de 100644
--- a/coreutils/ln.c
+++ b/coreutils/ln.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #define BB_DECLARE_EXTERN
 #define bb_need_not_a_directory
 #include "messages.c"
diff --git a/coreutils/logname.c b/coreutils/logname.c
index a0aff42d6..09ee24928 100644
--- a/coreutils/logname.c
+++ b/coreutils/logname.c
@@ -20,7 +20,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 extern int logname_main(int argc, char **argv)
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 0e08f7683..385d6b2de 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -47,7 +47,7 @@
 /************************************************************************/
-#include "internal.h"
+#include "busybox.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
diff --git a/coreutils/md5sum.c b/coreutils/md5sum.c
index a791a41b0..c7e540223 100644
--- a/coreutils/md5sum.c
+++ b/coreutils/md5sum.c
@@ -20,7 +20,7 @@
 /* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu> */
 /* Hacked to work with BusyBox by Alfred M. Szmidt <ams@trillian.itslinux.org> */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <errno.h>
 #include <ctype.h>
@@ -66,7 +66,7 @@ extern _IO_ssize_t getline __P ((char **, size_t *, FILE *));
 #include <string.h>
 #include <endian.h>
-#include "internal.h"
+#include "busybox.h"
 //----------------------------------------------------------------------------
 //--------md5.h
 //----------------------------------------------------------------------------
diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index f824cdcb6..04310e4c7 100644
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #define bb_need_name_too_long
 #define BB_DECLARE_EXTERN
 #include "messages.c"
diff --git a/coreutils/mkfifo.c b/coreutils/mkfifo.c
index 5d4126ac0..5e1bc1a78 100644
--- a/coreutils/mkfifo.c
+++ b/coreutils/mkfifo.c
@@ -20,7 +20,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <sys/types.h>
 #include <errno.h>
diff --git a/coreutils/mknod.c b/coreutils/mknod.c
index b815aa198..ecb0e4780 100644
--- a/coreutils/mknod.c
+++ b/coreutils/mknod.c
@@ -20,7 +20,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <errno.h>
 #include <sys/types.h>
diff --git a/coreutils/printf.c b/coreutils/printf.c
index 94b809348..832ca13d6 100644
--- a/coreutils/printf.c
+++ b/coreutils/printf.c
@@ -47,7 +47,7 @@
 //   19990508 Busy Boxed! Dave Cinege
-#include "internal.h"
+#include "busybox.h"
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/coreutils/pwd.c b/coreutils/pwd.c
index f0c923b7b..c9de7778e 100644
--- a/coreutils/pwd.c
+++ b/coreutils/pwd.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <dirent.h>
 #include <errno.h>
diff --git a/coreutils/rm.c b/coreutils/rm.c
index c93a94ce1..4f97cad23 100644
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -22,7 +22,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <time.h>
 #include <utime.h>
diff --git a/coreutils/rmdir.c b/coreutils/rmdir.c
index 500890e40..14ebf92c5 100644
--- a/coreutils/rmdir.c
+++ b/coreutils/rmdir.c
@@ -22,7 +22,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <errno.h>
diff --git a/coreutils/sleep.c b/coreutils/sleep.c
index d6705c4c3..709e3de34 100644
--- a/coreutils/sleep.c
+++ b/coreutils/sleep.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 extern int sleep_main(int argc, char **argv)
diff --git a/coreutils/sort.c b/coreutils/sort.c
index a74f96ad0..3fe4c7756 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -22,7 +22,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <sys/types.h>
 #include <fcntl.h>
 #include <dirent.h>
@@ -288,4 +288,4 @@ int sort_main(int argc, char **argv)
        return(0);
 }
-/* $Id: sort.c,v 1.21 2000/09/13 02:46:13 kraai Exp $ */
+/* $Id: sort.c,v 1.22 2000/09/25 21:45:58 andersen Exp $ */
diff --git a/coreutils/sync.c b/coreutils/sync.c
index 3737cb1f1..8f101cf17 100644
--- a/coreutils/sync.c
+++ b/coreutils/sync.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 extern int sync_main(int argc, char **argv)
diff --git a/coreutils/tail.c b/coreutils/tail.c
index dcb4f6742..1091d28ed 100644
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@@ -38,7 +38,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <getopt.h>
-#include "internal.h"
+#include "busybox.h"
 #define STDIN "standard input"
 #define LINES 0
diff --git a/coreutils/tee.c b/coreutils/tee.c
index dc9876020..621801336 100644
--- a/coreutils/tee.c
+++ b/coreutils/tee.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <getopt.h>
 #include <stdio.h>
diff --git a/coreutils/test.c b/coreutils/test.c
index a2bec4492..acd6947d9 100644
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -31,7 +31,7 @@
 *      "This program is in the Public Domain."
 */
-#include "internal.h"
+#include "busybox.h"
 #include <sys/types.h>
 #include <unistd.h>
 #include <ctype.h>
diff --git a/coreutils/touch.c b/coreutils/touch.c
index 464aedb55..7db6c6e33 100644
--- a/coreutils/touch.c
+++ b/coreutils/touch.c
@@ -22,7 +22,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <sys/types.h>
 #include <fcntl.h>
diff --git a/coreutils/tr.c b/coreutils/tr.c
index 004092477..54b6abc8c 100644
--- a/coreutils/tr.c
+++ b/coreutils/tr.c
@@ -24,7 +24,7 @@
 * Original copyright notice is retained at the end of this file.
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/coreutils/tty.c b/coreutils/tty.c
index bbc051f6b..6eebed9fb 100644
--- a/coreutils/tty.c
+++ b/coreutils/tty.c
@@ -20,7 +20,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/coreutils/uname.c b/coreutils/uname.c
index 55616dd19..8d9427c86 100644
--- a/coreutils/uname.c
+++ b/coreutils/uname.c
@@ -31,7 +31,7 @@
 /* Busyboxed by Erik Andersen */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/utsname.h>
diff --git a/coreutils/uniq.c b/coreutils/uniq.c
index 016fc7780..ef38587bd 100644
--- a/coreutils/uniq.c
+++ b/coreutils/uniq.c
@@ -22,7 +22,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
@@ -179,4 +179,4 @@ int uniq_main(int argc, char **argv)
        return(0);
 }
-/* $Id: uniq.c,v 1.13 2000/07/16 20:57:15 kraai Exp $ */
+/* $Id: uniq.c,v 1.14 2000/09/25 21:45:58 andersen Exp $ */
diff --git a/coreutils/usleep.c b/coreutils/usleep.c
index fcdf3bbf6..69790ef09 100644
--- a/coreutils/usleep.c
+++ b/coreutils/usleep.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c
index 90bef9238..965ded5b5 100644
--- a/coreutils/uudecode.c
+++ b/coreutils/uudecode.c
@@ -51,7 +51,7 @@
 /* Reworked to GNU style by Ian Lance Taylor, ian@airs.com, August 93.  */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <errno.h>
diff --git a/coreutils/uuencode.c b/coreutils/uuencode.c
index 1433c7f3b..5835bd22a 100644
--- a/coreutils/uuencode.c
+++ b/coreutils/uuencode.c
@@ -52,7 +52,7 @@
 /* Reworked to GNU style by Ian Lance Taylor, ian@airs.com, August 93.  */
 /* Hacked to work with BusyBox by Alfred M. Szmidt */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <errno.h>
diff --git a/coreutils/wc.c b/coreutils/wc.c
index ca5b3680a..b1c9a51cd 100644
--- a/coreutils/wc.c
+++ b/coreutils/wc.c
@@ -20,7 +20,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <getopt.h>
diff --git a/coreutils/whoami.c b/coreutils/whoami.c
index 84b27fe58..f3c21b3f5 100644
--- a/coreutils/whoami.c
+++ b/coreutils/whoami.c
@@ -20,7 +20,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <pwd.h>
diff --git a/coreutils/yes.c b/coreutils/yes.c
index 11fa537a0..46873f3f9 100644
--- a/coreutils/yes.c
+++ b/coreutils/yes.c
@@ -20,7 +20,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 extern int yes_main(int argc, char **argv)
diff --git a/cp_mv.c b/cp_mv.c
index f56c6dd49..2257f4422 100644
--- a/cp_mv.c
+++ b/cp_mv.c
@@ -25,7 +25,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #define BB_DECLARE_EXTERN
 #define bb_need_name_too_long
 #define bb_need_omitting_directory
diff --git a/cut.c b/cut.c
index fec52d3d4..1d36a4e88 100644
--- a/cut.c
+++ b/cut.c
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
-#include "internal.h"
+#include "busybox.h"
 /* globals from other files */
diff --git a/date.c b/date.c
index 571a55625..2e99aea19 100644
--- a/date.c
+++ b/date.c
@@ -20,7 +20,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #define BB_DECLARE_EXTERN
 #define bb_need_invalid_date
 #define bb_need_memory_exhausted
diff --git a/dc.c b/dc.c
index fac48e895..48aa830d6 100644
--- a/dc.c
+++ b/dc.c
@@ -1,5 +1,5 @@
 /* vi: set sw=4 ts=4: */
-#include "internal.h"
+#include "busybox.h"
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/dd.c b/dd.c
index 697cb7e58..01441c314 100644
--- a/dd.c
+++ b/dd.c
@@ -29,7 +29,7 @@
 */
-#include "internal.h"
+#include "busybox.h"
 #include <features.h>
 #include <stdio.h>
 #include <fcntl.h>
diff --git a/deallocvt.c b/deallocvt.c
index bb9632fde..65af79b77 100644
--- a/deallocvt.c
+++ b/deallocvt.c
@@ -3,7 +3,7 @@
 * disalloc.c - aeb - 940501 - Disallocate virtual terminal(s)
 * Renamed deallocvt.
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>
diff --git a/df.c b/df.c
index d8f8b7739..8d6242c56 100644
--- a/df.c
+++ b/df.c
@@ -22,7 +22,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <mntent.h>
 #include <sys/vfs.h>
diff --git a/dirname.c b/dirname.c
index e63fef30b..23f46be40 100644
--- a/dirname.c
+++ b/dirname.c
@@ -20,7 +20,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 extern int dirname_main(int argc, char **argv)
diff --git a/dmesg.c b/dmesg.c
index 99d053a72..88b5d1393 100644
--- a/dmesg.c
+++ b/dmesg.c
@@ -15,7 +15,7 @@
 * Support, replaced getopt, added some gotos for redundant stuff.
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/dos2unix.c b/dos2unix.c
index 9634687eb..c9f783f1a 100644
--- a/dos2unix.c
+++ b/dos2unix.c
@@ -22,7 +22,7 @@
  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 int dos2unix_main( int argc, char **argv ) {
diff --git a/du.c b/du.c
index 5a08abb78..408ad994c 100644
--- a/du.c
+++ b/du.c
@@ -22,7 +22,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #define BB_DECLARE_EXTERN
 #define bb_need_name_too_long
 #include "messages.c"
@@ -163,7 +163,7 @@ int du_main(int argc, char **argv)
        return(0);
 }
-/* $Id: du.c,v 1.24 2000/07/17 16:17:19 proski Exp $ */
+/* $Id: du.c,v 1.25 2000/09/25 21:45:57 andersen Exp $ */
 /*
 Local Variables:
 c-file-style: "linux"
diff --git a/dumpkmap.c b/dumpkmap.c
index 13b7d8937..2d989dfc4 100644
--- a/dumpkmap.c
+++ b/dumpkmap.c
@@ -20,7 +20,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/dutmp.c b/dutmp.c
index ec10941d0..cf5f1cff8 100644
--- a/dutmp.c
+++ b/dutmp.c
@@ -12,7 +12,7 @@
 * Erik Andersen <andersen@lineo.com>
 */
-#include "internal.h"
+#include "busybox.h"
 #include <sys/types.h>
 #include <fcntl.h>
diff --git a/echo.c b/echo.c
index 924cdd40c..6890d95e0 100644
--- a/echo.c
+++ b/echo.c
@@ -22,7 +22,7 @@
 * Original copyright notice is retained at the end of this file.
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 extern int 
diff --git a/editors/sed.c b/editors/sed.c
index 0e0d7f58c..cb3f1bbf1 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -49,7 +49,7 @@
 #include <string.h> /* for strdup() */
 #include <errno.h>
 #include <ctype.h> /* for isspace() */
-#include "internal.h"
+#include "busybox.h"
 #define bb_need_full_version
 #define BB_DECLARE_EXTERN
diff --git a/expr.c b/expr.c
index 9e3c04a11..670352eb6 100644
--- a/expr.c
+++ b/expr.c
@@ -33,7 +33,7 @@
 * One function can handle multiple operators all of equal precedence,
 * provided they all associate ((x op x) op x). */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/fbset.c b/fbset.c
index 235338c55..32325a7cf 100644
--- a/fbset.c
+++ b/fbset.c
@@ -24,7 +24,7 @@
 *     Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be)
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/fdflush.c b/fdflush.c
index 6bc3e7d66..6633e1212 100644
--- a/fdflush.c
+++ b/fdflush.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
diff --git a/find.c b/find.c
index 1c209aea1..48faf2c30 100644
--- a/find.c
+++ b/find.c
@@ -22,7 +22,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <dirent.h>
diff --git a/findutils/find.c b/findutils/find.c
index 1c209aea1..48faf2c30 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -22,7 +22,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <dirent.h>
diff --git a/findutils/grep.c b/findutils/grep.c
index 3ee409c64..003dae98e 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -26,7 +26,7 @@
 #include <regex.h>
 #include <string.h> /* for strerror() */
 #include <errno.h>
-#include "internal.h"
+#include "busybox.h"
 extern int optind; /* in unistd.h */
 extern int errno;  /* for use with strerror() */
diff --git a/findutils/which.c b/findutils/which.c
index 7df2557a3..da8801fab 100644
--- a/findutils/which.c
+++ b/findutils/which.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 extern int which_main(int argc, char **argv)
diff --git a/findutils/xargs.c b/findutils/xargs.c
index b8ac31aa0..4a3fe3c60 100644
--- a/findutils/xargs.c
+++ b/findutils/xargs.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/free.c b/free.c
index d8c3f0b91..a33fa9a59 100644
--- a/free.c
+++ b/free.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <errno.h>
diff --git a/freeramdisk.c b/freeramdisk.c
index 64915b313..22fc3e643 100644
--- a/freeramdisk.c
+++ b/freeramdisk.c
@@ -27,7 +27,7 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <errno.h>
-#include "internal.h"
+#include "busybox.h"
 /* From linux/fs.h */
diff --git a/fsck_minix.c b/fsck_minix.c
index 04c2b3317..ef65e3073 100644
--- a/fsck_minix.c
+++ b/fsck_minix.c
@@ -86,7 +86,7 @@
 * enforced (but it's not much fun on a character device :-). 
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
diff --git a/getopt.c b/getopt.c
index fb75790d9..919ae6c68 100644
--- a/getopt.c
+++ b/getopt.c
@@ -49,7 +49,7 @@
 #include <ctype.h>
 #include <getopt.h>
-#include "internal.h"
+#include "busybox.h"
 /* NON_OPT is the code that is returned when a non-option is found in '+'
   mode */
diff --git a/grep.c b/grep.c
index 3ee409c64..003dae98e 100644
--- a/grep.c
+++ b/grep.c
@@ -26,7 +26,7 @@
 #include <regex.h>
 #include <string.h> /* for strerror() */
 #include <errno.h>
-#include "internal.h"
+#include "busybox.h"
 extern int optind; /* in unistd.h */
 extern int errno;  /* for use with strerror() */
diff --git a/gunzip.c b/gunzip.c
index b27ebeda8..ee8693013 100644
--- a/gunzip.c
+++ b/gunzip.c
@@ -27,7 +27,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <getopt.h>
 /* These defines are very important for BusyBox.  Without these,
diff --git a/gzip.c b/gzip.c
index c0832680f..e518ffd16 100644
--- a/gzip.c
+++ b/gzip.c
@@ -29,7 +29,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #define BB_DECLARE_EXTERN
 #define bb_need_memory_exhausted
 #include "messages.c"
diff --git a/halt.c b/halt.c
index 2ca36d038..c3e2523c0 100644
--- a/halt.c
+++ b/halt.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <signal.h>
 extern int halt_main(int argc, char **argv)
diff --git a/head.c b/head.c
index 58b3cae68..c232e1153 100644
--- a/head.c
+++ b/head.c
@@ -22,7 +22,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <errno.h>
 #include <stdio.h>
@@ -100,4 +100,4 @@ int head_main(int argc, char **argv)
        return(0);
 }
-/* $Id: head.c,v 1.13 2000/07/16 20:57:15 kraai Exp $ */
+/* $Id: head.c,v 1.14 2000/09/25 21:45:57 andersen Exp $ */
diff --git a/hostid.c b/hostid.c
index f1010a65d..47bd8d724 100644
--- a/hostid.c
+++ b/hostid.c
@@ -20,7 +20,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 extern int hostid_main(int argc, char **argv)
diff --git a/hostname.c b/hostname.c
index 77b545ded..4320a968c 100644
--- a/hostname.c
+++ b/hostname.c
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * $Id: hostname.c,v 1.12 2000/07/16 20:57:15 kraai Exp $
+ * $Id: hostname.c,v 1.13 2000/09/25 21:45:57 andersen Exp $
 * Mini hostname implementation for busybox
 *
 * Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@@ -23,7 +23,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-#include "internal.h"
+#include "busybox.h"
 #include <errno.h>
 #include <arpa/inet.h>
 #include <netdb.h>
diff --git a/id.c b/id.c
index a1a17924c..fdfc33cdc 100644
--- a/id.c
+++ b/id.c
@@ -20,7 +20,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <pwd.h>
diff --git a/init.c b/init.c
index 2c23e60b7..17e605ba0 100644
--- a/init.c
+++ b/init.c
@@ -27,7 +27,7 @@
 #define DEBUG_INIT
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/init/halt.c b/init/halt.c
index 2ca36d038..c3e2523c0 100644
--- a/init/halt.c
+++ b/init/halt.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <signal.h>
 extern int halt_main(int argc, char **argv)
diff --git a/init/init.c b/init/init.c
index 2c23e60b7..17e605ba0 100644
--- a/init/init.c
+++ b/init/init.c
@@ -27,7 +27,7 @@
 #define DEBUG_INIT
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/init/poweroff.c b/init/poweroff.c
index 126a0fb94..3101a20dc 100644
--- a/init/poweroff.c
+++ b/init/poweroff.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <signal.h>
 extern int poweroff_main(int argc, char **argv)
diff --git a/init/reboot.c b/init/reboot.c
index bde8dbd77..354286d47 100644
--- a/init/reboot.c
+++ b/init/reboot.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <signal.h>
 extern int reboot_main(int argc, char **argv)
diff --git a/insmod.c b/insmod.c
index 136f9f062..0c81af6f0 100644
--- a/insmod.c
+++ b/insmod.c
@@ -36,7 +36,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <stddef.h>
@@ -77,7 +77,7 @@
 #ifndef MODUTILS_MODULE_H
 #define MODUTILS_MODULE_H 1
-#ident "$Id: insmod.c,v 1.24 2000/09/24 03:44:29 andersen Exp $"
+#ident "$Id: insmod.c,v 1.25 2000/09/25 21:45:58 andersen Exp $"
 /* This file contains the structures used by the 2.0 and 2.1 kernels.
   We do not use the kernel headers directly because we do not wish
@@ -283,7 +283,7 @@ int delete_module(const char *);
 #ifndef MODUTILS_OBJ_H
 #define MODUTILS_OBJ_H 1
-#ident "$Id: insmod.c,v 1.24 2000/09/24 03:44:29 andersen Exp $"
+#ident "$Id: insmod.c,v 1.25 2000/09/25 21:45:58 andersen Exp $"
 /* The relocatable object is manipulated using elfin types.  */
diff --git a/internal.h b/internal.h
deleted file mode 100644
index 69f455435..000000000
--- a/internal.h
+++ /dev/null
@@ -1,468 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- * Busybox main internal header file
- *
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Based in part on code from sash, Copyright (c) 1999 by David I. Bell 
- * Permission has been granted to redistribute this code under the GPL.
- *
- */
-#ifndef _BB_INTERNAL_H_
-#define _BB_INTERNAL_H_    1
-#include "Config.h"
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <sys/param.h>
-#include <mntent.h>
-#include <regex.h>
-/* for the _syscall() macros */
-#include <sys/syscall.h>
-#include <linux/unistd.h>
-/* Some useful definitions */
-#define FALSE   ((int) 1)
-#define TRUE    ((int) 0)
-/* for mtab.c */
-#define MTAB_GETMOUNTPT '1'
-#define MTAB_GETDEVICE  '2'
-#define BUF_SIZE        8192
-#define EXPAND_ALLOC    1024
-#define isBlank(ch)     (((ch) == ' ') || ((ch) == '\t'))
-#define isDecimal(ch)   (((ch) >= '0') && ((ch) <= '9'))
-#define isOctal(ch)     (((ch) >= '0') && ((ch) <= '7'))
-#define isWildCard(ch)  (((ch) == '*') || ((ch) == '?') || ((ch) == '['))
-/* Macros for min/max.  */
-#ifndef MIN
-#define MIN(a,b) (((a)<(b))?(a):(b))
-#endif
-#ifndef MAX
-#define MAX(a,b) (((a)>(b))?(a):(b))
-#endif
-/* I don't like nested includes, but the string and io functions are used
- * too often
- */
-#include <stdio.h>
-#if !defined(NO_STRING_H) || defined(STDC_HEADERS)
-#  include <string.h>
-#  if !defined(STDC_HEADERS) && !defined(NO_MEMORY_H) && !defined(__GNUC__)
-#    include <memory.h>
-#  endif
-#  define memzero(s, n)     memset ((void *)(s), 0, (n))
-#else
-#  include <strings.h>
-#  define strchr            index
-#  define strrchr           rindex
-#  define memcpy(d, s, n)   bcopy((s), (d), (n))
-#  define memcmp(s1, s2, n) bcmp((s1), (s2), (n))
-#  define memzero(s, n)     bzero((s), (n))
-#endif
-enum Location {
-        _BB_DIR_ROOT = 0,
-        _BB_DIR_BIN,
-        _BB_DIR_SBIN,
-        _BB_DIR_USR_BIN,
-        _BB_DIR_USR_SBIN
-};
-struct BB_applet {
-        const   char*   name;
-        int     (*main)(int argc, char** argv);
-        enum    Location        location;
-        const   char*   usage;
-};
-/* From busybox.c */
-extern const struct BB_applet applets[];
-extern int ar_main(int argc, char **argv);
-extern int basename_main(int argc, char **argv);
-extern int bogomips_main(int argc, char **argv);
-extern int busybox_main(int argc, char** argv);
-extern int cat_main(int argc, char** argv);
-extern int chmod_chown_chgrp_main(int argc, char** argv);
-extern int chroot_main(int argc, char** argv);
-extern int chvt_main(int argc, char** argv);
-extern int clear_main(int argc, char** argv);
-extern int cp_mv_main(int argc, char** argv);
-extern int cut_main(int argc, char** argv);
-extern int date_main(int argc, char** argv);
-extern int dc_main(int argc, char** argv);
-extern int dd_main(int argc, char** argv);
-extern int dirname_main(int argc, char** argv);
-extern int deallocvt_main(int argc, char** argv);
-extern int df_main(int argc, char** argv);
-extern int dmesg_main(int argc, char** argv);
-extern int dos2unix_main(int argc, char** argv);
-extern int du_main(int argc, char** argv);
-extern int dumpkmap_main(int argc, char** argv);
-extern int dutmp_main(int argc, char** argv);
-extern int echo_main(int argc, char** argv);
-extern int expr_main(int argc, char** argv);
-extern int false_main(int argc, char** argv);
-extern int fbset_main(int argc, char** argv);
-extern int fdisk_main(int argc, char** argv);
-extern int fdflush_main(int argc, char **argv);
-extern int fsck_minix_main(int argc, char **argv);
-extern int find_main(int argc, char** argv);
-extern int free_main(int argc, char** argv);
-extern int freeramdisk_main(int argc, char** argv);
-extern int getopt_main(int argc, char** argv);
-extern int grep_main(int argc, char** argv);
-extern int gunzip_main (int argc, char** argv);
-extern int gzip_main(int argc, char** argv);
-extern int halt_main(int argc, char** argv);
-extern int head_main(int argc, char** argv);
-extern int hostid_main(int argc, char** argv);
-extern int hostname_main(int argc, char** argv);
-extern int id_main(int argc, char** argv);
-extern int init_main(int argc, char** argv);
-extern int insmod_main(int argc, char** argv);
-extern int kill_main(int argc, char** argv);
-extern int length_main(int argc, char** argv);
-extern int ln_main(int argc, char** argv);
-extern int loadacm_main(int argc, char** argv);
-extern int loadfont_main(int argc, char** argv);
-extern int loadkmap_main(int argc, char** argv);
-extern int losetup_main(int argc, char** argv);
-extern int logger_main(int argc, char **argv);
-extern int logname_main(int argc, char **argv);
-extern int ls_main(int argc, char** argv);
-extern int lsmod_main(int argc, char** argv);
-extern int makedevs_main(int argc, char** argv);
-extern int md5sum_main(int argc, char** argv);
-extern int mkdir_main(int argc, char** argv);
-extern int mkfifo_main(int argc, char **argv);
-extern int mkfs_minix_main(int argc, char **argv);
-extern int mknod_main(int argc, char** argv);
-extern int mkswap_main(int argc, char** argv);
-extern int mktemp_main(int argc, char **argv);
-extern int nc_main(int argc, char** argv);
-extern int more_main(int argc, char** argv);
-extern int mount_main(int argc, char** argv);
-extern int mt_main(int argc, char** argv);
-extern int nslookup_main(int argc, char **argv);
-extern int ping_main(int argc, char **argv);
-extern int poweroff_main(int argc, char **argv);
-extern int printf_main(int argc, char** argv);
-extern int ps_main(int argc, char** argv);
-extern int pwd_main(int argc, char** argv);
-extern int rdate_main(int argc, char** argv);
-extern int reboot_main(int argc, char** argv);
-extern int renice_main(int argc, char** argv);
-extern int reset_main(int argc, char** argv);
-extern int rm_main(int argc, char** argv);
-extern int rmdir_main(int argc, char **argv);
-extern int rmmod_main(int argc, char** argv);
-extern int sed_main(int argc, char** argv);
-extern int sfdisk_main(int argc, char** argv);
-extern int setkeycodes_main(int argc, char** argv);
-extern int shell_main(int argc, char** argv);
-extern int sleep_main(int argc, char** argv);
-extern int sort_main(int argc, char** argv);
-extern int swap_on_off_main(int argc, char** argv);
-extern int sync_main(int argc, char** argv);
-extern int syslogd_main(int argc, char **argv);
-extern int tail_main(int argc, char** argv);
-extern int tar_main(int argc, char** argv);
-extern int tee_main(int argc, char** argv);
-extern int test_main(int argc, char** argv);
-extern int telnet_main(int argc, char** argv);
-extern int touch_main(int argc, char** argv);
-extern int tr_main(int argc, char** argv);
-extern int true_main(int argc, char** argv);
-extern int tput_main(int argc, char** argv);
-extern int tryopen_main(int argc, char** argv);
-extern int tty_main(int argc, char** argv);
-extern int umount_main(int argc, char** argv);
-extern int uname_main(int argc, char** argv);
-extern int uniq_main(int argc, char** argv);
-extern int unix2dos_main(int argc, char** argv);
-extern int unrpm_main(int argc, char** argv);
-extern int update_main(int argc, char** argv);
-extern int uptime_main(int argc, char** argv);
-extern int usleep_main(int argc, char** argv);
-extern int uuencode_main(int argc, char** argv);
-extern int uudecode_main(int argc, char** argv);
-extern int wc_main(int argc, char** argv);
-extern int wget_main(int argc, char** argv);
-extern int which_main(int argc, char** argv);
-extern int whoami_main(int argc, char** argv);
-extern int xargs_main(int argc, char** argv);
-extern int yes_main(int argc, char** argv);
-extern const char ar_usage[];
-extern const char basename_usage[];
-extern const char cat_usage[];
-extern const char chgrp_usage[];
-extern const char chmod_usage[];
-extern const char chown_usage[];
-extern const char chroot_usage[];
-extern const char chvt_usage[];
-extern const char clear_usage[];
-extern const char cp_usage[];
-extern const char cut_usage[];
-extern const char date_usage[];
-extern const char dc_usage[];
-extern const char dd_usage[];
-extern const char deallocvt_usage[];
-extern const char df_usage[];
-extern const char dirname_usage[];
-extern const char dmesg_usage[];
-extern const char dos2unix_usage[];
-extern const char du_usage[];
-extern const char dumpkmap_usage[];
-extern const char dutmp_usage[];
-extern const char echo_usage[];
-extern const char expr_usage[];
-extern const char false_usage[];
-extern const char fdflush_usage[];
-extern const char find_usage[];
-extern const char free_usage[];
-extern const char freeramdisk_usage[];
-extern const char fsck_minix_usage[];
-extern const char grep_usage[];
-extern const char gunzip_usage[];
-extern const char gzip_usage[];
-extern const char halt_usage[];
-extern const char head_usage[];
-extern const char hostid_usage[];
-extern const char hostname_usage[];
-extern const char id_usage[];
-extern const char insmod_usage[];
-extern const char kill_usage[];
-extern const char killall_usage[];
-extern const char length_usage[];
-extern const char ln_usage[];
-extern const char loadacm_usage[];
-extern const char loadfont_usage[];
-extern const char loadkmap_usage[];
-extern const char logger_usage[];
-extern const char logname_usage[];
-extern const char ls_usage[];
-extern const char lsmod_usage[];
-extern const char makedevs_usage[];
-extern const char md5sum_usage[];
-extern const char mkdir_usage[];
-extern const char mkfifo_usage[];
-extern const char mkfs_minix_usage[];
-extern const char mknod_usage[];
-extern const char mkswap_usage[];
-extern const char mktemp_usage[];
-extern const char more_usage[];
-extern const char mount_usage[]; 
-extern const char mt_usage[];
-extern const char mv_usage[];
-extern const char nc_usage[];
-extern const char nslookup_usage[];
-extern const char ping_usage[];
-extern const char poweroff_usage[];
-extern const char printf_usage[];
-extern const char ps_usage[];
-extern const char pwd_usage[];
-extern const char rdate_usage[];
-extern const char reboot_usage[];
-extern const char renice_usage[];
-extern const char reset_usage[];
-extern const char rm_usage[];
-extern const char rmdir_usage[];
-extern const char rmmod_usage[];
-extern const char sed_usage[];
-extern const char setkeycodes_usage[];
-extern const char shell_usage[];
-extern const char sleep_usage[];
-extern const char sort_usage[];
-extern const char swapoff_usage[];
-extern const char swapon_usage[];
-extern const char sync_usage[];
-extern const char syslogd_usage[];
-extern const char tail_usage[];
-extern const char tar_usage[];
-extern const char tee_usage[];
-extern const char telnet_usage[];
-extern const char test_usage[];
-extern const char touch_usage[];
-extern const char tr_usage[];
-extern const char true_usage[];
-extern const char tty_usage[];
-extern const char umount_usage[];
-extern const char uname_usage[];
-extern const char uniq_usage[];
-extern const char unix2dos_usage[];
-extern const char unrpm_usage[];
-extern const char update_usage[];
-extern const char uptime_usage[];
-extern const char usleep_usage[];
-extern const char uudecode_usage[];
-extern const char uuencode_usage[];
-extern const char wc_usage[];
-extern const char wget_usage[];
-extern const char which_usage[];
-extern const char whoami_usage[];
-extern const char xargs_usage[];
-extern const char yes_usage[];
-extern const char *applet_name;
-extern void usage(const char *usage) __attribute__ ((noreturn));
-extern void errorMsg(const char *s, ...) __attribute__ ((format (printf, 1, 2)));
-extern void fatalError(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2)));
-const char *modeString(int mode);
-const char *timeString(time_t timeVal);
-int isDirectory(const char *name, const int followLinks, struct stat *statBuf);
-int isDevice(const char *name);
-typedef struct ino_dev_hash_bucket_struct {
-  struct ino_dev_hash_bucket_struct *next;
-  ino_t ino;
-  dev_t dev;
-  char name[1];
-} ino_dev_hashtable_bucket_t;
-int is_in_ino_dev_hashtable(const struct stat *statbuf, char **name);
-void add_to_ino_dev_hashtable(const struct stat *statbuf, const char *name);
-void reset_ino_dev_hashtable(void);
-int copyFile(const char *srcName, const char *destName,
-                 int setModes, int followLinks, int forceFlag);
-int copySubFile(int srcFd, int dstFd, size_t remaining);
-char *buildName(const char *dirName, const char *fileName);
-int makeString(int argc, const char **argv, char *buf, int bufLen);
-char *getChunk(int size);
-char *chunkstrdup(const char *str);
-void freeChunks(void);
-int fullWrite(int fd, const char *buf, int len);
-int fullRead(int fd, char *buf, int len);
-int recursiveAction(const char *fileName, int recurse, int followLinks, int depthFirst,
-          int (*fileAction) (const char *fileName, struct stat* statbuf, void* userData),
-          int (*dirAction) (const char *fileName, struct stat* statbuf, void* userData),
-          void* userData);
-extern int createPath (const char *name, int mode);
-extern int parse_mode( const char* s, mode_t* theMode);
-extern int get_kernel_revision(void);
-extern int get_console_fd(char* tty_name);
-extern struct mntent *findMountPoint(const char *name, const char *table);
-extern void write_mtab(char* blockDevice, char* directory, 
-        char* filesystemType, long flags, char* string_flags);
-extern void erase_mtab(const char * name);
-extern void mtab_read(void);
-extern char *mtab_first(void **iter);
-extern char *mtab_next(void **iter);
-extern char *mtab_getinfo(const char *match, const char which);
-extern int check_wildcard_match(const char* text, const char* pattern);
-extern long getNum (const char *cp);
-extern pid_t* findPidByName( char* pidName);
-extern int find_real_root_device_name(char* name);
-extern char *get_line_from_file(FILE *file);
-extern void print_file(FILE *file);
-extern int print_file_by_name(char *filename);
-extern char process_escape_sequence(char **ptr);
-extern char *get_last_path_component(char *path);
-extern void xregcomp(regex_t *preg, const char *regex, int cflags);
-#ifndef DMALLOC 
-extern void *xmalloc (size_t size);
-extern void *xrealloc(void *old, size_t size);
-extern void *xcalloc(size_t nmemb, size_t size);
-extern char *xstrdup (const char *s);
-#endif
-extern char *xstrndup (const char *s, int n);
-/* These parse entries in /etc/passwd and /etc/group.  This is desirable
- * for BusyBox since we want to avoid using the glibc NSS stuff, which
- * increases target size and is often not needed embedded systems.  */
-extern long my_getpwnam(char *name);
-extern long my_getgrnam(char *name);
-extern void my_getpwuid(char *name, long uid);
-extern void my_getgrgid(char *group, long gid);
-extern long my_getpwnamegid(char *name);
-extern int device_open(char *device, int mode);
-#if defined BB_FEATURE_MOUNT_LOOP
-extern int del_loop(const char *device);
-extern int set_loop(const char *device, const char *file, int offset, int *loopro);
-extern char *find_unused_loop_device (void);
-#endif
-#if (__GLIBC__ < 2) && (defined BB_SYSLOGD || defined BB_INIT)
-extern int vdprintf(int d, const char *format, va_list ap);
-#endif
-#if defined BB_NFSMOUNT
-int nfsmount(const char *spec, const char *node, int *flags,
-             char **extra_opts, char **mount_opts, int running_bg);
-#endif
-#ifndef RB_POWER_OFF
-/* Stop system and switch power off if possible.  */
-#define RB_POWER_OFF   0x4321fedc
-#endif
-/* Include our own copy of struct sysinfo to avoid binary compatability
- * problems with Linux 2.4, which changed things.  Grumble, grumble. */
-struct sysinfo {
-        long uptime;                    /* Seconds since boot */
-        unsigned long loads[3];         /* 1, 5, and 15 minute load averages */
-        unsigned long totalram;         /* Total usable main memory size */
-        unsigned long freeram;          /* Available memory size */
-        unsigned long sharedram;        /* Amount of shared memory */
-        unsigned long bufferram;        /* Memory used by buffers */
-        unsigned long totalswap;        /* Total swap space size */
-        unsigned long freeswap;         /* swap space still available */
-        unsigned short procs;           /* Number of current processes */
-        unsigned long totalhigh;        /* Total high memory size */
-        unsigned long freehigh;         /* Available high memory size */
-        unsigned int mem_unit;          /* Memory unit size in bytes */
-        char _f[20-2*sizeof(long)-sizeof(int)]; /* Padding: libc5 uses this.. */
-};
-extern int sysinfo (struct sysinfo* info);
-/* Bit map related macros -- libc5 doens't provide these... sigh.  */
-#ifndef setbit
-#define NBBY            CHAR_BIT
-#define setbit(a,i)     ((a)[(i)/NBBY] |= 1<<((i)%NBBY))
-#define clrbit(a,i)     ((a)[(i)/NBBY] &= ~(1<<((i)%NBBY)))
-#define isset(a,i)      ((a)[(i)/NBBY] & (1<<((i)%NBBY)))
-#define isclr(a,i)      (((a)[(i)/NBBY] & (1<<((i)%NBBY))) == 0)
-#endif
-#endif /* _BB_INTERNAL_H_ */
diff --git a/kill.c b/kill.c
index 8f48ba026..7ade8228c 100644
--- a/kill.c
+++ b/kill.c
@@ -21,7 +21,7 @@
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/lash.c b/lash.c
index b8f407202..77efc6aac 100644
--- a/lash.c
+++ b/lash.c
@@ -32,7 +32,7 @@
 //#define DEBUG_SHELL
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/length.c b/length.c
index cf4fb1c07..14d15c81c 100644
--- a/length.c
+++ b/length.c
@@ -1,5 +1,5 @@
 /* vi: set sw=4 ts=4: */
-#include "internal.h"
+#include "busybox.h"
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/ln.c b/ln.c
index d5f44ea4c..8ef8d05de 100644
--- a/ln.c
+++ b/ln.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #define BB_DECLARE_EXTERN
 #define bb_need_not_a_directory
 #include "messages.c"
diff --git a/loadacm.c b/loadacm.c
index 7f669bf08..826c2a33f 100644
--- a/loadacm.c
+++ b/loadacm.c
@@ -7,7 +7,7 @@
 * Peter Novodvorsky <petya@logic.ru>
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <memory.h>
diff --git a/loadfont.c b/loadfont.c
index e93ca3186..d6eadc353 100644
--- a/loadfont.c
+++ b/loadfont.c
@@ -7,7 +7,7 @@
 * Loads the console font, and possibly the corresponding screen map(s).
 * (Adapted for busybox by Matej Vela.)
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <string.h>
 #include <fcntl.h>
diff --git a/loadkmap.c b/loadkmap.c
index 2321a1ede..3f8d726e0 100644
--- a/loadkmap.c
+++ b/loadkmap.c
@@ -20,7 +20,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/logger.c b/logger.c
index f4a0f82fb..fa1cf6d15 100644
--- a/logger.c
+++ b/logger.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/types.h>
diff --git a/logname.c b/logname.c
index a0aff42d6..09ee24928 100644
--- a/logname.c
+++ b/logname.c
@@ -20,7 +20,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 extern int logname_main(int argc, char **argv)
diff --git a/ls.c b/ls.c
index 0e08f7683..385d6b2de 100644
--- a/ls.c
+++ b/ls.c
@@ -47,7 +47,7 @@
 /************************************************************************/
-#include "internal.h"
+#include "busybox.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
diff --git a/lsmod.c b/lsmod.c
index a4a0ece0e..ab4726b9e 100644
--- a/lsmod.c
+++ b/lsmod.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <stddef.h>
diff --git a/makedevs.c b/makedevs.c
index c9802cca7..f979871bd 100644
--- a/makedevs.c
+++ b/makedevs.c
@@ -7,7 +7,7 @@
 * known bugs: can't deal with alpha ranges
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/md5sum.c b/md5sum.c
index a791a41b0..c7e540223 100644
--- a/md5sum.c
+++ b/md5sum.c
@@ -20,7 +20,7 @@
 /* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu> */
 /* Hacked to work with BusyBox by Alfred M. Szmidt <ams@trillian.itslinux.org> */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <errno.h>
 #include <ctype.h>
@@ -66,7 +66,7 @@ extern _IO_ssize_t getline __P ((char **, size_t *, FILE *));
 #include <string.h>
 #include <endian.h>
-#include "internal.h"
+#include "busybox.h"
 //----------------------------------------------------------------------------
 //--------md5.h
 //----------------------------------------------------------------------------
diff --git a/messages.c b/messages.c
index f7a772cbd..81fd9c75c 100644
--- a/messages.c
+++ b/messages.c
@@ -36,7 +36,7 @@
 //Then just use the string memory_exhausted when it is needed.
 //
-#include "internal.h"
+#include "busybox.h"
 #ifndef _BB_MESSAGES_C
 #define _BB_MESSAGES_C
diff --git a/miscutils/dc.c b/miscutils/dc.c
index fac48e895..48aa830d6 100644
--- a/miscutils/dc.c
+++ b/miscutils/dc.c
@@ -1,5 +1,5 @@
 /* vi: set sw=4 ts=4: */
-#include "internal.h"
+#include "busybox.h"
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/miscutils/dutmp.c b/miscutils/dutmp.c
index ec10941d0..cf5f1cff8 100644
--- a/miscutils/dutmp.c
+++ b/miscutils/dutmp.c
@@ -12,7 +12,7 @@
 * Erik Andersen <andersen@lineo.com>
 */
-#include "internal.h"
+#include "busybox.h"
 #include <sys/types.h>
 #include <fcntl.h>
diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c
index c9802cca7..f979871bd 100644
--- a/miscutils/makedevs.c
+++ b/miscutils/makedevs.c
@@ -7,7 +7,7 @@
 * known bugs: can't deal with alpha ranges
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/miscutils/mktemp.c b/miscutils/mktemp.c
index 2ec078503..62ca870c5 100644
--- a/miscutils/mktemp.c
+++ b/miscutils/mktemp.c
@@ -22,7 +22,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <errno.h>
diff --git a/miscutils/mt.c b/miscutils/mt.c
index e77f58a6a..6acae4ea1 100644
--- a/miscutils/mt.c
+++ b/miscutils/mt.c
@@ -1,5 +1,5 @@
 /* vi: set sw=4 ts=4: */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <sys/mtio.h>
 #include <sys/fcntl.h>
diff --git a/miscutils/update.c b/miscutils/update.c
index 3f3d68b87..e9f496913 100644
--- a/miscutils/update.c
+++ b/miscutils/update.c
@@ -28,7 +28,7 @@
 * earlier) kernel. 2.2.x and higher flush filesystem buffers automatically.
 */
-#include "internal.h"
+#include "busybox.h"
 #include <sys/param.h>
 #include <sys/syslog.h>
 #include <unistd.h> /* for getopt() */
diff --git a/mkdir.c b/mkdir.c
index f824cdcb6..04310e4c7 100644
--- a/mkdir.c
+++ b/mkdir.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #define bb_need_name_too_long
 #define BB_DECLARE_EXTERN
 #include "messages.c"
diff --git a/mkfifo.c b/mkfifo.c
index 5d4126ac0..5e1bc1a78 100644
--- a/mkfifo.c
+++ b/mkfifo.c
@@ -20,7 +20,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <sys/types.h>
 #include <errno.h>
diff --git a/mkfs_minix.c b/mkfs_minix.c
index fafcc230e..15cf531f0 100644
--- a/mkfs_minix.c
+++ b/mkfs_minix.c
@@ -62,7 +62,7 @@
 *      removed getopt based parser and added a hand rolled one.
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <time.h>
 #include <unistd.h>
diff --git a/mknod.c b/mknod.c
index b815aa198..ecb0e4780 100644
--- a/mknod.c
+++ b/mknod.c
@@ -20,7 +20,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <errno.h>
 #include <sys/types.h>
diff --git a/mkswap.c b/mkswap.c
index 70028dc2e..8a9767cca 100644
--- a/mkswap.c
+++ b/mkswap.c
@@ -35,7 +35,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/mktemp.c b/mktemp.c
index 2ec078503..62ca870c5 100644
--- a/mktemp.c
+++ b/mktemp.c
@@ -22,7 +22,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <errno.h>
diff --git a/modutils/insmod.c b/modutils/insmod.c
index 136f9f062..0c81af6f0 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -36,7 +36,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <stddef.h>
@@ -77,7 +77,7 @@
 #ifndef MODUTILS_MODULE_H
 #define MODUTILS_MODULE_H 1
-#ident "$Id: insmod.c,v 1.24 2000/09/24 03:44:29 andersen Exp $"
+#ident "$Id: insmod.c,v 1.25 2000/09/25 21:45:58 andersen Exp $"
 /* This file contains the structures used by the 2.0 and 2.1 kernels.
   We do not use the kernel headers directly because we do not wish
@@ -283,7 +283,7 @@ int delete_module(const char *);
 #ifndef MODUTILS_OBJ_H
 #define MODUTILS_OBJ_H 1
-#ident "$Id: insmod.c,v 1.24 2000/09/24 03:44:29 andersen Exp $"
+#ident "$Id: insmod.c,v 1.25 2000/09/25 21:45:58 andersen Exp $"
 /* The relocatable object is manipulated using elfin types.  */
diff --git a/modutils/lsmod.c b/modutils/lsmod.c
index a4a0ece0e..ab4726b9e 100644
--- a/modutils/lsmod.c
+++ b/modutils/lsmod.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <stddef.h>
diff --git a/modutils/rmmod.c b/modutils/rmmod.c
index 67b1084fb..dd293523d 100644
--- a/modutils/rmmod.c
+++ b/modutils/rmmod.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
diff --git a/more.c b/more.c
index 45b7c1274..caabc44e2 100644
--- a/more.c
+++ b/more.c
@@ -25,7 +25,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <fcntl.h>
 #include <signal.h>
diff --git a/mount.c b/mount.c
index 598b650f9..8b115c9f5 100644
--- a/mount.c
+++ b/mount.c
@@ -43,7 +43,7 @@
 *      
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
diff --git a/mt.c b/mt.c
index e77f58a6a..6acae4ea1 100644
--- a/mt.c
+++ b/mt.c
@@ -1,5 +1,5 @@
 /* vi: set sw=4 ts=4: */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <sys/mtio.h>
 #include <sys/fcntl.h>
diff --git a/mtab.c b/mtab.c
index 27489cfd4..8984d8822 100644
--- a/mtab.c
+++ b/mtab.c
@@ -1,5 +1,5 @@
 /* vi: set sw=4 ts=4: */
-#include "internal.h"
+#include "busybox.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
diff --git a/nc.c b/nc.c
index a544f32fc..fcacb0c45 100644
--- a/nc.c
+++ b/nc.c
@@ -25,7 +25,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/networking/hostname.c b/networking/hostname.c
index 77b545ded..4320a968c 100644
--- a/networking/hostname.c
+++ b/networking/hostname.c
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * $Id: hostname.c,v 1.12 2000/07/16 20:57:15 kraai Exp $
+ * $Id: hostname.c,v 1.13 2000/09/25 21:45:57 andersen Exp $
 * Mini hostname implementation for busybox
 *
 * Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@@ -23,7 +23,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-#include "internal.h"
+#include "busybox.h"
 #include <errno.h>
 #include <arpa/inet.h>
 #include <netdb.h>
diff --git a/networking/nc.c b/networking/nc.c
index a544f32fc..fcacb0c45 100644
--- a/networking/nc.c
+++ b/networking/nc.c
@@ -25,7 +25,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/networking/nslookup.c b/networking/nslookup.c
index 10d36b2d1..acb3e3bb2 100644
--- a/networking/nslookup.c
+++ b/networking/nslookup.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <ctype.h>
 #include <errno.h>
 #include <stdio.h>
@@ -170,4 +170,4 @@ int nslookup_main(int argc, char **argv)
        return( TRUE);
 }
-/* $Id: nslookup.c,v 1.11 2000/07/16 20:57:15 kraai Exp $ */
+/* $Id: nslookup.c,v 1.12 2000/09/25 21:45:58 andersen Exp $ */
diff --git a/networking/ping.c b/networking/ping.c
index f3ce6fb80..70ea0f196 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * $Id: ping.c,v 1.24 2000/09/20 04:33:30 kraai Exp $
+ * $Id: ping.c,v 1.25 2000/09/25 21:45:58 andersen Exp $
 * Mini ping implementation for busybox
 *
 * Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@@ -31,7 +31,7 @@
 * Original copyright notice is retained at the end of this file.
 */
-#include "internal.h"
+#include "busybox.h"
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/file.h>
diff --git a/networking/telnet.c b/networking/telnet.c
index cf55de6af..bfa964460 100644
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -31,7 +31,7 @@
 */
-#include "internal.h"
+#include "busybox.h"
 #include <termios.h>
 #include <unistd.h>
 #include <errno.h>
diff --git a/networking/wget.c b/networking/wget.c
index c06e76d90..58801ee47 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -7,7 +7,7 @@
 * <chip@laserlink.net>
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/nfsmount.c b/nfsmount.c
index 628772b1b..abae19afe 100644
--- a/nfsmount.c
+++ b/nfsmount.c
@@ -33,7 +33,7 @@
 * nfsmount.c,v 1.1.1.1 1993/11/18 08:40:51 jrs Exp
 */
-#include "internal.h"
+#include "busybox.h"
 #undef FALSE
 #undef TRUE
 #include <unistd.h>
diff --git a/nslookup.c b/nslookup.c
index 10d36b2d1..acb3e3bb2 100644
--- a/nslookup.c
+++ b/nslookup.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <ctype.h>
 #include <errno.h>
 #include <stdio.h>
@@ -170,4 +170,4 @@ int nslookup_main(int argc, char **argv)
        return( TRUE);
 }
-/* $Id: nslookup.c,v 1.11 2000/07/16 20:57:15 kraai Exp $ */
+/* $Id: nslookup.c,v 1.12 2000/09/25 21:45:58 andersen Exp $ */
diff --git a/ping.c b/ping.c
index f3ce6fb80..70ea0f196 100644
--- a/ping.c
+++ b/ping.c
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * $Id: ping.c,v 1.24 2000/09/20 04:33:30 kraai Exp $
+ * $Id: ping.c,v 1.25 2000/09/25 21:45:58 andersen Exp $
 * Mini ping implementation for busybox
 *
 * Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@@ -31,7 +31,7 @@
 * Original copyright notice is retained at the end of this file.
 */
-#include "internal.h"
+#include "busybox.h"
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/file.h>
diff --git a/poweroff.c b/poweroff.c
index 126a0fb94..3101a20dc 100644
--- a/poweroff.c
+++ b/poweroff.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <signal.h>
 extern int poweroff_main(int argc, char **argv)
diff --git a/printf.c b/printf.c
index 94b809348..832ca13d6 100644
--- a/printf.c
+++ b/printf.c
@@ -47,7 +47,7 @@
 //   19990508 Busy Boxed! Dave Cinege
-#include "internal.h"
+#include "busybox.h"
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/procps/free.c b/procps/free.c
index d8c3f0b91..a33fa9a59 100644
--- a/procps/free.c
+++ b/procps/free.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <errno.h>
diff --git a/procps/kill.c b/procps/kill.c
index 8f48ba026..7ade8228c 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -21,7 +21,7 @@
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/procps/ps.c b/procps/ps.c
index a326bc546..df321612a 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -28,7 +28,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <dirent.h>
diff --git a/procps/renice.c b/procps/renice.c
index af7ce94ca..d79a64d1a 100644
--- a/procps/renice.c
+++ b/procps/renice.c
@@ -20,7 +20,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <errno.h>
 #include <sys/time.h>
diff --git a/procps/uptime.c b/procps/uptime.c
index efdbccf00..fe4e48cd6 100644
--- a/procps/uptime.c
+++ b/procps/uptime.c
@@ -28,7 +28,7 @@
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <time.h>
 #include <errno.h>
diff --git a/ps.c b/ps.c
index a326bc546..df321612a 100644
--- a/ps.c
+++ b/ps.c
@@ -28,7 +28,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <dirent.h>
diff --git a/pwd.c b/pwd.c
index f0c923b7b..c9de7778e 100644
--- a/pwd.c
+++ b/pwd.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <dirent.h>
 #include <errno.h>
diff --git a/rdate.c b/rdate.c
index 20536d24b..915c4bdd4 100644
--- a/rdate.c
+++ b/rdate.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #define BB_DECLARE_EXTERN
 #include "messages.c"
 #include <sys/time.h>
diff --git a/reboot.c b/reboot.c
index bde8dbd77..354286d47 100644
--- a/reboot.c
+++ b/reboot.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <signal.h>
 extern int reboot_main(int argc, char **argv)
diff --git a/renice.c b/renice.c
index af7ce94ca..d79a64d1a 100644
--- a/renice.c
+++ b/renice.c
@@ -20,7 +20,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <errno.h>
 #include <sys/time.h>
diff --git a/reset.c b/reset.c
index 6c4ae35ae..8e2c491e2 100644
--- a/reset.c
+++ b/reset.c
@@ -23,7 +23,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 extern int reset_main(int argc, char **argv)
diff --git a/rm.c b/rm.c
index c93a94ce1..4f97cad23 100644
--- a/rm.c
+++ b/rm.c
@@ -22,7 +22,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <time.h>
 #include <utime.h>
diff --git a/rmdir.c b/rmdir.c
index 500890e40..14ebf92c5 100644
--- a/rmdir.c
+++ b/rmdir.c
@@ -22,7 +22,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <errno.h>
diff --git a/rmmod.c b/rmmod.c
index 67b1084fb..dd293523d 100644
--- a/rmmod.c
+++ b/rmmod.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
diff --git a/sed.c b/sed.c
index 0e0d7f58c..cb3f1bbf1 100644
--- a/sed.c
+++ b/sed.c
@@ -49,7 +49,7 @@
 #include <string.h> /* for strdup() */
 #include <errno.h>
 #include <ctype.h> /* for isspace() */
-#include "internal.h"
+#include "busybox.h"
 #define bb_need_full_version
 #define BB_DECLARE_EXTERN
diff --git a/setkeycodes.c b/setkeycodes.c
index 284ffa194..63c106333 100644
--- a/setkeycodes.c
+++ b/setkeycodes.c
@@ -22,7 +22,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
diff --git a/sh.c b/sh.c
index b8f407202..77efc6aac 100644
--- a/sh.c
+++ b/sh.c
@@ -32,7 +32,7 @@
 //#define DEBUG_SHELL
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/shell/cmdedit.c b/shell/cmdedit.c
index 04abc938c..af29b059a 100644
--- a/shell/cmdedit.c
+++ b/shell/cmdedit.c
@@ -31,7 +31,7 @@
   terminal width. (more then one line.) However, history will.
 */
-#include "internal.h"
+#include "busybox.h"
 #ifdef BB_FEATURE_SH_COMMAND_EDITING
 #include <stdio.h>
diff --git a/shell/lash.c b/shell/lash.c
index b8f407202..77efc6aac 100644
--- a/shell/lash.c
+++ b/shell/lash.c
@@ -32,7 +32,7 @@
 //#define DEBUG_SHELL
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/sleep.c b/sleep.c
index d6705c4c3..709e3de34 100644
--- a/sleep.c
+++ b/sleep.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 extern int sleep_main(int argc, char **argv)
diff --git a/sort.c b/sort.c
index a74f96ad0..3fe4c7756 100644
--- a/sort.c
+++ b/sort.c
@@ -22,7 +22,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <sys/types.h>
 #include <fcntl.h>
 #include <dirent.h>
@@ -288,4 +288,4 @@ int sort_main(int argc, char **argv)
        return(0);
 }
-/* $Id: sort.c,v 1.21 2000/09/13 02:46:13 kraai Exp $ */
+/* $Id: sort.c,v 1.22 2000/09/25 21:45:58 andersen Exp $ */
diff --git a/swaponoff.c b/swaponoff.c
index 6aafe51a2..4a1c8f93f 100644
--- a/swaponoff.c
+++ b/swaponoff.c
@@ -22,7 +22,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <sys/mount.h>
 #include <mntent.h>
diff --git a/sync.c b/sync.c
index 3737cb1f1..8f101cf17 100644
--- a/sync.c
+++ b/sync.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 extern int sync_main(int argc, char **argv)
diff --git a/sysklogd/logger.c b/sysklogd/logger.c
index f4a0f82fb..fa1cf6d15 100644
--- a/sysklogd/logger.c
+++ b/sysklogd/logger.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/types.h>
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index d647866cb..9bedc84f2 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -23,7 +23,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/syslogd.c b/syslogd.c
index d647866cb..9bedc84f2 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -23,7 +23,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/tail.c b/tail.c
index dcb4f6742..1091d28ed 100644
--- a/tail.c
+++ b/tail.c
@@ -38,7 +38,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <getopt.h>
-#include "internal.h"
+#include "busybox.h"
 #define STDIN "standard input"
 #define LINES 0
diff --git a/tar.c b/tar.c
index e4bdd0a6c..c14a6194d 100644
--- a/tar.c
+++ b/tar.c
@@ -36,7 +36,7 @@
 */
-#include "internal.h"
+#include "busybox.h"
 #define BB_DECLARE_EXTERN
 #define bb_need_io_error
 #define bb_need_name_longer_then_foo
diff --git a/tee.c b/tee.c
index dc9876020..621801336 100644
--- a/tee.c
+++ b/tee.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <getopt.h>
 #include <stdio.h>
diff --git a/telnet.c b/telnet.c
index cf55de6af..bfa964460 100644
--- a/telnet.c
+++ b/telnet.c
@@ -31,7 +31,7 @@
 */
-#include "internal.h"
+#include "busybox.h"
 #include <termios.h>
 #include <unistd.h>
 #include <errno.h>
diff --git a/test.c b/test.c
index a2bec4492..acd6947d9 100644
--- a/test.c
+++ b/test.c
@@ -31,7 +31,7 @@
 *      "This program is in the Public Domain."
 */
-#include "internal.h"
+#include "busybox.h"
 #include <sys/types.h>
 #include <unistd.h>
 #include <ctype.h>
diff --git a/touch.c b/touch.c
index 464aedb55..7db6c6e33 100644
--- a/touch.c
+++ b/touch.c
@@ -22,7 +22,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <sys/types.h>
 #include <fcntl.h>
diff --git a/tr.c b/tr.c
index 004092477..54b6abc8c 100644
--- a/tr.c
+++ b/tr.c
@@ -24,7 +24,7 @@
 * Original copyright notice is retained at the end of this file.
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/true_false.c b/true_false.c
index c56f5e7af..b3b221e1f 100644
--- a/true_false.c
+++ b/true_false.c
@@ -22,7 +22,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 extern int true_main(int argc, char **argv)
diff --git a/tty.c b/tty.c
index bbc051f6b..6eebed9fb 100644
--- a/tty.c
+++ b/tty.c
@@ -20,7 +20,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/umount.c b/umount.c
index 6a5e4cad8..1d9c6bb32 100644
--- a/umount.c
+++ b/umount.c
@@ -22,7 +22,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <mntent.h>
 #include <errno.h>
diff --git a/uname.c b/uname.c
index 55616dd19..8d9427c86 100644
--- a/uname.c
+++ b/uname.c
@@ -31,7 +31,7 @@
 /* Busyboxed by Erik Andersen */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/utsname.h>
diff --git a/uniq.c b/uniq.c
index 016fc7780..ef38587bd 100644
--- a/uniq.c
+++ b/uniq.c
@@ -22,7 +22,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
@@ -179,4 +179,4 @@ int uniq_main(int argc, char **argv)
        return(0);
 }
-/* $Id: uniq.c,v 1.13 2000/07/16 20:57:15 kraai Exp $ */
+/* $Id: uniq.c,v 1.14 2000/09/25 21:45:58 andersen Exp $ */
diff --git a/unix2dos.c b/unix2dos.c
index c6cf81bb0..553ad0c34 100644
--- a/unix2dos.c
+++ b/unix2dos.c
@@ -22,7 +22,7 @@
  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 int unix2dos_main( int argc, char **argv ) {
diff --git a/unrpm.c b/unrpm.c
index cfcc0d1ee..26989e8b6 100644
--- a/unrpm.c
+++ b/unrpm.c
@@ -13,7 +13,7 @@
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 */
 
-#include "internal.h" 
+#include "busybox.h" 
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/update.c b/update.c
index 3f3d68b87..e9f496913 100644
--- a/update.c
+++ b/update.c
@@ -28,7 +28,7 @@
 * earlier) kernel. 2.2.x and higher flush filesystem buffers automatically.
 */
-#include "internal.h"
+#include "busybox.h"
 #include <sys/param.h>
 #include <sys/syslog.h>
 #include <unistd.h> /* for getopt() */
diff --git a/uptime.c b/uptime.c
index efdbccf00..fe4e48cd6 100644
--- a/uptime.c
+++ b/uptime.c
@@ -28,7 +28,7 @@
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <time.h>
 #include <errno.h>
diff --git a/usage.c b/usage.c
index c4da08ad7..ae6cbaa7c 100644
--- a/usage.c
+++ b/usage.c
@@ -1,4 +1,4 @@
-#include "internal.h"
+#include "busybox.h"
 #if defined BB_AR
 const char ar_usage[] =
diff --git a/usleep.c b/usleep.c
index fcdf3bbf6..69790ef09 100644
--- a/usleep.c
+++ b/usleep.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index 99d053a72..88b5d1393 100644
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -15,7 +15,7 @@
 * Support, replaced getopt, added some gotos for redundant stuff.
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/util-linux/fbset.c b/util-linux/fbset.c
index 235338c55..32325a7cf 100644
--- a/util-linux/fbset.c
+++ b/util-linux/fbset.c
@@ -24,7 +24,7 @@
 *     Geert Uytterhoeven (Geert.Uytterhoeven@cs.kuleuven.ac.be)
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/util-linux/fdflush.c b/util-linux/fdflush.c
index 6bc3e7d66..6633e1212 100644
--- a/util-linux/fdflush.c
+++ b/util-linux/fdflush.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
diff --git a/util-linux/freeramdisk.c b/util-linux/freeramdisk.c
index 64915b313..22fc3e643 100644
--- a/util-linux/freeramdisk.c
+++ b/util-linux/freeramdisk.c
@@ -27,7 +27,7 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <errno.h>
-#include "internal.h"
+#include "busybox.h"
 /* From linux/fs.h */
diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c
index 04c2b3317..ef65e3073 100644
--- a/util-linux/fsck_minix.c
+++ b/util-linux/fsck_minix.c
@@ -86,7 +86,7 @@
 * enforced (but it's not much fun on a character device :-). 
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
diff --git a/util-linux/getopt.c b/util-linux/getopt.c
index fb75790d9..919ae6c68 100644
--- a/util-linux/getopt.c
+++ b/util-linux/getopt.c
@@ -49,7 +49,7 @@
 #include <ctype.h>
 #include <getopt.h>
-#include "internal.h"
+#include "busybox.h"
 /* NON_OPT is the code that is returned when a non-option is found in '+'
   mode */
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index fafcc230e..15cf531f0 100644
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@@ -62,7 +62,7 @@
 *      removed getopt based parser and added a hand rolled one.
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <time.h>
 #include <unistd.h>
diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c
index 70028dc2e..8a9767cca 100644
--- a/util-linux/mkswap.c
+++ b/util-linux/mkswap.c
@@ -35,7 +35,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
diff --git a/util-linux/more.c b/util-linux/more.c
index 45b7c1274..caabc44e2 100644
--- a/util-linux/more.c
+++ b/util-linux/more.c
@@ -25,7 +25,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <fcntl.h>
 #include <signal.h>
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 598b650f9..8b115c9f5 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -43,7 +43,7 @@
 *      
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
diff --git a/util-linux/nfsmount.c b/util-linux/nfsmount.c
index 628772b1b..abae19afe 100644
--- a/util-linux/nfsmount.c
+++ b/util-linux/nfsmount.c
@@ -33,7 +33,7 @@
 * nfsmount.c,v 1.1.1.1 1993/11/18 08:40:51 jrs Exp
 */
-#include "internal.h"
+#include "busybox.h"
 #undef FALSE
 #undef TRUE
 #include <unistd.h>
diff --git a/util-linux/rdate.c b/util-linux/rdate.c
index 20536d24b..915c4bdd4 100644
--- a/util-linux/rdate.c
+++ b/util-linux/rdate.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #define BB_DECLARE_EXTERN
 #include "messages.c"
 #include <sys/time.h>
diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index 6aafe51a2..4a1c8f93f 100644
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -22,7 +22,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <sys/mount.h>
 #include <mntent.h>
diff --git a/util-linux/umount.c b/util-linux/umount.c
index 6a5e4cad8..1d9c6bb32 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -22,7 +22,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <mntent.h>
 #include <errno.h>
diff --git a/utility.c b/utility.c
index b014f2a59..f7dda7917 100644
--- a/utility.c
+++ b/utility.c
@@ -25,7 +25,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #if defined (BB_CHMOD_CHOWN_CHGRP) \
 || defined (BB_CP_MV)             \
 || defined (BB_FIND)              \
diff --git a/uudecode.c b/uudecode.c
index 90bef9238..965ded5b5 100644
--- a/uudecode.c
+++ b/uudecode.c
@@ -51,7 +51,7 @@
 /* Reworked to GNU style by Ian Lance Taylor, ian@airs.com, August 93.  */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <errno.h>
diff --git a/uuencode.c b/uuencode.c
index 1433c7f3b..5835bd22a 100644
--- a/uuencode.c
+++ b/uuencode.c
@@ -52,7 +52,7 @@
 /* Reworked to GNU style by Ian Lance Taylor, ian@airs.com, August 93.  */
 /* Hacked to work with BusyBox by Alfred M. Szmidt */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <errno.h>
diff --git a/wc.c b/wc.c
index ca5b3680a..b1c9a51cd 100644
--- a/wc.c
+++ b/wc.c
@@ -20,7 +20,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <getopt.h>
diff --git a/wget.c b/wget.c
index c06e76d90..58801ee47 100644
--- a/wget.c
+++ b/wget.c
@@ -7,7 +7,7 @@
 * <chip@laserlink.net>
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/which.c b/which.c
index 7df2557a3..da8801fab 100644
--- a/which.c
+++ b/which.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 extern int which_main(int argc, char **argv)
diff --git a/whoami.c b/whoami.c
index 84b27fe58..f3c21b3f5 100644
--- a/whoami.c
+++ b/whoami.c
@@ -20,7 +20,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <pwd.h>
diff --git a/xargs.c b/xargs.c
index b8ac31aa0..4a3fe3c60 100644
--- a/xargs.c
+++ b/xargs.c
@@ -21,7 +21,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/yes.c b/yes.c
index 11fa537a0..46873f3f9 100644
--- a/yes.c
+++ b/yes.c
@@ -20,7 +20,7 @@
 *
 */
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 extern int yes_main(int argc, char **argv)