diff -rupN apitrace-5.0/common/trace_file_zlib.cpp apitrace-5.0-new/common/trace_file_zlib.cpp
--- apitrace-5.0/common/trace_file_zlib.cpp	2014-05-03 00:22:02.000000000 +0200
+++ apitrace-5.0-new/common/trace_file_zlib.cpp	2014-05-13 18:31:56.866095617 +0200
@@ -31,7 +31,6 @@
 #include <string.h>
 
 #include <zlib.h>
-#include <gzguts.h>
 
 // for lseek
 #ifdef _WIN32
@@ -44,7 +43,7 @@
 #include "os.hpp"
 
 #include <iostream>
-
+#include <cstdio>
 
 using namespace trace;
 
@@ -70,6 +69,7 @@ protected:
 private:
     gzFile m_gzFile;
     double m_endOffset;
+	int raw_fd;
 };
 
 ZLibFile::ZLibFile(const std::string &filename,
@@ -86,18 +86,23 @@ ZLibFile::~ZLibFile()
 
 bool ZLibFile::rawOpen(const std::string &filename, File::Mode mode)
 {
-    m_gzFile = gzopen(filename.c_str(),
-                      (mode == File::Write) ? "wb" : "rb");
+    FILE *file = fopen(filename.c_str(),
+                       (mode == File::Write) ? "wb" : "rb") ;
+    if (file == NULL)
+        return false;
+
+    raw_fd = fileno(file);
+    m_gzFile = gzdopen(raw_fd,
+                       (mode == File::Write) ? "wb" : "rb");
 
     if (mode == File::Read && m_gzFile) {
         //XXX: unfortunately zlib doesn't support
         //     SEEK_END or we could've done:
         //m_endOffset = gzseek(m_gzFile, 0, SEEK_END);
         //gzrewind(m_gzFile);
-        gz_state *state = (gz_state *)m_gzFile;
-        off_t loc = lseek(state->fd, 0, SEEK_CUR);
-        m_endOffset = lseek(state->fd, 0, SEEK_END);
-        lseek(state->fd, loc, SEEK_SET);
+        off_t loc = lseek(raw_fd, 0, SEEK_CUR);
+        m_endOffset = lseek(raw_fd, 0, SEEK_END);
+        lseek(raw_fd, loc, SEEK_SET);
     }
 
     return m_gzFile != NULL;
@@ -149,8 +154,7 @@ bool ZLibFile::rawSkip(size_t)
 
 int ZLibFile::rawPercentRead()
 {
-    gz_state *state = (gz_state *)m_gzFile;
-    return int(100 * (lseek(state->fd, 0, SEEK_CUR) / m_endOffset));
+    return 100 * (lseek(raw_fd, 0, SEEK_CUR) / m_endOffset);
 }