diff --git a/arch/arm/src/arm/up_allocpage.c b/arch/arm/src/arm/up_allocpage.c
index 499edc9da01..383de23b7d2 100755
--- a/arch/arm/src/arm/up_allocpage.c
+++ b/arch/arm/src/arm/up_allocpage.c
@@ -40,6 +40,7 @@
 
 #include <nuttx/config.h>
 
+#include <errno.h>
 #include <debug.h>
 
 #include <nuttx/sched.h>
@@ -105,7 +106,7 @@
  *
  ****************************************************************************/
 
-int up_allocpage(FAR _TCB *tcb, FAR void **vpage);
+int up_allocpage(FAR _TCB *tcb, FAR void **vpage)
 {
 # warning "Not implemented"
   return -ENOSYS;
diff --git a/arch/arm/src/arm/up_dataabort.c b/arch/arm/src/arm/up_dataabort.c
index b58e80a6c77..52a595d6d11 100644
--- a/arch/arm/src/arm/up_dataabort.c
+++ b/arch/arm/src/arm/up_dataabort.c
@@ -47,6 +47,11 @@
 #include "os_internal.h"
 #include "up_internal.h"
 
+#ifdef CONFIG_PAGING
+#  include <nuttx/page.h>
+#  include "arm.h"
+#endif
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
@@ -139,7 +144,7 @@ void up_dataabort(uint32_t *regs, uint32_t far, uint32_t fsr)
    * prefetch and data aborts.
    */
 
-  tcb->far = regs[REG_R15];
+  tcb->xcp.far = regs[REG_R15];
 
   /* Call pg_miss() to schedule the page fill.  A consequences of this
    * call are:
diff --git a/arch/arm/src/arm/up_prefetchabort.c b/arch/arm/src/arm/up_prefetchabort.c
index 91ada0436e4..3572165b8e9 100644
--- a/arch/arm/src/arm/up_prefetchabort.c
+++ b/arch/arm/src/arm/up_prefetchabort.c
@@ -127,7 +127,7 @@ void up_prefetchabort(uint32_t *regs)
        */
 
       FAR _TCB *tcb = (FAR _TCB *)g_readytorun.head;
-      tcb->far      = regs[REG_R15];
+      tcb->xcp.far  = regs[REG_R15];
 
       /* Call pg_miss() to schedule the page fill.  A consequences of this
        * call are:
diff --git a/arch/arm/src/lpc313x/Make.defs b/arch/arm/src/lpc313x/Make.defs
index 66435f5b885..ebe96f38a3c 100755
--- a/arch/arm/src/lpc313x/Make.defs
+++ b/arch/arm/src/lpc313x/Make.defs
@@ -47,7 +47,7 @@ CMN_CSRCS	= up_assert.c up_blocktask.c up_copystate.c up_createstack.c \
 		  up_undefinedinsn.c up_usestack.c
 
 ifeq ($(CONFIG_PAGING),y)
-CMN_CSRCS	+= up_pginitialize.c up_checkpaging.c up_allocpage.c
+CMN_CSRCS	+= up_pginitialize.c up_checkmapping.c up_allocpage.c
 endif
 
 CGU_ASRCS	= 
diff --git a/configs/ea3131/src/up_fillpage.c b/configs/ea3131/src/up_fillpage.c
index f72b88ec95c..be355fffe76 100755
--- a/configs/ea3131/src/up_fillpage.c
+++ b/configs/ea3131/src/up_fillpage.c
@@ -40,10 +40,11 @@
 
 #include <nuttx/config.h>
 
+#include <errno.h>
 #include <debug.h>
 
-#include <arch/nuttx/sched.h>
-#include <arch/nuttx/page.h>
+#include <nuttx/sched.h>
+#include <nuttx/page.h>
 
 #ifdef CONFIG_PAGING