diff --git a/extras/Introjucer/Builds/Linux/Makefile b/extras/Introjucer/Builds/Linux/Makefile
index b4ab5bc29b..4aa76799c4 100644
--- a/extras/Introjucer/Builds/Linux/Makefile
+++ b/extras/Introjucer/Builds/Linux/Makefile
@@ -69,7 +69,6 @@ OBJECTS := \
   $(OBJDIR)/jucer_StoredSettings_26078d2c.o \
   $(OBJDIR)/jucer_SourceCodeEditor_461f5487.o \
   $(OBJDIR)/BinaryData_ce4232d4.o \
-  $(OBJDIR)/juce_audio_basics_399a455e.o \
   $(OBJDIR)/juce_core_1ee54a40.o \
   $(OBJDIR)/juce_cryptography_3b1f489a.o \
   $(OBJDIR)/juce_data_structures_84790dfc.o \
@@ -223,11 +222,6 @@ $(OBJDIR)/BinaryData_ce4232d4.o: ../../JuceLibraryCode/BinaryData.cpp
 	@echo "Compiling BinaryData.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_audio_basics_399a455e.o: ../../../../modules/juce_audio_basics/juce_audio_basics.cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_audio_basics.cpp"
-	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
 $(OBJDIR)/juce_core_1ee54a40.o: ../../../../modules/juce_core/juce_core.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling juce_core.cpp"
diff --git a/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj
index b0fc10d7bf..cee2231d16 100644
--- a/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj	
+++ b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj	
@@ -38,7 +38,6 @@
 		59B173809CEC75EC0C74D1CF = { isa = PBXBuildFile; fileRef = F863E5B1070301A6FB05245A; };
 		6B48E4B12BB56C2254F293DF = { isa = PBXBuildFile; fileRef = CC5306B043DF96951C552172; };
 		69CA42E334E4BA09E4FE8B65 = { isa = PBXBuildFile; fileRef = 13C2F4340AD40DDAB1521007; };
-		51E9D6E4345FEEB1DC732A16 = { isa = PBXBuildFile; fileRef = 78598771B805D57F7909AE92; };
 		17B1F33450F77F3DB3510372 = { isa = PBXBuildFile; fileRef = FA1DFB3D7FCAE3EF609C1BC7; };
 		256BA1FB3B953A0A488664C5 = { isa = PBXBuildFile; fileRef = D27F04669C4196045345ED5E; };
 		D69F6237068A7A9C93AC5844 = { isa = PBXBuildFile; fileRef = 95DAEA601BF4DD69387C58D7; };
@@ -130,44 +129,6 @@
 		B05971E77A2396955C7A2F38 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_WindowTemplate.cpp"; path = "../../Source/BinaryData/jucer_WindowTemplate.cpp"; sourceTree = "SOURCE_ROOT"; };
 		AB0869E7B0299F15296FE45D = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_WindowTemplate.h"; path = "../../Source/BinaryData/jucer_WindowTemplate.h"; sourceTree = "SOURCE_ROOT"; };
 		4EE75DE6D14102A4CACC5F75 = { isa = PBXFileReference; lastKnownFileType = image.png; name = "juce_icon.png"; path = "../../Source/BinaryData/juce_icon.png"; sourceTree = "SOURCE_ROOT"; };
