diff --git a/Makefile.tools b/Makefile.tools
index 7c942a3..6d767d5 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -53,10 +53,11 @@ emulator_btvirt_SOURCES = emulator/main.c monitor/bt.h \
 emulator_b1ee_SOURCES = emulator/b1ee.c monitor/mainloop.h monitor/mainloop.c
 
 tools_3dsp_SOURCES = tools/3dsp.c monitor/bt.h \
-					monitor/mainloop.h monitor/mainloop.c \
-					src/shared/util.h src/shared/util.c \
-					src/shared/queue.h src/shared/queue.c \
-					src/shared/hci.h src/shared/hci.c
+				monitor/mainloop.h monitor/mainloop.c \
+				src/shared/io.h src/shared/io-mainloop.c \
+				src/shared/hci.h src/shared/hci.c \
+				src/shared/util.h src/shared/util.c \
+				src/shared/queue.h src/shared/queue.c
 
 tools_mgmt_tester_SOURCES = tools/mgmt-tester.c monitor/bt.h \
 				emulator/btdev.h emulator/btdev.c \
@@ -234,9 +235,10 @@ tools_btmgmt_LDADD = lib/libbluetooth-internal.la @GLIB_LIBS@
 
 tools_btinfo_SOURCES = tools/btinfo.c monitor/bt.h \
 				monitor/mainloop.h monitor/mainloop.c \
+				src/shared/io.h src/shared/io-mainloop.c \
+				src/shared/hci.h src/shared/hci.c \
 				src/shared/util.h src/shared/util.c \
-				src/shared/queue.h src/shared/queue.c \
-				src/shared/hci.h src/shared/hci.c
+				src/shared/queue.h src/shared/queue.c
 
 tools_btsnoop_SOURCES = tools/btsnoop.c \
 				src/shared/pcap.h src/shared/pcap.c \