diff --git a/Sources/BitCollections/CMakeLists.txt b/Sources/BitCollections/CMakeLists.txt
index 2e9c3681d..06a2e7445 100644
--- a/Sources/BitCollections/CMakeLists.txt
+++ b/Sources/BitCollections/CMakeLists.txt
@@ -56,6 +56,7 @@ add_library(BitCollections
   "BitSet/BitSet+SetAlgebra subtracting.swift"
   "BitSet/BitSet+SetAlgebra symmetricDifference.swift"
   "BitSet/BitSet+SetAlgebra union.swift"
+  "BitSet/BitSet+Sorted Collection APIs.swift"
   "BitSet/BitSet.Counted.swift"
   "BitSet/BitSet.Index.swift"
   "BitSet/BitSet._UnsafeHandle.swift"
diff --git a/Sources/CMakeLists.txt b/Sources/CMakeLists.txt
index 5e48abb37..7db3a61bc 100644
--- a/Sources/CMakeLists.txt
+++ b/Sources/CMakeLists.txt
@@ -7,8 +7,8 @@ Licensed under Apache License v2.0 with Runtime Library Exception
 See https://swift.org/LICENSE.txt for license information
 #]]
 
-add_subdirectory(Collections)
 add_subdirectory(BitCollections)
+add_subdirectory(Collections)
 add_subdirectory(DequeModule)
 add_subdirectory(HeapModule)
 add_subdirectory(OrderedCollections)
diff --git a/Sources/Collections/CMakeLists.txt b/Sources/Collections/CMakeLists.txt
index e2194389c..2a948e7e1 100644
--- a/Sources/Collections/CMakeLists.txt
+++ b/Sources/Collections/CMakeLists.txt
@@ -8,7 +8,7 @@ See https://swift.org/LICENSE.txt for license information
 #]]
 
 add_library(Collections
-  Collections.swift)
+  "Collections.swift")
 target_link_libraries(Collections PRIVATE
   BitCollections
   DequeModule
diff --git a/Sources/HeapModule/CMakeLists.txt b/Sources/HeapModule/CMakeLists.txt
index 4c10b0913..9e0bb6daf 100644
--- a/Sources/HeapModule/CMakeLists.txt
+++ b/Sources/HeapModule/CMakeLists.txt
@@ -8,11 +8,12 @@ See https://swift.org/LICENSE.txt for license information
 #]]
 
 add_library(HeapModule
-  _Node.swift
-  Heap.swift
-  Heap+ExpressibleByArrayLiteral.swift
-  Heap+Invariants.swift
-  Heap+UnsafeHandle.swift)
+  "_Node.swift"
+  "Heap.swift"
+  "Heap+Descriptions.swift"
+  "Heap+ExpressibleByArrayLiteral.swift"
+  "Heap+Invariants.swift"
+  "Heap+UnsafeHandle.swift")
 target_link_libraries(HeapModule PRIVATE
   _CollectionsUtilities)
 set_target_properties(HeapModule PROPERTIES
diff --git a/Sources/OrderedCollections/CMakeLists.txt b/Sources/OrderedCollections/CMakeLists.txt
index f1cd5271b..5bae3f6b4 100644
--- a/Sources/OrderedCollections/CMakeLists.txt
+++ b/Sources/OrderedCollections/CMakeLists.txt
@@ -16,13 +16,13 @@ add_library(OrderedCollections
   "HashTable/_Hashtable+Header.swift"
   "HashTable/_HashTable+Testing.swift"
   "HashTable/_HashTable+UnsafeHandle.swift"
-  "OrderedDictionary/OrderedDictionary.Elements.swift"
   "OrderedDictionary/OrderedDictionary.swift"
   "OrderedDictionary/OrderedDictionary+Codable.swift"
   "OrderedDictionary/OrderedDictionary+CustomReflectable.swift"
   "OrderedDictionary/OrderedDictionary+Deprecations.swift"
   "OrderedDictionary/OrderedDictionary+Descriptions.swift"
-  "OrderedDictionary/OrderedDictionary+Elements+SubSequence.swift"
+  "OrderedDictionary/OrderedDictionary+Elements.SubSequence.swift"
+  "OrderedDictionary/OrderedDictionary+Elements.swift"
   "OrderedDictionary/OrderedDictionary+Equatable.swift"
   "OrderedDictionary/OrderedDictionary+ExpressibleByDictionaryLiteral.swift"
   "OrderedDictionary/OrderedDictionary+Hashable.swift"
@@ -33,7 +33,6 @@ add_library(OrderedCollections
   "OrderedDictionary/OrderedDictionary+Sendable.swift"
   "OrderedDictionary/OrderedDictionary+Sequence.swift"
   "OrderedDictionary/OrderedDictionary+Values.swift"
-  "OrderedSet/OrderedSet.swift"
   "OrderedSet/OrderedSet+Codable.swift"
   "OrderedSet/OrderedSet+CustomReflectable.swift"
   "OrderedSet/OrderedSet+Descriptions.swift"
@@ -46,14 +45,21 @@ add_library(OrderedCollections
   "OrderedSet/OrderedSet+Invariants.swift"
   "OrderedSet/OrderedSet+Partial MutableCollection.swift"
   "OrderedSet/OrderedSet+Partial RangeReplaceableCollection.swift"
+  "OrderedSet/OrderedSet+Partial SetAlgebra formIntersection.swift"
+  "OrderedSet/OrderedSet+Partial SetAlgebra formSymmetricDifference.swift"
+  "OrderedSet/OrderedSet+Partial SetAlgebra formUnion.swift"
+  "OrderedSet/OrderedSet+Partial SetAlgebra intersection.swift"
   "OrderedSet/OrderedSet+Partial SetAlgebra isDisjoint.swift"
   "OrderedSet/OrderedSet+Partial SetAlgebra isEqual.swift"
   "OrderedSet/OrderedSet+Partial SetAlgebra isStrictSubset.swift"
   "OrderedSet/OrderedSet+Partial SetAlgebra isStrictSuperset.swift"
   "OrderedSet/OrderedSet+Partial SetAlgebra isSubset.swift"
   "OrderedSet/OrderedSet+Partial SetAlgebra isSuperset.swift"
+  "OrderedSet/OrderedSet+Partial SetAlgebra subtract.swift"
+  "OrderedSet/OrderedSet+Partial SetAlgebra subtracting.swift"
+  "OrderedSet/OrderedSet+Partial SetAlgebra symmetricDifference.swift"
+  "OrderedSet/OrderedSet+Partial SetAlgebra union.swift"
   "OrderedSet/OrderedSet+Partial SetAlgebra+Basics.swift"
-  "OrderedSet/OrderedSet+Partial SetAlgebra+Operations.swift"
   "OrderedSet/OrderedSet+RandomAccessCollection.swift"
   "OrderedSet/OrderedSet+ReserveCapacity.swift"
   "OrderedSet/OrderedSet+Sendable.swift"
@@ -61,6 +67,7 @@ add_library(OrderedCollections
   "OrderedSet/OrderedSet+Testing.swift"
   "OrderedSet/OrderedSet+UnorderedView.swift"
   "OrderedSet/OrderedSet+UnstableInternals.swift"
+  "OrderedSet/OrderedSet.swift"
   "Utilities/_UnsafeBitset.swift"
   )
 target_link_libraries(OrderedCollections PRIVATE
diff --git a/Sources/PersistentCollections/CMakeLists.txt b/Sources/PersistentCollections/CMakeLists.txt
index eac88614e..121e50fb6 100644
--- a/Sources/PersistentCollections/CMakeLists.txt
+++ b/Sources/PersistentCollections/CMakeLists.txt
@@ -55,6 +55,7 @@ add_library(PersistentCollections
   "PersistentDictionary/PersistentDictionary+Equatable.swift"
   "PersistentDictionary/PersistentDictionary+ExpressibleByDictionaryLiteral.swift"
   "PersistentDictionary/PersistentDictionary+Filter.swift"
+  "PersistentDictionary/PersistentDictionary+Fluent Operations.swift"
   "PersistentDictionary/PersistentDictionary+Hashable.swift"
   "PersistentDictionary/PersistentDictionary+Initializers.swift"
   "PersistentDictionary/PersistentDictionary+Keys.swift"