Issue %3005 - Move memory/mfbt/mozglue to system/ as memory, framework, and utils respectively

280 files changed, 20 insertions, 20 deletions

diff --git a/moz.build b/moz.build
index 93411cfbc..d5695c4b7 100644
--- a/moz.build
+++ b/moz.build
@@ -20,9 +20,9 @@ DIRS += [
   'libs/fdlibm',
   'libs/nspr/build',
   'config/external/zlib',
-  'memory',
-  'mfbt',
-  'mozglue',
+  'system/memory',
+  'system/framework',
+  'system/utils',
 ]
 
 if not CONFIG['JS_STANDALONE']:
@@ -32,7 +32,7 @@ if not CONFIG['JS_STANDALONE']:
   GENERATED_FILES += ['buildid.h', 'source-repo.h']
   GENERATED_FILES['buildid.h'].script = 'build/variables.py:buildid_header'
   GENERATED_FILES['source-repo.h'].script = 'build/variables.py:source_repo_header'
-  DIRS += ['build', 'probes', 'xpcom/xpidl']
+  DIRS += ['build', 'system/dtrace', 'xpcom/xpidl']
 
 if CONFIG['USE_ICU']:
   DIRS += ['config/external/icu']
diff --git a/probes/moz.build b/system/dtrace/moz.build
index 8c30c7fbc..8c30c7fbc 100644
--- a/probes/moz.build
+++ b/system/dtrace/moz.build
diff --git a/probes/mozilla-trace.d b/system/dtrace/mozilla-trace.d
index cf4158c94..cf4158c94 100644
--- a/probes/mozilla-trace.d
+++ b/system/dtrace/mozilla-trace.d
diff --git a/probes/trace-gen.py b/system/dtrace/trace-gen.py
index 586ad01f8..586ad01f8 100644
--- a/probes/trace-gen.py
+++ b/system/dtrace/trace-gen.py
diff --git a/mfbt/Alignment.h b/system/framework/Alignment.h
index 6dbf2eae6..6dbf2eae6 100644
--- a/mfbt/Alignment.h
+++ b/system/framework/Alignment.h
diff --git a/mfbt/AllocPolicy.h b/system/framework/AllocPolicy.h
index add1a1a34..add1a1a34 100644
--- a/mfbt/AllocPolicy.h
+++ b/system/framework/AllocPolicy.h
diff --git a/mfbt/AlreadyAddRefed.h b/system/framework/AlreadyAddRefed.h
index 1478ce9e8..1478ce9e8 100644
--- a/mfbt/AlreadyAddRefed.h
+++ b/system/framework/AlreadyAddRefed.h
diff --git a/mfbt/Array.h b/system/framework/Array.h
index e1e62f336..e1e62f336 100644
--- a/mfbt/Array.h
+++ b/system/framework/Array.h
diff --git a/mfbt/ArrayUtils.h b/system/framework/ArrayUtils.h
index 3bd7b53de..3bd7b53de 100644
--- a/mfbt/ArrayUtils.h
+++ b/system/framework/ArrayUtils.h
diff --git a/mfbt/Assertions.cpp b/system/framework/Assertions.cpp
index 62630842d..62630842d 100644
--- a/mfbt/Assertions.cpp
+++ b/system/framework/Assertions.cpp
diff --git a/mfbt/Assertions.h b/system/framework/Assertions.h
index d4e7febdf..d4e7febdf 100644
--- a/mfbt/Assertions.h
+++ b/system/framework/Assertions.h
diff --git a/mfbt/Atomics.h b/system/framework/Atomics.h
index f459ad83b..f459ad83b 100644
--- a/mfbt/Atomics.h
+++ b/system/framework/Atomics.h
diff --git a/mfbt/Attributes.h b/system/framework/Attributes.h
index 9bce9a128..9bce9a128 100644
--- a/mfbt/Attributes.h
+++ b/system/framework/Attributes.h
diff --git a/mfbt/BinarySearch.h b/system/framework/BinarySearch.h
index a6002da57..a6002da57 100644
--- a/mfbt/BinarySearch.h
+++ b/system/framework/BinarySearch.h
diff --git a/mfbt/BloomFilter.h b/system/framework/BloomFilter.h
index b7f960170..b7f960170 100644
--- a/mfbt/BloomFilter.h
+++ b/system/framework/BloomFilter.h
diff --git a/mfbt/BufferList.h b/system/framework/BufferList.h
index 57e293f18..57e293f18 100644
--- a/mfbt/BufferList.h
+++ b/system/framework/BufferList.h
diff --git a/mfbt/Casting.h b/system/framework/Casting.h
index 36de1188e..36de1188e 100644
--- a/mfbt/Casting.h
+++ b/system/framework/Casting.h
diff --git a/mfbt/ChaosMode.cpp b/system/framework/ChaosMode.cpp
index 98ba90d27..98ba90d27 100644
--- a/mfbt/ChaosMode.cpp
+++ b/system/framework/ChaosMode.cpp
diff --git a/mfbt/ChaosMode.h b/system/framework/ChaosMode.h
index e43f9751f..e43f9751f 100644
--- a/mfbt/ChaosMode.h
+++ b/system/framework/ChaosMode.h
diff --git a/mfbt/Char16.h b/system/framework/Char16.h
index bcdc6bb53..bcdc6bb53 100644
--- a/mfbt/Char16.h
+++ b/system/framework/Char16.h
diff --git a/mfbt/CheckedInt.h b/system/framework/CheckedInt.h
index a5e4f7ff1..a5e4f7ff1 100644
--- a/mfbt/CheckedInt.h
+++ b/system/framework/CheckedInt.h
diff --git a/mfbt/Compiler.h b/system/framework/Compiler.h
index 6478176e1..6478176e1 100644
--- a/mfbt/Compiler.h
+++ b/system/framework/Compiler.h
diff --git a/mfbt/Compression.cpp b/system/framework/Compression.cpp
index 6147d0d61..6147d0d61 100644
--- a/mfbt/Compression.cpp
+++ b/system/framework/Compression.cpp
diff --git a/mfbt/Compression.h b/system/framework/Compression.h
index 37e4307c0..37e4307c0 100644
--- a/mfbt/Compression.h
+++ b/system/framework/Compression.h
diff --git a/mfbt/DebugOnly.h b/system/framework/DebugOnly.h
index b2a2d82d4..b2a2d82d4 100644
--- a/mfbt/DebugOnly.h
+++ b/system/framework/DebugOnly.h
diff --git a/mfbt/EndianUtils.h b/system/framework/EndianUtils.h
index 719e048c1..719e048c1 100644
--- a/mfbt/EndianUtils.h
+++ b/system/framework/EndianUtils.h
diff --git a/mfbt/EnumSet.h b/system/framework/EnumSet.h
index 761579b7f..761579b7f 100644
--- a/mfbt/EnumSet.h
+++ b/system/framework/EnumSet.h
diff --git a/mfbt/EnumTypeTraits.h b/system/framework/EnumTypeTraits.h
index 223eaf8c0..223eaf8c0 100644
--- a/mfbt/EnumTypeTraits.h
+++ b/system/framework/EnumTypeTraits.h
diff --git a/mfbt/EnumeratedArray.h b/system/framework/EnumeratedArray.h
index 72411573d..72411573d 100644
--- a/mfbt/EnumeratedArray.h
+++ b/system/framework/EnumeratedArray.h
diff --git a/mfbt/EnumeratedRange.h b/system/framework/EnumeratedRange.h
index b9080ee9a..b9080ee9a 100644
--- a/mfbt/EnumeratedRange.h
+++ b/system/framework/EnumeratedRange.h
diff --git a/mfbt/FastBernoulliTrial.h b/system/framework/FastBernoulliTrial.h
index c549bca67..c549bca67 100644
--- a/mfbt/FastBernoulliTrial.h
+++ b/system/framework/FastBernoulliTrial.h
diff --git a/mfbt/FloatingPoint.cpp b/system/framework/FloatingPoint.cpp
index 68d0a08f1..68d0a08f1 100644
--- a/mfbt/FloatingPoint.cpp
+++ b/system/framework/FloatingPoint.cpp
diff --git a/mfbt/FloatingPoint.h b/system/framework/FloatingPoint.h
index 6a0e454ae..6a0e454ae 100644
--- a/mfbt/FloatingPoint.h
+++ b/system/framework/FloatingPoint.h
diff --git a/mfbt/Function.h b/system/framework/Function.h
index 4273f782c..4273f782c 100644
--- a/mfbt/Function.h
+++ b/system/framework/Function.h
diff --git a/mfbt/GuardObjects.h b/system/framework/GuardObjects.h
index 38523114b..38523114b 100644
--- a/mfbt/GuardObjects.h
+++ b/system/framework/GuardObjects.h
diff --git a/mfbt/HashFunctions.cpp b/system/framework/HashFunctions.cpp
index 6ba3c2d6e..6ba3c2d6e 100644
--- a/mfbt/HashFunctions.cpp
+++ b/system/framework/HashFunctions.cpp
diff --git a/mfbt/HashFunctions.h b/system/framework/HashFunctions.h
index cc9a1d68c..cc9a1d68c 100644
--- a/mfbt/HashFunctions.h
+++ b/system/framework/HashFunctions.h
diff --git a/mfbt/IndexSequence.h b/system/framework/IndexSequence.h
index f22b788e7..f22b788e7 100644
--- a/mfbt/IndexSequence.h
+++ b/system/framework/IndexSequence.h
diff --git a/mfbt/IntegerPrintfMacros.h b/system/framework/IntegerPrintfMacros.h
index b5ee9cd21..b5ee9cd21 100644
--- a/mfbt/IntegerPrintfMacros.h
+++ b/system/framework/IntegerPrintfMacros.h
diff --git a/mfbt/IntegerRange.h b/system/framework/IntegerRange.h
index 0eefea7e8..0eefea7e8 100644
--- a/mfbt/IntegerRange.h
+++ b/system/framework/IntegerRange.h
diff --git a/mfbt/IntegerTypeTraits.h b/system/framework/IntegerTypeTraits.h
index f20f68bc5..f20f68bc5 100644
--- a/mfbt/IntegerTypeTraits.h
+++ b/system/framework/IntegerTypeTraits.h
diff --git a/mfbt/JSONWriter.cpp b/system/framework/JSONWriter.cpp
index fcc77e2dd..fcc77e2dd 100644
--- a/mfbt/JSONWriter.cpp
+++ b/system/framework/JSONWriter.cpp
diff --git a/mfbt/JSONWriter.h b/system/framework/JSONWriter.h
index f721af744..f721af744 100644
--- a/mfbt/JSONWriter.h
+++ b/system/framework/JSONWriter.h
diff --git a/mfbt/Likely.h b/system/framework/Likely.h
index 3b250652c..3b250652c 100644
--- a/mfbt/Likely.h
+++ b/system/framework/Likely.h
diff --git a/mfbt/LinkedList.h b/system/framework/LinkedList.h
index 9d04e64c7..9d04e64c7 100644
--- a/mfbt/LinkedList.h
+++ b/system/framework/LinkedList.h
diff --git a/mfbt/LinuxSignal.h b/system/framework/LinuxSignal.h
index 83c2bf81f..83c2bf81f 100644
--- a/mfbt/LinuxSignal.h
+++ b/system/framework/LinuxSignal.h
diff --git a/mfbt/MacroArgs.h b/system/framework/MacroArgs.h
index d29313b84..d29313b84 100644
--- a/mfbt/MacroArgs.h
+++ b/system/framework/MacroArgs.h
diff --git a/mfbt/MacroForEach.h b/system/framework/MacroForEach.h
index 76a93225a..76a93225a 100644
--- a/mfbt/MacroForEach.h
+++ b/system/framework/MacroForEach.h
diff --git a/mfbt/MathAlgorithms.h b/system/framework/MathAlgorithms.h
index 153564da6..153564da6 100644
--- a/mfbt/MathAlgorithms.h
+++ b/system/framework/MathAlgorithms.h
diff --git a/mfbt/Maybe.h b/system/framework/Maybe.h
index 79df8d251..79df8d251 100644
--- a/mfbt/Maybe.h
+++ b/system/framework/Maybe.h
diff --git a/mfbt/MaybeOneOf.h b/system/framework/MaybeOneOf.h
index ea8124772..ea8124772 100644
--- a/mfbt/MaybeOneOf.h
+++ b/system/framework/MaybeOneOf.h
diff --git a/mfbt/MemoryChecking.h b/system/framework/MemoryChecking.h
index 8413da74b..8413da74b 100644
--- a/mfbt/MemoryChecking.h
+++ b/system/framework/MemoryChecking.h
diff --git a/mfbt/MemoryReporting.h b/system/framework/MemoryReporting.h
index 553e8cb75..553e8cb75 100644
--- a/mfbt/MemoryReporting.h
+++ b/system/framework/MemoryReporting.h
diff --git a/mfbt/Move.h b/system/framework/Move.h
index 091cd8281..091cd8281 100644
--- a/mfbt/Move.h
+++ b/system/framework/Move.h
diff --git a/mfbt/NotNull.h b/system/framework/NotNull.h
index b537c0d1b..b537c0d1b 100644
--- a/mfbt/NotNull.h
+++ b/system/framework/NotNull.h
diff --git a/mfbt/NullPtr.h b/system/framework/NullPtr.h
index 4e59dc170..4e59dc170 100644
--- a/mfbt/NullPtr.h
+++ b/system/framework/NullPtr.h
diff --git a/mfbt/Opaque.h b/system/framework/Opaque.h
index f2ffa9012..f2ffa9012 100644
--- a/mfbt/Opaque.h
+++ b/system/framework/Opaque.h
diff --git a/mfbt/OperatorNewExtensions.h b/system/framework/OperatorNewExtensions.h
index 10d33ab2f..10d33ab2f 100644
--- a/mfbt/OperatorNewExtensions.h
+++ b/system/framework/OperatorNewExtensions.h
diff --git a/mfbt/Pair.h b/system/framework/Pair.h
index 5dffb83d5..5dffb83d5 100644
--- a/mfbt/Pair.h
+++ b/system/framework/Pair.h
diff --git a/mfbt/PodOperations.h b/system/framework/PodOperations.h
index 678c4f366..678c4f366 100644
--- a/mfbt/PodOperations.h
+++ b/system/framework/PodOperations.h
diff --git a/mfbt/Poison.cpp b/system/framework/Poison.cpp
index 7ed58dc23..7ed58dc23 100644
--- a/mfbt/Poison.cpp
+++ b/system/framework/Poison.cpp
diff --git a/mfbt/Poison.h b/system/framework/Poison.h
index b9763a264..b9763a264 100644
--- a/mfbt/Poison.h
+++ b/system/framework/Poison.h
diff --git a/mfbt/Range.h b/system/framework/Range.h
index c286bc974..c286bc974 100644
--- a/mfbt/Range.h
+++ b/system/framework/Range.h
diff --git a/mfbt/RangedArray.h b/system/framework/RangedArray.h
index 0a8c4fdab..0a8c4fdab 100644
--- a/mfbt/RangedArray.h
+++ b/system/framework/RangedArray.h
diff --git a/mfbt/RangedPtr.h b/system/framework/RangedPtr.h
index 3b13f4898..3b13f4898 100644
--- a/mfbt/RangedPtr.h
+++ b/system/framework/RangedPtr.h
diff --git a/mfbt/ReentrancyGuard.h b/system/framework/ReentrancyGuard.h
index 1e91242b1..1e91242b1 100644
--- a/mfbt/ReentrancyGuard.h
+++ b/system/framework/ReentrancyGuard.h
diff --git a/mfbt/RefCountType.h b/system/framework/RefCountType.h
index f271c4cd6..f271c4cd6 100644
--- a/mfbt/RefCountType.h
+++ b/system/framework/RefCountType.h
diff --git a/mfbt/RefCounted.h b/system/framework/RefCounted.h
index f7ad4d6cb..f7ad4d6cb 100644
--- a/mfbt/RefCounted.h
+++ b/system/framework/RefCounted.h
diff --git a/mfbt/RefPtr.h b/system/framework/RefPtr.h
index 71d186ab4..71d186ab4 100644
--- a/mfbt/RefPtr.h
+++ b/system/framework/RefPtr.h
diff --git a/mfbt/ReverseIterator.h b/system/framework/ReverseIterator.h
index 8121b4a00..8121b4a00 100644
--- a/mfbt/ReverseIterator.h
+++ b/system/framework/ReverseIterator.h
diff --git a/mfbt/RollingMean.h b/system/framework/RollingMean.h
index 4dff9e62f..4dff9e62f 100644
--- a/mfbt/RollingMean.h
+++ b/system/framework/RollingMean.h
diff --git a/mfbt/SHA1.cpp b/system/framework/SHA1.cpp
index 432c6eee2..432c6eee2 100644
--- a/mfbt/SHA1.cpp
+++ b/system/framework/SHA1.cpp
diff --git a/mfbt/SHA1.h b/system/framework/SHA1.h
index 8a8267aac..8a8267aac 100644
--- a/mfbt/SHA1.h
+++ b/system/framework/SHA1.h
diff --git a/mfbt/STYLE b/system/framework/STYLE
index d16be6109..d16be6109 100644
--- a/mfbt/STYLE
+++ b/system/framework/STYLE
diff --git a/mfbt/Saturate.h b/system/framework/Saturate.h
index 4897a756b..4897a756b 100644
--- a/mfbt/Saturate.h
+++ b/system/framework/Saturate.h
diff --git a/mfbt/ScopeExit.h b/system/framework/ScopeExit.h
index 18fd400be..18fd400be 100644
--- a/mfbt/ScopeExit.h
+++ b/system/framework/ScopeExit.h
diff --git a/mfbt/Scoped.h b/system/framework/Scoped.h
index 0c943cb80..0c943cb80 100644
--- a/mfbt/Scoped.h
+++ b/system/framework/Scoped.h
diff --git a/mfbt/SegmentedVector.h b/system/framework/SegmentedVector.h
index 6e4dc2a45..6e4dc2a45 100644
--- a/mfbt/SegmentedVector.h
+++ b/system/framework/SegmentedVector.h
diff --git a/mfbt/SizePrintfMacros.h b/system/framework/SizePrintfMacros.h
index a5cb96cb7..a5cb96cb7 100644
--- a/mfbt/SizePrintfMacros.h
+++ b/system/framework/SizePrintfMacros.h
diff --git a/mfbt/Span.h b/system/framework/Span.h
index e71e068c6..e71e068c6 100644
--- a/mfbt/Span.h
+++ b/system/framework/Span.h
diff --git a/mfbt/SplayTree.h b/system/framework/SplayTree.h
index 183e4094a..183e4094a 100644
--- a/mfbt/SplayTree.h
+++ b/system/framework/SplayTree.h
diff --git a/mfbt/Sprintf.h b/system/framework/Sprintf.h
index 64567c6e4..64567c6e4 100644
--- a/mfbt/Sprintf.h
+++ b/system/framework/Sprintf.h
diff --git a/mfbt/StaticAnalysisFunctions.h b/system/framework/StaticAnalysisFunctions.h
index bead819ff..bead819ff 100644
--- a/mfbt/StaticAnalysisFunctions.h
+++ b/system/framework/StaticAnalysisFunctions.h
diff --git a/mfbt/TaggedAnonymousMemory.h b/system/framework/TaggedAnonymousMemory.h
index f227c2805..f227c2805 100644
--- a/mfbt/TaggedAnonymousMemory.h
+++ b/system/framework/TaggedAnonymousMemory.h
diff --git a/mfbt/TemplateLib.h b/system/framework/TemplateLib.h
index 415bba458..415bba458 100644
--- a/mfbt/TemplateLib.h
+++ b/system/framework/TemplateLib.h
diff --git a/mfbt/TextUtils.h b/system/framework/TextUtils.h
index 84889b5ef..84889b5ef 100644
--- a/mfbt/TextUtils.h
+++ b/system/framework/TextUtils.h
diff --git a/mfbt/ThreadLocal.h b/system/framework/ThreadLocal.h
index 9466630c3..9466630c3 100644
--- a/mfbt/ThreadLocal.h
+++ b/system/framework/ThreadLocal.h
diff --git a/mfbt/ToString.h b/system/framework/ToString.h
index d1fc140df..d1fc140df 100644
--- a/mfbt/ToString.h
+++ b/system/framework/ToString.h
diff --git a/mfbt/Tuple.h b/system/framework/Tuple.h
index ecb3f6c66..ecb3f6c66 100644
--- a/mfbt/Tuple.h
+++ b/system/framework/Tuple.h
diff --git a/mfbt/TypeTraits.h b/system/framework/TypeTraits.h
index e12a35eb8..e12a35eb8 100644
--- a/mfbt/TypeTraits.h
+++ b/system/framework/TypeTraits.h
diff --git a/mfbt/TypedEnumBits.h b/system/framework/TypedEnumBits.h
index ed3eaece6..ed3eaece6 100644
--- a/mfbt/TypedEnumBits.h
+++ b/system/framework/TypedEnumBits.h
diff --git a/mfbt/Types.h b/system/framework/Types.h
index 5f54ac8d3..5f54ac8d3 100644
--- a/mfbt/Types.h
+++ b/system/framework/Types.h
diff --git a/mfbt/UniquePtr.h b/system/framework/UniquePtr.h
index 97fb8d27a..97fb8d27a 100644
--- a/mfbt/UniquePtr.h
+++ b/system/framework/UniquePtr.h
diff --git a/mfbt/UniquePtrExtensions.h b/system/framework/UniquePtrExtensions.h
index 4a78fc61d..4a78fc61d 100644
--- a/mfbt/UniquePtrExtensions.h
+++ b/system/framework/UniquePtrExtensions.h
diff --git a/mfbt/Unused.cpp b/system/framework/Unused.cpp
index 14e471472..14e471472 100644
--- a/mfbt/Unused.cpp
+++ b/system/framework/Unused.cpp
diff --git a/mfbt/Unused.h b/system/framework/Unused.h
index d8a33589e..d8a33589e 100644
--- a/mfbt/Unused.h
+++ b/system/framework/Unused.h
diff --git a/mfbt/Variant.h b/system/framework/Variant.h
index 6220cd9aa..6220cd9aa 100644
--- a/mfbt/Variant.h
+++ b/system/framework/Variant.h
diff --git a/mfbt/Vector.h b/system/framework/Vector.h
index cda406b30..cda406b30 100644
--- a/mfbt/Vector.h
+++ b/system/framework/Vector.h
diff --git a/mfbt/WeakPtr.h b/system/framework/WeakPtr.h
index 477c56bbf..477c56bbf 100644
--- a/mfbt/WeakPtr.h
+++ b/system/framework/WeakPtr.h
diff --git a/mfbt/WindowsVersion.h b/system/framework/WindowsVersion.h
index 4a44a558c..4a44a558c 100644
--- a/mfbt/WindowsVersion.h
+++ b/system/framework/WindowsVersion.h
diff --git a/mfbt/XorShift128PlusRNG.h b/system/framework/XorShift128PlusRNG.h
index 368a7802d..368a7802d 100644
--- a/mfbt/XorShift128PlusRNG.h
+++ b/system/framework/XorShift128PlusRNG.h
diff --git a/mfbt/decimal/Decimal.cpp b/system/framework/decimal/Decimal.cpp
index b08b4160f..b08b4160f 100644
--- a/mfbt/decimal/Decimal.cpp
+++ b/system/framework/decimal/Decimal.cpp
diff --git a/mfbt/decimal/Decimal.h b/system/framework/decimal/Decimal.h
index 10d0e2c7c..10d0e2c7c 100644
--- a/mfbt/decimal/Decimal.h
+++ b/system/framework/decimal/Decimal.h
diff --git a/mfbt/decimal/UPSTREAM-GIT-SHA b/system/framework/decimal/UPSTREAM-GIT-SHA
index ed86150b2..ed86150b2 100644
--- a/mfbt/decimal/UPSTREAM-GIT-SHA
+++ b/system/framework/decimal/UPSTREAM-GIT-SHA
diff --git a/mfbt/decimal/comparison-with-nan.patch b/system/framework/decimal/comparison-with-nan.patch
index 477a61437..477a61437 100644
--- a/mfbt/decimal/comparison-with-nan.patch
+++ b/system/framework/decimal/comparison-with-nan.patch
diff --git a/mfbt/decimal/fix-wshadow-warnings.patch b/system/framework/decimal/fix-wshadow-warnings.patch
index eed7b60f7..eed7b60f7 100644
--- a/mfbt/decimal/fix-wshadow-warnings.patch
+++ b/system/framework/decimal/fix-wshadow-warnings.patch
diff --git a/mfbt/decimal/mfbt-abi-markers.patch b/system/framework/decimal/mfbt-abi-markers.patch
index 4399c2134..4399c2134 100644
--- a/mfbt/decimal/mfbt-abi-markers.patch
+++ b/system/framework/decimal/mfbt-abi-markers.patch
diff --git a/mfbt/decimal/moz-decimal-utils.h b/system/framework/decimal/moz-decimal-utils.h
index d02f525fe..d02f525fe 100644
--- a/mfbt/decimal/moz-decimal-utils.h
+++ b/system/framework/decimal/moz-decimal-utils.h
diff --git a/mfbt/decimal/to-moz-dependencies.patch b/system/framework/decimal/to-moz-dependencies.patch
index 25f52d7bf..25f52d7bf 100644
--- a/mfbt/decimal/to-moz-dependencies.patch
+++ b/system/framework/decimal/to-moz-dependencies.patch
diff --git a/mfbt/decimal/update.sh b/system/framework/decimal/update.sh
index 59e626f87..59e626f87 100755..100644
--- a/mfbt/decimal/update.sh
+++ b/system/framework/decimal/update.sh
diff --git a/mfbt/decimal/zero-serialization.patch b/system/framework/decimal/zero-serialization.patch
index bafa35956..bafa35956 100644
--- a/mfbt/decimal/zero-serialization.patch
+++ b/system/framework/decimal/zero-serialization.patch
diff --git a/mfbt/double-conversion/LICENSE b/system/framework/double-conversion/LICENSE
index 933718a9e..933718a9e 100644
--- a/mfbt/double-conversion/LICENSE
+++ b/system/framework/double-conversion/LICENSE
diff --git a/mfbt/double-conversion/README b/system/framework/double-conversion/README
index f186b420f..f186b420f 100644
--- a/mfbt/double-conversion/README
+++ b/system/framework/double-conversion/README
diff --git a/mfbt/double-conversion/ToPrecision-exponential.patch b/system/framework/double-conversion/ToPrecision-exponential.patch
index 202b29b1b..202b29b1b 100644
--- a/mfbt/double-conversion/ToPrecision-exponential.patch
+++ b/system/framework/double-conversion/ToPrecision-exponential.patch
diff --git a/mfbt/double-conversion/add-mfbt-api-markers.patch b/system/framework/double-conversion/add-mfbt-api-markers.patch
index bbb50f6f5..bbb50f6f5 100644
--- a/mfbt/double-conversion/add-mfbt-api-markers.patch
+++ b/system/framework/double-conversion/add-mfbt-api-markers.patch
diff --git a/mfbt/double-conversion/bignum-dtoa.cc b/system/framework/double-conversion/bignum-dtoa.cc
index b6c2e85d1..b6c2e85d1 100644
--- a/mfbt/double-conversion/bignum-dtoa.cc
+++ b/system/framework/double-conversion/bignum-dtoa.cc
diff --git a/mfbt/double-conversion/bignum-dtoa.h b/system/framework/double-conversion/bignum-dtoa.h
index 34b961992..34b961992 100644
--- a/mfbt/double-conversion/bignum-dtoa.h
+++ b/system/framework/double-conversion/bignum-dtoa.h
diff --git a/mfbt/double-conversion/bignum.cc b/system/framework/double-conversion/bignum.cc
index dc8a2a63e..dc8a2a63e 100644
--- a/mfbt/double-conversion/bignum.cc
+++ b/system/framework/double-conversion/bignum.cc
diff --git a/mfbt/double-conversion/bignum.h b/system/framework/double-conversion/bignum.h
index 5ec3544f5..5ec3544f5 100644
--- a/mfbt/double-conversion/bignum.h
+++ b/system/framework/double-conversion/bignum.h
diff --git a/mfbt/double-conversion/cached-powers.cc b/system/framework/double-conversion/cached-powers.cc
index c67642919..c67642919 100644
--- a/mfbt/double-conversion/cached-powers.cc
+++ b/system/framework/double-conversion/cached-powers.cc
diff --git a/mfbt/double-conversion/cached-powers.h b/system/framework/double-conversion/cached-powers.h
index 61a50614c..61a50614c 100644
--- a/mfbt/double-conversion/cached-powers.h
+++ b/system/framework/double-conversion/cached-powers.h
diff --git a/mfbt/double-conversion/diy-fp.cc b/system/framework/double-conversion/diy-fp.cc
index ddd1891b1..ddd1891b1 100644
--- a/mfbt/double-conversion/diy-fp.cc
+++ b/system/framework/double-conversion/diy-fp.cc
diff --git a/mfbt/double-conversion/diy-fp.h b/system/framework/double-conversion/diy-fp.h
index 9dcf8fbdb..9dcf8fbdb 100644
--- a/mfbt/double-conversion/diy-fp.h
+++ b/system/framework/double-conversion/diy-fp.h
diff --git a/mfbt/double-conversion/double-conversion.cc b/system/framework/double-conversion/double-conversion.cc
index 394b6a053..394b6a053 100644
--- a/mfbt/double-conversion/double-conversion.cc
+++ b/system/framework/double-conversion/double-conversion.cc
diff --git a/mfbt/double-conversion/double-conversion.h b/system/framework/double-conversion/double-conversion.h
index 957575cfb..957575cfb 100644
--- a/mfbt/double-conversion/double-conversion.h
+++ b/system/framework/double-conversion/double-conversion.h
diff --git a/mfbt/double-conversion/fast-dtoa.cc b/system/framework/double-conversion/fast-dtoa.cc
index 1a0f82350..1a0f82350 100644
--- a/mfbt/double-conversion/fast-dtoa.cc
+++ b/system/framework/double-conversion/fast-dtoa.cc
diff --git a/mfbt/double-conversion/fast-dtoa.h b/system/framework/double-conversion/fast-dtoa.h
index 5f1e8eee5..5f1e8eee5 100644
--- a/mfbt/double-conversion/fast-dtoa.h
+++ b/system/framework/double-conversion/fast-dtoa.h
diff --git a/mfbt/double-conversion/fixed-dtoa.cc b/system/framework/double-conversion/fixed-dtoa.cc
index d56b1449b..d56b1449b 100644
--- a/mfbt/double-conversion/fixed-dtoa.cc
+++ b/system/framework/double-conversion/fixed-dtoa.cc
diff --git a/mfbt/double-conversion/fixed-dtoa.h b/system/framework/double-conversion/fixed-dtoa.h
index 3bdd08e21..3bdd08e21 100644
--- a/mfbt/double-conversion/fixed-dtoa.h
+++ b/system/framework/double-conversion/fixed-dtoa.h
diff --git a/mfbt/double-conversion/ieee.h b/system/framework/double-conversion/ieee.h
index 839dc47d4..839dc47d4 100644
--- a/mfbt/double-conversion/ieee.h
+++ b/system/framework/double-conversion/ieee.h
diff --git a/mfbt/double-conversion/strtod.cc b/system/framework/double-conversion/strtod.cc
index b097afe0e..b097afe0e 100644
--- a/mfbt/double-conversion/strtod.cc
+++ b/system/framework/double-conversion/strtod.cc
diff --git a/mfbt/double-conversion/strtod.h b/system/framework/double-conversion/strtod.h
index ed0293b8f..ed0293b8f 100644
--- a/mfbt/double-conversion/strtod.h
+++ b/system/framework/double-conversion/strtod.h
diff --git a/mfbt/double-conversion/update.sh b/system/framework/double-conversion/update.sh
index 22233b92b..22233b92b 100755..100644
--- a/mfbt/double-conversion/update.sh
+++ b/system/framework/double-conversion/update.sh
diff --git a/mfbt/double-conversion/use-StandardInteger.patch b/system/framework/double-conversion/use-StandardInteger.patch
index 7fe867f43..7fe867f43 100644
--- a/mfbt/double-conversion/use-StandardInteger.patch
+++ b/system/framework/double-conversion/use-StandardInteger.patch
diff --git a/mfbt/double-conversion/use-mozilla-assertions.patch b/system/framework/double-conversion/use-mozilla-assertions.patch
index c98565f65..c98565f65 100644
--- a/mfbt/double-conversion/use-mozilla-assertions.patch
+++ b/system/framework/double-conversion/use-mozilla-assertions.patch
diff --git a/mfbt/double-conversion/use-static_assert.patch b/system/framework/double-conversion/use-static_assert.patch
index 414378259..414378259 100644
--- a/mfbt/double-conversion/use-static_assert.patch
+++ b/system/framework/double-conversion/use-static_assert.patch
diff --git a/mfbt/double-conversion/utils.h b/system/framework/double-conversion/utils.h
index 15dd4bfb3..15dd4bfb3 100644
--- a/mfbt/double-conversion/utils.h
+++ b/system/framework/double-conversion/utils.h
diff --git a/mfbt/lz4.c b/system/framework/lz4.c
index 9f5e9bfa0..9f5e9bfa0 100644
--- a/mfbt/lz4.c
+++ b/system/framework/lz4.c
diff --git a/mfbt/lz4.h b/system/framework/lz4.h
index 7ab1e483a..7ab1e483a 100644
--- a/mfbt/lz4.h
+++ b/system/framework/lz4.h
diff --git a/mfbt/moz.build b/system/framework/moz.build
index 4c2f903fb..17b7e2918 100644
--- a/mfbt/moz.build
+++ b/system/framework/moz.build
@@ -126,16 +126,16 @@ DISABLE_STL_WRAPPING = True
 # TODO: Remove these suppressions after bug 993267 is fixed.
 
 if CONFIG['GNU_CXX']:
