--- a/xpcom/base/nsMemoryReporterManager.cpp
+++ b/xpcom/base/nsMemoryReporterManager.cpp
@@ -37,16 +37,17 @@
 #ifndef getpid
 #define getpid _getpid
 #endif
 #else
 #include <unistd.h>
 #endif
 
 using namespace mozilla;
+using namespace dom;
 
 #if defined(MOZ_MEMORY)
 #  define HAVE_JEMALLOC_STATS 1
 #  include "mozmemory.h"
 #endif  // MOZ_MEMORY
 
 #if defined(XP_LINUX)
 

--- a/xpcom/base/nsMemoryReporterManager.h
+++ b/xpcom/base/nsMemoryReporterManager.h
@@ -7,17 +7,17 @@
 #ifndef nsMemoryReporterManager_h__
 #define nsMemoryReporterManager_h__
 
 #include "mozilla/Mutex.h"
 #include "nsHashKeys.h"
 #include "nsIMemoryReporter.h"
 #include "nsITimer.h"
 #include "nsServiceManagerUtils.h"
-#include "nsTHashtable.h"
+#include "nsDataHashtable.h"
 
 namespace mozilla {
 class MemoryReportingProcess;
 namespace dom {
 class MemoryReport;
 } // namespace dom
 } // namespace mozilla