Re-adding declspec stuff