diff --git a/ChangeLog b/ChangeLog
index 95dde172..3323e40a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 1999-02-19  Martin Baulig  <martin@home-of-linux.org>
 
+	* include/glibtop/error.h: Don't include <glib.h>.
+	* sysdeps/common/error.c: Use `int' not `gint'.
+
+	* src/daemon/Makefile.am (libgtop_server_SOURCES): Don't use
+	`@INTLLIBS@' for the server.
+
 	* misc/porting-libgtop.txt: Added a few instructions on how
 	to port LibGTop to Solaris.
 
diff --git a/include/glibtop/error.h b/include/glibtop/error.h
index 724b07bf..d12016e6 100644
--- a/include/glibtop/error.h
+++ b/include/glibtop/error.h
@@ -23,15 +23,14 @@
 #define __GLIBTOP_ERROR_H__
 
 #include <glibtop.h>
-#include <glib.h>
 
 BEGIN_LIBGTOP_DECLS
 
 void glibtop_error_vr (glibtop *server, char *format, va_list args);
 void glibtop_warn_vr (glibtop *server, char *format, va_list args);
 
-void glibtop_error_io_vr (glibtop *server, char *format, gint, va_list args);
-void glibtop_warn_io_vr (glibtop *server, char *format, gint, 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
 glibtop_error_r (glibtop *server, char *format, ...)
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index 13a79936..e63b4514 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -41,7 +41,7 @@ libgtop_daemon_LDADD		= $(top_builddir)/lib/libgtop.la \
 libgtop_server_SOURCES		= server.c slave.c io.c version.c daemon.h
 libgtop_server_LDADD		= $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la \
 				  $(top_builddir)/sysdeps/common/libgtop_suid_common.la \
-				  @LIBSUPPORT@ @INTLLIBS@
+				  @LIBSUPPORT@
 
 EXTRA_DIST			= server_config.h.in server_config.pl
 
diff --git a/sysdeps/common/error.c b/sysdeps/common/error.c
index f967c2ea..07d093f5 100644
--- a/sysdeps/common/error.c
+++ b/sysdeps/common/error.c
@@ -48,7 +48,7 @@ glibtop_error_vr (glibtop *server, char *format, va_list args)
 }
 
 void
-glibtop_error_io_vr (glibtop *server, char *format, gint error, va_list args)
+glibtop_error_io_vr (glibtop *server, char *format, int error, va_list args)
 {
 	print_server_name (server);
 	vfprintf (stderr, format, args);
@@ -74,7 +74,7 @@ glibtop_warn_vr (glibtop *server, char *format, va_list args)
 }
 
 void
-glibtop_warn_io_vr (glibtop *server, char *format, gint error, va_list args)
+glibtop_warn_io_vr (glibtop *server, char *format, int error, va_list args)
 {
 	print_server_name (server);
 	vfprintf (stderr, format, args);