Fix function prototypes
Merge branch 'ncn-devel' into dinglist-cleanup