added CPPSource and HeaderSourcePair