diff --git a/ChangeLog b/ChangeLog
index d35da0a673..5c0634e52a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-04  Andreas Jaeger  <aj@suse.de>
+
+	* nss/nsswitch.c: Include files for missing prototypes, remove
+	buggy declaration of prototypes.
+
 2001-01-03  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>
 
 	* resolv/Versions: Fix bracing.
diff --git a/nss/nsswitch.c b/nss/nsswitch.c
index b9e283eefb..f77828db6b 100644
--- a/nss/nsswitch.c
+++ b/nss/nsswitch.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1996,1997,1998,1999,2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -27,6 +27,12 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <aliases.h>
+#include <grp.h>
+#include <netinet/ether.h>
+#include <pwd.h>
+#include <shadow.h>
+
 #if !defined DO_STATIC_NSS || defined SHARED
 # include <gnu/lib-names.h>
 #endif
@@ -361,18 +367,6 @@ __nss_lookup_function (service_user *ni, const char *fct_name)
 #else
 	  /* We can't get function address dynamically in static linking. */
 	  {
-# define DEFINE_ENT(h,nm)						      \
-	    extern void _nss_##h##_get##nm##ent_r (void);		      \
-	    extern void _nss_##h##_end##nm##ent (void);			      \
-	    extern void _nss_##h##_set##nm##ent (void);
-# define DEFINE_GET(h,nm)						      \
-	    extern void _nss_##h##_get##nm##_r (void);
-# define DEFINE_GETBY(h,nm,ky)						      \
-	    extern void _nss_##h##_get##nm##by##ky##_r (void);
-# include "function.def"
-# undef DEFINE_ENT
-# undef DEFINE_GET
-# undef DEFINE_GETBY
 # define DEFINE_ENT(h,nm)						      \
 	    { #h"_get"#nm"ent_r", _nss_##h##_get##nm##ent_r },		      \
 	    { #h"_end"#nm"ent", _nss_##h##_end##nm##ent },		      \