diff --git a/src/config/config.c b/src/config/config.c
index 187244b14..e89b0a9a4 100644
--- a/src/config/config.c
+++ b/src/config/config.c
@@ -303,9 +303,6 @@ REQUIRE_OBJECT ( shim_cmd );
 #ifdef IMAGE_CRYPT_CMD
 REQUIRE_OBJECT ( image_crypt_cmd );
 #endif
-#ifdef USB_CMD
-REQUIRE_OBJECT ( usb_cmd );
-#endif
 #ifdef FDT_CMD
 REQUIRE_OBJECT ( fdt_cmd );
 #endif
diff --git a/src/config/config_usb.c b/src/config/config_usb.c
index b3fd412e9..2d88944bd 100644
--- a/src/config/config_usb.c
+++ b/src/config/config_usb.c
@@ -22,6 +22,7 @@
 FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 FILE_SECBOOT ( PERMITTED );
 
+#include <config/general.h>
 #include <config/usb.h>
 #include <config/settings.h>
 
@@ -72,3 +73,10 @@ REQUIRE_OBJECT ( efi_usb );
 #ifdef USB_SETTINGS
 REQUIRE_OBJECT ( usb_settings );
 #endif
+
+/*
+ * Drag in USB commands
+ */
+#ifdef USB_CMD
+REQUIRE_OBJECT ( usb_cmd );
+#endif