diff --git a/examples/Assets/DemoUtilities.h b/examples/Assets/DemoUtilities.h
index c6438e27ed..0893cfc0d7 100644
--- a/examples/Assets/DemoUtilities.h
+++ b/examples/Assets/DemoUtilities.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include <JuceHeader.h>
 
 #ifndef PIP_DEMO_UTILITIES_INCLUDED
  #define PIP_DEMO_UTILITIES_INCLUDED 1
diff --git a/examples/DemoRunner/Builds/Android/app/src/main/assets/DemoUtilities.h b/examples/DemoRunner/Builds/Android/app/src/main/assets/DemoUtilities.h
index c6438e27ed..0893cfc0d7 100644
--- a/examples/DemoRunner/Builds/Android/app/src/main/assets/DemoUtilities.h
+++ b/examples/DemoRunner/Builds/Android/app/src/main/assets/DemoUtilities.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include <JuceHeader.h>
 
 #ifndef PIP_DEMO_UTILITIES_INCLUDED
  #define PIP_DEMO_UTILITIES_INCLUDED 1
diff --git a/examples/DemoRunner/Source/Demos/DemoPIPs1.cpp b/examples/DemoRunner/Source/Demos/DemoPIPs1.cpp
index 9fe417f9ea..f030078ef8 100644
--- a/examples/DemoRunner/Source/Demos/DemoPIPs1.cpp
+++ b/examples/DemoRunner/Source/Demos/DemoPIPs1.cpp
@@ -24,7 +24,7 @@
   ==============================================================================
 */
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include <JuceHeader.h>
 #include "../../../Assets/DemoUtilities.h"
 #include "JUCEDemos.h"
 
diff --git a/examples/DemoRunner/Source/Demos/DemoPIPs2.cpp b/examples/DemoRunner/Source/Demos/DemoPIPs2.cpp
index b7d95de83a..d2584529bd 100644
--- a/examples/DemoRunner/Source/Demos/DemoPIPs2.cpp
+++ b/examples/DemoRunner/Source/Demos/DemoPIPs2.cpp
@@ -24,7 +24,7 @@
   ==============================================================================
 */
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include <JuceHeader.h>
 #include "../../../Assets/DemoUtilities.h"
 #include "JUCEDemos.h"
 
diff --git a/examples/DemoRunner/Source/Demos/JUCEDemos.cpp b/examples/DemoRunner/Source/Demos/JUCEDemos.cpp
index e609221670..9c7f5132d3 100644
--- a/examples/DemoRunner/Source/Demos/JUCEDemos.cpp
+++ b/examples/DemoRunner/Source/Demos/JUCEDemos.cpp
@@ -24,7 +24,7 @@
   ==============================================================================
 */
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include <JuceHeader.h>
 #include "../../../Assets/DemoUtilities.h"
 #include "JUCEDemos.h"
 
diff --git a/examples/DemoRunner/Source/Main.cpp b/examples/DemoRunner/Source/Main.cpp
index edbd8f8e61..537d83079c 100644
--- a/examples/DemoRunner/Source/Main.cpp
+++ b/examples/DemoRunner/Source/Main.cpp
@@ -24,7 +24,7 @@
   ==============================================================================
 */
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include <JuceHeader.h>
 #include "../../Assets/DemoUtilities.h"
 
 #include "UI/MainComponent.h"
diff --git a/examples/DemoRunner/Source/UI/DemoContentComponent.h b/examples/DemoRunner/Source/UI/DemoContentComponent.h
index b4daee1140..7a15f5372d 100644
--- a/examples/DemoRunner/Source/UI/DemoContentComponent.h
+++ b/examples/DemoRunner/Source/UI/DemoContentComponent.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include <JuceHeader.h>
 #include "../Demos/JUCEDemos.h"
 
 struct DemoContent;
diff --git a/examples/DemoRunner/Source/UI/MainComponent.h b/examples/DemoRunner/Source/UI/MainComponent.h
index 5833cb9171..2486383020 100644
--- a/examples/DemoRunner/Source/UI/MainComponent.h
+++ b/examples/DemoRunner/Source/UI/MainComponent.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include <JuceHeader.h>
 #include "DemoContentComponent.h"
 
 //==============================================================================
diff --git a/extras/AudioPerformanceTest/Source/Main.cpp b/extras/AudioPerformanceTest/Source/Main.cpp
index bfce625b56..76c3337fd9 100644
--- a/extras/AudioPerformanceTest/Source/Main.cpp
+++ b/extras/AudioPerformanceTest/Source/Main.cpp
@@ -24,7 +24,7 @@
   ==============================================================================
 */
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include <JuceHeader.h>
 #include "MainComponent.h"
 
 Component* createMainContentComponent();
diff --git a/extras/AudioPerformanceTest/Source/MainComponent.h b/extras/AudioPerformanceTest/Source/MainComponent.h
index f30b83e4c5..73dc3a1853 100644
--- a/extras/AudioPerformanceTest/Source/MainComponent.h
+++ b/extras/AudioPerformanceTest/Source/MainComponent.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include <JuceHeader.h>
 #include <mutex>
 
 //==============================================================================
