Updated to reflect new zipfor.h