diff --git a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode1.cpp b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode1.cpp
index 54e885b364..c57fe70170 100644
--- a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode1.cpp
+++ b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode1.cpp
@@ -24,11 +24,13 @@
   ==============================================================================
 */
 
-#if JucePlugin_Build_RTAS
+#pragma once
 
 #include "../../juce_core/system/juce_TargetPlatform.h"
 #include "../utility/juce_CheckSettingMacros.h"
 
+#if JucePlugin_Build_RTAS
+
 #include "juce_RTAS_DigiCode_Header.h"
 
 /*
diff --git a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode2.cpp b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode2.cpp
index 07a2cb9851..6df4685a05 100644
--- a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode2.cpp
+++ b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode2.cpp
@@ -24,11 +24,13 @@
   ==============================================================================
 */
 
-#if JucePlugin_Build_RTAS
+#pragma once
 
 #include "../../juce_core/system/juce_TargetPlatform.h"
 #include "../utility/juce_CheckSettingMacros.h"
 
+#if JucePlugin_Build_RTAS
+
 #include "juce_RTAS_DigiCode_Header.h"
 
 #ifdef __clang__
diff --git a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode3.cpp b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode3.cpp
index 725d412a82..d023957cc2 100644
--- a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode3.cpp
+++ b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode3.cpp
@@ -24,6 +24,8 @@
   ==============================================================================
 */
 
+#pragma once
+
 #include "../../juce_core/system/juce_TargetPlatform.h"
 #include "../utility/juce_CheckSettingMacros.h"
 
diff --git a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode_Header.h b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode_Header.h
index c8cb4d919c..5e2a3094c7 100644
--- a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode_Header.h
+++ b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode_Header.h
@@ -24,6 +24,8 @@
   ==============================================================================
 */
 
+#pragma once
+
 #if JucePlugin_Build_RTAS
 #ifdef _MSC_VER
 
diff --git a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_MacUtilities.mm b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_MacUtilities.mm
index e0d6467885..bd72e03bca 100644
--- a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_MacUtilities.mm
+++ b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_MacUtilities.mm
@@ -24,11 +24,11 @@
   ==============================================================================
 */
 
-#if JucePlugin_Build_RTAS
-
 #include "../../juce_core/system/juce_TargetPlatform.h"
 #include "../utility/juce_CheckSettingMacros.h"
 
+#if JucePlugin_Build_RTAS
+
 // Horrible carbon-based fix for a cocoa bug, where an NSWindow that wraps a carbon
 // window fails to keep its position updated when the user drags the window around..
 #define WINDOWPOSITION_BODGE 1
@@ -38,9 +38,6 @@
 #include "../utility/juce_IncludeModuleHeaders.h"
 #include "../utility/juce_CarbonVisibility.h"
 
-namespace juce
-{
-
 using namespace juce;
 
 //==============================================================================
@@ -170,6 +167,4 @@ void forwardCurrentKeyEventToHostWindow()
     }
 }
 
-} // namespace juce
-
 #endif
diff --git a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp
index 1a5bd3b435..0140d0dea3 100644
--- a/modules/juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp
+++ b/modules/juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp
@@ -24,11 +24,11 @@
   ==============================================================================
 */
 
-#if JucePlugin_Build_RTAS
-
 #include "../../juce_core/system/juce_TargetPlatform.h"
 #include "../utility/juce_CheckSettingMacros.h"
 
+#if JucePlugin_Build_RTAS
+
 #ifdef _MSC_VER
  // (this is a workaround for a build problem in VC9)
  #define _DO_NOT_DECLARE_INTERLOCKED_INTRINSICS_IN_MEMORY
@@ -111,11 +111,6 @@
 
 #include "../utility/juce_IncludeModuleHeaders.h"
 
-using namespace juce;
-
-namespace juce
-{
-
 #ifdef _MSC_VER
  #pragma pack (pop)
 
@@ -166,6 +161,8 @@ static const int bypassControlIndex = 1;
 
 static int numInstances = 0;
 
+using namespace juce;
+
 //==============================================================================
 class JucePlugInProcess  : public CEffectProcessMIDI,
                            public CEffectProcessRTAS,
@@ -686,7 +683,7 @@ public:
             auto paramIndex = controlIndex - 2;
             auto floatValue = longToFloat (value);
 
-            if (auto* param = owner.getParameters()[paramIndex])
+            if (auto* param = juceFilter->getParameters()[paramIndex])
             {
                 param->setValue (floatValue);
                 param->sendValueChangedMessageToListeners (floatValue);
@@ -1050,8 +1047,6 @@ private:
 
 void initialiseMacRTAS();
 
-} // namespace juce
-
 CProcessGroupInterface* CProcessGroup::CreateProcessGroup()
 {
    #if JUCE_MAC