diff --git a/e2fsprogs/e2fsbb.h b/e2fsprogs/e2fsbb.h
index 7e4d1ab48..570d536f2 100644
--- a/e2fsprogs/e2fsbb.h
+++ b/e2fsprogs/e2fsbb.h
@@ -39,7 +39,6 @@ typedef long errcode_t;
 #define ENABLE_HTREE 1
 #define HAVE_ERRNO_H 1
 #define HAVE_EXT2_IOCTLS 1
-#define HAVE_GETOPT_H 1
 #define HAVE_INTTYPES_H 1
 #define HAVE_LINUX_FD_H 1
 #define HAVE_MALLOC_H 1
diff --git a/e2fsprogs/tune2fs.c b/e2fsprogs/tune2fs.c
index ccbbc7868..0519c0981 100644
--- a/e2fsprogs/tune2fs.c
+++ b/e2fsprogs/tune2fs.c
@@ -26,14 +26,6 @@
  */
 
 #include <fcntl.h>
-#include <grp.h>
-#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#else
-extern char *optarg;
-extern int optind;
-#endif
-#include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -50,6 +42,10 @@ extern int optind;
 #include "util.h"
 #include "blkid/blkid.h"
 
+#include "busybox.h"
+#include "grp_.h"
+#include "pwd_.h"
+
 static char * device_name = NULL;
 static char * new_label, *new_last_mounted, *new_UUID;
 static char * io_options;