--- Makefile.orig	2018-01-29 18:01:01.000000000 -0700
+++ Makefile	2018-02-01 20:02:43.820439769 -0700
@@ -19,7 +19,7 @@ MODULES := \
 	src/map/mapper src/map/mio src/map/super src/map/if \
 	src/map/amap src/map/cov src/map/scl src/map/mpm \
 	src/misc/extra src/misc/mvc src/misc/st src/misc/util src/misc/nm \
-	src/misc/vec src/misc/hash src/misc/tim src/misc/bzlib src/misc/zlib \
+	src/misc/vec src/misc/hash src/misc/tim \
 	src/misc/mem src/misc/bar src/misc/bbl src/misc/parse \
 	src/opt/cut src/opt/fxu src/opt/fxch src/opt/rwr src/opt/mfs src/opt/sim \
 	src/opt/ret src/opt/fret src/opt/res src/opt/lpk src/opt/nwk src/opt/rwt \
@@ -118,7 +118,7 @@ endif
 endif
 
 # LIBS := -ldl -lrt
-LIBS += -ldl -lm
+LIBS += -Wl,--as-needed -lbz2 -lz -ldl -lm
 ifneq ($(findstring Darwin, $(shell uname)), Darwin)
    LIBS += -lrt
 endif
--- src/base/io/ioReadAiger.c.orig	2018-01-29 18:01:01.000000000 -0700
+++ src/base/io/ioReadAiger.c	2018-02-01 20:02:43.831439743 -0700
@@ -26,8 +26,8 @@
 #include <string.h>
 #include <assert.h>
 
-#include "misc/bzlib/bzlib.h"
-#include "misc/zlib/zlib.h"
+#include <bzlib.h>
+#include <zlib.h>
 #include "ioAbc.h"
 
 ABC_NAMESPACE_IMPL_START
--- src/base/io/ioReadBlifMv.c.orig	2018-01-29 18:01:01.000000000 -0700
+++ src/base/io/ioReadBlifMv.c	2018-02-01 20:02:43.832439741 -0700
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "misc/zlib/zlib.h"
-#include "misc/bzlib/bzlib.h"
+#include <zlib.h>
+#include <bzlib.h>
 #include "base/abc/abc.h"
 #include "misc/vec/vecPtr.h"
 #include "ioAbc.h"
--- src/base/io/ioWriteAiger.c.orig	2018-01-29 18:01:01.000000000 -0700
+++ src/base/io/ioWriteAiger.c	2018-02-01 20:02:43.832439741 -0700
@@ -26,8 +26,8 @@
 #include <string.h>
 #include <assert.h>
 
-#include "misc/bzlib/bzlib.h"
-#include "misc/zlib/zlib.h"
+#include <bzlib.h>
+#include <zlib.h>
 #include "ioAbc.h"
 
 
--- src/sat/bsat2/MainSat.cpp.orig	2018-01-29 18:01:01.000000000 -0700
+++ src/sat/bsat2/MainSat.cpp	2018-02-01 20:49:39.712648983 -0700
@@ -21,7 +21,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
 #include <errno.h>
 
 #include <signal.h>
-#include "misc/zlib/zlib.h"
+#include <zlib.h>
 
 #include "System.h"
 #include "ParseUtils.h"
--- src/sat/bsat2/MainSimp.cpp.orig	2018-01-29 18:01:01.000000000 -0700
+++ src/sat/bsat2/MainSimp.cpp	2018-02-01 20:49:18.648712089 -0700
@@ -21,10 +21,10 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
 #include <errno.h>
 
 #include <signal.h>
-#include "misc/zlib/zlib.h"
-
+#include <zlib.h>
+
 #ifndef _WIN32
-#include <sys/resource.h>
+#include <sys/resource.h>
 #endif
 
 #include "System.h"
--- src/sat/bsat2/ParseUtils.h.orig	2018-01-29 18:01:01.000000000 -0700
+++ src/sat/bsat2/ParseUtils.h	2018-02-01 20:48:48.095803623 -0700
@@ -24,7 +24,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "misc/zlib/zlib.h"
+#include <zlib.h>
 
 namespace Minisat {
 
--- src/sat/cnf/cnfMan.c.orig	2018-01-29 18:01:01.000000000 -0700
+++ src/sat/cnf/cnfMan.c	2018-02-01 20:02:43.833439738 -0700
@@ -21,7 +21,7 @@
 #include "cnf.h"
 #include "sat/bsat/satSolver.h"
 #include "sat/bsat/satSolver2.h"
-#include "misc/zlib/zlib.h"
+#include <zlib.h>
 
 ABC_NAMESPACE_IMPL_START
 
--- src/sat/glucose/ParseUtils.h.orig	2018-01-29 18:01:01.000000000 -0700
+++ src/sat/glucose/ParseUtils.h	2018-02-01 20:48:26.407868600 -0700
@@ -25,7 +25,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR
 #include <stdio.h>
 #include <math.h>
 
-#include "misc/zlib/zlib.h"
+#include <zlib.h>
 
 ABC_NAMESPACE_CXX_HEADER_START