Mostly get rid of including "Globals.h"