diff --git a/modules/juce_audio_formats/sampler/juce_Sampler.cpp b/modules/juce_audio_formats/sampler/juce_Sampler.cpp
index 8b942a1a70..8f7290dd96 100644
--- a/modules/juce_audio_formats/sampler/juce_Sampler.cpp
+++ b/modules/juce_audio_formats/sampler/juce_Sampler.cpp
@@ -23,7 +23,6 @@
   ==============================================================================
 */
 
-
 SamplerSound::SamplerSound (const String& name_,
                             AudioFormatReader& source,
                             const BigInteger& midiNotes_,
diff --git a/modules/juce_audio_processors/scanning/juce_PluginListComponent.cpp b/modules/juce_audio_processors/scanning/juce_PluginListComponent.cpp
index 32e95049b3..c27e3ae7f9 100644
--- a/modules/juce_audio_processors/scanning/juce_PluginListComponent.cpp
+++ b/modules/juce_audio_processors/scanning/juce_PluginListComponent.cpp
@@ -366,12 +366,12 @@ private:
         return false;
     }
 
-    ScopedPointer<PluginDirectoryScanner> scanner;
-    AlertWindow pathChooserWindow, progressWindow;
-    FileSearchPathListComponent pathList;
     PluginListComponent& owner;
     AudioPluginFormat& formatToScan;
     PropertiesFile* propertiesToUse;
+    ScopedPointer<PluginDirectoryScanner> scanner;
+    AlertWindow pathChooserWindow, progressWindow;
+    FileSearchPathListComponent pathList;
     String progressMessage;
     double progress;
     bool shouldUseThread, finished;
diff --git a/modules/juce_audio_utils/players/juce_AudioProcessorPlayer.cpp b/modules/juce_audio_utils/players/juce_AudioProcessorPlayer.cpp
index f3afe9b3d4..ccf452f845 100644
--- a/modules/juce_audio_utils/players/juce_AudioProcessorPlayer.cpp
+++ b/modules/juce_audio_utils/players/juce_AudioProcessorPlayer.cpp
@@ -139,14 +139,18 @@ void AudioProcessorPlayer::audioDeviceIOCallback (const float** const inputChann
     }
 }
 
-void AudioProcessorPlayer::prepareToPlay (double newSampleRate, int newBlockSize,
-                                          int numChansIn, int numChansOut)
+void AudioProcessorPlayer::audioDeviceAboutToStart (AudioIODevice* const device)
 {
+    const double newSampleRate = device->getCurrentSampleRate();
+    const int newBlockSize     = device->getCurrentBufferSizeSamples();
+    const int numChansIn       = device->getActiveInputChannels().countNumberOfSetBits();
+    const int numChansOut      = device->getActiveOutputChannels().countNumberOfSetBits();
+
     const ScopedLock sl (lock);
 
     sampleRate = newSampleRate;
-    blockSize = newBlockSize;
-    numInputChans = numChansIn;
+    blockSize  = newBlockSize;
+    numInputChans  = numChansIn;
     numOutputChans = numChansOut;
 
     messageCollector.reset (sampleRate);
@@ -163,14 +167,6 @@ void AudioProcessorPlayer::prepareToPlay (double newSampleRate, int newBlockSize
     }
 }
 
-void AudioProcessorPlayer::audioDeviceAboutToStart (AudioIODevice* const device)
-{
-    prepareToPlay (device->getCurrentSampleRate(),
-                   device->getCurrentBufferSizeSamples(),
-                   device->getActiveInputChannels().countNumberOfSetBits(),
-                   device->getActiveOutputChannels().countNumberOfSetBits());
-}
-
 void AudioProcessorPlayer::audioDeviceStopped()
 {
     const ScopedLock sl (lock);
diff --git a/modules/juce_audio_utils/players/juce_AudioProcessorPlayer.h b/modules/juce_audio_utils/players/juce_AudioProcessorPlayer.h
index 24a20205c6..6dd853d92b 100644
--- a/modules/juce_audio_utils/players/juce_AudioProcessorPlayer.h
+++ b/modules/juce_audio_utils/players/juce_AudioProcessorPlayer.h
@@ -77,13 +77,11 @@ public:
                                 int totalNumOutputChannels,
                                 int numSamples);
     /** @internal */
-    void audioDeviceAboutToStart (AudioIODevice* device);
+    void audioDeviceAboutToStart (AudioIODevice*);
     /** @internal */
     void audioDeviceStopped();
     /** @internal */
-    void handleIncomingMidiMessage (MidiInput* source, const MidiMessage& message);
-    /** @internal */
-    void prepareToPlay (double sampleRate, int blockSize, int numChansIn, int numChansOut);
+    void handleIncomingMidiMessage (MidiInput*, const MidiMessage&);
 
 private:
     //==============================================================================