Remove some unneeded includes