A few improvements towards getting check to pass.
Rename .hh -> .h.