diff --git a/arch/arm/src/lpc17xx/lpc17_allocateheap.c b/arch/arm/src/lpc17xx/lpc17_allocateheap.c
index 620b46a8e57..c49ceed36cd 100644
--- a/arch/arm/src/lpc17xx/lpc17_allocateheap.c
+++ b/arch/arm/src/lpc17xx/lpc17_allocateheap.c
@@ -43,7 +43,7 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/mm.h>
+#include <nuttx/kmalloc.h>
 #include <arch/board/board.h>
 
 #include "chip.h"
diff --git a/arch/z16/src/common/up_initialize.c b/arch/z16/src/common/up_initialize.c
index f06d8ff243b..5c5e5099951 100644
--- a/arch/z16/src/common/up_initialize.c
+++ b/arch/z16/src/common/up_initialize.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * common/up_initialize.c
+ * arch/z16/src/common/up_initialize.c
  *
  *   Copyright (C) 2008-2009, 2011-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -43,24 +43,17 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/fs/fs.h>
-#include <nuttx/mm.h>
 #include <nuttx/ramlog.h>
 
 #include <arch/board/board.h>
 
+#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
  * Definitions
  ****************************************************************************/
 
-/* Define to enable timing loop calibration.  CONFIG_DEBUG and
- * CONFIG_ARCH_LOWPUTC must also be enabled in the .config file because
- * the logic uses lldbg()
- */
-
-#undef CONFIG_ARCH_CALIBRATION
-
 /****************************************************************************
  * Public Data
  ****************************************************************************/
@@ -94,7 +87,7 @@ volatile FAR chipreg_t *current_regs;
  *
  ****************************************************************************/
 
-#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG) && defined(CONFIG_ARCH_LOWPUTC)
+#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG)
 static void up_calibratedelay(void)
 {
   int i;
@@ -140,7 +133,7 @@ void up_initialize(void)
 
   up_calibratedelay();
 
-  /* Add extra memory fragments to the memory manager */
+  /* Add any extra memory fragments to the memory manager */
 
 #if CONFIG_MM_REGIONS > 1
   up_addregion();
diff --git a/arch/z80/src/common/up_initialize.c b/arch/z80/src/common/up_initialize.c
index c7b7bdb22f7..a5623a63a31 100644
--- a/arch/z80/src/common/up_initialize.c
+++ b/arch/z80/src/common/up_initialize.c
@@ -43,32 +43,21 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/fs/fs.h>
-#include <nuttx/mm.h>
+
 #include <arch/board/board.h>
 
 #include "chip/switch.h"
+#include "up_arch.h"
 #include "up_internal.h"
 
 /****************************************************************************
- * Definitions
- ****************************************************************************/
-
-/* Define to enable timing loop calibration */
-
-#undef CONFIG_ARCH_CALIBRATION
-
-/****************************************************************************
- * Public Data
+ * Pre-processor Definitions
  ****************************************************************************/
 
 /****************************************************************************
  * Private Types
  ****************************************************************************/
 
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -83,7 +72,7 @@
  *
  ****************************************************************************/
 
-#if defined(CONFIG_ARCH_CALIBRATION) & defined(CONFIG_DEBUG)
+#if defined(CONFIG_ARCH_CALIBRATION) && defined(CONFIG_DEBUG)
 static void up_calibratedelay(void)
 {
   int i;
@@ -129,7 +118,7 @@ void up_initialize(void)
 
   up_calibratedelay();
 
-  /* Add extra memory fragments to the memory manager */
+  /* Add any extra memory fragments to the memory manager */
 
 #if CONFIG_MM_REGIONS > 1
   up_addregion();