Moved a bunch of definitions from gdi.h into a new gdi_private.h to