diff --git a/server/drivers/MtxOrb.c b/server/drivers/MtxOrb.c
index 307c599..2253647 100644
--- a/server/drivers/MtxOrb.c
+++ b/server/drivers/MtxOrb.c
@@ -186,12 +186,12 @@ MtxOrb_init (lcd_logical_driver * driver, char *args)
 	int argc;
 	struct termios portset;
 	int i;
-	int tmp;
+	//int tmp;
 
 	int contrast = DEFAULT_CONTRAST;
 	char device[256] = DEFAULT_DEVICE;
 	int speed = DEFAULT_SPEED;
-	char c;
+	//char c;
 
 	MtxOrb_type = MTXORB_LKD;  // Assume it's an LCD w/keypad
 
@@ -389,8 +389,8 @@ MtxOrb_init (lcd_logical_driver * driver, char *args)
 	return fd;
 }
 
-#define ValidX(a) { if (x > MtxOrb->wid) { x = MtxOrb->wid; } else x < 1 ? 1 : x; }
-#define ValidY(a) { if (y > MtxOrb->hgt) { y = MtxOrb->hgt; } else y < 1 ? 1 : y; }
+#define ValidX(x) if ((x) > MtxOrb->wid) { (x) = MtxOrb->wid; } else (x) = (x) < 1 ? 1 : (x);
+#define ValidY(y) if ((y) > MtxOrb->hgt) { (y) = MtxOrb->hgt; } else (y) = (y) < 1 ? 1 : (y);
 
 // TODO: Check this quick hack to detect clear of the screen.
 /////////////////////////////////////////////////////////////////
@@ -480,7 +480,7 @@ MtxOrb_flush_box (int lft, int top, int rgt, int bot)
 static void
 MtxOrb_chr (int x, int y, char c)
 {
-	char out[10], buf[64];
+	char buf[64]; // char out[10];
 	int offset;
 
 	// Characters may or may NOT be alphabetic; it appears
@@ -717,7 +717,7 @@ MtxOrb_getinfo (void)
 	char in = 0;
 	static char info[255];
 	char tmp[255], buf[64];
-	int i = 0;
+	//int i = 0;
 	fd_set rfds;
 
 	struct timeval tv;
diff --git a/server/drivers/curses_drv.c b/server/drivers/curses_drv.c
index 2170c09..4dea71f 100644
--- a/server/drivers/curses_drv.c
+++ b/server/drivers/curses_drv.c
@@ -327,8 +327,8 @@ curses_drv_clear ()
 	werase (lcd_win);
 }
 
-#define ValidX(x) { if ((x) > curses_drv->wid) { (x) = curses_drv->wid; } else (x) < 1 ? 1 : x; }
-#define ValidY(y) { if ((y) > curses_drv->hgt) { (y) = curses_drv->hgt; } else (y) < 1 ? 1 : y; }
+#define ValidX(x) { if ((x) > curses_drv->wid) { (x) = curses_drv->wid; } else (x) = (x) < 1 ? 1 : x; }
+#define ValidY(y) { if ((y) > curses_drv->hgt) { (y) = curses_drv->hgt; } else (y) = (y) < 1 ? 1 : y; }
 
 void
 curses_drv_backlight (int on)
diff --git a/server/drivers/lcdm001.c b/server/drivers/lcdm001.c
index bd544a1..43cd582 100644
--- a/server/drivers/lcdm001.c
+++ b/server/drivers/lcdm001.c
@@ -46,8 +46,8 @@ static void lcdm001_string (int x, int y, char *string);
 static void lcdm001_usage (void);
 
 
-#define ValidX(a) { if (x > lcdm001->wid) { x = lcdm001->wid; } else x < 1 ? 1 : x; }
-#define ValidY(a) { if (y > lcdm001->hgt) { y = lcdm001->hgt; } else y < 1 ? 1 : y; }
+#define ValidX(x) if ((x) > lcdm001->wid) { (x) = lcdm001->wid; } else (x) = (x) < 1 ? 1 : (x);
+#define ValidY(y) if ((y) > lcdm001->hgt) { (y) = lcdm001->hgt; } else (y) = (y) < 1 ? 1 : (y);
 
 // Set cursorblink on/off
 //
@@ -88,7 +88,7 @@ lcdm001_init (struct lcd_logical_driver *driver, char *args)
         int argc;
         int i;
         struct termios portset;
-	char c;
+	//char c;
 
 	char out[5]="";
   //fprintf(stderr,"lcdm001_init()\n");
@@ -351,7 +351,7 @@ lcdm001_flush_box (int lft, int top, int rgt, int bot)
 static void
 lcdm001_chr (int x, int y, char c)
 {
-	char out[10], buf[64];
+	char buf[64]; // char out[10];
 	int offset;
 
 	ValidX(x);
diff --git a/server/drivers/sed1520.c b/server/drivers/sed1520.c
index 8438515..4c39fef 100644
--- a/server/drivers/sed1520.c
+++ b/server/drivers/sed1520.c
@@ -184,7 +184,7 @@ sed1520_init (struct lcd_logical_driver *driver, char *args)
 	  else if (0 == strcmp (argv[i], "-h")
 		   || 0 == strcmp (argv[i], "--help"))
 	    {
-		int i;
+		//int i;
 		printf
 		    ("LCDproc sed1520 driver\n\t-p n\t--port n\tSelect the output device to use port n\n");
 		printf ("put the options in quotes like this:  '-p 0x278'\n");
diff --git a/server/drivers/stv5730.c b/server/drivers/stv5730.c
index 986d124..095089b 100644
--- a/server/drivers/stv5730.c
+++ b/server/drivers/stv5730.c
@@ -320,7 +320,7 @@ stv5730_init (struct lcd_logical_driver *driver, char *args)
 	  else if (0 == strcmp (argv[i], "-h")
 		   || 0 == strcmp (argv[i], "--help"))
 	    {
-		int i;
+		//int i;
 		printf
 		    ("LCDproc stv5730 driver\n\t-p n\t--port n\tSelect the output device to use port n\n");
 		printf ("put the options in quotes like this:  '-p 0x278'\n");
diff --git a/server/drivers/svgalib_drv.c b/server/drivers/svgalib_drv.c
index dc1873a..88f52a0 100644
--- a/server/drivers/svgalib_drv.c
+++ b/server/drivers/svgalib_drv.c
@@ -247,11 +247,11 @@ svgalib_drv_init (struct lcd_logical_driver *driver, char *args)
 {
 	char *argv[64];
 	int argc;
-	int i, j;
+	//int i, j;
 	int VGAMODE;
-	int fgtemp;
-	char param[100];
-	char buffer[1024];
+	//int fgtemp;
+	//char param[100];
+	//char buffer[1024];
 
 	/* not used at the moment */
 	argc = get_args (argv, args, 64);
@@ -474,8 +474,8 @@ char
 svgalib_drv_getkey ()
 {
 	int i;
-	int loop;
-	FILE *fd;
+	//int loop;
+	//FILE *fd;
 	i = vga_getkey ();
 	if (i) {
 		switch (i) {