diff -u -r u4-unbundle/src/Makefile.common u4/src/Makefile.common
--- u4-unbundle/src/Makefile.common	2012-03-18 06:32:01.000000000 -0500
+++ u4/src/Makefile.common	2015-02-22 15:23:52.420625704 -0600
@@ -6,7 +6,6 @@
 CSRCS=\
         lzw/hash.c \
         lzw/lzw.c \
-        unzip.c \
         $(NULL)
 
 CXXSRCS=\
diff -u -r u4/src/Makefile.unbundle u4/src/Makefile
--- u4/src/Makefile.unbundle    2010-12-13 16:50:58.000000000 -0600
+++ u4/src/Makefile     2011-03-29 20:23:10.861965251 -0500
@@ -15,7 +15,7 @@ FEATURES=-DHAVE_BACKTRACE=1 -DHAVE_VARIA
 DEBUGCXXFLAGS=-ggdb1 -rdynamic -g -O0 -fno-inline -fno-eliminate-unused-debug-types -gstabs -g3
 CXXFLAGS=$(FEATURES) -Wall -I. $(UIFLAGS) $(shell xml2-config --cflags) -DICON_FILE=\"$(datadir)/pixmaps/u4.bmp\" -DVERSION=\"$(VERSIO
 CFLAGS=$(CXXFLAGS)
-LIBS=$(UILIBS) $(shell xml2-config --libs) -lpng -lz
+LIBS=$(UILIBS) $(shell xml2-config --libs) -lpng -lz $(EXTRALIBS)
 INSTALL=install

 ifeq ($(STATIC_GCC_LIBS),true)
diff -u -r u4-unbundle/src/u4file.cpp u4/src/u4file.cpp
--- u4-unbundle/src/u4file.cpp	2015-02-22 15:22:38.738442217 -0600
+++ u4/src/u4file.cpp	2015-02-22 15:28:54.605175840 -0600
@@ -5,9 +5,9 @@
 #include <cctype>
 #include <cstring>
 #include <cstdlib>
+#include <unzip.h>
 
 #include "u4file.h"
-#include "unzip.h"
 #include "debug.h"
 #ifdef MACOSX
 #include <libgen.h>