diff --git a/configs/mcu123-lpc214x/composite/defconfig b/configs/mcu123-lpc214x/composite/defconfig
index 0775e5506c..73dc78cdf4 100644
--- a/configs/mcu123-lpc214x/composite/defconfig
+++ b/configs/mcu123-lpc214x/composite/defconfig
@@ -51,11 +51,8 @@ CONFIG_USBDEV=y
 CONFIG_USBMSC_BULKINREQLEN=256
 CONFIG_USBMSC_BULKOUTREQLEN=256
 CONFIG_USBMSC_COMPOSITE=y
-CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBMSC_EPBULKOUT=4
 CONFIG_USBMSC_NRDREQS=2
 CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
 CONFIG_USBMSC_REMOVABLE=y
 CONFIG_USBMSC_VERSIONNO=0x0399
 CONFIG_USBMSC=y
diff --git a/configs/mcu123-lpc214x/src/lpc2148_composite.c b/configs/mcu123-lpc214x/src/lpc2148_composite.c
index 582006850f..8b966edcd6 100644
--- a/configs/mcu123-lpc214x/src/lpc2148_composite.c
+++ b/configs/mcu123-lpc214x/src/lpc2148_composite.c
@@ -97,6 +97,7 @@
  *
  ************************************************************************************/
 
