diff --git a/griffin/griffin.c b/griffin/griffin.c
index f1fb84dafb..1c52069b22 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -99,8 +99,6 @@ VIDEO CONTEXT
 
 #if defined(__CELLOS_LV2__)
 #include "../gfx/drivers_context/ps3_ctx.c"
-#elif defined(HAVE_D3D)
-#include "../gfx/drivers_context/d3d_ctx.cpp"
 #elif defined(ANDROID)
 #include "../gfx/drivers_context/androidegl_ctx.c"
 #elif defined(__QNX__)
@@ -199,10 +197,6 @@ VIDEO DRIVER
 #include "../gfx/drivers/omap_gfx.c"
 #endif
 
-#ifdef _XBOX
-#include "../xdk/xdk_resources.cpp"
-#endif
-
 #ifdef HAVE_OPENGL
 #include "../gfx/drivers/gl.c"
 #include "../gfx/drivers/gl_common.c"
@@ -223,15 +217,7 @@ VIDEO DRIVER
 #endif
 
 #if defined(HAVE_D3D)
-#include "../gfx/d3d/d3d_wrapper.cpp"
-#include "../gfx/d3d/d3d.cpp"
 #include "../gfx/d3d/render_chain_driver.c"
-#ifdef _XBOX
-#include "../gfx/d3d/render_chain_xdk.cpp"
-#endif
-#ifdef HAVE_CG
-#include "../gfx/d3d/render_chain_cg.cpp"
-#endif
 #include "../gfx/d3d/render_chain_null.c"
 #endif
 
@@ -262,10 +248,6 @@ FONTS
 #include "../gfx/drivers_font_renderer/coretext.c"
 #endif
 
-#if defined(HAVE_D3D9) && !defined(_XBOX)
-#include "../gfx/drivers_font/d3d_w32_font.cpp"
-#endif
-
 #if defined(HAVE_LIBDBGFONT)
 #include "../gfx/drivers_font/ps_libdbgfont.c"
 #endif
@@ -479,10 +461,6 @@ AUDIO
 #include "../audio/drivers/ctr_audio.c"
 #endif
 
-#ifdef HAVE_XAUDIO
-#include "../audio/drivers/xaudio.cpp"
-#endif
-
 #ifdef HAVE_DSOUND
 #include "../audio/drivers/dsound.c"
 #endif
@@ -735,10 +713,6 @@ MENU
 #include "../menu/drivers/rgui.c"
 #endif
 
-#ifdef HAVE_RMENU_XUI
-#include "../menu/drivers/rmenu_xui.cpp"
-#endif
-
 #ifdef HAVE_OPENGL
 
 #ifdef HAVE_XMB
diff --git a/griffin/griffin_cpp.cpp b/griffin/griffin_cpp.cpp
index 0c6848a905..b6fe1bb445 100644
--- a/griffin/griffin_cpp.cpp
+++ b/griffin/griffin_cpp.cpp
@@ -28,3 +28,51 @@
 #ifdef HAVE_QT
 #include "../ui/drivers/ui_qt.cpp"
 #endif
+
+/*============================================================
+AUDIO
+============================================================ */
+#ifdef HAVE_XAUDIO
+#include "../audio/drivers/xaudio.cpp"
+#endif
+
+/*============================================================
+MENU
+============================================================ */
+#ifdef HAVE_RMENU_XUI
+#include "../menu/drivers/rmenu_xui.cpp"
+#endif
+
+/*============================================================
+VIDEO CONTEXT
+============================================================ */
+
+#if defined(HAVE_D3D)
+#include "../gfx/drivers_context/d3d_ctx.cpp"
+#endif
+
+/*============================================================
+VIDEO DRIVER
+============================================================ */
+#ifdef _XBOX
+#include "../xdk/xdk_resources.cpp"
+#endif
+
+#if defined(HAVE_D3D)
+#include "../gfx/d3d/d3d_wrapper.cpp"
+#include "../gfx/d3d/d3d.cpp"
+#ifdef _XBOX
+#include "../gfx/d3d/render_chain_xdk.cpp"
+#endif
+#ifdef HAVE_CG
+#include "../gfx/d3d/render_chain_cg.cpp"
+#endif
+#endif
+
+/*============================================================
+FONTS
+============================================================ */
+
+#if defined(HAVE_D3D9) && !defined(_XBOX)
+#include "../gfx/drivers_font/d3d_w32_font.cpp"
+#endif
\ No newline at end of file
diff --git a/menu/drivers/rmenu_xui.cpp b/menu/drivers/rmenu_xui.cpp
index 912232f35c..be28f63337 100644
--- a/menu/drivers/rmenu_xui.cpp
+++ b/menu/drivers/rmenu_xui.cpp
@@ -24,6 +24,8 @@
 #include <xui.h>
 #include <xuiapp.h>
 
