Removed unnecessary extern declarations
Removed ExportWrapper.h in favor of -DEXPORT= in Cmakelists.txt