diff --git a/ChangeLog b/ChangeLog
index 5edddea0a..f34491be1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1999-10-05  Tor Lillqvist  <tml@iki.fi>
+
+	* glibconfig.h.win32.in: Don't define WIN32 and NATIVE_WIN32.
+
+	* gerror.c (g_on_error_query): (Win32) Slightly more verbosity.
+
+	* build-dll: Don't strip.
+
 Sun Oct  3 19:46:55 PDT 1999 Manish Singh <yosh@gimp.org>
 
 	* configure.in: use G_HAVE_CYGWIN instead of G_OS_FEATURE_CYGWIN
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 5edddea0a..f34491be1 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+1999-10-05  Tor Lillqvist  <tml@iki.fi>
+
+	* glibconfig.h.win32.in: Don't define WIN32 and NATIVE_WIN32.
+
+	* gerror.c (g_on_error_query): (Win32) Slightly more verbosity.
+
+	* build-dll: Don't strip.
+
 Sun Oct  3 19:46:55 PDT 1999 Manish Singh <yosh@gimp.org>
 
 	* configure.in: use G_HAVE_CYGWIN instead of G_OS_FEATURE_CYGWIN
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5edddea0a..f34491be1 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+1999-10-05  Tor Lillqvist  <tml@iki.fi>
+
+	* glibconfig.h.win32.in: Don't define WIN32 and NATIVE_WIN32.
+
+	* gerror.c (g_on_error_query): (Win32) Slightly more verbosity.
+
+	* build-dll: Don't strip.
+
 Sun Oct  3 19:46:55 PDT 1999 Manish Singh <yosh@gimp.org>
 
 	* configure.in: use G_HAVE_CYGWIN instead of G_OS_FEATURE_CYGWIN
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 5edddea0a..f34491be1 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,11 @@
+1999-10-05  Tor Lillqvist  <tml@iki.fi>
+
+	* glibconfig.h.win32.in: Don't define WIN32 and NATIVE_WIN32.
+
+	* gerror.c (g_on_error_query): (Win32) Slightly more verbosity.
+
+	* build-dll: Don't strip.
+
 Sun Oct  3 19:46:55 PDT 1999 Manish Singh <yosh@gimp.org>
 
 	* configure.in: use G_HAVE_CYGWIN instead of G_OS_FEATURE_CYGWIN
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 5edddea0a..f34491be1 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+1999-10-05  Tor Lillqvist  <tml@iki.fi>
+
+	* glibconfig.h.win32.in: Don't define WIN32 and NATIVE_WIN32.
+
+	* gerror.c (g_on_error_query): (Win32) Slightly more verbosity.
+
+	* build-dll: Don't strip.
+
 Sun Oct  3 19:46:55 PDT 1999 Manish Singh <yosh@gimp.org>
 
 	* configure.in: use G_HAVE_CYGWIN instead of G_OS_FEATURE_CYGWIN
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 5edddea0a..f34491be1 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+1999-10-05  Tor Lillqvist  <tml@iki.fi>
+
+	* glibconfig.h.win32.in: Don't define WIN32 and NATIVE_WIN32.
+
+	* gerror.c (g_on_error_query): (Win32) Slightly more verbosity.
+
+	* build-dll: Don't strip.
+
 Sun Oct  3 19:46:55 PDT 1999 Manish Singh <yosh@gimp.org>
 
 	* configure.in: use G_HAVE_CYGWIN instead of G_OS_FEATURE_CYGWIN
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5edddea0a..f34491be1 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+1999-10-05  Tor Lillqvist  <tml@iki.fi>
+
+	* glibconfig.h.win32.in: Don't define WIN32 and NATIVE_WIN32.
+
+	* gerror.c (g_on_error_query): (Win32) Slightly more verbosity.
+
+	* build-dll: Don't strip.
+
 Sun Oct  3 19:46:55 PDT 1999 Manish Singh <yosh@gimp.org>
 
 	* configure.in: use G_HAVE_CYGWIN instead of G_OS_FEATURE_CYGWIN
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5edddea0a..f34491be1 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+1999-10-05  Tor Lillqvist  <tml@iki.fi>
+
+	* glibconfig.h.win32.in: Don't define WIN32 and NATIVE_WIN32.
+
+	* gerror.c (g_on_error_query): (Win32) Slightly more verbosity.
+
+	* build-dll: Don't strip.
+
 Sun Oct  3 19:46:55 PDT 1999 Manish Singh <yosh@gimp.org>
 
 	* configure.in: use G_HAVE_CYGWIN instead of G_OS_FEATURE_CYGWIN
diff --git a/build-dll b/build-dll
index ef3aa73b5..b29a50dbc 100644
--- a/build-dll
+++ b/build-dll
@@ -29,9 +29,9 @@ for F in $ldargs; do
     esac
 done
 
