diff --git a/tools/bdf-converter.c b/tools/bdf-converter.c
index a93da0f2b1..e6976843c8 100644
--- a/tools/bdf-converter.c
+++ b/tools/bdf-converter.c
@@ -189,6 +189,7 @@ static char *MY_strtok_r(char *str, const char *delim, char **saveptr)
   return pbegin;
 }
 
+#undef strtok_r
 #define strtok_r MY_strtok_r
 #endif
 
diff --git a/tools/mkdeps.c b/tools/mkdeps.c
index c0b71e707b..d6819ab25d 100644
--- a/tools/mkdeps.c
+++ b/tools/mkdeps.c
@@ -183,6 +183,7 @@ static char *MY_strtok_r(char *str, const char *delim, char **saveptr)
   return pbegin;
 }
 
+#undef strtok_r
 #define strtok_r MY_strtok_r
 #endif