fixed linking error and corrected #includes.