window: Change ordering of functions to match wayland branch

... and also change some unused public functions to be statics.