+#ifdef CONFIG_USBMSC_COMPOSITE
 static int board_mscclassobject(int minor, FAR struct usbdev_description_s *devdesc,
                                 FAR struct usbdevclass_driver_s **classdev)
 {
@@ -111,6 +112,7 @@ static int board_mscclassobject(int minor, FAR struct usbdev_description_s *devd
 
   return ret;
 }
+#endif
 
 /************************************************************************************
  * Name: board_mscuninitialize
@@ -129,10 +131,12 @@ static int board_mscclassobject(int minor, FAR struct usbdev_description_s *devd
  *
  ************************************************************************************/
 
+#ifdef CONFIG_USBMSC_COMPOSITE
 void board_mscuninitialize(FAR struct usbdevclass_driver_s *classdev)
 {
   usbmsc_uninitialize(classdev);
 }
+#endif
 
 /****************************************************************************
  * Public Functions
diff --git a/configs/olimexino-stm32/composite/defconfig b/configs/olimexino-stm32/composite/defconfig
index 529767834b..f8fe9eca0e 100644
--- a/configs/olimexino-stm32/composite/defconfig
+++ b/configs/olimexino-stm32/composite/defconfig
@@ -134,8 +134,6 @@ CONFIG_USART2_RXBUFSIZE=32
 CONFIG_USART2_TXBUFSIZE=32
 CONFIG_USBDEV_COMPOSITE=y
 CONFIG_USBMSC_COMPOSITE=y
-CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBMSC_EPBULKOUT=4
 CONFIG_USBMSC_NRDREQS=2
 CONFIG_USBMSC_NWRREQS=2
 CONFIG_USBMSC_REMOVABLE=y
diff --git a/configs/olimexino-stm32/src/stm32_composite.c b/configs/olimexino-stm32/src/stm32_composite.c
index 31dbf2e19b..47c57202d6 100644
--- a/configs/olimexino-stm32/src/stm32_composite.c
+++ b/configs/olimexino-stm32/src/stm32_composite.c
@@ -108,6 +108,7 @@
  *
  ************************************************************************************/
 
+#ifdef CONFIG_USBMSC_COMPOSITE
 static int board_mscclassobject(int minor, FAR struct usbdev_description_s *devdesc,
                                 FAR struct usbdevclass_driver_s **classdev)
 {
@@ -122,8 +123,9 @@ static int board_mscclassobject(int minor, FAR struct usbdev_description_s *devd
 
   return ret;
 }
+#endif
 
- /************************************************************************************
+/************************************************************************************
  * Name: board_mscuninitialize
  *
  * Description:
@@ -140,10 +142,12 @@ static int board_mscclassobject(int minor, FAR struct usbdev_description_s *devd
  *
  ************************************************************************************/
 
+#ifdef CONFIG_USBMSC_COMPOSITE
 void board_mscuninitialize(FAR struct usbdevclass_driver_s *classdev)
 {
   usbmsc_uninitialize(classdev);
 }
+#endif
 
 /****************************************************************************
  * Public Functions
diff --git a/configs/samv71-xult/src/sam_composite.c b/configs/samv71-xult/src/sam_composite.c
index e6f1ebfe81..672ca2260c 100644
--- a/configs/samv71-xult/src/sam_composite.c
+++ b/configs/samv71-xult/src/sam_composite.c
@@ -76,6 +76,7 @@
  *
  ************************************************************************************/
 
+#ifdef CONFIG_USBMSC_COMPOSITE
 static int board_mscclassobject(int minor, FAR struct usbdev_description_s *devdesc,
                                 FAR struct usbdevclass_driver_s **classdev)
 {
@@ -90,8 +91,9 @@ static int board_mscclassobject(int minor, FAR struct usbdev_description_s *devd
 
   return ret;
 }
+#endif
 
- /************************************************************************************
+/************************************************************************************
  * Name: board_mscuninitialize
  *
  * Description:
@@ -108,10 +110,12 @@ static int board_mscclassobject(int minor, FAR struct usbdev_description_s *devd
  *
  ************************************************************************************/
 
+#ifdef CONFIG_USBMSC_COMPOSITE
 void board_mscuninitialize(FAR struct usbdevclass_driver_s *classdev)
 {
   usbmsc_uninitialize(classdev);
 }
+#endif
 
 /****************************************************************************
  * Public Functions
diff --git a/configs/spark/composite/defconfig b/configs/spark/composite/defconfig
index daa5c9d842..9b3ae29625 100644
--- a/configs/spark/composite/defconfig
+++ b/configs/spark/composite/defconfig
@@ -110,8 +110,6 @@ CONFIG_USBDEV_COMPOSITE=y
 CONFIG_USBDEV_TRACE_NRECORDS=32
 CONFIG_USBDEV_TRACE=y
 CONFIG_USBMSC_COMPOSITE=y
-CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBMSC_EPBULKOUT=4
 CONFIG_USBMSC_NRDREQS=2
 CONFIG_USBMSC_NWRREQS=2
 CONFIG_USBMSC_SCSI_STACKSIZE=340
diff --git a/configs/stm3210e-eval/composite/defconfig b/configs/stm3210e-eval/composite/defconfig
index 9053356f75..c39ea0632d 100644
--- a/configs/stm3210e-eval/composite/defconfig
+++ b/configs/stm3210e-eval/composite/defconfig
@@ -58,11 +58,8 @@ CONFIG_USBDEV_COMPOSITE=y
 CONFIG_USBMSC_BULKINREQLEN=256
 CONFIG_USBMSC_BULKOUTREQLEN=256
 CONFIG_USBMSC_COMPOSITE=y
-CONFIG_USBMSC_EPBULKIN=5
-CONFIG_USBMSC_EPBULKOUT=4
 CONFIG_USBMSC_NRDREQS=2
 CONFIG_USBMSC_NWRREQS=2
-CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
 CONFIG_USBMSC_REMOVABLE=y
 CONFIG_USBMSC_VERSIONNO=0x0399
 CONFIG_USBMSC=y
diff --git a/configs/stm3210e-eval/src/stm32_composite.c b/configs/stm3210e-eval/src/stm32_composite.c
index 1c2f39b26d..4e446c1585 100644
--- a/configs/stm3210e-eval/src/stm32_composite.c
+++ b/configs/stm3210e-eval/src/stm32_composite.c
@@ -106,6 +106,7 @@
  *
  ************************************************************************************/
 
+#ifdef CONFIG_USBMSC_COMPOSITE
 static int board_mscclassobject(int minor, FAR struct usbdev_description_s *devdesc,
                                 FAR struct usbdevclass_driver_s **classdev)
 {
@@ -120,8 +121,9 @@ static int board_mscclassobject(int minor, FAR struct usbdev_description_s *devd
 
   return ret;
 }
+#endif
 
- /************************************************************************************
+/************************************************************************************
  * Name: board_mscuninitialize
  *
  * Description:
@@ -138,10 +140,12 @@ static int board_mscclassobject(int minor, FAR struct usbdev_description_s *devd
  *
  ************************************************************************************/
 
+#ifdef CONFIG_USBMSC_COMPOSITE
 void board_mscuninitialize(FAR struct usbdevclass_driver_s *classdev)
 {
   usbmsc_uninitialize(classdev);
 }
+#endif
 
 /****************************************************************************
  * Public Functions