diff --git a/build/win32/codeblocks/juce.cbp b/build/win32/codeblocks/juce.cbp
index 0e9a996b1f..ebab479a48 100644
--- a/build/win32/codeblocks/juce.cbp
+++ b/build/win32/codeblocks/juce.cbp
@@ -260,265 +260,6 @@
 			<Option target="Debug"/>
 			<Option target="Release"/>
 		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\all.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\assert.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\callback.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\export.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\format.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\bitbuffer.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\bitmath.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\cpu.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\crc.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\fixed.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\float.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\format.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\include\private\all.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\include\private\bitbuffer.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\include\private\bitmath.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\include\private\cpu.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\include\private\crc.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\include\private\fixed.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\include\private\float.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\include\private\format.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\include\private\lpc.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\include\private\md5.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\include\private\memory.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\include\private\metadata.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\include\private\stream_encoder_framing.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\include\private\window.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\include\protected\all.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\include\protected\stream_decoder.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\include\protected\stream_encoder.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\juce_FlacHeader.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\lpc_flac.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\md5.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\memory.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\stream_decoder.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\stream_encoder.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\stream_encoder_framing.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\window_flac.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\metadata.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\ordinals.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\stream_decoder.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\flac\stream_encoder.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
 		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\juce_AiffAudioFormat.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="Debug"/>
@@ -531,6 +272,13 @@
 			<Option target="Debug"/>
 			<Option target="Release"/>
 		</Unit>
+		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\juce_AudioCDBurner.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
 		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\juce_AudioCDReader.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="Debug"/>
@@ -593,6 +341,30 @@
 			<Option target="Debug"/>
 			<Option target="Release"/>
 		</Unit>
+		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\juce_AudioThumbnail.cpp">
+			<Option compilerVar="CPP"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
+		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\juce_AudioThumbnail.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
+		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\juce_AudioThumbnailCache.cpp">
+			<Option compilerVar="CPP"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
+		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\juce_AudioThumbnailCache.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
 		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\juce_FlacAudioFormat.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="Debug"/>
@@ -617,6 +389,18 @@
 			<Option target="Debug"/>
 			<Option target="Release"/>
 		</Unit>
+		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\juce_QuickTimeAudioFormat.cpp">
+			<Option compilerVar="CPP"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
+		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\juce_QuickTimeAudioFormat.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
 		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\juce_WavAudioFormat.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="Debug"/>
@@ -629,448 +413,6 @@
 			<Option target="Debug"/>
 			<Option target="Release"/>
 		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\bitwise.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\codec.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\config_types.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\framing.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\juce_OggVorbisHeader.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\analysis.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\backends.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\bitrate.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\bitrate.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\block.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\books\coupled\res_books_stereo.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\books\floor\floor_books.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\books\uncoupled\res_books_uncoupled.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\codebook.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\codebook.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\codec_internal.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\envelope.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\envelope.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\floor0.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\floor1.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\highlevel.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\info.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\lookup.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\lookup.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\lookup_data.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\lpc.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\lpc.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\lsp.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\lsp.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\mapping0.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\masking.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\mdct.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\mdct.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\misc.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\modes\floor_all.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\modes\psych_11.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\modes\psych_16.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\modes\psych_44.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\modes\psych_8.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\modes\residue_16.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\modes\residue_44.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\modes\residue_44u.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\modes\residue_8.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\modes\setup_11.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\modes\setup_16.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\modes\setup_22.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\modes\setup_32.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\modes\setup_44.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\modes\setup_44u.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\modes\setup_8.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\modes\setup_X.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\os.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\psy.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\psy.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\registry.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\registry.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\res0.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\scales.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\sharedbook.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\smallft.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\smallft.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\synthesis.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\vorbisenc.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\vorbisfile.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\window.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\window.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\ogg.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\os_types.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\vorbisenc.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\vorbisfile.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
 		<Unit filename="..\..\..\src\juce_appframework\audio\audio_sources\juce_AudioFormatReaderSource.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="Debug"/>
@@ -1356,6 +698,128 @@
 			<Option target="Debug"/>
 			<Option target="Release"/>
 		</Unit>
