--- a/khronosfws/openmax_al/src/common/xametadatatraversalitf.h	Mon May 03 12:59:52 2010 +0300
+++ b/khronosfws/openmax_al/src/common/xametadatatraversalitf.h	Fri May 14 16:22:35 2010 +0300
@@ -18,11 +18,8 @@
 #ifndef XAMETADATATRAVERSALITF_H
 #define XAMETADATATRAVERSALITF_H
 
-#include "openmaxalwrapper.h"
-#include "xaglobals.h"
-#ifdef _GSTREAMER_BACKEND_  
-#include "XAAdaptationContextBase.h"
-#endif
+#include "xaadptbasectx.h"
+
 /** MACROS **/
 
 /** TYPES **/
@@ -43,9 +40,9 @@
     XAuint32 index;
     XAuint32 nodedepth;
 
-#ifdef _GSTREAMER_BACKEND_  
+
     XAAdaptationBaseCtx *adaptCtx;
-#endif
+
 } XAMetadataTraversalImpl;
 
 /** METHODS **/
@@ -71,10 +68,9 @@
 XAresult XAMetadataTraversalItfImpl_SetActiveNode(XAMetadataTraversalItf self,
                                                 XAuint32 index);
 
-#ifdef _GSTREAMER_BACKEND_  
+
 /* XAMetadataExtractionItfImpl -specific methods */
 XAMetadataTraversalImpl* XAMetadataTraversalItfImpl_Create(XAAdaptationBaseCtx *adapCtx);
-#endif
 void XAMetadataTraversalItfImpl_Free(XAMetadataTraversalImpl* self);
 
 #endif /* XAMETADATATRAVERSALITF_H */