diff --git a/libs/libc/stdlib/Make.defs b/libs/libc/stdlib/Make.defs
index 5e01d1a16b1..cbe6192cb29 100644
--- a/libs/libc/stdlib/Make.defs
+++ b/libs/libc/stdlib/Make.defs
@@ -20,13 +20,12 @@
 
 # Add the stdlib C files to the build
 
-CSRCS += lib_abs.c lib_abort.c lib_aligned_alloc.c lib_atof.c lib_atoi.c
+CSRCS += lib_abs.c lib_abort.c lib_atof.c lib_atoi.c
 CSRCS += lib_atol.c lib_atoll.c lib_div.c lib_ldiv.c lib_lldiv.c lib_Exit.c
 CSRCS += lib_itoa.c lib_labs.c lib_llabs.c lib_realpath.c lib_bsearch.c
-CSRCS += lib_rand.c lib_posix_memalign.c lib_qsort.c lib_srand.c lib_strtol.c
+CSRCS += lib_rand.c lib_qsort.c lib_srand.c lib_strtol.c
 CSRCS += lib_strtoll.c lib_strtoul.c lib_strtoull.c lib_strtod.c lib_strtof.c
 CSRCS += lib_strtold.c lib_checkbase.c lib_mktemp.c lib_mkstemp.c lib_mkdtemp.c
-CSRCS += lib_valloc.c
 
 ifeq ($(CONFIG_LIBC_WCHAR),y)
 CSRCS += lib_mblen.c lib_mbtowc.c lib_wctomb.c
diff --git a/mm/umm_heap/Make.defs b/mm/umm_heap/Make.defs
index 56a64a827c7..703211bc5c6 100644
--- a/mm/umm_heap/Make.defs
+++ b/mm/umm_heap/Make.defs
@@ -38,7 +38,7 @@
 CSRCS += umm_initialize.c umm_addregion.c umm_sem.c
 CSRCS += umm_brkaddr.c umm_calloc.c umm_extend.c umm_free.c umm_mallinfo.c
 CSRCS += umm_malloc.c umm_memalign.c umm_realloc.c umm_zalloc.c umm_heapmember.c
-CSRCS += umm_globals.c
+CSRCS += umm_globals.c umm_posix_memalign.c umm_aligned_alloc.c umm_valloc.c
 
 ifeq ($(CONFIG_BUILD_KERNEL),y)
 CSRCS += umm_sbrk.c
diff --git a/libs/libc/stdlib/lib_aligned_alloc.c b/mm/umm_heap/umm_aligned_alloc.c
similarity index 93%
rename from libs/libc/stdlib/lib_aligned_alloc.c
rename to mm/umm_heap/umm_aligned_alloc.c
index 3dba42389a1..29c75d37fc3 100644
--- a/libs/libc/stdlib/lib_aligned_alloc.c
+++ b/mm/umm_heap/umm_aligned_alloc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/stdlib/lib_aligned_alloc.c
+ * mm/umm_heap/umm_aligned_alloc.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -22,7 +22,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <libc.h>
+#include <stdlib.h>
 
 /****************************************************************************
  * Public Functions
@@ -30,5 +30,5 @@
 
 FAR void *aligned_alloc(size_t align, size_t size)
 {
-  return lib_memalign(align, size);
+  return memalign(align, size);
 }
diff --git a/libs/libc/stdlib/lib_posix_memalign.c b/mm/umm_heap/umm_posix_memalign.c
similarity index 97%
rename from libs/libc/stdlib/lib_posix_memalign.c
rename to mm/umm_heap/umm_posix_memalign.c
index 04ba3193067..ae6d3ac0f25 100644
--- a/libs/libc/stdlib/lib_posix_memalign.c
+++ b/mm/umm_heap/umm_posix_memalign.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/stdlib/lib_posix_memalign.c
+ * mm/umm_heap/umm_posix_memalign.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/libs/libc/stdlib/lib_valloc.c b/mm/umm_heap/umm_valloc.c
similarity index 98%
rename from libs/libc/stdlib/lib_valloc.c
rename to mm/umm_heap/umm_valloc.c
index 7bafdfa16e9..7eb0afad702 100644
--- a/libs/libc/stdlib/lib_valloc.c
+++ b/mm/umm_heap/umm_valloc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/stdlib/lib_valloc.c
+ * mm/umm_heap/umm_valloc.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with