diff --git a/modules/completion/company/autoload.el b/modules/completion/company/autoload.el
index dfdf52b72..d605ac9b5 100644
--- a/modules/completion/company/autoload.el
+++ b/modules/completion/company/autoload.el
@@ -17,6 +17,7 @@ Examples:
   (set-company-backend! 'js2-mode
     '(:separate company-irony-c-headers company-irony))
   (set-company-backend! 'sh-mode nil)"
+  (declare (indent defun))
   (dolist (mode (doom-enlist modes))
     (let ((hook (intern (format "%s-hook" mode)))
           (fn   (intern (format "+company|init-%s" mode))))
diff --git a/modules/editor/rotate-text/autoload.el b/modules/editor/rotate-text/autoload.el
index dc53bb9c0..d5247e656 100644
--- a/modules/editor/rotate-text/autoload.el
+++ b/modules/editor/rotate-text/autoload.el
@@ -8,7 +8,7 @@
 (cl-defun set-rotate-patterns! (modes &key symbols words patterns)
   "Declare :symbols, :words or :patterns (all lists of strings) that
 `rotate-text' will cycle through."
-  (declare (indent 1))
+  (declare (indent defun))
   (dolist (mode (doom-enlist modes))
     (let ((fn-name (intern (format "+rotate-text|init-%s" mode))))
       (fset fn-name
diff --git a/modules/emacs/electric/autoload.el b/modules/emacs/electric/autoload.el
index 7ecbaf3b0..c75d2fe0e 100644
--- a/modules/emacs/electric/autoload.el
+++ b/modules/emacs/electric/autoload.el
@@ -4,7 +4,7 @@
 (defun set-electric! (modes &rest plist)
   "Declare :words (list of strings) or :chars (lists of chars) in MODES that
 trigger electric indentation."
-  (declare (indent 1))
+  (declare (indent defun))
   (dolist (mode (doom-enlist modes))
     (let ((hook (intern (format "%s-hook" mode)))
           (fn   (intern (format "+electric|init-%s" mode))))
diff --git a/modules/feature/eval/autoload/settings.el b/modules/feature/eval/autoload/settings.el
index 2925c6ee6..2849e5fab 100644
--- a/modules/feature/eval/autoload/settings.el
+++ b/modules/feature/eval/autoload/settings.el
@@ -42,6 +42,7 @@ function that creates and returns the REPL buffer."
    (quickrun-add-command MODE COMMAND :mode MODE).
 4. If MODE is not a string and COMMANd is a symbol, add it to
    `+eval-runners', which is used by `+eval/region'."
+  (declare (indent defun))
   (cond ((symbolp command)
          (push (cons mode command) +eval-runners))
         ((stringp command)
diff --git a/modules/feature/evil/autoload/evil.el b/modules/feature/evil/autoload/evil.el
index 1c1c86e8f..c6ab35535 100644
--- a/modules/feature/evil/autoload/evil.el
+++ b/modules/feature/evil/autoload/evil.el
@@ -4,6 +4,7 @@
 ;;;###autodef
 (defun set-evil-initial-state! (modes state)
   "Set the initialize STATE of MODES using `evil-set-initial-state'."
+  (declare (indent defun))
   (after! evil
     (if (listp modes)
         (dolist (mode (doom-enlist modes))
diff --git a/modules/feature/file-templates/autoload.el b/modules/feature/file-templates/autoload.el
index a7f5e4607..be789d92d 100644
--- a/modules/feature/file-templates/autoload.el
+++ b/modules/feature/file-templates/autoload.el
@@ -27,6 +27,7 @@ these properties:
   :ignore BOOL
     If non-nil, don't expand any template for this file and don't test any other
     file template rule against this buffer."
+  (declare (indent defun))
   (after! (:when (boundp '+file-templates-alist))
     (+file-templates--set pred plist)))
 
diff --git a/modules/feature/lookup/autoload/docsets.el b/modules/feature/lookup/autoload/docsets.el
index 9c2630494..2255e1662 100644
--- a/modules/feature/lookup/autoload/docsets.el
+++ b/modules/feature/lookup/autoload/docsets.el
@@ -13,6 +13,7 @@
 symbol or a list of them).
 
 Used by `+lookup/in-docsets' and `+lookup/documentation'."
+  (declare (indent defun))
   (dolist (mode (doom-enlist modes))
     (let ((fn   (intern (format "+lookup|init-docsets--%s" mode)))
           (hook (intern (format "%s-hook" mode))))
diff --git a/modules/feature/lookup/autoload/lookup.el b/modules/feature/lookup/autoload/lookup.el
index e0b70029a..de9216787 100644
--- a/modules/feature/lookup/autoload/lookup.el
+++ b/modules/feature/lookup/autoload/lookup.el
@@ -29,6 +29,7 @@ properties:
 :xref-backend FN
   Defines an xref backend for a major-mode. If you define :definition and
   :references along with :xref-backend, those will have higher precedence."
+  (declare (indent defun))
   (dolist (mode (doom-enlist modes))
     (let ((hook (intern (format "%s-hook" mode)))
           (fn   (intern (format "+lookup|init-%s" mode))))
diff --git a/modules/ui/pretty-code/autoload.el b/modules/ui/pretty-code/autoload.el
index a99278ece..b11795f42 100644
--- a/modules/ui/pretty-code/autoload.el
+++ b/modules/ui/pretty-code/autoload.el
@@ -319,7 +319,7 @@ assicated with :lambda in `+pretty-code-symbols'.
 Pretty symbols can be unset for emacs-lisp-mode with:
 
   (set-pretty-symbols! 'emacs-lisp-mode nil)"
-  (declare (indent 1))
+  (declare (indent defun))
   (dolist (mode (doom-enlist modes))
     (let ((hook (intern (format "%s-hook" mode)))
           (fn   (intern (format "+pretty-code|init-%s" mode))))