diff --git a/xpcom/threads/TimerThread.h b/xpcom/threads/TimerThread.h
index 9446bbe3b621..f65c501c50e8 100644
--- a/xpcom/threads/TimerThread.h
+++ b/xpcom/threads/TimerThread.h
@@ -19,6 +19,7 @@
 #include "mozilla/Atomics.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/Monitor.h"
+#include "mozilla/UniquePtr.h"
 
 #include <algorithm>
 
@@ -110,7 +111,8 @@ private:
     }
 
     static bool
-    UniquePtrLessThan(UniquePtr<Entry>& aLeft, UniquePtr<Entry>& aRight)
+    UniquePtrLessThan(mozilla::UniquePtr<Entry>& aLeft,
+                      mozilla::UniquePtr<Entry>& aRight)
     {
       // This is reversed because std::push_heap() sorts the "largest" to
       // the front of the heap.  We want that to be the earliest timer.
@@ -123,7 +125,7 @@ private:
     }
   };
 
-  nsTArray<UniquePtr<Entry>> mTimers;
+  nsTArray<mozilla::UniquePtr<Entry>> mTimers;
   uint32_t mAllowedEarlyFiringMicroseconds;
 };
 
diff --git a/xpcom/threads/nsTimerImpl.h b/xpcom/threads/nsTimerImpl.h
index a6c80ef2fa98..4b26cd21d80a 100644
--- a/xpcom/threads/nsTimerImpl.h
+++ b/xpcom/threads/nsTimerImpl.h
@@ -132,7 +132,7 @@ public:
   nsresult InitCommon(uint32_t aDelayMS, uint32_t aType,
                       Callback&& newCallback);
 
-  nsresult InitCommon(const TimeDuration& aDelay, uint32_t aType,
+  nsresult InitCommon(const mozilla::TimeDuration& aDelay, uint32_t aType,
                       Callback&& newCallback);
 
   Callback& GetCallback()
@@ -200,9 +200,9 @@ public:
   // Updated only after this timer has been removed from the timer thread.
   int32_t               mGeneration;
 
-  TimeDuration          mDelay;
+  mozilla::TimeDuration mDelay;
   // Updated only after this timer has been removed from the timer thread.
-  TimeStamp             mTimeout;
+  mozilla::TimeStamp    mTimeout;
 
 #ifdef MOZ_TASK_TRACER
   mozilla::tasktracer::TracedTaskCommon mTracedTask;