diff --git a/ChangeLog b/ChangeLog
index acd7fed9..393c8d9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-08-25  Eric B. Weddington  <eric@ecentral.com>
+
+    * fileio.c: 
+    * main.c: 
+    * ppiwin.c:
+    * ser_posix.c:
+    * stk500.c:
+    Minor code cleanup to remove warnings.
+
 2003-08-01  Theodore A. Roth  <troth@openavr.org>
 
 	* avrdude.1: Document the -q option.
diff --git a/fileio.c b/fileio.c
index d40e757b..5f994e6b 100644
--- a/fileio.c
+++ b/fileio.c
@@ -895,7 +895,6 @@ int fileio(int op, char * filename, FILEFMT format,
   char * fname;
   unsigned char * buf;
   struct fioparms fio;
-  int i;
   AVRMEM * mem;
   int using_stdio;
 
diff --git a/main.c b/main.c
index c05d5af5..d85e8971 100644
--- a/main.c
+++ b/main.c
@@ -334,7 +334,7 @@ static void update_progress_tty (int percent, double etime, char *hdr)
 {
   static char hashes[51];
   static char *header;
-  static last = 0;
+  static int last = 0;
   int i;
 
   hashes[50] = 0;
@@ -745,7 +745,6 @@ int main(int argc, char * argv [])
   int     cycles;      /* erase-rewrite cycles */
   int     set_cycles;  /* value to set the erase-rewrite cycles to */
   char  * e;           /* for strtol() error checking */
-  char  * homedir;
   int     quell_progress;
 
   progname = rindex(argv[0],'/');
@@ -797,6 +796,7 @@ int main(int argc, char * argv [])
   win_usr_config_set(usr_config);
   
   #else
+  char  * homedir;
 
   strcpy(sys_config, CONFIG_DIR);
   i = strlen(sys_config);
diff --git a/ppiwin.c b/ppiwin.c
index d9746d3f..dccbfac6 100644
--- a/ppiwin.c
+++ b/ppiwin.c
@@ -351,8 +351,10 @@ BOOL usecPerfDelay(long t)
   }
 }
 
-// WARNING WARNING This function replaces the standard usleep() library function
-// because it doesn't appear to delay for the correct time
+/*
+WARNING WARNING This function replaces the standard usleep() library function
+because it doesn't appear to delay for the correct time.
+*/
 
 #ifndef MIN_SLEEP_USEC
 #define MIN_SLEEP_USEC 20000
@@ -364,7 +366,7 @@ unsigned usleep( unsigned int uSeconds )
   struct timespec nanoDelay ;
 
   if (usecPerfDelay(uSeconds))
-    return;
+    return(0);
 
   gettimeofday(&t1, NULL);
 
@@ -384,6 +386,8 @@ unsigned usleep( unsigned int uSeconds )
   do {
     gettimeofday(&t2, NULL);
   } while (timercmp(&t2, &t1, <));
+  
+  return(0);
 }
 
 
diff --git a/ser_posix.c b/ser_posix.c
index 713c6e91..59b3bd19 100644
--- a/ser_posix.c
+++ b/ser_posix.c
@@ -23,7 +23,9 @@
  * Posix serial interface for avrdude.
  */
 
+#include <ctype.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 #include <sys/types.h>
diff --git a/stk500.c b/stk500.c
index cc4fe332..339a7186 100644
--- a/stk500.c
+++ b/stk500.c
@@ -34,6 +34,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
+#include <unistd.h>
 
 #include "avr.h"
 #include "pgm.h"