diff --git a/xpcom/glue/moz.build b/xpcom/glue/moz.build
index c81d098de635..ee043c94b000 100644
--- a/xpcom/glue/moz.build
+++ b/xpcom/glue/moz.build
@@ -10,27 +10,18 @@ with Files('nsString*'):
 DIRS += ['standalone']
 
 EXPORTS += [
-    'MainThreadUtils.h',
     'nsCategoryCache.h',
     'nsComponentManagerUtils.h',
-    'nsProxyRelease.h',
     'nsServiceManagerUtils.h',
     'nsStringAPI.h',
     'nsStringGlue.h',
     'nsTextFormatter.h',
-    'nsThreadUtils.h',
     'nsXPTCUtils.h',
 ]
 
 EXPORTS.mozilla += [
-    'BlockingResourceBase.h',
-    'CondVar.h',
-    'DeadlockDetector.h',
     'FileUtils.h',
     'GenericFactory.h',
-    'Monitor.h',
-    'Mutex.h',
-    'ReentrantMonitor.h',
 ]
 
 if CONFIG['ENABLE_TESTS']:
diff --git a/xpcom/glue/objs.mozbuild b/xpcom/glue/objs.mozbuild
index 36e6466bebc1..9fe2943e2e45 100644
--- a/xpcom/glue/objs.mozbuild
+++ b/xpcom/glue/objs.mozbuild
@@ -8,7 +8,6 @@ xpcom_glue_src_lcppsrcs = [
     'FileUtils.cpp',
     'nsCategoryCache.cpp',
     'nsComponentManagerUtils.cpp',
-    'nsThreadUtils.cpp',
     'XREAppData.cpp',
 ]
 
@@ -17,9 +16,7 @@ xpcom_glue_src_cppsrcs = [
 ]
 
 xpcom_gluens_src_lcppsrcs = [
-    'BlockingResourceBase.cpp',
     'GenericFactory.cpp',
-    'nsProxyRelease.cpp',
     'nsTextFormatter.cpp',
 ]
 
diff --git a/xpcom/glue/BlockingResourceBase.cpp b/xpcom/threads/BlockingResourceBase.cpp
similarity index 100%
rename from xpcom/glue/BlockingResourceBase.cpp
rename to xpcom/threads/BlockingResourceBase.cpp
diff --git a/xpcom/glue/BlockingResourceBase.h b/xpcom/threads/BlockingResourceBase.h
similarity index 100%
rename from xpcom/glue/BlockingResourceBase.h
rename to xpcom/threads/BlockingResourceBase.h
diff --git a/xpcom/glue/CondVar.h b/xpcom/threads/CondVar.h
similarity index 100%
rename from xpcom/glue/CondVar.h
rename to xpcom/threads/CondVar.h
diff --git a/xpcom/glue/DeadlockDetector.h b/xpcom/threads/DeadlockDetector.h
similarity index 100%
rename from xpcom/glue/DeadlockDetector.h
rename to xpcom/threads/DeadlockDetector.h
diff --git a/xpcom/glue/MainThreadUtils.h b/xpcom/threads/MainThreadUtils.h
similarity index 100%
rename from xpcom/glue/MainThreadUtils.h
rename to xpcom/threads/MainThreadUtils.h
diff --git a/xpcom/glue/Monitor.h b/xpcom/threads/Monitor.h
similarity index 100%
rename from xpcom/glue/Monitor.h
rename to xpcom/threads/Monitor.h
diff --git a/xpcom/glue/Mutex.h b/xpcom/threads/Mutex.h
similarity index 100%
rename from xpcom/glue/Mutex.h
rename to xpcom/threads/Mutex.h
diff --git a/xpcom/glue/ReentrantMonitor.h b/xpcom/threads/ReentrantMonitor.h
similarity index 100%
rename from xpcom/glue/ReentrantMonitor.h
rename to xpcom/threads/ReentrantMonitor.h
diff --git a/xpcom/threads/moz.build b/xpcom/threads/moz.build
index 8c596dd2707b..f15f5b544645 100644
--- a/xpcom/threads/moz.build
+++ b/xpcom/threads/moz.build
@@ -22,22 +22,31 @@ XPIDL_SOURCES += [
 XPIDL_MODULE = 'xpcom_threads'
 
 EXPORTS += [
+    'MainThreadUtils.h',
     'nsEventQueue.h',
     'nsICancelableRunnable.h',
     'nsIIncrementalRunnable.h',
     'nsMemoryPressure.h',
     'nsProcess.h',
+    'nsProxyRelease.h',
     'nsThread.h',
+    'nsThreadUtils.h',
 ]
 
 EXPORTS.mozilla += [
     'AbstractThread.h',
     'BackgroundHangMonitor.h',
+    'BlockingResourceBase.h',
+    'CondVar.h',
+    'DeadlockDetector.h',
     'HangAnnotations.h',
     'HangMonitor.h',
     'LazyIdleThread.h',
     'MainThreadIdlePeriod.h',
+    'Monitor.h',
     'MozPromise.h',
+    'Mutex.h',
+    'ReentrantMonitor.h',
     'SharedThreadPool.h',
     'StateMirroring.h',
     'StateWatching.h',
@@ -50,6 +59,7 @@ EXPORTS.mozilla += [
 UNIFIED_SOURCES += [
     'AbstractThread.cpp',
     'BackgroundHangMonitor.cpp',
+    'BlockingResourceBase.cpp',
     'HangAnnotations.cpp',
     'HangMonitor.cpp',
     'LazyIdleThread.cpp',
@@ -58,9 +68,11 @@ UNIFIED_SOURCES += [
     'nsEventQueue.cpp',
     'nsMemoryPressure.cpp',
     'nsProcessCommon.cpp',
+    'nsProxyRelease.cpp',
     'nsThread.cpp',
     'nsThreadManager.cpp',
     'nsThreadPool.cpp',
+    'nsThreadUtils.cpp',
     'nsTimerImpl.cpp',
     'SharedThreadPool.cpp',
     'TaskQueue.cpp',
diff --git a/xpcom/glue/nsProxyRelease.cpp b/xpcom/threads/nsProxyRelease.cpp
similarity index 100%
rename from xpcom/glue/nsProxyRelease.cpp
rename to xpcom/threads/nsProxyRelease.cpp
diff --git a/xpcom/glue/nsProxyRelease.h b/xpcom/threads/nsProxyRelease.h
similarity index 100%
rename from xpcom/glue/nsProxyRelease.h
rename to xpcom/threads/nsProxyRelease.h
diff --git a/xpcom/glue/nsThreadUtils.cpp b/xpcom/threads/nsThreadUtils.cpp
similarity index 100%
rename from xpcom/glue/nsThreadUtils.cpp
rename to xpcom/threads/nsThreadUtils.cpp
diff --git a/xpcom/glue/nsThreadUtils.h b/xpcom/threads/nsThreadUtils.h
similarity index 100%
rename from xpcom/glue/nsThreadUtils.h
rename to xpcom/threads/nsThreadUtils.h