diff --git a/lisp/org-footnote.el b/lisp/org-footnote.el
index de04fe659..5c74e4588 100644
--- a/lisp/org-footnote.el
+++ b/lisp/org-footnote.el
@@ -46,6 +46,7 @@
 (declare-function org-show-context "org" (&optional key))
 (declare-function org-back-to-heading "org" (&optional invisible-ok))
 (declare-function org-end-of-subtree "org"  (&optional invisible-ok to-heading))
+(declare-function org-in-verbatim-emphasis "org" ())
 (defvar org-odd-levels-only) ;; defined in org.el
 
 (defconst org-footnote-re
diff --git a/lisp/org-src.el b/lisp/org-src.el
index 069d3cfc5..463bfa8a3 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -34,9 +34,12 @@
 
 (require 'org-macs)
 (require 'org-compat)
+(eval-when-compile
+  (require 'cl))
 
 (declare-function org-do-remove-indentation "org" (&optional n))
 (declare-function org-get-indentation "org" (&optional line))
+(declare-function org-switch-to-buffer-other-window "org" (&rest args))
 
 (defcustom org-edit-src-region-extra nil
   "Additional regexps to identify regions for editing with `org-edit-src-code'.