+		<Unit filename="..\..\..\src\juce_appframework\audio\plugins\formats\juce_AudioUnitPluginFormat.cpp">
+			<Option compilerVar="CPP"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
+		<Unit filename="..\..\..\src\juce_appframework\audio\plugins\formats\juce_AudioUnitPluginFormat.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
+		<Unit filename="..\..\..\src\juce_appframework\audio\plugins\formats\juce_DirectXPluginFormat.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
+		<Unit filename="..\..\..\src\juce_appframework\audio\plugins\formats\juce_LADSPAPluginFormat.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
+		<Unit filename="..\..\..\src\juce_appframework\audio\plugins\formats\juce_VSTPluginFormat.cpp">
+			<Option compilerVar="CPP"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
+		<Unit filename="..\..\..\src\juce_appframework\audio\plugins\formats\juce_VSTPluginFormat.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
+		<Unit filename="..\..\..\src\juce_appframework\audio\plugins\juce_AudioPluginFormat.cpp">
+			<Option compilerVar="CPP"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
+		<Unit filename="..\..\..\src\juce_appframework\audio\plugins\juce_AudioPluginFormat.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
+		<Unit filename="..\..\..\src\juce_appframework\audio\plugins\juce_AudioPluginFormatManager.cpp">
+			<Option compilerVar="CPP"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
+		<Unit filename="..\..\..\src\juce_appframework\audio\plugins\juce_AudioPluginFormatManager.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
+		<Unit filename="..\..\..\src\juce_appframework\audio\plugins\juce_AudioPluginInstance.cpp">
+			<Option compilerVar="CPP"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
+		<Unit filename="..\..\..\src\juce_appframework\audio\plugins\juce_AudioPluginInstance.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
+		<Unit filename="..\..\..\src\juce_appframework\audio\plugins\juce_KnownPluginList.cpp">
+			<Option compilerVar="CPP"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
+		<Unit filename="..\..\..\src\juce_appframework\audio\plugins\juce_KnownPluginList.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
+		<Unit filename="..\..\..\src\juce_appframework\audio\plugins\juce_PluginDescription.cpp">
+			<Option compilerVar="CPP"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
+		<Unit filename="..\..\..\src\juce_appframework\audio\plugins\juce_PluginDescription.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
+		<Unit filename="..\..\..\src\juce_appframework\audio\plugins\juce_PluginDirectoryScanner.cpp">
+			<Option compilerVar="CPP"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
+		<Unit filename="..\..\..\src\juce_appframework\audio\plugins\juce_PluginDirectoryScanner.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
+		<Unit filename="..\..\..\src\juce_appframework\audio\plugins\juce_PluginListComponent.cpp">
+			<Option compilerVar="CPP"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
+		<Unit filename="..\..\..\src\juce_appframework\audio\plugins\juce_PluginListComponent.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
 		<Unit filename="..\..\..\src\juce_appframework\audio\processors\juce_AudioPlayHead.h">
 			<Option compilerVar=""/>
 			<Option compile="0"/>
@@ -1387,6 +851,18 @@
 			<Option target="Debug"/>
 			<Option target="Release"/>
 		</Unit>
+		<Unit filename="..\..\..\src\juce_appframework\audio\processors\juce_AudioProcessorGraph.cpp">
+			<Option compilerVar="CPP"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
+		<Unit filename="..\..\..\src\juce_appframework\audio\processors\juce_AudioProcessorGraph.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
 		<Unit filename="..\..\..\src\juce_appframework\audio\processors\juce_AudioProcessorListener.h">
 			<Option compilerVar=""/>
 			<Option compile="0"/>
@@ -1394,6 +870,18 @@
 			<Option target="Debug"/>
 			<Option target="Release"/>
 		</Unit>
+		<Unit filename="..\..\..\src\juce_appframework\audio\processors\juce_AudioProcessorPlayer.cpp">
+			<Option compilerVar="CPP"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
+		<Unit filename="..\..\..\src\juce_appframework\audio\processors\juce_AudioProcessorPlayer.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
 		<Unit filename="..\..\..\src\juce_appframework\audio\processors\juce_GenericAudioProcessorEditor.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="Debug"/>
@@ -2002,6 +1490,18 @@
 			<Option target="Debug"/>
 			<Option target="Release"/>
 		</Unit>
+		<Unit filename="..\..\..\src\juce_appframework\gui\components\filebrowser\juce_FileSearchPathListComponent.cpp">
+			<Option compilerVar="CPP"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
+		<Unit filename="..\..\..\src\juce_appframework\gui\components\filebrowser\juce_FileSearchPathListComponent.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
 		<Unit filename="..\..\..\src\juce_appframework\gui\components\filebrowser\juce_FileTreeComponent.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="Debug"/>
@@ -2723,6 +2223,13 @@
 			<Option target="Debug"/>
 			<Option target="Release"/>
 		</Unit>
