diff --git a/extensions/xmlextras/Makefile.in b/extensions/xmlextras/Makefile.in
new file mode 100644
index 000000000000..8e40aed3642c
--- /dev/null
+++ b/extensions/xmlextras/Makefile.in
@@ -0,0 +1,31 @@
+# 
+# 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 Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH           = ../..
+topsrcdir       = @top_srcdir@
+srcdir          = @srcdir@
+VPATH           = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS            = base build
+
+include $(topsrcdir)/config/rules.mk
diff --git a/extensions/xmlextras/base/Makefile.in b/extensions/xmlextras/base/Makefile.in
new file mode 100644
index 000000000000..191fba41575f
--- /dev/null
+++ b/extensions/xmlextras/base/Makefile.in
@@ -0,0 +1,31 @@
+# 
+# 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 Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH           = ../../..
+topsrcdir       = @top_srcdir@
+srcdir          = @srcdir@
+VPATH           = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS            = public src
+
+include $(topsrcdir)/config/rules.mk
diff --git a/extensions/xmlextras/base/public/Makefile.in b/extensions/xmlextras/base/public/Makefile.in
new file mode 100644
index 000000000000..56f1c17b581d
--- /dev/null
+++ b/extensions/xmlextras/base/public/Makefile.in
@@ -0,0 +1,36 @@
+# 
+# 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 Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= xmlextras
+
+XPIDLSRCS	= \
+		nsIDOMSerializer.idl  \
+		nsIXMLHttpRequest.idl \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
diff --git a/extensions/xmlextras/base/public/nsIXMLHttpRequest.idl b/extensions/xmlextras/base/public/nsIXMLHttpRequest.idl
index 1b0580ff4b2b..3a51a3f6331d 100644
--- a/extensions/xmlextras/base/public/nsIXMLHttpRequest.idl
+++ b/extensions/xmlextras/base/public/nsIXMLHttpRequest.idl
@@ -27,9 +27,9 @@ interface nsIDOMEventListener;
 
 [scriptable, uuid(b7215e70-4157-11d4-9a42-000064657374)]
 interface nsIXMLHttpRequest : nsISupports {
-  noscript void addEventListener(in string type, 
+  [noscript] void addEventListener(in string type, 
                                  in nsIDOMEventListener listener);
-  noscript void removeEventListener(in string type,
+  [noscript] void removeEventListener(in string type,
                                     in nsIDOMEventListener listener);
   attribute nsISupports onload;
   attribute nsISupports onerror;
@@ -40,7 +40,7 @@ interface nsIXMLHttpRequest : nsISupports {
   void   abort();
   string getAllResponseHeaders();  
   string getResponseHeader(in string header);
-  noscript void   openRequest(in string method, 
+  [noscript] void   openRequest(in string method, 
                               in wstring url, 
                               in boolean async,
                               in string user, 
diff --git a/extensions/xmlextras/base/src/Makefile.in b/extensions/xmlextras/base/src/Makefile.in
new file mode 100644
index 000000000000..eedcf1dab470
--- /dev/null
+++ b/extensions/xmlextras/base/src/Makefile.in
@@ -0,0 +1,42 @@
+# 
+# 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 Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= xmlextras
+LIBRARY_NAME	= xmlextrasbase_s
+
+CPPSRCS	= 				\
+		nsDOMSerializer.cpp	\
+		nsXMLHttpRequest.cpp	\
+		$(NULL)
+
+# we don't want the shared lib, but we want to force the creation of a
+# static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
+
+include $(topsrcdir)/config/rules.mk
diff --git a/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp b/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp
index becb6eca4a6f..89744cd9ac4c 100644
--- a/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp
+++ b/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp
@@ -625,9 +625,9 @@ nsXMLHttpRequest::Open(const char *method, const PRUnichar *url)
     }
 
     if (argc > 2) {
-      JSBool bool;
-      JS_ValueToBoolean(cx, argv[2], &bool);
-      async = (PRBool)bool;
+      JSBool asyncBool;
+      JS_ValueToBoolean(cx, argv[2], &asyncBool);
+      async = (PRBool)asyncBool;
 
       if (argc > 3) {
         JSString* userStr;
diff --git a/extensions/xmlextras/build/Makefile.in b/extensions/xmlextras/build/Makefile.in
new file mode 100644
index 000000000000..136d318e127d
--- /dev/null
+++ b/extensions/xmlextras/build/Makefile.in
@@ -0,0 +1,31 @@
+# 
+# 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 Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH           = ../../..
+topsrcdir       = @top_srcdir@
+srcdir          = @srcdir@
+VPATH           = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS            = src
+
+include $(topsrcdir)/config/rules.mk
diff --git a/extensions/xmlextras/build/src/Makefile.in b/extensions/xmlextras/build/src/Makefile.in
new file mode 100644
index 000000000000..7189117fe436
--- /dev/null
+++ b/extensions/xmlextras/build/src/Makefile.in
@@ -0,0 +1,49 @@
+# 
+# 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 Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= xmlextras
+LIBRARY_NAME	= xmlextras
+IS_COMPONENT	= 1
+
+CPPSRCS		= nsXMLExtrasModule.cpp
+
+SHARED_LIBRARY_LIBS = \
+		$(DIST)/lib/libxmlextrasbase_s.$(LIB_SUFFIX) \
+		$(NULL)
+
+LOCAL_INCLUDES	= \
+		-I$(srcdir)/../../base/src \
+		$(NULL)
+
+EXTRA_DSO_LDOPTS = \
+		$(MOZ_COMPONENT_LIBS) \
+		$(ZLIB_LIBS) \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+