diff -urN mysql-workbench-oss-5.1.12.orig/ext/boost/mpl/apply.hpp mysql-workbench-oss-5.1.12/ext/boost/mpl/apply.hpp
--- mysql-workbench-oss-5.1.12.orig/ext/boost/mpl/apply.hpp	2009-04-23 19:00:52.000000000 +0300
+++ mysql-workbench-oss-5.1.12/ext/boost/mpl/apply.hpp	2009-06-04 22:27:17.777969438 +0300
@@ -135,7 +135,8 @@
 
 ///// iteration, depth == 1
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+#else
+#if BOOST_PP_ITERATION_DEPTH() == 1
 
 #   define i_ BOOST_PP_FRAME_ITERATION(1)
 
@@ -221,5 +222,5 @@
 #   endif // BOOST_MPL_CFG_NO_APPLY_TEMPLATE
 
 #   undef i_
-
+#endif
 #endif // BOOST_PP_IS_ITERATING
diff -urN mysql-workbench-oss-5.1.12.orig/ext/boost/mpl/apply_wrap.hpp mysql-workbench-oss-5.1.12/ext/boost/mpl/apply_wrap.hpp
--- mysql-workbench-oss-5.1.12.orig/ext/boost/mpl/apply_wrap.hpp	2009-04-23 19:00:52.000000000 +0300
+++ mysql-workbench-oss-5.1.12/ext/boost/mpl/apply_wrap.hpp	2009-06-04 22:27:51.521107378 +0300
@@ -78,7 +78,8 @@
 
 ///// iteration, depth == 1
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+#else
+#if BOOST_PP_ITERATION_DEPTH() == 1
 
 #   define i_ BOOST_PP_FRAME_ITERATION(1)
 
@@ -170,7 +171,8 @@
 
 ///// iteration, depth == 2
 
-#elif BOOST_PP_ITERATION_DEPTH() == 2
+#else
+#if BOOST_PP_ITERATION_DEPTH() == 2
 
 #   define j_ BOOST_PP_FRAME_ITERATION(2)
 
@@ -196,5 +198,6 @@
 };
 
 #   undef j_
-
+#endif
+#endif
 #endif // BOOST_PP_IS_ITERATING
diff -urN mysql-workbench-oss-5.1.12.orig/ext/boost/mpl/aux_/full_lambda.hpp mysql-workbench-oss-5.1.12/ext/boost/mpl/aux_/full_lambda.hpp
--- mysql-workbench-oss-5.1.12.orig/ext/boost/mpl/aux_/full_lambda.hpp	2009-04-23 19:00:52.000000000 +0300
+++ mysql-workbench-oss-5.1.12/ext/boost/mpl/aux_/full_lambda.hpp	2009-06-04 22:28:43.181126606 +0300
@@ -227,7 +227,8 @@
 
 ///// iteration, depth == 1
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+#else
+#if BOOST_PP_ITERATION_DEPTH() == 1
 #define i_ BOOST_PP_FRAME_ITERATION(1)
 
 #if i_ > 0
@@ -347,4 +348,5 @@
 };
 
 #undef i_
+#endif
 #endif // BOOST_PP_IS_ITERATING
diff -urN mysql-workbench-oss-5.1.12.orig/ext/boost/mpl/aux_/numeric_op.hpp mysql-workbench-oss-5.1.12/ext/boost/mpl/aux_/numeric_op.hpp
--- mysql-workbench-oss-5.1.12.orig/ext/boost/mpl/aux_/numeric_op.hpp	2009-04-23 19:00:52.000000000 +0300
+++ mysql-workbench-oss-5.1.12/ext/boost/mpl/aux_/numeric_op.hpp	2009-06-04 22:30:20.161801940 +0300
@@ -287,7 +287,8 @@
 
 ///// iteration, depth == 1
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+#else
+#if BOOST_PP_ITERATION_DEPTH() == 1
 
 #   define i_ BOOST_PP_FRAME_ITERATION(1)
 
@@ -307,5 +308,5 @@
 #endif
 
 #   undef i_
-
+#endif
 #endif // BOOST_PP_IS_ITERATING