-    SOURCES['/mfbt/Compression.cpp'].flags += ['-Wno-unused-function']
+    SOURCES['/system/framework/Compression.cpp'].flags += ['-Wno-unused-function']
     CXXFLAGS += ['-Wno-error=shadow']
 
 if CONFIG['CLANG_CXX']:
     # Suppress warnings from third-party V8 Decimal code.
-    SOURCES['/mfbt/decimal/Decimal.cpp'].flags += ['-Wno-implicit-fallthrough']
+    SOURCES['/system/framework/decimal/Decimal.cpp'].flags += ['-Wno-implicit-fallthrough']
 
 if CONFIG['_MSC_VER']:
     # Error 4804 is "'>' : unsafe use of type 'bool' in operation"
-    SOURCES['/mfbt/Compression.cpp'].flags += ['-wd4804']
+    SOURCES['/system/framework/Compression.cpp'].flags += ['-wd4804']
 
 if CONFIG['MOZ_NEEDS_LIBATOMIC']:
     OS_LIBS += ['atomic']
diff --git a/mfbt/objs.mozbuild b/system/framework/objs.mozbuild
index 8aed3d179..c31816511 100644
--- a/mfbt/objs.mozbuild
+++ b/system/framework/objs.mozbuild
@@ -23,7 +23,7 @@ mfbt_src_lcppsrcs = [
 ]
 
 mfbt_src_cppsrcs = [
-    '/mfbt/%s' % s for s in mfbt_src_lcppsrcs
+    '/system/framework/%s' % s for s in mfbt_src_lcppsrcs
 ]
 
 # Compression.cpp cannot be built in unified mode because it pulls in Windows system headers.
