diff --git a/core/tremor/misc.h b/core/tremor/misc.h
index f762913..2253c88 100644
--- a/core/tremor/misc.h
+++ b/core/tremor/misc.h
@@ -37,6 +37,7 @@
 #include <sys/types.h>
 #endif
 
+#ifndef _XBOX360
 #if BYTE_ORDER==LITTLE_ENDIAN
 union magic {
   struct {
@@ -45,7 +46,8 @@ union magic {
   } halves;
   ogg_int64_t whole;
 };
-#endif 
+#endif
+#endif
 
 #ifndef ANDROID
 #if BYTE_ORDER==BIG_ENDIAN
diff --git a/core/tremor/os.h b/core/tremor/os.h
index 95e6e27..48d8f54 100644
--- a/core/tremor/os.h
+++ b/core/tremor/os.h
@@ -41,9 +41,11 @@
 #  define rint(x)   (floor((x)+0.5f)) 
 #  define NO_FLOAT_MATH_LIB
 #  define FAST_HYPOT(a, b) sqrt((a)*(a) + (b)*(b))
+#ifndef _XBOX360
 #  define LITTLE_ENDIAN 1
 #  define BYTE_ORDER LITTLE_ENDIAN
 #endif
+#endif
 
 #ifdef HAVE_ALLOCA_H
 #  include <alloca.h>
diff --git a/core/tremor/os_types.h b/core/tremor/os_types.h
index 8af2893..151e59b 100644
--- a/core/tremor/os_types.h
+++ b/core/tremor/os_types.h
@@ -32,7 +32,11 @@
 #define _ogg_realloc realloc
 #define _ogg_free    free
 
+#if defined(_WIN32) && defined(__LIBRETRO__)
+#include <stdint.h>
+#else
 #include <inttypes.h>
+#endif
 
 typedef int64_t ogg_int64_t;
 typedef int32_t ogg_int32_t;
diff --git a/libretro/msvc/msvc-2003-xbox1/msvc-2003-xbox1.vcproj b/libretro/msvc/msvc-2003-xbox1/msvc-2003-xbox1.vcproj
index 2a16177..7a597ad 100644
--- a/libretro/msvc/msvc-2003-xbox1/msvc-2003-xbox1.vcproj
+++ b/libretro/msvc/msvc-2003-xbox1/msvc-2003-xbox1.vcproj
@@ -22,7 +22,7 @@
 				Optimization="0"
 				OptimizeForProcessor="2"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\core&quot;;&quot;$(SolutionDir)\..\..\core\cd_hw&quot;;&quot;$(SolutionDir)\..\..\core\cart_hw&quot;;&quot;$(SolutionDir)\..\..\core\sound&quot;;&quot;$(SolutionDir)\..\..\core\z80&quot;;&quot;$(SolutionDir)\..\..\&quot;;&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)\..\..\core\m68k&quot;;&quot;$(SolutionDir)\..\..\core\input_hw&quot;;&quot;$(SolutionDir)\..\..\core\cart_hw\svp&quot;;&quot;$(SolutionDir)\..\..\core\ntsc&quot;;&quot;$(SolutionDir)\..\..\libretro&quot;;&quot;$(SolutionDir)\msvc-2003-xbox1&quot;"
