diff --git a/src/dirwalk.c b/src/dirwalk.c
index afafbd3af..7c251d702 100644
--- a/src/dirwalk.c
+++ b/src/dirwalk.c
@@ -85,7 +85,7 @@ void loadfont_callback(SDL_Surface * screen, SDL_Texture * texture, SDL_Renderer
 {
   dirlen = dirlen;
 
-#ifndef FORKED_FONTS && #defined __ANDROID__
+#if defined (__ANDROID__)
   while (i-- && !font_thread_aborted)
 #else
   while (i--)
diff --git a/src/fonts.c b/src/fonts.c
index 2f6b5f796..d8ea07c2c 100644
--- a/src/fonts.c
+++ b/src/fonts.c
@@ -1544,7 +1544,7 @@ int charset_works(TuxPaint_Font * font, const char *s)
   unsigned count = 0;
   int ret = 0;
 
-#ifndef FORKED_FONTS && #defined __ANDROID__
+#if defined (__ANDROID__)
   while (*s && !font_thread_aborted)
 #else
   while (*s)
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index b478c489b..3eba2be24 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -6239,7 +6239,8 @@ static void mainloop(void)
       SDL_Delay(10);
     }
   while (!done);
-#ifndef FORKED_FONTS && #defined __ANDROID__
+
+#if defined (__ANDROID__)
   /* Closing Tux Paint before the end of font scanning resulted in crashes in the Android port */
   /* This is an abuse of font_thread_aborted, maybe it is better to use a new, more descriptive marker? */
   if(!font_thread_done)