@@ -34,5 +34,5 @@ mfbt_nonunified_src_lcppsrcs = [
 ]
 
 mfbt_nonunified_src_cppsrcs = [
-    '/mfbt/%s' % s for s in mfbt_nonunified_src_lcppsrcs
+    '/system/framework/%s' % s for s in mfbt_nonunified_src_lcppsrcs
 ]
diff --git a/mfbt/staticruntime/moz.build b/system/framework/staticruntime/moz.build
index 177c119c8..20041f8a4 100644
--- a/mfbt/staticruntime/moz.build
+++ b/system/framework/staticruntime/moz.build
@@ -21,8 +21,8 @@ DISABLE_STL_WRAPPING = True
 # TODO: Remove these suppressions after bug 993267 is fixed.
 
 if CONFIG['GNU_CXX']:
-    SOURCES['/mfbt/Compression.cpp'].flags += ['-Wno-unused-function']
+    SOURCES['/system/framework/Compression.cpp'].flags += ['-Wno-unused-function']
 
 if CONFIG['_MSC_VER']:
     # Error 4804 is "'>' : unsafe use of type 'bool' in operation"
-    SOURCES['/mfbt/Compression.cpp'].flags += ['-wd4804']
+    SOURCES['/system/framework/Compression.cpp'].flags += ['-wd4804']
diff --git a/mfbt/tests/TestArray.cpp b/system/framework/tests/TestArray.cpp
index bdcaa8f34..bdcaa8f34 100644
--- a/mfbt/tests/TestArray.cpp
+++ b/system/framework/tests/TestArray.cpp
diff --git a/mfbt/tests/TestArrayUtils.cpp b/system/framework/tests/TestArrayUtils.cpp
index 7e961253d..7e961253d 100644
--- a/mfbt/tests/TestArrayUtils.cpp
+++ b/system/framework/tests/TestArrayUtils.cpp
diff --git a/mfbt/tests/TestAtomics.cpp b/system/framework/tests/TestAtomics.cpp
index 113392f08..113392f08 100644
--- a/mfbt/tests/TestAtomics.cpp
+++ b/system/framework/tests/TestAtomics.cpp
diff --git a/mfbt/tests/TestBinarySearch.cpp b/system/framework/tests/TestBinarySearch.cpp
index 66f30e96b..66f30e96b 100644
--- a/mfbt/tests/TestBinarySearch.cpp
+++ b/system/framework/tests/TestBinarySearch.cpp
diff --git a/mfbt/tests/TestBloomFilter.cpp b/system/framework/tests/TestBloomFilter.cpp
index 281cc33ea..281cc33ea 100644
--- a/mfbt/tests/TestBloomFilter.cpp
+++ b/system/framework/tests/TestBloomFilter.cpp
diff --git a/mfbt/tests/TestBufferList.cpp b/system/framework/tests/TestBufferList.cpp
index d87971207..d87971207 100644
--- a/mfbt/tests/TestBufferList.cpp
+++ b/system/framework/tests/TestBufferList.cpp
diff --git a/mfbt/tests/TestCasting.cpp b/system/framework/tests/TestCasting.cpp
index 0b6e4a5bd..0b6e4a5bd 100644
--- a/mfbt/tests/TestCasting.cpp
+++ b/system/framework/tests/TestCasting.cpp
diff --git a/mfbt/tests/TestCeilingFloor.cpp b/system/framework/tests/TestCeilingFloor.cpp
index 5440cd3a5..5440cd3a5 100644
--- a/mfbt/tests/TestCeilingFloor.cpp
+++ b/system/framework/tests/TestCeilingFloor.cpp
diff --git a/mfbt/tests/TestCheckedInt.cpp b/system/framework/tests/TestCheckedInt.cpp
index d8adc09fc..d8adc09fc 100644
--- a/mfbt/tests/TestCheckedInt.cpp
+++ b/system/framework/tests/TestCheckedInt.cpp
diff --git a/mfbt/tests/TestCountPopulation.cpp b/system/framework/tests/TestCountPopulation.cpp
index 29c1686cb..29c1686cb 100644
--- a/mfbt/tests/TestCountPopulation.cpp
+++ b/system/framework/tests/TestCountPopulation.cpp
diff --git a/mfbt/tests/TestCountZeroes.cpp b/system/framework/tests/TestCountZeroes.cpp
index 100fb9eed..100fb9eed 100644
--- a/mfbt/tests/TestCountZeroes.cpp
+++ b/system/framework/tests/TestCountZeroes.cpp
diff --git a/mfbt/tests/TestEndian.cpp b/system/framework/tests/TestEndian.cpp
index 6cfd9c304..6cfd9c304 100644
--- a/mfbt/tests/TestEndian.cpp
+++ b/system/framework/tests/TestEndian.cpp
diff --git a/mfbt/tests/TestEnumSet.cpp b/system/framework/tests/TestEnumSet.cpp
index b23a9d70d..b23a9d70d 100644
--- a/mfbt/tests/TestEnumSet.cpp
+++ b/system/framework/tests/TestEnumSet.cpp
diff --git a/mfbt/tests/TestEnumTypeTraits.cpp b/system/framework/tests/TestEnumTypeTraits.cpp
index 879d40526..879d40526 100644
--- a/mfbt/tests/TestEnumTypeTraits.cpp
+++ b/system/framework/tests/TestEnumTypeTraits.cpp
diff --git a/mfbt/tests/TestEnumeratedArray.cpp b/system/framework/tests/TestEnumeratedArray.cpp
index c46fe8e68..c46fe8e68 100644
--- a/mfbt/tests/TestEnumeratedArray.cpp
+++ b/system/framework/tests/TestEnumeratedArray.cpp
diff --git a/mfbt/tests/TestFastBernoulliTrial.cpp b/system/framework/tests/TestFastBernoulliTrial.cpp
index e102d12de..e102d12de 100644
--- a/mfbt/tests/TestFastBernoulliTrial.cpp
+++ b/system/framework/tests/TestFastBernoulliTrial.cpp
diff --git a/mfbt/tests/TestFloatingPoint.cpp b/system/framework/tests/TestFloatingPoint.cpp
index c218f9196..c218f9196 100644
--- a/mfbt/tests/TestFloatingPoint.cpp
+++ b/system/framework/tests/TestFloatingPoint.cpp
diff --git a/mfbt/tests/TestFunction.cpp b/system/framework/tests/TestFunction.cpp
index 381fab349..381fab349 100644
--- a/mfbt/tests/TestFunction.cpp
+++ b/system/framework/tests/TestFunction.cpp
diff --git a/mfbt/tests/TestIntegerPrintfMacros.cpp b/system/framework/tests/TestIntegerPrintfMacros.cpp
index a1b20a921..a1b20a921 100644
--- a/mfbt/tests/TestIntegerPrintfMacros.cpp
+++ b/system/framework/tests/TestIntegerPrintfMacros.cpp
diff --git a/mfbt/tests/TestIntegerRange.cpp b/system/framework/tests/TestIntegerRange.cpp
index 97eb59ecd..97eb59ecd 100644
--- a/mfbt/tests/TestIntegerRange.cpp
+++ b/system/framework/tests/TestIntegerRange.cpp
diff --git a/mfbt/tests/TestJSONWriter.cpp b/system/framework/tests/TestJSONWriter.cpp
index a744805c0..a744805c0 100644
--- a/mfbt/tests/TestJSONWriter.cpp
+++ b/system/framework/tests/TestJSONWriter.cpp
diff --git a/mfbt/tests/TestLinkedList.cpp b/system/framework/tests/TestLinkedList.cpp
index 5c750b46b..5c750b46b 100644
--- a/mfbt/tests/TestLinkedList.cpp
+++ b/system/framework/tests/TestLinkedList.cpp
diff --git a/mfbt/tests/TestMacroArgs.cpp b/system/framework/tests/TestMacroArgs.cpp
index 68cb07d5d..68cb07d5d 100644
--- a/mfbt/tests/TestMacroArgs.cpp
+++ b/system/framework/tests/TestMacroArgs.cpp
diff --git a/mfbt/tests/TestMacroForEach.cpp b/system/framework/tests/TestMacroForEach.cpp
index 9dfb1a1ea..9dfb1a1ea 100644
--- a/mfbt/tests/TestMacroForEach.cpp
+++ b/system/framework/tests/TestMacroForEach.cpp
diff --git a/mfbt/tests/TestMathAlgorithms.cpp b/system/framework/tests/TestMathAlgorithms.cpp
index 515c64c35..515c64c35 100644
--- a/mfbt/tests/TestMathAlgorithms.cpp
+++ b/system/framework/tests/TestMathAlgorithms.cpp
diff --git a/mfbt/tests/TestMaybe.cpp b/system/framework/tests/TestMaybe.cpp
index 5817ab428..5817ab428 100644
--- a/mfbt/tests/TestMaybe.cpp
+++ b/system/framework/tests/TestMaybe.cpp
diff --git a/mfbt/tests/TestNotNull.cpp b/system/framework/tests/TestNotNull.cpp
index 191ba61c5..191ba61c5 100644
--- a/mfbt/tests/TestNotNull.cpp
+++ b/system/framework/tests/TestNotNull.cpp
diff --git a/mfbt/tests/TestPair.cpp b/system/framework/tests/TestPair.cpp
index 5deb2ae2d..5deb2ae2d 100644
--- a/mfbt/tests/TestPair.cpp
+++ b/system/framework/tests/TestPair.cpp
diff --git a/mfbt/tests/TestPoisonArea.cpp b/system/framework/tests/TestPoisonArea.cpp
index 44269f33a..44269f33a 100644
--- a/mfbt/tests/TestPoisonArea.cpp
+++ b/system/framework/tests/TestPoisonArea.cpp
diff --git a/mfbt/tests/TestRange.cpp b/system/framework/tests/TestRange.cpp
index 55894d173..55894d173 100644
--- a/mfbt/tests/TestRange.cpp
+++ b/system/framework/tests/TestRange.cpp
diff --git a/mfbt/tests/TestRefPtr.cpp b/system/framework/tests/TestRefPtr.cpp
index 9b582d1f1..9b582d1f1 100644
--- a/mfbt/tests/TestRefPtr.cpp
+++ b/system/framework/tests/TestRefPtr.cpp
diff --git a/mfbt/tests/TestRollingMean.cpp b/system/framework/tests/TestRollingMean.cpp
index 3afc6df84..3afc6df84 100644
--- a/mfbt/tests/TestRollingMean.cpp
+++ b/system/framework/tests/TestRollingMean.cpp
diff --git a/mfbt/tests/TestSHA1.cpp b/system/framework/tests/TestSHA1.cpp
index f32b66680..f32b66680 100644
--- a/mfbt/tests/TestSHA1.cpp
+++ b/system/framework/tests/TestSHA1.cpp
diff --git a/mfbt/tests/TestSaturate.cpp b/system/framework/tests/TestSaturate.cpp
index 0242e55bd..0242e55bd 100644
--- a/mfbt/tests/TestSaturate.cpp
+++ b/system/framework/tests/TestSaturate.cpp
diff --git a/mfbt/tests/TestScopeExit.cpp b/system/framework/tests/TestScopeExit.cpp
index 21312481d..21312481d 100644
--- a/mfbt/tests/TestScopeExit.cpp
+++ b/system/framework/tests/TestScopeExit.cpp
diff --git a/mfbt/tests/TestSegmentedVector.cpp b/system/framework/tests/TestSegmentedVector.cpp
index 31f9f4743..31f9f4743 100644
--- a/mfbt/tests/TestSegmentedVector.cpp
+++ b/system/framework/tests/TestSegmentedVector.cpp
diff --git a/mfbt/tests/TestSplayTree.cpp b/system/framework/tests/TestSplayTree.cpp
index e38147c5c..e38147c5c 100644
--- a/mfbt/tests/TestSplayTree.cpp
+++ b/system/framework/tests/TestSplayTree.cpp
diff --git a/mfbt/tests/TestTemplateLib.cpp b/system/framework/tests/TestTemplateLib.cpp
index 6ae079d57..6ae079d57 100644
--- a/mfbt/tests/TestTemplateLib.cpp
+++ b/system/framework/tests/TestTemplateLib.cpp
diff --git a/mfbt/tests/TestTextUtils.cpp b/system/framework/tests/TestTextUtils.cpp
index 8e8be5136..8e8be5136 100644
--- a/mfbt/tests/TestTextUtils.cpp
+++ b/system/framework/tests/TestTextUtils.cpp
diff --git a/mfbt/tests/TestTuple.cpp b/system/framework/tests/TestTuple.cpp
index 54ba48257..54ba48257 100644
--- a/mfbt/tests/TestTuple.cpp
+++ b/system/framework/tests/TestTuple.cpp
diff --git a/mfbt/tests/TestTypeTraits.cpp b/system/framework/tests/TestTypeTraits.cpp
index 93f9b3d0f..93f9b3d0f 100644
--- a/mfbt/tests/TestTypeTraits.cpp
+++ b/system/framework/tests/TestTypeTraits.cpp
diff --git a/mfbt/tests/TestTypedEnum.cpp b/system/framework/tests/TestTypedEnum.cpp
index f7323c54a..f7323c54a 100644
--- a/mfbt/tests/TestTypedEnum.cpp
+++ b/system/framework/tests/TestTypedEnum.cpp
diff --git a/mfbt/tests/TestUniquePtr.cpp b/system/framework/tests/TestUniquePtr.cpp
index 179fa4a19..179fa4a19 100644
--- a/mfbt/tests/TestUniquePtr.cpp
+++ b/system/framework/tests/TestUniquePtr.cpp
diff --git a/mfbt/tests/TestVariant.cpp b/system/framework/tests/TestVariant.cpp
index 201613fe1..201613fe1 100644
--- a/mfbt/tests/TestVariant.cpp
+++ b/system/framework/tests/TestVariant.cpp
diff --git a/mfbt/tests/TestVector.cpp b/system/framework/tests/TestVector.cpp
index 24baf8eae..24baf8eae 100644
--- a/mfbt/tests/TestVector.cpp
+++ b/system/framework/tests/TestVector.cpp
diff --git a/mfbt/tests/TestWeakPtr.cpp b/system/framework/tests/TestWeakPtr.cpp
index db683aca2..db683aca2 100644
--- a/mfbt/tests/TestWeakPtr.cpp
+++ b/system/framework/tests/TestWeakPtr.cpp
diff --git a/mfbt/tests/TestXorShift128PlusRNG.cpp b/system/framework/tests/TestXorShift128PlusRNG.cpp
index bc9c70f7c..bc9c70f7c 100644
--- a/mfbt/tests/TestXorShift128PlusRNG.cpp
+++ b/system/framework/tests/TestXorShift128PlusRNG.cpp
diff --git a/mfbt/tests/gtest/TestSpan.cpp b/system/framework/tests/gtest/TestSpan.cpp
index f3aa000a4..f3aa000a4 100644
--- a/mfbt/tests/gtest/TestSpan.cpp
+++ b/system/framework/tests/gtest/TestSpan.cpp
diff --git a/mfbt/tests/gtest/moz.build b/system/framework/tests/gtest/moz.build
index 2fc533a02..2fc533a02 100644
--- a/mfbt/tests/gtest/moz.build
+++ b/system/framework/tests/gtest/moz.build
diff --git a/mfbt/tests/moz.build b/system/framework/tests/moz.build
index 491e4f339..491e4f339 100644
--- a/mfbt/tests/moz.build
+++ b/system/framework/tests/moz.build
diff --git a/system/graphics/gl/GLContext.h b/system/graphics/gl/GLContext.h
index 5f0f5a4e8..e98f969a0 100644
--- a/system/graphics/gl/GLContext.h
+++ b/system/graphics/gl/GLContext.h
@@ -28,8 +28,8 @@
 #define MOZ_GL_DEBUG 1
 #endif
 
