Make globals and goal source files more friendly to VS2013 compiler