diff --git a/mozilla/build/wince/shunt/include/mozce_shunt.h b/mozilla/build/wince/shunt/include/mozce_shunt.h
index b721b4babf2..75b2030c0ad 100755
--- a/mozilla/build/wince/shunt/include/mozce_shunt.h
+++ b/mozilla/build/wince/shunt/include/mozce_shunt.h
@@ -423,11 +423,17 @@
 #endif
 #define GetCurrentProcess         mozce_GetCurrentProcess
 
+#ifdef GetCurrentProcessId
+#undef GetCurrentProcessId
+#endif
+#define GetCurrentProcessId       mozce_GetCurrentProcessId
+
 #ifdef GetCurrentThreadId
 #undef GetCurrentThreadId
 #endif
 #define GetCurrentThreadId        mozce_GetCurrentThreadId
 
+
 #ifdef GetDIBits
 #undef GetDIBits
 #endif
@@ -644,7 +650,6 @@
 #define _OleSetClipboard          mozce_OleSetClipboard
 
 
-
 // From win32a.cpp
 
 #ifdef CopyFileA
@@ -992,6 +997,11 @@
 #endif
 #define SetCurrentDirectoryA      mozce_SetCurrentDirectoryA
 
+#ifdef SetCurrentDirectory
+#undef SetCurrentDirectory
+#endif
+#define SetCurrentDirectory      mozce_SetCurrentDirectoryA
+
 #ifdef SetDlgItemTextA
 #undef SetDlgItemTextA
 #endif
@@ -1271,6 +1281,7 @@ extern "C" {
 
   MOZCE_SHUNT_API UINT mozce_GetACP(void);
   MOZCE_SHUNT_API HANDLE mozce_GetCurrentProcess(void);
+  MOZCE_SHUNT_API HANDLE mozce_GetCurrentProcessId(void);
   MOZCE_SHUNT_API DWORD mozce_TlsAlloc(void);
   MOZCE_SHUNT_API BOOL mozce_TlsFree(DWORD dwTlsIndex);
   MOZCE_SHUNT_API DWORD GetCurrentThreadId(void);
diff --git a/mozilla/build/wince/shunt/win32.cpp b/mozilla/build/wince/shunt/win32.cpp
index 84262dae540..7308a90c856 100755
--- a/mozilla/build/wince/shunt/win32.cpp
+++ b/mozilla/build/wince/shunt/win32.cpp
@@ -1032,6 +1032,17 @@ MOZCE_SHUNT_API DWORD mozce_GetCurrentThreadId(void)
     return GetCurrentThreadId();
 }
 
+
+MOZCE_SHUNT_API DWORD mozce_GetCurrentProcessId(void)
+{
+    MOZCE_PRECHECK
+
+#ifdef DEBUG
+    mozce_printf("mozce_GetCurrentProcessId called\n");
+#endif
+    return GetCurrentProcessId();
+}
+
 MOZCE_SHUNT_API DWORD mozce_TlsAlloc(void)
 {
     MOZCE_PRECHECK