diff --git a/configs/nucleo-l452re/src/stm32_adc.c b/configs/nucleo-l452re/src/stm32_adc.c
index dde6eb3618..ce54c0c9bd 100644
--- a/configs/nucleo-l452re/src/stm32_adc.c
+++ b/configs/nucleo-l452re/src/stm32_adc.c
@@ -50,12 +50,13 @@
 #include <nuttx/fs/fs.h>
 #include <nuttx/analog/adc.h>
 #include <nuttx/analog/ioctl.h>
-#include <arch/board/board.h>
 
 #include "stm32l4_gpio.h"
 #include "stm32l4_adc.h"
 #include "nucleo-l452re.h"
 
+#include <arch/board/board.h>
+
 /************************************************************************************
  * Pre-processor Definitions
  ************************************************************************************/
diff --git a/configs/nucleo-l452re/src/stm32_appinit.c b/configs/nucleo-l452re/src/stm32_appinit.c
index 2a3ba3c518..ff3e604781 100644
--- a/configs/nucleo-l452re/src/stm32_appinit.c
+++ b/configs/nucleo-l452re/src/stm32_appinit.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * config/nucleo-l452re/src/stm32_appinit.c
  *
- *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2017-2018 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *           Alan Carvalho de Assis <acassis@gmail.com>
  *
@@ -42,10 +42,10 @@
 
 #include <stdint.h>
 
-#include <nuttx/board.h>
-
 #include "nucleo-l452re.h"
 
+#include <nuttx/board.h>
+
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
diff --git a/configs/nucleo-l452re/src/stm32_autoleds.c b/configs/nucleo-l452re/src/stm32_autoleds.c
index 197478aeaa..4ae01a45be 100644
--- a/configs/nucleo-l452re/src/stm32_autoleds.c
+++ b/configs/nucleo-l452re/src/stm32_autoleds.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/nucleo-l452re/src/stm32_autoleds.c
  *
- *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2017-2018 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,6 @@
 #include <debug.h>
 
 #include <nuttx/board.h>
-#include <arch/board/board.h>
 
 #include "chip.h"
 #include "up_arch.h"
@@ -52,6 +51,8 @@
 #include "stm32l4_gpio.h"
 #include "nucleo-l452re.h"
 
+#include <arch/board/board.h>
+
 #ifdef CONFIG_ARCH_LEDS
 
 /****************************************************************************
diff --git a/configs/nucleo-l452re/src/stm32_boot.c b/configs/nucleo-l452re/src/stm32_boot.c
index 182a51df27..b119833f5e 100644
--- a/configs/nucleo-l452re/src/stm32_boot.c
+++ b/configs/nucleo-l452re/src/stm32_boot.c
@@ -1,7 +1,7 @@
 /************************************************************************************
  * configs/nucleo-l452re/src/stm32_boot.c
  *
- *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2017-2018 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *           Alan Carvalho de Assis <acassis@gmail.com>
  *
@@ -43,11 +43,12 @@
 #include <debug.h>
 
 #include <nuttx/board.h>
-#include <arch/board/board.h>
 
 #include "up_arch.h"
 #include "nucleo-l452re.h"
 
+#include <arch/board/board.h>
+
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
diff --git a/configs/nucleo-l452re/src/stm32_bringup.c b/configs/nucleo-l452re/src/stm32_bringup.c
index 571a15fa0c..65cca4abaa 100644
--- a/configs/nucleo-l452re/src/stm32_bringup.c
+++ b/configs/nucleo-l452re/src/stm32_bringup.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * config/nucleo-l452re/src/stm32_bringup.c
  *
- *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2017-2018 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -48,11 +48,11 @@
 #include <nuttx/leds/userled.h>
 #include <nuttx/board.h>
 
-#include <arch/board/board.h>
-
 #include "stm32l4_i2c.h"
 #include "nucleo-l452re.h"
 
+#include <arch/board/board.h>
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
diff --git a/configs/nucleo-l452re/src/stm32_buttons.c b/configs/nucleo-l452re/src/stm32_buttons.c
index 1d48c1f4a6..569585fc4d 100644
--- a/configs/nucleo-l452re/src/stm32_buttons.c
+++ b/configs/nucleo-l452re/src/stm32_buttons.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/nucleo-l452re/src/stm32_buttons.c
  *
- *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2017-2018 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45,11 +45,12 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/board.h>
-#include <arch/board/board.h>
 
 #include "stm32l4_gpio.h"
 #include "nucleo-l452re.h"
 
+#include <arch/board/board.h>
+
 #ifdef CONFIG_ARCH_BUTTONS
 
 /****************************************************************************
diff --git a/configs/nucleo-l452re/src/stm32_dac.c b/configs/nucleo-l452re/src/stm32_dac.c
index 9a259bb7e0..e4307b9256 100644
--- a/configs/nucleo-l452re/src/stm32_dac.c
+++ b/configs/nucleo-l452re/src/stm32_dac.c
@@ -43,11 +43,13 @@
 
 #include <nuttx/board.h>
 #include <nuttx/analog/dac.h>
-#include <arch/board/board.h>
+
 #include "stm32l4_gpio.h"
 #include "stm32l4_dac.h"
 #include "nucleo-l452re.h"
 
+#include <arch/board/board.h>
+
 /************************************************************************************
  * Private Data
  ************************************************************************************/
diff --git a/configs/nucleo-l452re/src/stm32_spi.c b/configs/nucleo-l452re/src/stm32_spi.c
index 7330f7e5dd..70c0642452 100644
--- a/configs/nucleo-l452re/src/stm32_spi.c
+++ b/configs/nucleo-l452re/src/stm32_spi.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/nucleo-l452re/src/stm32_spi.c
  *
- *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2014, 2018 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -45,7 +45,6 @@
 #include <errno.h>
 
 #include <nuttx/spi/spi.h>
-#include <arch/board/board.h>
 
 #include <up_arch.h>
 #include <chip.h>
@@ -53,6 +52,8 @@
 
 #include "nucleo-l452re.h"
 
+#include <arch/board/board.h>
+
 #if defined(CONFIG_STM32L4_SPI1) || defined(CONFIG_STM32L4_SPI2) || defined(CONFIG_STM32L4_SPI3)
 
 /************************************************************************************
diff --git a/configs/nucleo-l452re/src/stm32_userleds.c b/configs/nucleo-l452re/src/stm32_userleds.c
index 4ed1b8d807..7fa72ab906 100644
--- a/configs/nucleo-l452re/src/stm32_userleds.c
+++ b/configs/nucleo-l452re/src/stm32_userleds.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/nucleo-l452re/src/stm32_userleds.c
  *
- *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2017-2018 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,7 +43,6 @@
 #include <stdbool.h>
 #include <debug.h>
 
-#include <arch/board/board.h>
 #include <nuttx/power/pm.h>
 
 #include "chip.h"
@@ -52,6 +51,8 @@
 #include "stm32l4_gpio.h"
 #include "nucleo-l452re.h"
 
+#include <arch/board/board.h>
+
 #ifndef CONFIG_ARCH_LEDS
 
 /****************************************************************************