diff --git a/gfx/common/d3d9_common.h b/gfx/common/d3d9_common.h
index 24ffeaa9ba..1340fee856 100644
--- a/gfx/common/d3d9_common.h
+++ b/gfx/common/d3d9_common.h
@@ -43,27 +43,14 @@
 
 RETRO_BEGIN_DECLS
 
-typedef struct d3d9_video d3d9_video_t;
-
 typedef struct d3d9_video
 {
-   bool keep_aspect;
-   bool should_resize;
-   bool quitting;
-   bool needs_restore;
-   bool overlays_enabled;
-   /* TODO - refactor this away properly. */
-   bool resolution_hd_enable;
-
-   /* Only used for Xbox */
-   bool widescreen_mode;
-
-   unsigned cur_mon_id;
-   unsigned dev_rotation;
-
    overlay_t *menu;
    void *renderchain_data;
 
+   char *shader_path;
+   overlay_t *overlays;
+
    RECT font_rect;
    RECT font_rect_shifted;
    math_matrix_4x4 mvp;
@@ -81,8 +68,6 @@ typedef struct d3d9_video
    float translate_x;
    float translate_y;
 
-   char *shader_path;
-
    struct
    {
       int size;
@@ -92,7 +77,20 @@ typedef struct d3d9_video
    }menu_display;
 
    size_t overlays_size;
-   overlay_t *overlays;
+
+   unsigned cur_mon_id;
+   unsigned dev_rotation;
+
+   bool keep_aspect;
+   bool should_resize;
+   bool quitting;
+   bool needs_restore;
+   bool overlays_enabled;
+   /* TODO - refactor this away properly. */
+   bool resolution_hd_enable;
+
+   /* Only used for Xbox */
+   bool widescreen_mode;
 } d3d9_video_t;
 
 void *d3d9_vertex_buffer_new(void *dev,
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index 7451f103c4..1bfa405e4f 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -4670,7 +4670,9 @@ void video_frame_delay_auto(video_driver_state_t *video_st, video_frame_delay_au
    uint8_t count_pos              = 0;
    uint8_t count_min              = 0;
    uint8_t count_med              = 0;
+#if FRAME_DELAY_AUTO_DEBUG
    uint8_t count_max              = 0;
+#endif
    int8_t mode                    = 0;
 
    /* Calculate average frame time */
@@ -4699,8 +4701,10 @@ void video_frame_delay_auto(video_driver_state_t *video_st, video_frame_delay_au
             count_min++;
          if (frame_time_i > frame_time_limit_med)
             count_med++;
+#if FRAME_DELAY_AUTO_DEBUG
          if (frame_time_i > frame_time_limit_max)
             count_max++;
+#endif
       }
 
       frame_time_avg += frame_time_i;