r12696: Reduce the size of include/structs.h