diff --git a/arch/arm/src/dm320/dm320_framebuffer.c b/arch/arm/src/dm320/dm320_framebuffer.c
index 8b5aec444b6..0b118e4df4d 100644
--- a/arch/arm/src/dm320/dm320_framebuffer.c
+++ b/arch/arm/src/dm320/dm320_framebuffer.c
@@ -45,7 +45,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/fb.h>
+#include <nuttx/video/fb.h>
 #include <nuttx/kmalloc.h>
 #include <nuttx/nx/nxglib.h>
 
diff --git a/arch/arm/src/lpc17xx/lpc17_lcd.c b/arch/arm/src/lpc17xx/lpc17_lcd.c
index d022390ed1b..36c6dfdbeab 100644
--- a/arch/arm/src/lpc17xx/lpc17_lcd.c
+++ b/arch/arm/src/lpc17xx/lpc17_lcd.c
@@ -44,7 +44,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/fb.h>
+#include <nuttx/video/fb.h>
 #include <arch/board/board.h>
 
 #include "up_arch.h"
diff --git a/arch/arm/src/lpc17xx/lpc17_lcd.h b/arch/arm/src/lpc17xx/lpc17_lcd.h
index 2b560bb47bc..99daa200691 100644
--- a/arch/arm/src/lpc17xx/lpc17_lcd.h
+++ b/arch/arm/src/lpc17xx/lpc17_lcd.h
@@ -163,7 +163,7 @@
  * Public Functions
  ************************************************************************************/
 /* The LPC17 LCD driver uses the common framebuffer interfaces declared in
- * include/nuttx/fb.h.
+ * include/nuttx/video/fb.h.
  */
 
 /************************************************************************************
diff --git a/arch/arm/src/sama5/sam_lcd.c b/arch/arm/src/sama5/sam_lcd.c
index 166239cc54c..d2c2cf92f2e 100644
--- a/arch/arm/src/sama5/sam_lcd.c
+++ b/arch/arm/src/sama5/sam_lcd.c
@@ -53,7 +53,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/fb.h>
+#include <nuttx/video/fb.h>
 #include <nuttx/kmalloc.h>
 
 #include <arch/board/board.h>
diff --git a/arch/arm/src/sama5/sam_lcd.h b/arch/arm/src/sama5/sam_lcd.h
index 58e49fd2a85..d16a2ec6f83 100644
--- a/arch/arm/src/sama5/sam_lcd.h
+++ b/arch/arm/src/sama5/sam_lcd.h
@@ -80,7 +80,7 @@
  * Public Functions
  ************************************************************************************/
 /* The SAMA5 LCD driver uses the common framebuffer interfaces declared in
- * include/nuttx/fb.h.
+ * include/nuttx/video/fb.h.
  */
 
 /************************************************************************************
diff --git a/arch/arm/src/stm32/stm32_ltdc.c b/arch/arm/src/stm32/stm32_ltdc.c
index 879ff18a224..d9cf1f7f47e 100644
--- a/arch/arm/src/stm32/stm32_ltdc.c
+++ b/arch/arm/src/stm32/stm32_ltdc.c
@@ -47,7 +47,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/fb.h>
+#include <nuttx/video/fb.h>
 #include <nuttx/kmalloc.h>
 
 #include <arch/board/board.h>
diff --git a/arch/arm/src/stm32/stm32_ltdc.h b/arch/arm/src/stm32/stm32_ltdc.h
index ab70b779b2b..007f03b5218 100644
--- a/arch/arm/src/stm32/stm32_ltdc.h
+++ b/arch/arm/src/stm32/stm32_ltdc.h
@@ -66,7 +66,7 @@
  * Public Functions
  ************************************************************************************/
 /* The STM32 LTDC driver uses the common framebuffer interfaces declared in
- * include/nuttx/fb.h.
+ * include/nuttx/video/fb.h.
  */
 
 /************************************************************************************
diff --git a/arch/sim/src/up_framebuffer.c b/arch/sim/src/up_framebuffer.c
index 35329b9d88c..bf80e99a115 100644
--- a/arch/sim/src/up_framebuffer.c
+++ b/arch/sim/src/up_framebuffer.c
@@ -44,7 +44,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/fb.h>
+#include <nuttx/video/fb.h>
 #include "up_internal.h"
 
 /****************************************************************************