diff -r ece3df019add -r cf642210ecb7 cryptomgmtlibs/cryptotokenfw/group/bld.inf
--- a/cryptomgmtlibs/cryptotokenfw/group/bld.inf	Tue Nov 24 09:06:03 2009 +0200
+++ b/cryptomgmtlibs/cryptotokenfw/group/bld.inf	Thu Dec 17 09:28:34 2009 +0200
@@ -26,20 +26,20 @@
 DEFAULT
 
 PRJ_EXPORTS
-../inc/ct/MCTTokenTypeFilter.h 							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ct/mcttokentypefilter.h)
-../inc/ct/TCTAllTokenTypes.h 							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ct/tctalltokentypes.h)
-../inc/ct/CCTTokenTypeInfo.h 							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ct/ccttokentypeinfo.h)
-../inc/ct/MCTTokenType.h 								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ct/mcttokentype.h)
-../inc/ct/MCTTokenInterface.h 							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ct/mcttokeninterface.h)
+../inc/ct/MCTTokenTypeFilter.h 							SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ct/mcttokentypefilter.h)
+../inc/ct/TCTAllTokenTypes.h 							SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ct/tctalltokentypes.h)
+../inc/ct/CCTTokenTypeInfo.h 							SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ct/ccttokentypeinfo.h)
+../inc/ct/MCTTokenType.h 								SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ct/mcttokentype.h)
+../inc/ct/MCTTokenInterface.h 							SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ct/mcttokeninterface.h)
 ../inc/ct/mcttokenobject.h 								SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ct/mcttokenobject.h)
-../inc/ct/CCTTokenType_v2.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ct/ccttokentype.h)
-../inc/ct/MCTToken.h 									SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ct/mcttoken.h)
+../inc/ct/CCTTokenType_v2.h								SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ct/ccttokentype.h)
+../inc/ct/MCTToken.h 									SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ct/mcttoken.h)
 ../inc/ct/tcttokenobjecthandle.h						SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ct/tcttokenobjecthandle.h)
-../inc/ct/TCTTokenTypeAttribute.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ct/tcttokentypeattribute.h)
-../inc/ct/TCTFindTokenTypesByInterface.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ct/tctfindtokentypesbyinterface.h)
-../inc/ct/TCTFindTokenTypesByInterfaceAndAttribute.h	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(ct/tctfindtokentypesbyinterfaceandattribute.h)
+../inc/ct/TCTTokenTypeAttribute.h						SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ct/tcttokentypeattribute.h)
+../inc/ct/TCTFindTokenTypesByInterface.h				SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ct/tctfindtokentypesbyinterface.h)
+../inc/ct/TCTFindTokenTypesByInterfaceAndAttribute.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ct/tctfindtokentypesbyinterfaceandattribute.h)
 ../inc/ct/InterfaceUID.hrh 								/epoc32/include/ct/interfaceuid.hrh
-../inc/CryptoTokenRegistryInfo.rh						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(cryptotokenregistryinfo.rh)
+../inc/CryptoTokenRegistryInfo.rh						SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(cryptotokenregistryinfo.rh)
 ../inc/ct/tcttokenhandle.h								SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ct/tcttokenhandle.h)
 ../inc/ct/RCPointerArray.h								SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ct/rcpointerarray.h)
 ../inc/ct/RMPointerArray.h								SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ct/rmpointerarray.h)
@@ -54,24 +54,24 @@
 ../inc_interfaces/MCTWritableCertStore.inl				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mctwritablecertstore.inl)
 ../inc_interfaces/CCTCertInfo_v2.h 						SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(cctcertinfo.h)
 ../inc_interfaces/MCTCertApps.h							SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mctcertapps.h)
-../inc/securitydefs.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(securitydefs.h)
-../inc/securitydefs.inl SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(securitydefs.inl)
-../inc/secdlg.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(secdlg.h)
-../inc/secdlgImplDefs.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(secdlgimpldefs.h)
+../inc/securitydefs.h									SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(securitydefs.h)
+../inc/securitydefs.inl									SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(securitydefs.inl)
+../inc/secdlg.h											SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(secdlg.h)
+../inc/secdlgImplDefs.h									SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(secdlgimpldefs.h)
 ../inc_interfaces/mkeystore_v2.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mkeystore.h)
 ../inc_interfaces/MCTKeyStore_v2.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mctkeystore.h)
 ../inc_interfaces/MCTKeyStore_v2.inl					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mctkeystore.inl)
 ../inc_interfaces/MCTKeyStoreManager_v2.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mctkeystoremanager.h)
-../inc_interfaces/CCertAttributeFilter.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ccertattributefilter.h)
-../inc/securitydefsconst.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(securitydefsconst.h)
-../inc_interfaces/MCTKeyStoreUIDs.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mctkeystoreuids.h)
+../inc_interfaces/CCertAttributeFilter.h				SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ccertattributefilter.h)
+../inc/securitydefsconst.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(securitydefsconst.h)
+../inc_interfaces/MCTKeyStoreUIDs.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mctkeystoreuids.h)
 
 #ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
 #ifdef SYMBIAN_OLD_EXPORT_LOCATION
 ../inc_interfaces/mctcertappinterface.h					/epoc32/include/mctcertappinterface.h
 #endif
 #ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../inc/ct/cttokentypedeletehandler.h 			/epoc32/include/cttokentypedeletehandler.h
+../inc/ct/cttokentypedeletehandler.h 					/epoc32/include/cttokentypedeletehandler.h
 #endif
 #endif