diff --git a/src/cardmod/cardmod.c b/src/cardmod/cardmod.c
index 8d1365c0..b523e11d 100644
--- a/src/cardmod/cardmod.c
+++ b/src/cardmod/cardmod.c
@@ -551,8 +551,8 @@ DWORD WINAPI CardReadFile(__in PCARD_DATA pCardData,
 					swprintf(p->wszGuid, L"%0*.*d", MAX_CONTAINER_NAME_LEN, \
 						MAX_CONTAINER_NAME_LEN, i /*rand()%1000*/);
 				
-					//{D4C246CC-423D-4BDC-BD9E-1089B8DEB823}
-					//swprintf(p->wszGuid, L"{D4C246CC-423D-4BDC-BD9E-1089B8DEB8%02.2d}", i);
+					/*{D4C246CC-423D-4BDC-BD9E-1089B8DEB823}
+					swprintf(p->wszGuid, L"{D4C246CC-423D-4BDC-BD9E-1089B8DEB8%02.2d}", i); */
 					p->bFlags += CONTAINER_MAP_VALID_CONTAINER;
 					if(i == 0)
 					{
@@ -791,7 +791,7 @@ DWORD WINAPI CardSignData(__in PCARD_DATA pCardData,
 		opt_crypt_flags += SC_ALGORITHM_RSA_PAD_PKCS1;
 		if (!pinf->pszAlgId) 
 		{
-			//hashAlg = CALG_SSL3_SHAMD5;
+			/* hashAlg = CALG_SSL3_SHAMD5; */
 			logprintf(pCardData, 0, "unsupported hashAlg\n");
 		}
 		else 
@@ -1188,7 +1188,7 @@ DWORD WINAPI CardGetProperty(__in PCARD_DATA pCardData,
 		BOOL *p = (BOOL*)pbData;
 		if (pdwDataLen) *pdwDataLen = sizeof(*p);
 		if (cbData < sizeof(*p)) return SCARD_E_NO_MEMORY;
-		*p = TRUE; //HACK
+		*p = TRUE; /* XXX HACK */
 		return SCARD_S_SUCCESS;
 	}
 	if (wcscmp(CP_CARD_CACHE_MODE,wszProperty) == 0)
@@ -1353,7 +1353,7 @@ DWORD WINAPI CardAcquireContext(IN PCARD_DATA pCardData, __in DWORD dwFlags)
 	
 	suppliedVersion = pCardData->dwVersion;
 
-	//VENDOR SPECIFIC
+	/* VENDOR SPECIFIC */
 	vs = pCardData->pvVendorSpecific = \
 		pCardData->pfnCspAlloc(sizeof(VENDOR_SPECIFIC));
 	memset(vs, 0, sizeof(VENDOR_SPECIFIC));
@@ -1366,7 +1366,7 @@ DWORD WINAPI CardAcquireContext(IN PCARD_DATA pCardData, __in DWORD dwFlags)
 			NULLWSTR(pCardData->pwszCardName),pCardData->hScard, \
 			pCardData->hSCardCtx);
 	
-	// The lowest supported version is 4.
+	/* The lowest supported version is 4. */
 	if (pCardData->dwVersion < MINIMUM_VERSION_SUPPORTED)
 	{
 		return (DWORD) ERROR_REVISION_MISMATCH;
@@ -1579,7 +1579,7 @@ DWORD WINAPI CardAcquireContext(IN PCARD_DATA pCardData, __in DWORD dwFlags)
 	pCardData->pfnCardAuthenticateChallenge = CardAuthenticateChallenge;
 	pCardData->pfnCardUnblockPin = CardUnblockPin;
 	pCardData->pfnCardChangeAuthenticator = CardChangeAuthenticator;
-	pCardData->pfnCardDeauthenticate = CardDeauthenticate; //NULL
+	pCardData->pfnCardDeauthenticate = CardDeauthenticate; /* NULL */
 	pCardData->pfnCardCreateDirectory = CardCreateDirectory;
 	pCardData->pfnCardDeleteDirectory = CardDeleteDirectory;
 	pCardData->pvUnused3 = NULL;
diff --git a/src/libopensc/card-piv.c b/src/libopensc/card-piv.c
index 4660aef2..e2717788 100644
--- a/src/libopensc/card-piv.c
+++ b/src/libopensc/card-piv.c
@@ -587,7 +587,7 @@ static int piv_get_data(sc_card_t * card, int enumtag,
 	SC_FUNC_CALLED(card->ctx, SC_LOG_DEBUG_VERBOSE);
 	sc_debug(card->ctx, SC_LOG_DEBUG_NORMAL, "#%d \n", enumtag);
 
-	//assert(enumtag >= 0 && enumtag < PIV_OBJ_LAST_ENUM);
+	/* assert(enumtag >= 0 && enumtag < PIV_OBJ_LAST_ENUM); */
 	
 	tag_len = piv_objects[enumtag].tag_len;
 
diff --git a/src/libopensc/card-westcos.c b/src/libopensc/card-westcos.c
index 0bc24c94..ee280972 100644
--- a/src/libopensc/card-westcos.c
+++ b/src/libopensc/card-westcos.c
@@ -121,10 +121,10 @@ static void westcos_compute_aetb_crc(int CRCType,
 	unsigned short wCrc;
 	switch (CRCType) {
 	case CRC_A:
-		wCrc = 0x6363;	// ITU-V.41
+		wCrc = 0x6363;	/* ITU-V.41 */
 		break;
 	case CRC_B:
-		wCrc = 0xFFFF;	// ISO 3309
+		wCrc = 0xFFFF;	/* ISO 3309 */
 		break;
 	default:
 		return;
@@ -135,7 +135,7 @@ static void westcos_compute_aetb_crc(int CRCType,
 		westcos_update_crc(chBlock, &wCrc);
 	} while (--Length);
 	if (CRCType == CRC_B)
-		wCrc = ~wCrc;	// ISO 3309
+		wCrc = ~wCrc;	/* ISO 3309 */
 	*TransmitFirst = (unsigned char) (wCrc & 0xFF);
 	*TransmitSecond = (unsigned char) ((wCrc >> 8) & 0xFF);
 	return;
diff --git a/src/libopensc/p15emu-westcos.c b/src/libopensc/p15emu-westcos.c
index dc09600c..0eb0bbe3 100644
--- a/src/libopensc/p15emu-westcos.c
+++ b/src/libopensc/p15emu-westcos.c
@@ -123,7 +123,7 @@ static int sc_pkcs15emu_westcos_init(sc_pkcs15_card_t * p15card)
 	}
 	else
 	{
-		// certificat file
+		/* certificat file */
 		struct sc_pkcs15_cert_info cert_info;
 		struct sc_pkcs15_object cert_obj;
 		struct sc_pkcs15_pubkey_info pubkey_info;
@@ -157,7 +157,7 @@ static int sc_pkcs15emu_westcos_init(sc_pkcs15_card_t * p15card)
 		}
 		else
 		{
-			// or public key
+			/* or public key */
 			memset(&pubkey_info, 0, sizeof(pubkey_info));
 			memset(&pubkey_obj, 0, sizeof(pubkey_obj));
 			pubkey_info.id.len = 1;
@@ -182,7 +182,7 @@ static int sc_pkcs15emu_westcos_init(sc_pkcs15_card_t * p15card)
 				r = sc_pkcs15_read_pubkey(p15card, &pubkey_obj, &pkey);
 				if (r)
 					goto out;
-				// not sure if necessary
+				/* not sure if necessary */
 				pubkey_obj.flags = 0;
 			}
 			if (pkey->algorithm == SC_ALGORITHM_RSA) {
diff --git a/src/libopensc/reader-pcsc.c b/src/libopensc/reader-pcsc.c
index 65c9ec0b..1ee3b4f8 100644
--- a/src/libopensc/reader-pcsc.c
+++ b/src/libopensc/reader-pcsc.c
@@ -1085,7 +1085,7 @@ static int pcsc_wait_for_event(sc_context_t *ctx, void *reader_data,
 
 			/* No match - copy the state so pcscd knows
 			 * what to watch out for */
-			//rsp->dwCurrentState = rsp->dwEventState;
+			/* rsp->dwCurrentState = rsp->dwEventState; */
 		}
 
 		if (timeout == 0) {
@@ -1563,7 +1563,7 @@ static int cardmod_init(sc_context_t *ctx, void **reader_data)
 		}
 	}
 	else {
-		//gpriv->SCardControlOLD = (SCardControlOLD_t)lt_dlsym(gpriv->dlhandle, "SCardControl");
+		/* gpriv->SCardControlOLD = (SCardControlOLD_t)lt_dlsym(gpriv->dlhandle, "SCardControl"); */
 	}
 
 	if (
@@ -1694,7 +1694,7 @@ static int cardmod_detect_readers(sc_context_t *ctx, void *prv_data)
 		}
 		priv->gpriv = gpriv;
 		
-		// attempt to detect protocol in use T0/T1/RAW
+		/* attempt to detect protocol in use T0/T1/RAW */
 		rv = priv->gpriv->SCardStatus(card_handle, NULL, &readers_len,
 				&state, &prot, atr, &atr_len);
 		if (rv != SCARD_S_SUCCESS) 
@@ -1854,14 +1854,14 @@ struct sc_reader_driver * sc_get_cardmod_driver(void)
 	cardmod_ops.init = cardmod_init;
 	cardmod_ops.finish = cardmod_finish;
 	cardmod_ops.detect_readers = cardmod_detect_readers;
-	//cardmod_ops.transmit = ;
+	/* cardmod_ops.transmit = ; */
 	cardmod_ops.detect_card_presence = NULL; 
 	cardmod_ops.lock = NULL;
 	cardmod_ops.unlock = NULL;
 	cardmod_ops.release = NULL; 
 	cardmod_ops.connect = cardmod_connect;
 	cardmod_ops.disconnect = cardmod_disconnect;
-	//cardmod_ops.perform_verify = ; 
+	/* cardmod_ops.perform_verify = ; */
 	cardmod_ops.wait_for_event = NULL; 
 	cardmod_ops.reset = NULL; 
 
diff --git a/src/pkcs11/pkcs11-session.c b/src/pkcs11/pkcs11-session.c
index 667f9839..5659d7fc 100644
--- a/src/pkcs11/pkcs11-session.c
+++ b/src/pkcs11/pkcs11-session.c
@@ -81,7 +81,7 @@ CK_RV C_OpenSession(CK_SLOT_ID slotID,	/* the slot's ID */
 	session->notify_data = pApplication;
 	session->flags = flags;
 	slot->nsessions++;
-	session->handle = (CK_SESSION_HANDLE) session;	// cast a pointer to long
+	session->handle = (CK_SESSION_HANDLE) session;	/* cast a pointer to long */
 	list_append(&sessions, session);
 	*phSession = session->handle;
 	sc_debug(context, SC_LOG_DEBUG_NORMAL, "C_OpenSession handle: 0x%lx", session->handle);
diff --git a/src/pkcs11/slot.c b/src/pkcs11/slot.c
index e50cbeea..e646cbf3 100644
--- a/src/pkcs11/slot.c
+++ b/src/pkcs11/slot.c
@@ -284,7 +284,7 @@ CK_RV slot_get_slot(CK_SLOT_ID id, struct sc_pkcs11_slot ** slot)
 	if (context == NULL)
 		return CKR_CRYPTOKI_NOT_INITIALIZED;
 
-	*slot = list_seek(&virtual_slots, &id);	// FIXME: check for null?
+	*slot = list_seek(&virtual_slots, &id);	/* FIXME: check for null? */
 	if (!*slot)
 		return CKR_SLOT_ID_INVALID;
 	return CKR_OK;
diff --git a/src/tools/netkey-tool.c b/src/tools/netkey-tool.c
index 6afbbdaa..ce54edc5 100644
--- a/src/tools/netkey-tool.c
+++ b/src/tools/netkey-tool.c
@@ -229,7 +229,7 @@ static void show_card(sc_card_t    *card)
 	printf("%X\n\n", buf[11]>>4);
 
 	for(i=0;i<4;++i) show_pin(card, i);
-	// printf("%s: %u tries left, %u tries max, %s\n", pinlist[i].label, pinlist[i].tries, max, status);
+	/* printf("%s: %u tries left, %u tries max, %s\n", pinlist[i].label, pinlist[i].tries, max, status); */
 
 	if(pinlist[0].len) show_initial_puk(card);
 }
diff --git a/src/tools/westcos-tool.c b/src/tools/westcos-tool.c
index 784ea8d1..d0398da5 100644
--- a/src/tools/westcos-tool.c
+++ b/src/tools/westcos-tool.c
@@ -500,7 +500,7 @@ int main(int argc, char *argv[])
 			r = sc_file_add_acl_entry(file, SC_AC_OP_ERASE, SC_AC_NONE, 0);
 			if(r) goto out;
 
-			//sc_format_path("3F00AAAA", &(file->path));
+			/* sc_format_path("3F00AAAA", &(file->path)); */
 			file->path = path;
 			r = sc_create_file(card, file);
 			if(r) goto out;