Fix inclusion of header file; Avoid zipping