diff --git a/mozilla/java/webclient/build.xml b/mozilla/java/webclient/build.xml
index a511327d4ff..33ffe3dd48b 100644
--- a/mozilla/java/webclient/build.xml
+++ b/mozilla/java/webclient/build.xml
@@ -244,6 +244,13 @@
       </fileset>
     </delete>
 
+    <delete >
+      <fileset dir="${basedir}/src_moz">
+        <include name="*.ilk"/>
+      </fileset>
+    </delete>
+
+
     <delete file="${basedir}/src_moz/gtk/GtkBrowserControlCanvas.h"/>
     <delete file="${basedir}/src_moz/win32/Win32BrowserControlCanvas.h"/>
 
diff --git a/mozilla/java/webclient/src_moz/Makefile.in b/mozilla/java/webclient/src_moz/Makefile.in
index d8412a25e16..141f809bde9 100644
--- a/mozilla/java/webclient/src_moz/Makefile.in
+++ b/mozilla/java/webclient/src_moz/Makefile.in
@@ -22,6 +22,7 @@ topsrcdir	= $(DEPTH)
 srcdir		= $(topsrcdir)/java/webclient/src_moz
 VPATH		= $(topsrcdir)/java/webclient/src_moz
 
+
 # IMPORTANT: on Linux, if building webclient with a non-debug mozilla
 # tree, the libwidget_gtk.so binary produced will not work with
 # webclient.  Namely, the symbol handle_gdk_event__FP9_GdkEventPv will
@@ -46,13 +47,6 @@ VPATH		= $(topsrcdir)/java/webclient/src_moz
 # to build WEBCLIENT_PACKAGE_BUILD on linux, grab libwidget_gtk.so from
 # the above URL and put it in the same directory as this file.
 
-# We don't need to build the stubs in the BAL case.
-ifeq ($(BAL_INTERFACE),)
-DIRS = gtk
-endif
-
-JAVAHOME        = $(JDKHOME)
-
 include $(DEPTH)/config/autoconf.mk
 
 ifneq ($(BAL_INTERFACE),)
@@ -64,6 +58,7 @@ endif
 REQUIRES	= xpcom \
 	layout \
 	shistory \
+	find \
 	appcomps \
 	appshell \
 	pref \
@@ -118,8 +113,40 @@ CPPSRCS = \
 	PreferencesImpl.cpp \
 	PreferencesActionEvents.cpp \
 	WrapperFactoryImpl.cpp \
+	$(NULL)
+
+ifeq ($(OS_ARCH),Linux)
+CPPSRCS += \
 	gtk/GtkBrowserControlCanvas.cpp \
 	$(NULL)
+DIRS = gtk
+else
+ifeq ($(OS_ARCH),WINNT)
+CPPSRCS += \
+	win32/Win32BrowserControlCanvas.cpp \
+	$(NULL)
+else
+CPPSRCS += \
+	gtk/GtkBrowserControlCanvas.cpp \
+	$(NULL)
+DIRS = gtk
+endif
+endif
+
+
+EXTRA_LIBS		+= \
+			$(XPCOM_LIBS) \
+			$(NSPR_LIBS) \
+			$(DIST)/lib/$(LIB_PREFIX)embed_base_s.$(LIB_SUFFIX) \
+			$(NULL)
+
+ifeq ($(OS_ARCH),WINNT)
+EXTRA_LIBS += \
+		$(DIST)/lib/wc_share.lib \
+		$(MOZ_JDKHOME)/jre/lib/jawt.lib \
+		$(NULL)
+endif
+
 
 include $(topsrcdir)/config/rules.mk
 
@@ -127,14 +154,14 @@ ifdef MOZ_ENABLE_GTK
 ifndef MOZ_MONOLITHIC_TOOLKIT
 CXXFLAGS        += $(MOZ_GTK_CFLAGS)
 CFLAGS          += $(MOZ_GTK_CFLAGS)
