diff --git a/ChangeLog b/ChangeLog
index 082f25cca4..9111b18e1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+1998-10-19  Ulrich Drepper  <drepper@cygnus.com>
+
+	* sysdeps/unix/sysv/linux/i386/setresgid.c: Remove #include of
+	non-existing file with generic implementation.
+	* sysdeps/unix/sysv/linux/i386/setresuid.c: Likewise.
+
+1998-10-19  Philip Blundell  <pb@nexus.co.uk>
+
+	* iconv/gconv_db.c: Include ELF header only if STATIC_GCONV is not
+	defined.  Avoid using _CALL_DL_FCT if it is not defined.
+	* iconv/gconv.c: Likewise.
+
 1998-10-19  Ulrich Drepper  <drepper@cygnus.com>
 
 	* nscd/connections.c (dbs): Define defualt values for timeouts and
diff --git a/sysdeps/unix/sysv/linux/i386/setresgid.c b/sysdeps/unix/sysv/linux/i386/setresgid.c
index 82d967b39b..20256e1ebd 100644
--- a/sysdeps/unix/sysv/linux/i386/setresgid.c
+++ b/sysdeps/unix/sysv/linux/i386/setresgid.c
@@ -41,6 +41,4 @@ setresgid (gid_t rgid, gid_t egid, gid_t sgid)
 
   return __syscall_setresgid (rgid, egid, sgid);
 }
-#else
-# include <sysdeps/generic/setresgid.c>
 #endif
diff --git a/sysdeps/unix/sysv/linux/i386/setresuid.c b/sysdeps/unix/sysv/linux/i386/setresuid.c
index db8a44fb61..49b4f21378 100644
--- a/sysdeps/unix/sysv/linux/i386/setresuid.c
+++ b/sysdeps/unix/sysv/linux/i386/setresuid.c
@@ -42,6 +42,4 @@ __setresuid (gid_t ruid, gid_t euid, gid_t suid)
   return __syscall_setresuid (ruid, euid, suid);
 }
 weak_alias (__setresuid, setresuid)
-#else
-# include <sysdeps/generic/setresuid.c>
 #endif