break dependency on utils/ZipEntry.h and utils/ZipFile.h
6 files changed