Revert "gdi/bcm: Remove static struct"