2 files changed, 12 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ee17699eb40..6a094692240 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2013-05-24  Glenn Morris  <rgm@gnu.org>
 
+        * obsolete/sym-comp.el: No need to load hipper-exp when compiling.
+        (he-search-string, he-tried-table, he-expand-list)
+        (he-init-string, he-string-member, he-substitute-string)
+        (he-reset-string): Declare.
+
         * obsolete/options.el (list-options): Use custom-variable-p,
         rather than obsolete alias.
 
diff --git a/lisp/obsolete/sym-comp.el b/lisp/obsolete/sym-comp.el
index 85d427a3317..4641ca68544 100644
--- a/lisp/obsolete/sym-comp.el
+++ b/lisp/obsolete/sym-comp.el
@@ -148,7 +148,13 @@ to be set buffer-locally.  Variables `symbol-completion-symbol-function',
     (completion-in-region (- (point) (length pattern)) (point)
                           completions predicate)))
 
-(eval-when-compile (require 'hippie-exp))
+(defvar he-search-string)
+(defvar he-tried-table)
+(defvar he-expand-list)
+(declare-function he-init-string "hippie-exp" (beg end))
+(declare-function he-string-member "hippie-exp" (str lst &optional trans-case))
+(declare-function he-substitute-string "hippie-exp" (str &optional trans-case))
+(declare-function he-reset-string "hippie-exp" ())
 
 ;;;###autoload
 (defun symbol-completion-try-complete (old)