diff --git a/ChangeLog b/ChangeLog
index 2b486b19a6..ccdc1c8614 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-10-01  H.J. Lu  <hongjiu.lu@intel.com>
+
+	[BZ #18822]
+	* include/search.h (__tdestroy): Add libc_hidden_proto.
+	* misc/tsearch.c (__tdestroy): Add libc_hidden_def.
+
 2017-10-01  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #18822]
diff --git a/include/search.h b/include/search.h
index a941959dbe..e17693022d 100644
--- a/include/search.h
+++ b/include/search.h
@@ -24,5 +24,6 @@ libc_hidden_proto (__tdelete)
 extern void __twalk (const void *__root, __action_fn_t action);
 libc_hidden_proto (__twalk)
 extern void __tdestroy (void *__root, __free_fn_t freefct);
+libc_hidden_proto (__tdestroy)
 #endif
 #endif
diff --git a/misc/tsearch.c b/misc/tsearch.c
index aef9c7c1ee..cdc401a4e5 100644
--- a/misc/tsearch.c
+++ b/misc/tsearch.c
@@ -745,4 +745,5 @@ __tdestroy (void *vroot, __free_fn_t freefct)
   if (root != NULL)
     tdestroy_recurse (root, freefct);
 }
+libc_hidden_def (__tdestroy)
 weak_alias (__tdestroy, tdestroy)