diff --git a/lisp/org-docview.el b/lisp/org-docview.el
index 64c215d8d..f36f70f14 100644
--- a/lisp/org-docview.el
+++ b/lisp/org-docview.el
@@ -49,7 +49,7 @@
 (declare-function image-mode-window-get "ext:image-mode"
 		  (prop &optional winprops))
 
-(autoload 'doc-view-goto-page "doc-view")
+(org-autoload 'doc-view-goto-page "doc-view")
 
 (org-add-link-type "docview" 'org-docview-open)
 (add-hook 'org-store-link-functions 'org-docview-store-link)
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index 82b9003e4..eaf679aec 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -50,12 +50,12 @@
 		  (&optional buffer-or-name norecord label))
 (declare-function org-unescape-code-in-region "org-src" (beg end))
 
-(autoload 'org-export-generic "org-export-generic" "Export using the generic exporter" t)
-
-(autoload 'org-export-as-odt "org-odt"
-  "Export the outline to a OpenDocument Text file." t)
-(autoload 'org-export-as-odt-and-open "org-odt"
-  "Export the outline to a OpenDocument Text file and open it." t)
+(org-autoload 'org-export-generic
+	      "org-export-generic" "Export using the generic exporter" t)
+(org-autoload 'org-export-as-odt "org-odt"
+	      "Export the outline to a OpenDocument Text file." t)
+(org-autoload 'org-export-as-odt-and-open "org-odt"
+	      "Export the outline to a OpenDocument Text file and open it." t)
 
 (defgroup org-export nil
   "Options for exporting org-listings."
diff --git a/lisp/org.el b/lisp/org.el
index 212d85af2..d2895e873 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -4216,7 +4216,7 @@ Otherwise, these types are allowed:
 	      '(org-columns-number-to-string
 		org-columns-get-format-and-top-level
 		org-columns-compute
-		org-columns-remove-overlays))
+		org-columns-remove-overlays)))
 
 ;; Autoload ID code
 
@@ -18752,8 +18752,8 @@ this function returns t, nil otherwise."
 		(throw 'exit t))))
 	nil))))
 
-(autoload 'org-element-at-point "org-element")
-(autoload 'org-element-type "org-element")
+(org-autoload 'org-element-at-point "org-element")
+(org-autoload 'org-element-type "org-element")
 
 (declare-function org-element-at-point "org-element" (&optional keep-trail))
 (declare-function org-element-type "org-element" (element))