diff --git a/src/dirwalk.c b/src/dirwalk.c
index b55c57435..02dc13228 100644
--- a/src/dirwalk.c
+++ b/src/dirwalk.c
@@ -263,6 +263,8 @@ int compare_ftw_str(const void *v1, const void *v2)
 
 void tp_ftw(SDL_Surface * screen, SDL_Texture * texture, SDL_Renderer * renderer, char *restrict const dir, unsigned dirlen,
 	    int rsrc, void (*fn) (SDL_Surface * screen,
+				  SDL_Texture * texture,
+				  SDL_Renderer * renderer,
 				  const char *restrict const dir,
 				  unsigned dirlen, tp_ftw_str * files,
 				  unsigned count, const char *restrict const locale),
@@ -390,7 +392,7 @@ void tp_ftw(SDL_Surface * screen, SDL_Texture * texture, SDL_Renderer * renderer
     }
     free(file_names);
 #else
-    fn(screen, dir, dirlen, file_names, num_file_names, locale);
+    fn(screen, texture, renderer, dir, dirlen, file_names, num_file_names, locale);
 #endif
   }
 
diff --git a/src/dirwalk.h b/src/dirwalk.h
index 61339e9f0..171ed9614 100644
--- a/src/dirwalk.h
+++ b/src/dirwalk.h
@@ -50,6 +50,8 @@ void loadfont_callback(SDL_Surface * screen, SDL_Texture * texture, SDL_Renderer
 int compare_ftw_str(const void *v1, const void *v2);
 void tp_ftw(SDL_Surface * screen, SDL_Texture * texture, SDL_Renderer * renderer, char *restrict const dir, unsigned dirlen,
 	    int rsrc, void (*fn) (SDL_Surface * screen,
+				  SDL_Texture * texture,
+				  SDL_Renderer * renderer,
 				  const char *restrict const dir,
 				  unsigned dirlen, tp_ftw_str * files,
 				  unsigned count, const char *restrict const locale),
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index a2e502e14..aaf74d004 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -6517,6 +6517,8 @@ static unsigned compute_default_scale_factor(double ratio)
 /* directory walking... */
 
 static void loadbrush_callback(SDL_Surface * screen,
+			       SDL_Texture * texture,
+			       SDL_Renderer * renderer,
 			       const char *restrict const dir,
 			       unsigned dirlen, tp_ftw_str * files,
 			       unsigned i, const char *restrict const locale)
@@ -7408,6 +7410,8 @@ static void get_stamp_thumb(stamp_type * sd)
 
 
 static void loadstamp_callback(SDL_Surface * screen,
+			       SDL_Texture * texture,
+			       SDL_Renderer * renderer,
 			       const char *restrict const dir,
 			       unsigned dirlen, tp_ftw_str * files,
 			       unsigned i, const char *restrict const locale)