diff --git a/platform/msvc2010/liblove.vcxproj b/platform/msvc2010/liblove.vcxproj
index 5d6d60780..8bbf1d65a 100644
--- a/platform/msvc2010/liblove.vcxproj
+++ b/platform/msvc2010/liblove.vcxproj
@@ -396,6 +396,10 @@
     <ClCompile Include="..\..\src\libraries\luasocket\libluasocket\wsocket.c" />
     <ClCompile Include="..\..\src\libraries\luasocket\luasocket.cpp" />
     <ClCompile Include="..\..\src\libraries\noise1234\simplexnoise1234.cpp" />
+    <ClCompile Include="..\..\src\libraries\Wuff\wuff.c" />
+    <ClCompile Include="..\..\src\libraries\Wuff\wuff_convert.c" />
+    <ClCompile Include="..\..\src\libraries\Wuff\wuff_internal.c" />
+    <ClCompile Include="..\..\src\libraries\Wuff\wuff_memory.c" />
     <ClCompile Include="..\..\src\modules\audio\Audio.cpp" />
     <ClCompile Include="..\..\src\modules\audio\null\Audio.cpp" />
     <ClCompile Include="..\..\src\modules\audio\null\Source.cpp" />
@@ -531,6 +535,7 @@
     <ClCompile Include="..\..\src\modules\sound\lullaby\Mpg123Decoder.cpp" />
     <ClCompile Include="..\..\src\modules\sound\lullaby\Sound.cpp" />
     <ClCompile Include="..\..\src\modules\sound\lullaby\VorbisDecoder.cpp" />
+    <ClCompile Include="..\..\src\modules\sound\lullaby\WaveDecoder.cpp" />
     <ClCompile Include="..\..\src\modules\sound\Sound.cpp" />
     <ClCompile Include="..\..\src\modules\sound\SoundData.cpp" />
     <ClCompile Include="..\..\src\modules\sound\wrap_Decoder.cpp" />
@@ -661,6 +666,10 @@
     <ClInclude Include="..\..\src\libraries\utf8\utf8\checked.h" />
     <ClInclude Include="..\..\src\libraries\utf8\utf8\core.h" />
     <ClInclude Include="..\..\src\libraries\utf8\utf8\unchecked.h" />
+    <ClInclude Include="..\..\src\libraries\Wuff\wuff.h" />
+    <ClInclude Include="..\..\src\libraries\Wuff\wuff_config.h" />
+    <ClInclude Include="..\..\src\libraries\Wuff\wuff_convert.h" />
+    <ClInclude Include="..\..\src\libraries\Wuff\wuff_internal.h" />
     <ClInclude Include="..\..\src\modules\audio\Audio.h" />
     <ClInclude Include="..\..\src\modules\audio\null\Audio.h" />
     <ClInclude Include="..\..\src\modules\audio\null\Source.h" />
@@ -803,6 +812,7 @@
     <ClInclude Include="..\..\src\modules\sound\lullaby\Mpg123Decoder.h" />
     <ClInclude Include="..\..\src\modules\sound\lullaby\Sound.h" />
     <ClInclude Include="..\..\src\modules\sound\lullaby\VorbisDecoder.h" />
+    <ClInclude Include="..\..\src\modules\sound\lullaby\WaveDecoder.h" />
     <ClInclude Include="..\..\src\modules\sound\Sound.h" />
     <ClInclude Include="..\..\src\modules\sound\SoundData.h" />
     <ClInclude Include="..\..\src\modules\sound\wrap_Decoder.h" />
diff --git a/platform/msvc2010/liblove.vcxproj.filters b/platform/msvc2010/liblove.vcxproj.filters
index e98ed133d..b8b835469 100644
--- a/platform/msvc2010/liblove.vcxproj.filters
+++ b/platform/msvc2010/liblove.vcxproj.filters
@@ -169,6 +169,9 @@
     <Filter Include="modules\system\sdl">
       <UniqueIdentifier>{2241f4ca-a51c-4d8d-be82-2b7dfd267b7b}</UniqueIdentifier>
     </Filter>
+    <Filter Include="libraries\Wuff">
+      <UniqueIdentifier>{4127f9be-b9c3-45bf-968f-888df9d5bc35}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\common\Matrix.cpp">
@@ -915,6 +918,21 @@
     <ClCompile Include="..\..\src\modules\graphics\opengl\Mesh.cpp">
       <Filter>modules\graphics\opengl</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Wuff\wuff_convert.c">
+      <Filter>libraries\Wuff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Wuff\wuff_internal.c">
+      <Filter>libraries\Wuff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Wuff\wuff_memory.c">
+      <Filter>libraries\Wuff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libraries\Wuff\wuff.c">
+      <Filter>libraries\Wuff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\modules\sound\lullaby\WaveDecoder.cpp">
+      <Filter>modules\sound\lullaby</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\scripts\boot.lua">
@@ -1756,6 +1774,21 @@
     <ClInclude Include="..\..\src\modules\graphics\opengl\Mesh.h">
       <Filter>modules\graphics\opengl</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Wuff\wuff.h">
+      <Filter>libraries\Wuff</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Wuff\wuff_config.h">
+      <Filter>libraries\Wuff</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Wuff\wuff_convert.h">
+      <Filter>libraries\Wuff</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libraries\Wuff\wuff_internal.h">
+      <Filter>libraries\Wuff</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\modules\sound\lullaby\WaveDecoder.h">
+      <Filter>modules\sound\lullaby</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="love.rc" />
diff --git a/src/modules/sound/lullaby/WaveDecoder.h b/src/modules/sound/lullaby/WaveDecoder.h
index e8ac57e40..d75719499 100644
--- a/src/modules/sound/lullaby/WaveDecoder.h
+++ b/src/modules/sound/lullaby/WaveDecoder.h
@@ -25,7 +25,6 @@
 #include "common/Data.h"
 #include "Decoder.h"
 
-// vorbis
 #include "libraries/Wuff/wuff.h"
 
 namespace love