Clean up includes in DiscIO as much as possible. Also turned a long iterator declaration in VolumeDirectory.cpp to using auto in order to shorten it.
