diff --git a/gfx/drivers/d3d11.c b/gfx/drivers/d3d11.c
index 79704ff1fd..961798b21f 100644
--- a/gfx/drivers/d3d11.c
+++ b/gfx/drivers/d3d11.c
@@ -1,4 +1,4 @@
-/*  RetroArch - A frontend for libretro.
+/*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2014-2018 - Ali Bouhlel
  *
  *  RetroArch is free software: you can redistribute it and/or modify it under the terms
@@ -283,7 +283,7 @@ static bool d3d11_gfx_frame(void* data, const void* frame,
       D3D11_MAPPED_SUBRESOURCE mapped_frame;
       D3D11MapTexture2D(d3d11->context, d3d11->frame_staging, 0, D3D11_MAP_WRITE, 0, &mapped_frame);
       {
-         int i, j;
+         unsigned i, j;
 
          if (d3d11->rgb32)
          {
@@ -518,7 +518,7 @@ static void d3d11_set_menu_texture_frame(void* data,
       D3D11_MAPPED_SUBRESOURCE mapped_frame;
       D3D11MapTexture2D(d3d11->context, d3d11->menu.tex, 0, D3D11_MAP_WRITE_DISCARD, 0, &mapped_frame);
       {
-         int i,j;
+         unsigned i, j;
 
          if (rgb32)
          {
diff --git a/gfx/drivers/d3d12.c b/gfx/drivers/d3d12.c
index 8d33ee2acc..6271268514 100644
--- a/gfx/drivers/d3d12.c
+++ b/gfx/drivers/d3d12.c
@@ -1,4 +1,4 @@
-/*  RetroArch - A frontend for libretro.
+/*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2014-2018 - Ali Bouhlel
  *
  *  RetroArch is free software: you can redistribute it and/or modify it under the terms
@@ -104,10 +104,11 @@ static bool d3d12_gfx_frame(void *data, const void *frame,
                             unsigned width, unsigned height, uint64_t frame_count,
                             unsigned pitch, const char *msg, video_frame_info_t *video_info)
 {
-   (void)msg;
-
-   d3d12_video_t *d3d12 = (d3d12_video_t *)data;
    D3D12_CPU_DESCRIPTOR_HANDLE rtvHandle;
+   d3d12_video_t *d3d12 = (d3d12_video_t *)data;
+
+   (void)msg;
+   (void)rtvHandle;
 
    D3D12ResetCommandAllocator(d3d12->queue.allocator);
 
@@ -146,9 +147,9 @@ static bool d3d12_gfx_frame(void *data, const void *frame,
       }
 
       {
-         int i, j;
-         const uint8_t *in = frame;
-         uint8_t *out;
+         unsigned i;
+         const uint8_t *in  = frame;
+         uint8_t       *out = NULL;
 
          D3D12Map(d3d12->frame.tex.upload_buffer, 0, NULL, &out);
          out += d3d12->frame.tex.layout.Offset;
@@ -344,8 +345,8 @@ static void d3d12_set_menu_texture_frame(void *data,
    }
 
    {
-      int i, j;
-      uint8_t *out;
+      unsigned i, j;
+      uint8_t *out  = NULL;
 
       D3D12Map(d3d12->menu.tex.upload_buffer, 0, NULL, &out);
       out += d3d12->menu.tex.layout.Offset;
diff --git a/menu/drivers_display/menu_display_d3d.c b/menu/drivers_display/menu_display_d3d.c
index ca261b745f..daf11a3331 100644
--- a/menu/drivers_display/menu_display_d3d.c
+++ b/menu/drivers_display/menu_display_d3d.c
@@ -1,4 +1,4 @@
-/*  RetroArch - A frontend for libretro.
+/*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2011-2017 - Daniel De Matteis
  *
  *  RetroArch is free software: you can redistribute it and/or modify it under the terms
@@ -136,7 +136,7 @@ static void menu_display_d3d_draw(void *data)
    if (!d3d || !draw || draw->pipeline.id)
       return;
    if((d3d->menu_display.offset + draw->coords->vertices )
-         > d3d->menu_display.size)
+         > (unsigned)d3d->menu_display.size)
       return;
 
    pv           = (Vertex*)