diff --git a/tools/quick_dump/Makefile.am b/tools/quick_dump/Makefile.am
index 89ac5202..b183af5c 100644
--- a/tools/quick_dump/Makefile.am
+++ b/tools/quick_dump/Makefile.am
@@ -6,15 +6,14 @@ dist_bin_SCRIPTS = quick_dump.py reg_access.py
 bin_SCRIPTS = chipset.py
 
 lib_LTLIBRARIES = I915ChipsetPython.la
-I915ChipsetPython_la_LDFLAGS = -module -avoid-version $(PYTHON_LDFLAGS) $(PCIACCESS_LIBS)
-I915ChipsetPython_la_SOURCES = chipset_wrap_python.c chipset_macro_wrap.c \
-			       $(top_srcdir)/lib/igt_core.c  \
-			       $(top_srcdir)/lib/igt_debugfs.c  \
-			       $(top_srcdir)/lib/intel_os.c  \
-			       $(top_srcdir)/lib/intel_chipset.c  \
-			       $(top_srcdir)/lib/intel_reg_map.c  \
-			       $(top_srcdir)/lib/intel_mmio.c  \
-			       $(top_srcdir)/lib/intel_iosf.c
+I915ChipsetPython_la_LDFLAGS = -module -avoid-version $(PYTHON_LDFLAGS)
+I915ChipsetPython_la_SOURCES = chipset_wrap_python.c chipset_macro_wrap.c
+I915ChipsetPython_la_LIBADD =			\
+	$(top_builddir)/lib/libintel_tools.la	\
+	$(PCIACCESS_LIBS)			\
+	$(DRM_LIBS)				\
+	$(CAIRO_LIBS)				\
+	$(NULL)
 
 chipset_wrap_python.c chipset.py: chipset.i
 	$(AM_V_GEN)$(SWIG) $(AX_SWIG_PYTHON_OPT) -I/usr/include -I$(top_srcdir)/lib -o $@ $<
diff --git a/tools/quick_dump/chipset_macro_wrap.c b/tools/quick_dump/chipset_macro_wrap.c
index 8bba9f71..862281e2 100644
--- a/tools/quick_dump/chipset_macro_wrap.c
+++ b/tools/quick_dump/chipset_macro_wrap.c
@@ -38,15 +38,3 @@ unsigned short pcidev_to_devid(struct pci_device *pdev)
 {
 	return pdev->device_id;
 }
-
-bool igt_check_boolean_env_var(const char *env_var, bool default_value)
-{
-	char *val;
-
-	val = getenv(env_var);
-	if (!val)
-		return default_value;
-
-	return atoi(val) != 0;
-}
-