diff --git a/mozilla/modules/plugin/tools/spy/common/logger.cpp b/mozilla/modules/plugin/tools/spy/common/logger.cpp
index 9b218dfec3e..e1fbdf42555 100644
--- a/mozilla/modules/plugin/tools/spy/common/logger.cpp
+++ b/mozilla/modules/plugin/tools/spy/common/logger.cpp
@@ -36,7 +36,6 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "xp.h"
-#include <windowsx.h>
 
 #include "resource.h"
 #include "logger.h"
@@ -53,7 +52,7 @@ Logger::Logger() :
 {
   if(0 != GetPluginsDir(szFile, strlen(szFile)))
   {
-    strcat(szFile, "\\");
+    strcat(szFile, DIR_SEPARATOR);
     strcat(szFile, DEFAULT_LOG_FILE_NAME);
   }
   else
diff --git a/mozilla/modules/plugin/tools/spy/include/xp.h b/mozilla/modules/plugin/tools/spy/include/xp.h
index 2079674384a..d3e2b3dea54 100644
--- a/mozilla/modules/plugin/tools/spy/include/xp.h
+++ b/mozilla/modules/plugin/tools/spy/include/xp.h
@@ -140,6 +140,18 @@
   #define _MAX_PATH       256
 #endif
 
+#ifdef XP_WIN
+  #define DIR_SEPARATOR "\\"
+#endif
+
+#ifdef XP_UNIX
+  #define DIR_SEPARATOR "/"
+#endif
+
+#ifdef XP_MAC
+  #define DIR_SEPARATOR ":"
+#endif
+  
 /*****************************************************/
 
 // File utilities