+		<Unit filename="..\..\..\src\juce_appframework\gui\components\special\juce_WebBrowserComponent.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
 		<Unit filename="..\..\..\src\juce_appframework\gui\components\windows\juce_AlertWindow.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="Debug"/>
@@ -3277,327 +2784,6 @@
 			<Option target="Debug"/>
 			<Option target="Release"/>
 		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\cderror.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcapimin.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcapistd.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jccoefct.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jccolor.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcdctmgr.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jchuff.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jchuff.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcinit.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcmainct.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcmarker.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcmaster.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcomapi.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jconfig.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcparam.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcphuff.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcprepct.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcsample.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jctrans.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdapimin.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdapistd.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdatasrc.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdcoefct.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdcolor.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdct.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jddctmgr.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdhuff.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdhuff.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdinput.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdmainct.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdmarker.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdmaster.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdmerge.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdphuff.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdpostct.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdsample.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdtrans.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jerror.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jerror.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jfdctflt.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jfdctfst.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jfdctint.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jidctflt.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jidctfst.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jidctint.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jidctred.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jinclude.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jmemmgr.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jmemnobs.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jmemsys.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jmorecfg.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jpegint.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jpeglib.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jquant1.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jquant2.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jutils.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jversion.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\transupp.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\transupp.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
 		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\juce_GIFLoader.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="Debug"/>
@@ -3620,95 +2806,6 @@
 			<Option target="Debug"/>
 			<Option target="Release"/>
 		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\png.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\png.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngconf.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngerror.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngget.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngmem.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngpread.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngread.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngrio.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngrtran.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngrutil.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngset.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngtrans.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngwio.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngwrite.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngwtran.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngwutil.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
 		<Unit filename="..\..\..\src\juce_appframework\gui\graphics\imaging\juce_Image.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="Debug"/>
@@ -4164,6 +3261,18 @@
 			<Option target="Debug"/>
 			<Option target="Release"/>
 		</Unit>
+		<Unit filename="..\..\..\src\juce_core\io\streams\juce_FileInputSource.cpp">
+			<Option compilerVar="CPP"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
+		<Unit filename="..\..\..\src\juce_core\io\streams\juce_FileInputSource.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
 		<Unit filename="..\..\..\src\juce_core\io\streams\juce_GZIPCompressorOutputStream.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="Debug"/>
@@ -4188,6 +3297,13 @@
 			<Option target="Debug"/>
 			<Option target="Release"/>
 		</Unit>
+		<Unit filename="..\..\..\src\juce_core\io\streams\juce_InputSource.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
 		<Unit filename="..\..\..\src\juce_core\io\streams\juce_MemoryInputStream.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="Debug"/>
@@ -4224,138 +3340,6 @@
 			<Option target="Debug"/>
 			<Option target="Release"/>
 		</Unit>
-		<Unit filename="..\..\..\src\juce_core\io\streams\zlib\adler32.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_core\io\streams\zlib\compress.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_core\io\streams\zlib\crc32.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_core\io\streams\zlib\crc32.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_core\io\streams\zlib\deflate.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_core\io\streams\zlib\deflate.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_core\io\streams\zlib\infback.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_core\io\streams\zlib\inffast.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_core\io\streams\zlib\inffast.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_core\io\streams\zlib\inffixed.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_core\io\streams\zlib\inflate.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_core\io\streams\zlib\inflate.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_core\io\streams\zlib\inftrees.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_core\io\streams\zlib\inftrees.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_core\io\streams\zlib\trees.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_core\io\streams\zlib\trees.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_core\io\streams\zlib\uncompr.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_core\io\streams\zlib\zconf.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_core\io\streams\zlib\zconf.in.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_core\io\streams\zlib\zlib.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_core\io\streams\zlib\zutil.c">
-			<Option compilerVar="CC"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
-		<Unit filename="..\..\..\src\juce_core\io\streams\zlib\zutil.h">
-			<Option compilerVar=""/>
-			<Option compile="0"/>
-			<Option link="0"/>
-			<Option target="Debug"/>
-			<Option target="Release"/>
-		</Unit>
 		<Unit filename="..\..\..\src\juce_core\misc\juce_PerformanceCounter.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="Debug"/>
@@ -4535,6 +3519,13 @@
 			<Option target="Debug"/>
 			<Option target="Release"/>
 		</Unit>
