diff --git a/core/core-lib.el b/core/core-lib.el
index 445efc706..8d0a9c57e 100644
--- a/core/core-lib.el
+++ b/core/core-lib.el
@@ -19,7 +19,7 @@
   (autoload sym "s"))
 
 (dolist (sym '(when-let if-let string-trim string-join string-blank-p string-lessp))
-  (autoload sym "subr-x"))
+  (autoload sym "subr-x" nil nil 'macro))
 
 
 ;;
diff --git a/modules/feature/evil/autoload/evil.el b/modules/feature/evil/autoload/evil.el
index aa3af8de7..7c7323833 100644
--- a/modules/feature/evil/autoload/evil.el
+++ b/modules/feature/evil/autoload/evil.el
@@ -1,7 +1,5 @@
 ;;; feature/evil/autoload/evil.el -*- lexical-binding: t; -*-
 
-(eval-when-compile (require 'subr-x))
-
 ;;;###autoload
 (defun +evil/visual-indent ()
   "vnoremap < <gv"
diff --git a/modules/ui/doom-modeline/config.el b/modules/ui/doom-modeline/config.el
index 612a03274..d2a71fdc7 100644
--- a/modules/ui/doom-modeline/config.el
+++ b/modules/ui/doom-modeline/config.el
@@ -1,10 +1,7 @@
 ;;; ui/doom-modeline/config.el -*- lexical-binding: t; -*-
 
-(eval-when-compile (require 'subr-x))
-
-(line-number-mode -1)
-
-(def-package! eldoc-eval :demand t
+(def-package! eldoc-eval
+  :demand t
   :config
   ;; Show eldoc in the mode-line with `eval-expression'
   (defun +doom-modeline--show-eldoc (input)