diff --git a/arch/arm/src/rtl8720c/amebaz_depend.h b/arch/arm/src/rtl8720c/amebaz_depend.h
index d3d9794ad24..1be6ab6d6a5 100644
--- a/arch/arm/src/rtl8720c/amebaz_depend.h
+++ b/arch/arm/src/rtl8720c/amebaz_depend.h
@@ -30,7 +30,6 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <malloc.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/arch/risc-v/src/esp32c3/esp32c3_bignum.c b/arch/risc-v/src/esp32c3/esp32c3_bignum.c
index 40cd72b498d..97c3703a1bd 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_bignum.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_bignum.c
@@ -28,7 +28,6 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
 #include <limits.h>
 #include <assert.h>
 #include <stdlib.h>
diff --git a/arch/risc-v/src/esp32c3/esp32c3_rtcheap.c b/arch/risc-v/src/esp32c3/esp32c3_rtcheap.c
index bb2d86e0c1f..92461ac988b 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_rtcheap.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_rtcheap.c
@@ -26,7 +26,6 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/mm/mm.h>
-#include <malloc.h>
 
 #include "esp32c3_rtcheap.h"
 
diff --git a/arch/sim/src/sim/sim_heap.c b/arch/sim/src/sim/sim_heap.c
index 280c1adc9d4..bdbc8de5000 100644
--- a/arch/sim/src/sim/sim_heap.c
+++ b/arch/sim/src/sim/sim_heap.c
@@ -26,7 +26,6 @@
 
 #include <assert.h>
 #include <string.h>
-#include <malloc.h>
 #include <stdbool.h>
 
 #include <nuttx/arch.h>
diff --git a/arch/sim/src/sim/win/sim_wpcap.c b/arch/sim/src/sim/win/sim_wpcap.c
index 5f224389d17..67d3432cc26 100644
--- a/arch/sim/src/sim/win/sim_wpcap.c
+++ b/arch/sim/src/sim/win/sim_wpcap.c
@@ -68,7 +68,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <syslog.h>
-#include <malloc.h>
 
 #include "sim_internal.h"
 
diff --git a/arch/xtensa/src/esp32/esp32_imm.c b/arch/xtensa/src/esp32/esp32_imm.c
index cae03ac4f18..5a879d50fde 100644
--- a/arch/xtensa/src/esp32/esp32_imm.c
+++ b/arch/xtensa/src/esp32/esp32_imm.c
@@ -26,7 +26,6 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/mm/mm.h>
-#include <malloc.h>
 #include <arch/esp32/memory_layout.h>
 
 #include "xtensa.h"
diff --git a/arch/xtensa/src/esp32/esp32_iramheap.c b/arch/xtensa/src/esp32/esp32_iramheap.c
index 87f03f35148..35da9982c39 100644
--- a/arch/xtensa/src/esp32/esp32_iramheap.c
+++ b/arch/xtensa/src/esp32/esp32_iramheap.c
@@ -26,7 +26,6 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/mm/mm.h>
-#include <malloc.h>
 
 #include "esp32_iramheap.h"
 
diff --git a/arch/xtensa/src/esp32/esp32_rtcheap.c b/arch/xtensa/src/esp32/esp32_rtcheap.c
index 85016a0abaa..d17b7599dfa 100644
--- a/arch/xtensa/src/esp32/esp32_rtcheap.c
+++ b/arch/xtensa/src/esp32/esp32_rtcheap.c
@@ -26,7 +26,6 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/mm/mm.h>
-#include <malloc.h>
 
 #include "esp32_rtcheap.h"
 
diff --git a/arch/xtensa/src/esp32s3/esp32s3_rtcheap.c b/arch/xtensa/src/esp32s3/esp32s3_rtcheap.c
index e46087f3d22..247735d1956 100644
--- a/arch/xtensa/src/esp32s3/esp32s3_rtcheap.c
+++ b/arch/xtensa/src/esp32s3/esp32s3_rtcheap.c
@@ -26,7 +26,6 @@
 
 #include <nuttx/arch.h>
 #include <nuttx/mm/mm.h>
