Fix some header files being marked as C++