--- a/epoc32/include/mmf/common/midistandardcustomcommands.h	Wed Mar 31 12:27:01 2010 +0100
+++ b/epoc32/include/mmf/common/midistandardcustomcommands.h	Wed Mar 31 12:33:34 2010 +0100
@@ -1,9 +1,9 @@
 // Copyright (c) 2003-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.
@@ -114,80 +114,6 @@
 	};
 
 /**
-@internalComponent
-*/
-enum TMMFMidiControllerMessages
-	{
-	EMMFMidiControllerSetPositionMicroBeats,
-	EMMFMidiControllerPositionMicroBeats,
-	EMMFMidiControllerPlayNote,
-	EMMFMidiControllerPlayNoteWithStartTime,
-	EMMFMidiControllerStopNotes,
-	EMMFMidiControllerNoteOn,
-	EMMFMidiControllerNoteOff,
-	EMMFMidiControllerPlaybackRate,
-	EMMFMidiControllerSetPlaybackRate,
-	EMMFMidiControllerMaxPlaybackRate,
-	EMMFMidiControllerMinPlaybackRate,
-	EMMFMidiControllerTempo,
-	EMMFMidiControllerSetTempo,
-	EMMFMidiControllerPitch,
-	EMMFMidiControllerSetPitch,
-	EMMFMidiControllerDurationMicroBeats,
-	EMMFMidiControllerNumTracks,
-	EMMFMidiControllerSetTrackMute,
-	EMMFMidiControllerMimeType,
-	EMMFMidiControllerSetSyncUpdateCallbackInterval,
-	EMMFMidiControllerSendMessage,
-	EMMFMidiControllerSendMessageWithTimeStamp,
-	EMMFMidiControllerSendMipMessage,
-	EMMFMidiControllerNumberOfBanks,
-	EMMFMidiControllerGetBankId,
-	EMMFMidiControllerLoadCustomBank,
-	EMMFMidiControllerLoadCustomBankData,
-	EMMFMidiControllerUnloadCustomBank,
-	EMMFMidiControllerCustomBankLoaded,
-	EMMFMidiControllerUnloadAllCustomBanks,
-	EMMFMidiControllerNumberOfInstruments,
-	EMMFMidiControllerGetInstrumentId,
-	EMMFMidiControllerInstrumentName,
-	EMMFMidiControllerCopyInstrumentName,
-	EMMFMidiControllerSetInstrument,
-	EMMFMidiControllerLoadCustomInstrument,
-	EMMFMidiControllerLoadCustomInstrumentData,
-	EMMFMidiControllerUnloadCustomInstrument,
-	EMMFMidiControllerPercussionKeyName,
-	EMMFMidiControllerCopyPercussionKeyName,
-	EMMFMidiControllerSetStopTime,
-	EMMFMidiControllerStopTime,
-	EMMFMidiControllerPolyphony,
-	EMMFMidiControllerSetMaxPolyphony,
-	EMMFMidiControllerChannelsSupported,
-	EMMFMidiControllerChannelVolume,
-	EMMFMidiControllerMaxChannelVolume,
-	EMMFMidiControllerSetChannelVolume,
-	EMMFMidiControllerSetChannelMute,
-	EMMFMidiControllerVolume,
-	EMMFMidiControllerMaxVolume,
-	EMMFMidiControllerSetVolume,
-	EMMFMidiControllerSetVolumeRamp,
-	EMMFMidiControllerGetBalance,
-	EMMFMidiControllerSetBalance,
-	EMMFMidiControllerGetRepeats,
-	EMMFMidiControllerSetRepeats,
-	EMMFMidiControllerSetBank,
-	EMMFMidiControllerIsTrackMute,
-	EMMFMidiControllerIsChannelMute,
-	EMMFMidiControllerGetInstrument,
-	EMMFMidiControllerClose,
-	EMMFMidiControllerStop,
-	EMMFMidiControllerReceiveEvents,
-	EMMFMidiControllerRetrieveEvent,
-	EMMFMidiControllerCancelReceiveEvents,
-	EMMFMidiControllerMaxPolyphony
-	};
-
-/**
 Client class to access functionality specific to a MIDI controller.
 The class uses the custom command function of the controller plugin, and removes the necessity
 for the client to formulate the custom commands.
@@ -895,25 +821,6 @@
 
 
 /**
-@internalComponent
-*/
-class CMidiEventReceiver : public CBase
-	{
-public:
-	static CMidiEventReceiver* NewL(const TMMFMessage& aMessage);
-	~CMidiEventReceiver();
-	void PrepareEventL(const CMMFMidiEvent& aEvent);
-	void SendEventL(TMMFMessage& aMessage);
-	TBool IsWaitingToSendEvent();
-private:
-	CMidiEventReceiver(const TMMFMessage& aMessage);
-private:
-	TMMFMessage iMessage;
-	CBufFlat* iEventBuf;
-	};
-
-
-/**
 Mixin class to define an object capable of handling a MIDI event within the controller framework.
 
 @publishedAll
@@ -932,6 +839,11 @@
 	virtual TInt SendMidiEventToClient(const CMMFMidiEvent& aEvent) = 0;
 	};
 
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include <mmf/common/midieventreceiver.h>
+#endif
+
+class CMidiEventReceiver;
 
 /**
 Custom command parser class to be used by controller plugins wishing to support