-#include "../../mfbt/RefPtr.h"
-#include "../../mfbt/UniquePtr.h"
+#include "../../system/framework/RefPtr.h"
+#include "../../system/framework/UniquePtr.h"
 
 #include "GLDefs.h"
 #include "GLLibraryLoader.h"
diff --git a/memory/build/jemalloc_config.cpp b/system/memory/build/jemalloc_config.cpp
index 0b734d804..0b734d804 100644
--- a/memory/build/jemalloc_config.cpp
+++ b/system/memory/build/jemalloc_config.cpp
diff --git a/memory/build/malloc_decls.h b/system/memory/build/malloc_decls.h
index f3f9570ac..f3f9570ac 100644
--- a/memory/build/malloc_decls.h
+++ b/system/memory/build/malloc_decls.h
diff --git a/memory/build/moz.build b/system/memory/build/moz.build
index 9d6c08b43..9d6c08b43 100644
--- a/memory/build/moz.build
+++ b/system/memory/build/moz.build
diff --git a/memory/build/mozmemory.h b/system/memory/build/mozmemory.h
index 2ed63b9e1..2ed63b9e1 100644
--- a/memory/build/mozmemory.h
+++ b/system/memory/build/mozmemory.h
diff --git a/memory/build/mozmemory_wrap.c b/system/memory/build/mozmemory_wrap.c
index 409b39da2..409b39da2 100644
--- a/memory/build/mozmemory_wrap.c
+++ b/system/memory/build/mozmemory_wrap.c
diff --git a/memory/build/mozmemory_wrap.h b/system/memory/build/mozmemory_wrap.h
index aa305588d..aa305588d 100644
--- a/memory/build/mozmemory_wrap.h
+++ b/system/memory/build/mozmemory_wrap.h
diff --git a/memory/build/replace_malloc.c b/system/memory/build/replace_malloc.c
index cfa9e5a5f..cfa9e5a5f 100644
--- a/memory/build/replace_malloc.c
+++ b/system/memory/build/replace_malloc.c
diff --git a/memory/build/replace_malloc.h b/system/memory/build/replace_malloc.h
index 3e592749a..3e592749a 100644
--- a/memory/build/replace_malloc.h
+++ b/system/memory/build/replace_malloc.h
diff --git a/memory/build/replace_malloc_bridge.h b/system/memory/build/replace_malloc_bridge.h
index 567e27afd..567e27afd 100644
--- a/memory/build/replace_malloc_bridge.h
+++ b/system/memory/build/replace_malloc_bridge.h
diff --git a/memory/fallible/fallible.cpp b/system/memory/fallible/fallible.cpp
index 5a449bc80..5a449bc80 100644
--- a/memory/fallible/fallible.cpp
+++ b/system/memory/fallible/fallible.cpp
diff --git a/memory/fallible/fallible.h b/system/memory/fallible/fallible.h
index c028360b1..c028360b1 100644
--- a/memory/fallible/fallible.h
+++ b/system/memory/fallible/fallible.h
diff --git a/memory/fallible/moz.build b/system/memory/fallible/moz.build
index 0439e1a18..0439e1a18 100644
--- a/memory/fallible/moz.build
+++ b/system/memory/fallible/moz.build
diff --git a/memory/gtest/TestJemalloc.cpp b/system/memory/gtest/TestJemalloc.cpp
index f37c57376..f37c57376 100644
--- a/memory/gtest/TestJemalloc.cpp
+++ b/system/memory/gtest/TestJemalloc.cpp
diff --git a/memory/gtest/moz.build b/system/memory/gtest/moz.build
index 4067ccf53..4067ccf53 100644
--- a/memory/gtest/moz.build
+++ b/system/memory/gtest/moz.build
diff --git a/memory/moz.build b/system/memory/moz.build
index 18a35fe0e..18a35fe0e 100644
--- a/memory/moz.build
+++ b/system/memory/moz.build
diff --git a/memory/mozalloc/moz.build b/system/memory/mozalloc/moz.build
index 9afcefc03..fc69438ac 100644
--- a/memory/mozalloc/moz.build
+++ b/system/memory/mozalloc/moz.build
@@ -50,7 +50,7 @@ if CONFIG['_MSC_VER']:
 
 LOCAL_INCLUDES += [
     '!/xpcom',
-    '/memory/build',
+    '../build',
 ]
 
 DIST_INSTALL = True
