diff --git a/java/webclient/src_moz/Makefile.in b/java/webclient/src_moz/Makefile.in
index 1d1eb51fc724..29ee61ed1003 100644
--- a/java/webclient/src_moz/Makefile.in
+++ b/java/webclient/src_moz/Makefile.in
@@ -71,49 +71,13 @@ EXTRA_DSO_LDOPTS += -L$(DEPTH)/dist/bin/components -lwidget_gtk -lwc_share
 INCLUDES := -I$(JDKHOME)/include -I$(JDKHOME)/include/solaris $(INCLUDES) \
 	-I$(DEPTH)/widget/src/gtk -I../src_share
 
-JAVAH_CLS= \
-	"-o BookmarksImpl.h org.mozilla.webclient.wrapper_native.BookmarksImpl" \
-	"-o CurrentPageImpl.h org.mozilla.webclient.wrapper_native.CurrentPageImpl" \
-	"-o HistoryImpl.h org.mozilla.webclient.wrapper_native.HistoryImpl" \
-	"-o WrapperFactoryImpl.h org.mozilla.webclient.wrapper_native.WrapperFactoryImpl" \
-	"-o NavigationImpl.h org.mozilla.webclient.wrapper_native.NavigationImpl" \
-	"-o RDFEnumeration.h org.mozilla.webclient.wrapper_native.RDFEnumeration" \
-	"-o RDFTreeNode.h org.mozilla.webclient.wrapper_native.RDFTreeNode" \
-	"-o ISupportsPeer.h org.mozilla.webclient.wrapper_native.ISupportsPeer" \
-	"-o WindowControlImpl.h org.mozilla.webclient.wrapper_native.WindowControlImpl" \
-	"-o NativeEventThread.h org.mozilla.webclient.wrapper_native.NativeEventThread" \
-	$(NULL)
-
-JAVAH_FILES=\
-	BookmarksImpl.h \
-	CurrentPageImpl.h \
-	HistoryImpl.h \
-	WrapperFactoryImpl.h \
-	NavigationImpl.h \
-	RDFEnumeration.h \
-	RDFTreeNode.h \
-	ISupportsPeer.h \
-	WindowControlImpl.h \
-	NativeEventThread.h \
-	$(NULL)
-
-JAVAH_PROG=$(JDKHOME)/bin/javah
-JAVAH_FLAGS=-jni -classpath $(CLASSPATH):$(JAVA_DESTPATH)
-
-export:: $(JAVAH_FILES) linkSetupRegistry
+export:: linkSetupRegistry
 
 linkSetupRegistry:
 	rm -f nsSetupRegistry.cpp
 	ln -s $(DEPTH)/xpfe/bootstrap/nsSetupRegistry.cpp .
 
-$(JAVAH_FILES): 
-	@for c in $(JAVAH_CLS); do \
-		echo $(JAVAH_PROG) $(JAVAH_FLAGS) $$c; \
-		$(JAVAH_PROG) $(JAVAH_FLAGS) $$c; \
-	done
-
 clobber_all::
-	rm -f $(JAVAH_FILES)
 	rm -f nsSetupRegistry.cpp
 
 buildRunems:
@@ -121,7 +85,7 @@ ifeq ($(BAL_INTERFACE),)
 	@echo +++ Creating runem.  Use this to run the test browser.
 	rm -f runem
 	@echo #!/bin/sh > runem
-	@echo $(PERL) runem.pl $(DIST)/bin org.mozilla.webclient.test.EmbeddedMozilla $(DEPTH) "$$"1 "$$"2 "$$"3 "$$"4 "$$"4 "$$"6 >> runem
+	@echo $(PERL) ../src_share/runem.pl $(DIST)/bin org.mozilla.webclient.test.EmbeddedMozilla $(DEPTH) "$$"1 "$$"2 "$$"3 "$$"4 "$$"4 "$$"6 >> runem
 	chmod 755 runem
 endif
 
diff --git a/java/webclient/src_moz/Makefile.win b/java/webclient/src_moz/Makefile.win
index 5503cd9d8b3d..7a41e3b44faf 100644
--- a/java/webclient/src_moz/Makefile.win
+++ b/java/webclient/src_moz/Makefile.win
@@ -84,12 +84,6 @@ WIN_LIBS = \
 
 include <$(DEPTH)\config\rules.mak>
 
