diff --git a/mozilla/modules/staticmod/Makefile.in b/mozilla/modules/staticmod/Makefile.in
index 610a06dcbb8..484a98d0108 100644
--- a/mozilla/modules/staticmod/Makefile.in
+++ b/mozilla/modules/staticmod/Makefile.in
@@ -94,15 +94,15 @@ list:
 ifdef MOZ_STATIC_COMPONENTS
 nsStaticModule.cpp: nsStaticModule.cpp.in Makefile Makefile.in $(DEPTH)/config/autoconf.mk
 	rm -f $@
-	cat $< | sed -e "s|@COMPONENT_NS_GET_MODULE@|$(foreach m, $(MOZ_STATIC_COMPONENTS), REGISTER_MODULE_USING($(m)_NSGetModule);)|" | \
-	sed -e "s|@COMPONENT_LIST@|$(foreach m, $(MOZ_STATIC_COMPONENTS), { $(m)_NSGM_comps, $(m)_NSGM_comp_count }, )|" | \
-	sed -e "s|@DECLARE_COMPONENT_LIST@|$(foreach m,$(MOZ_STATIC_COMPONENTS), extern \"C\" nsresult $(m)_NSGetModule(nsIComponentManager *servMgr, nsIFile* aPath, nsIModule** return_cobj); extern nsModuleComponentInfo*  $(m)_NSGM_comps; extern PRUint32 $(m)_NSGM_comp_count;)|" > $@
+	cat $< | sed -e "s|%COMPONENT_NS_GET_MODULE%|$(foreach m, $(MOZ_STATIC_COMPONENTS), REGISTER_MODULE_USING($(m)_NSGetModule);)|" | \
+	sed -e "s|%COMPONENT_LIST%|$(foreach m, $(MOZ_STATIC_COMPONENTS), { $(m)_NSGM_comps, $(m)_NSGM_comp_count }, )|" | \
+	sed -e "s|%DECLARE_COMPONENT_LIST%|$(foreach m,$(MOZ_STATIC_COMPONENTS), extern \"C\" nsresult $(m)_NSGetModule(nsIComponentManager *servMgr, nsIFile* aPath, nsIModule** return_cobj); extern nsModuleComponentInfo*  $(m)_NSGM_comps; extern PRUint32 $(m)_NSGM_comp_count;)|" > $@
 endif
 
 nsMetaModule_%.cpp: nsMetaModule_%.cpp.in Makefile Makefile.in $(topsrcdir)/config/config.mk
 	rm -f $@
 	cat $< | \
-	sed -e "s|@COMPONENT_NS_GET_MODULE@|$(foreach m, $($(_META_COMPONENT_NAMES)), REGISTER_MODULE_USING($(m)_NSGetModule);)|" | \
-	sed -e "s|@COMPONENT_LIST@|$(foreach m, $($(_META_COMPONENT_NAMES)), { $(m)_NSGM_comps, $(m)_NSGM_comp_count }, )|" | \
-	sed -e "s|@DECLARE_COMPONENT_LIST@|$(foreach m,$($(_META_COMPONENT_NAMES)), extern \"C\" nsresult $(m)_NSGetModule(nsIComponentManager *servMgr, nsIFile* aPath, nsIModule** return_cobj); extern nsModuleComponentInfo*  $(m)_NSGM_comps; extern PRUint32 $(m)_NSGM_comp_count;)|" > $@
+	sed -e "s|%COMPONENT_NS_GET_MODULE%|$(foreach m, $($(_META_COMPONENT_NAMES)), REGISTER_MODULE_USING($(m)_NSGetModule);)|" | \
+	sed -e "s|%COMPONENT_LIST%|$(foreach m, $($(_META_COMPONENT_NAMES)), { $(m)_NSGM_comps, $(m)_NSGM_comp_count }, )|" | \
+	sed -e "s|%DECLARE_COMPONENT_LIST%|$(foreach m,$($(_META_COMPONENT_NAMES)), extern \"C\" nsresult $(m)_NSGetModule(nsIComponentManager *servMgr, nsIFile* aPath, nsIModule** return_cobj); extern nsModuleComponentInfo*  $(m)_NSGM_comps; extern PRUint32 $(m)_NSGM_comp_count;)|" > $@
 
diff --git a/mozilla/modules/staticmod/nsMetaModule_crypto.cpp.in b/mozilla/modules/staticmod/nsMetaModule_crypto.cpp.in
index 61c6e1d13c4..9fe52ce32da 100644
--- a/mozilla/modules/staticmod/nsMetaModule_crypto.cpp.in
+++ b/mozilla/modules/staticmod/nsMetaModule_crypto.cpp.in
@@ -53,7 +53,7 @@ struct nsModuleComponentInfoContainer {
     PRUint32                    count;
 };
 
