Header files in swig/include/swig are used by swig to build the wrapper without the protobuf stuff. It's time to adjust the native C++ header and use them directly.