diff --git a/configs/mikroe-stm32f4/kernel/up_userspace.c b/configs/mikroe-stm32f4/kernel/up_userspace.c
index 614ae3b8992..ed2f7d8a954 100644
--- a/configs/mikroe-stm32f4/kernel/up_userspace.c
+++ b/configs/mikroe-stm32f4/kernel/up_userspace.c
@@ -43,7 +43,7 @@
 
 #include <nuttx/userspace.h>
 #include <nuttx/wqueue.h>
-#include <nuttx/mm.h>
+#include <nuttx/mm/mm.h>
 
 #if defined(CONFIG_BUILD_PROTECTED) && !defined(__KERNEL__)
 
@@ -114,7 +114,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) =
   .signal_handler   = up_signal_handler,
 #endif
 
-  /* Memory manager entry points (declared in include/nuttx/mm.h) */
+  /* Memory manager entry points (declared in include/nuttx/mm/mm.h) */
 
   .mm_initialize    = umm_initialize,
   .mm_addregion     = umm_addregion,
diff --git a/configs/open1788/kernel/up_userspace.c b/configs/open1788/kernel/up_userspace.c
index ffcd8db480a..48413ec159b 100644
--- a/configs/open1788/kernel/up_userspace.c
+++ b/configs/open1788/kernel/up_userspace.c
@@ -43,7 +43,7 @@
 
 #include <nuttx/userspace.h>
 #include <nuttx/wqueue.h>
-#include <nuttx/mm.h>
+#include <nuttx/mm/mm.h>
 
 #if defined(CONFIG_BUILD_PROTECTED) && !defined(__KERNEL__)
 
@@ -114,7 +114,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) =
   .signal_handler   = up_signal_handler,
 #endif
 
-  /* Memory manager entry points (declared in include/nuttx/mm.h) */
+  /* Memory manager entry points (declared in include/nuttx/mm/mm.h) */
 
   .mm_initialize    = umm_initialize,
   .mm_addregion     = umm_addregion,
diff --git a/configs/sam3u-ek/kernel/up_userspace.c b/configs/sam3u-ek/kernel/up_userspace.c
index 51ed83b6fe1..7a71c8ad16c 100644
--- a/configs/sam3u-ek/kernel/up_userspace.c
+++ b/configs/sam3u-ek/kernel/up_userspace.c
@@ -43,7 +43,7 @@
 
 #include <nuttx/userspace.h>
 #include <nuttx/wqueue.h>
-#include <nuttx/mm.h>
+#include <nuttx/mm/mm.h>
 
 #if defined(CONFIG_BUILD_PROTECTED) && !defined(__KERNEL__)
 
@@ -114,7 +114,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) =
   .signal_handler   = up_signal_handler,
 #endif
 
-  /* Memory manager entry points (declared in include/nuttx/mm.h) */
+  /* Memory manager entry points (declared in include/nuttx/mm/mm.h) */
 
   .mm_initialize    = umm_initialize,
   .mm_addregion     = umm_addregion,
diff --git a/configs/stm3240g-eval/kernel/up_userspace.c b/configs/stm3240g-eval/kernel/up_userspace.c
index c5aecd02e50..7947c99de44 100644
--- a/configs/stm3240g-eval/kernel/up_userspace.c
+++ b/configs/stm3240g-eval/kernel/up_userspace.c
@@ -43,7 +43,7 @@
 
 #include <nuttx/userspace.h>
 #include <nuttx/wqueue.h>
-#include <nuttx/mm.h>
+#include <nuttx/mm/mm.h>
 
 #if defined(CONFIG_BUILD_PROTECTED) && !defined(__KERNEL__)
 
@@ -114,7 +114,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) =
   .signal_handler   = up_signal_handler,
 #endif
 
-  /* Memory manager entry points (declared in include/nuttx/mm.h) */
+  /* Memory manager entry points (declared in include/nuttx/mm/mm.h) */
 
   .mm_initialize    = umm_initialize,
   .mm_addregion     = umm_addregion,
diff --git a/configs/stm32f4discovery/kernel/up_userspace.c b/configs/stm32f4discovery/kernel/up_userspace.c
index 19fda356d3d..36065bdaede 100644
--- a/configs/stm32f4discovery/kernel/up_userspace.c
+++ b/configs/stm32f4discovery/kernel/up_userspace.c
@@ -42,7 +42,7 @@
 #include <stdlib.h>
 
 #include <nuttx/arch.h>
-#include <nuttx/mm.h>
+#include <nuttx/mm/mm.h>
 #include <nuttx/wqueue.h>
 #include <nuttx/userspace.h>
 
@@ -115,7 +115,7 @@ const struct userspace_s userspace __attribute__ ((section (".userspace"))) =
   .signal_handler   = up_signal_handler,
 #endif
 
-  /* Memory manager entry points (declared in include/nuttx/mm.h) */
+  /* Memory manager entry points (declared in include/nuttx/mm/mm.h) */
 
   .mm_initialize    = umm_initialize,
   .mm_addregion     = umm_addregion,