diff --git a/extras/static library/JuceLibraryCode/modules/juce_audio_utils/juce_audio_utils.h b/extras/static library/JuceLibraryCode/modules/juce_audio_utils/juce_audio_utils.h
new file mode 100644
index 0000000000..dfd50e5536
--- /dev/null
+++ b/extras/static library/JuceLibraryCode/modules/juce_audio_utils/juce_audio_utils.h	
@@ -0,0 +1,5 @@
+// This is an auto-generated file to redirect any included
+// module headers to the correct external folder.
+
+#include "../../../../../modules/juce_audio_utils/juce_audio_utils.h"
+
diff --git a/modules/juce_core/juce_core.cpp b/modules/juce_core/juce_core.cpp
index cf67e0dccf..8c091d960d 100644
--- a/modules/juce_core/juce_core.cpp
+++ b/modules/juce_core/juce_core.cpp
@@ -143,45 +143,50 @@ namespace juce
 
 //==============================================================================
 #if JUCE_MAC || JUCE_IOS
- #include "native/juce_osx_ObjCHelpers.h"
- #include "native/juce_mac_ObjCSuffix.h"
- #include "native/juce_posix_NamedPipe.cpp"
- #include "native/juce_posix_SharedCode.h"
- #include "native/juce_mac_Files.mm"
- #include "native/juce_mac_Network.mm"
- #include "native/juce_mac_Strings.mm"
- #include "native/juce_mac_SystemStats.mm"
- #include "native/juce_mac_Threads.mm"
+#include "native/juce_osx_ObjCHelpers.h"
+#include "native/juce_mac_ObjCSuffix.h"
+#endif
+
+#if JUCE_ANDROID
+#include "native/juce_android_JNIHelpers.h"
+#endif
+
+#if ! JUCE_WINDOWS
+#include "native/juce_posix_SharedCode.h"
+#include "native/juce_posix_NamedPipe.cpp"
+#endif
+
+//==============================================================================
+#if JUCE_MAC || JUCE_IOS
+#include "native/juce_mac_Files.mm"
+#include "native/juce_mac_Network.mm"
+#include "native/juce_mac_Strings.mm"
+#include "native/juce_mac_SystemStats.mm"
+#include "native/juce_mac_Threads.mm"
 
 //==============================================================================
 #elif JUCE_WINDOWS
- #include "native/juce_win32_ComSmartPtr.h"
- #include "native/juce_win32_Files.cpp"
- #include "native/juce_win32_Network.cpp"
- #include "native/juce_win32_Registry.cpp"
- #include "native/juce_win32_SystemStats.cpp"
- #include "native/juce_win32_Threads.cpp"
+#include "native/juce_win32_ComSmartPtr.h"
+#include "native/juce_win32_Files.cpp"
+#include "native/juce_win32_Network.cpp"
+#include "native/juce_win32_Registry.cpp"
+#include "native/juce_win32_SystemStats.cpp"
+#include "native/juce_win32_Threads.cpp"
 
 //==============================================================================
 #elif JUCE_LINUX
- #include "native/juce_posix_SharedCode.h"
- #include "native/juce_posix_NamedPipe.cpp"
- #include "native/juce_linux_Files.cpp"
- #include "native/juce_linux_Network.cpp"
- #include "native/juce_linux_SystemStats.cpp"
- #include "native/juce_linux_Threads.cpp"
+#include "native/juce_linux_Files.cpp"
+#include "native/juce_linux_Network.cpp"
+#include "native/juce_linux_SystemStats.cpp"
+#include "native/juce_linux_Threads.cpp"
 
 //==============================================================================
 #elif JUCE_ANDROID
- #include "native/juce_android_JNIHelpers.h"
- #include "native/juce_posix_SharedCode.h"
- #include "native/juce_posix_NamedPipe.cpp"
- #include "native/juce_android_Files.cpp"
- #include "native/juce_android_Misc.cpp"
- #include "native/juce_android_Network.cpp"
- #include "native/juce_android_SystemStats.cpp"
- #include "native/juce_android_Threads.cpp"
+#include "native/juce_android_Files.cpp"
+#include "native/juce_android_Misc.cpp"
+#include "native/juce_android_Network.cpp"
+#include "native/juce_android_SystemStats.cpp"
+#include "native/juce_android_Threads.cpp"
 
 #endif
-
 }
\ No newline at end of file