Added support for C/C++ includes by unique name as well as relative path.