Remove some unused #includes