diff --git a/core/autoload/packages.el b/core/autoload/packages.el
index c39767f2f..4cd53f75d 100644
--- a/core/autoload/packages.el
+++ b/core/autoload/packages.el
@@ -230,7 +230,7 @@ appropriate."
                               (format "+ %s %s -> %s"
                                       (s-pad-right (+ -max-len 2) " " (symbol-name (car pkg)))
                                       (s-pad-right 14 " " (doom--version-list-str (cadr pkg)))
-                                      (doom--version-list-str (caddr pkg))))
+                                      (doom--version-list-str (cl-caddr pkg))))
                             (--sort (string-lessp (symbol-name (car it))
                                                   (symbol-name (car other)))
                                     packages)
@@ -319,7 +319,7 @@ calls."
       (if (y-or-n-p (format "%s will be updated from %s to %s. Update?"
                             (car desc)
                             (doom--version-list-str (cadr desc))
-                            (doom--version-list-str (caddr desc))))
+                            (doom--version-list-str (cl-caddr desc))))
           (message "%s %s"
                    (if (doom-update-package package)
                        "Updated"
diff --git a/core/core-lib.el b/core/core-lib.el
index 69d4f3430..afcf82ff1 100644
--- a/core/core-lib.el
+++ b/core/core-lib.el
@@ -3,6 +3,7 @@
 (require 'dash)
 (require 's)
 (require 'f)
+(eval-when-compile (require 'cl-lib))
 
 (defvar __DIR__ nil  "The directory of the currently loaded file (set by `@load')")
 (defvar __FILE__ nil "The full path of the currently loaded file (set by `@load')")
diff --git a/modules/feature/evil/autoload/evil.el b/modules/feature/evil/autoload/evil.el
index bd3a31790..29a098750 100644
--- a/modules/feature/evil/autoload/evil.el
+++ b/modules/feature/evil/autoload/evil.el
@@ -10,7 +10,7 @@ flags."
                         "\\(\\(?::\\(?:[phtreS~.]\\|g?s[^: $]+\\)\\)*\\)"))
         case-fold-search)
     (dolist (match (s-match-strings-all regexp file-name))
-      (let ((flags (split-string (caddr match) ":" t))
+      (let ((flags (split-string (cl-caddr match) ":" t))
             (path (file-relative-name
                    (pcase (cadr match)
                      ("@" (doom-project-root))
diff --git a/modules/feature/file-templates/config.el b/modules/feature/file-templates/config.el
index c8c2405d1..dfdf6d3a0 100644
--- a/modules/feature/file-templates/config.el
+++ b/modules/feature/file-templates/config.el
@@ -102,8 +102,8 @@
       (require 'yasnippet)
       (unless yas-minor-mode
         (yas-minor-mode-on))
-      (let ((snippet (let ((template (cdar (mapcan #'(lambda (table) (yas--fetch table key))
-                                                   (yas--get-snippet-tables mode)))))
+      (let ((snippet (let ((template (cdar (cl-mapcan #'(lambda (table) (yas--fetch table key))
+                                                      (yas--get-snippet-tables mode)))))
                        (if template (yas--template-content template) nil))))
         (when (and yas-minor-mode snippet)
           (yas-expand-snippet snippet)