-				PreprocessorDefinitions="_DEBUG;_XBOX;_XBOX1;_LIB;__LIBRETRO__;LSB_FIRST;USE_16BPP_RENDERING;INLINE=static _inline;__restrict=;FRONTEND_SUPPORTS_RGB565"
+				PreprocessorDefinitions="_DEBUG;_XBOX;_XBOX1;_LIB;__LIBRETRO__;LSB_FIRST;USE_16BPP_RENDERING;INLINE=static _inline;__restrict=;FRONTEND_SUPPORTS_RGB565;USE_LIBTREMOR;BYTE_ORDER=LITTLE_ENDIAN"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -56,7 +56,7 @@
 				OmitFramePointers="TRUE"
 				OptimizeForProcessor="2"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\core&quot;;&quot;$(SolutionDir)\..\..\core\cd_hw&quot;;&quot;$(SolutionDir)\..\..\core\cart_hw&quot;;&quot;$(SolutionDir)\..\..\core\sound&quot;;&quot;$(SolutionDir)\..\..\core\z80&quot;;&quot;$(SolutionDir)\..\..\&quot;;&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)\..\..\core\m68k&quot;;&quot;$(SolutionDir)\..\..\core\input_hw&quot;;&quot;$(SolutionDir)\..\..\core\cart_hw\svp&quot;;&quot;$(SolutionDir)\..\..\core\ntsc&quot;;&quot;$(SolutionDir)\..\..\libretro&quot;;&quot;$(SolutionDir)\msvc-2003-xbox1&quot;"
-				PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;PROFILE;_LIB;__LIBRETRO__;LSB_FIRST;USE_16BPP_RENDERING;INLINE=static _inline;__restrict=;FRONTEND_SUPPORTS_RGB565"
+				PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;PROFILE;_LIB;__LIBRETRO__;LSB_FIRST;USE_16BPP_RENDERING;INLINE=static _inline;__restrict=;FRONTEND_SUPPORTS_RGB565;USE_LIBTREMOR;BYTE_ORDER=LITTLE_ENDIAN"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="TRUE"
@@ -91,7 +91,7 @@
 				OmitFramePointers="TRUE"
 				OptimizeForProcessor="2"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\core&quot;;&quot;$(SolutionDir)\..\..\core\cd_hw&quot;;&quot;$(SolutionDir)\..\..\core\cart_hw&quot;;&quot;$(SolutionDir)\..\..\core\sound&quot;;&quot;$(SolutionDir)\..\..\core\z80&quot;;&quot;$(SolutionDir)\..\..\&quot;;&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)\..\..\core\m68k&quot;;&quot;$(SolutionDir)\..\..\core\input_hw&quot;;&quot;$(SolutionDir)\..\..\core\cart_hw\svp&quot;;&quot;$(SolutionDir)\..\..\core\ntsc&quot;;&quot;$(SolutionDir)\..\..\libretro&quot;;&quot;$(SolutionDir)\msvc-2003-xbox1&quot;"
-				PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;PROFILE;FASTCAP;_LIB;__LIBRETRO__;LSB_FIRST;USE_16BPP_RENDERING;INLINE=static _inline;__restrict=;FRONTEND_SUPPORTS_RGB565"
+				PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;PROFILE;FASTCAP;_LIB;__LIBRETRO__;LSB_FIRST;USE_16BPP_RENDERING;INLINE=static _inline;__restrict=;FRONTEND_SUPPORTS_RGB565;USE_LIBTREMOR;BYTE_ORDER=LITTLE_ENDIAN"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="TRUE"
@@ -127,7 +127,7 @@
 				OmitFramePointers="TRUE"
 				OptimizeForProcessor="2"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\core&quot;;&quot;$(SolutionDir)\..\..\core\cd_hw&quot;;&quot;$(SolutionDir)\..\..\core\cart_hw&quot;;&quot;$(SolutionDir)\..\..\core\sound&quot;;&quot;$(SolutionDir)\..\..\core\z80&quot;;&quot;$(SolutionDir)\..\..\&quot;;&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)\..\..\core\m68k&quot;;&quot;$(SolutionDir)\..\..\core\input_hw&quot;;&quot;$(SolutionDir)\..\..\core\cart_hw\svp&quot;;&quot;$(SolutionDir)\..\..\core\ntsc&quot;;&quot;$(SolutionDir)\..\..\libretro&quot;;&quot;$(SolutionDir)\msvc-2003-xbox1&quot;"
