Remove some needless includes