diff --git a/aegisub/tinderbox/windows/anpan.bat b/aegisub/tinderbox/windows/anpan.bat
index ddd02cc5b..765f477a4 100755
--- a/aegisub/tinderbox/windows/anpan.bat
+++ b/aegisub/tinderbox/windows/anpan.bat
@@ -28,9 +28,9 @@ set TMP=%LOCALAPPDATA%\Temp
 set INCLUDE=%VCINSTALLDIR%\ATLMFC\INCLUDE;%VCINSTALLDIR%\INCLUDE
 set INCLUDE=%INCLUDE%;%WindowsSdkDir%\include
 set INCLUDE=%INCLUDE%;%DXSDK_DIR%\Include
-set INCLUDE=%INCLUDE%;%HOME%\Dev\wxWidgets-2.9\install\include
-set INCLUDE=%INCLUDE%;%HOME%\Dev\freetype-2.3.9\include
-set INCLUDE=%INCLUDE%;%HOME%\Dev\portaudio\include
+set INCLUDE=%INCLUDE%;%HOME%\Dev\wxlib\include
+set INCLUDE=%INCLUDE%;%HOME%\Dev\src\freetype-2.3.9\include
+set INCLUDE=%INCLUDE%;%HOME%\Dev\src\portaudio\include
 
 set Framework35Version=v3.5
 set FrameworkVersion=v2.0.50727
@@ -43,10 +43,10 @@ if /i "%2"=="x64" goto set64
 set LIB=%VCINSTALLDIR%\ATLMFC\LIB;%VCINSTALLDIR%\LIB
 set LIB=%LIB%;%WindowsSdkDir%\lib
 set LIB=%LIB%;%DXSDK_DIR%\Lib\x86
-set LIB=%LIB%;%HOME%\Dev\wxWidgets-2.9\install\lib32
-set LIB=%LIB%;%HOME%\Dev\freetype-2.3.9\objs\win32\vc2008
-set LIB=%LIB%;%HOME%\Dev\portaudio\lib
-set LIB=%LIB%;%HOME%\Dev\ffms2\lib
+set LIB=%LIB%;%HOME%\Dev\wxlib\lib32
+set LIB=%LIB%;%HOME%\Dev\src\freetype-2.3.9\objs\win32\vc2008
+set LIB=%LIB%;%HOME%\Dev\src\portaudio\lib
+set LIB=%LIB%;%HOME%\Dev\src\ffms2\lib
 set FrameworkDir=C:\Windows\Microsoft.NET\Framework
 set LIBPATH=C:\Windows\Microsoft.NET\Framework\v3.5;C:\Windows\Microsoft.NET\Framework\v2.0.50727;C:\Windows\Microsoft.NET\Framework\v3.5;C:\Windows\Microsoft.NET\Framework\v2.0.50727;C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\ATLMFC\LIB;C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\LIB;
 set Path=C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\BIN;C:\Windows\Microsoft.NET\Framework\v3.5;C:\Windows\Microsoft.NET\Framework\v3.5\Microsoft .NET Framework 3.5 (Pre-Release Version);C:\Windows\Microsoft.NET\Framework\v2.0.50727;C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\VCPackages;C:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\IDE;C:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\Tools;C:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\Tools\bin;C:\Program Files\Microsoft SDKs\Windows\v6.0A\bin;C:\Program Files (x86)\CollabNet Subversion Server;C:\cygwin\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Program Files\TortoiseSVN\bin;C:\Python25;C:\Python25\Scripts
@@ -56,9 +56,9 @@ goto startbuild
 set LIB=%VCINSTALLDIR%\ATLMFC\LIB\amd64;%VCINSTALLDIR%\LIB\amd64
 set LIB=%LIB%;%WindowsSdkDir%\lib\x64
 set LIB=%LIB%;%DXSDK_DIR%\Lib\x64
-set LIB=%LIB%;%HOME%\Dev\wxWidgets-2.9\install\lib64
-set LIB=%LIB%;%HOME%\Dev\freetype-2.3.9\objs\win32\vc2008_64
-set LIB=%LIB%;%HOME%\Dev\portaudio\lib
+set LIB=%LIB%;%HOME%\Dev\wxlib\lib64
+set LIB=%LIB%;%HOME%\Dev\src\freetype-2.3.9\objs\win32\vc2008_64
+set LIB=%LIB%;%HOME%\Dev\src\portaudio\lib
 set FrameworkDir=C:\Windows\Microsoft.NET\Framework64
 set LIBPATH=C:\Windows\Microsoft.NET\Framework64\v3.5;C:\Windows\Microsoft.NET\Framework64\v2.0.50727;C:\Windows\Microsoft.NET\Framework64\v3.5;C:\Windows\Microsoft.NET\Framework64\v2.0.50727;C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\ATLMFC\LIB\amd64;C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\LIB\amd64;
 set Path=C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\BIN\amd64;C:\Windows\Microsoft.NET\Framework64\v3.5;C:\Windows\Microsoft.NET\Framework64\v3.5\Microsoft .NET Framework 3.5 (Pre-Release Version);C:\Windows\Microsoft.NET\Framework64\v2.0.50727;C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\VCPackages;C:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\IDE;C:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\Tools;C:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\Tools\bin;C:\Program Files\Microsoft SDKs\Windows\v6.0A\bin\x64;C:\Program Files\Microsoft SDKs\Windows\v6.0A\bin\win64\x64;C:\Program Files\Microsoft SDKs\Windows\v6.0A\bin;C:\Program Files (x86)\CollabNet Subversion Server;C:\cygwin\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Program Files\TortoiseSVN\bin;C:\Python25;C:\Python25\Scripts