diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 2107de59a..2553286e1 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -53,7 +53,9 @@
 (declare-function speedbar-line-directory "speedbar" (&optional depth))
 (declare-function table--at-cell-p "table" (position &optional object at-column))
 
+(defvar calendar-mode-map)
 (defvar org-complex-heading-regexp)
+(defvar org-agenda-diary-file)
 (defvar org-table-any-border-regexp)
 (defvar org-table-dataline-regexp)
 (defvar org-table-tab-recognizes-table.el)
diff --git a/lisp/org-tempo.el b/lisp/org-tempo.el
index 5dd665f6b..37c849cae 100644
--- a/lisp/org-tempo.el
+++ b/lisp/org-tempo.el
@@ -40,6 +40,7 @@
 
 (require 'tempo)
 (require 'cl-lib)
+(declare-function org-buffer-list "org" (&optional predicate exclude-tmp))
 
 (defvar org-structure-template-alist)