Add support for including kid in header.