diff --git a/mozilla/java/build.xml b/mozilla/java/build.xml
index 9c045d676f8..caf6730c4e3 100644
--- a/mozilla/java/build.xml
+++ b/mozilla/java/build.xml
@@ -71,16 +71,7 @@
 
   <target name="dom">
 
-    <exec os="SunOS" dir="${basedir}/dom" executable="gmake" 
-                     failonerror="yes">
-    </exec>
-    <exec os="Linux" dir="${basedir}/dom" executable="make" 
-                     failonerror="yes">
-    </exec>
-    <exec os="Windows 2000" dir="${basedir}/dom" executable="nmake" 
-                     failonerror="yes">
-      <arg line="-f makefile.win"/>
-    </exec>
+    <ant dir="${basedir}/dom"/>
 
   </target>
 
@@ -96,18 +87,7 @@
 
     <ant dir="${basedir}/util" target="clean"/>
 
-    <exec os="SunOS" dir="${basedir}/dom" executable="make" 
-                     failonerror="yes">
-      <arg line="clean"/>
-    </exec>
-    <exec os="Linux" dir="${basedir}/dom" executable="make" 
-                     failonerror="yes">
-      <arg line="clean"/>
-    </exec>
-    <exec os="Windows 2000" dir="${basedir}/dom" executable="nmake" 
-                     failonerror="yes">
-      <arg line="-f makefile.win clean"/>
-    </exec>
+    <ant dir="${basedir}/dom" target="clean"/>
 
     <ant dir="${basedir}/webclient" target="clean"/>
 
diff --git a/mozilla/java/dom/build.xml b/mozilla/java/dom/build.xml
new file mode 100644
index 00000000000..a8f8d2ddafa
--- /dev/null
+++ b/mozilla/java/dom/build.xml
@@ -0,0 +1,206 @@
+<?xml version="1.0"?>
+
+<!--
+
+ * The contents of this file are subject to the Netscape 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/NPL/
+ *
+ * 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 Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+
+ * Ed Burns &gt;edburns@acm.org&lt;
+
+
+-->
+
+<project name="javadom" default="main" basedir=".">
+
+  <property name="Name" value="javadom"/>
+  <property name="name" value="javadom"/>
+  <property name="version" value="20030111"/>
+
+<!-- ************ Per user local properties ******************************* -->
+
+  <property file="${user.home}/build.properties"/>   <!-- User local        -->
+  <property file="build.properties"/>                <!-- Component local   -->
+  <property file="../build.properties"/>         <!-- java-supplement local -->
+  <property environment="myenv" />
+
+<!-- ************ Compiler Defaults *************************************** -->
+
+  <!-- Should Java compilations set the 'debug' compiler option? -->
+  <property name="compile.debug" value="true"/>
+
+  <!-- Should Java compilations set the 'deprecation' compiler option? -->
+  <property name="compile.deprecation" value="false"/>
+
+  <!-- Should Java compilations set the 'optimize' compiler option? -->
+  <property name="compile.optimize" value="false"/>
+
+<!-- ************ Where are we building into? ***************************** -->
+
+  <!-- The base directory for component sources -->
+  <property name="source.home" value="${basedir}/classes"/>
+
+  <!-- Construct compile classpath -->
+  <path id="compile.classpath">
+    <pathelement location="${build.home}"/>
+  </path>
+
+  <target name="main" 
+          depends="compile.classes,compile.src"/> <!--,compile.jni"/>-->
+
+  <target name="compile.classes">
+
+    <javac destdir="${build.home}"
+             debug="${compile.debug}"
+       deprecation="${compile.deprecation}"
+          optimize="${compile.optimize}">
+      <classpath refid="compile.classpath"/>
+      <src path="${source.home}"/>
+
+    </javac>
+
+  </target>
+
+  <target name="compile.src">
+
+    <exec os="SunOS" dir="${basedir}/src" failonerror="yes" 
+                     executable="gmake"/>
+    <exec os="Linux" dir="${basedir}/src" failonerror="yes" 
+                     executable="make"/>
+    <exec os="Windows 2000" dir="${basedir}/src" executable="make" 
+                     failonerror="yes"/>
+
+  </target>
+
+  <target name="compile.javah.headers" depends="compile.javah.canvas.headers">
+
+    <javah outputFile="${basedir}/src_share/BookmarksImpl.h"
+           class="org.mozilla.webclient.wrapper_native.BookmarksImpl">
+      <classpath refid="compile.classpath"/>
+    </javah>
+    <javah outputFile="${basedir}/src_share/PreferencesImpl.h"
+           class="org.mozilla.webclient.wrapper_native.PreferencesImpl">
+      <classpath refid="compile.classpath"/>
+    </javah>
+    <javah outputFile="${basedir}/src_share/CurrentPageImpl.h"
+           class="org.mozilla.webclient.wrapper_native.CurrentPageImpl">
+      <classpath refid="compile.classpath"/>
+    </javah>
+    <javah outputFile="${basedir}/src_share/HistoryImpl.h"
+           class="org.mozilla.webclient.wrapper_native.HistoryImpl">
+      <classpath refid="compile.classpath"/>
+    </javah>
+    <javah outputFile="${basedir}/src_share/WrapperFactoryImpl.h"
+           class="org.mozilla.webclient.wrapper_native.WrapperFactoryImpl">
+      <classpath refid="compile.classpath"/>
+    </javah>
+    <javah outputFile="${basedir}/src_share/NavigationImpl.h"
+           class="org.mozilla.webclient.wrapper_native.NavigationImpl">
+      <classpath refid="compile.classpath"/>
+    </javah>
+    <javah outputFile="${basedir}/src_share/RDFEnumeration.h"
+           class="org.mozilla.webclient.wrapper_native.RDFEnumeration">
+      <classpath refid="compile.classpath"/>
+    </javah>
+    <javah outputFile="${basedir}/src_share/RDFTreeNode.h"
+           class="org.mozilla.webclient.wrapper_native.RDFTreeNode">
+      <classpath refid="compile.classpath"/>
+    </javah>
+    <javah outputFile="${basedir}/src_share/ISupportsPeer.h"
+           class="org.mozilla.webclient.wrapper_native.ISupportsPeer">
+      <classpath refid="compile.classpath"/>
+    </javah>
+    <javah outputFile="${basedir}/src_share/WindowControlImpl.h"
+           class="org.mozilla.webclient.wrapper_native.WindowControlImpl">
+      <classpath refid="compile.classpath"/>
+    </javah>
+    <javah outputFile="${basedir}/src_share/NativeEventThread.h"
+           class="org.mozilla.webclient.wrapper_native.NativeEventThread">
+      <classpath refid="compile.classpath"/>
+    </javah>
+  </target>
+
+  <target name="compile.javah.canvas.headers" 
+          depends="compile.unix.canvas.headers,compile.win32.canvas.headers"/>
+
+  <target name="compile.unix.canvas.headers" if="build.unix.classes">
+
+    <javah outputFile="${basedir}/src_moz/gtk/GtkBrowserControlCanvas.h"
+      class="org.mozilla.webclient.wrapper_native.gtk.GtkBrowserControlCanvas">
+      <classpath refid="compile.classpath"/>
+    </javah>
+
+  </target>
+
+  <target name="compile.win32.canvas.headers" if="build.win32.classes">
+
+    <javah outputFile="${basedir}/src_moz/win32/Win32BrowserControlCanvas.h"
+      class="org.mozilla.webclient.wrapper_native.win32.Win32BrowserControlCanvas">
+      <classpath refid="compile.classpath"/>
+    </javah>
+
+  </target>
+
+  <target name="clean">
+
+    <exec os="SunOS" dir="${basedir}/src" executable="gmake" 
+          failonerror="yes">
+
+      <arg line="clobber_all"/>
+
+    </exec>
+    <exec os="Linux" dir="${basedir}/src" executable="make" 
+          failonerror="yes">
+
+      <arg line="clobber_all"/>
+
+    </exec>
+    <exec os="Windows 2000" dir="${basedir}/src" executable="make" 
+                     failonerror="yes">
+      <arg line="clobber_all"/>
+    </exec>
+
+    <exec os="SunOS" dir="${basedir}/jni" executable="gmake" 
+          failonerror="yes">
+
+      <arg line="clobber_all"/>
+
+    </exec>
+    <exec os="Linux" dir="${basedir}/jni" executable="make" 
+          failonerror="yes">
+
+      <arg line="clobber_all"/>
+
+    </exec>
+    <exec os="Windows 2000" dir="${basedir}/jni" executable="make" 
+                     failonerror="yes">
+      <arg line="clobber_all"/>
+    </exec>
+
+
+    <delete dir="${build.home}/org/mozilla/dom"/>
+
+  </target>
+
+  <target name="run.test" depends="main" description="Run unit tests">
+
+    <ant antfile="build-tests.xml" target="run.test"/>
+    
+  </target>
+
+</project>
diff --git a/mozilla/java/dom/src/Makefile.in b/mozilla/java/dom/src/Makefile.in
index bc6ae23f737..701bcc66af4 100644
--- a/mozilla/java/dom/src/Makefile.in
+++ b/mozilla/java/dom/src/Makefile.in
@@ -63,6 +63,9 @@ ifeq ($(OS_ARCH),Linux)
 	-Xlinker -rpath $(JAVAHOME)/jre/lib/i386/native_threads \
 	-ljvm -lhpi
  DEFINES	+= -DDISABLE_JIT
