Includes: Move some miscellaneous includes into module header and source files

modules/juce_audio_basics/juce_audio_basics.cpp

@@ -39,13 +39,18 @@
  #include <emmintrin.h>
 #endif
 
-#ifndef JUCE_USE_VDSP_FRAMEWORK
- #define JUCE_USE_VDSP_FRAMEWORK 1
-#endif
+#if JUCE_MAC || JUCE_IOS
+ #ifndef JUCE_USE_VDSP_FRAMEWORK
+  #define JUCE_USE_VDSP_FRAMEWORK 1
+ #endif
 
-#if (JUCE_MAC || JUCE_IOS) && JUCE_USE_VDSP_FRAMEWORK
- #include <Accelerate/Accelerate.h>
-#else
+ #if JUCE_USE_VDSP_FRAMEWORK
+  #include <Accelerate/Accelerate.h>
+ #endif
+
+ #include "native/juce_AudioWorkgroup_mac.h"
+
+#elif JUCE_USE_VDSP_FRAMEWORK
  #undef JUCE_USE_VDSP_FRAMEWORK
 #endif
 

modules/juce_audio_basics/utilities/juce_AudioWorkgroup.cpp

@@ -20,11 +20,6 @@
   ==============================================================================
 */
 
-
-#if JUCE_MAC || JUCE_IOS
- #include "../native/juce_AudioWorkgroup_mac.h"
-#endif
-
 namespace juce
 {
 

modules/juce_audio_devices/juce_audio_devices.cpp

@@ -50,6 +50,8 @@
 
 //==============================================================================
 #if JUCE_MAC || JUCE_IOS
+ #include <juce_audio_basics/native/juce_CoreAudioTimeConversions_mac.h>
+ #include <juce_audio_basics/native/juce_AudioWorkgroup_mac.h>
  #include <juce_audio_basics/midi/juce_MidiDataConcatenator.h>
  #include <juce_audio_basics/midi/ump/juce_UMP.h>
  #include "midi_io/ump/juce_UMPBytestreamInputHandler.h"
@@ -77,6 +79,10 @@
   #import <CoreMIDI/MIDINetworkSession.h>
  #endif
 
+ #if JUCE_MODULE_AVAILABLE_juce_graphics
+  #include <juce_graphics/native/juce_CoreGraphicsHelpers_mac.h>
+ #endif
+
  #include "native/juce_Audio_ios.cpp"
  #include "native/juce_CoreMidi_mac.mm"
 

modules/juce_audio_devices/native/juce_Audio_ios.cpp

@@ -20,10 +20,6 @@
   ==============================================================================
 */
 
-#include <juce_audio_basics/native/juce_CoreAudioTimeConversions_mac.h>
-#include <juce_audio_basics/native/juce_AudioWorkgroup_mac.h>
-
-
 namespace juce
 {
 
@@ -197,10 +193,6 @@ JUCE_END_IGNORE_WARNINGS_GCC_LIKE
 @end
 
 //==============================================================================
-#if JUCE_MODULE_AVAILABLE_juce_graphics
- #include <juce_graphics/native/juce_CoreGraphicsHelpers_mac.h>
-#endif
-
 namespace juce {
 
 #ifndef JUCE_IOS_AUDIO_LOGGING

modules/juce_audio_devices/native/juce_CoreAudio_mac.cpp

@@ -20,9 +20,6 @@
   ==============================================================================
 */
 
-#include <juce_audio_basics/native/juce_CoreAudioTimeConversions_mac.h>
-#include <juce_audio_basics/native/juce_AudioWorkgroup_mac.h>
-
 namespace juce
 {
 

modules/juce_audio_utils/juce_audio_utils.cpp

@@ -41,8 +41,10 @@
 #include <juce_gui_extra/juce_gui_extra.h>
 
 #if JUCE_MAC
-  #import <DiscRecording/DiscRecording.h>
-  #import <CoreAudioKit/CABTLEMIDIWindowController.h>
+ #import <DiscRecording/DiscRecording.h>
+ #import <CoreAudioKit/CABTLEMIDIWindowController.h>
+#elif JUCE_IOS
+ #import <CoreAudioKit/CoreAudioKit.h>
 #elif JUCE_WINDOWS
  #if JUCE_USE_CDBURNER
   /* You'll need the Platform SDK for these headers - if you don't have it and don't

modules/juce_audio_utils/native/juce_BluetoothMidiDevicePairingDialogue_ios.mm

@@ -25,8 +25,6 @@
 
 #if ! TARGET_IPHONE_SIMULATOR
 
-#include <CoreAudioKit/CoreAudioKit.h>
-
 namespace juce
 {
 

modules/juce_core/juce_core.h

@@ -354,6 +354,7 @@ JUCE_END_IGNORE_WARNINGS_MSVC
 #include "streams/juce_AndroidDocumentInputSource.h"
 
 #if JUCE_CORE_INCLUDE_OBJC_HELPERS && (JUCE_MAC || JUCE_IOS)
+ #include "native/juce_CFHelpers_mac.h"
  #include "native/juce_ObjCHelpers_mac.h"
 #endif
 

modules/juce_core/memory/juce_ByteOrder.h

@@ -20,10 +20,6 @@
   ==============================================================================
 */
 
-#if ! defined (DOXYGEN) && (JUCE_MAC || JUCE_IOS)
- #include <libkern/OSByteOrder.h>
-#endif
-
 namespace juce
 {
 

modules/juce_core/native/juce_ObjCHelpers_mac.h

@@ -20,8 +20,6 @@
   ==============================================================================
 */
 
-#include "juce_CFHelpers_mac.h"
-
 /* This file contains a few helper functions that are used internally but which
    need to be kept away from the public headers because they use obj-C symbols.
 */

modules/juce_core/system/juce_StandardHeader.h

@@ -92,6 +92,7 @@ JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4514 4245 4100)
 
 #if JUCE_MAC || JUCE_IOS
  #include <libkern/OSAtomic.h>
+ #include <libkern/OSByteOrder.h>
  #include <xlocale.h>
  #include <signal.h>
 #endif

modules/juce_dsp/juce_dsp.cpp

@@ -56,6 +56,7 @@
 
 #include "processors/juce_FIRFilter.cpp"
 #include "processors/juce_IIRFilter.cpp"
+#include "processors/juce_IIRFilter_Impl.h"
 #include "processors/juce_FirstOrderTPTFilter.cpp"
 #include "processors/juce_Panner.cpp"
 #include "processors/juce_Oversampling.cpp"

modules/juce_dsp/juce_dsp.h

@@ -239,6 +239,7 @@ namespace juce
  #endif
 
  #include "containers/juce_SIMDRegister.h"
+ #include "containers/juce_SIMDRegister_Impl.h"
 #endif
 
 #include "maths/juce_SpecialFunctions.h"

modules/juce_gui_basics/juce_gui_basics.cpp

@@ -138,6 +138,7 @@
 
 #if JUCE_MAC || JUCE_IOS
  #include "native/accessibility/juce_AccessibilitySharedCode_mac.mm"
+ #include "native/juce_CGMetalLayerRenderer_mac.h"
 
  #if JUCE_IOS
   #include "native/juce_UIViewComponentPeer_ios.mm"
@@ -166,6 +167,9 @@
  #include "native/juce_MouseCursor_mac.mm"
 
 #elif JUCE_WINDOWS
+ #if JUCE_MODULE_AVAILABLE_juce_audio_plugin_client
+  #include <juce_audio_plugin_client/AAX/juce_AAX_Modifier_Injector.h>
+ #endif
  #include "native/accessibility/juce_ComInterfaces_windows.h"
  #include "native/accessibility/juce_WindowsUIAWrapper_windows.h"
  #include "native/accessibility/juce_AccessibilityElement_windows.h"

modules/juce_gui_basics/native/juce_NSViewComponentPeer_mac.mm

@@ -23,8 +23,6 @@
   ==============================================================================
 */
 
-#include "juce_CGMetalLayerRenderer_mac.h"
-
 @interface NSEvent (DeviceDelta)
 - (float)deviceDeltaX;
 - (float)deviceDeltaY;

modules/juce_gui_basics/native/juce_UIViewComponentPeer_ios.mm

@@ -23,8 +23,6 @@
   ==============================================================================
 */
 
-#include "juce_CGMetalLayerRenderer_mac.h"
-
 #if TARGET_OS_SIMULATOR && JUCE_COREGRAPHICS_RENDER_WITH_MULTIPLE_PAINT_CALLS
  #warning JUCE_COREGRAPHICS_RENDER_WITH_MULTIPLE_PAINT_CALLS uses parts of the Metal API that are currently unsupported in the simulator - falling back to JUCE_COREGRAPHICS_RENDER_WITH_MULTIPLE_PAINT_CALLS=0
  #undef JUCE_COREGRAPHICS_RENDER_WITH_MULTIPLE_PAINT_CALLS

modules/juce_gui_basics/native/juce_Windowing_windows.cpp

@@ -23,10 +23,6 @@
   ==============================================================================
 */
 
-#if JUCE_MODULE_AVAILABLE_juce_audio_plugin_client
- #include <juce_audio_plugin_client/AAX/juce_AAX_Modifier_Injector.h>
-#endif
-
 namespace juce
 {
 

modules/juce_gui_extra/juce_gui_extra.cpp

@@ -94,6 +94,7 @@
   #if JUCE_USE_WIN_WEBVIEW2
    #include <windows.foundation.h>
    #include <windows.foundation.collections.h>
+   #include <winuser.h>
 
    JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4265)
    #include <wrl.h>
@@ -176,6 +177,10 @@
  #include "native/juce_XEmbedComponent_linux.cpp"
 
  #if JUCE_WEB_BROWSER
+  #if JUCE_USE_EXTERNAL_TEMPORARY_SUBPROCESS
+   #include "juce_LinuxSubprocessHelperBinaryData.h"
+  #endif
+
   #include "native/juce_WebBrowserComponent_linux.cpp"
  #endif
 

modules/juce_gui_extra/native/juce_WebBrowserComponent_linux.cpp

@@ -23,10 +23,6 @@
   ==============================================================================
 */
 
-#if JUCE_USE_EXTERNAL_TEMPORARY_SUBPROCESS
- #include "juce_LinuxSubprocessHelperBinaryData.h"
-#endif
-
 namespace juce
 {
 

modules/juce_gui_extra/native/juce_WebBrowserComponent_windows.cpp

@@ -351,8 +351,6 @@ private:
 
 #if JUCE_USE_WIN_WEBVIEW2
 
-#include <winuser.h>
-
 using namespace Microsoft::WRL;
 
 static std::vector<HWND> getDirectChildWindows (HWND hwnd)