-@DECLARE_COMPONENT_LIST@
+%DECLARE_COMPONENT_LIST%
 
 static nsresult
 NS_RegisterMetaModules(nsIComponentManager *aCompMgr,
@@ -63,7 +63,7 @@ NS_RegisterMetaModules(nsIComponentManager *aCompMgr,
 {
     nsresult rv = NS_OK;
     
-    @COMPONENT_NS_GET_MODULE@
+    %COMPONENT_NS_GET_MODULE%
     
         {};
     
@@ -129,7 +129,7 @@ static nsModuleComponentInfo components[] =
 
 static nsModuleComponentInfoContainer componentsList[] = {
     { components, sizeof(components)/sizeof(components[0]) },
-    @COMPONENT_LIST@
+    %COMPONENT_LIST%
     { nsnull, 0 }
 };
 
diff --git a/mozilla/modules/staticmod/nsMetaModule_mail.cpp.in b/mozilla/modules/staticmod/nsMetaModule_mail.cpp.in
index 2ef3eb2fbe9..f81a784c775 100644
--- a/mozilla/modules/staticmod/nsMetaModule_mail.cpp.in
+++ b/mozilla/modules/staticmod/nsMetaModule_mail.cpp.in
@@ -53,7 +53,7 @@ struct nsModuleComponentInfoContainer {
     PRUint32                    count;
 };
 
-@DECLARE_COMPONENT_LIST@
+%DECLARE_COMPONENT_LIST%
 
 static nsresult
 NS_RegisterMetaModules(nsIComponentManager *aCompMgr,
@@ -63,7 +63,7 @@ NS_RegisterMetaModules(nsIComponentManager *aCompMgr,
 {
     nsresult rv = NS_OK;
     
-    @COMPONENT_NS_GET_MODULE@
+    %COMPONENT_NS_GET_MODULE%
     
         {};
     
@@ -128,7 +128,7 @@ static nsModuleComponentInfo components[] =
 
 static nsModuleComponentInfoContainer componentsList[] = {
     { components, sizeof(components)/sizeof(components[0]) },
-    @COMPONENT_LIST@
+    %COMPONENT_LIST%
     { nsnull, 0 }
 };
 
diff --git a/mozilla/modules/staticmod/nsStaticModule.cpp.in b/mozilla/modules/staticmod/nsStaticModule.cpp.in
index e7ea1099b30..39883fdf6d2 100644
--- a/mozilla/modules/staticmod/nsStaticModule.cpp.in
+++ b/mozilla/modules/staticmod/nsStaticModule.cpp.in
@@ -39,7 +39,7 @@ struct nsModuleComponentInfoContainer {
     PRUint32                    count;
 };
 
-@DECLARE_COMPONENT_LIST@
+%DECLARE_COMPONENT_LIST%
 
 static nsresult
 NS_RegisterStaticModules(nsIFile *aPath)
@@ -51,7 +51,7 @@ NS_RegisterStaticModules(nsIFile *aPath)
     
     NS_ASSERTION(NS_SUCCEEDED(rv), "Static mods cannot get global component manager.");
     
-    @COMPONENT_NS_GET_MODULE@
+    %COMPONENT_NS_GET_MODULE%
     
         {};
     
@@ -124,7 +124,7 @@ static nsModuleComponentInfo components[] =
 
 static nsModuleComponentInfoContainer componentsList[] = {
     { components, sizeof(components)/sizeof(components[0]) },
-    @COMPONENT_LIST@
+    %COMPONENT_LIST%
     { nsnull, 0 }
 };
 
diff --git a/mozilla/xpfe/bootstrap/Makefile.in b/mozilla/xpfe/bootstrap/Makefile.in
index 6d2b502cfeb..3fa2a4f0a8c 100644
--- a/mozilla/xpfe/bootstrap/Makefile.in
+++ b/mozilla/xpfe/bootstrap/Makefile.in
@@ -264,7 +264,7 @@ endif
 nsStaticComponents.cpp: nsStaticComponents.cpp.in Makefile Makefile.in $(FINAL_LINK_COMP_NAMES)
 	rm -f $@
 	cat $< | \
-	sed -e "s|@DECLARE_COMPONENTS@|$(foreach m,$(_COMPONENT_LIST),DECL_MODULE($(m));)|" | \
-	sed -e "s|@COMPONENT_LIST@|$(foreach m, $(_COMPONENT_LIST),MODULE($(m)),)|" \
+	sed -e "s|%DECLARE_COMPONENTS%|$(foreach m,$(_COMPONENT_LIST),DECL_MODULE($(m));)|" | \
+	sed -e "s|%COMPONENT_LIST%|$(foreach m, $(_COMPONENT_LIST),MODULE($(m)),)|" \
 	> $@
 
diff --git a/mozilla/xpfe/bootstrap/nsStaticComponents.cpp.in b/mozilla/xpfe/bootstrap/nsStaticComponents.cpp.in
index d0c9c146a07..2b042c78b7a 100644
--- a/mozilla/xpfe/bootstrap/nsStaticComponents.cpp.in
+++ b/mozilla/xpfe/bootstrap/nsStaticComponents.cpp.in
@@ -35,10 +35,10 @@ NSGETMODULE_ENTRY_POINT(name) (nsIComponentManager *aCompMgr,  \
                                nsIFile *aLocation,             \
                                nsIModule **aResult)
 
-@DECLARE_COMPONENTS@
+%DECLARE_COMPONENTS%
 
 static nsStaticModuleInfo StaticModuleInfo[] = {
-	@COMPONENT_LIST@
+	%COMPONENT_LIST%
 };
 
 nsresult PR_CALLBACK