One more fix to headers.