diff --git a/extras/AudioPluginHost/Source/HostStartup.cpp b/extras/AudioPluginHost/Source/HostStartup.cpp
index e45009acaa..cce530eb45 100644
--- a/extras/AudioPluginHost/Source/HostStartup.cpp
+++ b/extras/AudioPluginHost/Source/HostStartup.cpp
@@ -24,7 +24,7 @@
   ==============================================================================
 */
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include <JuceHeader.h>
 #include "UI/MainHostWindow.h"
 #include "Plugins/InternalPlugins.h"
 
diff --git a/extras/AudioPluginHost/Source/Plugins/IOConfigurationWindow.cpp b/extras/AudioPluginHost/Source/Plugins/IOConfigurationWindow.cpp
index 2a8ac4d089..03b3454141 100644
--- a/extras/AudioPluginHost/Source/Plugins/IOConfigurationWindow.cpp
+++ b/extras/AudioPluginHost/Source/Plugins/IOConfigurationWindow.cpp
@@ -24,7 +24,7 @@
   ==============================================================================
 */
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include <JuceHeader.h>
 #include "../UI/GraphEditorPanel.h"
 #include "InternalPlugins.h"
 #include "../UI/MainHostWindow.h"
diff --git a/extras/AudioPluginHost/Source/Plugins/InternalPlugins.cpp b/extras/AudioPluginHost/Source/Plugins/InternalPlugins.cpp
index b4b4cf5555..eb10b98b98 100644
--- a/extras/AudioPluginHost/Source/Plugins/InternalPlugins.cpp
+++ b/extras/AudioPluginHost/Source/Plugins/InternalPlugins.cpp
@@ -24,7 +24,7 @@
   ==============================================================================
 */
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include <JuceHeader.h>
 #include "InternalPlugins.h"
 #include "PluginGraph.h"
 
diff --git a/extras/AudioPluginHost/Source/Plugins/PluginGraph.cpp b/extras/AudioPluginHost/Source/Plugins/PluginGraph.cpp
index 416c9b4bb0..8d9b9261fb 100644
--- a/extras/AudioPluginHost/Source/Plugins/PluginGraph.cpp
+++ b/extras/AudioPluginHost/Source/Plugins/PluginGraph.cpp
@@ -24,7 +24,7 @@
   ==============================================================================
 */
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include <JuceHeader.h>
 #include "../UI/MainHostWindow.h"
 #include "PluginGraph.h"
 #include "InternalPlugins.h"
diff --git a/extras/AudioPluginHost/Source/UI/GraphEditorPanel.cpp b/extras/AudioPluginHost/Source/UI/GraphEditorPanel.cpp
index d6d2fa87a7..afa65bdbee 100644
--- a/extras/AudioPluginHost/Source/UI/GraphEditorPanel.cpp
+++ b/extras/AudioPluginHost/Source/UI/GraphEditorPanel.cpp
@@ -24,7 +24,7 @@
   ==============================================================================
 */
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include <JuceHeader.h>
 #include "GraphEditorPanel.h"
 #include "../Plugins/InternalPlugins.h"
 #include "MainHostWindow.h"
diff --git a/extras/AudioPluginHost/Source/UI/MainHostWindow.cpp b/extras/AudioPluginHost/Source/UI/MainHostWindow.cpp
index 28678c2c4c..104b8aaef8 100644
--- a/extras/AudioPluginHost/Source/UI/MainHostWindow.cpp
+++ b/extras/AudioPluginHost/Source/UI/MainHostWindow.cpp
@@ -24,7 +24,7 @@
   ==============================================================================
 */
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include <JuceHeader.h>
 #include "MainHostWindow.h"
 #include "../Plugins/InternalPlugins.h"
 
diff --git a/extras/BinaryBuilder/Source/Main.cpp b/extras/BinaryBuilder/Source/Main.cpp
index e6c4aeaac5..9716d7c10f 100644
--- a/extras/BinaryBuilder/Source/Main.cpp
+++ b/extras/BinaryBuilder/Source/Main.cpp
@@ -35,7 +35,7 @@
   ==============================================================================
 */
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include <JuceHeader.h>
 
 
 //==============================================================================
diff --git a/extras/NetworkGraphicsDemo/Source/Main.cpp b/extras/NetworkGraphicsDemo/Source/Main.cpp
index 40c0597b3b..07298d41ae 100644
--- a/extras/NetworkGraphicsDemo/Source/Main.cpp
+++ b/extras/NetworkGraphicsDemo/Source/Main.cpp
@@ -24,7 +24,7 @@
   ==============================================================================
 */
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include <JuceHeader.h>
 
 namespace
 {
diff --git a/extras/Projucer/Source/Application/jucer_Headers.h b/extras/Projucer/Source/Application/jucer_Headers.h
index 048a9aa3e7..b96a1bbf0f 100644
--- a/extras/Projucer/Source/Application/jucer_Headers.h
+++ b/extras/Projucer/Source/Application/jucer_Headers.h
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include <JuceHeader.h>
 #include "jucer_CommonHeaders.h"
 
 #if JUCE_DEBUG
diff --git a/extras/UnitTestRunner/Source/Main.cpp b/extras/UnitTestRunner/Source/Main.cpp
index 47ebd68281..3c9a56ad44 100644
--- a/extras/UnitTestRunner/Source/Main.cpp
+++ b/extras/UnitTestRunner/Source/Main.cpp
@@ -24,7 +24,7 @@
   ==============================================================================
 */
 
-#include "../JuceLibraryCode/JuceHeader.h"
+#include <JuceHeader.h>
 
 //==============================================================================
 class ConsoleLogger : public Logger