-include <$(DEPTH)\java\config\localdefs.mak>
-
-!ifdef CLASSPATH
-JAVAC_CLASSPATH=$(JAVAC_CLASSPATH);$(CLASSPATH)
-!endif
-
 !ifdef BAL_INTERFACE
 INCS = \
 	-I..\bal\ \
@@ -112,47 +106,7 @@ INCS = \
 !CMDSWITCHES -S
 
 # generate the jni header
-export:: BookmarksImpl.h CurrentPageImpl.h HistoryImpl.h WrapperFactoryImpl.h WindowControlImpl.h NavigationImpl.h NativeEventThread.h RDFEnumeration.h RDFTreeNode.h ISupportsPeer.h nsSetupRegistry.cpp 
-
-BookmarksImpl.h:
-	@echo Assuming class org.mozilla.webclient.wrapper_native.BookmarksImpl is in $(JAVAH_FLAGS)
-	$(JAVAH) $(JAVAH_FLAGS)  -o $@ org.mozilla.webclient.wrapper_native.BookmarksImpl
-
-CurrentPageImpl.h:
-	@echo Assuming class org.mozilla.webclient.wrapper_native.CurrentPageImpl is in $(JAVAH_FLAGS)
-	$(JAVAH) $(JAVAH_FLAGS)  -o $@ org.mozilla.webclient.wrapper_native.CurrentPageImpl
-
-HistoryImpl.h:
-	@echo Assuming class org.mozilla.webclient.wrapper_native.HistoryImpl is in $(JAVAH_FLAGS)
-	$(JAVAH) $(JAVAH_FLAGS)  -o $@ org.mozilla.webclient.wrapper_native.HistoryImpl
-
-WrapperFactoryImpl.h:
-	@echo Assuming class org.mozilla.webclient.wrapper_native.WrapperFactoryImpl is in $(JAVAH_FLAGS)
-	$(JAVAH) $(JAVAH_FLAGS)  -o $@ org.mozilla.webclient.wrapper_native.WrapperFactoryImpl
-
-NavigationImpl.h:
-	@echo Assuming class org.mozilla.webclient.wrapper_native.NavigationImpl is in $(JAVAH_FLAGS)
-	$(JAVAH) $(JAVAH_FLAGS)  -o $@ org.mozilla.webclient.wrapper_native.NavigationImpl
-
-RDFEnumeration.h:
-	@echo Assuming class org.mozilla.webclient.wrapper_native.RDFEnumeration is in $(JAVAH_FLAGS)
-	$(JAVAH) $(JAVAH_FLAGS)  -o $@ org.mozilla.webclient.wrapper_native.RDFEnumeration
-
-RDFTreeNode.h:
-	@echo Assuming class org.mozilla.webclient.wrapper_native.RDFTreeNode is in $(JAVAH_FLAGS)
-	$(JAVAH) $(JAVAH_FLAGS)  -o $@ org.mozilla.webclient.wrapper_native.RDFTreeNode
-
-ISupportsPeer.h:
-	@echo Assuming class org.mozilla.webclient.wrapper_native.ISupportsPeer is in $(JAVAH_FLAGS)
-	$(JAVAH) $(JAVAH_FLAGS)  -o $@ org.mozilla.webclient.wrapper_native.ISupportsPeer
-
-WindowControlImpl.h:
-	@echo Assuming class org.mozilla.webclient.wrapper_native.WindowControlImpl is in $(JAVAH_FLAGS)
-	$(JAVAH) $(JAVAH_FLAGS)  -o $@ org.mozilla.webclient.wrapper_native.WindowControlImpl
-
-NativeEventThread.h:
-	@echo Assuming class org.mozilla.webclient.wrapper_native.NativeEventThread is in $(JAVAH_FLAGS)
-	$(JAVAH) $(JAVAH_FLAGS)  -o $@ org.mozilla.webclient.wrapper_native.NativeEventThread
+export:: nsSetupRegistry.cpp 
 
 nsSetupRegistry.cpp:
 	copy $(MOZ_SRC)\mozilla\xpfe\bootstrap\nsSetupRegistry.cpp
@@ -162,7 +116,7 @@ buildRunems:
 !else
 	@echo +++ Creating runem.bat.  Use this to run the test browser.
 	rm -f runem.bat
