diff --git a/Makefile.tools b/Makefile.tools
index 57a918f..cd0d20c 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -140,15 +140,11 @@ tools_sdptool_LDADD = lib/libbluetooth-internal.la @GLIB_LIBS@
 tools_ciptool_LDADD = lib/libbluetooth-internal.la
 
 tools_bccmd_SOURCES = tools/bccmd.c tools/csr.h tools/csr.c \
-			tools/csr_hci.c tools/csr_h4.c tools/csr_3wire.c \
+			tools/csr_hci.c tools/csr_usb.c \
+			tools/csr_h4.c tools/csr_3wire.c \
 			tools/csr_bcsp.c tools/ubcsp.h tools/ubcsp.c
 tools_bccmd_LDADD = lib/libbluetooth-internal.la
 
-if USB
-tools_bccmd_SOURCES += tools/csr_usb.c
-tools_bccmd_LDADD += @USB_LIBS@
-endif
-
 dist_man_MANS += tools/hciattach.1 tools/hciconfig.1 \
 			tools/hcitool.1 tools/hcidump.1 \
 			tools/rfcomm.1 tools/rctest.1 tools/l2ping.1 \
diff --git a/configure.ac b/configure.ac
index d93a006..0814e90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,15 +123,6 @@ if (test "${enable_tools}" != "no" && test "${enable_usb}" != "no"  ); then
 			AC_MSG_ERROR(USB library support is required))
 	AC_SUBST(USB_CFLAGS)
 	AC_SUBST(USB_LIBS)
-	AC_CHECK_LIB(usb, usb_get_busses, dummy=yes,
-		AC_DEFINE(NEED_USB_GET_BUSSES, 1,
-			[Define to 1 if you need the usb_get_busses() function.]
-))
-	AC_CHECK_LIB(usb, usb_interrupt_read, dummy=yes,
-		AC_DEFINE(NEED_USB_INTERRUPT_READ, 1,
-			[Define to 1 if you need the usb_interrupt_read() functi
-on.]))
-	AC_DEFINE(HAVE_LIBUSB, 1, [Define to 1 if you have USB library.])
 fi
 AM_CONDITIONAL(USB, test "${enable_usb}" != "no")