--- Source/OpenGL_Windows.cpp.orig	2010-05-11 20:25:50.000000000 +0400
+++ Source/OpenGL_Windows.cpp	2010-05-12 03:50:02.000000000 +0400
@@ -24,8 +24,6 @@
 #include <vld.h>
 #endif
 
-#include "Game.h"
-
 #ifndef USE_DEVIL
 #  ifdef WIN32
 #    define USE_DEVIL
@@ -43,6 +41,7 @@
         #include "png.h"
         #include "jpeglib.h"
     }
+    #include "Game.h"
     static bool load_image(const char * fname, TGAImageRec & tex);
     static bool load_png(const char * fname, TGAImageRec & tex);
     static bool load_jpg(const char * fname, TGAImageRec & tex);
@@ -2681,7 +2680,7 @@
     png_init_io(png_ptr, fp);
     png_read_png(png_ptr, info_ptr,
                  PNG_TRANSFORM_STRIP_16 | PNG_TRANSFORM_PACKING,
-                 png_voidp_NULL);
+                 NULL);
     png_get_IHDR(png_ptr, info_ptr, &width, &height,
                  &bit_depth, &color_type, &interlace_type, NULL, NULL);
 
@@ -2731,7 +2730,7 @@
     retval = true;
 
 png_done:
-    png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
+    png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
     if (fp)
         fclose(fp);
     return (retval);