diff --git a/libs/openzap/src/isdn/Q931StateNT.c b/libs/openzap/src/isdn/Q931StateNT.c
index fc245902bb..0b03170566 100644
--- a/libs/openzap/src/isdn/Q931StateNT.c
+++ b/libs/openzap/src/isdn/Q931StateNT.c
@@ -120,7 +120,7 @@ void Q931CreateNT(L3UCHAR i)
 	/* procs can when search this to find out if the message/state			*/
 	/* combination is legale. If not, the proc for unexpected message apply.*/
 
-	// TODO define state table here
+	/* TODO define state table here */
 }
 
 /*****************************************************************************
diff --git a/libs/openzap/src/isdn/Q931StateTE.c b/libs/openzap/src/isdn/Q931StateTE.c
index 745d0bc790..c1a51ab649 100644
--- a/libs/openzap/src/isdn/Q931StateTE.c
+++ b/libs/openzap/src/isdn/Q931StateTE.c
@@ -483,7 +483,6 @@ L3INT Q931ProcSetupAckTE(Q931_TrunkInfo *pTrunk, L3UCHAR * buf, L3INT iFrom)
 L3INT Q931ProcResumeTE(Q931_TrunkInfo *pTrunk, L3UCHAR * buf, L3INT iFrom)
 {
     Q931mes_Resume * pMes = (Q931mes_Resume *)&buf[Q931L4HeaderSpace];
-//    L3INT chanIndex;
     L3INT callIndex;
     L3INT ret = Q931E_NO_ERROR;
 
diff --git a/libs/openzap/src/isdn/Q931ie.c b/libs/openzap/src/isdn/Q931ie.c
index 28b1845ca7..3bcf30623e 100644
--- a/libs/openzap/src/isdn/Q931ie.c
+++ b/libs/openzap/src/isdn/Q931ie.c
@@ -1580,7 +1580,7 @@ L3INT Q931Uie_HLComp(Q931_TrunkInfo *pTrunk, ie *pIE, L3UCHAR * IBuf, L3UCHAR *
         }
         else
         {
-            // error Octet 4a indicated, but invalid value in Octet 4.
+            /* error Octet 4a indicated, but invalid value in Octet 4. */
             Q931SetError(pTrunk,Q931E_HLCOMP, 4, Off);
             return Q931E_HLCOMP;
         }
@@ -2690,7 +2690,6 @@ L3INT Q931Pie_SendComplete(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf,
     Q931ie_SendComplete * pIE = (Q931ie_SendComplete*)IBuf;
     L3INT rc=Q931E_NO_ERROR;
     L3INT Beg=*Octet;
-//    L3INT li;
 
     OBuf[(*Octet)++] = 0x80 | (L3UCHAR)Q931ie_SENDING_COMPLETE;
 
diff --git a/libs/openzap/src/isdn/Q931mes.c b/libs/openzap/src/isdn/Q931mes.c
index d2066d0358..c536d94799 100644
--- a/libs/openzap/src/isdn/Q931mes.c
+++ b/libs/openzap/src/isdn/Q931mes.c
@@ -1482,7 +1482,7 @@ L3INT Q931Pmes_Setup(Q931_TrunkInfo *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UCHAR
 
 	/* Repeat Indicator */
 	if(Q931IsIEPresent(pMes->LLRepeatInd))
-		;//TODO
+		;/* TODO */
 
 	/* Low Layer Compatibility */
 	if(Q931IsIEPresent(pMes->LLComp))
diff --git a/libs/openzap/src/isdn/Q932mes.c b/libs/openzap/src/isdn/Q932mes.c
index c0cf6505c3..a404018fa7 100644
--- a/libs/openzap/src/isdn/Q932mes.c
+++ b/libs/openzap/src/isdn/Q932mes.c
@@ -50,7 +50,7 @@ L3INT Q932Umes_Facility(Q931_TrunkInfo *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, L3I
 	L3INT OOff=0;
 	Q932mes_Facility *mes = (Q932mes_Facility*)IBuf;
 
-	//TODO
+	/* TODO */
 
     mes->Size = sizeof(Q932mes_Facility) - 1 + OOff;
     return Q931E_NO_ERROR;
@@ -84,7 +84,7 @@ L3INT Q932Umes_Hold(Q931_TrunkInfo *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT I
 	L3INT OOff=0;
 	Q932mes_Hold *mes = (Q932mes_Hold*)IBuf;
 
-	//TODO
+	/* TODO */
 
     mes->Size = sizeof(Q932mes_Hold) - 1 + OOff;
     return Q931E_NO_ERROR;
@@ -118,7 +118,7 @@ L3INT Q932Umes_HoldAck(Q931_TrunkInfo *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, L3IN
 	L3INT OOff=0;
 	Q932mes_HoldAck *mes = (Q932mes_HoldAck*)IBuf;
 
-	//TODO
+	/* TODO */
 
     mes->Size = sizeof(Q932mes_HoldAck) - 1 + OOff;
     return Q931E_NO_ERROR;
@@ -152,7 +152,7 @@ L3INT Q932Umes_HoldReject(Q931_TrunkInfo *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, L
 	L3INT OOff=0;
 	Q932mes_HoldReject *mes = (Q932mes_HoldReject*)IBuf;
 
-	//TODO
+	/* TODO */
 
     mes->Size = sizeof(Q932mes_HoldReject) - 1 + OOff;
     return Q931E_NO_ERROR;
@@ -186,7 +186,7 @@ L3INT Q932Umes_Register(Q931_TrunkInfo *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, L3I
 	L3INT OOff=0;
 	Q932mes_Register *mes = (Q932mes_Register*)IBuf;
 
-	//TODO
+	/* TODO */
 
     mes->Size = sizeof(Q932mes_Register) - 1 + OOff;
     return Q931E_NO_ERROR;
@@ -220,7 +220,7 @@ L3INT Q932Umes_Retrieve(Q931_TrunkInfo *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, L3I
 	L3INT OOff=0;
 	Q932mes_Retrieve *mes = (Q932mes_Retrieve*)IBuf;
 
-	//TODO
+	/* TODO */
 
     mes->Size = sizeof(Q932mes_Retrieve) - 1 + OOff;
     return Q931E_NO_ERROR;
@@ -254,7 +254,7 @@ L3INT Q932Umes_RetrieveAck(Q931_TrunkInfo *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf,
 	L3INT OOff=0;
 	Q932mes_RetrieveAck *mes = (Q932mes_RetrieveAck*)IBuf;
 
-	//TODO
+	/* TODO */
 
     mes->Size = sizeof(Q932mes_RetrieveAck) - 1 + OOff;
     return Q931E_NO_ERROR;
@@ -288,7 +288,7 @@ L3INT Q932Umes_RetrieveReject(Q931_TrunkInfo *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBu
 	L3INT OOff=0;
 	Q932mes_RetrieveReject *mes = (Q932mes_RetrieveReject*)IBuf;
 
-	//TODO
+	/* TODO */
 
     mes->Size = sizeof(Q932mes_RetrieveReject) - 1 + OOff;
     return Q931E_NO_ERROR;