Add a missing #include
Update our copy of ZLIB to 1.2.8