-		7BA6EBE5F4357E6C224CE5E9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioDataConverters.cpp"; path = "../../../../modules/juce_audio_basics/buffers/juce_AudioDataConverters.cpp"; sourceTree = "SOURCE_ROOT"; };
-		45923C016AD2218896A00F32 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioDataConverters.h"; path = "../../../../modules/juce_audio_basics/buffers/juce_AudioDataConverters.h"; sourceTree = "SOURCE_ROOT"; };
-		E04A8F519F69EF4E0DB6A49D = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioSampleBuffer.cpp"; path = "../../../../modules/juce_audio_basics/buffers/juce_AudioSampleBuffer.cpp"; sourceTree = "SOURCE_ROOT"; };
-		9B5170A75C11AF3C59C48255 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioSampleBuffer.h"; path = "../../../../modules/juce_audio_basics/buffers/juce_AudioSampleBuffer.h"; sourceTree = "SOURCE_ROOT"; };
-		866B1C8140AEF08C491B0724 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MidiBuffer.cpp"; path = "../../../../modules/juce_audio_basics/midi/juce_MidiBuffer.cpp"; sourceTree = "SOURCE_ROOT"; };
-		7F20C346C6C270497F504358 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MidiBuffer.h"; path = "../../../../modules/juce_audio_basics/midi/juce_MidiBuffer.h"; sourceTree = "SOURCE_ROOT"; };
-		85973E73969D28640E0F2796 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MidiFile.cpp"; path = "../../../../modules/juce_audio_basics/midi/juce_MidiFile.cpp"; sourceTree = "SOURCE_ROOT"; };
-		348D5EE3F0DBB0D4B0C3835A = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MidiFile.h"; path = "../../../../modules/juce_audio_basics/midi/juce_MidiFile.h"; sourceTree = "SOURCE_ROOT"; };
-		775D7C98D68826BE9142A8DB = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MidiKeyboardState.cpp"; path = "../../../../modules/juce_audio_basics/midi/juce_MidiKeyboardState.cpp"; sourceTree = "SOURCE_ROOT"; };
-		0180096E2D274919B7D94196 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MidiKeyboardState.h"; path = "../../../../modules/juce_audio_basics/midi/juce_MidiKeyboardState.h"; sourceTree = "SOURCE_ROOT"; };
-		67202D83384B13EFD2B822A1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MidiMessage.cpp"; path = "../../../../modules/juce_audio_basics/midi/juce_MidiMessage.cpp"; sourceTree = "SOURCE_ROOT"; };
-		22FF4060C10B097C8600E6C2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MidiMessage.h"; path = "../../../../modules/juce_audio_basics/midi/juce_MidiMessage.h"; sourceTree = "SOURCE_ROOT"; };
-		47482403376A1EE3367731E9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MidiMessageSequence.cpp"; path = "../../../../modules/juce_audio_basics/midi/juce_MidiMessageSequence.cpp"; sourceTree = "SOURCE_ROOT"; };
-		74FABF4622FCE02CACB073D9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MidiMessageSequence.h"; path = "../../../../modules/juce_audio_basics/midi/juce_MidiMessageSequence.h"; sourceTree = "SOURCE_ROOT"; };
-		AD67C46D31175803A87DBD9F = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Decibels.h"; path = "../../../../modules/juce_audio_basics/effects/juce_Decibels.h"; sourceTree = "SOURCE_ROOT"; };
-		01FF9A2237193ABCC9AF020B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_IIRFilter.cpp"; path = "../../../../modules/juce_audio_basics/effects/juce_IIRFilter.cpp"; sourceTree = "SOURCE_ROOT"; };
-		F9654ADCA30CE9750E0AB56E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_IIRFilter.h"; path = "../../../../modules/juce_audio_basics/effects/juce_IIRFilter.h"; sourceTree = "SOURCE_ROOT"; };
-		BA6D3802121EA35F8F3310DF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Reverb.h"; path = "../../../../modules/juce_audio_basics/effects/juce_Reverb.h"; sourceTree = "SOURCE_ROOT"; };
-		89D19DC50DF9C30804D011B4 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioSource.h"; path = "../../../../modules/juce_audio_basics/sources/juce_AudioSource.h"; sourceTree = "SOURCE_ROOT"; };
-		D6EDD8F0AF19317612E8B45A = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_BufferingAudioSource.cpp"; path = "../../../../modules/juce_audio_basics/sources/juce_BufferingAudioSource.cpp"; sourceTree = "SOURCE_ROOT"; };
-		C3DE6655ABEDE6906A04E6D0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_BufferingAudioSource.h"; path = "../../../../modules/juce_audio_basics/sources/juce_BufferingAudioSource.h"; sourceTree = "SOURCE_ROOT"; };
-		E103C08770ACC76680876D15 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ChannelRemappingAudioSource.cpp"; path = "../../../../modules/juce_audio_basics/sources/juce_ChannelRemappingAudioSource.cpp"; sourceTree = "SOURCE_ROOT"; };
-		1E7F7DC82F1C90C1DAC4646A = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ChannelRemappingAudioSource.h"; path = "../../../../modules/juce_audio_basics/sources/juce_ChannelRemappingAudioSource.h"; sourceTree = "SOURCE_ROOT"; };
-		625BAFAEFE8EF50EEDCAB08F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_IIRFilterAudioSource.cpp"; path = "../../../../modules/juce_audio_basics/sources/juce_IIRFilterAudioSource.cpp"; sourceTree = "SOURCE_ROOT"; };
-		95ACC46D68A4848E1E8D31DA = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_IIRFilterAudioSource.h"; path = "../../../../modules/juce_audio_basics/sources/juce_IIRFilterAudioSource.h"; sourceTree = "SOURCE_ROOT"; };
-		49F61011F7B5C934766EC2CF = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MixerAudioSource.cpp"; path = "../../../../modules/juce_audio_basics/sources/juce_MixerAudioSource.cpp"; sourceTree = "SOURCE_ROOT"; };
-		95532D5AB63FE80B1CD8B4D1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MixerAudioSource.h"; path = "../../../../modules/juce_audio_basics/sources/juce_MixerAudioSource.h"; sourceTree = "SOURCE_ROOT"; };
-		C7EDF40BEE8693642A0DD711 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_PositionableAudioSource.h"; path = "../../../../modules/juce_audio_basics/sources/juce_PositionableAudioSource.h"; sourceTree = "SOURCE_ROOT"; };
-		9027733E7AA030DCE0E958FE = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ResamplingAudioSource.cpp"; path = "../../../../modules/juce_audio_basics/sources/juce_ResamplingAudioSource.cpp"; sourceTree = "SOURCE_ROOT"; };
-		CCDCBCFA683BDD44F9210A1C = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ResamplingAudioSource.h"; path = "../../../../modules/juce_audio_basics/sources/juce_ResamplingAudioSource.h"; sourceTree = "SOURCE_ROOT"; };
-		442190C094E7147AEC5AB08C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ReverbAudioSource.cpp"; path = "../../../../modules/juce_audio_basics/sources/juce_ReverbAudioSource.cpp"; sourceTree = "SOURCE_ROOT"; };
-		C4AAB6601761A743D57690E6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ReverbAudioSource.h"; path = "../../../../modules/juce_audio_basics/sources/juce_ReverbAudioSource.h"; sourceTree = "SOURCE_ROOT"; };
-		6299363C7F8D9533CCB98201 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ToneGeneratorAudioSource.cpp"; path = "../../../../modules/juce_audio_basics/sources/juce_ToneGeneratorAudioSource.cpp"; sourceTree = "SOURCE_ROOT"; };
-		432CE442BF38BA3949114F3C = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ToneGeneratorAudioSource.h"; path = "../../../../modules/juce_audio_basics/sources/juce_ToneGeneratorAudioSource.h"; sourceTree = "SOURCE_ROOT"; };
-		946786785369DC5F12B3D3BC = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Synthesiser.cpp"; path = "../../../../modules/juce_audio_basics/synthesisers/juce_Synthesiser.cpp"; sourceTree = "SOURCE_ROOT"; };
-		FC73AA046536348A2049BFB7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Synthesiser.h"; path = "../../../../modules/juce_audio_basics/synthesisers/juce_Synthesiser.h"; sourceTree = "SOURCE_ROOT"; };
-		B608227C15B500ADB6A94090 = { isa = PBXFileReference; lastKnownFileType = file; name = "juce_module_info"; path = "../../../../modules/juce_audio_basics/juce_module_info"; sourceTree = "SOURCE_ROOT"; };
-		3F0F7145BCBB4CBB431CBE5F = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_audio_basics.h"; path = "../../../../modules/juce_audio_basics/juce_audio_basics.h"; sourceTree = "SOURCE_ROOT"; };
 		8E0BD043BD8DE112F37D56E5 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_CharacterFunctions.cpp"; path = "../../../../modules/juce_core/text/juce_CharacterFunctions.cpp"; sourceTree = "SOURCE_ROOT"; };
 		E85A8D1F985B43C287A5D340 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CharacterFunctions.h"; path = "../../../../modules/juce_core/text/juce_CharacterFunctions.h"; sourceTree = "SOURCE_ROOT"; };
 		1B66B138A9EA0DAD7332A29C = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CharPointer_ASCII.h"; path = "../../../../modules/juce_core/text/juce_CharPointer_ASCII.h"; sourceTree = "SOURCE_ROOT"; };
