Fix the declarations of ncm-ccm and ncm-cdp.
Fix the declarations of ncm-ccm and ncm-cdp.

brunocanning/release,jrha/release,jrha/release,wdpypere/release,quattor/release,brunocanning/release,jouvin/release,brunocanning/release,stdweird/release,stdweird/release,quattor/release,quattor/release,wdpypere/release,jrha/release,wdpypere/release,jouvin/release,jouvin/release