+		<Unit filename="..\..\..\src\juce_core\threads\juce_ScopedTryLock.h">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="Debug"/>
+			<Option target="Release"/>
+		</Unit>
 		<Unit filename="..\..\..\src\juce_core\threads\juce_ScopedWriteLock.h">
 			<Option compilerVar=""/>
 			<Option compile="0"/>
diff --git a/build/win32/platform_specific_code/juce_win32_Midi.cpp b/build/win32/platform_specific_code/juce_win32_Midi.cpp
index 103deedb41..da89220d82 100644
--- a/build/win32/platform_specific_code/juce_win32_Midi.cpp
+++ b/build/win32/platform_specific_code/juce_win32_Midi.cpp
@@ -44,6 +44,8 @@ BEGIN_JUCE_NAMESPACE
   #pragma warning (disable: 4312)
 #endif
 
+using ::free;
+
 //==============================================================================
 static const int midiBufferSize = 1024 * 10;
 static const int numInHeaders = 32;
diff --git a/build/win32/platform_specific_code/juce_win32_Windowing.cpp b/build/win32/platform_specific_code/juce_win32_Windowing.cpp
index 8e932c85f5..e7f3779b5e 100644
--- a/build/win32/platform_specific_code/juce_win32_Windowing.cpp
+++ b/build/win32/platform_specific_code/juce_win32_Windowing.cpp
@@ -48,7 +48,6 @@
   #pragma warning (disable: 4312 4244)
 #endif
 
-
 #undef GetSystemMetrics // multimon overrides this for some reason and causes a mess..
 
 // these are in the windows SDK, but need to be repeated here for GCC..
@@ -113,6 +112,8 @@ static bool screenSaverAllowed = true;
 static HICON createHICONFromImage (const Image& image, const BOOL isIcon, int hotspotX, int hotspotY) throw();
 #define WM_TRAYNOTIFY WM_USER + 100
 
+using ::abs;
+
 //==============================================================================
 typedef BOOL (WINAPI* UpdateLayeredWinFunc) (HWND, HDC, POINT*, SIZE*, HDC, POINT*, COLORREF, BLENDFUNCTION*, DWORD);
 static UpdateLayeredWinFunc updateLayeredWindow = 0;
diff --git a/build/win32/vc6/JUCE.dsp b/build/win32/vc6/JUCE.dsp
index 6d9cdcfd96..11f1d17938 100644
--- a/build/win32/vc6/JUCE.dsp
+++ b/build/win32/vc6/JUCE.dsp
@@ -162,178 +162,6 @@ SOURCE=..\..\..\src\juce_appframework\application\juce_SystemClipboard.h
 # Begin Group "audio_file_formats"
 
 # PROP Default_Filter ""
-# Begin Group "flac"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\bitmath.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\bitreader.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\bitwriter.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\cpu.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\crc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\fixed.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\float.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\format.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\juce_FlacHeader.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\lpc_flac.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\md5.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\memory.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\stream_decoder.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\stream_encoder.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\stream_encoder_framing.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\flac\libFLAC\window_flac.c
-# End Source File
-# End Group
-# Begin Group "ogg"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\bitwise.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\framing.c
-# End Source File
-# End Group
-# Begin Group "vorbis"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\analysis.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\bitrate.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\block.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\codebook.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\envelope.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\floor0.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\floor1.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\info.c"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\juce_OggVorbisHeader.h
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\lpc.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\lsp.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\mapping0.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\mdct.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\psy.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\registry.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\res0.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\sharedbook.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\smallft.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\synthesis.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\vorbisenc.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\vorbisfile.c"
-# End Source File
-# Begin Source File
-
-SOURCE="..\..\..\src\juce_appframework\audio\audio_file_formats\oggvorbis\libvorbis-1.1.2\lib\window.c"
-# End Source File
-# End Group
 # Begin Source File
 
 SOURCE=..\..\..\src\juce_appframework\audio\audio_file_formats\juce_AiffAudioFormat.cpp
@@ -1152,318 +980,6 @@ SOURCE=..\..\..\src\juce_appframework\gui\graphics\geometry\juce_RectangleList.h
 # Begin Group "image_file_formats"
 
 # PROP Default_Filter ""
