--- a/epoc32/include/mmf/server/mmfaudiooutput.h	Wed Mar 31 12:27:01 2010 +0100
+++ b/epoc32/include/mmf/server/mmfaudiooutput.h	Wed Mar 31 12:33:34 2010 +0100
@@ -1,9 +1,9 @@
 // Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
 // Initial Contributors:
 // Nokia Corporation - initial contribution.
@@ -20,7 +20,6 @@
 #include <e32base.h>
 #include <e32std.h>
 
-#include <mmfaudioiointerfaceuids.hrh>
 
 #include <mmf/common/mmfpaniccodes.h>
 
@@ -113,12 +112,14 @@
 
 Uses CMMFDevSound to access such output.
 */
+class CMMFChannelAndSampleRateConverterFactory;
+class CMMFChannelAndSampleRateConverter;
 class CMMFAudioOutput : public CBase, public MMMFAudioOutput, public MDevSoundObserver
 
 	{
 public:
 	static MDataSink* NewSinkL() ;
-	virtual CMMFAudioOutput::~CMMFAudioOutput();
+	virtual ~CMMFAudioOutput();
 	void ConstructL();
 
 	//MDataSink mixin implementations