Index: head/lib/libc/gen/scandir.c
===================================================================
--- head/lib/libc/gen/scandir.c
+++ head/lib/libc/gen/scandir.c
@@ -56,15 +56,18 @@
 #define	SELECT(x)	select(x)
 #endif
 
-#ifndef I_AM_SCANDIR_B
+#ifdef I_AM_SCANDIR_B
+typedef DECLARE_BLOCK(int, select_block, const struct dirent *);
+typedef DECLARE_BLOCK(int, dcomp_block, const struct dirent **,
+    const struct dirent **);
+#else
 static int alphasort_thunk(void *thunk, const void *p1, const void *p2);
 #endif
 
 int
 #ifdef I_AM_SCANDIR_B
-scandir_b(const char *dirname, struct dirent ***namelist,
-    DECLARE_BLOCK(int, select, const struct dirent *),
-    DECLARE_BLOCK(int, dcomp, const struct dirent **, const struct dirent **))
+scandir_b(const char *dirname, struct dirent ***namelist, select_block select,
+    dcomp_block dcomp)
 #else
 scandir(const char *dirname, struct dirent ***namelist,
     int (*select)(const struct dirent *), int (*dcomp)(const struct dirent **,