[sanitizer] Rename 2 files *.h->*.inc as appropriate.

Also add a missing include.
[asan] kill some dead code