Also remove the unused Buf1, Buf2 and Usize tokens.
Using https://github.com/google/oss-fuzz on .c files says: clang-7.0: warning: treating 'c' input as 'c++' when in C++ mode, this behavior is deprecated [-Wdeprecated]