+else
+ifeq ($(OS_ARCH),WINNT)
+ INCLUDES	+= -I$(JAVAHOME)/include -I$(JAVAHOME)/include/win32/
 else
  INCLUDES	+= -I$(JAVAHOME)/include -I$(JAVAHOME)/include/solaris
  DSO_LDOPTS	+= \
@@ -74,6 +77,9 @@ else
 	-R$(JAVAHOME)/jre/lib/sparc/native_threads \
 	-ljvm -lhpi
 endif
+endif
+
+# ifeq (($OS_ARCH),SunOS)
 
 EXPORTS 	= \
 	nsIJavaDOM.h 
diff --git a/mozilla/java/webclient/build.xml b/mozilla/java/webclient/build.xml
index 953f40aa6aa..b353927d1a0 100644
--- a/mozilla/java/webclient/build.xml
+++ b/mozilla/java/webclient/build.xml
@@ -219,9 +219,9 @@
       <arg line="clobber_all"/>
 
     </exec>
-    <exec os="Windows 2000" dir="${basedir}/src_moz" executable="nmake" 
+    <exec os="Windows 2000" dir="${basedir}/src_moz" executable="make" 
                      failonerror="yes">
-      <arg line="-f makefile.win clobber_all"/>
+      <arg line="clobber_all"/>
     </exec>
 
     <exec os="SunOS" dir="${basedir}/src_share" executable="gmake"
@@ -236,9 +236,9 @@
       <arg line="clobber_all"/>
 
     </exec>
-    <exec os="Windows 2000" dir="${basedir}/src_share" executable="nmake" 
+    <exec os="Windows 2000" dir="${basedir}/src_share" executable="make" 
                      failonerror="yes">
-      <arg line="-f makefile.win clobber_all"/>
+      <arg line="clobber_all"/>
     </exec>
 
     <delete >