-				PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;_LIB;__LIBRETRO__;LSB_FIRST;USE_16BPP_RENDERING;INLINE=static _inline;__restrict=;FRONTEND_SUPPORTS_RGB565"
+				PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;_LIB;__LIBRETRO__;LSB_FIRST;USE_16BPP_RENDERING;INLINE=static _inline;__restrict=;FRONTEND_SUPPORTS_RGB565;USE_LIBTREMOR;BYTE_ORDER=LITTLE_ENDIAN"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="TRUE"
@@ -163,7 +163,7 @@
 				OmitFramePointers="TRUE"
 				OptimizeForProcessor="2"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\core&quot;;&quot;$(SolutionDir)\..\..\core\cd_hw&quot;;&quot;$(SolutionDir)\..\..\core\cart_hw&quot;;&quot;$(SolutionDir)\..\..\core\sound&quot;;&quot;$(SolutionDir)\..\..\core\z80&quot;;&quot;$(SolutionDir)\..\..\&quot;;&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)\..\..\core\m68k&quot;;&quot;$(SolutionDir)\..\..\core\input_hw&quot;;&quot;$(SolutionDir)\..\..\core\cart_hw\svp&quot;;&quot;$(SolutionDir)\..\..\core\ntsc&quot;;&quot;$(SolutionDir)\..\..\libretro&quot;;&quot;$(SolutionDir)\msvc-2003-xbox1&quot;"
-				PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;LTCG;_LIB;__LIBRETRO__;LSB_FIRST;USE_16BPP_RENDERING;INLINE=static _inline;__restrict=;FRONTEND_SUPPORTS_RGB565"
+				PreprocessorDefinitions="NDEBUG;_XBOX;_XBOX1;LTCG;_LIB;__LIBRETRO__;LSB_FIRST;USE_16BPP_RENDERING;INLINE=static _inline;__restrict=;FRONTEND_SUPPORTS_RGB565;USE_LIBTREMOR;BYTE_ORDER=LITTLE_ENDIAN"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="TRUE"
@@ -527,6 +527,55 @@
 						</FileConfiguration>
 					</File>
 				</Filter>
+				<Filter
+					Name="libtremor"
+					Filter="">
+					<File
+						RelativePath="..\..\..\core\tremor\bitwise.c">
+					</File>
+					<File
+						RelativePath="..\..\..\core\tremor\block.c">
+					</File>
+					<File
+						RelativePath="..\..\..\core\tremor\codebook.c">
+					</File>
+					<File
+						RelativePath="..\..\..\core\tremor\floor0.c">
+					</File>
+					<File
+						RelativePath="..\..\..\core\tremor\floor1.c">
+					</File>
+					<File
+						RelativePath="..\..\..\core\tremor\framing.c">
+					</File>
+					<File
+						RelativePath="..\..\..\core\tremor\info.c">
+					</File>
+					<File
+						RelativePath="..\..\..\core\tremor\mapping0.c">
+					</File>
+					<File
+						RelativePath="..\..\..\core\tremor\mdct.c">
+					</File>
+					<File
+						RelativePath="..\..\..\core\tremor\registry.c">
+					</File>
+					<File
+						RelativePath="..\..\..\core\tremor\res012.c">
+					</File>
+					<File
+						RelativePath="..\..\..\core\tremor\sharedbook.c">
+					</File>
+					<File
+						RelativePath="..\..\..\core\tremor\synthesis.c">
+					</File>
+					<File
+						RelativePath="..\..\..\core\tremor\vorbisfile.c">
+					</File>
+					<File
+						RelativePath="..\..\..\core\tremor\window.c">
+					</File>
+				</Filter>
 			</Filter>
 		</Filter>
 		<Filter
diff --git a/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj b/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj
index a8c2a3e..d1476bf 100644
--- a/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj
+++ b/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj
@@ -148,6 +148,21 @@
     <ClCompile Include="..\..\..\core\sound\ym2612.c" />
     <ClCompile Include="..\..\..\core\state.c" />
     <ClCompile Include="..\..\..\core\system.c" />
