Fix a few symbols in EXTRA_EXPORT I thought we stopped doing this, but that's for a separate thread.