diff --git a/init.el b/init.el
index b153298..9e61f6d 100644
--- a/init.el
+++ b/init.el
@@ -1,5 +1,5 @@
 ;;; init.el --- tastytea's Emacs init file.
-;; Time-stamp: <2019-08-04T17:44:45+00:00>
+;; Time-stamp: <2019-08-06T22:03:53+00:00>
 
 ;;; Commentary:
 ;; I am using this file with Emacs 26, but most of it will probably work with
@@ -406,14 +406,15 @@ With argument, do this that many times."
   ;; Auto-complete integration.
   (use-package company-irony
     :after (company irony)
-    :config
-    (add-to-list 'company-backends 'company-irony))
+    ;; Backend is added in company-irony-c-headers.
+    )
 
   ;; Auto-complete headers
   (use-package company-irony-c-headers
-    :after (company-irony)
+    :after company-irony
     :config
-    (add-to-list 'company-backends 'company-irony-c-headers))
+    (add-to-list 'company-backends '(company-irony-c-headers company-irony))
+    )
 
   ;; cmake integration.
   (use-package cmake-ide
@@ -428,7 +429,7 @@ With argument, do this that many times."
 
 ;; Highlighting and indentation for CMake.
 (use-package cmake-mode
-  ;; The CMake ebuild installs the mode.
+  ;; The CMake ebuild installs and activates the mode.
   :unless (string-match-p "gentoo" operating-system-release)
   :mode
   ("CMakeLists\\.txt\\'" . cmake-mode)