This avoids compiler warnings when consuming the headers from C++. (cherry picked from commit 7381a2b072)
7381a2b072