Fix compilation with ICU after introduction of gdi_private.h.