Code cleanup, sort includes in global.h