+    <ClCompile Include="..\..\..\core\tremor\bitwise.c" />
+    <ClCompile Include="..\..\..\core\tremor\block.c" />
+    <ClCompile Include="..\..\..\core\tremor\codebook.c" />
+    <ClCompile Include="..\..\..\core\tremor\floor0.c" />
+    <ClCompile Include="..\..\..\core\tremor\floor1.c" />
+    <ClCompile Include="..\..\..\core\tremor\framing.c" />
+    <ClCompile Include="..\..\..\core\tremor\info.c" />
+    <ClCompile Include="..\..\..\core\tremor\mapping0.c" />
+    <ClCompile Include="..\..\..\core\tremor\mdct.c" />
+    <ClCompile Include="..\..\..\core\tremor\registry.c" />
+    <ClCompile Include="..\..\..\core\tremor\res012.c" />
+    <ClCompile Include="..\..\..\core\tremor\sharedbook.c" />
+    <ClCompile Include="..\..\..\core\tremor\synthesis.c" />
+    <ClCompile Include="..\..\..\core\tremor\vorbisfile.c" />
+    <ClCompile Include="..\..\..\core\tremor\window.c" />
     <ClCompile Include="..\..\..\core\vdp_ctrl.c" />
     <ClCompile Include="..\..\..\core\vdp_render.c" />
     <ClCompile Include="..\..\..\core\z80\z80.c" />
@@ -242,7 +257,7 @@
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PreprocessorDefinitions>_DEBUG;_XBOX;_XBOX360;_LIB;INLINE=static _inline;__attribute__=;__inline__=_inline;__extension__=;USE_16BPP_RENDERING;__LIBRETRO__;FRONTEND_SUPPORTS_RGB565;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_XBOX;_XBOX360;_LIB;INLINE=static _inline;__attribute__=;__inline__=_inline;__extension__=;USE_16BPP_RENDERING;__LIBRETRO__;FRONTEND_SUPPORTS_RGB565;%(PreprocessorDefinitions);USE_LIBTREMOR;BYTE_ORDER=BIG_ENDIAN</PreprocessorDefinitions>
       <CallAttributedProfiling>Callcap</CallAttributedProfiling>
       <AdditionalIncludeDirectories>$(SolutionDir)\..\..\core;$(SolutionDir)\..\..\core\cd_hw;$(SolutionDir)\..\..\core\cart_hw;$(SolutionDir)\..\..\core\sound;$(SolutionDir)\..\..\core\z80;$(SolutionDir)\..\..\core\m68k;$(SolutionDir)\..\..\core\input_hw;$(SolutionDir)\..\..\core\cart_hw\svp;$(SolutionDir)\..\..\core\ntsc;$(SolutionDir)\..\;$(SolutionDir)\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsC</CompileAs>
@@ -263,7 +278,7 @@
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PreprocessorDefinitions>_DEBUG;_XBOX;_XBOX360;_LIB;%(PreprocessorDefinitions);INLINE=static _inline;__attribute__=;__inline__=_inline;__extension__=;USE_16BPP_RENDERING;__LIBRETRO__;FRONTEND_SUPPORTS_RGB565</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_XBOX;_XBOX360;_LIB;%(PreprocessorDefinitions);INLINE=static _inline;__attribute__=;__inline__=_inline;__extension__=;USE_16BPP_RENDERING;__LIBRETRO__;FRONTEND_SUPPORTS_RGB565;USE_LIBTREMOR;BYTE_ORDER=BIG_ENDIAN</PreprocessorDefinitions>
       <CallAttributedProfiling>Callcap</CallAttributedProfiling>
       <AdditionalIncludeDirectories>$(SolutionDir)\..\..\core;$(SolutionDir)\..\..\core\cd_hw;$(SolutionDir)\..\..\core\cart_hw;$(SolutionDir)\..\..\core\sound;$(SolutionDir)\..\..\core\z80;$(SolutionDir)\..\..\core\m68k;$(SolutionDir)\..\..\core\input_hw;$(SolutionDir)\..\..\core\cart_hw\svp;$(SolutionDir)\..\..\core\ntsc;$(SolutionDir)\..\;$(SolutionDir)\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsC</CompileAs>
