diff --git a/src/CxbxKrnl/EmuFS.cpp b/src/CxbxKrnl/EmuFS.cpp
index 28349f1b9..24a3979ee 100644
--- a/src/CxbxKrnl/EmuFS.cpp
+++ b/src/CxbxKrnl/EmuFS.cpp
@@ -220,11 +220,10 @@ __declspec(naked) void EmuMFs00Esp()
 	}
 }
 
-__declspec(thread) uint32 returnAddr;
-__declspec(thread) uint32 temp;
-
 __declspec(naked) void EmuPushDwordPtrFs00()
 {
+	uint32 returnAddr;
+	uint32 temp;
 	__asm
 	{
 		pop returnAddr
@@ -239,6 +238,9 @@ __declspec(naked) void EmuPushDwordPtrFs00()
 
 __declspec(naked) void EmuPopDwordPtrFs00()
 {
+	uint32 returnAddr;
+	uint32 temp;
+
 	__asm
 	{
 		pop returnAddr