diff --git a/include/string.h b/include/string.h
index 5459eaaf5..d2d246e86 100644
--- a/include/string.h
+++ b/include/string.h
@@ -1,15 +1,15 @@
 /*****************************************************************************/
 /*                                                                           */
-/*				   string.h				     */
+/*				   string.h   				     */
 /*                                                                           */
 /*				String handling				     */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998-2004 Ullrich von Bassewitz                                       */
-/*               Römerstrasse 52                                             */
-/*               D-70794 Filderstadt                                         */
-/* EMail:        uz@cc65.org                                                 */
+/* (C) 1998-2005, Ullrich von Bassewitz                                      */
+/*                Römerstrasse 52                                            */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -56,7 +56,7 @@ char* __fastcall__ strncpy (char* dest, const char* src, size_t count);
 char* __fastcall__ strrchr (const char* s, int c);
 size_t __fastcall__ strspn (const char* s1, const char* s2);
 char* __fastcall__ strstr (const char* str, const char* substr);
-char* strtok (char* s1, const char* s2);
+char* __fastcall__ strtok (char* s1, const char* s2);
 size_t strxfrm (char* s1, const char* s2, size_t count);
 void* __fastcall__ memchr (const void* mem, int c, size_t count);
 int __fastcall__ memcmp (const void* p1, const void* p2, size_t count);
diff --git a/libsrc/common/strtok.c b/libsrc/common/strtok.c
index 5d9295711..3e5ff7dd5 100644
--- a/libsrc/common/strtok.c
+++ b/libsrc/common/strtok.c
@@ -27,7 +27,7 @@ static char* Last = 0;
 
 
 
-char* strtok (register char* s1, const char* s2)
+char* __fastcall__ strtok (register char* s1, const char* s2)
 {
     char c;
     char* start;
@@ -72,6 +72,6 @@ char* strtok (register char* s1, const char* s2)
     /* Return the start of the token */
     return start;
 }
-                                 
+