smatch.h: shuffle some declarations around