diff --git a/configs/samv71-xult/src/sam_composite.c b/configs/samv71-xult/src/sam_composite.c
index 2e0f1dcea74..81fdfbcc900 100644
--- a/configs/samv71-xult/src/sam_composite.c
+++ b/configs/samv71-xult/src/sam_composite.c
@@ -38,6 +38,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
+#include <sys/types.h>
 
 #include <nuttx/usb/composite.h>
 
diff --git a/configs/samv71-xult/src/sam_usbmsc.c b/configs/samv71-xult/src/sam_usbmsc.c
index c3fc23411f4..4e8258fa68e 100644
--- a/configs/samv71-xult/src/sam_usbmsc.c
+++ b/configs/samv71-xult/src/sam_usbmsc.c
@@ -45,7 +45,7 @@
 
 #include "samv71-xult.h"
 
-#if defined(CONFIG_USBMSC) && !defined(CONFIG_USBMSC_COMPOSITE)
+#if defined(CONFIG_USBMSC)
 
 /****************************************************************************
  * Public Functions