diff --git a/lisp/ob.el b/lisp/ob.el
index 2e485244e..64a96dd29 100644
--- a/lisp/ob.el
+++ b/lisp/ob.el
@@ -79,6 +79,7 @@
 (declare-function org-list-struct "org-list" ())
 (declare-function org-list-prevs-alist "org-list" (struct))
 (declare-function org-list-get-list-end "org-list" (item struct prevs))
+(declare-function org-strip-protective-commas "org" (beg end))
 
 (defgroup org-babel nil
   "Code block evaluation and management in `org-mode' documents."
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 25f9b8c90..2825ee538 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -6191,6 +6191,7 @@ When this is the global TODO list, a prefix argument will be interpreted."
 
 (defvar org-global-tags-completion-table nil)
 (defvar org-agenda-filter-form nil)
+(defvar org-agenda-filtered-by-category nil)
 
 (defun org-agenda-filter-by-category (strip)
   "Keep only those lines in the agenda buffer that have a specific category.
@@ -6369,7 +6370,6 @@ If the line does not have an effort defined, return nil."
       (funcall op (or eff (if org-sort-agenda-noeffort-is-high 32767 0))
 	       value))))
 
-(defvar org-agenda-filtered-by-category nil)
 (defun org-agenda-filter-apply (filter type)
   "Set FILTER as the new agenda filter and apply it."
   (let (tags)
diff --git a/lisp/org-eshell.el b/lisp/org-eshell.el
index de6f9fb1d..f572095d8 100644
--- a/lisp/org-eshell.el
+++ b/lisp/org-eshell.el
@@ -45,7 +45,7 @@
      (if (get-buffer eshell-buffer-name)
        (org-pop-to-buffer-same-window eshell-buffer-name)
        (eshell))
-     (end-of-buffer)
+     (goto-char (point-max))
      (eshell-kill-input)
      (insert command)
      (eshell-send-input)))
diff --git a/lisp/org-footnote.el b/lisp/org-footnote.el
index 196dd9919..612c0558b 100644
--- a/lisp/org-footnote.el
+++ b/lisp/org-footnote.el
@@ -58,6 +58,7 @@
 (declare-function org-show-context "org" (&optional key))
 (declare-function org-trim "org" (s))
 (declare-function outline-next-heading "outline")
+(declare-function org-skip-whitespace "org" ())
 
 (defvar org-outline-regexp-bol)		; defined in org.el
 (defvar org-odd-levels-only)		; defined in org.el
diff --git a/lisp/org-mobile.el b/lisp/org-mobile.el
index cc935a3c5..9f1b7ec10 100644
--- a/lisp/org-mobile.el
+++ b/lisp/org-mobile.el
@@ -303,7 +303,7 @@ create all custom agenda views, for upload to the mobile phone."
   (interactive)
   (let ((a-buffer (get-buffer org-agenda-buffer-name)))
     (let ((org-agenda-buffer-name "*SUMO*")
-	  (org-agenda-filter org-agenda-filter)
+	  (org-agenda-tag-filter org-agenda-tag-filter)
 	  (org-agenda-redo-command org-agenda-redo-command))
       (save-excursion
 	(save-window-excursion
diff --git a/lisp/org-src.el b/lisp/org-src.el
index 0e811c08b..0a67d79f2 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -43,6 +43,8 @@
 (declare-function org-switch-to-buffer-other-window "org" (&rest args))
 (declare-function org-pop-to-buffer-same-window
 		  "org-compat" (&optional buffer-or-name norecord label))
+(declare-function org-strip-protective-commas "org" (beg end))
+(declare-function org-base-buffer "org" (buffer))
 
 (defcustom org-edit-src-region-extra nil
   "Additional regexps to identify regions for editing with `org-edit-src-code'.