DEBUG disabled, cc and header fixes
CCP-header fix.