@@ -769,7 +730,6 @@
 		C82ADD55EB91E34E5BF15F8B = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AppConfig.h; path = ../../JuceLibraryCode/AppConfig.h; sourceTree = "SOURCE_ROOT"; };
 		13C2F4340AD40DDAB1521007 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = BinaryData.cpp; path = ../../JuceLibraryCode/BinaryData.cpp; sourceTree = "SOURCE_ROOT"; };
 		21238F019A9CE6203F6EE6A3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = BinaryData.h; path = ../../JuceLibraryCode/BinaryData.h; sourceTree = "SOURCE_ROOT"; };
-		78598771B805D57F7909AE92 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_audio_basics.mm"; path = "../../../../modules/juce_audio_basics/juce_audio_basics.mm"; sourceTree = "SOURCE_ROOT"; };
 		FA1DFB3D7FCAE3EF609C1BC7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_core.mm"; path = "../../../../modules/juce_core/juce_core.mm"; sourceTree = "SOURCE_ROOT"; };
 		D27F04669C4196045345ED5E = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_cryptography.mm"; path = "../../../../modules/juce_cryptography/juce_cryptography.mm"; sourceTree = "SOURCE_ROOT"; };
 		95DAEA601BF4DD69387C58D7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_data_structures.mm"; path = "../../../../modules/juce_data_structures/juce_data_structures.mm"; sourceTree = "SOURCE_ROOT"; };
@@ -867,55 +827,6 @@
 				EB77B261C62447EE22D136DD,
 				644797EB12AAB2529ED6786E,
 				2436CB32D02E7E3293665601 ); name = "The Introjucer"; sourceTree = "<group>"; };
