--- a/browser/components/migration/src/nsIEHistoryEnumerator.h
+++ b/browser/components/migration/src/nsIEHistoryEnumerator.h
@@ -2,21 +2,22 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef iehistoryenumerator___h___
 #define iehistoryenumerator___h___
 
 #include <urlhist.h>
 
+#include "mozilla/Attributes.h"
 #include "nsISimpleEnumerator.h"
 #include "nsIWritablePropertyBag2.h"
 #include "nsAutoPtr.h"
 
-class nsIEHistoryEnumerator : public nsISimpleEnumerator
+class nsIEHistoryEnumerator MOZ_FINAL : public nsISimpleEnumerator
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSISIMPLEENUMERATOR
 
   nsIEHistoryEnumerator();
 
 private:

--- a/browser/components/shell/src/nsWindowsShellService.cpp
+++ b/browser/components/shell/src/nsWindowsShellService.cpp
@@ -130,19 +130,19 @@ OpenKeyForReading(HKEY aKeyRoot, const n
 //     shell\properties                 (default)         REG_SZ     <appname> &Options
 //     shell\properties\command         (default)         REG_SZ     <apppath> -preferences
 //     shell\safemode                   (default)         REG_SZ     <appname> &Safe Mode
 //     shell\safemode\command           (default)         REG_SZ     <apppath> -safe-mode
 //
 
 // The values checked are all default values so the value name is not needed.
 typedef struct {
-  char* keyName;
-  char* valueData;
-  char* oldValueData;
+  const char* keyName;
+  const char* valueData;
+  const char* oldValueData;
 } SETTING;
 
 #define APP_REG_NAME L"Firefox"
 #define VAL_FILE_ICON "%APPPATH%,1"
 #define VAL_OPEN "\"%APPPATH%\" -osint -url \"%1\""
 #define OLD_VAL_OPEN "\"%APPPATH%\" -requestPending -osint -url \"%1\""
 #define DI "\\DefaultIcon"
 #define SOC "\\shell\\open\\command"
@@ -312,17 +312,17 @@ nsWindowsShellService::ShortcutMaintenan
 
 static bool
 IsWin8OrLater()
 {
   OSVERSIONINFOW osInfo;
   osInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW);
   GetVersionExW(&osInfo);
   return osInfo.dwMajorVersion > 6 || 
-         osInfo.dwMajorVersion >= 6 && osInfo.dwMinorVersion >= 2;
+         (osInfo.dwMajorVersion >= 6 && osInfo.dwMinorVersion >= 2);
 }
 
 static bool
 IsAARDefaultHTTP(IApplicationAssociationRegistration* pAAR,
                  bool* aIsDefaultBrowser)
 {
   // Make sure the Prog ID matches what we have
   LPWSTR registeredApp;