more include reordering, add GlobalPrefs.[cpp|h]