diff -urN mysql-workbench-oss-5.1.12.orig/ext/boost/mpl/bind.hpp mysql-workbench-oss-5.1.12/ext/boost/mpl/bind.hpp
--- mysql-workbench-oss-5.1.12.orig/ext/boost/mpl/bind.hpp	2009-04-23 19:00:52.000000000 +0300
+++ mysql-workbench-oss-5.1.12/ext/boost/mpl/bind.hpp	2009-06-04 22:32:05.855243782 +0300
@@ -361,7 +361,8 @@
 
 ///// iteration, depth == 1
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+#else
+#if BOOST_PP_ITERATION_DEPTH() == 1
 
 #   define i_ BOOST_PP_FRAME_ITERATION(1)
 
@@ -528,7 +529,8 @@
 
 ///// iteration, depth == 2
 
-#elif BOOST_PP_ITERATION_DEPTH() == 2
+#else
+#if BOOST_PP_ITERATION_DEPTH() == 2
 
 #   define j_ BOOST_PP_FRAME_ITERATION(2)
 #   if !defined(BOOST_MPL_CFG_NO_UNNAMED_PLACEHOLDER_SUPPORT)
@@ -543,5 +545,6 @@
 
 #   endif
 #   undef j_
-
+#endif
+#endif
 #endif // BOOST_PP_IS_ITERATING
diff -urN mysql-workbench-oss-5.1.12.orig/ext/cppconn/driver/mysql_art_resultset.cpp mysql-workbench-oss-5.1.12/ext/cppconn/driver/mysql_art_resultset.cpp
--- mysql-workbench-oss-5.1.12.orig/ext/cppconn/driver/mysql_art_resultset.cpp	2009-04-23 19:00:53.000000000 +0300
+++ mysql-workbench-oss-5.1.12/ext/cppconn/driver/mysql_art_resultset.cpp	2009-06-04 22:23:06.751993650 +0300
@@ -16,6 +16,7 @@
 
 #include <cppconn/exception.h>
 #include <sstream>
+#include <cstdio>
 #include <math.h>
 
 
diff -urN mysql-workbench-oss-5.1.12.orig/ext/cppconn/driver/mysql_resultbind.cpp mysql-workbench-oss-5.1.12/ext/cppconn/driver/mysql_resultbind.cpp
--- mysql-workbench-oss-5.1.12.orig/ext/cppconn/driver/mysql_resultbind.cpp	2009-04-23 19:00:53.000000000 +0300
+++ mysql-workbench-oss-5.1.12/ext/cppconn/driver/mysql_resultbind.cpp	2009-06-04 22:23:06.755298749 +0300
@@ -14,6 +14,7 @@
 #include "mysql_resultbind.h"
 
 #include <string.h>
+#include <cstdio>
 
 namespace sql
 {
diff -urN mysql-workbench-oss-5.1.12.orig/library/canvas/src/mdc_common.h mysql-workbench-oss-5.1.12/library/canvas/src/mdc_common.h
--- mysql-workbench-oss-5.1.12.orig/library/canvas/src/mdc_common.h	2009-04-23 19:00:55.000000000 +0300
+++ mysql-workbench-oss-5.1.12/library/canvas/src/mdc_common.h	2009-06-04 22:23:06.755298749 +0300
@@ -27,6 +27,7 @@
 #endif
 #endif
 
+#include <cstdio>
 
 #include "mdc_canvas_public.h"
 
diff -urN mysql-workbench-oss-5.1.12.orig/library/forms/filechooser.cpp mysql-workbench-oss-5.1.12/library/forms/filechooser.cpp
--- mysql-workbench-oss-5.1.12.orig/library/forms/filechooser.cpp	2009-04-23 19:00:55.000000000 +0300
+++ mysql-workbench-oss-5.1.12/library/forms/filechooser.cpp	2009-06-04 22:23:06.755298749 +0300
@@ -1,6 +1,8 @@
 
 #include "stdafx.h"
 
+#include <cstdio>
+
 #include <mforms/mforms.h>
 
 
diff -urN mysql-workbench-oss-5.1.12.orig/library/forms/mforms.cpp mysql-workbench-oss-5.1.12/library/forms/mforms.cpp
--- mysql-workbench-oss-5.1.12.orig/library/forms/mforms.cpp	2009-04-23 19:00:55.000000000 +0300
+++ mysql-workbench-oss-5.1.12/library/forms/mforms.cpp	2009-06-04 22:23:06.755298749 +0300
@@ -3,7 +3,7 @@
 #include <string.h>
 #include "mforms/mforms.h"
 #include "mforms/simpleform.h"
-
+#include <cstdio>
 using namespace mforms;
 
 ControlFactory *ControlFactory::get_instance()