C++: More accurately report declaring header

Determine more accurately which header a declaration belongs to:
 * Identify "closest" imported header
 * Use manual mapping to disambiguate

Author: lcartey