diff --git a/graphics/nxglyphs/include/cursor-arrow1-30x30.h b/graphics/nxglyphs/include/cursor-arrow1-30x30.h
index 43e5bff8f..e7faf27a8 100644
--- a/graphics/nxglyphs/include/cursor-arrow1-30x30.h
+++ b/graphics/nxglyphs/include/cursor-arrow1-30x30.h
@@ -2,8 +2,8 @@
 
 #include <stdint.h>
 
-#include <nuttx/video/rgbcolors.h
-#include <nuttx/video/cursor.h
+#include <nuttx/video/rgbcolors.h>
+#include <nuttx/nx/nxcursor.h>
 
 #if CONFIG_NXWIDGETS_BPP == 8
 #  define FGCOLOR1             RGB8WHITE
@@ -55,10 +55,13 @@ static const uint8_t g_arrow1Image[] =
   0x00 0x00 0x00 0x00 0x00 0x00 0x80 0x00    /* Row 29 */
 }
 
-const struct cursor_image_s g_arrow1Cursor
+const struct nx_cursorimage_s g_arrow1Cursor =
 {
-  .width  = 30
-  .height = 30
+  .size =
+  {
+    .w = 30
+    .h = 30
+  },
   .color1 =
   {
     FGCOLOR1
diff --git a/graphics/nxglyphs/include/cursor-arrow2-30x30.h b/graphics/nxglyphs/include/cursor-arrow2-30x30.h
index 8d82e8991..475098e16 100644
--- a/graphics/nxglyphs/include/cursor-arrow2-30x30.h
+++ b/graphics/nxglyphs/include/cursor-arrow2-30x30.h
@@ -2,8 +2,8 @@
 
 #include <stdint.h>
 
-#include <nuttx/video/rgbcolors.h
-#include <nuttx/video/cursor.h
+#include <nuttx/video/rgbcolors.h>
+#include <nuttx/nx/nxcursor.h>
 
 #if CONFIG_NXWIDGETS_BPP == 8
 #  define FGCOLOR1             RGB8WHITE
@@ -55,10 +55,13 @@ static const uint8_t g_arrow2Image[] =
   0x00 0x00 0x00 0xe0 0x00 0x00 0x00 0x00    /* Row 29 */
 }
 
-const struct cursor_image_s g_arrow2Cursor
+const struct nx_cursorimage_s g_arrow2Cursor =
 {
-  .width  = 30
-  .height = 30
+  .size =
+  {
+    .w = 30
+    .h = 30
+  },
   .color1 =
   {
     FGCOLOR1
diff --git a/graphics/nxglyphs/include/cursor-grab-25x30.h b/graphics/nxglyphs/include/cursor-grab-25x30.h
index 98693be17..ce7db1e95 100644
--- a/graphics/nxglyphs/include/cursor-grab-25x30.h
+++ b/graphics/nxglyphs/include/cursor-grab-25x30.h
@@ -2,8 +2,8 @@
 
 #include <stdint.h>
 
-#include <nuttx/video/rgbcolors.h
-#include <nuttx/video/cursor.h
+#include <nuttx/video/rgbcolors.h>
+#include <nuttx/nx/nxcursor.h>
 
 #if CONFIG_NXWIDGETS_BPP == 8
 #  define FGCOLOR1             RGB8WHITE
@@ -55,10 +55,13 @@ static const uint8_t g_grabImage[] =
   0x00 0x2a 0xaa 0xaa 0xaa 0xb0 0x00    /* Row 29 */
 }
 
-const struct cursor_image_s g_grabCursor
+const struct nx_cursorimage_s g_grabCursor =
 {
-  .width  = 25
-  .height = 30
+  .size =
+  {
+    .w = 25
+    .h = 30
+  },
   .color1 =
   {
     FGCOLOR1
diff --git a/graphics/nxglyphs/include/cursor-wait-23x30.h b/graphics/nxglyphs/include/cursor-wait-23x30.h
index 3ae5ca6c2..d5df1f8ea 100644
--- a/graphics/nxglyphs/include/cursor-wait-23x30.h
+++ b/graphics/nxglyphs/include/cursor-wait-23x30.h
@@ -2,8 +2,8 @@
 
 #include <stdint.h>
 
-#include <nuttx/video/rgbcolors.h
-#include <nuttx/video/cursor.h
+#include <nuttx/video/rgbcolors.h>
+#include <nuttx/nx/nxcursor.h>
 
 #if CONFIG_NXWIDGETS_BPP == 8
 #  define FGCOLOR1             RGB8WHITE
@@ -55,10 +55,13 @@ static const uint8_t g_waitImage[] =
   0xaa 0xaa 0xaa 0xaa 0xaa 0xa8    /* Row 29 */
 }
 
-const struct cursor_image_s g_waitCursor
+const struct nx_cursorimage_s g_waitCursor =
 {
-  .width  = 23
-  .height = 30
+  .size =
+  {
+    .w = 23
+    .h = 30
+  },
   .color1 =
   {
     FGCOLOR1
diff --git a/graphics/nxglyphs/include/cursor-zoomin-30x30.h b/graphics/nxglyphs/include/cursor-zoomin-30x30.h
index 960ebe272..de83142bf 100644
--- a/graphics/nxglyphs/include/cursor-zoomin-30x30.h
+++ b/graphics/nxglyphs/include/cursor-zoomin-30x30.h
@@ -2,8 +2,8 @@
 
 #include <stdint.h>
 
-#include <nuttx/video/rgbcolors.h
-#include <nuttx/video/cursor.h
+#include <nuttx/video/rgbcolors.h>
+#include <nuttx/nx/nxcursor.h>
 
 #if CONFIG_NXWIDGETS_BPP == 8
 #  define FGCOLOR1             RGB8WHITE
@@ -55,10 +55,13 @@ static const uint8_t g_zoomInImage[] =
   0x00 0x00 0x00 0x00 0x00 0x00 0x2a 0x80    /* Row 29 */
 }
 
-const struct cursor_image_s g_zoomInCursor
+const struct nx_cursorimage_s g_zoomInCursor =
 {
-  .width  = 30
-  .height = 30
+  .size =
+  {
+    .w = 30
+    .h = 30
+  },
   .color1 =
   {
     FGCOLOR1
diff --git a/graphics/nxglyphs/include/cursor-zoomout-30x30.h b/graphics/nxglyphs/include/cursor-zoomout-30x30.h
index 1bbc7c5d6..84016f797 100644
--- a/graphics/nxglyphs/include/cursor-zoomout-30x30.h
+++ b/graphics/nxglyphs/include/cursor-zoomout-30x30.h
@@ -2,8 +2,8 @@
 
 #include <stdint.h>
 
-#include <nuttx/video/rgbcolors.h
-#include <nuttx/video/cursor.h
+#include <nuttx/video/rgbcolors.h>
+#include <nuttx/nx/nxcursor.h>
 
 #if CONFIG_NXWIDGETS_BPP == 8
 #  define FGCOLOR1             RGB8WHITE
@@ -55,10 +55,13 @@ static const uint8_t g_zoomOutImage[] =
   0x00 0x00 0x00 0x00 0x00 0x00 0x3a 0x80    /* Row 29 */
 }
 
-const struct cursor_image_s g_zoomOutCursor
+const struct nx_cursorimage_s g_zoomOutCursor =
 {
-  .width  = 30
-  .height = 30
+  .size =
+  {
+    .w = 30
+    .h = 30
+  },
   .color1 =
   {
     FGCOLOR1
diff --git a/graphics/nxglyphs/include/mkcursor.c b/graphics/nxglyphs/include/mkcursor.c
index 1b7e71e23..1b17368bc 100644
--- a/graphics/nxglyphs/include/mkcursor.c
+++ b/graphics/nxglyphs/include/mkcursor.c
@@ -104,8 +104,8 @@ int main(int argc, char **argv, char **envp)
 
   printf("#include <nuttx/config.h>\n\n");
   printf("#include <stdint.h>\n\n");
-  printf("#include <nuttx/video/rgbcolors.h\n");
-  printf("#include <nuttx/video/cursor.h\n\n");
+  printf("#include <nuttx/video/rgbcolors.h>\n");
+  printf("#include <nuttx/nx/nxcursor.h>\n\n");
 
   printf("#if CONFIG_NXWIDGETS_BPP == 8\n");
   printf("#  define FGCOLOR1             RGB8WHITE\n");
@@ -178,10 +178,13 @@ int main(int argc, char **argv, char **envp)
     }
 
   printf("}\n\n");
-  printf("const struct cursor_image_s g_cursor\n");
+  printf("const struct nx_cursorimage_s g_cursor =\n");
   printf("{\n");
-  printf("  .width  = %u\n", gimp_image.width);
-  printf("  .height = %u\n", gimp_image.height);
+  printf("  .size =\n");
+  printf("  {\n");
+  printf("    .w = %u\n", gimp_image.width);
+  printf("    .h = %u\n", gimp_image.height);
+  printf("  },\n");
   printf("  .color1 =\n");
   printf("  {\n");
   printf("    FGCOLOR1\n");
@@ -194,7 +197,7 @@ int main(int argc, char **argv, char **envp)
   printf("  {\n");
   printf("    FGCOLOR3\n");
   printf("  },\n");
-  printf("  .image  = g_cursorImage,\n");
+  printf("  .image  = g_cursorImage\n");
   printf("};\n\n");
 
   return 0;