Fix more header defines