Clean up header and add C++-friendly linkage
Reformed CDFLIB header