diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 534433769..bbf348134 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -47,11 +47,13 @@
 (declare-function org-get-heading "org" (&optional no-tags no-todo no-priority no-comment))
 (declare-function org-get-tags "org" (&optional pos local))
 (declare-function org-hide-block-toggle "org" (&optional force no-error element))
+(declare-function org-hide-drawer-all "org" ())
 (declare-function org-link-display-format "ol" (s))
 (declare-function org-link-set-parameters "ol" (type &rest rest))
 (declare-function org-log-into-drawer "org" ())
 (declare-function org-make-tag-string "org" (tags))
 (declare-function org-reduced-level "org" (l))
+(declare-function org-return "org" (&optional indent arg interactive))
 (declare-function org-show-context "org" (&optional key))
 (declare-function org-table-end "org-table" (&optional table-type))
 (declare-function outline-next-heading "outline" ())
diff --git a/lisp/org-keys.el b/lisp/org-keys.el
index 7c0cc9216..c006e9c12 100644
--- a/lisp/org-keys.el
+++ b/lisp/org-keys.el
@@ -148,7 +148,7 @@
 (declare-function org-remove-file "org" (&optional file))
 (declare-function org-resolve-clocks "org" (&optional only-dangling-p prompt-fn last-valid))
 (declare-function org-return "org" (&optional indent))
-(declare-function org-return-indent "org" ())
+(declare-function org-return-and-maybe-indent "org" ())
 (declare-function org-reveal "org" (&optional siblings))
 (declare-function org-schedule "org" (arg &optional time))
 (declare-function org-self-insert-command "org" (N))