diff --git a/src/fonts.c b/src/fonts.c
index 94ca44588..88610306a 100644
--- a/src/fonts.c
+++ b/src/fonts.c
@@ -1,7 +1,7 @@
 /*
   fonts.c
 
-  Copyright (c) 2009-2014
+  Copyright (c) 2009-2017
   http://www.tuxpaint.org/
 
   This program is free software; you can redistribute it and/or modify
@@ -157,6 +157,10 @@ unsigned text_size = 4;         // initial text size
 
 int button_label_y_nudge;
 
+#ifdef FORKED_FONTS
+static void reliable_read(int fd, void *buf, size_t count);
+#endif
+
 
 #ifndef NO_SDLPANGO
 static TuxPaint_Font *try_alternate_font(int size)
diff --git a/src/fonts.h b/src/fonts.h
index 617601a78..822e14cbc 100644
--- a/src/fonts.h
+++ b/src/fonts.h
@@ -1,7 +1,7 @@
 /*
   fonts.h
 
-  Copyright (c) 2009-2014
+  Copyright (c) 2009-2017
   http://www.tuxpaint.org/
 
   This program is free software; you can redistribute it and/or modify
@@ -115,7 +115,6 @@ int TuxPaint_Font_FontHeight(TuxPaint_Font * tpf);
 
 #ifdef FORKED_FONTS
 void reliable_write(int fd, const void *buf, size_t count);
-static void reliable_read(int fd, void *buf, size_t count);
 void run_font_scanner(SDL_Surface * screen, const char *restrict const locale);
 void receive_some_font_info(SDL_Surface * screen);
 #endif
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index bb77fd92c..5a58f2a38 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -648,18 +648,6 @@ static void debug(const char *const str)
 #endif
 }
 
-static const char *getfilename(const char *path)
-{
-  char *p;
-
-  if ((p = strrchr(path, '\\')) != NULL)
-    return p + 1;
-  if ((p = strrchr(path, '/')) != NULL)
-    return p + 1;
-  return path;
-}
-
-
 /* sizing */
 
 /* The old Tux Paint:
@@ -1876,7 +1864,6 @@ static void draw_image_title(int t, SDL_Rect dest);
 static void handle_keymouse(SDLKey key, Uint8 updown, int steps, SDL_Rect * area1, SDL_Rect * area2);
 static void handle_keymouse_buttons(SDLKey key, int *whicht, int *whichc, SDL_Rect real_r_tools);
 static void handle_active(SDL_Event * event);
-static char *remove_slash(char *path);
 
 /*static char *replace_tilde(const char* const path);*/
 #ifdef NO_SDLPANGO