diff --git a/oni-core.el b/oni-core.el
index dbccf96..795dd39 100644
--- a/oni-core.el
+++ b/oni-core.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.0920.202748
+;; Version: 2021.0921.232841
 ;; Package-Requires: (oni-data-dir oni-embrace oni-hydra expand-region multiple-cursors gcmh diminish ws-butler which-key insert-char-preview dashboard mixed-pitch)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -265,6 +265,7 @@ _s_: String list"
 (with-eval-after-load 'counsel (require 'oni-counsel))
 (with-eval-after-load 'csharp-mode (require 'oni-csharp))
 (with-eval-after-load 'css-mode (require 'oni-css))
+(with-eval-after-load 'diff-hl (require 'oni-diff-hl))
 (with-eval-after-load 'elfeed (require 'oni-elfeed))
 (with-eval-after-load 'embrace (require 'oni-embrace))
 (with-eval-after-load 'flycheck (require 'oni-flycheck))
@@ -302,6 +303,7 @@ _s_: String list"
 (which-key-mode)
 (auto-insert-mode)
 (counsel-mode)
+(global-diff-hl-mode)
 
 (provide 'oni-core)
 ;;; oni-core.el ends here
diff --git a/oni-diff-hl.el b/oni-diff-hl.el
index 7fbc28b..b699926 100644
--- a/oni-diff-hl.el
+++ b/oni-diff-hl.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2020.0228.154151
+;; Version: 2021.0921.232803
 ;; Package-Requires: (diff-hl)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -39,10 +39,5 @@ ORIG-FUN is the function being wrapped, ARGS are the arguments specified"
   (add-function :around (symbol-function 'diff-hl-changes-buffer)
                 #'oni:with-diff-hl-p4-args))
 
-;;;###autoload
-(global-diff-hl-mode)
-
-;;;###autoload(with-eval-after-load 'diff-hl (require 'oni-diff-hl))
-
 (provide 'oni-diff-hl)
 ;;; oni-diff-hl.el ends here