diff --git a/mozilla/embedding/config/basebrowser-mac-cfm b/mozilla/embedding/config/basebrowser-mac-cfm
index 89274670d76..c8f3d114f3f 100644
--- a/mozilla/embedding/config/basebrowser-mac-cfm
+++ b/mozilla/embedding/config/basebrowser-mac-cfm
@@ -235,7 +235,6 @@ Components:nsIStringBundle.xpt
 
 ; required prefs files
 defaults:pref:all.js
-defaults:pref:initpref.js
 defaults:pref:macprefs.js
 
 ; uriloader
diff --git a/mozilla/embedding/config/basebrowser-mac-cfmDebug b/mozilla/embedding/config/basebrowser-mac-cfmDebug
index 8013efca543..066ea33912d 100644
--- a/mozilla/embedding/config/basebrowser-mac-cfmDebug
+++ b/mozilla/embedding/config/basebrowser-mac-cfmDebug
@@ -235,7 +235,6 @@ Components:nsIStringBundle.xpt
 
 ; required prefs files
 defaults:pref:all.js
-defaults:pref:initpref.js
 defaults:pref:macprefs.js
 
 ; uriloader
diff --git a/mozilla/embedding/config/basebrowser-mac-macho b/mozilla/embedding/config/basebrowser-mac-macho
index d23da5c1ae6..234c9bce86b 100644
--- a/mozilla/embedding/config/basebrowser-mac-macho
+++ b/mozilla/embedding/config/basebrowser-mac-macho
@@ -222,8 +222,8 @@ components/libstrres.dylib
 
 ; required prefs files
 defaults/pref/all.js
-defaults/pref/initpref.js
-defaults/pref/unix.js
+defaults/pref/macprefs.js
+defaults/pref/macxprefs.js
 
 ; uriloader
 components/liburiloader.dylib
diff --git a/mozilla/embedding/config/basebrowser-unix b/mozilla/embedding/config/basebrowser-unix
index 43f8e1bd1fb..10321eff43f 100644
--- a/mozilla/embedding/config/basebrowser-unix
+++ b/mozilla/embedding/config/basebrowser-unix
@@ -235,7 +235,6 @@ components/libstrres.so
 
 ; required prefs files
 defaults/pref/all.js
-defaults/pref/initpref.js
 defaults/pref/unix.js
 
 ; uriloader
diff --git a/mozilla/embedding/config/basebrowser-win b/mozilla/embedding/config/basebrowser-win
index b796b726e6d..e96aef3dc38 100644
--- a/mozilla/embedding/config/basebrowser-win
+++ b/mozilla/embedding/config/basebrowser-win
@@ -252,7 +252,6 @@ components\strres.dll
 
 ; required prefs files
 defaults\pref\all.js
-defaults\pref\initpref.js
 defaults\pref\winpref.js
 
 ; uriloader
diff --git a/mozilla/embedding/tests/cocoaEmbed/CocoaEmbed.pbproj/project.pbxproj b/mozilla/embedding/tests/cocoaEmbed/CocoaEmbed.pbproj/project.pbxproj
index 767c8b03e1f..ace477f5565 100644
--- a/mozilla/embedding/tests/cocoaEmbed/CocoaEmbed.pbproj/project.pbxproj
+++ b/mozilla/embedding/tests/cocoaEmbed/CocoaEmbed.pbproj/project.pbxproj
@@ -282,6 +282,8 @@
 			files = (
 				080E96DCFE201CFB7F000001,
 				089C165EFE840E0CC02AAC07,
+				F51D673F02ABFDB701A968F5,
+				F51D674002ABFDB701A968F5,
 			);
 			isa = PBXResourcesBuildPhase;
 			name = "Bundle Resources";
@@ -350,6 +352,40 @@
 //4A2
 //4A3
 //4A4
+//F50
+//F51
+//F52
+//F53
+//F54
+		F51D673D02ABFDB601A968F5 = {
+			isa = PBXFileReference;
+			name = macprefs.js;
+			path = ../../../modules/libpref/src/mac/macprefs.js;
+			refType = 2;
+		};
+		F51D673E02ABFDB601A968F5 = {
+			isa = PBXFileReference;
+			name = macxprefs.js;
+			path = ../../../modules/libpref/src/mac/macxprefs.js;
+			refType = 2;
+		};
+		F51D673F02ABFDB701A968F5 = {
+			fileRef = F51D673D02ABFDB601A968F5;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		F51D674002ABFDB701A968F5 = {
+			fileRef = F51D673E02ABFDB601A968F5;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+//F50
+//F51
+//F52
+//F53
+//F54
 //F60
 //F61
 //F62
@@ -2083,8 +2119,8 @@
 		F6BD64FB01B3184301A962F7 = {
 			children = (
 				F6BD64FC01B3184301A962F7,
-				F6BD64FD01B3184301A962F7,
-				F6BD64FE01B3184301A962F7,
+				F51D673D02ABFDB601A968F5,
+				F51D673E02ABFDB601A968F5,
 			);
 			isa = PBXGroup;
 			name = "Gecko Defaults";
@@ -2097,18 +2133,6 @@
 			path = ../../../modules/libpref/src/init/all.js;
 			refType = 2;
 		};
-		F6BD64FD01B3184301A962F7 = {
-			isa = PBXFileReference;
-			name = initpref.js;
-			path = ../../../modules/libpref/src/initpref.js;
-			refType = 2;
-		};
-		F6BD64FE01B3184301A962F7 = {
-			isa = PBXFileReference;
-			name = unix.js;
-			path = ../../../modules/libpref/src/unix/unix.js;
-			refType = 2;
-		};
 		F6BD64FF01B3184301A962F7 = {
 			children = (
 				F6BD650001B3184301A962F7,
@@ -2233,8 +2257,6 @@
 			dstSubfolderSpec = 6;
 			files = (
 				F6BD652001B3184301A962F7,
-				F6BD652101B3184301A962F7,
-				F6BD652201B3184301A962F7,
 			);
 			isa = PBXCopyFilesBuildPhase;
 			name = "Copy Files";
@@ -2245,18 +2267,6 @@
 			settings = {
 			};
 		};
-		F6BD652101B3184301A962F7 = {
-			fileRef = F6BD64FD01B3184301A962F7;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		F6BD652201B3184301A962F7 = {
-			fileRef = F6BD64FE01B3184301A962F7;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		F6BD652301B3184301A962F7 = {
 			buildActionMask = 2147483647;
 			dstPath = chrome;