diff --git a/plugins/zynaddsubfx/LocalZynAddSubFx.cpp b/plugins/zynaddsubfx/LocalZynAddSubFx.cpp
index 6705bb33d..b6c77bb69 100644
--- a/plugins/zynaddsubfx/LocalZynAddSubFx.cpp
+++ b/plugins/zynaddsubfx/LocalZynAddSubFx.cpp
@@ -241,7 +241,7 @@ void LocalZynAddSubFx::processAudio( sampleFrame * _out )
 	REALTYPE outputl[SOUND_BUFFER_SIZE];
 	REALTYPE outputr[SOUND_BUFFER_SIZE];
 
-	m_master->AudioOut( outputl, outputr );
+	m_master->GetAudioOutSamples( SOUND_BUFFER_SIZE, SAMPLE_RATE, outputl, outputr );
 
 	for( int f = 0; f < SOUND_BUFFER_SIZE; ++f )
 	{
diff --git a/plugins/zynaddsubfx/LocalZynAddSubFx.h b/plugins/zynaddsubfx/LocalZynAddSubFx.h
index 3aeab8ba5..01bd2241e 100644
--- a/plugins/zynaddsubfx/LocalZynAddSubFx.h
+++ b/plugins/zynaddsubfx/LocalZynAddSubFx.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _LOCAL_ZYNADDSUBFX_H
-#define _LOCAL_ZYNADDSUBFX_H
+#ifndef LOCAL_ZYNADDSUBFX_H
+#define LOCAL_ZYNADDSUBFX_H
 
 #include "MidiEvent.h"
 #include "note.h"