diff --git a/extras/Projucer/Source/LiveBuildEngine/jucer_CompileEngineServer.cpp b/extras/Projucer/Source/LiveBuildEngine/jucer_CompileEngineServer.cpp
index 1f809f7cbc..8b7e926087 100644
--- a/extras/Projucer/Source/LiveBuildEngine/jucer_CompileEngineServer.cpp
+++ b/extras/Projucer/Source/LiveBuildEngine/jucer_CompileEngineServer.cpp
@@ -52,6 +52,8 @@
 #if JUCE_WINDOWS
  static void setParentProcessID (int);
  static int getCurrentProcessID();
+#else
+ #include <unistd.h>
 #endif
 
 //==============================================================================
diff --git a/modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm b/modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm
index fefa8f7341..7698e704b3 100644
--- a/modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm
+++ b/modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm
@@ -1815,7 +1815,7 @@ private:
         }
     }
 
-    void processBlock (AudioBuffer<float>& buffer, MidiBuffer& midiBuffer) noexcept
+    void processBlock (juce::AudioBuffer<float>& buffer, MidiBuffer& midiBuffer) noexcept
     {
         const ScopedLock sl (juceFilter->getCallbackLock());
 
diff --git a/modules/juce_audio_plugin_client/AU/juce_AUv3_Wrapper.mm b/modules/juce_audio_plugin_client/AU/juce_AUv3_Wrapper.mm
index 4921f06bc5..bd86ac2e28 100644
--- a/modules/juce_audio_plugin_client/AU/juce_AUv3_Wrapper.mm
+++ b/modules/juce_audio_plugin_client/AU/juce_AUv3_Wrapper.mm
@@ -1130,7 +1130,7 @@ private:
         AudioBufferList* bufferList = nullptr;
         int maxFrames, numberOfChannels;
         bool isInterleaved;
-        AudioBuffer<float> scratchBuffer;
+        juce::AudioBuffer<float> scratchBuffer;
     };
 
     //==============================================================================
@@ -1557,7 +1557,7 @@ private:
         return noErr;
     }
 
-    void processBlock (AudioBuffer<float>& buffer, MidiBuffer& midiBuffer) noexcept
+    void processBlock (juce::AudioBuffer<float>& buffer, MidiBuffer& midiBuffer) noexcept
     {
         auto& processor = getAudioProcessor();
         const ScopedLock sl (processor.getCallbackLock());
diff --git a/modules/juce_core/files/juce_File.h b/modules/juce_core/files/juce_File.h
index 6a09f7d8e6..3c1dbdce47 100644
--- a/modules/juce_core/files/juce_File.h
+++ b/modules/juce_core/files/juce_File.h
@@ -20,6 +20,10 @@
   ==============================================================================
 */
 
+#if JUCE_MAC || JUCE_IOS
+ using OSType = uint32_t;
+#endif
+
 namespace juce
 {
 
diff --git a/modules/juce_core/memory/juce_ByteOrder.h b/modules/juce_core/memory/juce_ByteOrder.h
index 2579957a4f..4c3bcb41ee 100644
--- a/modules/juce_core/memory/juce_ByteOrder.h
+++ b/modules/juce_core/memory/juce_ByteOrder.h
@@ -20,6 +20,10 @@
   ==============================================================================
 */
 
+#if JUCE_MAC || JUCE_IOS
+ #include <libkern/OSByteOrder.h>
+#endif
+
 namespace juce
 {
 
diff --git a/modules/juce_core/system/juce_TargetPlatform.h b/modules/juce_core/system/juce_TargetPlatform.h
index 4b9228d99d..1b48e4dfca 100644
--- a/modules/juce_core/system/juce_TargetPlatform.h
+++ b/modules/juce_core/system/juce_TargetPlatform.h
@@ -69,7 +69,8 @@
   #define     JUCE_LINUX 1
 #elif defined (__APPLE_CPP__) || defined (__APPLE_CC__)
   #define CF_EXCLUDE_CSTD_HEADERS 1
-  #include <CoreFoundation/CoreFoundation.h> // (needed to find out what platform we're using)
+  #include <TargetConditionals.h> // (needed to find out what platform we're using)
+  #include <AvailabilityMacros.h>
   #include "../native/juce_mac_ClangBugWorkaround.h"
 
   #if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
diff --git a/modules/juce_core/text/juce_String.h b/modules/juce_core/text/juce_String.h
index 3a5a52d2d7..430b5b37fa 100644
--- a/modules/juce_core/text/juce_String.h
+++ b/modules/juce_core/text/juce_String.h
@@ -20,6 +20,20 @@
   ==============================================================================
 */
 
+#if JUCE_MAC || JUCE_IOS
+ // Annoyingly we can only forward-declare a typedef by forward-declaring the
+ // aliased type
+ #if __has_attribute(objc_bridge)
+  #define JUCE_CF_BRIDGED_TYPE(T) __attribute__((objc_bridge(T)))
+ #else
+  #define JUCE_CF_BRIDGED_TYPE(T)
+ #endif
+
+ typedef const struct JUCE_CF_BRIDGED_TYPE(NSString) __CFString * CFStringRef;
+
+ #undef JUCE_CF_BRIDGED_TYPE
+#endif
+
 namespace juce
 {