diff --git a/compat/tfind.c b/compat/tfind.c
index 87fcefe874..7963085fb8 100644
--- a/compat/tfind.c
+++ b/compat/tfind.c
@@ -6,9 +6,6 @@
 # include <config.h>
 #endif
 
-/** search.h is not present so every t* functions has to be implemented */
-#ifndef HAVE_SEARCH_H
-
 #include <assert.h>
 #include <stdlib.h>
 
@@ -240,5 +237,3 @@ twalk(const void *vroot, cmp_fn_t action) /* Root of the tree to be walked */
 	if (vroot != NULL && action != NULL)
 		trecurse(vroot, action, 0);
 }
-
-#endif // HAVE_SEARCH_H
diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index 546f83d501..41933e8601 100644
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -481,7 +481,7 @@ ssize_t sendmsg(int, const struct msghdr *, int);
 #endif
 
 /* search.h */
-#ifndef HAVE_SEARCH_H
+#ifndef HAVE_TFIND
 typedef enum {
     preorder,
     postorder,
@@ -498,7 +498,7 @@ void twalk( const void *root, void(*action)(const void *nodep, VISIT which, int
 void *lfind( const void *key, const void *base, size_t *nmemb,
              size_t size, int(*cmp)(const void *, const void *) );
 #endif
-#endif /* HAVE_SEARCH_H */
+#endif /* HAVE_TFIND */
 
 #ifndef HAVE_TDESTROY
 void tdestroy( void *root, void (*free_node)(void *nodep) );