--- a/javaextensions/satsa/pki/src.s60/cstssignatureservice.h	Wed Sep 15 12:05:25 2010 +0300
+++ b/javaextensions/satsa/pki/src.s60/cstssignatureservice.h	Wed Oct 13 14:23:59 2010 +0300
@@ -19,18 +19,19 @@
 #ifndef CSTSSIGNATURESERVICE_H
 #define CSTSSIGNATURESERVICE_H
 
-
-
+//  INCLUDES
 #include <e32base.h>
 #include <badesca.h>
 #include <mctkeystore.h>
 #include "functionserver.h"
 
+// CONSTANTS
+
+
+
 // FORWARD DECLARATIONS
 class MSecurityDialog;
-#ifndef RD_JAVA_S60_RELEASE_10_1_ONWARDS 
 class MPKIDialog;
-#endif
 class CUnifiedCertStore;
 class CUnifiedKeyStore;
 class CCTCertInfo;
@@ -265,10 +266,8 @@
     // security dialog, owned
     MSecurityDialog* iDialog;
 
-#ifndef RD_JAVA_S60_RELEASE_10_1_ONWARDS
     // PKI Dialog, owned
     MPKIDialog* iPKIDialog;
-#endif	
 
     // certificate store, owned
     CUnifiedCertStore* iCertStore;