diff --git a/gfx/gfx_thumbnail_path.h b/gfx/gfx_thumbnail_path.h
index 656bbd8ed4..7b54caa29b 100644
--- a/gfx/gfx_thumbnail_path.h
+++ b/gfx/gfx_thumbnail_path.h
@@ -27,6 +27,7 @@
 #include <libretro.h>
 
 #include <boolean.h>
+#include <retro_miscellaneous.h>
 
 #include "../playlist.h"
 
@@ -60,6 +61,10 @@ struct gfx_thumbnail_path_data
    enum playlist_thumbnail_mode playlist_left_mode;
    enum playlist_thumbnail_mode playlist_icon_mode;
    size_t playlist_index;
+   char content_label[NAME_MAX_LENGTH];
+   char content_core_name[NAME_MAX_LENGTH];
+   char system[NAME_MAX_LENGTH];
+   char content_db_name[NAME_MAX_LENGTH];
    char content_path[PATH_MAX_LENGTH];
    char content_img[PATH_MAX_LENGTH];
    char content_img_short[PATH_MAX_LENGTH];
@@ -67,10 +72,6 @@ struct gfx_thumbnail_path_data
    char right_path[PATH_MAX_LENGTH];
    char left_path[PATH_MAX_LENGTH];
    char icon_path[PATH_MAX_LENGTH];
-   char content_label[256];
-   char content_core_name[256];
-   char system[256];
-   char content_db_name[256];
 };
 
 /* Initialisation */
diff --git a/gfx/gfx_widgets.h b/gfx/gfx_widgets.h
index a6121608fb..547207320c 100644
--- a/gfx/gfx_widgets.h
+++ b/gfx/gfx_widgets.h
@@ -246,6 +246,7 @@ typedef struct dispgfx_widget
 
    uint8_t flags;
 
+   char gfx_widgets_status_text[NAME_MAX_LENGTH];
    char assets_pkg_dir[DIR_MAX_LENGTH];
    char xmb_path[PATH_MAX_LENGTH];                /* TODO/FIXME - decouple from XMB */
    char ozone_path[PATH_MAX_LENGTH];              /* TODO/FIXME - decouple from Ozone */
@@ -254,7 +255,6 @@ typedef struct dispgfx_widget
 
    char monochrome_png_path[PATH_MAX_LENGTH];
    char gfx_widgets_path[PATH_MAX_LENGTH];
-   char gfx_widgets_status_text[NAME_MAX_LENGTH];
 
    bool active;
 } dispgfx_widget_t;
diff --git a/gfx/video_shader_parse.h b/gfx/video_shader_parse.h
index 1754902ce9..28c9e485b2 100644
--- a/gfx/video_shader_parse.h
+++ b/gfx/video_shader_parse.h
@@ -60,8 +60,8 @@ RETRO_BEGIN_DECLS
 enum wildcard_type
 {
    RARCH_WILDCARD_CONTENT_DIR = 0,
-   RARCH_WILDCARD_CORE, 
-   RARCH_WILDCARD_GAME, 
+   RARCH_WILDCARD_CORE,
+   RARCH_WILDCARD_GAME,
    RARCH_WILDCARD_VIDEO_DRIVER,
    RARCH_WILDCARD_VIDEO_USER_ROTATION,
    RARCH_WILDCARD_VIDEO_ALLOW_CORE_ROTATION,
@@ -104,7 +104,7 @@ enum
 enum video_shader_flags
 {
    SHDR_FLAG_MODERN    = (1 << 0), /* Only used for XML shaders. */
-   /* Indicative of whether shader was modified - 
+   /* Indicative of whether shader was modified -
     * for instance from the menus */
    SHDR_FLAG_MODIFIED  = (1 << 1),
    SHDR_FLAG_DISABLED  = (1 << 2)
@@ -213,8 +213,8 @@ struct video_shader
    /* Path to the root preset */
    char path[PATH_MAX_LENGTH];
 
-   /* Path to the original preset loaded, if this is a preset 
-    * with the #reference directive, then this will be different 
+   /* Path to the original preset loaded, if this is a preset
+    * with the #reference directive, then this will be different
     * than the path */
    char loaded_preset_path[PATH_MAX_LENGTH];
 };
@@ -266,7 +266,7 @@ bool video_shader_load_preset_into_shader(const char *path, struct video_shader
  * Writes a preset to disk. Can be written as a simple preset (With the #reference directive in it) or a full preset.
  **/
 bool video_shader_write_preset(const char *path,
-      const struct video_shader *shader, 
+      const struct video_shader *shader,
       bool reference);
 
 enum rarch_shader_type video_shader_get_type_from_ext(const char *ext, bool *is_preset);