Some header changes for slightly improved compile times.