diff --git a/bin_win32/SDL.dll b/bin_win32/SDL.dll
index a5da7bbd..3ce97a59 100755
Binary files a/bin_win32/SDL.dll and b/bin_win32/SDL.dll differ
diff --git a/bin_win32/SDL_image.dll b/bin_win32/SDL_image.dll
index c536a5b2..4a97c3af 100755
Binary files a/bin_win32/SDL_image.dll and b/bin_win32/SDL_image.dll differ
diff --git a/source/include/SDL_image.h b/source/include/SDL_image.h
index 7bc332c3..7a474878 100755
--- a/source/include/SDL_image.h
+++ b/source/include/SDL_image.h
@@ -38,7 +38,7 @@ extern "C" {
 */
 #define SDL_IMAGE_MAJOR_VERSION	1
 #define SDL_IMAGE_MINOR_VERSION	2
-#define SDL_IMAGE_PATCHLEVEL	6
+#define SDL_IMAGE_PATCHLEVEL	7
 
 /* This macro can be used to fill a version structure with the compile-time
  * version of the SDL_image library.
diff --git a/source/include/SDL_mixer.h b/source/include/SDL_mixer.h
index e2c1aca0..cf0a095b 100755
--- a/source/include/SDL_mixer.h
+++ b/source/include/SDL_mixer.h
@@ -20,7 +20,7 @@
     slouken@libsdl.org
 */
 
-/* $Id: SDL_mixer.h,v 1.3 2007-08-13 06:40:34 eihrul Exp $ */
+/* $Id: SDL_mixer.h,v 1.2 2007/08/12 09:32:55 eihrul Exp $ */
 
 #ifndef _SDL_MIXER_H
 #define _SDL_MIXER_H
diff --git a/source/include/SDL_mouse.h b/source/include/SDL_mouse.h
index c2364d85..019497fb 100755
--- a/source/include/SDL_mouse.h
+++ b/source/include/SDL_mouse.h
@@ -122,9 +122,13 @@ extern DECLSPEC int SDLCALL SDL_ShowCursor(int toggle);
 #define SDL_BUTTON_RIGHT	3
 #define SDL_BUTTON_WHEELUP	4
 #define SDL_BUTTON_WHEELDOWN	5
+#define SDL_BUTTON_X1		6
+#define SDL_BUTTON_X2		7
 #define SDL_BUTTON_LMASK	SDL_BUTTON(SDL_BUTTON_LEFT)
 #define SDL_BUTTON_MMASK	SDL_BUTTON(SDL_BUTTON_MIDDLE)
 #define SDL_BUTTON_RMASK	SDL_BUTTON(SDL_BUTTON_RIGHT)
+#define SDL_BUTTON_X1MASK	SDL_BUTTON(SDL_BUTTON_X1)
+#define SDL_BUTTON_X2MASK	SDL_BUTTON(SDL_BUTTON_X2)
 
 
 /* Ends C function definitions when using C++ */
diff --git a/source/include/SDL_stdinc.h b/source/include/SDL_stdinc.h
index 891a9ac8..e47c21da 100644
--- a/source/include/SDL_stdinc.h
+++ b/source/include/SDL_stdinc.h
@@ -174,6 +174,8 @@ extern DECLSPEC void SDLCALL SDL_free(void *mem);
 #  define alloca _alloca
 # elif defined(__WATCOMC__)
 #  include <malloc.h>
+# elif defined(__BORLANDC__)
+#  include <malloc.h>
 # elif defined(__DMC__)
 #  include <stdlib.h>
 # elif defined(__AIX__)
diff --git a/source/include/SDL_version.h b/source/include/SDL_version.h
index 610ffe67..9ff0fa8a 100755
--- a/source/include/SDL_version.h
+++ b/source/include/SDL_version.h
@@ -37,7 +37,7 @@ extern "C" {
 */
 #define SDL_MAJOR_VERSION	1
 #define SDL_MINOR_VERSION	2
-#define SDL_PATCHLEVEL		12
+#define SDL_PATCHLEVEL		13
 
 typedef struct SDL_version {
 	Uint8 major;
diff --git a/source/include/begin_code.h b/source/include/begin_code.h
index b03787f4..d1ddaa6a 100755
--- a/source/include/begin_code.h
+++ b/source/include/begin_code.h
@@ -90,8 +90,8 @@
 #elif !defined(__WINS__)
 #undef DECLSPEC
 #define DECLSPEC __declspec(dllexport)
-#endif //EKA2
-#endif //__SYMBIAN32__
+#endif /* !EKA2 */
+#endif /* __SYMBIAN32__ */
 
 /* Force structure packing at 4 byte alignment.
    This is necessary if the header is included in code which has structure
diff --git a/source/include/zconf.h b/source/include/zconf.h
index 80b7c21a..e13acd10 100755
--- a/source/include/zconf.h
+++ b/source/include/zconf.h
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-/* @(#) $Id: zconf.h,v 1.3 2007-08-13 06:40:34 eihrul Exp $ */
+/* @(#) $Id: zconf.h,v 1.2 2006/09/11 19:19:13 aardappel Exp $ */
 
 #ifndef ZCONF_H
 #define ZCONF_H
diff --git a/source/lib/SDL_image.lib b/source/lib/SDL_image.lib
index 50b46768..a0cecc88 100755
Binary files a/source/lib/SDL_image.lib and b/source/lib/SDL_image.lib differ
diff --git a/source/lib/SDLmain.lib b/source/lib/SDLmain.lib
index 1a88abe1..13bf9f97 100755
Binary files a/source/lib/SDLmain.lib and b/source/lib/SDLmain.lib differ