Revert multiple cxx header paths support