diff --git a/src/libopensc/card-mcrd.c b/src/libopensc/card-mcrd.c
index 4f9f19ba..1a3f3dc0 100644
--- a/src/libopensc/card-mcrd.c
+++ b/src/libopensc/card-mcrd.c
@@ -160,7 +160,7 @@ static void clear_special_files (struct df_info_s *dfi)
 	}
 }
 
-// this function should be somewhere else in opensc code, too
+/* this function should be somewhere else in opensc code, too */
 static int
 sc_card_identify (struct sc_card *card, struct sc_card_atrs *atr_list)
 {
@@ -1115,7 +1115,7 @@ static int mcrd_set_security_env(struct sc_card *card,
 		    || env->key_ref_len != 1)
 			return SC_ERROR_INVALID_ARGUMENTS;
 
-		select_esteid_df(card);	// is it needed?
+		select_esteid_df(card);	/* is it needed? */
 		switch (env->operation) {
 		case SC_SEC_OPERATION_DECIPHER:
 			sc_debug(card->ctx,
diff --git a/src/libopensc/card-oberthur.c b/src/libopensc/card-oberthur.c
index 95d966c8..19c1376e 100644
--- a/src/libopensc/card-oberthur.c
+++ b/src/libopensc/card-oberthur.c
@@ -128,7 +128,7 @@ auth_select_aid(struct sc_card *card)
 	int rv, ii;
 	unsigned char cm[7] = {0xA0,0x00,0x00,0x00,0x03,0x00,0x00};
 
-	// Select Card Manager (to deselect previously selected application) 
+	/* Select Card Manager (to deselect previously selected application) */
 	sc_format_apdu(card, &apdu, SC_APDU_CASE_3_SHORT, 0xA4, 0x04, 0x00);
 	apdu.lc = sizeof(cm);
 	apdu.le = sizeof(cm)+4;
@@ -140,7 +140,7 @@ auth_select_aid(struct sc_card *card)
 	rv = sc_transmit_apdu(card, &apdu);
 	SC_TEST_RET(card->ctx, rv, "APDU transmit failed");
 	
-	// Get smart card serial number
+	/* Get smart card serial number */
 	sc_format_apdu(card, &apdu, SC_APDU_CASE_2_SHORT, 0xCA, 0x9F, 0x7F);
 	apdu.cla = 0x80;
 	apdu.le = 0x2D;
@@ -156,7 +156,7 @@ auth_select_aid(struct sc_card *card)
 	sc_format_apdu(card, &apdu, SC_APDU_CASE_3_SHORT, 0xA4, 0x04, 0x00);
 	apdu.resp = apdu_resp;
 
-	// Try to select known AID 
+	/* Try to select known AID */
 	for (ii = 0; oberthur_aids[ii].value != NULL; ii++) {
 		size_t len = oberthur_aids[ii].len;
 		unsigned char *ptr;
@@ -764,8 +764,10 @@ auth_select_file(struct sc_card *card, const struct sc_path *path,
 	if (locked)
 		sc_unlock(card);
 	
-//	if (!rv)
-//		auth_cache_path(card, path);
+#if 0
+	if (!rv)
+		auth_cache_path(card, path);
+#endif
 	
 	sc_debug(card->ctx, "return %i\n",rv);
 	return rv;
@@ -837,15 +839,18 @@ auth_delete_file(struct sc_card *card, const struct sc_path *path)
 	SC_TEST_RET(card->ctx, rv, "APDU transmit failed");
 	if (apdu.sw1==0x6A && apdu.sw2==0x82)   {
 		/* Clean the DF contents.*/
-//		struct sc_file *file;
 		u8 lbuf[SC_MAX_APDU_BUFFER_SIZE];
 		int ii, len;
+#if 0
+		struct sc_file *file;
 
-//		if (!(file = sc_file_new()))
-//			SC_FUNC_RETURN(card->ctx, 0, SC_ERROR_OUT_OF_MEMORY);
+		if (!(file = sc_file_new()))
+			SC_FUNC_RETURN(card->ctx, 0, SC_ERROR_OUT_OF_MEMORY);
 		
-//		rv = select_file_id(card, sbuf, 2, 0x01, &file);
+		rv = select_file_id(card, sbuf, 2, 0x01, &file);
+#else
 		rv = select_file_id(card, sbuf, 2, 0x01, NULL);
+#endif
 		SC_TEST_RET(card->ctx, rv, "select DF failed");
 		
 		len = auth_list_files(card, lbuf, sizeof(lbuf));
@@ -861,8 +866,11 @@ auth_delete_file(struct sc_card *card, const struct sc_path *path)
 			rv = auth_delete_file(card, &tpath);
 			SC_TEST_RET(card->ctx, rv, "delete failed");
 		}
-//		rv = select_parent(card, &file);
+#if 0
+		rv = select_parent(card, &file);
+#else
 		rv = select_parent(card, NULL);
+#endif
 		SC_TEST_RET(card->ctx, rv, "select parent DF failed");
 		
 		apdu.p1 = 1;
@@ -1032,9 +1040,9 @@ encode_file_structure_V5(struct sc_card *card, const struct sc_file *file,
 		ops[1] = SC_AC_OP_CRYPTO;
 		ops[2] = SC_AC_OP_LIST_FILES;
 		ops[3] = SC_AC_OP_DELETE;
-		ops[4] = SC_AC_OP_LIST_FILES;  // SC_AC_OP_SET_REFERENCE
-		ops[5] = SC_AC_OP_LIST_FILES;  // SC_AC_OP_CHANGE_REFERENCE
-		ops[6] = SC_AC_OP_LIST_FILES;  // SC_AC_OP_RESET_COUNTER
+		ops[4] = SC_AC_OP_LIST_FILES;  /* SC_AC_OP_SET_REFERENCE */
+		ops[5] = SC_AC_OP_LIST_FILES;  /* SC_AC_OP_CHANGE_REFERENCE */
+		ops[6] = SC_AC_OP_LIST_FILES;  /* SC_AC_OP_RESET_COUNTER */
 	} 
 	else if (file->type == SC_FILE_TYPE_WORKING_EF)   {
 		if (file->ef_structure == SC_FILE_EF_TRANSPARENT)   {
@@ -1056,22 +1064,22 @@ encode_file_structure_V5(struct sc_card *card, const struct sc_file *file,
 		if (file->ef_structure == SC_CARDCTL_OBERTHUR_KEY_DES)  {
 			sc_debug(card->ctx, "EF_DES\n");
 			ops[0] = SC_AC_OP_UPDATE;
-			ops[1] = SC_AC_OP_READ;  // SC_AC_OP_DECRYPT
-			ops[2] = SC_AC_OP_READ;  // SC_AC_OP_ENCRYPT
-			ops[3] = SC_AC_OP_READ;  // SC_AC_OP_CHECKSUM
-			ops[4] = SC_AC_OP_READ;  // SC_AC_OP_CHECKSUM
+			ops[1] = SC_AC_OP_READ;  /* SC_AC_OP_DECRYPT */
+			ops[2] = SC_AC_OP_READ;  /* SC_AC_OP_ENCRYPT */
+			ops[3] = SC_AC_OP_READ;  /* SC_AC_OP_CHECKSUM */
+			ops[4] = SC_AC_OP_READ;  /* SC_AC_OP_CHECKSUM */
 		}
 		else if (file->ef_structure == SC_CARDCTL_OBERTHUR_KEY_RSA_PUBLIC)  {
 			sc_debug(card->ctx, "EF_RSA_PUBLIC\n");
 			ops[0] = SC_AC_OP_UPDATE;
-			ops[2] = SC_AC_OP_READ;  // SC_AC_OP_ENCRYPT
-			ops[4] = SC_AC_OP_READ;  // SC_AC_OP_SIGN
+			ops[2] = SC_AC_OP_READ;  /* SC_AC_OP_ENCRYPT */
+			ops[4] = SC_AC_OP_READ;  /* SC_AC_OP_SIGN */
 		}
 		else if (file->ef_structure == SC_CARDCTL_OBERTHUR_KEY_RSA_CRT)  {
 			sc_debug(card->ctx, "EF_RSA_PRIVATE\n");
 			ops[0] = SC_AC_OP_UPDATE;
-			ops[1] = SC_AC_OP_READ;  // SC_AC_OP_ENCRYPT
-			ops[3] = SC_AC_OP_READ;  // SC_AC_OP_SIGN
+			ops[1] = SC_AC_OP_READ;  /* SC_AC_OP_ENCRYPT */
+			ops[3] = SC_AC_OP_READ;  /* SC_AC_OP_SIGN */
 		}
 	}
 	
diff --git a/src/libopensc/pkcs15-esteid.c b/src/libopensc/pkcs15-esteid.c
index 4a5554af..ddb86259 100644
--- a/src/libopensc/pkcs15-esteid.c
+++ b/src/libopensc/pkcs15-esteid.c
@@ -74,7 +74,6 @@ sc_pkcs15emu_esteid_init (sc_pkcs15_card_t * p15card)
   r = sc_read_record (card, SC_ESTEID_PD_DOCUMENT_NR, buff, 8,
 		      SC_RECORD_BY_REC_NR);
   SC_TEST_RET (card->ctx, r, "read document number failed");
-  // null-terminate
   buff[r] = '\0';
   set_string (&p15card->serial_number, buff);
 
@@ -188,7 +187,7 @@ sc_pkcs15emu_esteid_init (sc_pkcs15_card_t * p15card)
       auth_id.value[0] = prkey_pin[i];
       auth_id.len = 1;
 
-      // NULL may be a path.... ?
+      /* NULL may be a path.... ? */
       r = sc_pkcs15emu_add_prkey (p15card, &id,
 				  prkey_name[i],
 				  SC_PKCS15_TYPE_PRKEY_RSA,
diff --git a/src/pkcs15init/pkcs15-oberthur.c b/src/pkcs15init/pkcs15-oberthur.c
index 28ca0484..c7df6f45 100644
--- a/src/pkcs15init/pkcs15-oberthur.c
+++ b/src/pkcs15init/pkcs15-oberthur.c
@@ -58,7 +58,7 @@
 #define TLV_TYPE_LV      1
 #define TLV_TYPE_TLV	2
 
-// Should be greater then SC_PKCS15_TYPE_CLASS_MASK
+/* Should be greater then SC_PKCS15_TYPE_CLASS_MASK */
 #define SC_DEVICE_SPECIFIC_TYPE	 0x1000
 
 #define COSM_PUBLIC_LIST (SC_DEVICE_SPECIFIC_TYPE | 0x02)
@@ -581,7 +581,7 @@ cosm_old_generate_key(struct sc_profile *profile, struct sc_card *card,
 		goto failed;
 	}
 	
-	//FIXME and if the exponent length is not 3? 
+	/* FIXME and if the exponent length is not 3? */
 	pubkey->u.rsa.exponent.len  = 3;
 	pubkey->u.rsa.exponent.data = (u8 *) malloc(3);
 	if (!pubkey->u.rsa.exponent.data)   {
@@ -695,7 +695,7 @@ sc_pkcs15init_get_oberthur_ops(void)
 	
 	ops->erase_card = cosm_erase_card;
 	
-//NEW	
+/* NEW */
 	ops->create_dir = NULL;
 	ops->create_domain = NULL;
 	ops->select_pin_reference = cosm_select_pin_reference;
@@ -707,7 +707,7 @@ sc_pkcs15init_get_oberthur_ops(void)
 	ops->encode_private_key = NULL; 
 	ops->encode_public_key = NULL;
 
-//OLD
+/* OLD */
 	ops->init_app = cosm_init_app;
 	ops->new_pin = NULL;
 	ops->new_key = cosm_new_key;
diff --git a/src/sslengines/engine_pkcs11.c b/src/sslengines/engine_pkcs11.c
index 3b69f535..e02bde4c 100644
--- a/src/sslengines/engine_pkcs11.c
+++ b/src/sslengines/engine_pkcs11.c
@@ -284,7 +284,8 @@ EVP_PKEY *pkcs11_load_key(ENGINE * e, const char *s_slot_key_id,
 		fprintf(stderr,"Found empty token; \n");
 		return NULL;
 	}
-#if 0 // Removed for interop with some other pkcs11 libs.
+/* Removed for interop with some other pkcs11 libs. */
+#if 0
 	if (!tok->initialized) {
 		fprintf(stderr,"Found uninitialized token; \n");
 		return NULL;