--- a/pkiutilities/CTSecurityDialogs/Group/CTSecDialogImpl.mmp	Tue Aug 31 16:04:40 2010 +0300
+++ b/pkiutilities/CTSecurityDialogs/Group/CTSecDialogImpl.mmp	Wed Sep 01 12:19:59 2010 +0100
@@ -34,40 +34,29 @@
 LANGUAGE_IDS
 END
 
-// CTSecuritydialognotifier uses CertManUi resources that are not compiled in builds any more
-SOURCEPATH ../../CertmanUi/data
-START RESOURCE  certmanui.rss
-HEADER
-TARGETPATH      RESOURCE_FILES_DIR
-LANGUAGE_IDS
-END
-
 SYSTEMINCLUDE ../../CertmanUi/INC
 SYSTEMINCLUDE ../../CertSaver/inc
 SYSTEMINCLUDE ../../DeviceToken/Inc
 SYSTEMINCLUDE ../../../inc              // securityservices/inc directory
 MW_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE   /epoc32/include/mw/hb/hbcore 
-SYSTEMINCLUDE   /epoc32/include/mw/hb/hbwidgets
 
 
 USERINCLUDE ../NotifInc
 USERINCLUDE ../ClientInc
-USERINCLUDE ../../../securitydialogs/SecUi/Inc
 
 SOURCEPATH  ../NotifSrc
 
 SOURCE    DllMain.cpp
 SOURCE    CTSecuritydialognotifier.cpp
-//SOURCE    CTpinquerydialog.cpp
-//SOURCE    CTQueryDialog.cpp
-//SOURCE    CTSigntextdialog.cpp
-//SOURCE    CTSelectcertificatedialog.cpp
-//SOURCE    CTPinPinQueryDialog.cpp
+SOURCE    CTpinquerydialog.cpp
+SOURCE    CTQueryDialog.cpp
+SOURCE    CTSigntextdialog.cpp
+SOURCE    CTSelectcertificatedialog.cpp
+SOURCE    CTPinPinQueryDialog.cpp
 SOURCE    CTCertificateQuery.cpp
 SOURCE    CTSecurityDialogsAO.cpp
-SOURCE    CTUntrustedCertQuery.cpp
-//SOURCE    CTInvalidCertNote.cpp
+SOURCE    CTNoTrustQuery.cpp
+SOURCE    CTInvalidCertNote.cpp
 
 LIBRARY   EUSER.LIB
 LIBRARY   EIKSRV.LIB
@@ -91,13 +80,10 @@
 LIBRARY   aknlayout.lib
 LIBRARY   X500.lib
 LIBRARY   DevTokenClient.lib
-LIBRARY   HbCore.lib                // CHbDeviceDialog
-LIBRARY   HbWidgets.lib
-LIBRARY   secui.lib
 
 DEBUGLIBRARY     flogger.lib
 
-#if defined( EABI )
+#if defined(ARMCC)
     DEFFILE ../eabi/CTSecDilogImpl.DEF
 #elif defined( WINSCW )
     DEFFILE ../BWINSCW/CTSecDilogImpl.DEF