-# Begin Group "jpglib"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\cderror.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcapimin.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcapistd.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jccoefct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jccolor.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcdctmgr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jchuff.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jchuff.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcinit.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcmainct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcmarker.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcmaster.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcomapi.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jconfig.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcparam.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcphuff.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcprepct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jcsample.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jctrans.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdapimin.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdapistd.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdatasrc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdcoefct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdcolor.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdct.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jddctmgr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdhuff.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdhuff.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdinput.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdmainct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdmarker.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdmaster.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdmerge.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdphuff.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdpostct.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdsample.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jdtrans.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jerror.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jerror.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jfdctflt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jfdctfst.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jfdctint.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jidctflt.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jidctfst.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jidctint.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jidctred.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jinclude.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jmemmgr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jmemnobs.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jmemsys.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jmorecfg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jpegint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jpeglib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jquant1.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jquant2.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jutils.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\jversion.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\transupp.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\jpglib\transupp.h
-# End Source File
-# End Group
-# Begin Group "pnglib"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\png.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\png.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngconf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngerror.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngget.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngmem.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngpread.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngread.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngrio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngrtran.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngrutil.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngset.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngtrans.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngwio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngwrite.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngwtran.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\pnglib\pngwutil.c
-# End Source File
-# End Group
 # Begin Source File
 
 SOURCE=..\..\..\src\juce_appframework\gui\graphics\imaging\image_file_formats\juce_GIFLoader.cpp
@@ -2701,54 +2217,6 @@ SOURCE=..\..\..\src\juce_core\io\network\juce_URL.h
 # Begin Group "streams"
 
 # PROP Default_Filter ""
-# Begin Group "zlib"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_core\io\streams\zlib\adler32.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_core\io\streams\zlib\compress.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_core\io\streams\zlib\crc32.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_core\io\streams\zlib\deflate.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_core\io\streams\zlib\infback.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_core\io\streams\zlib\inffast.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_core\io\streams\zlib\inflate.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_core\io\streams\zlib\inftrees.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_core\io\streams\zlib\trees.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_core\io\streams\zlib\uncompr.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\src\juce_core\io\streams\zlib\zutil.c
-# End Source File
-# End Group
 # Begin Source File
 
 SOURCE=..\..\..\src\juce_core\io\streams\juce_BufferedInputStream.cpp
@@ -3093,6 +2561,10 @@ SOURCE=..\platform_specific_code\juce_win32_Threads.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\platform_specific_code\juce_win32_WebBrowserComponent.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\platform_specific_code\juce_win32_Windowing.cpp
 # End Source File
 # Begin Source File
diff --git a/extras/the jucer/src/model/components/jucer_ImageButtonHandler.h b/extras/the jucer/src/model/components/jucer_ImageButtonHandler.h
index 00aa5872de..c77c956b4a 100644
--- a/extras/the jucer/src/model/components/jucer_ImageButtonHandler.h	
+++ b/extras/the jucer/src/model/components/jucer_ImageButtonHandler.h	
@@ -465,7 +465,7 @@ public:
 
     static const Colour getImageColour (ImageButton* button, const ImageRole role)
     {
-        return Colour::fromString (button->getComponentProperty ("imageColour" + String ((int) role), "0"));
+        return Colour::fromString (button->getComponentProperty ("imageColour" + String ((int) role), false, "0"));
     }
 
     static void setImageColour (ComponentLayout& layout, ImageButton* button, const ImageRole role, const Colour& colour, const bool undoable)
diff --git a/src/juce_appframework/audio/audio_file_formats/flac/libFLAC/bitreader.c b/src/juce_appframework/audio/audio_file_formats/flac/libFLAC/bitreader.c
index 172af4a108..cbb57d5e0b 100644
--- a/src/juce_appframework/audio/audio_file_formats/flac/libFLAC/bitreader.c
+++ b/src/juce_appframework/audio/audio_file_formats/flac/libFLAC/bitreader.c
@@ -762,7 +762,7 @@ FLAC__bool FLAC__bitreader_read_rice_signed(FLAC__BitReader *br, int *val, unsig
 	FLAC__ASSERT(parameter <= 31);
 
 	/* read the unary MSBs and end bit */
-	if(!FLAC__bitreader_read_unary_unsigned(br, &msbs))
+	if(!FLAC__bitreader_read_unary_unsigned(br, (unsigned int*) &msbs))
 		return false;
 
 	/* read the binary LSBs */
diff --git a/src/juce_appframework/audio/audio_file_formats/flac/libFLAC/stream_decoder.c b/src/juce_appframework/audio/audio_file_formats/flac/libFLAC/stream_decoder.c
index b507831a91..8975c47128 100644
--- a/src/juce_appframework/audio/audio_file_formats/flac/libFLAC/stream_decoder.c
+++ b/src/juce_appframework/audio/audio_file_formats/flac/libFLAC/stream_decoder.c
@@ -170,7 +170,7 @@ typedef struct FLAC__StreamDecoderPrivate {
 	void (*local_lpc_restore_signal_16bit)(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]);
 	/* for use when the signal is <= 16 bits-per-sample, or <= 15 bits-per-sample on a side channel (which requires 1 extra bit), AND order <= 8: */
 	void (*local_lpc_restore_signal_16bit_order8)(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]);
