usage.c: remove reference to busybox.h
*: s/include "busybox.h"/include "libbb.h"
diff --git a/shell/ash.c b/shell/ash.c
index ed46e1c..b1d22e5 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -53,7 +53,7 @@
#if DEBUG
#define _GNU_SOURCE
#endif
-#include "busybox.h"
+#include "busybox.h" /* for struct bb_applet */
#include <paths.h>
#include <setjmp.h>
#include <fnmatch.h>
diff --git a/shell/bbsh.c b/shell/bbsh.c
index 8f0fb05..4fd0714 100644
--- a/shell/bbsh.c
+++ b/shell/bbsh.c
@@ -36,7 +36,7 @@
echo `echo hello#comment " woot` and more
*/
-#include "busybox.h"
+#include "libbb.h"
// A single executable, its arguments, and other information we know about it.
#define BBSH_FLAG_EXIT 1
diff --git a/shell/hush.c b/shell/hush.c
index 2e6f286..6844f06 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -76,12 +76,15 @@
* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
*/
-#include "busybox.h"
+
#include <glob.h> /* glob, of course */
#include <getopt.h> /* should be pretty obvious */
/* #include <dmalloc.h> */
+
extern char **environ; /* This is in <unistd.h>, but protected with __USE_GNU */
+#include "busybox.h" /* for struct bb_applet */
+
/* If you comment out one of these below, it will be #defined later
* to perform debug printfs to stderr: */
diff --git a/shell/lash.c b/shell/lash.c
index 28449b7..21c95fb 100644
--- a/shell/lash.c
+++ b/shell/lash.c
@@ -20,10 +20,11 @@
//For debugging/development on the shell only...
//#define DEBUG_SHELL
-
-#include "busybox.h"
#include <getopt.h>
#include <glob.h>
+
+#include "busybox.h" /* for struct bb_applet */
+
#define expand_t glob_t
/* Always enable for the moment... */