remove more deprecated headers

as they create lots of warnings