move more things to gtk-app.h, so both versions can share