diff --git a/system/composite/composite.h b/system/composite/composite.h
index 338bc65d4..299c931cd 100644
--- a/system/composite/composite.h
+++ b/system/composite/composite.h
@@ -65,14 +65,6 @@
 #  error "USB CDC/ACM serial composite device support is not enabled (CONFIG_CDCACM_COMPOSITE)"
 #endif
 
-#ifndef CONFIG_USBMSC
-#  error "USB mass storage device support is not enabled (CONFIG_USBMSC)"
-#endif
-
-#ifndef CONFIG_USBMSC_COMPOSITE
-#  error "USB mass storage composite device support is not enabled (CONFIG_USBMSC_COMPOSITE)"
-#endif
-
 /* Add-on Mass Storagte Class default values */
 
 #ifndef CONFIG_SYSTEM_COMPOSITE_NLUNS
diff --git a/system/composite/composite_main.c b/system/composite/composite_main.c
index e2e97794e..d3d9d9277 100644
--- a/system/composite/composite_main.c
+++ b/system/composite/composite_main.c
@@ -52,7 +52,6 @@
 #include <nuttx/usb/usbdev.h>
 #include <nuttx/usb/composite.h>
 #include <nuttx/usb/cdcacm.h>
-#include <nuttx/usb/usbmsc.h>
 #include <nuttx/usb/usbdev_trace.h>
 
 #include "composite.h"