diff --git a/arch/arm/src/armv7-a/arm_virtpgaddr.c b/arch/arm/src/armv7-a/arm_virtpgaddr.c
index b6442732b6e..b4ef3a3eb51 100644
--- a/arch/arm/src/armv7-a/arm_virtpgaddr.c
+++ b/arch/arm/src/armv7-a/arm_virtpgaddr.c
@@ -39,20 +39,6 @@
 
 #include <nuttx/config.h>
 
-#if 0
-#include <sys/types.h>
-#include <assert.h>
-#include <debug.h>
-
-#include <nuttx/arch.h>
-#include <nuttx/addrenv.h>
-#include <nuttx/pgalloc.h>
-
-#include "chip.h"
-#include "mmu.h"
-#include "cache.h"
-#endif
-
 #include "pgalloc.h"
 
 #if defined(CONFIG_MM_PGALLOC) && defined(CONFIG_ARCH_PGPOOL_MAPPING)
diff --git a/mm/mm_gran/mm_graninit.c b/mm/mm_gran/mm_graninit.c
index 1dc31911409..79d28837096 100644
--- a/mm/mm_gran/mm_graninit.c
+++ b/mm/mm_gran/mm_graninit.c
@@ -71,7 +71,7 @@ FAR struct gran_s *g_graninfo;
  * Name: gran_common_initialize
  *
  * Description:
- *   Perfrom common GRAN initialization.
+ *   Perform common GRAN initialization.
  *
  * Input Parameters:
  *   heapstart - Start of the granule allocation heap