--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -5512,17 +5512,17 @@ Database section 7.
     <h1><a id="ucal"></a>University of California License</h1>
 
     <p>This license applies to the following files or, in the case of
     directories, certain files in those directories:</p>
 
     <ul>
       <li class="path">dbm/</li>
       <li class="path">db/mork/src/morkQuickSort.cpp</li>
-      <li class="path">xpcom/glue/nsQuickSort.cpp</li>
+      <li class="path">xpcom/ds/nsQuickSort.cpp</li>
       <li class="path">nsprpub/pr/src/misc/praton.c</li>
       <li class="path">media/mtransport/third_party/nICEr/src/stun/addrs.c</li>
     </ul>
 
 <pre>
 Copyright (c) 1990, 1993
  The Regents of the University of California.  All rights reserved.
 

rename from xpcom/glue/Observer.h
rename to xpcom/ds/Observer.h

rename from xpcom/glue/PLDHashTable.cpp
rename to xpcom/ds/PLDHashTable.cpp

rename from xpcom/glue/PLDHashTable.h
rename to xpcom/ds/PLDHashTable.h

--- a/xpcom/ds/moz.build
+++ b/xpcom/ds/moz.build
@@ -40,52 +40,83 @@ if CONFIG['OS_ARCH'] == 'WINNT':
     SOURCES += [
         'nsWindowsRegKey.cpp'
     ]
 
 XPIDL_MODULE = 'xpcom_ds'
 
 EXPORTS += [
     'nsArray.h',
+    'nsArrayEnumerator.h',
+    'nsArrayUtils.h',
     'nsAtomService.h',
+    'nsBaseHashtable.h',
     'nsCharSeparatedTokenizer.h',
     'nsCheapSets.h',
+    'nsClassHashtable.h',
+    'nsCOMArray.h',
     'nsCRT.h',
+    'nsDataHashtable.h',
+    'nsDeque.h',
+    'nsEnumeratorUtils.h',
     'nsExpirationTracker.h',
+    'nsHashKeys.h',
     'nsHashPropertyBag.h',
+    'nsInterfaceHashtable.h',
+    'nsJSThingHashtable.h',
     'nsMathUtils.h',
+    'nsPointerHashKeys.h',
+    'nsQuickSort.h',
+    'nsRefPtrHashtable.h',
     'nsStaticAtom.h',
     'nsStaticNameTable.h',
     'nsStringEnumerator.h',
     'nsSupportsArray.h',
     'nsSupportsPrimitives.h',
+    'nsTArray-inl.h',
+    'nsTArray.h',
+    'nsTArrayForwardDeclare.h',
+    'nsTHashtable.h',
+    'nsTObserverArray.h',
+    'nsTPriorityQueue.h',
     'nsVariant.h',
     'nsWhitespaceTokenizer.h',
+    'PLDHashTable.h',
 ]
 
 EXPORTS.mozilla += [
+    'Observer.h',
     'StickyTimeDuration.h',
     'Tokenizer.h',
 ]
 
 UNIFIED_SOURCES += [
     'nsArray.cpp',
+    'nsArrayEnumerator.cpp',
+    'nsArrayUtils.cpp',
     'nsAtomService.cpp',
     'nsAtomTable.cpp',
+    'nsCOMArray.cpp',
     'nsCRT.cpp',
+    'nsDeque.cpp',
+    'nsEnumeratorUtils.cpp',
     'nsHashPropertyBag.cpp',
     'nsINIParserImpl.cpp',
     'nsObserverList.cpp',
     'nsObserverService.cpp',
     'nsProperties.cpp',
+    'nsQuickSort.cpp',
     'nsStringEnumerator.cpp',
     'nsSupportsArray.cpp',
     'nsSupportsArrayEnumerator.cpp',
     'nsSupportsPrimitives.cpp',
+    'nsTArray.cpp',
+    'nsTObserverArray.cpp',
     'nsVariant.cpp',
+    'PLDHashTable.cpp',
     'Tokenizer.cpp',
 ]
 
 # These two files cannot be built in unified mode because they use the
 # PL_ARENA_CONST_ALIGN_MASK macro with plarena.h.
 SOURCES += [
     'nsPersistentProperties.cpp',
     'nsStaticNameTable.cpp',

rename from xpcom/glue/nsArrayEnumerator.cpp
rename to xpcom/ds/nsArrayEnumerator.cpp

rename from xpcom/glue/nsArrayEnumerator.h
rename to xpcom/ds/nsArrayEnumerator.h

rename from xpcom/glue/nsArrayUtils.cpp
rename to xpcom/ds/nsArrayUtils.cpp

rename from xpcom/glue/nsArrayUtils.h
rename to xpcom/ds/nsArrayUtils.h

rename from xpcom/glue/nsBaseHashtable.h
rename to xpcom/ds/nsBaseHashtable.h

rename from xpcom/glue/nsCOMArray.cpp
rename to xpcom/ds/nsCOMArray.cpp

rename from xpcom/glue/nsCOMArray.h
rename to xpcom/ds/nsCOMArray.h

rename from xpcom/glue/nsClassHashtable.h
rename to xpcom/ds/nsClassHashtable.h

rename from xpcom/glue/nsDataHashtable.h
rename to xpcom/ds/nsDataHashtable.h

rename from xpcom/glue/nsDeque.cpp
rename to xpcom/ds/nsDeque.cpp

rename from xpcom/glue/nsDeque.h
rename to xpcom/ds/nsDeque.h

rename from xpcom/glue/nsEnumeratorUtils.cpp
rename to xpcom/ds/nsEnumeratorUtils.cpp

rename from xpcom/glue/nsEnumeratorUtils.h
rename to xpcom/ds/nsEnumeratorUtils.h

rename from xpcom/glue/nsHashKeys.h
rename to xpcom/ds/nsHashKeys.h

rename from xpcom/glue/nsInterfaceHashtable.h
rename to xpcom/ds/nsInterfaceHashtable.h

rename from xpcom/glue/nsJSThingHashtable.h
rename to xpcom/ds/nsJSThingHashtable.h

rename from xpcom/glue/nsPointerHashKeys.h
rename to xpcom/ds/nsPointerHashKeys.h

rename from xpcom/glue/nsQuickSort.cpp
rename to xpcom/ds/nsQuickSort.cpp

rename from xpcom/glue/nsQuickSort.h
rename to xpcom/ds/nsQuickSort.h

rename from xpcom/glue/nsRefPtrHashtable.h
rename to xpcom/ds/nsRefPtrHashtable.h

rename from xpcom/glue/nsTArray-inl.h
rename to xpcom/ds/nsTArray-inl.h

rename from xpcom/glue/nsTArray.cpp
rename to xpcom/ds/nsTArray.cpp

rename from xpcom/glue/nsTArray.h
rename to xpcom/ds/nsTArray.h

rename from xpcom/glue/nsTArrayForwardDeclare.h
rename to xpcom/ds/nsTArrayForwardDeclare.h

rename from xpcom/glue/nsTHashtable.h
rename to xpcom/ds/nsTHashtable.h

rename from xpcom/glue/nsTObserverArray.cpp
rename to xpcom/ds/nsTObserverArray.cpp

rename from xpcom/glue/nsTObserverArray.h
rename to xpcom/ds/nsTObserverArray.h

rename from xpcom/glue/nsTPriorityQueue.h
rename to xpcom/ds/nsTPriorityQueue.h

--- a/xpcom/glue/moz.build
+++ b/xpcom/glue/moz.build
@@ -6,54 +6,32 @@
 
 with Files('nsString*'):
     BUG_COMPONENT = ('Core', 'String')
 
 DIRS += ['standalone']
 
 EXPORTS += [
     'MainThreadUtils.h',
-    'nsArrayEnumerator.h',
-    'nsArrayUtils.h',
-    'nsBaseHashtable.h',
     'nsCategoryCache.h',
-    'nsClassHashtable.h',
-    'nsCOMArray.h',
     'nsComponentManagerUtils.h',
-    'nsDataHashtable.h',
-    'nsDeque.h',
-    'nsEnumeratorUtils.h',
-    'nsHashKeys.h',
-    'nsInterfaceHashtable.h',
-    'nsJSThingHashtable.h',
-    'nsPointerHashKeys.h',
     'nsProxyRelease.h',
-    'nsQuickSort.h',
-    'nsRefPtrHashtable.h',
     'nsServiceManagerUtils.h',
     'nsStringAPI.h',
     'nsStringGlue.h',
-    'nsTArray-inl.h',
-    'nsTArray.h',
-    'nsTArrayForwardDeclare.h',
     'nsTextFormatter.h',
-    'nsTHashtable.h',
     'nsThreadUtils.h',
-    'nsTObserverArray.h',
-    'nsTPriorityQueue.h',
     'nsXPTCUtils.h',
-    'PLDHashTable.h',
 ]
 
 EXPORTS.mozilla += [
     'BlockingResourceBase.h',
     'CondVar.h',
     'DeadlockDetector.h',
     'FileUtils.h',
     'GenericFactory.h',
     'Monitor.h',
     'Mutex.h',
-    'Observer.h',
     'ReentrantMonitor.h',
 ]
 
 if CONFIG['ENABLE_TESTS']:
     DIRS += ['tests/gtest']

--- a/xpcom/glue/objs.mozbuild
+++ b/xpcom/glue/objs.mozbuild
@@ -1,28 +1,19 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 xpcom_glue_src_lcppsrcs = [
     'FileUtils.cpp',
-    'nsArrayEnumerator.cpp',
-    'nsArrayUtils.cpp',
     'nsCategoryCache.cpp',
-    'nsCOMArray.cpp',
     'nsComponentManagerUtils.cpp',
-    'nsDeque.cpp',
-    'nsEnumeratorUtils.cpp',
-    'nsQuickSort.cpp',
-    'nsTArray.cpp',
     'nsThreadUtils.cpp',
-    'nsTObserverArray.cpp',
-    'PLDHashTable.cpp',
     'XREAppData.cpp',
 ]
 
 xpcom_glue_src_cppsrcs = [
     '/xpcom/glue/%s' % s for s in xpcom_glue_src_lcppsrcs
 ]
 
 xpcom_gluens_src_lcppsrcs = [