diff --git a/lisp/org-element.el b/lisp/org-element.el
index d9ee8fdfa..3d6f1f625 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -60,18 +60,21 @@
 
 (require 'avl-tree)
 (require 'cl-lib)
-(require 'org-macs)
 (require 'ol)
+(require 'org)
+(require 'org-compat)
 (require 'org-entities)
 (require 'org-footnote)
 (require 'org-list)
-(require 'org-macro)
+(require 'org-macs)
 (require 'org-table)
 
 (declare-function org-at-heading-p "org" (&optional _))
 (declare-function org-end-of-subtree "org" (&optional invisible-ok to-heading))
 (declare-function org-escape-code-in-string "org-src" (s))
 (declare-function org-find-visible "org" ())
+(declare-function org-macro-escape-arguments "org-macro" (&rest args))
+(declare-function org-macro-extract-arguments "org-macro" (s))
 (declare-function org-reduced-level "org" (l))
 (declare-function org-unescape-code-in-string "org-src" (s))
 (declare-function outline-next-heading "outline" ())
diff --git a/lisp/org-lint.el b/lisp/org-lint.el
index 1131ea5a1..64167cdad 100644
--- a/lisp/org-lint.el
+++ b/lisp/org-lint.el
@@ -108,7 +108,6 @@
 (require 'cl-lib)
 (require 'ob)
 (require 'ol)
-(require 'org-element)
 (require 'org-macro)
 (require 'ox)
 
diff --git a/lisp/org-macro.el b/lisp/org-macro.el
index c14703c0c..a3a0d1fc1 100644
--- a/lisp/org-macro.el
+++ b/lisp/org-macro.el
@@ -62,7 +62,7 @@
 (declare-function org-file-contents "org" (file &optional noerror nocache))
 (declare-function org-file-url-p "org" (file))
 (declare-function org-in-commented-heading-p "org" (&optional no-inheritance))
-(declare-function org-link-search "org" (s &optional avoid-pos stealth))
+(declare-function org-link-search "ol" (s &optional avoid-pos stealth))
 (declare-function org-mode "org" ())
 (declare-function vc-backend "vc-hooks" (f))
 (declare-function vc-call "vc-hooks" (fun file &rest args) t)
@@ -139,6 +139,7 @@ In addition to buffer-defined macros, the function installs the
 following ones: \"n\", \"author\", \"email\", \"keyword\",
 \"time\", \"property\", and, if the buffer is associated to
 a file, \"input-file\" and \"modification-time\"."
+  (require 'org-element)
   (org-macro--counter-initialize)	;for "n" macro
   (setq org-macro-templates
 	(nconc