-#include <malloc.h>
 
 #include "esp32s3_rtcheap.h"
 
diff --git a/include/nuttx/kmalloc.h b/include/nuttx/kmalloc.h
index b22196aaf19..71b0fee0f8f 100644
--- a/include/nuttx/kmalloc.h
+++ b/include/nuttx/kmalloc.h
@@ -28,7 +28,6 @@
 #include <nuttx/config.h>
 
 #include <sys/types.h>
-#include <malloc.h>
 #include <stdbool.h>
 #include <stdlib.h>
 
diff --git a/include/nuttx/mm/mm.h b/include/nuttx/mm/mm.h
index d43e84ea965..1c17c035bfb 100644
--- a/include/nuttx/mm/mm.h
+++ b/include/nuttx/mm/mm.h
@@ -29,6 +29,7 @@
 
 #include <sys/types.h>
 #include <stdbool.h>
+#include <malloc.h>
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -108,7 +109,6 @@
  ****************************************************************************/
 
 struct mm_heap_s; /* Forward reference */
-struct mm_memdump_s;
 
 /****************************************************************************
  * Public Data
@@ -314,9 +314,7 @@ void kmm_extend(FAR void *mem, size_t size, int region);
 
 /* Functions contained in mm_mallinfo.c *************************************/
 
-struct mallinfo; /* Forward reference */
 struct mallinfo mm_mallinfo(FAR struct mm_heap_s *heap);
-struct mallinfo_task; /* Forward reference */
 struct mallinfo_task mm_mallinfo_task(FAR struct mm_heap_s *heap,
                                       FAR const struct mm_memdump_s *dump);
 
diff --git a/mm/kmm_heap/kmm_mallinfo.c b/mm/kmm_heap/kmm_mallinfo.c
index c2e9f704766..6056389e43d 100644
--- a/mm/kmm_heap/kmm_mallinfo.c
+++ b/mm/kmm_heap/kmm_mallinfo.c
@@ -24,8 +24,6 @@
 
 #include <nuttx/config.h>
 
-#include <malloc.h>
-
 #include <nuttx/mm/mm.h>
 
 #ifdef CONFIG_MM_KERNEL_HEAP
diff --git a/mm/mm_heap/mm_mallinfo.c b/mm/mm_heap/mm_mallinfo.c
index b0272cbbc7f..5295c50e14b 100644
--- a/mm/mm_heap/mm_mallinfo.c
+++ b/mm/mm_heap/mm_mallinfo.c
@@ -24,7 +24,6 @@
 
 #include <nuttx/config.h>
 
-#include <malloc.h>
 #include <assert.h>
 #include <debug.h>
 
diff --git a/mm/mm_heap/mm_malloc.c b/mm/mm_heap/mm_malloc.c
index 6084ba3b982..9a5f7d44923 100644
--- a/mm/mm_heap/mm_malloc.c
+++ b/mm/mm_heap/mm_malloc.c
@@ -27,7 +27,6 @@
 #include <assert.h>
 #include <debug.h>
 #include <string.h>
-#include <malloc.h>
 
 #include <nuttx/arch.h>
 #include <nuttx/mm/mm.h>
diff --git a/mm/mm_heap/mm_memdump.c b/mm/mm_heap/mm_memdump.c
index 874016cf2a2..088bf85347d 100644
--- a/mm/mm_heap/mm_memdump.c
+++ b/mm/mm_heap/mm_memdump.c
@@ -25,7 +25,6 @@
 #include <nuttx/config.h>
 
 #include <stdio.h>
-#include <malloc.h>
 #include <assert.h>
 #include <debug.h>
 
diff --git a/mm/tlsf/mm_tlsf.c b/mm/tlsf/mm_tlsf.c
index 65fd1f56b9e..ac3eb689d9e 100644
--- a/mm/tlsf/mm_tlsf.c
+++ b/mm/tlsf/mm_tlsf.c
@@ -29,7 +29,6 @@
 #include <assert.h>
 #include <debug.h>
 #include <execinfo.h>
-#include <malloc.h>
 #include <sched.h>
 #include <stdio.h>
 #include <string.h>