diff -r 6add9366d894 -r fb6faddbb212 omxil_generic/omxilcomplib/src/omxilcallbackmanager.h
--- a/omxil_generic/omxilcomplib/src/omxilcallbackmanager.h	Fri Sep 17 08:38:32 2010 +0300
+++ b/omxil_generic/omxilcomplib/src/omxilcallbackmanager.h	Thu Oct 14 10:21:48 2010 +0100
@@ -57,9 +57,6 @@
 	class CEventCallbackCommand;
 	class CBufferDoneCallbackCommand;
 	class CPortSettingsChangeCommand;
-#ifdef _OMXIL_COMMON_IL516C_ON
-	class CEjectBuffersRequestCommand;
-#endif
 	// Note that the following friends don't break COmxILCallbackManager's
 	// interface as all friends below are COmxILCallbackManager's private
 	// nested classes and therefore they are logically part of
@@ -72,9 +69,6 @@
 	friend class CEventCallbackCommand;
 	friend class CBufferDoneCallbackCommand;
 	friend class CPortSettingsChangeCommand;
-#ifdef _OMXIL_COMMON_IL516C_ON
-	friend class CEjectBuffersRequestCommand;
-#endif
 
 public:
 
@@ -131,11 +125,6 @@
 		OMX_COMMANDTYPE aOmxCommand,
 		OMX_U32 aOmxPortIndex);
 
-#ifdef _OMXIL_COMMON_IL516C_ON
-	OMX_ERRORTYPE EjectBuffersRequest(
-		OMX_U32 aLocalOmxPortIndex);
-#endif
-
 	//
 	// Methods for Callback Notification (from MOmxILCallbackManagerIf)
 	//
@@ -500,28 +489,6 @@
 
 	};
 
-#ifdef _OMXIL_COMMON_IL516C_ON
-/**
-  Callback Manager's command class for requesting buffer ejection from tunnelled component.
- */
-class COmxILCallbackManager::CEjectBuffersRequestCommand :
-	public COmxILCallbackManager::CCallbackCommand
-	{
-
-public:
-
-	inline CEjectBuffersRequestCommand(OMX_U32 aLocalOmxPortIndex);
-
-	void operator()(COmxILCallbackManager& aCbMgr, TBool& aHasBeenDeferred);
-
-private:
-
-	OMX_U32 iLocalOmxPortIndex;
-
-	};
-#endif
-
-
 #include "omxilcallbackmanager.inl"
 
 #endif // OMXILCALLBACKMANAGER_H