Remove debug code and add definitions and include directories.
Remove debug code and add definitions and include directories.

iauns/cpm,SteffenL/cpm,iauns/cpm,CIBC-Internal/cpm,CIBC-Internal/cpm,SteffenL/cpm