arch/stm32/stm32.h: do not include stm32_usbdev.h if not supported

arch/arm/src/stm32/stm32.h

@@ -57,7 +57,9 @@
 #include "stm32_i2s.h"
 #include "stm32_tim.h"
 #include "stm32_uart.h"
-#include "stm32_usbdev.h"
+#if defined(CONFIG_USBDEV) && defined(CONFIG_STM32_USB)
+#  include "stm32_usbdev.h"
+#endif
 #include "stm32_wdg.h"
 #include "stm32_lowputc.h"
 #include "stm32_eth.h"

arch/arm/src/stm32/stm32_otgfs.h

@@ -26,11 +26,10 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
+#include <nuttx/usb/usbdev.h>
 
 #include <stdint.h>
 
-#include "stm32.h"
-
 #include "hardware/stm32fxxxxx_otgfs.h"
 
 #if defined(CONFIG_STM32_OTGFS)

arch/arm/src/stm32/stm32_otgfsdev.c

@@ -47,6 +47,7 @@
 #include "chip.h"
 #include "arm_internal.h"
 #include "stm32_otgfs.h"
+#include "stm32_rcc.h"
 
 #if defined(CONFIG_USBDEV) && (defined(CONFIG_STM32_OTGFS))
 /****************************************************************************

arch/arm/src/stm32/stm32_otghs.h

@@ -26,10 +26,10 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
+#include <nuttx/usb/usbdev.h>
 
 #include <stdint.h>
 
-#include "stm32.h"
 #include "hardware/stm32_otghs.h"
 
 #if defined(CONFIG_STM32_OTGHS)

arch/arm/src/stm32/stm32_otghsdev.c

@@ -47,6 +47,7 @@
 #include "chip.h"
 #include "arm_internal.h"
 #include "stm32_otghs.h"
+#include "stm32_rcc.h"
 
 #if defined(CONFIG_USBDEV) && (defined(CONFIG_STM32_OTGHS))
 

boards/arm/stm32/clicker2-stm32/src/stm32_usb.c

@@ -30,6 +30,7 @@
 #include <debug.h>
 
 #include "stm32_otgfs.h"
+#include "stm32_gpio.h"
 #include "clicker2-stm32.h"
 
 #ifdef CONFIG_STM32_OTGFS