r13924: Split more prototypes out of include/proto.h + initial work on header