Make header self-contained