Partial resolution
The redefined error seems to have been eliminated by exclusion of fit_pcm.c file from build (in CCS, right click on file and marked as exclude from build). Believe the error was occurring because there were actually two copies of the code being compiled, the fit_pcm.c itself AND the code in fit_product.c due to the #include fit_pcm.c