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 777bee129b..4108f3301e 100644
--- a/modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm
+++ b/modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm
@@ -40,8 +40,15 @@
 #include <AudioUnit/AUCocoaUIView.h>
 #include <AudioUnit/AudioUnit.h>
 #include <AudioToolbox/AudioUnitUtilities.h>
+
+#if JUCE_SUPPORT_CARBON
+ #define Point CarbonDummyPointName
+ #define Component CarbonDummyCompName
+#endif
 #include "AUMIDIEffectBase.h"
 #include "MusicDeviceBase.h"
+#undef Point
+#undef Component
 
 /** The BUILD_AU_CARBON_UI flag lets you specify whether old-school carbon hosts are supported as
     well as ones that can open a cocoa view. If this is enabled, you'll need to also add the AUCarbonBase
@@ -57,7 +64,9 @@
 
 #if BUILD_AU_CARBON_UI
  #undef Button
+ #define Point CarbonDummyPointName
  #include "AUCarbonViewBase.h"
+ #undef Point
  class JuceAUView;
 #endif
 
diff --git a/modules/juce_audio_plugin_client/utility/juce_IncludeSystemHeaders.h b/modules/juce_audio_plugin_client/utility/juce_IncludeSystemHeaders.h
index 5b98e65165..ad78cfef7e 100644
--- a/modules/juce_audio_plugin_client/utility/juce_IncludeSystemHeaders.h
+++ b/modules/juce_audio_plugin_client/utility/juce_IncludeSystemHeaders.h
@@ -47,8 +47,6 @@
  #undef Time
 
 #else
-  #include <Cocoa/Cocoa.h>
-
  #ifndef JUCE_SUPPORT_CARBON
   #define JUCE_SUPPORT_CARBON 1
  #endif
@@ -56,8 +54,11 @@
  #if JUCE_SUPPORT_CARBON
   #define Point CarbonDummyPointName
   #define Component CarbonDummyCompName
+  #include <Cocoa/Cocoa.h>
   #include <Carbon/Carbon.h>
   #undef Point
   #undef Component
+ #else
+  #include <Cocoa/Cocoa.h>
  #endif
 #endif