Redeclaring NSMutableSet

Is there a workaround for the following code:
typedef CCSet NSMutableSet; in CCSet.h

This redeclares NSMutableSet. Any other instance of NSMutableSet outside cocos2d throws an ambiguous namespace error. For example, this conflicts with the latest release (2.15) of Open Feint which wants to use Foundation’s NSMutableSet. Currently removing this is a feature request under Issues (from 2 months ago) with no planned timeline on resolution. Can this be moved to a bug request?

Sorry, we forgot to delete this.
#951 is created for it.

This also conflits when integrating the latest iOS Facebook SDK.