diff --git a/sysdeps/common/ChangeLog b/sysdeps/common/ChangeLog
index bc3dcf39..9b6bac04 100644
--- a/sysdeps/common/ChangeLog
+++ b/sysdeps/common/ChangeLog
@@ -1,3 +1,10 @@
+2004-06-18  Benoît Dejean  <tazforever@dlfp.org>
+
+	* error.c: (print_server_name), (glibtop_error_r),
+	(glibtop_warn_r), (glibtop_error_io_r), (glibtop_warn_io_r),
+	(glibtop_error), (glibtop_warn), (glibtop_error_io),
+	(glibtop_warn_io): These functions are now globally defined.
+
 2004-06-12  Benoît Dejean  <tazforever@dlfp.org>
 
 	* Makefile.am:
diff --git a/sysdeps/common/error.c b/sysdeps/common/error.c
index 9936dcd4..65640ce7 100644
--- a/sysdeps/common/error.c
+++ b/sysdeps/common/error.c
@@ -28,7 +28,7 @@
 /* Prints error message and exits. */
 
 static void
-print_server_name (glibtop *server)
+print_server_name (const glibtop *server)
 {
 	fprintf (stderr, "%s: ", server ?
 		 (server->name ? server->name : DEFAULT_NAME)
@@ -86,3 +86,85 @@ glibtop_warn_io_vr (glibtop *server, char *format, int error, va_list args)
 	abort ();
 #endif
 }
+
+
+void G_GNUC_UNUSED
+glibtop_error_r (glibtop *server, char *format, ...)
+{
+	va_list args;
+
+	va_start (args, format);
+	glibtop_error_vr (server, format, args);
+	va_end (args);
+}
+
+
+void G_GNUC_UNUSED
+glibtop_warn_r (glibtop *server, char *format, ...)
+{
+	va_list args;
+
+	va_start (args, format);
+	glibtop_warn_vr (server, format, args);
+	va_end (args);
+}
+
+void G_GNUC_UNUSED
+glibtop_error_io_r (glibtop *server, char *format, ...)
+{
+	va_list args;
+
+	va_start (args, format);
+	glibtop_error_io_vr (server, format, errno, args);
+	va_end (args);
+}
+
+void G_GNUC_UNUSED
+glibtop_warn_io_r (glibtop *server, char *format, ...)
+{
+	va_list args;
+
+	va_start (args, format);
+	glibtop_warn_io_vr (server, format, errno, args);
+	va_end (args);
+}
+
+#ifndef __GNUC__
+
+void
+glibtop_error (char *format, ...)
+{
+	va_list args;
+	va_start (args, format);
+	glibtop_error_vr (glibtop_global_server, format, args);
+	va_end (args);
+}
+
+void
+glibtop_warn (char *format, ...)
+{
+	va_list args;
+	va_start (args, format);
+	glibtop_warn_vr (glibtop_global_server, format, args);
+	va_end (args);
+}
+
+void
+glibtop_error_io (char *format, ...)
+{
+	va_list args;
+	va_start (args, format);
+	glibtop_error_io_vr (glibtop_global_server, format, errno, args);
+	va_end (args);
+}
+
+void
+glibtop_warn_io (char *format, ...)
+{
+	va_list args;
+	va_start (args, format);
+	glibtop_warn_io_vr (glibtop_global_server, format, errno, args);
+	va_end (args);
+}
+
+#endif /* __GNUC__ */