diff --git a/memory/mozalloc/mozalloc.cpp b/system/memory/mozalloc/mozalloc.cpp
index 1ae071ea0..1ae071ea0 100644
--- a/memory/mozalloc/mozalloc.cpp
+++ b/system/memory/mozalloc/mozalloc.cpp
diff --git a/memory/mozalloc/mozalloc.h b/system/memory/mozalloc/mozalloc.h
index 50dc53e5c..50dc53e5c 100644
--- a/memory/mozalloc/mozalloc.h
+++ b/system/memory/mozalloc/mozalloc.h
diff --git a/memory/mozalloc/mozalloc_abort.cpp b/system/memory/mozalloc/mozalloc_abort.cpp
index 8db569655..8db569655 100644
--- a/memory/mozalloc/mozalloc_abort.cpp
+++ b/system/memory/mozalloc/mozalloc_abort.cpp
diff --git a/memory/mozalloc/mozalloc_abort.h b/system/memory/mozalloc/mozalloc_abort.h
index 065cebcb3..065cebcb3 100644
--- a/memory/mozalloc/mozalloc_abort.h
+++ b/system/memory/mozalloc/mozalloc_abort.h
diff --git a/memory/mozalloc/mozalloc_oom.cpp b/system/memory/mozalloc/mozalloc_oom.cpp
index 820888cdb..820888cdb 100644
--- a/memory/mozalloc/mozalloc_oom.cpp
+++ b/system/memory/mozalloc/mozalloc_oom.cpp
diff --git a/memory/mozalloc/mozalloc_oom.h b/system/memory/mozalloc/mozalloc_oom.h
index 35bb9acc8..35bb9acc8 100644
--- a/memory/mozalloc/mozalloc_oom.h
+++ b/system/memory/mozalloc/mozalloc_oom.h
diff --git a/memory/mozalloc/msvc_raise_wrappers.cpp b/system/memory/mozalloc/msvc_raise_wrappers.cpp
index 820663f63..820663f63 100644
--- a/memory/mozalloc/msvc_raise_wrappers.cpp
+++ b/system/memory/mozalloc/msvc_raise_wrappers.cpp
diff --git a/memory/mozalloc/msvc_raise_wrappers.h b/system/memory/mozalloc/msvc_raise_wrappers.h
index 91b77f453..91b77f453 100644
--- a/memory/mozalloc/msvc_raise_wrappers.h
+++ b/system/memory/mozalloc/msvc_raise_wrappers.h
diff --git a/memory/mozalloc/staticruntime/moz.build b/system/memory/mozalloc/staticruntime/moz.build
index 0a3dd7f7a..0a3dd7f7a 100644
--- a/memory/mozalloc/staticruntime/moz.build
+++ b/system/memory/mozalloc/staticruntime/moz.build
diff --git a/memory/mozalloc/throw_gcc.h b/system/memory/mozalloc/throw_gcc.h
index 4264df63d..4264df63d 100644
--- a/memory/mozalloc/throw_gcc.h
+++ b/system/memory/mozalloc/throw_gcc.h
diff --git a/memory/mozalloc/throw_msvc.h b/system/memory/mozalloc/throw_msvc.h
index e6ebf46dc..e6ebf46dc 100644
--- a/memory/mozalloc/throw_msvc.h
+++ b/system/memory/mozalloc/throw_msvc.h
diff --git a/memory/mozalloc/winheap.cpp b/system/memory/mozalloc/winheap.cpp
index 79ff35fff..79ff35fff 100644
--- a/memory/mozalloc/winheap.cpp
+++ b/system/memory/mozalloc/winheap.cpp
diff --git a/memory/mozjemalloc/Makefile.in b/system/memory/mozjemalloc/Makefile.in
index f02b315ec..f02b315ec 100644
--- a/memory/mozjemalloc/Makefile.in
+++ b/system/memory/mozjemalloc/Makefile.in
diff --git a/memory/mozjemalloc/jemalloc.c b/system/memory/mozjemalloc/jemalloc.c
index 02e771a09..02e771a09 100644
--- a/memory/mozjemalloc/jemalloc.c
+++ b/system/memory/mozjemalloc/jemalloc.c
diff --git a/memory/mozjemalloc/jemalloc_types.h b/system/memory/mozjemalloc/jemalloc_types.h
index dc778ae0a..dc778ae0a 100644
--- a/memory/mozjemalloc/jemalloc_types.h
+++ b/system/memory/mozjemalloc/jemalloc_types.h
diff --git a/memory/mozjemalloc/linkedlist.h b/system/memory/mozjemalloc/linkedlist.h
index acb10e56d..acb10e56d 100644
--- a/memory/mozjemalloc/linkedlist.h
+++ b/system/memory/mozjemalloc/linkedlist.h
diff --git a/memory/mozjemalloc/moz.build b/system/memory/mozjemalloc/moz.build
index 41585dd5f..8ac0a62ff 100644
--- a/memory/mozjemalloc/moz.build
+++ b/system/memory/mozjemalloc/moz.build
@@ -27,7 +27,7 @@ if CONFIG['OS_TARGET'] == 'Linux':
     NO_PGO = True
 
 LOCAL_INCLUDES += [
-    '/memory/build',
+    '../build',
 ]
 
 if CONFIG['GNU_CC']:
