diff --git a/drivers/video/fb.c b/drivers/video/fb.c
index 9a0a764ca76..6a1006220c2 100644
--- a/drivers/video/fb.c
+++ b/drivers/video/fb.c
@@ -39,7 +39,6 @@
 #include <nuttx/fs/fs.h>
 #include <nuttx/fs/ioctl.h>
 #include <nuttx/video/fb.h>
-#include <nuttx/mm/map.h>
 
 /****************************************************************************
  * Private Types
diff --git a/drivers/video/video.c b/drivers/video/video.c
index 3c45408603e..61fbd59eaf2 100644
--- a/drivers/video/video.c
+++ b/drivers/video/video.c
@@ -38,7 +38,6 @@
 
 #include <nuttx/video/imgsensor.h>
 #include <nuttx/video/imgdata.h>
-#include <nuttx/mm/map.h>
 
 #include "video_framebuff.h"
 
diff --git a/fs/mmap/fs_mmap.c b/fs/mmap/fs_mmap.c
index 5717ed1cd96..36e710ad230 100644
--- a/fs/mmap/fs_mmap.c
+++ b/fs/mmap/fs_mmap.c
@@ -23,7 +23,6 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#include <nuttx/mm/map.h>
 
 #include <sys/types.h>
 #include <sys/mman.h>
diff --git a/include/nuttx/mm/map.h b/include/nuttx/mm/map.h
index cf1d38f0474..ffb4d18fbc2 100644
--- a/include/nuttx/mm/map.h
+++ b/include/nuttx/mm/map.h
@@ -29,6 +29,12 @@
 #include <nuttx/queue.h>
 #include <nuttx/mutex.h>
 
+/****************************************************************************
+ * Forward declarations
+ ****************************************************************************/
+
+struct task_group_s;
+
 /****************************************************************************
  * Public Types
  ****************************************************************************/