Add support for multiple cxx header paths