diff --git a/tasks/task_screenshot.c b/tasks/task_screenshot.c
index 8d7e26280c..8297d5c3d3 100644
--- a/tasks/task_screenshot.c
+++ b/tasks/task_screenshot.c
@@ -57,6 +57,36 @@
 
 #include "tasks_internal.h"
 
+enum screenshot_task_flags
+{
+   SS_TASK_FLAG_BGR24               = (1 << 0),
+   SS_TASK_FLAG_SILENCE             = (1 << 1),
+   SS_TASK_FLAG_IS_IDLE             = (1 << 2),
+   SS_TASK_FLAG_IS_PAUSED           = (1 << 3),
+   SS_TASK_FLAG_HISTORY_LIST_ENABLE = (1 << 4),
+   SS_TASK_FLAG_WIDGETS_READY       = (1 << 5)
+};
+
+typedef struct screenshot_task_state screenshot_task_state_t;
+
+struct screenshot_task_state
+{
+   struct scaler_ctx scaler;
+   uint8_t *out_buffer;
+   const void *frame;
+   void *userbuf;
+
+   int pitch;
+   unsigned width;
+   unsigned height;
+   unsigned pixel_format_type;
+
+   uint8_t flags;
+
+   char filename[PATH_MAX_LENGTH];
+   char shotname[NAME_MAX_LENGTH];
+};
+
 static bool screenshot_dump_direct(screenshot_task_state_t *state)
 {
    struct scaler_ctx *scaler     = (struct scaler_ctx*)&state->scaler;
diff --git a/tasks/tasks_internal.h b/tasks/tasks_internal.h
index eda6e19981..4c65bb397f 100644
--- a/tasks/tasks_internal.h
+++ b/tasks/tasks_internal.h
@@ -45,16 +45,6 @@
 
 RETRO_BEGIN_DECLS
 
-enum screenshot_task_flags
-{
-   SS_TASK_FLAG_BGR24               = (1 << 0),
-   SS_TASK_FLAG_SILENCE             = (1 << 1),
-   SS_TASK_FLAG_IS_IDLE             = (1 << 2),
-   SS_TASK_FLAG_IS_PAUSED           = (1 << 3),
-   SS_TASK_FLAG_HISTORY_LIST_ENABLE = (1 << 4),
-   SS_TASK_FLAG_WIDGETS_READY       = (1 << 5)
-};
-
 typedef struct nbio_buf
 {
    void *buf;
@@ -62,26 +52,6 @@ typedef struct nbio_buf
    unsigned bufsize;
 } nbio_buf_t;
 
-typedef struct screenshot_task_state screenshot_task_state_t;
-
-struct screenshot_task_state
-{
-   struct scaler_ctx scaler;
-   uint8_t *out_buffer;
-   const void *frame;
-   void *userbuf;
-
-   int pitch;
-   unsigned width;
-   unsigned height;
-   unsigned pixel_format_type;
-
-   uint8_t flags;
-
-   char filename[PATH_MAX_LENGTH];
-   char shotname[NAME_MAX_LENGTH];
-};
-
 #ifdef HAVE_NETWORKING
 typedef struct
 {