r22016: Try and fix the build - move things out of proto.h