diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index a4ee9b755..2ded20e2e 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -47,11 +47,29 @@ endif
 grub_emu_LDFLAGS = $(LIBCURSES)
 
 ifeq ($(enable_grub_emu_usb), yes)
+pkglib_MODULES += libusb.mod
+libusb_mod_SOURCES = util/usb.c
+libusb_mod_CFLAGS = 
+libusb_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For usb.mod
 pkglib_MODULES += usb.mod
-usb_mod_SOURCES = disk/usbms.c util/usb.c bus/usb/usb.c	\
-		commands/usbtest.c
+usb_mod_SOURCES = bus/usb/usb.c
 usb_mod_CFLAGS = $(COMMON_CFLAGS)
 usb_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For usbtest.mod
+pkglib_MODULES += usbtest.mod
+usbtest_mod_SOURCES = commands/usbtest.c
+usbtest_mod_CFLAGS = $(COMMON_CFLAGS)
+usbtest_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For usbms.mod
+pkglib_MODULES += usbms.mod
+usbms_mod_SOURCES = disk/usbms.c
+usbms_mod_CFLAGS = $(COMMON_CFLAGS)
+usbms_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 grub_emu_LDFLAGS += $(LIBUSB)
 endif