fix some obscure header type size/alignment issues