@@ -285,7 +300,7 @@
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PreprocessorDefinitions>NDEBUG;_XBOX;_XBOX360;PROFILE;_LIB;__LIBRETRO__;USE_16BPP_RENDERING;INLINE=static _inline;FRONTEND_SUPPORTS_RGB565;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_XBOX;_XBOX360;PROFILE;_LIB;__LIBRETRO__;USE_16BPP_RENDERING;INLINE=static _inline;FRONTEND_SUPPORTS_RGB565;%(PreprocessorDefinitions);USE_LIBTREMOR;BYTE_ORDER=BIG_ENDIAN</PreprocessorDefinitions>
       <CallAttributedProfiling>Callcap</CallAttributedProfiling>
       <AdditionalIncludeDirectories>$(SolutionDir)\..\..\core;$(SolutionDir)\..\..\core\cd_hw;$(SolutionDir)\..\..\core\cart_hw;$(SolutionDir)\..\..\core\sound;$(SolutionDir)\..\..\core\z80;$(SolutionDir)\..\..\core\m68k;$(SolutionDir)\..\..\core\input_hw;$(SolutionDir)\..\..\core\cart_hw\svp;$(SolutionDir)\..\..\core\ntsc;$(SolutionDir)\..\;$(SolutionDir)\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsC</CompileAs>
@@ -311,7 +326,7 @@
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PreprocessorDefinitions>NDEBUG;_XBOX;_XBOX360;PROFILE;FASTCAP;_LIB;__LIBRETRO__;USE_16BPP_RENDERING;INLINE=static _inline;FRONTEND_SUPPORTS_RGB565;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_XBOX;_XBOX360;PROFILE;FASTCAP;_LIB;__LIBRETRO__;USE_16BPP_RENDERING;INLINE=static _inline;FRONTEND_SUPPORTS_RGB565;%(PreprocessorDefinitions);USE_LIBTREMOR;BYTE_ORDER=BIG_ENDIAN</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)\..\..\core;$(SolutionDir)\..\..\core\cd_hw;$(SolutionDir)\..\..\core\cart_hw;$(SolutionDir)\..\..\core\sound;$(SolutionDir)\..\..\core\z80;$(SolutionDir)\..\..\core\m68k;$(SolutionDir)\..\..\core\input_hw;$(SolutionDir)\..\..\core\cart_hw\svp;$(SolutionDir)\..\..\core\ntsc;$(SolutionDir)\..\;$(SolutionDir)\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
@@ -334,7 +349,7 @@
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PreprocessorDefinitions>NDEBUG;_XBOX;_XBOX360;_LIB;INLINE=static _inline;__inline__=_inline;__extension__=;USE_16BPP_RENDERING;__LIBRETRO__;FRONTEND_SUPPORTS_RGB565;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_XBOX;_XBOX360;_LIB;INLINE=static _inline;__inline__=_inline;__extension__=;USE_16BPP_RENDERING;__LIBRETRO__;FRONTEND_SUPPORTS_RGB565;%(PreprocessorDefinitions);USE_LIBTREMOR;BYTE_ORDER=BIG_ENDIAN</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)\..\..\core;$(SolutionDir)\..\..\core\cd_hw;$(SolutionDir)\..\..\core\cart_hw;$(SolutionDir)\..\..\core\sound;$(SolutionDir)\..\..\core\z80;$(SolutionDir)\..\..\core\m68k;$(SolutionDir)\..\..\core\input_hw;$(SolutionDir)\..\..\core\cart_hw\svp;$(SolutionDir)\..\..\core\ntsc;$(SolutionDir)\..\;$(SolutionDir)\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
@@ -357,7 +372,7 @@
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <PrecompiledHeaderOutputFile>$(OutDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PreprocessorDefinitions>NDEBUG;_XBOX;_XBOX360;LTCG;_LIB;INLINE=static _inline;__inline__=_inline;__extension__=;USE_16BPP_RENDERING;__LIBRETRO__;FRONTEND_SUPPORTS_RGB565;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_XBOX;_XBOX360;LTCG;_LIB;INLINE=static _inline;__inline__=_inline;__extension__=;USE_16BPP_RENDERING;__LIBRETRO__;FRONTEND_SUPPORTS_RGB565;%(PreprocessorDefinitions);USE_LIBTREMOR;BYTE_ORDER=BIG_ENDIAN</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)\..\..\core;$(SolutionDir)\..\..\core\cd_hw;$(SolutionDir)\..\..\core\cart_hw;$(SolutionDir)\..\..\core\sound;$(SolutionDir)\..\..\core\z80;$(SolutionDir)\..\..\core\m68k;$(SolutionDir)\..\..\core\input_hw;$(SolutionDir)\..\..\core\cart_hw\svp;$(SolutionDir)\..\..\core\ntsc;$(SolutionDir)\..\;$(SolutionDir)\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
@@ -370,4 +385,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj.filters b/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj.filters
index 657a081..cd37e39 100644
--- a/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj.filters
+++ b/libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj.filters
@@ -36,6 +36,9 @@
     <Filter Include="Source Files\cd_hw">
       <UniqueIdentifier>{d8d4356b-c678-422e-aa12-9f52ba60fdbc}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\tremor">
