diff --git a/oni-core.el b/oni-core.el
index b3fe1df..21d2fbe 100644
--- a/oni-core.el
+++ b/oni-core.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.0919.234012
+;; Version: 2021.0920.200535
 ;; 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
@@ -254,6 +254,7 @@ _s_: String list"
 (with-eval-after-load 'bookmark (require 'oni-bookmark))
 (with-eval-after-load 'browse-url (require 'oni-browse-url))
 (with-eval-after-load 'cc-mode (require 'oni-c))
+(with-eval-after-load 'cc-mode (require 'oni-cpp))
 (with-eval-after-load 'cider (require 'oni-clojure))
 (with-eval-after-load 'circe (require 'oni-circe))
 (with-eval-after-load 'clojure-mode (require 'oni-clojure))
@@ -276,6 +277,7 @@ _s_: String list"
 (with-eval-after-load 'smartparens (require 'oni-smartparens))
 (with-eval-after-load 'vterm (require 'oni-vterm))
 
+
 (with-eval-after-load 'yasnippet
   (require 'oni-yasnippet)
   (when (and (package-installed-p 'oni-yasnippet)
diff --git a/oni-cpp.el b/oni-cpp.el
index b8a764a..3487e9c 100644
--- a/oni-cpp.el
+++ b/oni-cpp.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2021.0622.220950
+;; Version: 2021.0920.200451
 ;; Package-Requires: (oni-company oni-flycheck)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -38,7 +38,5 @@
 (add-hook 'c++-mode-hook 'flycheck-mode)
 (add-hook 'c++-mode-hook 'oni-cpp--auto-fill-mode)
 
-;;;###autoload(with-eval-after-load 'cc-mode (require 'oni-cpp))
-
 (provide 'oni-cpp)
 ;;; oni-cpp.el ends here