diff --git a/libvncserver/zrleencodetemplate.c b/libvncserver/zrleencodetemplate.c
index a1772ae..78bcb24 100644
--- a/libvncserver/zrleencodetemplate.c
+++ b/libvncserver/zrleencodetemplate.c
@@ -134,15 +134,15 @@ void ZRLE_ENCODE_TILE (PIXEL_T* data, int w, int h, zrleOutStream* os)
     return;
   }
 
-  // Try to work out whether to use RLE and/or a palette.  We do this by
-  // estimating the number of bytes which will be generated and picking the
-  // method which results in the fewest bytes.  Of course this may not result
-  // in the fewest bytes after compression...
+  /* Try to work out whether to use RLE and/or a palette.  We do this by
+     estimating the number of bytes which will be generated and picking the
+     method which results in the fewest bytes.  Of course this may not result
+     in the fewest bytes after compression... */
 
   useRle = FALSE;
   usePalette = FALSE;
 
-  estimatedBytes = w * h * (BPPOUT/8); // start assuming raw
+  estimatedBytes = w * h * (BPPOUT/8); /* start assuming raw */
 
   plainRleBytes = ((BPPOUT/8)+1) * (runs + singlePixels);
 
@@ -216,13 +216,13 @@ void ZRLE_ENCODE_TILE (PIXEL_T* data, int w, int h, zrleOutStream* os)
 
   } else {
 
-    // no RLE
+    /* no RLE */
 
     if (usePalette) {
       int bppp;
       PIXEL_T* ptr = data;
 
-      // packed pixels
+      /* packed pixels */
 
       assert (ph->size < 17);
 
@@ -251,7 +251,7 @@ void ZRLE_ENCODE_TILE (PIXEL_T* data, int w, int h, zrleOutStream* os)
       }
     } else {
 
-      // raw
+      /* raw */
 
 #ifdef CPIXEL
       PIXEL_T *ptr;
diff --git a/test/tight-1.c b/test/tight-1.c
index fa22ea7..e8b9b79 100644
--- a/test/tight-1.c
+++ b/test/tight-1.c
@@ -13,7 +13,6 @@ int main(int argc,char** argv)
   server->frameBuffer=malloc(400*300*4);
   for(j=0;j<400*300*4;j++)
     server->frameBuffer[j]=j;
-  //server->maxRectsPerUpdate=-1;
   rfbInitServer(server);           
   while(time(0)-t<20) {
 
diff --git a/vncterm/LinuxVNC.c b/vncterm/LinuxVNC.c
index 0817fbb..7d32cde 100644
--- a/vncterm/LinuxVNC.c
+++ b/vncterm/LinuxVNC.c
@@ -48,7 +48,6 @@ void do_key(rfbBool down,rfbKeySym keySym,rfbClientPtr cl)
 
       if(keySym<0x100) {
 	int ret;
-	//rfbLog("do_key: %c (0x%lx)\n",(char)keySym,keySym);
 	ret=ioctl(tty_inject_device,TIOCSTI,&keySym);
 	if(ret<0) {
 	  static char device[64];
diff --git a/vncterm/VNCommand.c b/vncterm/VNCommand.c
index 358aa1f..fc07bdb 100644
--- a/vncterm/VNCommand.c
+++ b/vncterm/VNCommand.c
@@ -44,7 +44,7 @@ int main(int argc, char **argv)
       dup2(in[0],0);
       dup2(out[1],1);
       dup2(err[1],2);
-      //setbuf(stdin,NULL);
+      /*setbuf(stdin,NULL);*/
       execvp(argv[programArg0],argv+programArg0);
     }
 
@@ -63,7 +63,7 @@ int main(int argc, char **argv)
       FD_ZERO(&fs);
       FD_SET(out[0],&fs);
       FD_SET(err[0],&fs);
-      //FD_SET(0,&fs);
+      /*FD_SET(0,&fs);*/
       tv.tv_sec=0; tv.tv_usec=5000;
 
       input_pipe=fdopen(in[1],"w");
diff --git a/vncterm/VNConsole.c b/vncterm/VNConsole.c
index 23da1b0..b15abb8 100644
--- a/vncterm/VNConsole.c
+++ b/vncterm/VNConsole.c
@@ -416,7 +416,7 @@ void vcPtrAddEventProc(int buttonMask,int x,int y,rfbClientPtr cl)
     if(cy<0) cy=0; else if(cy>=c->height) cy=c->height-1;
     pos=cy*c->width+cx;
 
-    // mark
+    /* mark */
     if(!c->currentlyMarking) {
       c->currentlyMarking=TRUE;
       c->markStart=pos;
diff --git a/vncterm/example.c b/vncterm/example.c
index e9d49b9..54de666 100644
--- a/vncterm/example.c
+++ b/vncterm/example.c
@@ -19,7 +19,6 @@ int main(int argc,char **argv)
     l=strlen(buffer)-1;
     while(l>=0 && buffer[l]=='\n')
       buffer[l]=0;
-    //rfbLog("%s (%d)",buffer,strlen(buffer));
     if(!strcmp(buffer,"quit"))
       return(0);
     if(!strcmp(buffer,"s"))