+      <UniqueIdentifier>{d1768684-24bc-4639-8b7c-481d2281d4cf}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\core\vdp_render.c">
@@ -182,5 +185,50 @@
     <ClCompile Include="..\..\..\core\cart_hw\eeprom_i2c.c">
       <Filter>Source Files\cart_hw</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\window.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\bitwise.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\block.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\codebook.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\floor0.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\floor1.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\framing.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\info.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\mapping0.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\mdct.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\registry.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\res012.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\sharedbook.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\synthesis.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\vorbisfile.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/libretro/msvc/msvc-2010/msvc-2010.vcxproj b/libretro/msvc/msvc-2010/msvc-2010.vcxproj
index fbd29b1..11ed4df 100644
--- a/libretro/msvc/msvc-2010/msvc-2010.vcxproj
+++ b/libretro/msvc/msvc-2010/msvc-2010.vcxproj
@@ -55,6 +55,21 @@
     <ClCompile Include="..\..\..\core\sound\ym2612.c" />
     <ClCompile Include="..\..\..\core\state.c" />
     <ClCompile Include="..\..\..\core\system.c" />
+    <ClCompile Include="..\..\..\core\tremor\bitwise.c" />
+    <ClCompile Include="..\..\..\core\tremor\block.c" />
+    <ClCompile Include="..\..\..\core\tremor\codebook.c" />
+    <ClCompile Include="..\..\..\core\tremor\floor0.c" />
+    <ClCompile Include="..\..\..\core\tremor\floor1.c" />
+    <ClCompile Include="..\..\..\core\tremor\framing.c" />
+    <ClCompile Include="..\..\..\core\tremor\info.c" />
+    <ClCompile Include="..\..\..\core\tremor\mapping0.c" />
+    <ClCompile Include="..\..\..\core\tremor\mdct.c" />
+    <ClCompile Include="..\..\..\core\tremor\registry.c" />
+    <ClCompile Include="..\..\..\core\tremor\res012.c" />
+    <ClCompile Include="..\..\..\core\tremor\sharedbook.c" />
+    <ClCompile Include="..\..\..\core\tremor\synthesis.c" />
+    <ClCompile Include="..\..\..\core\tremor\vorbisfile.c" />
+    <ClCompile Include="..\..\..\core\tremor\window.c" />
     <ClCompile Include="..\..\..\core\vdp_ctrl.c" />
     <ClCompile Include="..\..\..\core\vdp_render.c" />
     <ClCompile Include="..\..\..\core\z80\z80.c" />
