Given the #ifdef mess, perhaps bridge should have the hooks available independent of the configuration.