comments fixup
fix implicit header inclusions