diff --git a/lib/master.pike.in b/lib/master.pike.in
index 7bb348b6252359cec92115c8c8934421ee270a82..62f4f7ef7cdf0d2eebcdae3c436a3ff8493dd7c3 100644
--- a/lib/master.pike.in
+++ b/lib/master.pike.in
@@ -1,6 +1,6 @@
 /* -*- Pike -*-
  *	
- * $Id: master.pike.in,v 1.128 2000/08/29 21:54:01 mast Exp $
+ * $Id: master.pike.in,v 1.129 2000/09/05 02:15:53 hubbe Exp $
  * 
  * Master-file for Pike.
  *
@@ -974,7 +974,6 @@ void _main(array(string) orig_argv, array(string) env)
 {
   array(string) argv=copy_value(orig_argv);
   int i,debug,trace;
-  object script;
   object tmp;
   string a,b;
   array q;
@@ -1174,10 +1173,10 @@ void _main(array(string) orig_argv, array(string) env)
 
   argv[0]=combine_path_with_cwd(argv[0]);
 
-  program tmp;
+  program prog;
 
   mixed err = catch {
-    tmp=(program)argv[0];
+    prog=(program)argv[0];
   };
 
   if (err) {
@@ -1187,13 +1186,13 @@ void _main(array(string) orig_argv, array(string) env)
   }
 
   // FIXME: Isn't the following code dead?
-  if(!tmp)
+  if(!prog)
   {
     werror("Pike: Couldn't find script to execute\n(%O)\n",argv[0]);
     exit(1);
   }
 
-  object script=tmp();
+  object script=prog();
 
 #if constant(_debug)
   if(debug) _debug(debug);
diff --git a/lib/modules/_Image_XPM.pmod b/lib/modules/_Image_XPM.pmod
index 0deb3c55d7f7495098e4af6f77daa281d6fb1b79..15ed3f6d5e40d6a2cb464e36de475378d459e622 100644
--- a/lib/modules/_Image_XPM.pmod
+++ b/lib/modules/_Image_XPM.pmod
@@ -100,7 +100,7 @@ array cmap_t;
 
 string encode( object what, mapping|void options )
 {
-  int x,y, q;
+  int x,y,q;
   array lcmapt;
   TI("Encode init");
   if(!options) options = ([]);
@@ -164,7 +164,7 @@ string encode( object what, mapping|void options )
     res += "\""+c+"\",\n";
   TD(sprintf("Encode %d rows", sizeof(rows)));
 
-  int q = sizeof(rows);
+  q = sizeof(rows);
   foreach(rows, string row)
   {
     string r = "";
diff --git a/src/modules/call_out/test_co.pike b/src/modules/call_out/test_co.pike
index c330c2ca2af7e542f76f2fee3d5e82a3a21ade87..689b048ec29028e207da036393ce9b213869d924 100644
--- a/src/modules/call_out/test_co.pike
+++ b/src/modules/call_out/test_co.pike
@@ -1,6 +1,6 @@
 #!/usr/local/bin/pike
 
-/* $Id: test_co.pike,v 1.4 1998/05/22 00:49:17 hubbe Exp $ */
+/* $Id: test_co.pike,v 1.5 2000/09/05 02:16:48 hubbe Exp $ */
 
 void verify();
 
@@ -101,7 +101,7 @@ int main()
 
   verify();
 
-  mixed *tmp=allocate(10000);
+  array  tmp=allocate(10000);
   for(int e=0;e<sizeof(tmp);e++) tmp[e]=co(f0,50.0);
 
   verify();
@@ -119,7 +119,6 @@ int main()
 
   verify();
 
-  mixed *tmp=allocate(10000);
   for(int e=0;e<sizeof(tmp);e++) tmp[e]=co(f0,-50.0);
 
   verify();
diff --git a/src/post_modules/GTK/docs.pike b/src/post_modules/GTK/docs.pike
index befe7f0dc6114ca504914d952a89595266fd6f13..6f2f3b6dc7f74c9d8a45837235bcd7b19fa38a8f 100644
--- a/src/post_modules/GTK/docs.pike
+++ b/src/post_modules/GTK/docs.pike
@@ -106,7 +106,6 @@ void print_inherited_functions( string cl, object fd )
 {
   foreach(sort(indices(struct[cl]))-({"inherit"}), string fun)
   {
-    string a,b;
     string a = true_types[cl+fun][1],b=true_types[cl+fun][0];
     if( (a-" ") == "void"  )
       a = "";