--- a/contentmgmt/cafstreamingsupport/test/tscaf/source/tscafstep.cpp	Tue Aug 31 17:00:08 2010 +0300
+++ b/contentmgmt/cafstreamingsupport/test/tscaf/source/tscafstep.cpp	Wed Sep 01 12:40:57 2010 +0100
@@ -16,8 +16,10 @@
 //
 
 #include "tscafstep.h"
-#include "sdpconnectionfield.h"
-#include "sdporiginfield.h"
+#ifdef INTERNALLY_ENABLE_UPWARD_DEPENDENCY
+#include <sdpconnectionfield.h>
+#include <sdporiginfield.h>
+#endif
 
 TSdpAttribute::TSdpAttribute()
 	{
@@ -119,6 +121,7 @@
 	return TestStepResult();
 	}
 
+#ifdef INTERNALLY_ENABLE_UPWARD_DEPENDENCY
 // We need this dummy function because TCleanupItem c'tor (see below) does not accept functions without parameters
 void CloseSdpCodecPool(TAny *)
 	{
@@ -271,6 +274,7 @@
 	
 	return sdp;
 	}
+#endif
 
 CKeyStreamSink* CScafStep::CreateKeyStreamSinkLC(const TDesC& aFileName, const TDesC& aPrivPath)
 /**
@@ -312,8 +316,12 @@
  	@param aSdp The SDP object which will be deleted.
  */
 	{
+#ifdef INTERNALLY_ENABLE_UPWARD_DEPENDENCY
 	delete reinterpret_cast<CSdpDocument *>(aSdpDoc);
 	SdpCodecStringPool::Close();
+#else
+	(void) aSdpDoc;
+#endif
 	}
 
 void CScafStep::CopyFile2AgentsPrivateFolderL(RFs& aFs, const TDesC& aFileName, const TDesC& aPrivPath)
@@ -348,6 +356,7 @@
 	CleanupStack::PopAndDestroy(2, fTarget);
 	}
 
+#ifdef INTERNALLY_ENABLE_UPWARD_DEPENDENCY
 void CScafStep::AddAttributes2SdpL(CSdpMediaField& aSdp, TInt aSdpNum)
 /**
  * Add attributes from the instance within the CSdpConfiguration array, where 
@@ -395,6 +404,7 @@
 		CleanupStack::PopAndDestroy(3);
 		}//for
 	}//End of function
+#endif
 
 void CScafStep::PrintErrorAndLeaveL(TDesC& aKey)
 /**