diff --git a/Makefile.vex.am b/Makefile.vex.am
index 419a5804e..a7b959306 100644
--- a/Makefile.vex.am
+++ b/Makefile.vex.am
@@ -26,6 +26,7 @@ pkginclude_HEADERS = \
 	pub/libvex_guest_arm.h \
 	pub/libvex_guest_s390x.h \
 	pub/libvex_guest_mips32.h \
+	pub/libvex_guest_mips64.h \
 	pub/libvex_s390x_common.h \
 	pub/libvex_ir.h \
 	pub/libvex_trc_values.h
@@ -71,7 +72,8 @@ pub/libvex_guest_offsets.h: auxprogs/genoffsets.c \
 			    pub/libvex_guest_ppc64.h \
 			    pub/libvex_guest_arm.h \
 			    pub/libvex_guest_s390x.h \
-			    pub/libvex_guest_mips32.h
+			    pub/libvex_guest_mips32.h \
+			    pub/libvex_guest_mips64.h
 	rm -f auxprogs/genoffsets.s
 	$(CC) $(CFLAGS) \
 	      $(LIBVEX_CFLAGS) \
diff --git a/configure.in b/configure.in
index 58dc221e3..9b1c70203 100644
--- a/configure.in
+++ b/configure.in
@@ -2661,6 +2661,7 @@ AC_CONFIG_FILES([
    coregrind/Makefile 
    memcheck/Makefile
    memcheck/tests/Makefile
+   memcheck/tests/common/Makefile
    memcheck/tests/amd64/Makefile
    memcheck/tests/x86/Makefile
    memcheck/tests/linux/Makefile
diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index c96ac965b..8d114f1e9 100644
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -204,6 +204,9 @@ noinst_HEADERS = \
 	m_debuginfo/priv_readelf.h	\
 	m_debuginfo/priv_readmacho.h	\
 	m_debuginfo/priv_image.h	\
+	m_debuginfo/lzoconf.h		\
+	m_debuginfo/lzodefs.h		\
+	m_debuginfo/minilzo.h		\
 	m_demangle/ansidecl.h	\
 	m_demangle/cp-demangle.h \
 	m_demangle/dyn-string.h	\
@@ -298,6 +301,7 @@ COREGRIND_SOURCES_COMMON = \
 	m_debuginfo/storage.c \
 	m_debuginfo/tytypes.c \
 	m_debuginfo/image.c \
+	m_debuginfo/minilzo-inl.c \
 	m_demangle/cp-demangle.c \
 	m_demangle/cplus-dem.c \
 	m_demangle/demangle.c \
diff --git a/include/Makefile.am b/include/Makefile.am
index f05916502..c584283ab 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -68,4 +68,13 @@ nobase_pkginclude_HEADERS = \
 	vki/vki-scnums-mips64-linux.h	\
 	vki/vki-scnums-darwin.h         \
 	vki/vki-xen.h                   \
+	vki/vki-xen-domctl.h		\
+	vki/vki-xen-evtchn.h		\
+	vki/vki-xen-gnttab.h		\
+	vki/vki-xen-hvm.h		\
+	vki/vki-xen-memory.h		\
+	vki/vki-xen-mmuext.h		\
+	vki/vki-xen-sysctl.h		\
+	vki/vki-xen-version.h		\
+	vki/vki-xen-x86.h		\
 	vki/vki-linux-drm.h