--- a/src/drivers/shader.cpp.orig	2012-04-01 11:03:00.000000000 +0200
+++ b/src/drivers/shader.cpp	2012-04-01 11:10:57.000000000 +0200
@@ -176,7 +176,7 @@
 }";
 
 
-static void ShaderErrorTest(GLenum moe)
+static void ShaderErrorTest(GLhandleARB moe)
 {
  char buf[1000];
  GLsizei buflen = 0;
--- a/src/file.cpp.orig	2012-04-01 10:41:21.000000000 +0200
+++ b/src/file.cpp	2012-04-01 10:42:58.000000000 +0200
@@ -229,7 +229,7 @@
    goto doret;
   }
 
-  while((howmany = gzread(tz, tmp->data + cur_size, cur_alloced - cur_size)) > 0)
+  while((howmany = gzread((gzFile) tz, tmp->data + cur_size, cur_alloced - cur_size)) > 0)
   {
    cur_size += howmany;
    cur_alloced <<= 1;
@@ -282,7 +282,7 @@
  }
  else if(type == MDFN_FILETYPE_GZIP)
  {
-  gzclose(tz);
+  gzclose((gzFile) tz);
  }
  else if(type == MDFN_FILETYPE_ZIP)
  {
@@ -444,7 +444,7 @@
 
    if(!(fceufp = MakeMemWrap(t, 1)))
    {
-    gzclose(t);
+    gzclose((gzFile) t);
     return(0);
    }
 
@@ -671,12 +671,12 @@
     int errnum;
 
     MDFN_PrintError(_("Error writing to \"%s\": %m"), filename, gzerror(gp, &errnum));
-    gzclose(gp);
+    gzclose((gzFile) gp);
     return(0);
    }
   }
 
-  if(gzclose(gp) != Z_OK) // FIXME: Huhm, how should we handle this?
+  if(gzclose((gzFile) gp) != Z_OK) // FIXME: Huhm, how should we handle this?
   {
    MDFN_PrintError(_("Error closing \"%s\""), filename);
    return(0);