- au BufEnter *.h let b:fswitchdst = 'c'
- au BufEnter *.h let b:fswitchlocs = 'reg:|include.*|source|'
- au BufEnter *.c let b:fswitchdst = 'h'
- au BufEnter *.c let b:fswitchlocs = 'reg:|source|include/**|'
+ au!
+ au BufEnter *.h let b:fswitchdst = 'c,cpp,cxx'
+ au BufEnter *.h let b:fswitchlocs = '.,reg:|include.*|src|'
+ au BufEnter *.c let b:fswitchdst = 'h'
+ au BufEnter *.c let b:fswitchlocs = 'reg:|source|include/**|'