diff --git a/extras/Projucer/Source/Project Saving/jucer_ProjectExporter.cpp b/extras/Projucer/Source/Project Saving/jucer_ProjectExporter.cpp
index 97c7496ec4..198ca1b349 100644
--- a/extras/Projucer/Source/Project Saving/jucer_ProjectExporter.cpp	
+++ b/extras/Projucer/Source/Project Saving/jucer_ProjectExporter.cpp	
@@ -304,7 +304,10 @@ void ProjectExporter::addVST3FolderToPath()
     const String vst3Folder (getVST3PathValue().toString());
 
     if (vst3Folder.isNotEmpty())
-        addToExtraSearchPaths (RelativePath (vst3Folder, RelativePath::projectFolder), 0);
+    {
+        addToExtraSearchPaths (RelativePath (vst3Folder, RelativePath::projectFolder).getChildFile ("VST2_SDK"), 0);
+        addToExtraSearchPaths (RelativePath (vst3Folder, RelativePath::projectFolder).getChildFile ("VST3_SDK"), 0);
+    }
 }
 
 void ProjectExporter::addAAXFoldersToPath()
diff --git a/extras/Projucer/Source/Utility/jucer_StoredSettings.cpp b/extras/Projucer/Source/Utility/jucer_StoredSettings.cpp
index f4359176b5..0900231afc 100644
--- a/extras/Projucer/Source/Utility/jucer_StoredSettings.cpp
+++ b/extras/Projucer/Source/Utility/jucer_StoredSettings.cpp
@@ -277,7 +277,7 @@ bool StoredSettings::isGlobalPathValid (const File& relativeTo, const Identifier
 
     if (key == Ids::vst3Path)
     {
-        fileToCheckFor = "base/source/baseiids.cpp";
+        fileToCheckFor = "VST3_SDK/base/source/baseiids.cpp";
     }
     else if (key == Ids::rtasPath)
     {
diff --git a/modules/juce_audio_processors/format_types/juce_VST3Headers.h b/modules/juce_audio_processors/format_types/juce_VST3Headers.h
index c3b12036af..c0d6f0de72 100644
--- a/modules/juce_audio_processors/format_types/juce_VST3Headers.h
+++ b/modules/juce_audio_processors/format_types/juce_VST3Headers.h
@@ -84,14 +84,12 @@
  #include <public.sdk/source/vst/vsteditcontroller.h>
 #else
  #include <base/source/baseiids.cpp>
- #include <base/source/fatomic.cpp>
  #include <base/source/fbuffer.cpp>
  #include <base/source/fdebug.cpp>
  #include <base/source/fobject.cpp>
- #include <base/source/frect.cpp>
  #include <base/source/fstreamer.cpp>
  #include <base/source/fstring.cpp>
- #include <base/source/fthread.cpp>
+ #include <base/source/flock.cpp>
  #include <base/source/updatehandler.cpp>
  #include <pluginterfaces/base/conststringtable.cpp>
  #include <pluginterfaces/base/funknown.cpp>