-	FLAC__bool (*local_bitreader_read_rice_signed_block)(FLAC__BitReader *br, int vals[], unsigned nvals, unsigned parameter);
+	FLAC__bool (*local_bitreader_read_rice_signed_block)(FLAC__BitReader *br, int* vals, unsigned nvals, unsigned parameter);
 	void *client_data;
 	FILE *file; /* only used if FLAC__stream_decoder_init_file()/FLAC__stream_decoder_init_file() called, else NULL */
 	FLAC__BitReader *input;
@@ -2753,7 +2753,7 @@ FLAC__bool read_residual_partitioned_rice_(FLAC__StreamDecoder *decoder, unsigne
 		if(rice_parameter < pesc) {
 			partitioned_rice_contents->raw_bits[partition] = 0;
 			u = (partition_order == 0 || partition > 0)? partition_samples : partition_samples - predictor_order;
-			if(!decoder->private_->local_bitreader_read_rice_signed_block(decoder->private_->input, residual + sample, u, rice_parameter))
+			if(!decoder->private_->local_bitreader_read_rice_signed_block(decoder->private_->input, (int*) residual + sample, u, rice_parameter))
 				return false; /* read_callback_ sets the state for us */
 			sample += u;
 		}
@@ -2762,7 +2762,7 @@ FLAC__bool read_residual_partitioned_rice_(FLAC__StreamDecoder *decoder, unsigne
 				return false; /* read_callback_ sets the state for us */
 			partitioned_rice_contents->raw_bits[partition] = rice_parameter;
 			for(u = (partition_order == 0 || partition > 0)? 0 : predictor_order; u < partition_samples; u++, sample++) {
-				if(!FLAC__bitreader_read_raw_int32(decoder->private_->input, &i, rice_parameter))
+				if(!FLAC__bitreader_read_raw_int32(decoder->private_->input, (FLAC__int32*) &i, rice_parameter))
 					return false; /* read_callback_ sets the state for us */
 				residual[sample] = i;
 			}
diff --git a/src/juce_appframework/gui/graphics/imaging/image_file_formats/juce_PNGLoader.cpp b/src/juce_appframework/gui/graphics/imaging/image_file_formats/juce_PNGLoader.cpp
index d37b2b56be..9845aeebae 100644
--- a/src/juce_appframework/gui/graphics/imaging/image_file_formats/juce_PNGLoader.cpp
+++ b/src/juce_appframework/gui/graphics/imaging/image_file_formats/juce_PNGLoader.cpp
@@ -47,6 +47,8 @@ namespace zlibNamespace
 namespace pnglibNamespace
 {
   using namespace zlibNamespace;
+  using ::malloc;
+  using ::free;
 
   extern "C"
   {
@@ -89,6 +91,8 @@ BEGIN_JUCE_NAMESPACE
 #include "../../colour/juce_PixelFormats.h"
 
 using namespace pnglibNamespace;
+using ::malloc;
+using ::free;
 
 //==============================================================================
 static void pngReadCallback (png_structp pngReadStruct, png_bytep data, png_size_t length) throw()
diff --git a/src/juce_core/io/streams/juce_GZIPDecompressorInputStream.cpp b/src/juce_core/io/streams/juce_GZIPDecompressorInputStream.cpp
index 88ce740bca..58d6d3d39f 100644
--- a/src/juce_core/io/streams/juce_GZIPDecompressorInputStream.cpp
+++ b/src/juce_core/io/streams/juce_GZIPDecompressorInputStream.cpp
@@ -31,6 +31,11 @@
 
 #include "../../basics/juce_StandardHeader.h"
 
+#if JUCE_MSVC
+  #pragma warning (push)
+  #pragma warning (disable: 4309 4305)
+#endif
+
 namespace zlibNamespace
 {
   extern "C"
@@ -63,6 +68,10 @@ namespace zlibNamespace
     #include "zlib/zutil.c"
   }
 }
+
+#if JUCE_MSVC
+  #pragma warning (pop)
+#endif
 
 BEGIN_JUCE_NAMESPACE