diff --git a/mozilla/base/src/nsBaseDLL.cpp b/mozilla/base/src/nsBaseDLL.cpp
index 25b78215be0..1503ff89d12 100644
--- a/mozilla/base/src/nsBaseDLL.cpp
+++ b/mozilla/base/src/nsBaseDLL.cpp
@@ -22,7 +22,7 @@
 #include "nsProperties.h"
 #include "nsRepository.h"
 
-extern "C" PRInt32 gLockCount = 0;
+PRInt32 gLockCount = 0;
 
 NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
 
diff --git a/mozilla/base/src/nsBaseDLL.h b/mozilla/base/src/nsBaseDLL.h
index ebab1c735f5..208a7c64513 100644
--- a/mozilla/base/src/nsBaseDLL.h
+++ b/mozilla/base/src/nsBaseDLL.h
@@ -21,6 +21,6 @@
 
 #include "prtypes.h"
 
-extern "C" PRInt32 gLockCount;
+extern PRInt32 gLockCount;
 
 #endif /* nsBaseDLL_h___ */
diff --git a/mozilla/base/src/nsProperties.cpp b/mozilla/base/src/nsProperties.cpp
index 5725c601914..f95bf4bee5b 100644
--- a/mozilla/base/src/nsProperties.cpp
+++ b/mozilla/base/src/nsProperties.cpp
@@ -32,7 +32,7 @@ class nsProperties : public nsIProperties
 {
 public:
   nsProperties();
-  ~nsProperties();
+  virtual ~nsProperties();
 
   NS_DECL_ISUPPORTS
 
diff --git a/mozilla/xpcom/ds/nsProperties.cpp b/mozilla/xpcom/ds/nsProperties.cpp
index 5725c601914..f95bf4bee5b 100644
--- a/mozilla/xpcom/ds/nsProperties.cpp
+++ b/mozilla/xpcom/ds/nsProperties.cpp
@@ -32,7 +32,7 @@ class nsProperties : public nsIProperties
 {
 public:
   nsProperties();
-  ~nsProperties();
+  virtual ~nsProperties();
 
   NS_DECL_ISUPPORTS