11 files changed, 12 insertions, 12 deletions
diff --git a/apps/examples/nx/nx_main.c b/apps/examples/nx/nx_main.c
index 147994ebb..92328d2a1 100644
--- a/apps/examples/nx/nx_main.c
+++ b/apps/examples/nx/nx_main.c
@@ -54,7 +54,7 @@
 #ifdef CONFIG_NX_LCDDRIVER
 #  include <nuttx/lcd/lcd.h>
 #else
-#  include <nuttx/fb.h>
+#  include <nuttx/video/fb.h>
 #endif
 
 #include <nuttx/arch.h>
diff --git a/apps/examples/nx/nx_server.c b/apps/examples/nx/nx_server.c
index 7f3ee5dfc..0cf3066de 100644
--- a/apps/examples/nx/nx_server.c
+++ b/apps/examples/nx/nx_server.c
@@ -52,7 +52,7 @@
 #ifdef CONFIG_NX_LCDDRIVER
 #  include <nuttx/lcd/lcd.h>
 #else
-#  include <nuttx/fb.h>
+#  include <nuttx/video/fb.h>
 #endif
 
 #include "nx_internal.h"
diff --git a/apps/examples/nxconsole/nxcon_main.c b/apps/examples/nxconsole/nxcon_main.c
index 41d8efd19..02546750e 100644
--- a/apps/examples/nxconsole/nxcon_main.c
+++ b/apps/examples/nxconsole/nxcon_main.c
@@ -54,7 +54,7 @@
 #ifdef CONFIG_NX_LCDDRIVER
 #  include <nuttx/lcd/lcd.h>
 #else
-#  include <nuttx/fb.h>
+#  include <nuttx/video/fb.h>
 #endif
 
 #include <nuttx/arch.h>
diff --git a/apps/examples/nxconsole/nxcon_server.c b/apps/examples/nxconsole/nxcon_server.c
index ccd000ec0..e42271c1f 100644
--- a/apps/examples/nxconsole/nxcon_server.c
+++ b/apps/examples/nxconsole/nxcon_server.c
@@ -52,7 +52,7 @@
 #ifdef CONFIG_NX_LCDDRIVER
 #  include <nuttx/lcd/lcd.h>
 #else
-#  include <nuttx/fb.h>
+#  include <nuttx/video/fb.h>
 #endif
 
 #include "nxcon_internal.h"
diff --git a/apps/examples/nxhello/nxhello_main.c b/apps/examples/nxhello/nxhello_main.c
index 6ee6c69b2..23288da7d 100644
--- a/apps/examples/nxhello/nxhello_main.c
+++ b/apps/examples/nxhello/nxhello_main.c
@@ -55,7 +55,7 @@
 #ifdef CONFIG_NX_LCDDRIVER
 #  include <nuttx/lcd/lcd.h>
 #else
-#  include <nuttx/fb.h>
+#  include <nuttx/video/fb.h>
 #endif
 
 #include <nuttx/arch.h>
diff --git a/apps/examples/nximage/nximage_main.c b/apps/examples/nximage/nximage_main.c
index c432d8a73..a32ea2a89 100644
--- a/apps/examples/nximage/nximage_main.c
+++ b/apps/examples/nximage/nximage_main.c
@@ -55,7 +55,7 @@
 #ifdef CONFIG_NX_LCDDRIVER
 #  include <nuttx/lcd/lcd.h>
 #else
-#  include <nuttx/fb.h>
+#  include <nuttx/video/fb.h>
 #endif
 
 #include <nuttx/arch.h>
diff --git a/apps/examples/nxlines/nxlines_main.c b/apps/examples/nxlines/nxlines_main.c
index e4632bb21..93e0436d8 100644
--- a/apps/examples/nxlines/nxlines_main.c
+++ b/apps/examples/nxlines/nxlines_main.c
@@ -53,7 +53,7 @@
 #ifdef CONFIG_NX_LCDDRIVER
 #  include <nuttx/lcd/lcd.h>
 #else
-#  include <nuttx/fb.h>
+#  include <nuttx/video/fb.h>
 #endif
 
 #include <nuttx/arch.h>
diff --git a/apps/examples/nxtext/nxtext_main.c b/apps/examples/nxtext/nxtext_main.c
index 2a1b50355..9bb94dcb8 100644
--- a/apps/examples/nxtext/nxtext_main.c
+++ b/apps/examples/nxtext/nxtext_main.c
@@ -55,7 +55,7 @@
 #ifdef CONFIG_NX_LCDDRIVER
 #  include <nuttx/lcd/lcd.h>
 #else
-#  include <nuttx/fb.h>
+#  include <nuttx/video/fb.h>
 #endif
 
 #include <nuttx/arch.h>
diff --git a/apps/examples/nxtext/nxtext_server.c b/apps/examples/nxtext/nxtext_server.c
index a464628e1..119c1a412 100644
--- a/apps/examples/nxtext/nxtext_server.c
+++ b/apps/examples/nxtext/nxtext_server.c
@@ -52,7 +52,7 @@
 #ifdef CONFIG_NX_LCDDRIVER
 #  include <nuttx/lcd/lcd.h>
 #else
-#  include <nuttx/fb.h>
+#  include <nuttx/video/fb.h>
 #endif
 
 #include "nxtext_internal.h"
diff --git a/apps/graphics/screenshot/Kconfig b/apps/graphics/screenshot/Kconfig
index 48cd367a6..642e75768 100644
--- a/apps/graphics/screenshot/Kconfig
+++ b/apps/graphics/screenshot/Kconfig
@@ -28,7 +28,7 @@ config SCREENSHOT_FORMAT
 	int "Screenshot color format"
 	default 9
 	---help---
-		See inlcude/nuttx/fb.h for a list of color formats.  The default
+		See inlcude/nuttx/video/fb.h for a list of color formats.  The default
 		value of 9 corresponds to FB_FMT_RGB16_565
 
 endif
diff --git a/apps/include/tiff.h b/apps/include/tiff.h
index 378af9fe0..e4567641f 100644
--- a/apps/include/tiff.h
+++ b/apps/include/tiff.h
@@ -298,7 +298,7 @@ struct tiff_info_s
    *
    * colorfmt  - Specifies the form of the color data that will be provided
    *             in the strip data.  These are the FB_FMT_* definitions
-   *             provided in include/nuttx/fb.h.  Only the following values
+   *             provided in include/nuttx/video/fb.h.  Only the following values
    *             are supported:
    *
    *             FB_FMT_Y1               BPP=1, monochrome, 0=black
@@ -316,7 +316,7 @@ struct tiff_info_s
   FAR const char *tmpfile1; /* Full path to first temporary file */
   FAR const char *tmpfile2; /* Full path to second temporary file */
 
-  uint8_t      colorfmt;    /* See FB_FMT_* definitions in include/nuttx/fb.h */
+  uint8_t      colorfmt;    /* See FB_FMT_* definitions in include/nuttx/video/fb.h */
   nxgl_coord_t rps;         /* TIFF RowsPerStrip */
   nxgl_coord_t imgwidth;    /* TIFF ImageWidth, Number of columns in the image */
   nxgl_coord_t imgheight;   /* TIFF ImageLength, Number of rows in the image */