diff --git a/layers/+lang/c-c++/packages.el b/layers/+lang/c-c++/packages.el
index e10a4c8f8..530c27e2c 100644
--- a/layers/+lang/c-c++/packages.el
+++ b/layers/+lang/c-c++/packages.el
@@ -123,6 +123,10 @@
 (defun c-c++/post-init-ycmd ()
   (add-hook 'c++-mode-hook 'ycmd-mode)
   (spacemacs/set-leader-keys-for-major-mode 'c++-mode
+    "gg" 'ycmd-goto
+    "gG" 'ycmd-goto-imprecise)
+  (add-hook 'c-mode-hook 'ycmd-mode)
+  (spacemacs/set-leader-keys-for-major-mode 'c-mode
     "gg" 'ycmd-goto
     "gG" 'ycmd-goto-imprecise))