Add remaining header checks to be used in subsequent patches.