diff --git a/arch/arm/src/kinetis/chip/kinetis_k60memorymap.h b/arch/arm/src/kinetis/chip/kinetis_k60memorymap.h
index 8b00303ef7b..135da475536 100644
--- a/arch/arm/src/kinetis/chip/kinetis_k60memorymap.h
+++ b/arch/arm/src/kinetis/chip/kinetis_k60memorymap.h
@@ -44,7 +44,7 @@
 
 #include "chip.h"
 
-#ifdef KINETIS_K64
+#ifdef KINETIS_K60
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -192,5 +192,5 @@
  * Public Functions
  ************************************************************************************/
 
-#endif /* KINETIS_K64 */
+#endif /* KINETIS_K60 */
 #endif /* __ARCH_ARM_SRC_KINETIS_CHIP_KINETIS_K60MEMORYMAP_H */
diff --git a/arch/arm/src/kinetis/kinetis_clockconfig.c b/arch/arm/src/kinetis/kinetis_clockconfig.c
index 2f703ea96e7..7d3d6ecb22a 100644
--- a/arch/arm/src/kinetis/kinetis_clockconfig.c
+++ b/arch/arm/src/kinetis/kinetis_clockconfig.c
@@ -39,8 +39,6 @@
 
 #include <nuttx/config.h>
 
-#include <arch/board/board.h>
-
 #include "up_arch.h"
 
 #include "kinetis.h"
@@ -50,6 +48,8 @@
 #include "chip/kinetis_llwu.h"
 #include "chip/kinetis_pinmux.h"
 
+#include <arch/board/board.h>
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/