diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index 5e85d983e..020cbb2f7 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -313,11 +313,15 @@ struct grub_script_function
 };
 typedef struct grub_script_function *grub_script_function_t;
 
+extern grub_script_function_t grub_script_function_list;
+
+#define FOR_SCRIPT_FUNCTIONS(var) for((var) = grub_script_function_list; \
+				      (var); (var) = (var)->next)
+
 grub_script_function_t grub_script_function_create (struct grub_script_arg *functionname,
 						    struct grub_script *cmd);
 void grub_script_function_remove (const char *name);
 grub_script_function_t grub_script_function_find (char *functionname);
-int grub_script_function_iterate (int (*iterate) (grub_script_function_t));
 int grub_script_function_call (grub_script_function_t func,
 			       int argc, char **args);
 
diff --git a/script/function.c b/script/function.c
index ded470c4e..810c65233 100644
--- a/script/function.c
+++ b/script/function.c
@@ -21,7 +21,7 @@
 #include <grub/parser.h>
 #include <grub/mm.h>
 
-static grub_script_function_t grub_script_function_list;
+grub_script_function_t grub_script_function_list;
 
 grub_script_function_t
 grub_script_function_create (struct grub_script_arg *functionname_arg,
@@ -104,18 +104,6 @@ grub_script_function_find (char *functionname)
   return func;
 }
 
-int
-grub_script_function_iterate (int (*iterate) (grub_script_function_t))
-{
-  grub_script_function_t func;
-
-  for (func = grub_script_function_list; func; func = func->next)
-    if (iterate (func))
-      return 1;
-
-  return 0;
-}
-
 int
 grub_script_function_call (grub_script_function_t func,
 			   int argc __attribute__((unused)),