diff --git a/desmume/src/GPU.cpp b/desmume/src/GPU.cpp
index 823f0ef03..cf230c715 100644
--- a/desmume/src/GPU.cpp
+++ b/desmume/src/GPU.cpp
@@ -38,12 +38,12 @@
 #include "NDSSystem.h"
 #include "readwrite.h"
 
-//#undef FORCEINLINE
-//#define FORCEINLINE
-//#define SSE2_NOINTRIN
-
-//compilation speed hack (cuts time exactly in half by cutting out permutations)
-//#define DISABLE_MOSAIC
+//#ifdef FASTBUILD
+//	#undef FORCEINLINE
+//	#define FORCEINLINE
+//	//compilation speed hack (cuts time exactly in half by cutting out permutations)
+//	#define DISABLE_MOSAIC
+//#endif
 
 extern BOOL click;
 NDS_Screen MainScreen;
diff --git a/desmume/src/SPU.cpp b/desmume/src/SPU.cpp
index 8bab4fbf9..54bf34bb5 100644
--- a/desmume/src/SPU.cpp
+++ b/desmume/src/SPU.cpp
@@ -47,10 +47,10 @@
 
 #define K_ADPCM_LOOPING_RECOVERY_INDEX 99999
 
-//#undef FORCEINLINE
-//#define FORCEINLINE
-
-
+//#ifdef FASTBUILD
+//	#undef FORCEINLINE
+//	#define FORCEINLINE
+//#endif
 
 //static ISynchronizingAudioBuffer* synchronizer = metaspu_construct(ESynchMethod_Z);
 static ISynchronizingAudioBuffer* synchronizer = metaspu_construct(ESynchMethod_N);
diff --git a/desmume/src/windows/DeSmuME_2008.vcproj b/desmume/src/windows/DeSmuME_2008.vcproj
index 772e1cee3..5ca6f941e 100644
--- a/desmume/src/windows/DeSmuME_2008.vcproj
+++ b/desmume/src/windows/DeSmuME_2008.vcproj
@@ -77,7 +77,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="lua-vc8-Win32-debug.lib glib-vc8-Win32.lib 7z-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib lua-5.1.4-x86d.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib shlwapi.lib winpcap\wpcap.lib comctl32.lib"
+				AdditionalDependencies="lua-vc8-Win32-debug.lib glib-vc8-Win32.lib 7z-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib shlwapi.lib winpcap\wpcap.lib comctl32.lib"
 				OutputFile="$(OutDir)\$(ProjectName)_debug.exe"
 				AdditionalLibraryDirectories=".\zlib123;glib-2.20.1;.\lua;.\7z;agg"
 				DelayLoadDLLs="wpcap.dll"
@@ -259,7 +259,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="lua-vc8-Win32.lib glib-vc8-Win32.lib 7z-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib lua-5.1.4-x86.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib shlwapi.lib winpcap\wpcap.lib comctl32.lib"
+				AdditionalDependencies="lua-vc8-Win32.lib glib-vc8-Win32.lib 7z-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib shlwapi.lib winpcap\wpcap.lib comctl32.lib"
 				OutputFile="$(OutDir)\$(ProjectName)_release.exe"
 				AdditionalLibraryDirectories=".\zlib123;glib-2.20.1;.\lua;.\7z;agg"
 				DelayLoadDLLs="wpcap.dll"
@@ -447,7 +447,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="lua-vc8-Win32.lib glib-vc8-Win32.lib 7z-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib lua-5.1.4-x86.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib shlwapi.lib winpcap\wpcap.lib comctl32.lib"
+				AdditionalDependencies="lua-vc8-Win32.lib glib-vc8-Win32.lib 7z-vc8-Win32.lib zlib-vc8-Win32.lib agg-2.5.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib shlwapi.lib winpcap\wpcap.lib comctl32.lib"
 				OutputFile="$(OutDir)\$(ProjectName)_releaseFastBuild.exe"
 				AdditionalLibraryDirectories=".\zlib123;glib-2.20.1;.\lua;.\7z;agg"
 				DelayLoadDLLs="wpcap.dll"