diff --git a/libbb/md5.c b/libbb/md5.c
index 132efdf93..e672559cf 100644
--- a/libbb/md5.c
+++ b/libbb/md5.c
@@ -13,21 +13,13 @@
  *  Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
 
-#include <fcntl.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
 #include "libbb.h"
 
-# if CONFIG_MD5_SIZE_VS_SPEED < 0 || CONFIG_MD5_SIZE_VS_SPEED > 3
+#if CONFIG_MD5_SIZE_VS_SPEED < 0 || CONFIG_MD5_SIZE_VS_SPEED > 3
 # define MD5_SIZE_VS_SPEED 2
-# else
+#else
 # define MD5_SIZE_VS_SPEED CONFIG_MD5_SIZE_VS_SPEED
-# endif
+#endif
 
 /* Initialize structure containing state of computation.
  * (RFC 1321, 3.3: Step 3)
diff --git a/shell/cmdedit.c b/shell/cmdedit.c
index 3f44ea013..35a8d5e27 100644
--- a/shell/cmdedit.c
+++ b/shell/cmdedit.c
@@ -1565,7 +1565,7 @@ prepare_to_die:
 			while (cursor > 0 &&!isspace(command[cursor-1]))
 				input_backspace();
 			break;
-#if CONFIG_FEATURE_COMMAND_EDITING_VI
+#if ENABLE_FEATURE_COMMAND_EDITING_VI
 		case 'i'|vbit:
 			vi_cmdmode = 0;
 			break;
@@ -1697,7 +1697,7 @@ prepare_to_die:
 
 		case ESC:
 
-#if CONFIG_FEATURE_COMMAND_EDITING_VI
+#if ENABLE_FEATURE_COMMAND_EDITING_VI
 			if (vi_mode) {
 				/* ESC: insert mode --> command mode */
 				vi_cmdmode = 1;
@@ -1749,7 +1749,7 @@ rewrite_line:
 				/* change command */
 				len = strlen(strcpy(command, history[cur_history]));
 				/* redraw and go to eol (bol, in vi */
-#if CONFIG_FEATURE_COMMAND_EDITING_VI
+#if ENABLE_FEATURE_COMMAND_EDITING_VI
 				redraw(cmdedit_y, vi_mode ? 9999:0);
 #else
 				redraw(cmdedit_y, 0);
@@ -1797,7 +1797,7 @@ rewrite_line:
 			} else
 #endif
 			{
-#if CONFIG_FEATURE_COMMAND_EDITING_VI
+#if ENABLE_FEATURE_COMMAND_EDITING_VI
 				if (vi_cmdmode)  /* don't self-insert */
 					break;
 #endif
diff --git a/shell/cmdedit.h b/shell/cmdedit.h
index c4ce2ac8c..f5863921a 100644
--- a/shell/cmdedit.h
+++ b/shell/cmdedit.h
@@ -2,19 +2,19 @@
 #ifndef CMDEDIT_H
 #define CMDEDIT_H
 
-int     cmdedit_read_input(char* promptStr, char* command);
+int cmdedit_read_input(char* promptStr, char* command);
 
 #ifdef CONFIG_ASH
 extern const char *cmdedit_path_lookup;
 #endif
 
 #ifdef CONFIG_FEATURE_COMMAND_SAVEHISTORY
-void    load_history ( const char *fromfile );
-void    save_history ( const char *tofile );
+void load_history(const char *fromfile);
+void save_history(const char *tofile);
 #endif
 
-#if CONFIG_FEATURE_COMMAND_EDITING_VI
-void	setvimode ( int viflag );
+#if ENABLE_FEATURE_COMMAND_EDITING_VI
+void setvimode(int viflag);
 #endif
 
 #endif /* CMDEDIT_H */