diff --git a/mozilla/suite/profile/migration/src/nsNetscapeProfileMigratorBase.h b/mozilla/suite/profile/migration/src/nsNetscapeProfileMigratorBase.h
index 54397850b83..46b92ceccef 100644
--- a/mozilla/suite/profile/migration/src/nsNetscapeProfileMigratorBase.h
+++ b/mozilla/suite/profile/migration/src/nsNetscapeProfileMigratorBase.h
@@ -68,10 +68,10 @@ struct fileTransactionEntry {
 #define F(a) nsNetscapeProfileMigratorBase::a
 
 #define MAKEPREFTRANSFORM(pref, newpref, getmethod, setmethod) \
-  { pref, newpref, F(Get##getmethod), F(Set##setmethod), PR_FALSE, -1 }
+  { pref, newpref, F(Get##getmethod), F(Set##setmethod), PR_FALSE, { -1 } }
 
 #define MAKESAMETYPEPREFTRANSFORM(pref, method) \
-  { pref, 0, F(Get##method), F(Set##method), PR_FALSE, -1 }
+  { pref, 0, F(Get##method), F(Set##method), PR_FALSE, { -1 } }
 
 class nsNetscapeProfileMigratorBase : public nsISuiteProfileMigrator,
                                       public nsITimerCallback
@@ -87,8 +87,8 @@ public:
   typedef nsresult(*prefConverter)(PrefTransform*, nsIPrefBranch*);
 
   struct PrefTransform {
-    char*         sourcePrefName;
-    char*         targetPrefName;
+    const char*   sourcePrefName;
+    const char*   targetPrefName;
     prefConverter prefGetterFunc;
     prefConverter prefSetterFunc;
     PRBool        prefHasValue;
diff --git a/mozilla/suite/profile/migration/src/nsSuiteProfileMigratorUtils.h b/mozilla/suite/profile/migration/src/nsSuiteProfileMigratorUtils.h
index 82672797ad9..c45827fdd00 100644
--- a/mozilla/suite/profile/migration/src/nsSuiteProfileMigratorUtils.h
+++ b/mozilla/suite/profile/migration/src/nsSuiteProfileMigratorUtils.h
@@ -77,7 +77,7 @@ void SetProxyPref(const nsAString& aHostPort, const char* aPref,
                   const char* aPortPref, nsIPrefBranch* aPrefs);
 
 struct MigrationData {
-  char* fileName;
+  const char* fileName;
   PRUint32 sourceFlag;
   PRBool replaceOnly;
 };