@@ -101,7 +116,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MSVC2010_EXPORTS;_CRT_SECURE_NO_WARNINGS;INLINE=static _inline;__inline__=_inline;__extension__=;LSB_FIRST;__LIBRETRO__;USE_16BPP_RENDERING;FRONTEND_SUPPORTS_RGB565;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MSVC2010_EXPORTS;_CRT_SECURE_NO_WARNINGS;INLINE=static _inline;__inline__=_inline;__extension__=;LSB_FIRST;__LIBRETRO__;USE_16BPP_RENDERING;FRONTEND_SUPPORTS_RGB565;%(PreprocessorDefinitions);USE_LIBTREMOR;BYTE_ORDER=LITTLE_ENDIAN</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)/../../core;$(SolutionDir)/../../utils/zlib;$(SolutionDir)/../../core/cart_hw/svp;$(SolutionDir)/../../libretro;$(SolutionDir)/../../core/m68k;$(SolutionDir)/../../core/z80;$(SolutionDir)/../../core/input_hw;$(SolutionDir)/../../core/cart_hw;$(SolutionDir)/../../core/sound;$(SolutionDir)/../../core/ntsc;$(SolutionDir)/../../core/cd_hw;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
@@ -118,7 +133,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MSVC2010_EXPORTS;_CRT_SECURE_NO_WARNINGS;INLINE=static _inline;__inline__=_inline;__extension__=;LSB_FIRST;__LIBRETRO__;USE_16BPP_RENDERING;FRONTEND_SUPPORTS_RGB565;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MSVC2010_EXPORTS;_CRT_SECURE_NO_WARNINGS;INLINE=static _inline;__inline__=_inline;__extension__=;LSB_FIRST;__LIBRETRO__;USE_16BPP_RENDERING;FRONTEND_SUPPORTS_RGB565;%(PreprocessorDefinitions);USE_LIBTREMOR;BYTE_ORDER=LITTLE_ENDIAN</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)/../../core;$(SolutionDir)/../../utils/zlib;$(SolutionDir)/../../core/cart_hw/svp;$(SolutionDir)/../../libretro;$(SolutionDir)/../../core/m68k;$(SolutionDir)/../../core/z80;$(SolutionDir)/../../core/input_hw;$(SolutionDir)/../../core/cart_hw;$(SolutionDir)/../../core/sound;$(SolutionDir)/../../core/ntsc;$(SolutionDir)/../../core/cd_hw;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
diff --git a/libretro/msvc/msvc-2010/msvc-2010.vcxproj.filters b/libretro/msvc/msvc-2010/msvc-2010.vcxproj.filters
index 42f5874..262e025 100644
--- a/libretro/msvc/msvc-2010/msvc-2010.vcxproj.filters
+++ b/libretro/msvc/msvc-2010/msvc-2010.vcxproj.filters
@@ -40,6 +40,9 @@
     <Filter Include="Source Files\cd_hw">
       <UniqueIdentifier>{eba4b43d-dbd8-4170-9853-e3234db6dfc0}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\tremor">
+      <UniqueIdentifier>{c4a5e1da-1ff3-4c81-893c-97364ed7ed4b}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\core\cart_hw\svp\svp.c">
@@ -189,5 +192,50 @@
     <ClCompile Include="..\..\..\core\sound\blip_buf.c">
       <Filter>Source Files\sound</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\window.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\bitwise.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\block.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\codebook.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\floor0.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\floor1.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\framing.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\info.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\mapping0.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\mdct.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\registry.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\res012.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\sharedbook.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\synthesis.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\core\tremor\vorbisfile.c">
+      <Filter>Source Files\tremor</Filter>
+    </ClCompile>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file