diff --git a/mozilla/java/build.properties.sample b/mozilla/java/build.properties.sample
index d04c49c82e8..e3aeafe06b1 100644
--- a/mozilla/java/build.properties.sample
+++ b/mozilla/java/build.properties.sample
@@ -1,3 +1,11 @@
-debug.jvm.args=-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n
+# Uncomment the following to enable attaching the debugger on win32
+#debug.jvm.args=-Xdebug -Xrunjdwp:transport=dt_shmem,address=jdbconn,server=y,suspend=n
+# Uncomment the following to enable attaching the debugger on Unix
+#debug.jvm.args=-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n
+
+# Uncomment the right one for your system
 build.unix.classes=true
+build.win32.classes=true
+
+# On win32, make sure to use \\ for \
 build.home=/home/edburns/Projects/mozilla/NETSCAPE_7_0_RTM_RELEASE/mozilla/dist/classes
diff --git a/mozilla/java/build.xml b/mozilla/java/build.xml
index 63c9d78641d..72360a08646 100644
--- a/mozilla/java/build.xml
+++ b/mozilla/java/build.xml
@@ -74,6 +74,10 @@
     <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>
 
   </target>
 
@@ -93,15 +97,18 @@
                      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}/webclient" target="clean"/>
 
   </target>
 
-    <ant dir="${basedir}/dist"/>
-
   <target name="dist">
 
+    <ant dir="${basedir}/dist"/>
 
   </target>
 
diff --git a/mozilla/java/webclient/build.xml b/mozilla/java/webclient/build.xml
index 7ae613066a2..a97dc3b2342 100644
--- a/mozilla/java/webclient/build.xml
+++ b/mozilla/java/webclient/build.xml
@@ -94,6 +94,10 @@
 
     <exec os="Linux" dir="${basedir}/src_share" failonerror="yes" 
                      executable="make"/>
+    <exec os="Windows 2000" dir="${basedir}/src_share" executable="nmake" 
+                     failonerror="yes">
+      <arg line="-f makefile.win"/>
+    </exec>
 
   </target>
 
@@ -159,8 +163,8 @@
 
   <target name="compile.win32.canvas.headers" if="build.win32.classes">
 
-    <javah outputFile="${basedir}/src_moz/gtk/GtkBrowserControlCanvas.h"
-      class="org.mozilla.webclient.wrapper_native.gtk.GtkBrowserControlCanvas">
+    <javah outputFile="${basedir}/src_moz/win32/Win32BrowserControlCanvas.h"
+      class="org.mozilla.webclient.wrapper_native.win32.Win32BrowserControlCanvas">
       <classpath refid="compile.classpath"/>
     </javah>
 
@@ -173,11 +177,19 @@
     <exec os="Linux" dir="${basedir}/src_moz" executable="make" 
                      failonerror="yes">
     </exec>
+    <exec os="Windows 2000" dir="${basedir}/src_moz" executable="nmake" 
+                     failonerror="yes">
+      <arg line="-f makefile.win"/>
+    </exec>
 
     <exec os="Linux" dir="${basedir}/src_moz" executable="make" 
                      failonerror="yes">
       <arg line="buildRunems"/>
     </exec>
+    <exec os="Windows 2000" dir="${basedir}/src_moz" executable="nmake" 
+                     failonerror="yes">
+      <arg line="-f makefile.win buildRunems"/>
+    </exec>
 
   </target>
 
@@ -192,6 +204,10 @@
       <arg line="clobber_all"/>
 
     </exec>
+    <exec os="Windows 2000" dir="${basedir}/src_moz" executable="nmake" 
+                     failonerror="yes">
+      <arg line="-f makefile.win clobber_all"/>
+    </exec>
 
     <exec os="Linux" dir="${basedir}/src_share" executable="make"
           failonerror="yes">
@@ -199,6 +215,10 @@
       <arg line="clobber_all"/>
 
     </exec>
+    <exec os="Windows 2000" dir="${basedir}/src_share" executable="nmake" 
+                     failonerror="yes">
+      <arg line="-f makefile.win clobber_all"/>
+    </exec>
 
     <delete >
       <fileset dir="${basedir}/src_share">
@@ -210,6 +230,7 @@
     </delete>
 
     <delete file="${basedir}/src_moz/gtk/GtkBrowserControlCanvas.h"/>
+    <delete file="${basedir}/src_moz/win32/Win32BrowserControlCanvas.h"/>
 
 
     <delete dir="${build.home}/org/mozilla/webclient"/>
diff --git a/mozilla/java/webclient/src_moz/win32/Win32BrowserControlCanvas.h b/mozilla/java/webclient/src_moz/win32/Win32BrowserControlCanvas.h
deleted file mode 100644
index dc11cda432e..00000000000
--- a/mozilla/java/webclient/src_moz/win32/Win32BrowserControlCanvas.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class org_mozilla_webclient_wrapper_0005fnative_win32_Win32BrowserControlCanvas */
-
-#ifndef _Included_org_mozilla_webclient_wrapper_0005fnative_win32_Win32BrowserControlCanvas
-#define _Included_org_mozilla_webclient_wrapper_0005fnative_win32_Win32BrowserControlCanvas
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Class:     org_mozilla_webclient_wrapper_0005fnative_win32_Win32BrowserControlCanvas
- * Method:    getHandleToPeer
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_org_mozilla_webclient_wrapper_1native_win32_Win32BrowserControlCanvas_getHandleToPeer
-  (JNIEnv *, jobject);
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif