remove more header conflicts