-# Adding $(JDKHOME)/jre/lib/sparc because we need to link against 
+# Adding $(MOZ_JDKHOME)/jre/lib/sparc because we need to link against 
 # the libjawt.so shared library for the JAWT Native Interface
 # functionality to work correctly.
-EXTRA_DSO_LDOPTS += -lgtkxtbin -lgtksuperwin -lwc_share -lembed_base_s -L$(JDKHOME)/jre/lib/sparc -L$(JDKHOME)/jre/lib/i386 -ljawt -L/usr/X11R6/lib -lXt
+EXTRA_DSO_LDOPTS += -lgtkxtbin -lgtksuperwin -lwc_share -lembed_base_s -L$(MOZ_JDKHOME)/jre/lib/sparc -L$(MOZ_JDKHOME)/jre/lib/i386 -ljawt -L/usr/X11R6/lib -lXt
 else
 CXXFLAGS        += $(TK_CFLAGS)
 CFLAGS          += $(TK_CFLAGS)
-EXTRA_DSO_LDOPTS += -lgtkxtbin -lgtksuperwin -lwc_share -lembed_base_s -L$(JDKHOME)/jre/lib/sparc -L$(JDKHOME)/jre/lib/i386 -ljawt -L/usr/X11R6/lib -lXt 
+EXTRA_DSO_LDOPTS += -lgtkxtbin -lgtksuperwin -lwc_share -lembed_base_s -L$(MOZ_JDKHOME)/jre/lib/sparc -L$(MOZ_JDKHOME)/jre/lib/i386 -ljawt -L/usr/X11R6/lib -lXt 
 endif
 endif
 
@@ -142,22 +169,26 @@ ifneq ($(BAL_INTERFACE),)
 CXXFLAGS += -DBAL_INTERFACE
 endif
 
- EXTRA_DSO_LDOPTS += -L$(DEPTH)/dist/lib -lxpcom
-
 ifneq ($(BAL_INTERFACE),)
 EXTRA_DSO_LDOPTS += -lwc_share_bal
 else
+ifneq ($(OS_ARCH),WINNT)
 EXTRA_DSO_LDOPTS += -lwc_share
 endif
-
+endif
 
 ifeq ($(OS_ARCH),Linux)
-INCLUDES := -I$(JDKHOME)/include -I$(JDKHOME)/include/linux $(INCLUDES) \
+INCLUDES := -I$(MOZ_JDKHOME)/include -I$(MOZ_JDKHOME)/include/linux $(INCLUDES) \
        -I$(DEPTH)/widget/src/gtk -I../src_share
 else
-INCLUDES := -I$(JDKHOME)/include -I$(JDKHOME)/include/solaris $(INCLUDES) \
+ifeq ($(OS_ARCH),WINNT)
+INCLUDES := -I$(MOZ_JDKHOME)/include -I$(MOZ_JDKHOME)/include/win32 $(INCLUDES) \
+       -I../src_share -I.
+else
+INCLUDES := -I$(MOZ_JDKHOME)/include -I$(MOZ_JDKHOME)/include/solaris $(INCLUDES) \
 	-I$(DEPTH)/widget/src/gtk -I../src_share
 endif
+endif
 
 
 buildRunems:
