Stricter header double-inclusion protection