diff --git a/build/win32/vc8/JUCE.vcproj b/build/win32/vc8/JUCE.vcproj
index fee40932a6..981fd9828c 100644
--- a/build/win32/vc8/JUCE.vcproj
+++ b/build/win32/vc8/JUCE.vcproj
@@ -114,6 +114,7 @@
 				InlineFunctionExpansion="1"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
+				WholeProgramOptimization="true"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -5028,6 +5029,78 @@
 							RelativePath="..\..\..\src\juce_core\io\network\juce_URL.h"
 							>
 						</File>
+						<Filter
+							Name="win32_code"
+							>
+							<File
+								RelativePath="..\platform_specific_code\juce_win32_ASIO.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\platform_specific_code\juce_win32_AudioCDReader.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\platform_specific_code\juce_win32_DirectSound.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\platform_specific_code\juce_win32_DynamicLibraryLoader.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\platform_specific_code\juce_win32_DynamicLibraryLoader.h"
+								>
+							</File>
+							<File
+								RelativePath="..\platform_specific_code\juce_win32_FileChooser.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\platform_specific_code\juce_win32_Files.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\platform_specific_code\juce_win32_Fonts.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\platform_specific_code\juce_win32_Messaging.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\platform_specific_code\juce_win32_Midi.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\platform_specific_code\juce_win32_Misc.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\platform_specific_code\juce_win32_Network.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\platform_specific_code\juce_win32_PlatformUtils.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\platform_specific_code\juce_win32_SystemStats.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\platform_specific_code\juce_win32_Threads.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\platform_specific_code\juce_win32_Windowing.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\platform_specific_code\win32_headers.h"
+								>
+							</File>
+						</Filter>
 					</Filter>
 					<Filter
 						Name="streams"
@@ -6007,78 +6080,6 @@
 					</File>
 				</Filter>
 			</Filter>
-			<Filter
-				Name="win32_code"
-				>
-				<File
-					RelativePath="..\platform_specific_code\juce_win32_ASIO.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\platform_specific_code\juce_win32_AudioCDReader.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\platform_specific_code\juce_win32_DirectSound.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\platform_specific_code\juce_win32_DynamicLibraryLoader.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\platform_specific_code\juce_win32_DynamicLibraryLoader.h"
-					>
-				</File>
-				<File
-					RelativePath="..\platform_specific_code\juce_win32_FileChooser.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\platform_specific_code\juce_win32_Files.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\platform_specific_code\juce_win32_Fonts.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\platform_specific_code\juce_win32_Messaging.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\platform_specific_code\juce_win32_Midi.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\platform_specific_code\juce_win32_Misc.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\platform_specific_code\juce_win32_Network.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\platform_specific_code\juce_win32_PlatformUtils.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\platform_specific_code\juce_win32_SystemStats.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\platform_specific_code\juce_win32_Threads.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\platform_specific_code\juce_win32_Windowing.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\platform_specific_code\win32_headers.h"
-					>
-				</File>
-			</Filter>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/extras/example projects/example_project_for_Win32/juce_application.vcproj b/extras/example projects/example_project_for_Win32/juce_application.vcproj
index acb8748731..02e1bd0fdb 100644
--- a/extras/example projects/example_project_for_Win32/juce_application.vcproj	
+++ b/extras/example projects/example_project_for_Win32/juce_application.vcproj	
@@ -144,6 +144,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
+				WholeProgramOptimization="true"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -175,6 +176,8 @@
 				AdditionalLibraryDirectories="../../bin"
 				ProgramDatabaseFile=".\Release/juce_application.pdb"
 				SubSystem="2"
+				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="1"
 				TargetMachine="1"
 			/>
 			<Tool
diff --git a/extras/the jucer/src/properties/jucer_FontPropertyComponent.cpp b/extras/the jucer/src/properties/jucer_FontPropertyComponent.cpp
index cadb92804b..3d2a435d69 100644
--- a/extras/the jucer/src/properties/jucer_FontPropertyComponent.cpp	
+++ b/extras/the jucer/src/properties/jucer_FontPropertyComponent.cpp	
@@ -51,12 +51,12 @@ public:
         clearSingletonInstance();
     }
 
-    juce_DeclareSingleton (FontList, false)
+    juce_DeclareSingleton_SingleThreaded (FontList, false)
 
     StringArray fontNames;
 };
 
-juce_ImplementSingleton (FontList)
+juce_ImplementSingleton_SingleThreaded (FontList)
 
 void FontPropertyComponent::preloadAllFonts()
 {
diff --git a/src/juce_appframework/gui/components/windows/juce_TopLevelWindow.cpp b/src/juce_appframework/gui/components/windows/juce_TopLevelWindow.cpp
index 70aa859e86..5262c93f86 100644
--- a/src/juce_appframework/gui/components/windows/juce_TopLevelWindow.cpp
+++ b/src/juce_appframework/gui/components/windows/juce_TopLevelWindow.cpp
@@ -61,7 +61,7 @@ public:
         clearSingletonInstance();
     }
 
-    juce_DeclareSingleton (TopLevelWindowManager, false)
+    juce_DeclareSingleton_SingleThreaded (TopLevelWindowManager, false)
 
     void timerCallback()
     {
@@ -138,7 +138,7 @@ private:
     const TopLevelWindowManager& operator= (const TopLevelWindowManager&);
 };
 
-juce_ImplementSingleton (TopLevelWindowManager)
+juce_ImplementSingleton_SingleThreaded (TopLevelWindowManager)
 
 void juce_CheckCurrentlyFocusedTopLevelWindow()
 {