diff --git a/ChangeLog b/ChangeLog
index 12b04d0c74..5fcf34da4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
 2012-09-28  Roland McGrath  <roland@hack.frob.com>
 
-	* nss/nsswitch.c (nss_new_service): Conditionalize definition on
-	[!DO_STATIC_NSS || SHARED], matching its only caller.
+	* nss/nsswitch.c (nss_new_service): Conditionalize definition and
+	declaration on [!DO_STATIC_NSS || SHARED], matching its only caller.
+	(__nss_lookup_function): Conditionalize label remove_from_tree on
+	[!DO_STATIC_NSS || SHARED], matching its only use.
 
 2012-09-28  David S. Miller  <davem@davemloft.net>
 
diff --git a/nss/nsswitch.c b/nss/nsswitch.c
index 1379553abe..c0e3e1eb97 100644
--- a/nss/nsswitch.c
+++ b/nss/nsswitch.c
@@ -46,8 +46,10 @@ static name_database *nss_parse_file (const char *fname) internal_function;
 static name_database_entry *nss_getline (char *line) internal_function;
 static service_user *nss_parse_service_list (const char *line)
      internal_function;
+#if !defined DO_STATIC_NSS || defined SHARED
 static service_library *nss_new_service (name_database *database,
 					 const char *name) internal_function;
+#endif
 
 
 /* Declare external database variables.  */
@@ -433,7 +435,9 @@ __nss_lookup_function (service_user *ni, const char *fct_name)
       known_function *known = malloc (sizeof *known);
       if (! known)
 	{
+#if !defined DO_STATIC_NSS || defined SHARED
 	remove_from_tree:
+#endif
 	  /* Oops.  We can't instantiate this node properly.
 	     Remove it from the tree.  */
 	  __tdelete (&fct_name, &ni->known, &known_compare);