An incomplete attempt at rationalising the non-Posix/ANSI header files, required by a fresh Zlib and Libpng implementation