diff --git a/mozilla/java/webclient/src_moz/win32/Makefile.in b/mozilla/java/webclient/src_moz/win32/Makefile.in
deleted file mode 100644
index b3b2aca1a30..00000000000
--- a/mozilla/java/webclient/src_moz/win32/Makefile.in
+++ /dev/null
@@ -1,87 +0,0 @@
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Sun Microsystems,
-# Inc. Portions created by Sun are
-# Copyright (C) 1999 Sun Microsystems, Inc. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH		= ../../../..
-topsrcdir	= $(DEPTH)
-srcdir		= $(topsrcdir)/java/webclient/src_moz/win32
-VPATH		= $(topsrcdir)/java/webclient/src_moz/win32
-
-JAVAHOME        = $(MOZ_JDKHOME)
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE=wc_win32
-REQUIRES	= xpcom \
-		  layout \
-		  appcomps \
-		  string \
-		  embed_base \
-		  webBrowser_core \
-		  webshell \
-		  windowwatcher \
-		  profile \
-		  necko \
-		  docshell \
-		  dom \
-		  widget \
-		  uriloader \
-		  shistory \
-		  webbrowserpersist \
-		  content \
-		  gfx \
-		  $(NULL)
-
-ifdef BAL_INTERFACE
-LIBRARY_NAME = wc_win32_bal
-else
-LIBRARY_NAME = wc_win32
-endif
-
-CPPSRCS = \
-	Win32BrowserControlCanvas.cpp \
-	$(NULL)
-
-EXTRA_LIBS		+= \
-			$(XPCOM_LIBS) \
-			$(NSPR_LIBS) \
-			$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
-# check for OS type
-ifeq ($(OS_ARCH),Linux)
-INCLUDES := -I$(MOZ_JDKHOME)/include -I$(MOZ_JDKHOME)/include/linux -I.. -I../../src_share $(INCLUDES)
-else
-ifeq ($(OS_ARCH),WINNT)
-INCLUDES := -I$(MOZ_JDKHOME)/include -I$(MOZ_JDKHOME)/include/win32 -I.. -I../../src_share $(INCLUDES)
-else
-INCLUDES := -I$(MOZ_JDKHOME)/include -I$(MOZ_JDKHOME)/include/solaris -I.. -I../../src_share $(INCLUDES)
-endif
-endif
-
-export:: libs
-
-libs:: $(LIBRARY)
-        $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
-
-clobber::
-	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
-	rm -f $(DIST)\lib\$(LIBRARY_NAME).a
-
-clobber_all:: clobber
diff --git a/mozilla/java/webclient/src_moz/win32/Makefile.win b/mozilla/java/webclient/src_moz/win32/Makefile.win
deleted file mode 100755
index dd997857522..00000000000
--- a/mozilla/java/webclient/src_moz/win32/Makefile.win
+++ /dev/null
@@ -1,101 +0,0 @@
-#!nmake
-#
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Sun Microsystems,
-# Inc. Portions created by Sun are
-# Copyright (C) 1999 Sun Microsystems, Inc. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-DEPTH=..\..\..\..
-MODULE=wc_win32
-REQUIRES	= xpcom \
-		  layout \
-		  appcomps \
-		  string \
-		  embed_base \
-		  webBrowser_core \
-		  webshell \
-		  windowwatcher \
-		  profile \
-		  necko \
-		  docshell \
-		  dom \
-		  widget \
-		  uriloader \
-		  shistory \
-		  webbrowserpersist \
-		  content \
-		  gfx \
-		  $(NULL)
-
-!ifdef BAL_INTERFACE
-LIBRARY_NAME = wc_win32_bal
-!else
-LIBRARY_NAME = wc_win32
-!endif
-
-CPP_OBJS =                              \
-    .\$(OBJDIR)\Win32BrowserControlCanvas.obj  \
-    $(NULL)
-
-INCS=-I.. -I..\..\src_share $(INCS)
-
-!ifdef BAL_INTERFACE
-INCS = \
-	-I..\..\bal\ \
-	-I..\..\bal\win32 \
-	$(INCS) \
-	$(NULL)
-!else
-INCS = \
-	-I$(JDKHOME)\include \
-	-I$(JDKHOME)\include\win32 \
-	$(INCS) \
-	$(NULL)
-!endif
-
-LCFLAGS = \
-	-DDEBUG_RAPTOR_CANVAS \
-        $(NULL)
-
-!ifdef BAL_INTERFACE
-LCFLAGS = \
-	$(LCFLAGS) \
-	-DBAL_INTERFACE \
-	$(NULL)
-!endif
-
-LLIBS = \
-	$(NULL)  
-
-WIN_LIBS = \
-  version.lib
-
-include <$(DEPTH)\config\rules.mak>
-
-!CMDSWITCHES -S
-
-export:: libs
-
-libs:: $(LIBRARY)
-        $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
-         
-
-clobber::
-	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
-
-clobber_all:: clobber
-