diff --git a/memory/mozjemalloc/osx_zone_types.h b/system/memory/mozjemalloc/osx_zone_types.h
index 603649dbc..603649dbc 100644
--- a/memory/mozjemalloc/osx_zone_types.h
+++ b/system/memory/mozjemalloc/osx_zone_types.h
diff --git a/memory/mozjemalloc/ql.h b/system/memory/mozjemalloc/ql.h
index 2fdb2d40c..2fdb2d40c 100644
--- a/memory/mozjemalloc/ql.h
+++ b/system/memory/mozjemalloc/ql.h
diff --git a/memory/mozjemalloc/qr.h b/system/memory/mozjemalloc/qr.h
index 03891664b..03891664b 100644
--- a/memory/mozjemalloc/qr.h
+++ b/system/memory/mozjemalloc/qr.h
diff --git a/memory/mozjemalloc/rb.h b/system/memory/mozjemalloc/rb.h
index a1b08973b..a1b08973b 100644
--- a/memory/mozjemalloc/rb.h
+++ b/system/memory/mozjemalloc/rb.h
diff --git a/memory/replace/dummy/dummy_replace_malloc.c b/system/memory/replace/dummy/dummy_replace_malloc.c
index e2f703826..e2f703826 100644
--- a/memory/replace/dummy/dummy_replace_malloc.c
+++ b/system/memory/replace/dummy/dummy_replace_malloc.c
diff --git a/memory/replace/dummy/moz.build b/system/memory/replace/dummy/moz.build
index 329016803..329016803 100644
--- a/memory/replace/dummy/moz.build
+++ b/system/memory/replace/dummy/moz.build
diff --git a/memory/replace/logalloc/FdPrintf.cpp b/system/memory/replace/logalloc/FdPrintf.cpp
index 3c32743d8..3c32743d8 100644
--- a/memory/replace/logalloc/FdPrintf.cpp
+++ b/system/memory/replace/logalloc/FdPrintf.cpp
diff --git a/memory/replace/logalloc/FdPrintf.h b/system/memory/replace/logalloc/FdPrintf.h
index 552db2b64..552db2b64 100644
--- a/memory/replace/logalloc/FdPrintf.h
+++ b/system/memory/replace/logalloc/FdPrintf.h
diff --git a/memory/replace/logalloc/LogAlloc.cpp b/system/memory/replace/logalloc/LogAlloc.cpp
index f475db409..f475db409 100644
--- a/memory/replace/logalloc/LogAlloc.cpp
+++ b/system/memory/replace/logalloc/LogAlloc.cpp
diff --git a/memory/replace/logalloc/README b/system/memory/replace/logalloc/README
index ce0d82be8..ce0d82be8 100644
--- a/memory/replace/logalloc/README
+++ b/system/memory/replace/logalloc/README
diff --git a/memory/replace/logalloc/moz.build b/system/memory/replace/logalloc/moz.build
index 2aea7a388..2aea7a388 100644
--- a/memory/replace/logalloc/moz.build
+++ b/system/memory/replace/logalloc/moz.build
diff --git a/memory/replace/logalloc/replay/Makefile.in b/system/memory/replace/logalloc/replay/Makefile.in
index 47e8c43ca..33f6578ec 100644
--- a/memory/replace/logalloc/replay/Makefile.in
+++ b/system/memory/replace/logalloc/replay/Makefile.in
@@ -2,7 +2,7 @@
 # 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/.
 
