allow local header overrides

Change-Id: Id51395f1a386e7188db41a00a51c263f683f5b8e