diff --git a/modules/app/email/autoload/evil.el b/modules/app/email/autoload/evil.el
index ccc281a17..d7b64c9c6 100644
--- a/modules/app/email/autoload/evil.el
+++ b/modules/app/email/autoload/evil.el
@@ -1,4 +1,5 @@
-;;; app/email/autoload/evil.el -*- lexical-binding: t; -*-
+;; app/email/autoload/evil.el -*- lexical-binding: t; -*-
+;;;###if (featurep! :feature evil)
 
 ;;;###autoload
 (defun +email/mark (&optional beg end)
diff --git a/modules/completion/helm/autoload/evil.el b/modules/completion/helm/autoload/evil.el
index eceb08f0f..d1f1b5f59 100644
--- a/modules/completion/helm/autoload/evil.el
+++ b/modules/completion/helm/autoload/evil.el
@@ -1,4 +1,5 @@
 ;;; completion/helm/autoload/evil.el -*- lexical-binding: t; -*-
+;;;###if (featurep! :feature evil)
 
 ;;;###autoload (autoload '+helm:swoop "completion/helm/autoload/evil" nil t)
 (evil-define-command +helm:swoop (&optional search bang)
diff --git a/modules/completion/ivy/autoload/evil.el b/modules/completion/ivy/autoload/evil.el
index f8789be6a..1cd8b8d69 100644
--- a/modules/completion/ivy/autoload/evil.el
+++ b/modules/completion/ivy/autoload/evil.el
@@ -1,4 +1,5 @@
-;;; completion/ivy/autoload/evil.el -*- lexical-binding: t; -*-
+;; completion/ivy/autoload/evil.el -*- lexical-binding: t; -*-
+;;;###if (featurep! :feature evil)
 
 ;;;###autoload (autoload '+ivy:swiper "completion/ivy/autoload/evil" nil t)
 (evil-define-command +ivy:swiper (&optional search)
diff --git a/modules/feature/debugger/autoload/evil.el b/modules/feature/debugger/autoload/evil.el
index c1b9c0a5b..7ae3027ef 100644
--- a/modules/feature/debugger/autoload/evil.el
+++ b/modules/feature/debugger/autoload/evil.el
@@ -1,4 +1,5 @@
-;;; feature/debugger/autoload/evil.el -*- lexical-binding: t; -*-
+;; feature/debugger/autoload/evil.el -*- lexical-binding: t; -*-
+;;;###if (featurep! :feature evil)
 
 ;;;###autoload (autoload '+debugger:start "feature/debugger/autoload/evil" nil t)
 (evil-define-command +debugger:start (&optional path)
diff --git a/modules/feature/eval/autoload/evil.el b/modules/feature/eval/autoload/evil.el
index 00b87245c..e36320976 100644
--- a/modules/feature/eval/autoload/evil.el
+++ b/modules/feature/eval/autoload/evil.el
@@ -1,4 +1,5 @@
-;;; feature/eval/autoload/evil.el -*- lexical-binding: t; -*-
+;; feature/eval/autoload/evil.el -*- lexical-binding: t; -*-
+;;;###if (featurep! :feature evil)
 
 ;;;###autoload (autoload '+eval:region "feature/eval/autoload/evil" nil t)
 (evil-define-operator +eval:region (beg end)
diff --git a/modules/feature/evil/autoload/evil.el b/modules/feature/evil/autoload/evil.el
index c471de661..7e1d6d773 100644
--- a/modules/feature/evil/autoload/evil.el
+++ b/modules/feature/evil/autoload/evil.el
@@ -1,4 +1,5 @@
-;;; feature/evil/autoload/evil.el -*- lexical-binding: t; -*-
+;; feature/evil/autoload/evil.el -*- lexical-binding: t; -*-
+;;;###if (featurep! :feature evil)
 
 ;;;###autoload
 (defun +evil/visual-indent ()
diff --git a/modules/feature/jump/autoload/evil.el b/modules/feature/jump/autoload/evil.el
index 7f74c5205..51142c206 100644
--- a/modules/feature/jump/autoload/evil.el
+++ b/modules/feature/jump/autoload/evil.el
@@ -1,4 +1,5 @@
 ;;; feature/jump/autoload/evil.el -*- lexical-binding: t; -*-
+;;;###if (featurep! :feature evil)
 
 ;;;###autoload (autoload '+jump:online "feature/jump/autoload/evil" nil t)
 (evil-define-command +jump:online (query &optional bang)
diff --git a/modules/feature/snippets/autoload/evil.el b/modules/feature/snippets/autoload/evil.el
index cac086280..c8d5cfc7f 100644
--- a/modules/feature/snippets/autoload/evil.el
+++ b/modules/feature/snippets/autoload/evil.el
@@ -1,4 +1,5 @@
 ;;; feature/snippets/autoload/evil.el -*- lexical-binding: t; -*-
+;;;###if (featurep! :feature evil)
 
 ;;;###autoload
 (defun +snippets/expand-on-region ()
diff --git a/modules/feature/workspaces/autoload/evil.el b/modules/feature/workspaces/autoload/evil.el
index a4aee5e15..16f75c4e6 100644
--- a/modules/feature/workspaces/autoload/evil.el
+++ b/modules/feature/workspaces/autoload/evil.el
@@ -1,4 +1,5 @@
 ;;; feature/workspaces/autoload/evil.el -*- lexical-binding: t; -*-
+;;;###if (featurep! :feature evil)
 
 ;;;###autoload (autoload '+workspace:save-session "feature/workspaces/autoload/evil" nil t)
 (evil-define-command +workspace:save-session (&optional bang name)
diff --git a/modules/lang/web/autoload/evil.el b/modules/lang/web/autoload/evil.el
index c719018eb..8886f1ae0 100644
--- a/modules/lang/web/autoload/evil.el
+++ b/modules/lang/web/autoload/evil.el
@@ -1,4 +1,5 @@
 ;;; lang/html/autoload/evil.el -*- lexical-binding: t; -*-
+;;;###if (featurep! :feature evil)
 
 ;;;###autoload (autoload '+web:encode-html-entities "lang/web/autoload/evil" nil t)
 (evil-define-operator +web:encode-html-entities (beg end &optional input)
diff --git a/modules/org/org-attach/autoload/evil.el b/modules/org/org-attach/autoload/evil.el
index 7570f465b..b32920298 100644
--- a/modules/org/org-attach/autoload/evil.el
+++ b/modules/org/org-attach/autoload/evil.el
@@ -1,4 +1,5 @@
-;;; org/org-attach/autoload/evil.el -*- lexical-binding: t; -*-
+;; org/org-attach/autoload/evil.el -*- lexical-binding: t; -*-
+;;;###if (featurep! :feature evil)
 
 ;; TODO +org-attach:find
 
diff --git a/modules/org/org-capture/autoload/evil.el b/modules/org/org-capture/autoload/evil.el
index 7becec046..b6efbb629 100644
--- a/modules/org/org-capture/autoload/evil.el
+++ b/modules/org/org-capture/autoload/evil.el
@@ -1,4 +1,5 @@
 ;;; org/org-capture/autoload/evil.el -*- lexical-binding: t; -*-
+;;;###if (featurep! :feature evil)
 
 ;;;###autoload (autoload '+org-capture:open "org/org-capture/autoload/evil" nil t)
 (evil-define-operator +org-capture:open (&optional beg end)
diff --git a/modules/private/hlissner/autoload/evil.el b/modules/private/hlissner/autoload/evil.el
index 3ef44c1ad..0845af2d2 100644
--- a/modules/private/hlissner/autoload/evil.el
+++ b/modules/private/hlissner/autoload/evil.el
@@ -1,4 +1,5 @@
 ;;; private/hlissner/autoload/evil.el -*- lexical-binding: t; -*-
+;;;###if (featurep! :feature evil)
 
 ;;;###autoload (autoload '+hlissner:multi-next-line "private/hlissner/autoload/evil" nil t)
 (evil-define-motion +hlissner:multi-next-line (count)
diff --git a/modules/tools/eshell/autoload/evil.el b/modules/tools/eshell/autoload/evil.el
index 5ef5f8ee0..0f8d18316 100644
--- a/modules/tools/eshell/autoload/evil.el
+++ b/modules/tools/eshell/autoload/evil.el
@@ -1,4 +1,5 @@
 ;;; tools/eshell/autoload/evil.el -*- lexical-binding: t; -*-
+;;;###if (featurep! :feature evil)
 
 ;;;###autoload (autoload '+eshell:run "tools/eshell/autoload/evil" nil t)
 (evil-define-command +eshell:run (command bang)
diff --git a/modules/tools/gist/autoload/evil.el b/modules/tools/gist/autoload/evil.el
index 2d93324b7..3633fe876 100644
--- a/modules/tools/gist/autoload/evil.el
+++ b/modules/tools/gist/autoload/evil.el
@@ -1,4 +1,5 @@
 ;;; tools/gist/autoload/evil.el -*- lexical-binding: t; -*-
+;;;###if (featurep! :feature evil)
 
 ;;;###autoload (autoload '+gist:send "tools/gist/autoload/evil" nil t)
 (evil-define-operator +gist:send (bang)
diff --git a/modules/tools/tmux/autoload/evil.el b/modules/tools/tmux/autoload/evil.el
index f01230c28..df3284290 100644
--- a/modules/tools/tmux/autoload/evil.el
+++ b/modules/tools/tmux/autoload/evil.el
@@ -1,4 +1,5 @@
 ;;; tools/tmux/autoload/evil.el -*- lexical-binding: t; -*-
+;;;###if (featurep! :feature evil)
 
 ;;;###autoload (autoload '+tmux:run "tools/tmux/autoload/evil" nil t)
 (evil-define-command +tmux:run (bang &optional command)