diff --git a/configure b/configure
index 4c38cbebb..0be9f136c 100755
--- a/configure
+++ b/configure
@@ -13404,7 +13404,7 @@ $as_echo_n "checking whether to enable readline... " >&6; }
 $as_echo "$READLINE" >&6; }
 
 if test "$EDITLINE" = yes; then
-	for ac_header in editline/readline.h editline/history.h
+	for ac_header in editline/readline.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
diff --git a/configure.ac b/configure.ac
index ee21b879d..b92be0db3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1420,7 +1420,7 @@ if test "$EDITLINE" == yes; then
 	PKG_CHECK_MODULES([EDITLINE], [libedit], [
 		AC_DEFINE([EDITLINE_SUPPORT], 1,
 			[Define to 1 to include the LVM editline shell.])], AC_MSG_ERROR(
-[libedit could not be found which is required for the --enable-readline option.])
+[libedit could not be found which is required for the --enable-editline option.])
 	)
 fi
 
@@ -1557,7 +1557,7 @@ AC_MSG_CHECKING(whether to enable readline)
 AC_MSG_RESULT($READLINE)
 
 if test "$EDITLINE" = yes; then
-	AC_CHECK_HEADERS(editline/readline.h editline/history.h,,hard_bailout)
+	AC_CHECK_HEADERS(editline/readline.h,,hard_bailout)
 fi
 AC_MSG_CHECKING(whether to enable editline)
 AC_MSG_RESULT($EDITLINE)
diff --git a/tools/lvm.c b/tools/lvm.c
index 79b1210af..cc67e924a 100644
--- a/tools/lvm.c
+++ b/tools/lvm.c
@@ -33,7 +33,6 @@ int main(int argc, char **argv)
 #    endif
 #  elif defined(EDITLINE_SUPPORT)
 #    include <editline/readline.h>
-#    include <editline/history.h>
 #  endif
 
 static struct cmdline_context *_cmdline;