Moved more GDI definitions to gdi_private.h.