-include $(topsrcdir)/mozglue/build/replace_malloc.mk
+include $(topsrcdir)/system/utils/build/replace_malloc.mk
 
 ifndef CROSS_COMPILE
 
diff --git a/memory/replace/logalloc/replay/Replay.cpp b/system/memory/replace/logalloc/replay/Replay.cpp
index 1eb0fac57..1eb0fac57 100644
--- a/memory/replace/logalloc/replay/Replay.cpp
+++ b/system/memory/replace/logalloc/replay/Replay.cpp
diff --git a/memory/replace/logalloc/replay/logalloc_munge.py b/system/memory/replace/logalloc/replay/logalloc_munge.py
index a244c3c3d..a244c3c3d 100644
--- a/memory/replace/logalloc/replay/logalloc_munge.py
+++ b/system/memory/replace/logalloc/replay/logalloc_munge.py
diff --git a/memory/replace/logalloc/replay/moz.build b/system/memory/replace/logalloc/replay/moz.build
index 42185969d..03123058a 100644
--- a/memory/replace/logalloc/replay/moz.build
+++ b/system/memory/replace/logalloc/replay/moz.build
@@ -7,7 +7,7 @@ Program('logalloc-replay')
 
 SOURCES += [
     '../FdPrintf.cpp',
-    '/mfbt/Assertions.cpp',
+    '/system/framework/Assertions.cpp',
     'Replay.cpp',
 ]
 
