diff --git a/bc/system/file/System_File.cpp b/bc/system/file/System_File.cpp
index 9b77b34..ed8fe58 100644
--- a/bc/system/file/System_File.cpp
+++ b/bc/system/file/System_File.cpp
@@ -77,6 +77,7 @@ bool (MakeAbsolutePath)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parm
     return Stacked::MakeAbsolutePath(parms);
 }
 
+#undef CreateDirectory
 bool (CreateDirectory)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) {
     return Stacked::CreateDirectory(parms);
 }
@@ -93,6 +94,7 @@ bool (Open)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) {
     return Stacked::Open(parms);
 }
 
+#undef RemoveDirectory
 bool (RemoveDirectory)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) {
     return Stacked::RemoveDirectory(parms);
 }
diff --git a/bc/system/file/win/Stacked.cpp b/bc/system/file/win/Stacked.cpp
index 760c0ec..f2cf551 100644
--- a/bc/system/file/win/Stacked.cpp
+++ b/bc/system/file/win/Stacked.cpp
@@ -696,7 +696,9 @@ bool (Open)(FileParms* parms) {
     return true;
 }
 
+#undef RemoveDirectory
 bool (RemoveDirectory)(FileParms* parms) {
+#define RemoveDirectory RemoveDirectoryA
     if (parms->recurse) {
         return Blizzard::File::RemoveDirectoryAndContents(parms->name, false);
     }