diff --git a/configs/stm32butterfly2/src/stm32_butterfly2.h b/configs/stm32butterfly2/src/stm32_butterfly2.h
index 20d43a06dc..d1e498e8cd 100644
--- a/configs/stm32butterfly2/src/stm32_butterfly2.h
+++ b/configs/stm32butterfly2/src/stm32_butterfly2.h
@@ -32,8 +32,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  ****************************************************************************/
 
-#ifndef __CONFIGS_STM32_BUTTERFLY2_SRC_STM32_BUTTERFLY2_H 1
-#define __CONFIGS_STM32_BUTTERFLY2_SRC_STM32_BUTTERFLY2_H
+#ifndef __CONFIGS_STM32_BUTTERFLY2_SRC_STM32_BUTTERFLY2_H
+#define __CONFIGS_STM32_BUTTERFLY2_SRC_STM32_BUTTERFLY2_H 1
 
 /*****************************************************************************
  * Included Files
diff --git a/configs/stm32butterfly2/src/stm32_usbhost.c b/configs/stm32butterfly2/src/stm32_usbhost.c
index d7c7c13e81..dfb8d0c4eb 100644
--- a/configs/stm32butterfly2/src/stm32_usbhost.c
+++ b/configs/stm32butterfly2/src/stm32_usbhost.c
@@ -56,7 +56,11 @@
  ****************************************************************************/
 
 #ifndef CONFIG_STM32_OTGFS
-#error "CONFIG_USBHOST requires CONFIG_STM32_OTGFS to be enabled"
+#  error "CONFIG_USBHOST requires CONFIG_STM32_OTGFS to be enabled"
+#endif
+
+#ifdef CONFIG_USBDEV
+#  error "CONFIG_USBHOST cannot be set alongside CONFIG_USBDEV"
 #endif
 
 /*****************************************************************************