diff --git a/client/X11/xf_event.c b/client/X11/xf_event.c
index 5f4f8297d..e7a889efc 100644
--- a/client/X11/xf_event.c
+++ b/client/X11/xf_event.c
@@ -185,7 +185,8 @@ BOOL xf_event_action_script_init(xfContext* xfc)
 
 	while (fgets(buffer, sizeof(buffer), actionScript))
 	{
-		strtok(buffer, "\n");
+		char* context = NULL;
+		strtok_s(buffer, "\n", &context);
 		xevent = _strdup(buffer);
 
 		if (!xevent || ArrayList_Add(xfc->xevents, xevent) < 0)
@@ -253,7 +254,8 @@ static BOOL xf_event_execute_action_script(xfContext* xfc, const XEvent* event)
 
 	while (fgets(buffer, sizeof(buffer), actionScript))
 	{
-		strtok(buffer, "\n");
+		char* context = NULL;
+		strtok_s(buffer, "\n", &context);
 	}
 
 	pclose(actionScript);
diff --git a/client/X11/xf_keyboard.c b/client/X11/xf_keyboard.c
index 50b259308..794acea0c 100644
--- a/client/X11/xf_keyboard.c
+++ b/client/X11/xf_keyboard.c
@@ -74,7 +74,8 @@ static BOOL xf_keyboard_action_script_init(xfContext* xfc)
 
 	while (fgets(buffer, sizeof(buffer), keyScript) != NULL)
 	{
-		strtok(buffer, "\n");
+		char* context = NULL;
+		strtok_s(buffer, "\n", &context);
 		keyCombination = _strdup(buffer);
 
 		if (!keyCombination || ArrayList_Add(xfc->keyCombinations, keyCombination) < 0)
@@ -433,7 +434,8 @@ static int xf_keyboard_execute_action_script(xfContext* xfc, XF_MODIFIER_KEYS* m
 
 	while (fgets(buffer, sizeof(buffer), keyScript) != NULL)
 	{
-		strtok(buffer, "\n");
+		char* context = NULL;
+		strtok_s(buffer, "\n", &context);
 
 		if (strcmp(buffer, "key-local") == 0)
 			status = 0;
diff --git a/client/common/cmdline.c b/client/common/cmdline.c
index cdea23de0..bad661987 100644
--- a/client/common/cmdline.c
+++ b/client/common/cmdline.c
@@ -3500,8 +3500,9 @@ BOOL freerdp_client_load_addins(rdpChannels* channels, rdpSettings* settings)
 			BOOL success;
 			const char* name = NULL;
 			const char* drive = tok;
-			char* start = strtok(tok, "(");
-			char* end = strtok(NULL, ")");
+			char* subcontext = NULL;
+			char* start = strtok_s(tok, "(", &subcontext);
+			char* end = strtok_s(NULL, ")", &subcontext);
 			if (start && end)
 				name = end;
 
diff --git a/libfreerdp/crypto/tls.c b/libfreerdp/crypto/tls.c
index d7743994e..c94c55534 100644
--- a/libfreerdp/crypto/tls.c
+++ b/libfreerdp/crypto/tls.c
@@ -1198,9 +1198,10 @@ static BOOL is_accepted_fingerprint(CryptoCert cert, const char* CertificateAcce
 		char* cur = strtok_s(copy, ",", &context);
 		while (cur)
 		{
+			char* subcontext = NULL;
 			BOOL equal;
 			char* strhash;
-			const char* h = strtok(cur, ":");
+			const char* h = strtok_s(cur, ":", &subcontext);
 			const char* fp;
 
 			if (!h)
diff --git a/winpr/libwinpr/smartcard/smartcard_pcsc.c b/winpr/libwinpr/smartcard/smartcard_pcsc.c
index f5f33a6b2..36c43af06 100644
--- a/winpr/libwinpr/smartcard/smartcard_pcsc.c
+++ b/winpr/libwinpr/smartcard/smartcard_pcsc.c
@@ -2930,6 +2930,7 @@ unsigned int determineMacOSXVersion(void)
 	long minorVersion = 0;
 	long patchVersion = 0;
 	int count = 0;
+	char* context = NULL;
 	mib[0] = CTL_KERN;
 	mib[1] = KERN_OSRELEASE;
 
@@ -2947,7 +2948,7 @@ unsigned int determineMacOSXVersion(void)
 		return 0;
 	}
 
-	tok = strtok(kernelVersion, ".");
+	tok = strtok_s(kernelVersion, ".", &context);
 	errno = 0;
 
 	while (tok)
@@ -2979,7 +2980,7 @@ unsigned int determineMacOSXVersion(void)
 				break;
 		}
 
-		tok = strtok(NULL, ".");
+		tok = strtok_s(NULL, ".", &context);
 		count++;
 	}