diff --git a/include/Kyoto/Streams/CZipSupport.hpp b/include/Kyoto/Streams/CZipSupport.hpp
new file mode 100644
index 00000000..e419f6a5
--- /dev/null
+++ b/include/Kyoto/Streams/CZipSupport.hpp
@@ -0,0 +1,13 @@
+#ifndef _CZIPSUPPORT
+#define _CZIPSUPPORT
+
+#include "rstl/single_ptr.hpp"
+#include <types.h>
+
+class CZipSupport {
+public:
+  static void * Alloc(void* ptr, uint w1, uint w2);
+  static void Free(void*, void*);
+};
+
+#endif // _CZIPSUPPORT
diff --git a/include/zlib/zlib.h b/include/zlib/zlib.h
index 86d8e5cb..d945d77b 100644
--- a/include/zlib/zlib.h
+++ b/include/zlib/zlib.h
@@ -28,8 +28,8 @@
   (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
 */
 
-#ifndef _ZLIB
-#define _ZLIB
+#ifndef _ZLIB_H
+#define _ZLIB_H
 
 #include "zconf.h"
 
@@ -890,4 +890,4 @@ ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
 }
 #endif
 
-#endif // _ZLIB
+#endif /* _ZLIB_H */