diff --git a/ChangeLog b/ChangeLog
index 7c81dd46..349a4f48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2000-02-24  Martin Baulig  <martin@home-of-linux.org>
+
+	* include/glibtop/error.h (glibtop_error_r, glibtop_warn_r): Moved
+	to sysdeps/common/error.c.
+	(glibtop_error_io_r, glibtop_warn_io_r): Likewise.
+	(glibtop_error, glibtop_warn): Moved the non-GNU-C version of them
+	to sysdeps/common/error.c.
+	(glibtop_error_io, glibtop_warn_io): Likewise.
+
+	* sysdeps/common/error.c (glibtop_error_r, glibtop_warn_r): Moved
+	here from include/glibtop/error.h.
+	(glibtop_error_io_r, glibtop_warn_io_r): Likewise.
+	(glibtop_error, glibtop_warn): Moved the non-GNU-C version of them
+	here from include/glibtop/error.h.
+	(glibtop_error_io, glibtop_warn_io): Likewise.
+
 2000-02-23  Martin Baulig  <martin@home-of-linux.org>
 
 	* autogen.sh: Call it "GNOME Portable System Access Library".
diff --git a/include/glibtop/error.h b/include/glibtop/error.h
index a168aee9..c0de8b6f 100644
--- a/include/glibtop/error.h
+++ b/include/glibtop/error.h
@@ -45,45 +45,10 @@ void glibtop_warn_vr (glibtop *server, char *format, va_list args);
 void glibtop_error_io_vr (glibtop *server, char *format, int, va_list args);
 void glibtop_warn_io_vr (glibtop *server, char *format, int, va_list args);
 
-static 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);
-}
-
-static 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);
-}
-
-static 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);
-}
-
-static 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);
-}
+void glibtop_error_r (glibtop *server, char *format, ...);
+void glibtop_warn_r (glibtop *server, char *format, ...);
+void glibtop_error_io_r (glibtop *server, char *format, ...);
+void glibtop_warn_io_r (glibtop *server, char *format, ...);
 
 #ifdef  __GNUC__
 
@@ -95,41 +60,10 @@ glibtop_warn_io_r (glibtop *server, char *format, ...)
 
 #else /* no __GNUC__ */
 
-static void
-glibtop_error (char *format, ...)
-{
-    va_list args;
-    va_start (args, format);
-    glibtop_error_vr (glibtop_global_server, format, args);
-    va_end (args);
-}
-
-static void
-glibtop_warn (char *format, ...)
-{
-    va_list args;
-    va_start (args, format);
-    glibtop_warn_vr (glibtop_global_server, format, args);
-    va_end (args);
-}
-
-static 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);
-}
-
-static 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);
-}
+void glibtop_error (char *format, ...);
+void glibtop_warn (char *format, ...);
+void glibtop_error_io (char *format, ...);
+void glibtop_warn_io (char *format, ...);
 
 #endif /* no __GNUC__ */
 
diff --git a/sysdeps/common/error.c b/sysdeps/common/error.c
index cf6719e8..ae80c705 100644
--- a/sysdeps/common/error.c
+++ b/sysdeps/common/error.c
@@ -88,3 +88,83 @@ glibtop_warn_io_vr (glibtop *server, char *format, int error, va_list args)
     abort ();
 #endif
 }
+
+void
+glibtop_error_r (glibtop *server, char *format, ...)
+{
+    va_list args;
+
+    va_start (args, format);
+    glibtop_error_vr (server, format, args);
+    va_end (args);
+}
+
+void
+glibtop_warn_r (glibtop *server, char *format, ...)
+{
+    va_list args;
+
+    va_start (args, format);
+    glibtop_warn_vr (server, format, args);
+    va_end (args);
+}
+
+void
+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
+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__
+
+static void
+glibtop_error (char *format, ...)
+{
+    va_list args;
+    va_start (args, format);
+    glibtop_error_vr (glibtop_global_server, format, args);
+    va_end (args);
+}
+
+static void
+glibtop_warn (char *format, ...)
+{
+    va_list args;
+    va_start (args, format);
+    glibtop_warn_vr (glibtop_global_server, format, args);
+    va_end (args);
+}
+
+static 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);
+}
+
+static 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 /* no __GNUC__ */