diff --git a/build/wince/shunt/include/mozce_shunt.h b/build/wince/shunt/include/mozce_shunt.h
index 38793ebb81e..6cf10c9d301 100755
--- a/build/wince/shunt/include/mozce_shunt.h
+++ b/build/wince/shunt/include/mozce_shunt.h
@@ -513,12 +513,7 @@
 #ifdef GetMessageA
 #undef GetMessageA
 #endif
-#define GetMessageA               mozce_GetMessage
-
-#ifdef GetMessageW
-#undef GetMessageW
-#endif
-#define GetMessageW               mozce_GetMessage
+#define GetMessageA               GetMessageW
 
 #ifdef GetMessageTime
 #undef GetMessageTime
@@ -634,12 +629,8 @@
 #ifdef PeekMessageA
 #undef PeekMessageA
 #endif
-#define PeekMessageA              mozce_PeekMessage
+#define PeekMessageA              PeekMessageW
 
-#ifdef PeekMessageW
-#undef PeekMessageW
-#endif
-#define PeekMessageW              mozce_PeekMessage
 
 #ifdef RegCreateKey
 #undef RegCreateKey