lisp/cedet/semantic/db-el.el (semanticdb-elisp-sym->tag): Require

semantic/bovine/el for semantic-elisp-desymbolify.

lisp/cedet/semantic/symref.el: Declare external functions.

lisp/cedet/semantic/tag-file.el: Declare external variables and functions.

lisp/cedet/semantic/texi.el: Declare external variables and functions.

4 files changed, 12 insertions, 2 deletions

diff --git a/lisp/cedet/semantic/db-el.el b/lisp/cedet/semantic/db-el.el
index e1459f259cc..f98226906c8 100644
--- a/lisp/cedet/semantic/db-el.el
+++ b/lisp/cedet/semantic/db-el.el
@@ -37,8 +37,10 @@
   ;; For generic function searching.
   (require 'eieio)
   (require 'eieio-opt)
-  (require 'eieio-base)
-  )
+  (require 'eieio-base))
+
+(declare-function semantic-elisp-desymbolify "semantic/bovine/el")
+
 ;;; Code:
 
 ;;; Classes:
@@ -205,6 +207,7 @@ TOKTYPE is a hint to the type of tag desired."
       (setq sym (intern-soft sym)))
   (when sym
     (cond ((and (eq toktype 'function) (fboundp sym))
+           (require 'semantic/bovine/el)
            (semantic-tag-new-function
             (symbol-name sym)
             nil ;; return type
diff --git a/lisp/cedet/semantic/symref.el b/lisp/cedet/semantic/symref.el
index 98bc7dd310d..56c6cc33af5 100644
--- a/lisp/cedet/semantic/symref.el
+++ b/lisp/cedet/semantic/symref.el
@@ -67,8 +67,11 @@
 (require 'semantic)
 ;; (require 'ede)
 
+(defvar ede-minor-mode)
 (declare-function data-debug-new-buffer "data-debug")
 (declare-function data-debug-insert-object-slots "eieio-datadebug")
+(declare-function ede-toplevel "ede/files")
+(declare-function ede-project-root-directory "ede/files")
 
 ;;; Code:
 (defvar semantic-symref-tool 'detect
diff --git a/lisp/cedet/semantic/tag-file.el b/lisp/cedet/semantic/tag-file.el
index 58c0aaeec63..a013035a84c 100644
--- a/lisp/cedet/semantic/tag-file.el
+++ b/lisp/cedet/semantic/tag-file.el
@@ -28,9 +28,11 @@
 
 (require 'semantic/tag)
 
+(defvar ede-minor-mode)
 (declare-function semanticdb-table-child-p "semantic/db")
 (declare-function semanticdb-get-buffer "semantic/db")
 (declare-function semantic-dependency-find-file-on-path "semantic/dep")
+(declare-function ede-toplevel "ede/files")
 
 ;;; Code:
 
diff --git a/lisp/cedet/semantic/texi.el b/lisp/cedet/semantic/texi.el
index 3190bf1d5ec..4850b781c0a 100644
--- a/lisp/cedet/semantic/texi.el
+++ b/lisp/cedet/semantic/texi.el
@@ -41,7 +41,9 @@
 ;;  (require 'senator)
 )
 
+(defvar ede-minor-mode)
 (declare-function lookup-words "ispell")
+(declare-function ede-current-project "ede")
 
 (defvar semantic-texi-super-regex
   "^@\\(top\\|chapter\\|\\(sub\\)*section\\|unnumbered\\(\\(sub\\)*sec\\)?\\|\