diff --git a/init/mod-cpp.el b/init/mod-cpp.el
index c8eb13078..7cdd6c852 100644
--- a/init/mod-cpp.el
+++ b/init/mod-cpp.el
@@ -1,5 +1,14 @@
 
-(use-package c++-mode :mode "\\.h\\'")
+(mapc 'my/install-package '(auto-complete-clang auto-complete-c-headers))
+
+(add-to-list 'auto-mode-alist '("\\.h\\'" . c++-mode))
+
+(add-hook 'c-mode-common-hook
+          (lambda()
+            (use-package auto-complete-clang)
+            (use-package auto-complete-c-headers)
+
+            (setq ac-sources '(ac-source-clang ac-source-c-headers ac-source-yasnippet))))
 
 ;; TODO Better SFML & build settings