diff --git a/gfx/drivers/d3d10.c b/gfx/drivers/d3d10.c
index 5c6261264625..1184ecf8d824 100644
--- a/gfx/drivers/d3d10.c
+++ b/gfx/drivers/d3d10.c
@@ -1336,7 +1336,7 @@ static bool d3d10_gfx_set_shader(void* data,
             &d3d10->pass[i].frame_count,     /* FrameCount */
             &d3d10->pass[i].frame_direction, /* FrameDirection */
             &d3d10->pass[i].frame_time_delta,/* FrameTimeDelta */
-            &d3d10->pass[i].original_fps,        /* OriginalFPS */
+            &d3d10->pass[i].original_fps,    /* OriginalFPS */
             &d3d10->pass[i].rotation,        /* Rotation */
             &d3d10->pass[i].core_aspect,     /* OriginalAspect */
             &d3d10->pass[i].core_aspect_rot, /* OriginalAspectRotated */
@@ -2324,28 +2324,23 @@ static bool d3d10_gfx_frame(
          d3d10_set_shader(context, &d3d10->pass[i].shader);
 
          if (d3d10->shader_preset->pass[i].frame_count_mod)
-            d3d10->pass[i].frame_count =
+            d3d10->pass[i].frame_count   =
                frame_count % d3d10->shader_preset->pass[i].frame_count_mod;
          else
-            d3d10->pass[i].frame_count = frame_count;
+            d3d10->pass[i].frame_count   = frame_count;
 
 #ifdef HAVE_REWIND
-         d3d10->pass[i].frame_direction = state_manager_frame_is_reversed()
+         d3d10->pass[i].frame_direction  = state_manager_frame_is_reversed()
             ? -1 : 1;
 #else
-         d3d10->pass[i].frame_direction = 1;
+         d3d10->pass[i].frame_direction  = 1;
 #endif
-
-         d3d10->pass[i].frame_time_delta = video_driver_get_frame_time_delta_usec();
-
-         d3d10->pass[i].original_fps = video_driver_get_original_fps();
-
-         d3d10->pass[i].rotation = retroarch_get_rotation();
-
-         d3d10->pass[i].core_aspect = video_driver_get_core_aspect();
-
-         /* OriginalAspectRotated: return 1/aspect for 90 and 270 rotated content */
-         d3d10->pass[i].core_aspect_rot = video_driver_get_core_aspect();
+         d3d10->pass[i].frame_time_delta = (uint32_t)video_driver_get_frame_time_delta_usec();
+         d3d10->pass[i].original_fps     = video_driver_get_original_fps();
+         d3d10->pass[i].rotation         = retroarch_get_rotation();
+         d3d10->pass[i].core_aspect      = video_driver_get_core_aspect();
+         /* OriginalAspectRotated: return 1 / aspect for 90 and 270 rotated content */
+         d3d10->pass[i].core_aspect_rot  = video_driver_get_core_aspect();
          uint32_t rot = retroarch_get_rotation();
          if (rot == 1 || rot == 3)
             d3d10->pass[i].core_aspect_rot = 1/d3d10->pass[i].core_aspect_rot;
diff --git a/gfx/drivers/d3d11.c b/gfx/drivers/d3d11.c
index 143877e296af..29e81d591d88 100644
--- a/gfx/drivers/d3d11.c
+++ b/gfx/drivers/d3d11.c
@@ -1538,7 +1538,7 @@ static bool d3d11_gfx_set_shader(void* data, enum rarch_shader_type type, const
             &d3d11->pass[i].frame_count,     /* FrameCount */
             &d3d11->pass[i].frame_direction, /* FrameDirection */
             &d3d11->pass[i].frame_time_delta,/* FrameTimeDelta */
-            &d3d11->pass[i].original_fps,        /* OriginalFPS */
+            &d3d11->pass[i].original_fps,    /* OriginalFPS */
             &d3d11->pass[i].rotation,        /* Rotation */
             &d3d11->pass[i].core_aspect,     /* OriginalAspect */
             &d3d11->pass[i].core_aspect_rot, /* OriginalAspectRotated */
@@ -3081,25 +3081,21 @@ static bool d3d11_gfx_frame(
          }
 
          if (d3d11->shader_preset->pass[i].frame_count_mod)
-            d3d11->pass[i].frame_count =
+            d3d11->pass[i].frame_count   =
                frame_count % d3d11->shader_preset->pass[i].frame_count_mod;
          else
-            d3d11->pass[i].frame_count = frame_count;
+            d3d11->pass[i].frame_count   = frame_count;
 
 #ifdef HAVE_REWIND
-         d3d11->pass[i].frame_direction = state_manager_frame_is_reversed() ? -1 : 1;
+         d3d11->pass[i].frame_direction  = state_manager_frame_is_reversed() ? -1 : 1;
 #else
-         d3d11->pass[i].frame_direction = 1;
+         d3d11->pass[i].frame_direction  = 1;
 #endif
-         d3d11->pass[i].frame_time_delta = video_driver_get_frame_time_delta_usec();
-
-         d3d11->pass[i].original_fps = video_driver_get_original_fps();
-
-         d3d11->pass[i].rotation = retroarch_get_rotation();
-
-         d3d11->pass[i].core_aspect = video_driver_get_core_aspect();
-
-         /* OriginalAspectRotated: return 1/aspect for 90 and 270 rotated content */
+         d3d11->pass[i].frame_time_delta = (uint32_t)video_driver_get_frame_time_delta_usec();
+         d3d11->pass[i].original_fps     = video_driver_get_original_fps();
+         d3d11->pass[i].rotation         = retroarch_get_rotation();
+         d3d11->pass[i].core_aspect      = video_driver_get_core_aspect();
+         /* OriginalAspectRotated: return 1 / aspect for 90 and 270 rotated content */
          d3d11->pass[i].core_aspect_rot = video_driver_get_core_aspect();
          uint32_t rot = retroarch_get_rotation();
          if (rot == 1 || rot == 3)
diff --git a/gfx/drivers/d3d12.c b/gfx/drivers/d3d12.c
index f78659d63cef..17ae8fc5bc54 100644
--- a/gfx/drivers/d3d12.c
+++ b/gfx/drivers/d3d12.c
@@ -1725,7 +1725,7 @@ static bool d3d12_gfx_set_shader(void* data, enum rarch_shader_type type, const
             &d3d12->pass[i].frame_count,     /* FrameCount */
             &d3d12->pass[i].frame_direction, /* FrameDirection */
             &d3d12->pass[i].frame_time_delta,/* FrameTimeDelta */
-            &d3d12->pass[i].original_fps,        /* OriginalFPS */
+            &d3d12->pass[i].original_fps,    /* OriginalFPS */
             &d3d12->pass[i].rotation,        /* Rotation */
             &d3d12->pass[i].core_aspect,     /* OriginalAspect */
             &d3d12->pass[i].core_aspect_rot, /* OriginalAspectRotated */
@@ -3596,21 +3596,16 @@ static bool d3d12_gfx_frame(
             d3d12->pass[i].frame_direction = -1;
          else
 #endif
-         d3d12->pass[i].frame_direction = 1;
-
-         d3d12->pass[i].frame_time_delta = video_driver_get_frame_time_delta_usec();
-
-         d3d12->pass[i].original_fps = video_driver_get_original_fps();
-
-         d3d12->pass[i].rotation = retroarch_get_rotation();
-
-         d3d12->pass[i].core_aspect = video_driver_get_core_aspect();
-
-         /* OriginalAspectRotated: return 1/aspect for 90 and 270 rotated content */
-         d3d12->pass[i].core_aspect_rot = video_driver_get_core_aspect();
+         d3d12->pass[i].frame_direction    = 1;
+         d3d12->pass[i].frame_time_delta   = (uint32_t)video_driver_get_frame_time_delta_usec();
+         d3d12->pass[i].original_fps       = video_driver_get_original_fps();
+         d3d12->pass[i].rotation           = retroarch_get_rotation();
+         d3d12->pass[i].core_aspect        = video_driver_get_core_aspect();
+         /* OriginalAspectRotated: return 1 / aspect for 90 and 270 rotated content */
+         d3d12->pass[i].core_aspect_rot    = video_driver_get_core_aspect();
          uint32_t rot = retroarch_get_rotation();
          if (rot == 1 || rot == 3)
-            d3d12->pass[i].core_aspect_rot = 1/d3d12->pass[i].core_aspect_rot;
+            d3d12->pass[i].core_aspect_rot = 1 / d3d12->pass[i].core_aspect_rot;
 
          /* Sub-frame info for multiframe shaders (per real content frame).
             Should always be 1 for non-use of subframes */
diff --git a/gfx/drivers/gl3.c b/gfx/drivers/gl3.c
index 3fdace418a56..5d7bef333226 100644
--- a/gfx/drivers/gl3.c
+++ b/gfx/drivers/gl3.c
@@ -2740,7 +2740,7 @@ static bool gl3_frame(void *data, const void *frame,
 #else
    gl3_filter_chain_set_frame_direction(gl->filter_chain, 1);
 #endif
-   gl3_filter_chain_set_frame_time_delta(gl->filter_chain, video_driver_get_frame_time_delta_usec());
+   gl3_filter_chain_set_frame_time_delta(gl->filter_chain, (uint32_t)video_driver_get_frame_time_delta_usec());
 
    gl3_filter_chain_set_original_fps(gl->filter_chain, video_driver_get_original_fps());
 
diff --git a/gfx/drivers/gx2_gfx.c b/gfx/drivers/gx2_gfx.c
index 2ac624afbe4b..1df7a4f36e6e 100644
--- a/gfx/drivers/gx2_gfx.c
+++ b/gfx/drivers/gx2_gfx.c
@@ -1958,23 +1958,18 @@ static bool gx2_frame(void *data, const void *frame,
    {
       unsigned i;
 #ifdef HAVE_REWIND
-      int32_t frame_direction = state_manager_frame_is_reversed() ? -1 : 1;
+      int32_t frame_direction   = state_manager_frame_is_reversed() ? -1 : 1;
 #else
-      int32_t frame_direction = 1;
+      int32_t frame_direction   = 1;
 #endif
-
-      uint32_t frame_time_delta = video_driver_get_frame_time_delta_usec();
-
-      float original_fps = video_driver_get_original_fps();
-
-      uint32_t rotation       = retroarch_get_rotation();
-
-      float core_aspect = video_driver_get_core_aspect();
-
+      uint32_t frame_time_delta = (uint32_t)video_driver_get_frame_time_delta_usec();
+      float original_fps        = video_driver_get_original_fps();
+      uint32_t rotation         = retroarch_get_rotation();
+      float core_aspect         = video_driver_get_core_aspect();
       /* OriginalAspectRotated: return 1/aspect for 90 and 270 rotated content */
-      float core_aspect_rot = core_aspect;
+      float core_aspect_rot     = core_aspect;
       if (rotation == 1 || rotation == 3)
-         core_aspect_rot = 1/core_aspect;
+         core_aspect_rot        = 1 / core_aspect;
 
       for (i = 0; i < wiiu->shader_preset->passes; i++)
       {
@@ -1986,7 +1981,8 @@ static bool gx2_frame(void *data, const void *frame,
             gx2_update_uniform_block(wiiu, i, wiiu->pass[i].vs_ubos[j], j,
                   wiiu->pass[i].gfd->vs->uniformBlocks[j].size,
                   wiiu->pass[i].gfd->vs->uniformVarCount, wiiu->pass[i].gfd->vs->uniformVars,
-                  frame_count, frame_direction, rotation, core_aspect, core_aspect_rot,frame_time_delta, original_fps);
+                  frame_count, frame_direction, rotation, core_aspect, core_aspect_rot,
+                  frame_time_delta, original_fps);
 
             GX2SetVertexUniformBlock(wiiu->pass[i].gfd->vs->uniformBlocks[j].offset,
                   wiiu->pass[i].gfd->vs->uniformBlocks[j].size, wiiu->pass[i].vs_ubos[j]);
@@ -1999,7 +1995,8 @@ static bool gx2_frame(void *data, const void *frame,
             gx2_update_uniform_block(wiiu, i, wiiu->pass[i].ps_ubos[j], j,
                   wiiu->pass[i].gfd->ps->uniformBlocks[j].size,
                   wiiu->pass[i].gfd->ps->uniformVarCount, wiiu->pass[i].gfd->ps->uniformVars,
-                  frame_count, frame_direction, rotation, core_aspect, core_aspect_rot,frame_time_delta, original_fps);
+                  frame_count, frame_direction, rotation, core_aspect, core_aspect_rot,
+                  frame_time_delta, original_fps);
             GX2SetPixelUniformBlock(wiiu->pass[i].gfd->ps->uniformBlocks[j].offset,
                   wiiu->pass[i].gfd->ps->uniformBlocks[j].size, wiiu->pass[i].ps_ubos[j]);
          }
diff --git a/gfx/drivers/metal.m b/gfx/drivers/metal.m
index 9916dcd322b6..53b4eee15bee 100644
--- a/gfx/drivers/metal.m
+++ b/gfx/drivers/metal.m
@@ -1578,23 +1578,19 @@ - (void)drawWithContext:(Context *)ctx
          _engine.pass[i].frame_direction = -1;
       else
 #else
-      _engine.pass[i].frame_direction = 1;
+      _engine.pass[i].frame_direction    = 1;
 #endif
-
-      _engine.pass[i].frame_time_delta = video_driver_get_frame_time_delta_usec();
-
-      _engine.pass[i].original_fps = video_driver_get_original_fps();
-
-      _engine.pass[i].rotation = retroarch_get_rotation();
-
-      _engine.pass[i].core_aspect = video_driver_get_core_aspect();
-
-      /* OriginalAspectRotated: return 1/aspect for 90 and 270 rotated content */
-      int rot = retroarch_get_rotation();
-      float core_aspect_rot = video_driver_get_core_aspect();
+      _engine.pass[i].frame_time_delta   = (uint32_t)video_driver_get_frame_time_delta_usec();
+      _engine.pass[i].original_fps       = video_driver_get_original_fps();
+      _engine.pass[i].rotation           = retroarch_get_rotation();
+      _engine.pass[i].core_aspect        = video_driver_get_core_aspect();
+
+      /* OriginalAspectRotated: return 1 / aspect for 90 and 270 rotated content */
+      int rot                            = retroarch_get_rotation();
+      float core_aspect_rot              = video_driver_get_core_aspect();
       if (rot == 1 || rot == 3)
-         core_aspect_rot = 1/core_aspect_rot;
-      _engine.pass[i].core_aspect_rot  = core_aspect_rot;
+         core_aspect_rot                 = 1 / core_aspect_rot;
+      _engine.pass[i].core_aspect_rot    = core_aspect_rot;
 
       for (j = 0; j < SLANG_CBUFFER_MAX; j++)
       {
diff --git a/gfx/drivers/vulkan.c b/gfx/drivers/vulkan.c
index c7f2a6b4b795..7063b3e8722e 100644
--- a/gfx/drivers/vulkan.c
+++ b/gfx/drivers/vulkan.c
@@ -4567,7 +4567,7 @@ static bool vulkan_frame(void *data, const void *frame,
          1);
 #endif
    vulkan_filter_chain_set_frame_time_delta(
-         (vulkan_filter_chain_t*)vk->filter_chain, video_driver_get_frame_time_delta_usec());
+         (vulkan_filter_chain_t*)vk->filter_chain, (uint32_t)video_driver_get_frame_time_delta_usec());
 
    vulkan_filter_chain_set_original_fps(
          (vulkan_filter_chain_t*)vk->filter_chain, video_driver_get_original_fps());
diff --git a/gfx/drivers_shader/shader_glsl.c b/gfx/drivers_shader/shader_glsl.c
index 7a17ade1a17b..d8e97d8be58b 100644
--- a/gfx/drivers_shader/shader_glsl.c
+++ b/gfx/drivers_shader/shader_glsl.c
@@ -1368,7 +1368,7 @@ static void gl_glsl_set_params(void *dat, void *shader_data)
    }
 
   if (uni->frame_time_delta >= 0)
-      glUniform1i(uni->frame_time_delta, video_driver_get_frame_time_delta_usec());
+      glUniform1i(uni->frame_time_delta, (GLint)video_driver_get_frame_time_delta_usec());
 
   if (uni->original_fps >= 0)
       glUniform1f(uni->original_fps, video_driver_get_original_fps());
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index 609a3c26936e..3fc3a7d2cdc6 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -1924,7 +1924,7 @@ void video_driver_unset_stub_frame(void)
 }
 
 /* Get time diff between frames in usec (microseconds) */
-uint32_t video_driver_get_frame_time_delta_usec(void)
+retro_time_t video_driver_get_frame_time_delta_usec(void)
 {
    static retro_time_t last_time;
    retro_time_t now_time   = cpu_features_get_time_usec();
diff --git a/gfx/video_driver.h b/gfx/video_driver.h
index 7dfc555d5ed1..26bbee6421be 100644
--- a/gfx/video_driver.h
+++ b/gfx/video_driver.h
@@ -915,7 +915,7 @@ void video_driver_unset_stub_frame(void);
 
 float video_driver_get_core_aspect(void);
 
-uint32_t video_driver_get_frame_time_delta_usec(void);
+retro_time_t video_driver_get_frame_time_delta_usec(void);
 
 float video_driver_get_original_fps(void);
 
diff --git a/libretro-common/hash/lrc_hash.c b/libretro-common/hash/lrc_hash.c
index b57754456674..3185298abd48 100644
--- a/libretro-common/hash/lrc_hash.c
+++ b/libretro-common/hash/lrc_hash.c
@@ -129,7 +129,7 @@ static void sha256_chunk(struct sha256_ctx *p,
 
    while (len)
    {
-      unsigned l = 64 - p->inlen;
+      size_t l   = 64 - p->inlen;
 
       if (len < l)
          l       = len;