Merge Fix code highlighting for C files and C++ headers.

Closes #584