Add some missing includes, so we do not have implicit function
declarations.

OK miod@ stsp@

A test for a corner-case that some pmaps get wrong.