More consistent header define