diff --git a/gfx/drivers/d3d11.c b/gfx/drivers/d3d11.c
index fb8077f1cc..2a9e1ce426 100644
--- a/gfx/drivers/d3d11.c
+++ b/gfx/drivers/d3d11.c
@@ -1270,15 +1270,15 @@ static bool d3d11_gfx_frame(
    }
    else if (video_info->statistics_show)
    {
-      struct font_params *osd_params = (struct font_params*)
-         &video_info->osd_stat_params;
+      struct font_params* osd_params = (struct font_params*)&video_info->osd_stat_params;
 
       if (osd_params)
       {
          D3D11SetViewports(context, 1, &d3d11->viewport);
          D3D11SetBlendState(d3d11->context, d3d11->blend_enable, NULL, D3D11_DEFAULT_SAMPLE_MASK);
          D3D11SetVertexBuffer(context, 0, d3d11->sprites.vbo, sizeof(d3d11_sprite_t), 0);
-         font_driver_render_msg(video_info, NULL, video_info->stat_text,
+         font_driver_render_msg(
+               video_info, NULL, video_info->stat_text,
                (const struct font_params*)&video_info->osd_stat_params);
       }
    }
@@ -1443,7 +1443,7 @@ static void d3d11_gfx_set_osd_msg(
    if (d3d11)
    {
       if (d3d11->sprites.enabled)
-         font_driver_render_msg(video_info, font, msg, params);
+         font_driver_render_msg(video_info, font, msg, (const struct font_params*)params);
       else
          printf("OSD msg: %s\n", msg);
    }
diff --git a/gfx/drivers/d3d9.c b/gfx/drivers/d3d9.c
index b9a5afcab1..24b54dcf77 100644
--- a/gfx/drivers/d3d9.c
+++ b/gfx/drivers/d3d9.c
@@ -1072,7 +1072,7 @@ static void d3d9_set_osd_msg(void *data,
       d3d->renderchain_driver->set_font_rect(d3d, params);
 
    d3d9_begin_scene(d3d->dev);
-   font_driver_render_msg(video_info, font, msg, params);
+   font_driver_render_msg(video_info, font, msg, (const struct font_params *)params);
    d3d9_end_scene(d3d->dev);
 }
 
diff --git a/gfx/drivers/gdi_gfx.c b/gfx/drivers/gdi_gfx.c
index 7025cd9711..6ac92b19c4 100644
--- a/gfx/drivers/gdi_gfx.c
+++ b/gfx/drivers/gdi_gfx.c
@@ -498,7 +498,7 @@ static void gdi_set_osd_msg(void *data,
       const char *msg,
       const void *params, void *font)
 {
-   font_driver_render_msg(video_info, font, msg, params);
+   font_driver_render_msg(video_info, font, msg, (const struct font_params *)params);
 }
 
 static void gdi_get_video_output_size(void *data,
diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
index 940e663dcb..720a4b238b 100644
--- a/gfx/drivers/gl.c
+++ b/gfx/drivers/gl.c
@@ -853,7 +853,7 @@ static void gl_set_osd_msg(void *data,
       const char *msg,
       const void *params, void *font)
 {
-   font_driver_render_msg(video_info, font, msg, params);
+   font_driver_render_msg(video_info, font, msg, (const struct font_params *)params);
 }
 
 #if defined(HAVE_MENU)
diff --git a/gfx/drivers/vulkan.c b/gfx/drivers/vulkan.c
index 722f45a176..cb62be8ffc 100644
--- a/gfx/drivers/vulkan.c
+++ b/gfx/drivers/vulkan.c
@@ -2219,7 +2219,7 @@ static void vulkan_set_osd_msg(void *data,
       const char *msg,
       const void *params, void *font)
 {
-   font_driver_render_msg(video_info, font, msg, params);
+   font_driver_render_msg(video_info, font, msg, (const struct font_params *)params);
 }
 
 static uintptr_t vulkan_load_texture(void *video_data, void *data,
diff --git a/pkg/msvc/msvc-2015/RetroArch-msvc2015.vcxproj b/pkg/msvc/msvc-2015/RetroArch-msvc2015.vcxproj
index 9016d5e002..eb0955f903 100644
--- a/pkg/msvc/msvc-2015/RetroArch-msvc2015.vcxproj
+++ b/pkg/msvc/msvc-2015/RetroArch-msvc2015.vcxproj
@@ -233,6 +233,7 @@
       <AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\gfx\include\dxsdk;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
+      <AdditionalOptions>/bigobj</AdditionalOptions>
       <FloatingPointModel>Fast</FloatingPointModel>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
     </ClCompile>
@@ -376,4 +377,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>