Fix more headers.