1 files changed, 5 insertions, 2 deletions

diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el
index 8ee925c23cd..58bc72a3ea9 100644
--- a/lisp/eshell/eshell.el
+++ b/lisp/eshell/eshell.el
@@ -224,9 +224,11 @@
 ;; will only have to read in this one file, which will greatly speed
 ;; things up.
 
-(require 'esh-mode)
+(eval-when-compile
+  (require 'cl)
+  (require 'esh-util))
 (require 'esh-util)
-(eval-when-compile (require 'esh-maint))
+(require 'esh-mode)
 
 (defgroup eshell nil
   "Eshell is a command shell implemented entirely in Emacs Lisp.  It
@@ -243,6 +245,7 @@ the tasks accomplished by such tools."
 ;;;_* User Options
 ;;
 ;; The following user options modify the behavior of Eshell overall.
+(defvar eshell-buffer-name)
 
 (defsubst eshell-add-to-window-buffer-names ()
   "Add `eshell-buffer-name' to `same-window-buffer-names'."