extra: shuffle smatch_extra.h around some more