--- include/my_global.h	2006-06-30 13:39:13.000000000 +0200
+++ include/my_global.h-21749	2006-08-21 14:57:26.000000000 +0200
@@ -70,6 +70,8 @@
 #define C_MODE_END
 #endif
 
+#ifndef VERSION
+/* "my_config.h" will always define "VERSION", so this is the double-inclusion guard */
 #if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(WIN32)
 #include <config-win.h>
 #elif defined(OS2)
@@ -86,6 +88,7 @@
 #undef inline				/* fix configure problem */
 #endif
 #endif /* _WIN32... */
+#endif /* VERSION */
 
 /* Some defines to avoid ifdefs in the code */
 #ifndef NETWARE_YIELD
--- mysys/thr_alarm.c	2006-01-19 10:10:41.000000000 +0100
+++ mysys/thr_alarm.c-21749	2006-08-21 14:58:04.000000000 +0200
@@ -14,9 +14,30 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+/* This comes from "my_global.h" */
+#if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(WIN32)
+#include <config-win.h>
+#elif defined(OS2)
+#include <config-os2.h>
+#elif defined(__NETWARE__)
+#include <my_config.h>
+#include <config-netware.h>
+#if defined(__cplusplus) && defined(inline)
+#undef inline				/* fix configure problem */
+#endif
+#else
+#include <my_config.h>
+#if defined(__cplusplus) && defined(inline)
+#undef inline				/* fix configure problem */
+#endif
+#endif /* _WIN32... */
+
 /* To avoid problems with alarms in debug code, we disable DBUG here */
-#undef DBUG_OFF
+/* "my_config.h" will always define one of "DBUG_ON" or "DBUG_OFF" */
+#ifdef DBUG_ON
+#undef DBUG_ON
 #define DBUG_OFF
+#endif
 #include <my_global.h>
 
 #if defined(THREAD) && !defined(DONT_USE_THR_ALARM)
--- mysys/thr_lock.c	2006-06-27 17:13:26.000000000 +0200
+++ mysys/thr_lock.c-21749	2006-08-21 14:58:23.000000000 +0200
@@ -71,6 +71,24 @@
 
 */
 
+/* This comes from "my_global.h" */
+#if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(WIN32)
+#include <config-win.h>
+#elif defined(OS2)
+#include <config-os2.h>
+#elif defined(__NETWARE__)
+#include <my_config.h>
+#include <config-netware.h>
+#if defined(__cplusplus) && defined(inline)
+#undef inline				/* fix configure problem */
+#endif
+#else
+#include <my_config.h>
+#if defined(__cplusplus) && defined(inline)
+#undef inline				/* fix configure problem */
+#endif
+#endif /* _WIN32... */
+
 #if !defined(MAIN) && !defined(DBUG_OFF) && !defined(EXTRA_DEBUG)
 #define DBUG_OFF
 #endif