-		3891C9A3A7DCBA95B187EAB0 = { isa = PBXGroup; children = (
-				7BA6EBE5F4357E6C224CE5E9,
-				45923C016AD2218896A00F32,
-				E04A8F519F69EF4E0DB6A49D,
-				9B5170A75C11AF3C59C48255 ); name = buffers; sourceTree = "<group>"; };
-		3841028F736356AF5E57AAF6 = { isa = PBXGroup; children = (
-				866B1C8140AEF08C491B0724,
-				7F20C346C6C270497F504358,
-				85973E73969D28640E0F2796,
-				348D5EE3F0DBB0D4B0C3835A,
-				775D7C98D68826BE9142A8DB,
-				0180096E2D274919B7D94196,
-				67202D83384B13EFD2B822A1,
-				22FF4060C10B097C8600E6C2,
-				47482403376A1EE3367731E9,
-				74FABF4622FCE02CACB073D9 ); name = midi; sourceTree = "<group>"; };
-		4ED8E4D8B784E58560CBBA78 = { isa = PBXGroup; children = (
-				AD67C46D31175803A87DBD9F,
-				01FF9A2237193ABCC9AF020B,
-				F9654ADCA30CE9750E0AB56E,
-				BA6D3802121EA35F8F3310DF ); name = effects; sourceTree = "<group>"; };
-		FCA9145D7E14445C4F26943F = { isa = PBXGroup; children = (
-				89D19DC50DF9C30804D011B4,
-				D6EDD8F0AF19317612E8B45A,
-				C3DE6655ABEDE6906A04E6D0,
-				E103C08770ACC76680876D15,
-				1E7F7DC82F1C90C1DAC4646A,
-				625BAFAEFE8EF50EEDCAB08F,
-				95ACC46D68A4848E1E8D31DA,
-				49F61011F7B5C934766EC2CF,
-				95532D5AB63FE80B1CD8B4D1,
-				C7EDF40BEE8693642A0DD711,
-				9027733E7AA030DCE0E958FE,
-				CCDCBCFA683BDD44F9210A1C,
-				442190C094E7147AEC5AB08C,
-				C4AAB6601761A743D57690E6,
-				6299363C7F8D9533CCB98201,
-				432CE442BF38BA3949114F3C ); name = sources; sourceTree = "<group>"; };
-		C0081AE70E243505D0A12F2A = { isa = PBXGroup; children = (
-				946786785369DC5F12B3D3BC,
-				FC73AA046536348A2049BFB7 ); name = synthesisers; sourceTree = "<group>"; };
-		2236CCA6721140A551F78C66 = { isa = PBXGroup; children = (
-				3891C9A3A7DCBA95B187EAB0,
-				3841028F736356AF5E57AAF6,
-				4ED8E4D8B784E58560CBBA78,
-				FCA9145D7E14445C4F26943F,
-				C0081AE70E243505D0A12F2A,
-				B608227C15B500ADB6A94090,
-				3F0F7145BCBB4CBB431CBE5F ); name = "juce_audio_basics"; sourceTree = "<group>"; };
 		80242E1E1D9538C20BB4B53C = { isa = PBXGroup; children = (
 				8E0BD043BD8DE112F37D56E5,
 				E85A8D1F985B43C287A5D340,
@@ -1640,7 +1551,6 @@
 				7C941BC465E7F3C32E199E35,
 				A428465B3ED758CB651A675F ); name = "juce_gui_extra"; sourceTree = "<group>"; };
 		CEE72D9CA28977AB920B6CFC = { isa = PBXGroup; children = (
-				2236CCA6721140A551F78C66,
 				33D986B20E738CE9477E3073,
 				458013993C056D9D36FA4017,
 				188FED12B3C683E6AF2F1BFA,
@@ -1652,7 +1562,6 @@
 				C82ADD55EB91E34E5BF15F8B,
 				13C2F4340AD40DDAB1521007,
 				21238F019A9CE6203F6EE6A3,
-				78598771B805D57F7909AE92,
 				FA1DFB3D7FCAE3EF609C1BC7,
 				D27F04669C4196045345ED5E,
 				95DAEA601BF4DD69387C58D7,
@@ -1776,7 +1685,6 @@
 				59B173809CEC75EC0C74D1CF,
 				6B48E4B12BB56C2254F293DF,
 				69CA42E334E4BA09E4FE8B65,
-				51E9D6E4345FEEB1DC732A16,
 				17B1F33450F77F3DB3510372,
 				256BA1FB3B953A0A488664C5,
 				D69F6237068A7A9C93AC5844,
diff --git a/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj b/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj
index f59dde5d96..0cda318f4a 100644
--- a/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj	
+++ b/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj	
@@ -335,209 +335,6 @@
       </Filter>
     </Filter>
     <Filter Name="Juce Modules">
-      <Filter Name="juce_audio_basics">
-        <Filter Name="buffers">
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\buffers\juce_AudioDataConverters.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\buffers\juce_AudioDataConverters.h"/>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\buffers\juce_AudioSampleBuffer.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\buffers\juce_AudioSampleBuffer.h"/>
-        </Filter>
-        <Filter Name="midi">
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiBuffer.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiBuffer.h"/>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiFile.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiFile.h"/>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiKeyboardState.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiKeyboardState.h"/>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiMessage.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiMessage.h"/>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiMessageSequence.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiMessageSequence.h"/>
-        </Filter>
-        <Filter Name="effects">
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\effects\juce_Decibels.h"/>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\effects\juce_IIRFilter.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\effects\juce_IIRFilter.h"/>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\effects\juce_Reverb.h"/>
-        </Filter>
-        <Filter Name="sources">
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\sources\juce_AudioSource.h"/>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\sources\juce_BufferingAudioSource.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\sources\juce_BufferingAudioSource.h"/>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\sources\juce_ChannelRemappingAudioSource.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\sources\juce_ChannelRemappingAudioSource.h"/>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\sources\juce_IIRFilterAudioSource.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\sources\juce_IIRFilterAudioSource.h"/>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\sources\juce_MixerAudioSource.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\sources\juce_MixerAudioSource.h"/>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\sources\juce_PositionableAudioSource.h"/>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\sources\juce_ResamplingAudioSource.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\sources\juce_ResamplingAudioSource.h"/>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\sources\juce_ReverbAudioSource.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\sources\juce_ReverbAudioSource.h"/>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\sources\juce_ToneGeneratorAudioSource.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\sources\juce_ToneGeneratorAudioSource.h"/>
-        </Filter>
-        <Filter Name="synthesisers">
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\synthesisers\juce_Synthesiser.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\synthesisers\juce_Synthesiser.h"/>
-        </Filter>
-        <File RelativePath="..\..\..\..\modules\juce_audio_basics\juce_module_info">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\..\..\modules\juce_audio_basics\juce_audio_basics.h"/>
-      </Filter>
       <Filter Name="juce_core">
         <Filter Name="text">
           <File RelativePath="..\..\..\..\modules\juce_core\text\juce_CharacterFunctions.cpp">
@@ -3667,7 +3464,6 @@
       <File RelativePath="..\..\JuceLibraryCode\AppConfig.h"/>
       <File RelativePath="..\..\JuceLibraryCode\BinaryData.cpp"/>
       <File RelativePath="..\..\JuceLibraryCode\BinaryData.h"/>
-      <File RelativePath="..\..\..\..\modules\juce_audio_basics\juce_audio_basics.cpp"/>
       <File RelativePath="..\..\..\..\modules\juce_core\juce_core.cpp"/>
       <File RelativePath="..\..\..\..\modules\juce_cryptography\juce_cryptography.cpp"/>
       <File RelativePath="..\..\..\..\modules\juce_data_structures\juce_data_structures.cpp"/>
diff --git a/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj b/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj
index 89cfd4dc4f..b85252a04c 100644
--- a/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj	
+++ b/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj	
@@ -335,209 +335,6 @@
       </Filter>
     </Filter>
     <Filter Name="Juce Modules">
-      <Filter Name="juce_audio_basics">
-        <Filter Name="buffers">
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\buffers\juce_AudioDataConverters.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\buffers\juce_AudioDataConverters.h"/>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\buffers\juce_AudioSampleBuffer.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\buffers\juce_AudioSampleBuffer.h"/>
-        </Filter>
-        <Filter Name="midi">
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiBuffer.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiBuffer.h"/>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiFile.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiFile.h"/>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiKeyboardState.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiKeyboardState.h"/>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiMessage.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiMessage.h"/>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiMessageSequence.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiMessageSequence.h"/>
-        </Filter>
-        <Filter Name="effects">
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\effects\juce_Decibels.h"/>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\effects\juce_IIRFilter.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\effects\juce_IIRFilter.h"/>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\effects\juce_Reverb.h"/>
-        </Filter>
-        <Filter Name="sources">
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\sources\juce_AudioSource.h"/>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\sources\juce_BufferingAudioSource.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\sources\juce_BufferingAudioSource.h"/>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\sources\juce_ChannelRemappingAudioSource.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\sources\juce_ChannelRemappingAudioSource.h"/>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\sources\juce_IIRFilterAudioSource.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\sources\juce_IIRFilterAudioSource.h"/>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\sources\juce_MixerAudioSource.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\sources\juce_MixerAudioSource.h"/>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\sources\juce_PositionableAudioSource.h"/>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\sources\juce_ResamplingAudioSource.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\sources\juce_ResamplingAudioSource.h"/>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\sources\juce_ReverbAudioSource.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\sources\juce_ReverbAudioSource.h"/>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\sources\juce_ToneGeneratorAudioSource.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\sources\juce_ToneGeneratorAudioSource.h"/>
-        </Filter>
-        <Filter Name="synthesisers">
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\synthesisers\juce_Synthesiser.cpp">
-            <FileConfiguration Name="Debug|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-            <FileConfiguration Name="Release|Win32"
-                               ExcludedFromBuild="true">
-              <Tool Name="VCCLCompilerTool"/>
-            </FileConfiguration>
-          </File>
-          <File RelativePath="..\..\..\..\modules\juce_audio_basics\synthesisers\juce_Synthesiser.h"/>
-        </Filter>
-        <File RelativePath="..\..\..\..\modules\juce_audio_basics\juce_module_info">
-          <FileConfiguration Name="Debug|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-          <FileConfiguration Name="Release|Win32"
-                             ExcludedFromBuild="true">
-            <Tool Name="VCCLCompilerTool"/>
-          </FileConfiguration>
-        </File>
-        <File RelativePath="..\..\..\..\modules\juce_audio_basics\juce_audio_basics.h"/>
-      </Filter>
       <Filter Name="juce_core">
         <Filter Name="text">
           <File RelativePath="..\..\..\..\modules\juce_core\text\juce_CharacterFunctions.cpp">
@@ -3667,7 +3464,6 @@
       <File RelativePath="..\..\JuceLibraryCode\AppConfig.h"/>
       <File RelativePath="..\..\JuceLibraryCode\BinaryData.cpp"/>
       <File RelativePath="..\..\JuceLibraryCode\BinaryData.h"/>
-      <File RelativePath="..\..\..\..\modules\juce_audio_basics\juce_audio_basics.cpp"/>
       <File RelativePath="..\..\..\..\modules\juce_core\juce_core.cpp"/>
       <File RelativePath="..\..\..\..\modules\juce_cryptography\juce_cryptography.cpp"/>
       <File RelativePath="..\..\..\..\modules\juce_data_structures\juce_data_structures.cpp"/>
diff --git a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj
index 821c3d0a99..048d74b64a 100644
--- a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj	
+++ b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj	
@@ -165,54 +165,6 @@
     <ClCompile Include="..\..\Source\BinaryData\jucer_WindowTemplate.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\buffers\juce_AudioDataConverters.cpp">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\buffers\juce_AudioSampleBuffer.cpp">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiBuffer.cpp">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiFile.cpp">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiKeyboardState.cpp">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiMessage.cpp">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiMessageSequence.cpp">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\effects\juce_IIRFilter.cpp">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\sources\juce_BufferingAudioSource.cpp">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\sources\juce_ChannelRemappingAudioSource.cpp">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\sources\juce_IIRFilterAudioSource.cpp">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\sources\juce_MixerAudioSource.cpp">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\sources\juce_ResamplingAudioSource.cpp">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\sources\juce_ReverbAudioSource.cpp">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\sources\juce_ToneGeneratorAudioSource.cpp">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\synthesisers\juce_Synthesiser.cpp">
-      <ExcludedFromBuild>true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_core\text\juce_CharacterFunctions.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -991,7 +943,6 @@
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\JuceLibraryCode\BinaryData.cpp"/>
-    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\juce_audio_basics.cpp"/>
     <ClCompile Include="..\..\..\..\modules\juce_core\juce_core.cpp"/>
     <ClCompile Include="..\..\..\..\modules\juce_cryptography\juce_cryptography.cpp"/>
     <ClCompile Include="..\..\..\..\modules\juce_data_structures\juce_data_structures.cpp"/>
@@ -1043,27 +994,6 @@
     <ClInclude Include="..\..\Source\BinaryData\jucer_AudioPluginFilterTemplate.h"/>
     <ClInclude Include="..\..\Source\BinaryData\jucer_NewCppFileTemplate.h"/>
     <ClInclude Include="..\..\Source\BinaryData\jucer_WindowTemplate.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\buffers\juce_AudioDataConverters.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\buffers\juce_AudioSampleBuffer.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiBuffer.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiFile.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiKeyboardState.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiMessage.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiMessageSequence.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\effects\juce_Decibels.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\effects\juce_IIRFilter.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\effects\juce_Reverb.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\sources\juce_AudioSource.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\sources\juce_BufferingAudioSource.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\sources\juce_ChannelRemappingAudioSource.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\sources\juce_IIRFilterAudioSource.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\sources\juce_MixerAudioSource.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\sources\juce_PositionableAudioSource.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\sources\juce_ResamplingAudioSource.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\sources\juce_ReverbAudioSource.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\sources\juce_ToneGeneratorAudioSource.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\synthesisers\juce_Synthesiser.h"/>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\juce_audio_basics.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\text\juce_CharacterFunctions.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\text\juce_CharPointer_ASCII.h"/>
     <ClInclude Include="..\..\..\..\modules\juce_core\text\juce_CharPointer_UTF16.h"/>
diff --git a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters
index b22d962157..e43d2169a9 100644
--- a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters	
+++ b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters	
@@ -26,24 +26,6 @@
     <Filter Include="Juce Modules">
       <UniqueIdentifier>{F842EDF7-A721-5611-7D34-D687130DB5AF}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Juce Modules\juce_audio_basics">
-      <UniqueIdentifier>{7DC92EF2-E271-9A9D-670B-D20E3BB1A433}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Juce Modules\juce_audio_basics\buffers">
-      <UniqueIdentifier>{953A48F2-5B19-40DB-D4D9-68702D2B7E55}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Juce Modules\juce_audio_basics\midi">
-      <UniqueIdentifier>{876A26AF-3F56-0869-028E-BE6C40A1A182}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Juce Modules\juce_audio_basics\effects">
-      <UniqueIdentifier>{0C3A88A6-68D6-21C8-3D84-1E4572BED74B}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Juce Modules\juce_audio_basics\sources">
-      <UniqueIdentifier>{F310E954-1312-0901-03F2-DB22605C8D01}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Juce Modules\juce_audio_basics\synthesisers">
-      <UniqueIdentifier>{C78E3776-E6F7-3E8C-B749-98CBDDCE9B0E}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Juce Modules\juce_core">
       <UniqueIdentifier>{0950B058-AE5B-9D46-7088-E03C444D0F06}</UniqueIdentifier>
     </Filter>
@@ -349,57 +331,6 @@
     <ClCompile Include="..\..\Source\BinaryData\juce_icon.png">
       <Filter>The Introjucer\BinaryData</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\buffers\juce_AudioDataConverters.cpp">
-      <Filter>Juce Modules\juce_audio_basics\buffers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\buffers\juce_AudioSampleBuffer.cpp">
-      <Filter>Juce Modules\juce_audio_basics\buffers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiBuffer.cpp">
-      <Filter>Juce Modules\juce_audio_basics\midi</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiFile.cpp">
-      <Filter>Juce Modules\juce_audio_basics\midi</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiKeyboardState.cpp">
-      <Filter>Juce Modules\juce_audio_basics\midi</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiMessage.cpp">
-      <Filter>Juce Modules\juce_audio_basics\midi</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiMessageSequence.cpp">
-      <Filter>Juce Modules\juce_audio_basics\midi</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\effects\juce_IIRFilter.cpp">
-      <Filter>Juce Modules\juce_audio_basics\effects</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\sources\juce_BufferingAudioSource.cpp">
-      <Filter>Juce Modules\juce_audio_basics\sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\sources\juce_ChannelRemappingAudioSource.cpp">
-      <Filter>Juce Modules\juce_audio_basics\sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\sources\juce_IIRFilterAudioSource.cpp">
-      <Filter>Juce Modules\juce_audio_basics\sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\sources\juce_MixerAudioSource.cpp">
-      <Filter>Juce Modules\juce_audio_basics\sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\sources\juce_ResamplingAudioSource.cpp">
-      <Filter>Juce Modules\juce_audio_basics\sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\sources\juce_ReverbAudioSource.cpp">
-      <Filter>Juce Modules\juce_audio_basics\sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\sources\juce_ToneGeneratorAudioSource.cpp">
-      <Filter>Juce Modules\juce_audio_basics\sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\synthesisers\juce_Synthesiser.cpp">
-      <Filter>Juce Modules\juce_audio_basics\synthesisers</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\juce_module_info">
-      <Filter>Juce Modules\juce_audio_basics</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_core\text\juce_CharacterFunctions.cpp">
       <Filter>Juce Modules\juce_core\text</Filter>
     </ClCompile>
@@ -1264,9 +1195,6 @@
     <ClCompile Include="..\..\JuceLibraryCode\BinaryData.cpp">
       <Filter>Juce Library Code</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\juce_audio_basics.cpp">
-      <Filter>Juce Library Code</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\modules\juce_core\juce_core.cpp">
       <Filter>Juce Library Code</Filter>
     </ClCompile>
@@ -1416,69 +1344,6 @@
     <ClInclude Include="..\..\Source\BinaryData\jucer_WindowTemplate.h">
       <Filter>The Introjucer\BinaryData</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\buffers\juce_AudioDataConverters.h">
-      <Filter>Juce Modules\juce_audio_basics\buffers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\buffers\juce_AudioSampleBuffer.h">
-      <Filter>Juce Modules\juce_audio_basics\buffers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiBuffer.h">
-      <Filter>Juce Modules\juce_audio_basics\midi</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiFile.h">
-      <Filter>Juce Modules\juce_audio_basics\midi</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiKeyboardState.h">
-      <Filter>Juce Modules\juce_audio_basics\midi</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiMessage.h">
-      <Filter>Juce Modules\juce_audio_basics\midi</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\midi\juce_MidiMessageSequence.h">
-      <Filter>Juce Modules\juce_audio_basics\midi</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\effects\juce_Decibels.h">
-      <Filter>Juce Modules\juce_audio_basics\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\effects\juce_IIRFilter.h">
-      <Filter>Juce Modules\juce_audio_basics\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\effects\juce_Reverb.h">
-      <Filter>Juce Modules\juce_audio_basics\effects</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\sources\juce_AudioSource.h">
-      <Filter>Juce Modules\juce_audio_basics\sources</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\sources\juce_BufferingAudioSource.h">
-      <Filter>Juce Modules\juce_audio_basics\sources</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\sources\juce_ChannelRemappingAudioSource.h">
-      <Filter>Juce Modules\juce_audio_basics\sources</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\sources\juce_IIRFilterAudioSource.h">
-      <Filter>Juce Modules\juce_audio_basics\sources</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\sources\juce_MixerAudioSource.h">
-      <Filter>Juce Modules\juce_audio_basics\sources</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\sources\juce_PositionableAudioSource.h">
-      <Filter>Juce Modules\juce_audio_basics\sources</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\sources\juce_ResamplingAudioSource.h">
-      <Filter>Juce Modules\juce_audio_basics\sources</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\sources\juce_ReverbAudioSource.h">
-      <Filter>Juce Modules\juce_audio_basics\sources</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\sources\juce_ToneGeneratorAudioSource.h">
-      <Filter>Juce Modules\juce_audio_basics\sources</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\synthesisers\juce_Synthesiser.h">
-      <Filter>Juce Modules\juce_audio_basics\synthesisers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\modules\juce_audio_basics\juce_audio_basics.h">
-      <Filter>Juce Modules\juce_audio_basics</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\modules\juce_core\text\juce_CharacterFunctions.h">
       <Filter>Juce Modules\juce_core\text</Filter>
     </ClInclude>
diff --git a/extras/Introjucer/Introjucer.jucer b/extras/Introjucer/Introjucer.jucer
index 4b48ae24a0..281b832f97 100644
--- a/extras/Introjucer/Introjucer.jucer
+++ b/extras/Introjucer/Introjucer.jucer
@@ -207,6 +207,5 @@
     <MODULE id="juce_audio" showAllCode="1"/>
     <MODULE id="juce_gui_basics" showAllCode="1"/>
     <MODULE id="juce_gui_extra" showAllCode="1"/>
-    <MODULE id="juce_audio_basics" showAllCode="1"/>
   </MODULES>
 </JUCERPROJECT>
diff --git a/extras/Introjucer/JuceLibraryCode/AppConfig.h b/extras/Introjucer/JuceLibraryCode/AppConfig.h
index 234d77d562..ef8e7b369b 100644
--- a/extras/Introjucer/JuceLibraryCode/AppConfig.h
+++ b/extras/Introjucer/JuceLibraryCode/AppConfig.h
@@ -14,7 +14,6 @@
 #define __JUCE_APPCONFIG_M70QFTRRK__
 
 //==============================================================================
-#define JUCE_MODULE_AVAILABLE_juce_audio_basics         1
 #define JUCE_MODULE_AVAILABLE_juce_core                 1
 #define JUCE_MODULE_AVAILABLE_juce_cryptography         1
 #define JUCE_MODULE_AVAILABLE_juce_data_structures      1
diff --git a/extras/Introjucer/JuceLibraryCode/JuceHeader.h b/extras/Introjucer/JuceLibraryCode/JuceHeader.h
index 45784b0768..77cab3b5ed 100644
--- a/extras/Introjucer/JuceLibraryCode/JuceHeader.h
+++ b/extras/Introjucer/JuceLibraryCode/JuceHeader.h
@@ -14,7 +14,6 @@
 #define __APPHEADERFILE_M70QFTRRK__
 
 #include "AppConfig.h"
-#include "modules/juce_audio_basics/juce_audio_basics.h"
 #include "modules/juce_core/juce_core.h"
 #include "modules/juce_cryptography/juce_cryptography.h"
 #include "modules/juce_data_structures/juce_data_structures.h"
diff --git a/extras/Introjucer/JuceLibraryCode/modules/juce_audio_basics/juce_audio_basics.h b/extras/Introjucer/JuceLibraryCode/modules/juce_audio_basics/juce_audio_basics.h
deleted file mode 100644
index b9a775c861..0000000000
--- a/extras/Introjucer/JuceLibraryCode/modules/juce_audio_basics/juce_audio_basics.h
+++ /dev/null
@@ -1,5 +0,0 @@
-// This is an auto-generated file to redirect any included
-// module headers to the correct external folder.
-
-#include "../../../../../modules/juce_audio_basics/juce_audio_basics.h"
-
diff --git a/extras/Introjucer/Source/Application/jucer_CommandLine.cpp b/extras/Introjucer/Source/Application/jucer_CommandLine.cpp
index a84124dfe3..3b577e8500 100644
--- a/extras/Introjucer/Source/Application/jucer_CommandLine.cpp
+++ b/extras/Introjucer/Source/Application/jucer_CommandLine.cpp
@@ -180,6 +180,22 @@ namespace
 
         return 0;
     }
+
+    int listModules()
+    {
+        std::cout << "Downloading list of available modules..." << std::endl;
+        ModuleList list;
+        list.loadFromWebsite();
+
+        for (int i = 0; i < list.modules.size(); ++i)
+        {
+            ModuleList::Module* m = list.modules.getUnchecked(i);
+
+            std::cout << m->uid << ": " << m->version << std::endl;
+        }
+
+        return 0;
+    }
 }
 
 //==============================================================================
@@ -198,5 +214,8 @@ int performCommandLine (const String& commandLine)
     if (tokens[0] == "buildallmodules")
         return buildModules (tokens, true);
 
+    if (tokens[0] == "listmodules")
+        return listModules();
+
     return commandLineNotPerformed;
 }
diff --git a/extras/Introjucer/Source/Project/jucer_Module.cpp b/extras/Introjucer/Source/Project/jucer_Module.cpp
index 5b0ad6d57c..1dde1874b4 100644
--- a/extras/Introjucer/Source/Project/jucer_Module.cpp
+++ b/extras/Introjucer/Source/Project/jucer_Module.cpp
@@ -88,7 +88,7 @@ void ModuleList::loadFromWebsite()
     modules.clear();
 
     URL baseURL ("http://www.rawmaterialsoftware.com/juce/modules");
-    URL url (baseURL.getChildURL ("modulelist"));
+    URL url (baseURL.getChildURL ("modulelist.php"));
 
     var infoList (JSON::parse (url.readEntireTextStream (false)));