diff --git a/netwerk/wifi/nsWifiScannerSolaris.cpp b/netwerk/wifi/nsWifiScannerSolaris.cpp
index d55b500808ff..4a82f01942fb 100644
--- a/netwerk/wifi/nsWifiScannerSolaris.cpp
+++ b/netwerk/wifi/nsWifiScannerSolaris.cpp
@@ -38,7 +38,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsAutoPtr.h"
 #include "nsWifiMonitor.h"
 #include "nsWifiAccessPoint.h"
 
@@ -53,6 +52,8 @@
 #define DLADM_STRSIZE 256
 #define DLADM_SECTIONS 3
 
+using namespace mozilla;
+
 struct val_strength_t {
   const char *strength_name;
   int         signal_value;
@@ -173,7 +174,7 @@ nsWifiMonitor::DoScan()
     nsCOMArray<nsIWifiListener> currentListeners;
 
     {
-      nsAutoMonitor mon(mMonitor);
+      MonitorAutoEnter mon(mMonitor);
 
       for (PRUint32 i = 0; i < mListeners.Length(); i++) {
         if (!mListeners[i].mHasSentData || accessPointsChanged) {
@@ -222,7 +223,7 @@ nsWifiMonitor::DoScan()
 
     LOG(("waiting on monitor\n"));
 
-    nsAutoMonitor mon(mMonitor);
+    MonitorAutoEnter mon(mMonitor);
     mon.Wait(PR_SecondsToInterval(60));
   }