diff --git a/Cask b/Cask
index 6b0dd01d9..5567af546 100644
--- a/Cask
+++ b/Cask
@@ -124,16 +124,17 @@
 (depends-on "company-sourcekit")
 
 ;; C/C++ -- modules/module-cc.el
-(depends-on "disaster")
-(depends-on "cmake-mode")
-(depends-on "glsl-mode")
-(depends-on "cuda-mode")
-;; (depends-on "company-c-headers")
 (depends-on "irony")
 (depends-on "irony-eldoc")
 (depends-on "flycheck-irony")
 (depends-on "company-irony")
 (depends-on "company-irony-c-headers")
+(depends-on "disaster")
+(depends-on "cmake-mode")
+(depends-on "glsl-mode")
+(depends-on "cuda-mode")
+(depends-on "opencl-mode")
+(depends-on "demangle-mode")
 
 ;; Crystal -- modules/module-crystal.el
 (depends-on "crystal-mode" :git "https://github.com/jpellerin/emacs-crystal-mode")
diff --git a/modules/module-cc.el b/modules/module-cc.el
index 4ee8d4eea..f82b6c573 100644
--- a/modules/module-cc.el
+++ b/modules/module-cc.el
@@ -66,11 +66,18 @@
 (use-package cmake-mode
   :mode "CMakeLists\\.txt$"
   :config (def-company-backend! cmake-mode (cmake yasnippet)))
+
 (use-package company-cmake :after cmake-mode)
 
 (use-package glsl-mode :mode ("\\.glsl\\'" "\\.vert\\'" "\\.frag\\'" "\\.geom\\'"))
 
 (use-package cuda-mode :mode "\\.cuh?$")
 
+(use-package opencl-mode :mode "\\.cl$")
+
+(use-package demangle-mode
+  :commands demangle-mode
+  :init (add-hook 'llvm-mode-hook 'demangle-mode))
+
 (provide 'module-cc)
 ;;; module-cc.el ends here