--- a/khronosfws/openmax_al/src/outputmix/xaoutputmixitf.h	Mon May 03 12:59:52 2010 +0300
+++ b/khronosfws/openmax_al/src/outputmix/xaoutputmixitf.h	Fri May 14 16:22:35 2010 +0300
@@ -18,11 +18,8 @@
 #ifndef XAOUTPUTMIXITF_H_
 #define XAOUTPUTMIXITF_H_
 
-#include "openmaxalwrapper.h"
-#include "xaglobals.h"
-#ifdef _GSTREAMER_BACKEND_
-#include "XAAdaptationContextBase.h"
-#endif
+#include "xaadptbasectx.h"
+
 /** MACROS **/
 
 /** TYPES **/
@@ -40,10 +37,9 @@
 
     /* Variables */
 
-#ifdef _GSTREAMER_BACKEND_
     /*Adaptation variables*/
     XAAdaptationBaseCtx *adapCtx;
-#endif
+
     XAuint32 eventFlags;
     xaMixDeviceChangeCallback callback;
     void    *cbContext;
@@ -58,11 +54,11 @@
 XAresult XAOutputMixItfImpl_RegisterDeviceChangeCallback( XAOutputMixItf self, xaMixDeviceChangeCallback callback, void * pContext);
 XAresult XAOutputMixItfImpl_ReRoute( XAOutputMixItf self, XAint32 numOutputDevices, XAuint32 * pOutputDeviceIDs);
 
-#ifdef _GSTREAMER_BACKEND_
+
 /* XAOutputMixItfImpl -specific methods */
 XAOutputMixItfImpl* XAOutputMixItfImpl_Create(XAAdaptationBaseCtx *adapCtx);
 void XAOutputMixItfImpl_Free(XAOutputMixItfImpl* self);
 void XAOutputMixItfImpl_AdaptCb( void *pHandlerCtx, XAAdaptEvent *event );
-#endif
+
 
 #endif /* XAOUTPUTMIXITF_H_ */