diff --git a/Makefile.am b/Makefile.am
index 27b6027..2c9490f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -426,7 +426,8 @@ unit_test_hog_LDADD = src/libshared-glib.la \
 
 unit_tests += unit/test-gattrib
 
-unit_test_gattrib_SOURCES = unit/test-gattrib.c attrib/gattrib.c $(btio_sources) src/log.h src/log.c
+unit_test_gattrib_SOURCES = unit/test-gattrib.c attrib/gattrib.c \
+					$(btio_sources) src/log.h src/log.c
 unit_test_gattrib_LDADD = lib/libbluetooth-internal.la \
 			src/libshared-glib.la \
 			@GLIB_LIBS@ @DBUS_LIBS@ -ldl -lrt
@@ -474,7 +475,6 @@ EXTRA_DIST += $(manual_pages:.1=.txt)
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-datafiles --enable-library \
 						--enable-health \
-						--enable-mesh \
 						--enable-midi \
 						--enable-manpages \
 						--enable-android \
diff --git a/Makefile.tools b/Makefile.tools
index 59f3076..9106c1a 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -69,8 +69,7 @@ endif
 if LOGGER
 libexec_PROGRAMS += tools/btmon-logger
 
-tools_btmon_logger_SOURCES = tools/btmon-logger.c src/systemd.c src/systemd.h \
-				lib/monitor.h
+tools_btmon_logger_SOURCES = tools/btmon-logger.c src/systemd.c src/systemd.h
 tools_btmon_logger_LDADD = src/libshared-mainloop.la
 tools_btmon_logger_DEPENDENCIES = src/libshared-mainloop.la \
 					tools/bluetooth-logger.service