Proper support for c/c++ function/class highlighting