More clean-up
Switch from OBJC_EXPORT (in objc-api.h) to FOUNDATION_EXPORT (in Foundation.h)