diff --git a/cmdedit.c b/cmdedit.c
index 9cb53522f..993e83b21 100644
--- a/cmdedit.c
+++ b/cmdedit.c
@@ -42,12 +42,6 @@
 #include <signal.h>
 #include <limits.h>
 
-#ifdef BB_FEATURE_SH_TAB_COMPLETION
-#include <dirent.h>
-#include <sys/stat.h>
-#endif
-
-
 #ifndef TEST
 
 #include "busybox.h"
@@ -67,6 +61,11 @@
 
 #endif							/* TEST */
 
+#ifdef BB_FEATURE_SH_TAB_COMPLETION
+#include <dirent.h>
+#include <sys/stat.h>
+#endif
+
 #ifdef BB_FEATURE_SH_COMMAND_EDITING
 
 #ifndef BB_FEATURE_SH_TAB_COMPLETION
diff --git a/shell/cmdedit.c b/shell/cmdedit.c
index 9cb53522f..993e83b21 100644
--- a/shell/cmdedit.c
+++ b/shell/cmdedit.c
@@ -42,12 +42,6 @@
 #include <signal.h>
 #include <limits.h>
 
-#ifdef BB_FEATURE_SH_TAB_COMPLETION
-#include <dirent.h>
-#include <sys/stat.h>
-#endif
-
-
 #ifndef TEST
 
 #include "busybox.h"
@@ -67,6 +61,11 @@
 
 #endif							/* TEST */
 
+#ifdef BB_FEATURE_SH_TAB_COMPLETION
+#include <dirent.h>
+#include <sys/stat.h>
+#endif
+
 #ifdef BB_FEATURE_SH_COMMAND_EDITING
 
 #ifndef BB_FEATURE_SH_TAB_COMPLETION