diff --git a/hardware/arduino/sam/system/libsam/chip.h b/hardware/arduino/sam/system/libsam/chip.h
index 5414dc727..d557371f5 100644
--- a/hardware/arduino/sam/system/libsam/chip.h
+++ b/hardware/arduino/sam/system/libsam/chip.h
@@ -54,5 +54,10 @@
 #include "include/wdt.h"
 
 #include "include/timetick.h"
+#include "include/USB_driver.h"
+
+#if SAM3XA_SERIES
+#include "include/uotghs.h"
+#endif /* SAM3XA_SERIES */
 
 #endif /* _LIB_SAM_ */
diff --git a/hardware/arduino/sam/system/libsam/source/uotghs.c b/hardware/arduino/sam/system/libsam/source/uotghs.c
index f0594143b..5052f0207 100644
--- a/hardware/arduino/sam/system/libsam/source/uotghs.c
+++ b/hardware/arduino/sam/system/libsam/source/uotghs.c
@@ -20,8 +20,5 @@
 
 #if SAM3XA_SERIES
 
-#include "USB_driver.h"
-#include "uotghs.h"
-
 
 #endif /* SAM3XA_SERIES */