--- a/networkcontrol/iptransportlayer/src/ipcprups_states.cpp	Tue Jun 15 15:58:22 2010 +0100
+++ b/networkcontrol/iptransportlayer/src/ipcprups_states.cpp	Tue Jun 15 15:59:44 2010 +0100
@@ -26,7 +26,7 @@
 
 #include "IPCpr.h"
 #include "ipcprups_states.h"
-#include "../../../../commsfw/datacommsserver/esockserver/inc/ss_internal_activities.h"
+#include <comms-infras/ss_internal_activities.h>
 #include <comms-infras/ss_nodemessages_factory.h>
 
 #include <comms-infras/upsmessages.h>

--- a/networkcontrol/qosipscpr/src/ipscpr.cpp	Tue Jun 15 15:58:22 2010 +0100
+++ b/networkcontrol/qosipscpr/src/ipscpr.cpp	Tue Jun 15 15:59:44 2010 +0100
@@ -39,7 +39,7 @@
 
 
 //TODO remove this ECFActivityDataClientJoin activity
-#include "../../../../commsfw/datacommsserver/esockserver/inc/ss_internal_activities.h"
+#include <comms-infras/ss_internal_activities.h>
 
 #if defined __FLOG_ACTIVE || defined SYMBIAN_TRACE_ENABLE
 	#define KIPSCprTag KESockSubConnectionTag

--- a/networksecurity/ipsec/ipsec6/src/sa_crypt.cpp	Tue Jun 15 15:58:22 2010 +0100
+++ b/networksecurity/ipsec/ipsec6/src/sa_crypt.cpp	Tue Jun 15 15:59:44 2010 +0100
@@ -26,7 +26,7 @@
 #include "sa_crypt.h"
 #include <networking/ipsecerr.h>
 #include "ipseccrypto.h"
-#include "keys.h"
+#include <cryptospi/keys.h>
 #include <cryptospi/cryptospidef.h>
 #ifdef SYMBIAN_IPSEC_VOIP_SUPPORT
 #include <cryptospi/cryptomacapi.h>

--- a/networksecurity/ipsec/ipseccrypto/src/ipseccrypto_prt.cpp	Tue Jun 15 15:58:22 2010 +0100
+++ b/networksecurity/ipsec/ipseccrypto/src/ipseccrypto_prt.cpp	Tue Jun 15 15:59:44 2010 +0100
@@ -23,9 +23,9 @@
 #include <rijndael.h>
 #include <hash.h>
 
-#include "keys.h"
+#include <cryptospi/keys.h>
 #include <cryptospi/cryptospidef.h>
-#include "cryptosymmetriccipherapi.h"
+#include <cryptospi/cryptosymmetriccipherapi.h>
 #ifdef SYMBIAN_IPSEC_VOIP_SUPPORT
 #include "ruleselector.h"
 #include "plugincharacteristics.h"