Stop using deprecated headers
Most things were already ported away, only that nobody realized they weren't used.