Include some forgotted headers

(it SEGVed in amd64 because of that)