Remove some #includes which were not necessary