Cleanup of common.gypi inclusion.
Don't clobber root namespace with GDI stuff from windows.h.