diff --git a/build/wince/shunt/include/mozce_defs.h b/build/wince/shunt/include/mozce_defs.h
index c19a8bd4cb47..2c252bf238bc 100755
--- a/build/wince/shunt/include/mozce_defs.h
+++ b/build/wince/shunt/include/mozce_defs.h
@@ -284,7 +284,6 @@ typedef WINDOWPLACEMENT *PWINDOWPLACEMENT, *LPWINDOWPLACEMENT;
 #define DISPID_WINDOWRESIZE             (__LINE__ + 3000) /* 110 */
 #define DISPID_WINDOWACTIVATE           (__LINE__ + 3000) /* 111 */
 
-
 #define CBM_INIT 4
 
 #ifndef MM_TEXT
@@ -324,4 +323,16 @@ typedef struct _BLENDFUNCTION
 #define LR_LOADFROMFILE 0
 #endif
 
+#ifndef MA_NOACTIVATE
+#define MA_NOACTIVATE 1
+#endif
+
+#ifndef MA_ACTIVATE
+#define MA_ACTIVATE 1
+#endif
+
+#ifndef WM_MOUSEACTIVATE
+#define WM_MOUSEACTIVATE WM_ACTIVATE
+#endif
+
 #endif
diff --git a/build/wince/shunt/include/mozce_shunt.h b/build/wince/shunt/include/mozce_shunt.h
index 6cf10c9d3018..bc835e9f81fc 100755
--- a/build/wince/shunt/include/mozce_shunt.h
+++ b/build/wince/shunt/include/mozce_shunt.h
@@ -187,6 +187,10 @@
 #endif
 #define getpid		mozce_getpid
 
+#ifdef _getpid
+#undef _getpid
+#endif
+#define _getpid		mozce_getpid
 
 // From signal.cpp
 #ifdef raise
@@ -702,6 +706,16 @@
 #endif
 #define IsClipboardFormatAvailable mozce_IsClipboardFormatAvailable
 
+#ifdef OleInitialize
+#undef OleInitialize
+#endif
+#define OleInitialize             mozce_OleInitialize
+
+#ifdef OleUninitialize
+#undef OleUninitialize
+#endif
+#define OleUninitialize          mozce_OleUninitialize
+
 #ifdef OleFlushClipboard
 #undef OleFlushClipboard
 #endif
@@ -1360,6 +1374,8 @@ extern "C" {
   MOZCE_SHUNT_API int mozce_GetScrollPos(HWND inWnd, int inBar);
   MOZCE_SHUNT_API BOOL mozce_GetScrollRange(HWND inWnd, int inBar, LPINT outMinPos, LPINT outMaxPos);
   MOZCE_SHUNT_API HRESULT mozce_CoLockObjectExternal(IUnknown* inUnk, BOOL inLock, BOOL inLastUnlockReleases);
+  MOZCE_SHUNT_API LRESULT mozce_OleInitialize(LPVOID pvReserved);
+  MOZCE_SHUNT_API void    mozce_OleUninitialize();;
   MOZCE_SHUNT_API HRESULT mozce_OleSetClipboard(IDataObject* inDataObj);
   MOZCE_SHUNT_API HRESULT mozce_OleGetClipboard(IDataObject** outDataObj);
   MOZCE_SHUNT_API HRESULT mozce_OleFlushClipboard(void);
@@ -1388,7 +1404,7 @@ extern "C" {
   MOZCE_SHUNT_API BOOL mozce_PeekMessage(LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax, UINT wRemoveMsg);
   MOZCE_SHUNT_API BOOL mozce_GetMessage(LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax);
   MOZCE_SHUNT_API LONG mozce_GetMessageTime(void);
-
+  
   // from win32a.cpp
   
   MOZCE_SHUNT_API DWORD mozce_GetGlyphOutlineA(HDC inDC, CHAR inChar, UINT inFormat, void* inGM, DWORD inBufferSize, LPVOID outBuffer, CONST mozce_MAT2* inMAT2);
diff --git a/build/wince/shunt/win32.cpp b/build/wince/shunt/win32.cpp
index 55d29829fa3e..ea4ec6d772b1 100755
--- a/build/wince/shunt/win32.cpp
+++ b/build/wince/shunt/win32.cpp
@@ -160,6 +160,12 @@ MOZCE_SHUNT_API int mozce_ExtSelectClipRgn(HDC inDC, HRGN inRGN, int inMode)
     // RGN_DIFF = 4
     // RGN_COPY = 5
     
+
+    if (inMode == RGN_COPY)
+    {
+        return SelectClipRgn(inDC, inRGN);
+    }
+
     HRGN cRGN = NULL;
     int result = GetClipRgn(inDC, cRGN);
     
@@ -759,6 +765,27 @@ MOZCE_SHUNT_API HRESULT mozce_CoLockObjectExternal(IUnknown* inUnk, BOOL inLock,
 
     return retval;
 }
+
+MOZCE_SHUNT_API LRESULT mozce_OleInitialize(LPVOID pvReserved)
+{
+    MOZCE_PRECHECK
+
+#ifdef DEBUG
+    mozce_printf("-- mozce_OleInitialize called\n");
+#endif
+
+    return S_OK;
+}
+
+MOZCE_SHUNT_API void mozce_OleUninitialize()
+{
+    MOZCE_PRECHECK
+
+#ifdef DEBUG
+    mozce_printf("-- mozce_OleUninitialize called\n");
+#endif
+}
+
 MOZCE_SHUNT_API HRESULT mozce_OleQueryLinkFromData(IDataObject* inSrcDataObject)
 {
     MOZCE_PRECHECK