Remove more header includes