diff --git a/build/wince/tools/vs8ppc2003arm/arm-wince-link.c b/build/wince/tools/vs8ppc2003arm/arm-wince-link.c
index eb09456c446..46fbcb0fa58 100755
--- a/build/wince/tools/vs8ppc2003arm/arm-wince-link.c
+++ b/build/wince/tools/vs8ppc2003arm/arm-wince-link.c
@@ -15,41 +15,41 @@ main(int argc, char **argv)
   args[i++] = "/LIBPATH:\"" WCE_CRT "\"";
   args[i++] = "/LIBPATH:\"" SHUNT_LIB "\"";
 
-  args[i++] = "winsock.lib";
   args[i++] = "corelibc.lib";
   args[i++] = "coredll.lib";
   args[i++] = "ceshell.lib";
-  args[i++] = "ole32.lib";
   args[i++] = "mmtimer.lib";
   args[i++] = "mozce_shunt.lib";
 
   args[i++] = "/NODEFAULTLIB:LIBC";
   args[i++] = "/NODEFAULTLIB:OLDNAMES";
+  args[i++] = "/NODEFAULTLIB:MSVCRT";
 
   // if -DLL is not passed, then change the entry to 'main'
-  while(argv[j])
-    {
-	  if (strncmp(argv[j], "-DLL", 4) == 0 || strncmp(argv[j], "/DLL", 4) == 0)
-		{
-		  k = 1;
+  while(argv[j]) {
 
-		}
-	  if (strncmp(argv[j], "-entry", 6) == 0 || strncmp(argv[j], "/entry", 6) == 0 || strncmp(argv[j], "-ENTRY", 6) == 0 || strncmp(argv[j], "/ENTRY",6 ) == 0)
-		{
-		  k = 1;
-
-		}
-	  if (strncmp(argv[j], "-subsystem:", 11) == 0 || strncmp(argv[j], "/subsystem:", 11) == 0 || strncmp(argv[j], "-SUBSYSTEM:", 11) == 0 || strncmp(argv[j], "/SUBSYSTEM:", 11) == 0)
-		{
-		  s = 1;
-
-		}
+      if (strncmp(argv[j], "-DLL", 4) == 0 ||
+	  strncmp(argv[j], "/DLL", 4) == 0) {
+	k = 1;
+      }
+      if (strncmp(argv[j], "-entry", 6) == 0 ||
+	  strncmp(argv[j], "/entry", 6) == 0 ||
+	  strncmp(argv[j], "-ENTRY", 6) == 0 ||
+	  strncmp(argv[j], "/ENTRY",6 ) == 0) {
+	k = 1;
+      }
+      if (strncmp(argv[j], "-subsystem:", 11) == 0 ||
+	  strncmp(argv[j], "/subsystem:", 11) == 0 ||
+	  strncmp(argv[j], "-SUBSYSTEM:", 11) == 0 ||
+	  strncmp(argv[j], "/SUBSYSTEM:", 11) == 0) {
+	s = 1;
+      }
       j++;
-    }
-
+  }
+  
   if (k==0)
     args[i++] = "/ENTRY:main";
-
+  
   if (s==0){
     args[i++] = "/subsystem:\"WINDOWSCE,5.02\"";
   }
diff --git a/build/wince/tools/vs9ppc2003arm/arm-wince-link.c b/build/wince/tools/vs9ppc2003arm/arm-wince-link.c
index eb09456c446..f5b7c7a5a8d 100644
--- a/build/wince/tools/vs9ppc2003arm/arm-wince-link.c
+++ b/build/wince/tools/vs9ppc2003arm/arm-wince-link.c
@@ -15,37 +15,37 @@ main(int argc, char **argv)
   args[i++] = "/LIBPATH:\"" WCE_CRT "\"";
   args[i++] = "/LIBPATH:\"" SHUNT_LIB "\"";
 
-  args[i++] = "winsock.lib";
   args[i++] = "corelibc.lib";
   args[i++] = "coredll.lib";
   args[i++] = "ceshell.lib";
-  args[i++] = "ole32.lib";
   args[i++] = "mmtimer.lib";
   args[i++] = "mozce_shunt.lib";
 
   args[i++] = "/NODEFAULTLIB:LIBC";
   args[i++] = "/NODEFAULTLIB:OLDNAMES";
+  args[i++] = "/NODEFAULTLIB:MSVCRT";
 
   // if -DLL is not passed, then change the entry to 'main'
-  while(argv[j])
-    {
-	  if (strncmp(argv[j], "-DLL", 4) == 0 || strncmp(argv[j], "/DLL", 4) == 0)
-		{
-		  k = 1;
+  while(argv[j]) {
 
-		}
-	  if (strncmp(argv[j], "-entry", 6) == 0 || strncmp(argv[j], "/entry", 6) == 0 || strncmp(argv[j], "-ENTRY", 6) == 0 || strncmp(argv[j], "/ENTRY",6 ) == 0)
-		{
-		  k = 1;
-
-		}
-	  if (strncmp(argv[j], "-subsystem:", 11) == 0 || strncmp(argv[j], "/subsystem:", 11) == 0 || strncmp(argv[j], "-SUBSYSTEM:", 11) == 0 || strncmp(argv[j], "/SUBSYSTEM:", 11) == 0)
-		{
-		  s = 1;
-
-		}
+      if (strncmp(argv[j], "-DLL", 4) == 0 ||
+	  strncmp(argv[j], "/DLL", 4) == 0) {
+	k = 1;
+      }
+      if (strncmp(argv[j], "-entry", 6) == 0 ||
+	  strncmp(argv[j], "/entry", 6) == 0 ||
+	  strncmp(argv[j], "-ENTRY", 6) == 0 ||
+	  strncmp(argv[j], "/ENTRY",6 ) == 0) {
+	k = 1;
+      }
+      if (strncmp(argv[j], "-subsystem:", 11) == 0 ||
+	  strncmp(argv[j], "/subsystem:", 11) == 0 ||
+	  strncmp(argv[j], "-SUBSYSTEM:", 11) == 0 ||
+	  strncmp(argv[j], "/SUBSYSTEM:", 11) == 0) {
+	s = 1;
+      }
       j++;
-    }
+  }
 
   if (k==0)
     args[i++] = "/ENTRY:main";