fixed rdf, reduced header dependencies, cigar-npt compiling