diff --git a/syntax_checkers/c/cppcheck.vim b/syntax_checkers/c/cppcheck.vim
index ce187553..a028e451 100644
--- a/syntax_checkers/c/cppcheck.vim
+++ b/syntax_checkers/c/cppcheck.vim
@@ -28,6 +28,10 @@ endif
 let s:save_cpo = &cpo
 set cpo&vim
 
+function! SyntaxCheckers_c_cppcheck_Preprocess(errors)
+    return map(copy(a:errors), 'substitute(v:val, ''\v^\[[^]]+\]\zs( -\> \[[^]]+\])+\ze:'', "", "")')
+endfunction
+
 function! SyntaxCheckers_c_cppcheck_GetLocList() dict
     let makeprg = self.makeprgBuild({
         \ 'args': syntastic#c#ReadConfig(g:syntastic_cppcheck_config_file),
@@ -46,6 +50,7 @@ function! SyntaxCheckers_c_cppcheck_GetLocList() dict
     let loclist = SyntasticMake({
         \ 'makeprg': makeprg,
         \ 'errorformat': errorformat,
+        \ 'preprocess': 'SyntaxCheckers_c_cppcheck_Preprocess',
         \ 'returns': [0] })
 
     for e in loclist
diff --git a/syntax_checkers/cpp/cppcheck.vim b/syntax_checkers/cpp/cppcheck.vim
index 4dbc2d4d..b4b9d344 100644
--- a/syntax_checkers/cpp/cppcheck.vim
+++ b/syntax_checkers/cpp/cppcheck.vim
@@ -21,48 +21,11 @@ if exists("g:loaded_syntastic_cpp_cppcheck_checker")
 endif
 let g:loaded_syntastic_cpp_cppcheck_checker = 1
 
-if !exists('g:syntastic_cppcheck_config_file')
-    let g:syntastic_cppcheck_config_file = '.syntastic_cppcheck_config'
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function! SyntaxCheckers_cpp_cppcheck_GetLocList() dict
-    let makeprg = self.makeprgBuild({
-        \ 'args': syntastic#c#ReadConfig(g:syntastic_cppcheck_config_file),
-        \ 'args_after': '-q --enable=style' })
-
-    let errorformat =
-        \ '[%f:%l]: (%trror) %m,' .
-        \ '[%f:%l]: (%tarning) %m,' .
-        \ '[%f:%l]: (%ttyle) %m,' .
-        \ '[%f:%l]: (%terformance) %m,' .
-        \ '[%f:%l]: (%tortability) %m,' .
-        \ '[%f:%l]: (%tnformation) %m,' .
-        \ '[%f:%l]: (%tnconclusive) %m,' .
-        \ '%-G%.%#'
-
-    let loclist = SyntasticMake({
-        \ 'makeprg': makeprg,
-        \ 'errorformat': errorformat,
-        \ 'returns': [0] })
-
-    for e in loclist
-        if e['type'] =~? '\m^[SPI]'
-            let e['type'] = 'w'
-            let e['subtype'] = 'Style'
-        endif
-    endfor
-
-    return loclist
-endfunction
+runtime! syntax_checkers/c/*.vim
 
 call g:SyntasticRegistry.CreateAndRegisterChecker({
     \ 'filetype': 'cpp',
-    \ 'name': 'cppcheck'})
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
+    \ 'name': 'cppcheck',
+    \ 'redirect': 'c/cppcheck'})
 
 " vim: set et sts=4 sw=4: