Fix NextStep build problems with globals.h introducion.