Removing import to Cordova/CDVPlugin.h and adding Cordova/CDV.h instead
Restoring clobbers to EmailComposer