diff --git a/memory/replace/logalloc/replay/replay.log b/system/memory/replace/logalloc/replay/replay.log
index c56dfab12..c56dfab12 100644
--- a/memory/replace/logalloc/replay/replay.log
+++ b/system/memory/replace/logalloc/replay/replay.log
diff --git a/memory/replace/moz.build b/system/memory/replace/moz.build
index fd6da449d..fd6da449d 100644
--- a/memory/replace/moz.build
+++ b/system/memory/replace/moz.build
diff --git a/memory/replace/replace/ReplaceMalloc.cpp b/system/memory/replace/replace/ReplaceMalloc.cpp
index baa72d576..baa72d576 100644
--- a/memory/replace/replace/ReplaceMalloc.cpp
+++ b/system/memory/replace/replace/ReplaceMalloc.cpp
diff --git a/memory/replace/replace/moz.build b/system/memory/replace/replace/moz.build
index 6ab8628cd..6ab8628cd 100644
--- a/memory/replace/replace/moz.build
+++ b/system/memory/replace/replace/moz.build
diff --git a/memory/volatile/VolatileBuffer.h b/system/memory/volatile/VolatileBuffer.h
index 19aeb9df2..19aeb9df2 100644
--- a/memory/volatile/VolatileBuffer.h
+++ b/system/memory/volatile/VolatileBuffer.h
diff --git a/memory/volatile/VolatileBufferFallback.cpp b/system/memory/volatile/VolatileBufferFallback.cpp
index f4bfe39c6..f4bfe39c6 100644
--- a/memory/volatile/VolatileBufferFallback.cpp
+++ b/system/memory/volatile/VolatileBufferFallback.cpp
diff --git a/memory/volatile/VolatileBufferOSX.cpp b/system/memory/volatile/VolatileBufferOSX.cpp
index af39bcae1..af39bcae1 100644
--- a/memory/volatile/VolatileBufferOSX.cpp
+++ b/system/memory/volatile/VolatileBufferOSX.cpp
diff --git a/memory/volatile/VolatileBufferWindows.cpp b/system/memory/volatile/VolatileBufferWindows.cpp
index b12e0eccb..b12e0eccb 100644
--- a/memory/volatile/VolatileBufferWindows.cpp
+++ b/system/memory/volatile/VolatileBufferWindows.cpp
diff --git a/memory/volatile/moz.build b/system/memory/volatile/moz.build
index 2fafbc13b..2fafbc13b 100644
--- a/memory/volatile/moz.build
+++ b/system/memory/volatile/moz.build
diff --git a/memory/volatile/tests/TestVolatileBuffer.cpp b/system/memory/volatile/tests/TestVolatileBuffer.cpp
index 7d21236a4..7d21236a4 100644
--- a/memory/volatile/tests/TestVolatileBuffer.cpp
+++ b/system/memory/volatile/tests/TestVolatileBuffer.cpp
diff --git a/memory/volatile/tests/moz.build b/system/memory/volatile/tests/moz.build
index 59c0f7c87..59c0f7c87 100644
--- a/memory/volatile/tests/moz.build
+++ b/system/memory/volatile/tests/moz.build
diff --git a/mozglue/build/AsanOptions.cpp b/system/utils/build/AsanOptions.cpp
index 729c61ef3..729c61ef3 100644
--- a/mozglue/build/AsanOptions.cpp
+++ b/system/utils/build/AsanOptions.cpp
diff --git a/mozglue/build/Makefile.in b/system/utils/build/Makefile.in
index ffa73529e..bdd5bf786 100644
--- a/mozglue/build/Makefile.in
+++ b/system/utils/build/Makefile.in
@@ -13,5 +13,5 @@ mozglue.def: mozglue.def.in $(GLOBAL_DEPS)
 GARBAGE += mozglue.def
 endif
 
-include $(topsrcdir)/mozglue/build/replace_malloc.mk
+include $(topsrcdir)/system/utils/build/replace_malloc.mk
 
diff --git a/mozglue/build/SSE.cpp b/system/utils/build/SSE.cpp
index 7a214607c..7a214607c 100644
--- a/mozglue/build/SSE.cpp
+++ b/system/utils/build/SSE.cpp
diff --git a/mozglue/build/SSE.h b/system/utils/build/SSE.h
index a69c59af2..a69c59af2 100644
--- a/mozglue/build/SSE.h
+++ b/system/utils/build/SSE.h
diff --git a/mozglue/build/WindowsDllBlocklist.cpp b/system/utils/build/WindowsDllBlocklist.cpp
index 0686b64cb..0686b64cb 100644
--- a/mozglue/build/WindowsDllBlocklist.cpp
+++ b/system/utils/build/WindowsDllBlocklist.cpp
diff --git a/mozglue/build/WindowsDllBlocklist.h b/system/utils/build/WindowsDllBlocklist.h
index 5afe6b8ce..5afe6b8ce 100644
--- a/mozglue/build/WindowsDllBlocklist.h
+++ b/system/utils/build/WindowsDllBlocklist.h
diff --git a/mozglue/build/arm-eabi-filter b/system/utils/build/arm-eabi-filter
index 401454ee8..401454ee8 100644
--- a/mozglue/build/arm-eabi-filter
+++ b/system/utils/build/arm-eabi-filter
diff --git a/mozglue/build/arm.cpp b/system/utils/build/arm.cpp
index a2f40246d..a2f40246d 100644
--- a/mozglue/build/arm.cpp
+++ b/system/utils/build/arm.cpp
diff --git a/mozglue/build/arm.h b/system/utils/build/arm.h
index 4ab03d6ec..4ab03d6ec 100644
--- a/mozglue/build/arm.h
+++ b/system/utils/build/arm.h
diff --git a/mozglue/build/dummy.cpp b/system/utils/build/dummy.cpp
index 47866547f..47866547f 100644
--- a/mozglue/build/dummy.cpp
+++ b/system/utils/build/dummy.cpp
diff --git a/mozglue/build/mips.cpp b/system/utils/build/mips.cpp
index 6a015db8a..6a015db8a 100644
--- a/mozglue/build/mips.cpp
+++ b/system/utils/build/mips.cpp
diff --git a/mozglue/build/mips.h b/system/utils/build/mips.h
index ff31cbc87..ff31cbc87 100644
--- a/mozglue/build/mips.h
+++ b/system/utils/build/mips.h
diff --git a/mozglue/build/moz.build b/system/utils/build/moz.build
index 24f849f58..bbbdcd48a 100644
--- a/mozglue/build/moz.build
+++ b/system/utils/build/moz.build
@@ -31,7 +31,7 @@ if not CONFIG['JS_STANDALONE']:
         SOURCES += ['dummy.cpp']
 
     if CONFIG['OS_TARGET'] == 'WINNT':
-        LOCAL_INCLUDES += ['/memory/build']
+        LOCAL_INCLUDES += ['/system/memory/build']
         SOURCES += ['WindowsDllBlocklist.cpp']
         DISABLE_STL_WRAPPING = True
         OS_LIBS += ['version']
diff --git a/mozglue/build/mozglue.def.in b/system/utils/build/mozglue.def.in
index 62eb3caed..62eb3caed 100644
--- a/mozglue/build/mozglue.def.in
+++ b/system/utils/build/mozglue.def.in
diff --git a/mozglue/build/replace_malloc.mk b/system/utils/build/replace_malloc.mk
index 7f436f2ee..72160b280 100644
--- a/mozglue/build/replace_malloc.mk
+++ b/system/utils/build/replace_malloc.mk
@@ -28,5 +28,5 @@ ifeq ($(MOZ_REPLACE_MALLOC_LINKAGE),dummy library)
 OS_LDFLAGS += -Wl,-weak_library,$(DEPTH)/memory/replace/dummy/$(DLL_PREFIX)dummy_replace_malloc$(DLL_SUFFIX)
 endif
 
-EXTRA_DEPS += $(topsrcdir)/mozglue/build/replace_malloc.mk
+EXTRA_DEPS += $(topsrcdir)/system/utils/build/replace_malloc.mk
 endif
diff --git a/mozglue/misc/StackWalk.cpp b/system/utils/misc/StackWalk.cpp
index 0fa2250ae..0fa2250ae 100644
--- a/mozglue/misc/StackWalk.cpp
+++ b/system/utils/misc/StackWalk.cpp
diff --git a/mozglue/misc/StackWalk.h b/system/utils/misc/StackWalk.h
index abaf42c98..abaf42c98 100644
--- a/mozglue/misc/StackWalk.h
+++ b/system/utils/misc/StackWalk.h
diff --git a/mozglue/misc/StackWalk_windows.h b/system/utils/misc/StackWalk_windows.h
index 5ffdd2068..5ffdd2068 100644
--- a/mozglue/misc/StackWalk_windows.h
+++ b/system/utils/misc/StackWalk_windows.h
diff --git a/mozglue/misc/TimeStamp.cpp b/system/utils/misc/TimeStamp.cpp
index a690b3716..a690b3716 100644
--- a/mozglue/misc/TimeStamp.cpp
+++ b/system/utils/misc/TimeStamp.cpp
diff --git a/mozglue/misc/TimeStamp.h b/system/utils/misc/TimeStamp.h
index 20e70cbdc..20e70cbdc 100644
--- a/mozglue/misc/TimeStamp.h
+++ b/system/utils/misc/TimeStamp.h
diff --git a/mozglue/misc/TimeStamp_darwin.cpp b/system/utils/misc/TimeStamp_darwin.cpp
index 1da2d49e3..1da2d49e3 100644
--- a/mozglue/misc/TimeStamp_darwin.cpp
+++ b/system/utils/misc/TimeStamp_darwin.cpp
diff --git a/mozglue/misc/TimeStamp_posix.cpp b/system/utils/misc/TimeStamp_posix.cpp
index eeab85258..eeab85258 100644
--- a/mozglue/misc/TimeStamp_posix.cpp
+++ b/system/utils/misc/TimeStamp_posix.cpp
diff --git a/mozglue/misc/TimeStamp_windows.cpp b/system/utils/misc/TimeStamp_windows.cpp
index ceedbe885..ceedbe885 100644
--- a/mozglue/misc/TimeStamp_windows.cpp
+++ b/system/utils/misc/TimeStamp_windows.cpp
diff --git a/mozglue/misc/TimeStamp_windows.h b/system/utils/misc/TimeStamp_windows.h
index 59780b25a..59780b25a 100644
--- a/mozglue/misc/TimeStamp_windows.h
+++ b/system/utils/misc/TimeStamp_windows.h
diff --git a/mozglue/misc/moz.build b/system/utils/misc/moz.build
index 9c2ef399c..9c2ef399c 100644
--- a/mozglue/misc/moz.build
+++ b/system/utils/misc/moz.build
diff --git a/mozglue/moz.build b/system/utils/moz.build
index 97cf97ea5..97cf97ea5 100644
--- a/mozglue/moz.build
+++ b/system/utils/moz.build
diff --git a/mozglue/tests/ShowSSEConfig.cpp b/system/utils/tests/ShowSSEConfig.cpp
index f9aa8ccd4..f9aa8ccd4 100644
--- a/mozglue/tests/ShowSSEConfig.cpp
+++ b/system/utils/tests/ShowSSEConfig.cpp
diff --git a/mozglue/tests/moz.build b/system/utils/tests/moz.build
index b448dfff8..b448dfff8 100644
--- a/mozglue/tests/moz.build
+++ b/system/utils/tests/moz.build