diff --git a/boards/arm/stm32f7/nucleo-144/include/board.h b/boards/arm/stm32f7/nucleo-144/include/board.h
index a6b680aca4..355afa11f7 100644
--- a/boards/arm/stm32f7/nucleo-144/include/board.h
+++ b/boards/arm/stm32f7/nucleo-144/include/board.h
@@ -1,11 +1,11 @@
 /****************************************************************************
  * boards/arm/stm32f7/nucleo-144/include/board.h
  *
- *   Copyright (C) 2016-2017 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2016-2017, 2019 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
- *           Mark Olsson <post@markolsson.se>
- *           David Sidrane <david_s5@nscdg.com>
- *           Bob Feretich <bob.feretich@rafresearch.com>
+ *            Mark Olsson <post@markolsson.se>
+ *            David Sidrane <david_s5@nscdg.com>
+ *            Bob Feretich <bob.feretich@rafresearch.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -49,12 +49,7 @@
 # include <stdint.h>
 #endif
 
-#ifdef __KERNEL__
-#include "stm32_rcc.h"
-#ifdef CONFIG_STM32F7_SDMMC1
-#  include "stm32_sdmmc.h"
-#endif
-#endif
+/* Do not include STM32 F7 header files here */
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/boards/arm/stm32f7/stm32f746-ws/include/board.h b/boards/arm/stm32f7/stm32f746-ws/include/board.h
index b135ff98aa..f0aa42831d 100644
--- a/boards/arm/stm32f7/stm32f746-ws/include/board.h
+++ b/boards/arm/stm32f7/stm32f746-ws/include/board.h
@@ -1,9 +1,9 @@
 /****************************************************************************
  * boards/arm/stm32f7/stm32f746-ws/include/board.h
  *
- *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2016, 2019 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
- *   Author: Mark Olsson <post@markolsson.se>
+ *           Mark Olsson <post@markolsson.se>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -47,12 +47,7 @@
 # include <stdint.h>
 #endif
 
-#ifdef __KERNEL__
-#include "stm32_rcc.h"
-#ifdef CONFIG_STM32F7_SDMMC1
-#  include "stm32_sdmmc.h"
-#endif
-#endif
+/* Do not include STM32 F7 header files here */
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/boards/arm/stm32f7/stm32f746g-disco/include/board.h b/boards/arm/stm32f7/stm32f746g-disco/include/board.h
index 0cd0e9ba1a..0abb51f7fa 100644
--- a/boards/arm/stm32f7/stm32f746g-disco/include/board.h
+++ b/boards/arm/stm32f7/stm32f746g-disco/include/board.h
@@ -46,6 +46,8 @@
 # include <stdint.h>
 #endif
 
+/* No not include STM32 F7 header files here. */
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_bringup.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_bringup.c
index 55bce20828..2b528c56b3 100644
--- a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_bringup.c
+++ b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_bringup.c
@@ -139,5 +139,6 @@ int stm32_bringup(void)
     }
 #endif
 
+  UNUSED(ret);  /* May not be used */
   return OK;
 }
diff --git a/boards/arm/stm32f7/stm32f769i-disco/include/board.h b/boards/arm/stm32f7/stm32f769i-disco/include/board.h
index baa44a080a..f1db48cdca 100644
--- a/boards/arm/stm32f7/stm32f769i-disco/include/board.h
+++ b/boards/arm/stm32f7/stm32f769i-disco/include/board.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * boards/arm/stm32f7/stm32f769i-disco/include/board.h
  *
- *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2015, 2019 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -46,10 +46,7 @@
 # include <stdint.h>
 #endif
 
-#include "stm32_rcc.h"
-#if defined(CONFIG_STM32F7_SDMMC1) || defined(CONFIG_STM32F7_SDMMC2)
-#  include "stm32_sdmmc.h"
-#endif
+/* Do not include STM32F7 header files here */
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/boards/arm/stm32h7/nucleo-h743zi/include/board.h b/boards/arm/stm32h7/nucleo-h743zi/include/board.h
index f05d67ff73..6cd2593428 100644
--- a/boards/arm/stm32h7/nucleo-h743zi/include/board.h
+++ b/boards/arm/stm32h7/nucleo-h743zi/include/board.h
@@ -48,6 +48,8 @@
 # include <stdint.h>
 #endif
 
+/* Do not include STM32 H7 header files here */
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/