Removed some file includes