+#include <file/file_path.h>
+
 #include "../menu_driver.h"
 #include "../menu.h"
 #include "../menu_list.h"
diff --git a/msvc/RetroArch-360/RetroArch-360.vcxproj b/msvc/RetroArch-360/RetroArch-360.vcxproj
index 02c94a4099..7bb6e97d9a 100644
--- a/msvc/RetroArch-360/RetroArch-360.vcxproj
+++ b/msvc/RetroArch-360/RetroArch-360.vcxproj
@@ -356,6 +356,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\griffin\griffin.c" />
+    <ClCompile Include="..\..\griffin\griffin_cpp.cpp" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\media\360\rarch.ttf">
@@ -437,4 +438,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/msvc/RetroArch-360/RetroArch-360.vcxproj.filters b/msvc/RetroArch-360/RetroArch-360.vcxproj.filters
index c15e73bc9f..70fb58d33f 100644
--- a/msvc/RetroArch-360/RetroArch-360.vcxproj.filters
+++ b/msvc/RetroArch-360/RetroArch-360.vcxproj.filters
@@ -1,40 +1,43 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Source Files\media">
-      <UniqueIdentifier>{b7d54b1f-ffda-45f9-8175-7bf67010253d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\media\sd">
-      <UniqueIdentifier>{d50021e0-79f4-42c0-b190-1c31fa4fe2b2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\media\hd">
-      <UniqueIdentifier>{76fa04d8-4379-4b8c-ae79-2aa78d380e06}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\griffin\griffin.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\media\360\Arial_12.rdf">
-      <Filter>Source Files\media</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\..\media\360\sd\rarch_main.xui">
-      <Filter>Source Files\media\sd</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\..\media\360\hd\rarch_main.xui">
-      <Filter>Source Files\media\hd</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\..\media\360\rarch.ttf">
-      <Filter>Source Files\media</Filter>
-    </CustomBuild>
-    <CustomBuild Include="..\..\media\360\rarch_scene_skin.xui">
-      <Filter>Source Files\media</Filter>
-    </CustomBuild>
-  </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Source Files\media">
+      <UniqueIdentifier>{b7d54b1f-ffda-45f9-8175-7bf67010253d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\media\sd">
+      <UniqueIdentifier>{d50021e0-79f4-42c0-b190-1c31fa4fe2b2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\media\hd">
+      <UniqueIdentifier>{76fa04d8-4379-4b8c-ae79-2aa78d380e06}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\griffin\griffin.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\griffin\griffin_cpp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\media\360\Arial_12.rdf">
+      <Filter>Source Files\media</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\media\360\sd\rarch_main.xui">
+      <Filter>Source Files\media\sd</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\media\360\hd\rarch_main.xui">
+      <Filter>Source Files\media\hd</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\media\360\rarch.ttf">
+      <Filter>Source Files\media</Filter>
+    </CustomBuild>
+    <CustomBuild Include="..\..\media\360\rarch_scene_skin.xui">
+      <Filter>Source Files\media</Filter>
+    </CustomBuild>
+  </ItemGroup>
 </Project>
\ No newline at end of file