-$GCC -s -mdll -mno-cygwin -Wl,--base-file,$library.base -o $dllfile $ldargs &&
+$GCC -mdll -mno-cygwin -Wl,--base-file,$library.base -o $dllfile $ldargs &&
 $DLLTOOL --as=$AS --dllname $dllfile $defswitch --base-file $library.base --output-exp $library.exp $objs &&
-$GCC -s -mdll -mno-cygwin -Wl,--base-file,$library.base,$library.exp -o $dllfile $ldargs &&
+$GCC -mdll -mno-cygwin -Wl,--base-file,$library.base,$library.exp -o $dllfile $ldargs &&
 $DLLTOOL --as=$AS --dllname $dllfile $defswitch --base-file $library.base --output-exp $library.exp $objs &&
 $GCC -mdll -mno-cygwin -Wl,$library.exp -o $dllfile $ldargs &&
 $DLLTOOL --as=$AS --dllname $dllfile $defswitch --output-lib lib$libname.a $objs
diff --git a/gbacktrace.c b/gbacktrace.c
index 89118d422..7fa77687c 100644
--- a/gbacktrace.c
+++ b/gbacktrace.c
@@ -143,7 +143,7 @@ g_on_error_query (const gchar *prg_name)
   if (!prg_name)
     prg_name = g_get_prgname ();
   
-  MessageBox (NULL, "Terminating",
+  MessageBox (NULL, "g_on_error_query called, program terminating",
 	      (prg_name && *prg_name) ? prg_name : NULL,
 	      MB_OK|MB_ICONERROR);
   _exit(0);
diff --git a/gerror.c b/gerror.c
index 89118d422..7fa77687c 100644
--- a/gerror.c
+++ b/gerror.c
@@ -143,7 +143,7 @@ g_on_error_query (const gchar *prg_name)
   if (!prg_name)
     prg_name = g_get_prgname ();
   
-  MessageBox (NULL, "Terminating",
+  MessageBox (NULL, "g_on_error_query called, program terminating",
 	      (prg_name && *prg_name) ? prg_name : NULL,
 	      MB_OK|MB_ICONERROR);
   _exit(0);
diff --git a/glib/gbacktrace.c b/glib/gbacktrace.c
index 89118d422..7fa77687c 100644
--- a/glib/gbacktrace.c
+++ b/glib/gbacktrace.c
@@ -143,7 +143,7 @@ g_on_error_query (const gchar *prg_name)
   if (!prg_name)
     prg_name = g_get_prgname ();
   
-  MessageBox (NULL, "Terminating",
+  MessageBox (NULL, "g_on_error_query called, program terminating",
 	      (prg_name && *prg_name) ? prg_name : NULL,
 	      MB_OK|MB_ICONERROR);
   _exit(0);
diff --git a/glib/gerror.c b/glib/gerror.c
index 89118d422..7fa77687c 100644
--- a/glib/gerror.c
+++ b/glib/gerror.c
@@ -143,7 +143,7 @@ g_on_error_query (const gchar *prg_name)
   if (!prg_name)
     prg_name = g_get_prgname ();
   
-  MessageBox (NULL, "Terminating",
+  MessageBox (NULL, "g_on_error_query called, program terminating",
 	      (prg_name && *prg_name) ? prg_name : NULL,
 	      MB_OK|MB_ICONERROR);
   _exit(0);
diff --git a/glibconfig.h.win32.in b/glibconfig.h.win32.in
index e87aae479..805e731ef 100644
--- a/glibconfig.h.win32.in
+++ b/glibconfig.h.win32.in
@@ -185,12 +185,6 @@ struct _GStaticMutex
 #define G_HAVE_WCHAR_H 1
 #define G_HAVE_WCTYPE_H 1
 
-/* Define if this is Win32, possibly using the Cygwin emulation layer. */
-#define WIN32 1
-
-/* Define if this is Win32 using the Microsoft C runtime.  */
-#define NATIVE_WIN32 1
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog
index 003914627..26ba0ea80 100644
--- a/gmodule/ChangeLog
+++ b/gmodule/ChangeLog
@@ -1,3 +1,8 @@
+1999-10-05  Tor Lillqvist  <tml@iki.fi>
+
+	* gmodule.h: (Win32) Use __declspec(dllexport) in G_MODULE_EXPORT
+	only with gcc.
+
 Sun Oct  3 19:30:52 PDT 1999 Manish Singh <yosh@gimp.org>
 
 	* gmodule.h
diff --git a/gmodule/gmodule.h b/gmodule/gmodule.h
index f4914013a..536a3c691 100644
--- a/gmodule/gmodule.h
+++ b/gmodule/gmodule.h
@@ -40,7 +40,7 @@ extern const char      *g_log_domain_gmodule;
  * to feature Windows dll stubs.
  */
 #define	G_MODULE_IMPORT		extern
-#ifdef G_OS_WIN32
+#if defined (G_OS_WIN32) && defined (__GNUC__)
 #  define	G_MODULE_EXPORT		__declspec(dllexport)
 #else /* !G_OS_WIN32 */
 #  define	G_MODULE_EXPORT