diff --git a/cfg/gnu.cfg b/cfg/gnu.cfg
index 99c11f827..2ba9f49a7 100644
--- a/cfg/gnu.cfg
+++ b/cfg/gnu.cfg
@@ -45,6 +45,19 @@
       <valid>0:</valid>
     </arg>
   </function>
+  <!-- http://man7.org/linux/man-pages/man3/strsep.3.html -->
+  <!-- char *strsep(char **stringp, const char *delim); -->
+  <function name="strsep">
+    <use-retval/>
+    <noreturn>false</noreturn>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-uninit/>
+      <not-null/>
+    </arg>
+  </function>
   <!-- char *strdupa(const char *s); -->
   <function name="strdupa">
     <use-retval/>
diff --git a/cfg/windows.cfg b/cfg/windows.cfg
index 64b1c385d..dc4e0d64a 100644
--- a/cfg/windows.cfg
+++ b/cfg/windows.cfg
@@ -1646,9 +1646,61 @@
       <not-uninit/>
     </arg>
   </function>
+  <!-- unsigned char *_mbstok(unsigned char *strToken, const unsigned char *strDelimit);  -->
+  <function name="_mbstok,_tcstok">
+    <pure/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- unsigned char *_mbstok(unsigned char *strToken, const unsigned char *strDelimit, _locale_t locale );  -->
+  <function name="_mbstok">
+    <pure/>
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+    </arg>
+  </function>
+  <!-- char *_strtok_s_l(char *strToken, const char *strDelimit, char **context,_locale_t locale ); -->
+  <!-- wchar_t *_wcstok_s_l(wchar_t *strToken, const wchar_t *strDelimit, wchar_t**context,_locale_t locale); -->
+  <!-- unsigned char *_mbstok_s_l(unsigned char*strToken, const unsigned char *strDelimit, char **context,_locale_t locale); -->
+  <function name="_strtok_s_l,_wcstok_s_l,_mbstok_s,_tcstok_s_l">
+    <!-- strtok may modify the first argument, so using the return value is not mandatory -->
+    <noreturn>false</noreturn>
+    <pure/>
+    <leak-ignore/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-null/>
+    </arg>
+    <arg nr="4">
+      <not-uninit/>
+    </arg>
+  </function>
   <!-- char *strtok_s(char *strToken, const char *strDelimit, char **context); -->
   <!-- wchar_t *wcstok_s(wchar_t *strToken, const wchar_t *strDelimit, wchar_t**context); -->
-  <function name="strtok_s,wcstok_s">
+  <!-- unsigned char *_mbstok_s(unsigned char*strToken, const unsigned char *strDelimit, char **context); -->
+  <function name="strtok_s,wcstok_s,_mbstok_s,_tcstok_s">
     <!-- strtok may modify the first argument, so using the return value is not mandatory -->
     <noreturn>false</noreturn>
     <pure/>