std::unordered_map for non-perf critical debug code
iwyu
clean up tuple includes
fwd declare layer