--- a/crypto/weakcryptospi/group/tpkcs5kdf.mmp	Fri Oct 02 13:15:59 2009 +0300
+++ b/crypto/weakcryptospi/group/tpkcs5kdf.mmp	Mon Oct 12 10:17:04 2009 +0300
@@ -30,9 +30,10 @@
 SOURCE tactionderivekey.cpp tpkcs5kdfmain.cpp
 
 USERINCLUDE ../inc
+USERINCLUDE ../../../cryptomgmtlibs/securitytestfw/test/testhandler2
 
-SYSTEMINCLUDE /epoc32/include/testhandler2 /epoc32/include
-SYSTEMINCLUDE /epoc32/include/libc
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+OS_LAYER_LIBC_SYSTEMINCLUDE
 
 LIBRARY	euser.lib efsrv.lib t_testhandler2.lib pbe.lib estlib.lib