-	@echo $(PERL) runem.pl $(DIST)\bin org.mozilla.webclient.test.EmbeddedMozilla $(DEPTH) %1% >> runem.bat
+	@echo $(PERL) ..\src_share\runem.pl $(DIST)\bin org.mozilla.webclient.test.EmbeddedMozilla $(DEPTH) %1% >> runem.bat
 !endif
 
 install:: $(DLL) buildRunems
@@ -173,16 +127,6 @@ clobber_all:: clobber
 
 clobber::
 	rm -f $(DIST)\bin\$(DLLNAME).dll
-	rm -f BookmarksImpl.h
-	rm -f CurrentPageImpl.h
-	rm -f HistoryImpl.h
-	rm -f WrapperFactoryImpl.h
-	rm -f NavigationImpl.h
-	rm -f WindowControlImpl.h
-	rm -f NativeEventThread.h
-	rm -f RDFEnumeration.h
-	rm -f RDFTreeNode.h
-	rm -f ISupportsPeer.h
 	rm -f nsSetupRegistry.cpp
 	rm -f runem.bat
 
diff --git a/java/webclient/src_share/Makefile.in b/java/webclient/src_share/Makefile.in
index 89eb3571a28b..f7ee570c1283 100644
--- a/java/webclient/src_share/Makefile.in
+++ b/java/webclient/src_share/Makefile.in
@@ -44,3 +44,43 @@ override NO_STATIC_LIB=
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES := -I$(JDKHOME)/include -I$(JDKHOME)/include/solaris $(INCLUDES) 
+
+JAVAH_CLS= \
+	"-o BookmarksImpl.h org.mozilla.webclient.wrapper_native.BookmarksImpl" \
+	"-o CurrentPageImpl.h org.mozilla.webclient.wrapper_native.CurrentPageImpl" \
+	"-o HistoryImpl.h org.mozilla.webclient.wrapper_native.HistoryImpl" \
+	"-o WrapperFactoryImpl.h org.mozilla.webclient.wrapper_native.WrapperFactoryImpl" \
+	"-o NavigationImpl.h org.mozilla.webclient.wrapper_native.NavigationImpl" \
+	"-o RDFEnumeration.h org.mozilla.webclient.wrapper_native.RDFEnumeration" \
+	"-o RDFTreeNode.h org.mozilla.webclient.wrapper_native.RDFTreeNode" \
+	"-o ISupportsPeer.h org.mozilla.webclient.wrapper_native.ISupportsPeer" \
+	"-o WindowControlImpl.h org.mozilla.webclient.wrapper_native.WindowControlImpl" \
+	"-o NativeEventThread.h org.mozilla.webclient.wrapper_native.NativeEventThread" \
+	$(NULL)
+
+JAVAH_FILES=\
+	BookmarksImpl.h \
+	CurrentPageImpl.h \
+	HistoryImpl.h \
+	WrapperFactoryImpl.h \
+	NavigationImpl.h \
+	RDFEnumeration.h \
+	RDFTreeNode.h \
+	ISupportsPeer.h \
+	WindowControlImpl.h \
+	NativeEventThread.h \
+	$(NULL)
+
+JAVAH_PROG=$(JDKHOME)/bin/javah
+JAVAH_FLAGS=-jni -classpath $(CLASSPATH):$(JAVA_DESTPATH)
+
+export:: $(JAVAH_FILES)
+
+$(JAVAH_FILES): 
+	@for c in $(JAVAH_CLS); do \
+		echo $(JAVAH_PROG) $(JAVAH_FLAGS) $$c; \
+		$(JAVAH_PROG) $(JAVAH_FLAGS) $$c; \
+	done
+
+clobber_all::
+	rm -f $(JAVAH_FILES)
diff --git a/java/webclient/src_share/Makefile.win b/java/webclient/src_share/Makefile.win
index bdad70d17c48..d025e8c5a132 100644
--- a/java/webclient/src_share/Makefile.win
+++ b/java/webclient/src_share/Makefile.win
@@ -73,12 +73,74 @@ INCS = \
 	$(NULL)
 !endif
 
+include <$(DEPTH)\java\config\localdefs.mak>
+
+!ifdef CLASSPATH
+JAVAC_CLASSPATH=$(JAVAC_CLASSPATH);$(CLASSPATH)
+!endif
+
 !CMDSWITCHES -S
 
