remove header includes that are no longer necessary