diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.h b/mozilla/modules/plugin/base/src/nsPluginHostImpl.h
index 2cc9619224d..474b8a7b2e2 100644
--- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.h
+++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.h
@@ -27,6 +27,7 @@
 #include "prlink.h"
 #include "nsIMalloc.h"
 #include "nsIFileUtilities.h"
+#include "nsPluginsDir.h"
 
 class ns4xPlugin;
 class nsNativeFileSpec;
@@ -57,7 +58,7 @@ public:
 
 class nsPluginHostImpl : public nsIPluginManager2,
                          public nsIPluginHost,
-						                   public nsIFileUtilities
+                         public nsIFileUtilities
 {
 public:
   nsPluginHostImpl(nsIServiceManager *serviceMgr);
@@ -223,7 +224,7 @@ private:
   nsPluginTag *mPlugins;
   nsIMalloc   *mMalloc;
   PRBool      mPluginsLoaded;
-  nsIServiceManager *mserviceMgr;
+  nsIServiceManager *mServiceMgr;
 };
 
 #endif
diff --git a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.h b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.h
index 2cc9619224d..474b8a7b2e2 100644
--- a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.h
+++ b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.h
@@ -27,6 +27,7 @@
 #include "prlink.h"
 #include "nsIMalloc.h"
 #include "nsIFileUtilities.h"
+#include "nsPluginsDir.h"
 
 class ns4xPlugin;
 class nsNativeFileSpec;
@@ -57,7 +58,7 @@ public:
 
 class nsPluginHostImpl : public nsIPluginManager2,
                          public nsIPluginHost,
-						                   public nsIFileUtilities
+                         public nsIFileUtilities
 {
 public:
   nsPluginHostImpl(nsIServiceManager *serviceMgr);
@@ -223,7 +224,7 @@ private:
   nsPluginTag *mPlugins;
   nsIMalloc   *mMalloc;
   PRBool      mPluginsLoaded;
-  nsIServiceManager *mserviceMgr;
+  nsIServiceManager *mServiceMgr;
 };
 
 #endif