More globals.h cleanup