diff --git a/src/util/imports.h b/src/util/imports.h
index 149bb225ad4..9556223b3ba 100644
--- a/src/util/imports.h
+++ b/src/util/imports.h
@@ -119,10 +119,6 @@ extern int
 _mesa_vsnprintf(char *str, size_t size, const char *fmt, va_list arg);
 
 
-#if defined(_WIN32) && !defined(HAVE_STRTOK_R)
-#define strtok_r strtok_s
-#endif
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/util/u_string.h b/src/util/u_string.h
index cd21f9d1af1..88df2cceda6 100644
--- a/src/util/u_string.h
+++ b/src/util/u_string.h
@@ -116,6 +116,10 @@ util_asprintf(char **str, const char *fmt, ...)
 
 #define strdup _strdup
 
+#if defined(_WIN32) && !defined(HAVE_STRTOK_R)
+#define strtok_r strtok_s
+#endif
+
 #endif