diff --git a/activemq-cpp/src/main/Makefile.am b/activemq-cpp/src/main/Makefile.am
index 15a64eb..ea4b141 100644
--- a/activemq-cpp/src/main/Makefile.am
+++ b/activemq-cpp/src/main/Makefile.am
@@ -588,20 +588,6 @@ cc_sources = \
     decaf/internal/util/concurrent/SynchronizableImpl.cpp \
     decaf/internal/util/concurrent/unix/ConditionImpl.cpp \
     decaf/internal/util/concurrent/unix/MutexImpl.cpp \
-    decaf/internal/util/zip/adler32.c \
-    decaf/internal/util/zip/crc32.c \
-    decaf/internal/util/zip/deflate.c \
-    decaf/internal/util/zip/gzclose.c \
-    decaf/internal/util/zip/gzlib.c \
-    decaf/internal/util/zip/gzread.c \
-    decaf/internal/util/zip/gzwrite.c \
-    decaf/internal/util/zip/infback.c \
-    decaf/internal/util/zip/inffast.c \
-    decaf/internal/util/zip/inflate.c \
-    decaf/internal/util/zip/inftrees.c \
-    decaf/internal/util/zip/trees.c \
-    decaf/internal/util/zip/uncompr.c \
-    decaf/internal/util/zip/zutil.c \
     decaf/io/BlockingByteArrayInputStream.cpp \
     decaf/io/BufferedInputStream.cpp \
     decaf/io/BufferedOutputStream.cpp \
@@ -1354,17 +1340,6 @@ h_sources = \
     decaf/internal/util/concurrent/unix/MutexHandle.h \
     decaf/internal/util/concurrent/windows/ConditionHandle.h \
     decaf/internal/util/concurrent/windows/MutexHandle.h \
-    decaf/internal/util/zip/crc32.h \
-    decaf/internal/util/zip/deflate.h \
-    decaf/internal/util/zip/gzguts.h \
-    decaf/internal/util/zip/inffast.h \
-    decaf/internal/util/zip/inffixed.h \
-    decaf/internal/util/zip/inflate.h \
-    decaf/internal/util/zip/inftrees.h \
-    decaf/internal/util/zip/trees.h \
-    decaf/internal/util/zip/zconf.h \
-    decaf/internal/util/zip/zlib.h \
-    decaf/internal/util/zip/zutil.h \
     decaf/io/BlockingByteArrayInputStream.h \
     decaf/io/BufferedInputStream.h \
     decaf/io/BufferedOutputStream.h \
@@ -1602,7 +1577,7 @@ lib_LTLIBRARIES= libactivemq-cpp.la
 libactivemq_cpp_la_SOURCES= $(h_sources) $(cc_sources)
 libactivemq_cpp_la_CXXFLAGS= $(AMQ_CXXFLAGS)
 libactivemq_cpp_la_LDFLAGS= -version-info $(ACTIVEMQ_LIBRARY_VERSION)
-libactivemq_cpp_la_LIBADD= $(AMQ_LIBS)
+libactivemq_cpp_la_LIBADD= $(AMQ_LIBS) -lz
 
 ##
 ## Packaging Info
diff --git a/activemq-cpp/src/main/decaf/util/zip/Adler32.cpp b/activemq-cpp/src/main/decaf/util/zip/Adler32.cpp
index 071bbc2..7676744 100644
--- a/activemq-cpp/src/main/decaf/util/zip/Adler32.cpp
+++ b/activemq-cpp/src/main/decaf/util/zip/Adler32.cpp
@@ -17,7 +17,7 @@
 
 #include "Adler32.h"
 
-#include <decaf/internal/util/zip/zlib.h>
+#include <zlib.h>
 
 using namespace decaf;
 using namespace decaf::lang;
diff --git a/activemq-cpp/src/main/decaf/util/zip/CRC32.cpp b/activemq-cpp/src/main/decaf/util/zip/CRC32.cpp
index 1a8c5c4..b4f9e96 100644
--- a/activemq-cpp/src/main/decaf/util/zip/CRC32.cpp
+++ b/activemq-cpp/src/main/decaf/util/zip/CRC32.cpp
@@ -17,7 +17,7 @@
 
 #include "CRC32.h"
 
-#include <decaf/internal/util/zip/zlib.h>
+#include <zlib.h>
 
 using namespace decaf;
 using namespace decaf::lang;
diff --git a/activemq-cpp/src/main/decaf/util/zip/Deflater.cpp b/activemq-cpp/src/main/decaf/util/zip/Deflater.cpp
index 5036f85..62677e4 100644
--- a/activemq-cpp/src/main/decaf/util/zip/Deflater.cpp
+++ b/activemq-cpp/src/main/decaf/util/zip/Deflater.cpp
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include <decaf/internal/util/zip/zlib.h>
+#include <zlib.h>
 #include <decaf/lang/exceptions/RuntimeException.h>
 
 using namespace decaf;
diff --git a/activemq-cpp/src/main/decaf/util/zip/Inflater.cpp b/activemq-cpp/src/main/decaf/util/zip/Inflater.cpp
index 965ab10..2e4d0ac 100644
--- a/activemq-cpp/src/main/decaf/util/zip/Inflater.cpp
+++ b/activemq-cpp/src/main/decaf/util/zip/Inflater.cpp
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include <decaf/internal/util/zip/zlib.h>
+#include <zlib.h>
 
 #include <decaf/lang/exceptions/RuntimeException.h>
 
