Improve header dependency.

This change doesn't directly affect the current repo. I made it because
in another repo I have a functional version of dbgcheck that requires
it. I do plan to pull in the functional version of dbgcheck for stronger
unit tests eventually.