+# generate the jni header
+export:: BookmarksImpl.h CurrentPageImpl.h HistoryImpl.h WrapperFactoryImpl.h WindowControlImpl.h NavigationImpl.h NativeEventThread.h RDFEnumeration.h RDFTreeNode.h ISupportsPeer.h
+
+BookmarksImpl.h:
+	@echo Assuming class org.mozilla.webclient.wrapper_native.BookmarksImpl is in $(JAVAH_FLAGS)
+	$(JAVAH) $(JAVAH_FLAGS)  -o $@ org.mozilla.webclient.wrapper_native.BookmarksImpl
+
+
+CurrentPageImpl.h:
+	@echo Assuming class org.mozilla.webclient.wrapper_native.CurrentPageImpl is in $(JAVAH_FLAGS)
+	$(JAVAH) $(JAVAH_FLAGS)  -o $@ org.mozilla.webclient.wrapper_native.CurrentPageImpl
+
+HistoryImpl.h:
+	@echo Assuming class org.mozilla.webclient.wrapper_native.HistoryImpl is in $(JAVAH_FLAGS)
+	$(JAVAH) $(JAVAH_FLAGS)  -o $@ org.mozilla.webclient.wrapper_native.HistoryImpl
+
+WrapperFactoryImpl.h:
+	@echo Assuming class org.mozilla.webclient.wrapper_native.WrapperFactoryImpl is in $(JAVAH_FLAGS)
+	$(JAVAH) $(JAVAH_FLAGS)  -o $@ org.mozilla.webclient.wrapper_native.WrapperFactoryImpl
+
+NavigationImpl.h:
+	@echo Assuming class org.mozilla.webclient.wrapper_native.NavigationImpl is in $(JAVAH_FLAGS)
+	$(JAVAH) $(JAVAH_FLAGS)  -o $@ org.mozilla.webclient.wrapper_native.NavigationImpl
+
+RDFEnumeration.h:
+	@echo Assuming class org.mozilla.webclient.wrapper_native.RDFEnumeration is in $(JAVAH_FLAGS)
+	$(JAVAH) $(JAVAH_FLAGS)  -o $@ org.mozilla.webclient.wrapper_native.RDFEnumeration
+
+RDFTreeNode.h:
+	@echo Assuming class org.mozilla.webclient.wrapper_native.RDFTreeNode is in $(JAVAH_FLAGS)
+	$(JAVAH) $(JAVAH_FLAGS)  -o $@ org.mozilla.webclient.wrapper_native.RDFTreeNode
+
+ISupportsPeer.h:
+	@echo Assuming class org.mozilla.webclient.wrapper_native.ISupportsPeer is in $(JAVAH_FLAGS)
+	$(JAVAH) $(JAVAH_FLAGS)  -o $@ org.mozilla.webclient.wrapper_native.ISupportsPeer
+
+WindowControlImpl.h:
+	@echo Assuming class org.mozilla.webclient.wrapper_native.WindowControlImpl is in $(JAVAH_FLAGS)
+	$(JAVAH) $(JAVAH_FLAGS)  -o $@ org.mozilla.webclient.wrapper_native.WindowControlImpl
+
+NativeEventThread.h:
+	@echo Assuming class org.mozilla.webclient.wrapper_native.NativeEventThread is in $(JAVAH_FLAGS)
+	$(JAVAH) $(JAVAH_FLAGS)  -o $@ org.mozilla.webclient.wrapper_native.NativeEventThread
+
+
+
 install:: $(LIBRARY)
 	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).lib $(DIST)\lib
 
 clobber_all:: clobber
+	rm -f BookmarksImpl.h
+	rm -f CurrentPageImpl.h
+	rm -f HistoryImpl.h
+	rm -f WrapperFactoryImpl.h
+	rm -f NavigationImpl.h
+	rm -f WindowControlImpl.h
+	rm -f NativeEventThread.h
+	rm -f RDFEnumeration.h
+	rm -f RDFTreeNode.h
+	rm -f ISupportsPeer.h
 
 clobber::
 	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
diff --git a/java/webclient/src_moz/runem.pl b/java/webclient/src_share/runem.pl
similarity index 100%
rename from java/webclient/src_moz/runem.pl
rename to java/webclient/src_share/runem.pl