diff --git a/vimfiles.stefan/after/ftdetect/c.vim b/vimfiles.stefan/after/ftdetect/c.vim
index 7a2033c..e5d9572 100644
--- a/vimfiles.stefan/after/ftdetect/c.vim
+++ b/vimfiles.stefan/after/ftdetect/c.vim
@@ -1,6 +1,7 @@
-autocmd BufRead,BufNewFile /usr/include/*/*   setlocal filetype=c
-autocmd BufRead,BufNewFile *.d   setlocal filetype=c
-autocmd BufRead,BufNewFile *.dat setlocal filetype=c
-autocmd BufRead,BufNewFile *.i   setlocal filetype=c
-autocmd BufRead,BufNewFile *.h.merge*   setlocal filetype=c
-autocmd BufRead,BufNewFile *.c.merge*   setlocal filetype=c
+autocmd BufRead,BufNewFile /usr/include/*/*   setlocal filetype=cpp
+autocmd BufRead,BufNewFile *.d   setlocal filetype=cpp
+autocmd BufRead,BufNewFile *.dat setlocal filetype=cpp
+autocmd BufRead,BufNewFile *.i   setlocal filetype=cpp
+autocmd BufRead,BufNewFile *.h   setlocal filetype=cpp
+autocmd BufRead,BufNewFile *.h.merge*   setlocal filetype=cpp
+autocmd BufRead,BufNewFile *.c.merge*   setlocal filetype=cpp
diff --git a/vimfiles.stefan/after/ftplugin/c.vim b/vimfiles.stefan/after/ftplugin/cpp.vim
similarity index 97%
rename from vimfiles.stefan/after/ftplugin/c.vim
rename to vimfiles.stefan/after/ftplugin/cpp.vim
index 93b1e90..a2e4e3d 100644
--- a/vimfiles.stefan/after/ftplugin/c.vim
+++ b/vimfiles.stefan/after/ftplugin/cpp.vim
@@ -51,7 +51,7 @@ let g:doxygen_javadoc_autobrief = 0
 let b:GrepFiles = '*.c *.h'
 
 " matchit.vim
-let b:match_words = b:match_words . ',\<lint\s\+-save\>:\<lint\s\+-restore\>'
+" let b:match_words = b:match_words . ',\<lint\s\+-save\>:\<lint\s\+-restore\>'
 
 " Adding spaces where needed
 " --------------------------