--- a/memory/moz.build
+++ b/memory/moz.build
@@ -7,11 +7,10 @@
 DIRS += ['mozjemalloc']
 
 if CONFIG['MOZ_JEMALLOC3'] or CONFIG['MOZ_REPLACE_MALLOC']:
     if not CONFIG['MOZ_NATIVE_JEMALLOC']:
         DIRS += ['jemalloc']
 
 DIRS += ['build']
 
-if CONFIG['MOZ_REPLACE_MALLOC_LINKAGE'] == 'dummy library':
-    DIRS += ['replace/dummy']
-
+if CONFIG['MOZ_REPLACE_MALLOC']:
+    DIRS += ['replace']

--- a/memory/replace/moz.build
+++ b/memory/replace/moz.build
@@ -3,9 +3,13 @@
 # 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/.
 
 # Build jemalloc3 as a replace-malloc lib when building with mozjemalloc
 if not CONFIG['MOZ_JEMALLOC3']:
     DIRS += ['jemalloc']
 
-DISABLE_STL_WRAPPING = True
+if CONFIG['MOZ_REPLACE_MALLOC_LINKAGE'] == 'dummy library':
+    DIRS += ['dummy']
+
+if CONFIG['MOZ_DMD']:
+    DIRS += ['dmd']

--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -19,19 +19,16 @@ DIRS += [
 
 # the signing related bits of libmar depend on nss
 if CONFIG['MOZ_UPDATER']:
     DIRS += ['/modules/libmar']
 
 if CONFIG['NS_TRACE_MALLOC']:
     DIRS += ['/tools/trace-malloc/lib']
 
-if CONFIG['MOZ_DMD']:
-    DIRS += ['/memory/replace/dmd']
-
 DIRS += [
     '/config/external/freetype2',
     '/xpcom',
     '/modules/libpref',
     '/intl',
     '/netwerk',
 ]
 
@@ -159,19 +156,16 @@ DIRS += [
 if CONFIG['MOZ_GIO_COMPONENT']:
     DIRS += ['/extensions/gio']
 
 DIRS += [
     '/toolkit/library/StaticXULComponentsEnd',
     '/toolkit/library',
 ]
 
-if CONFIG['MOZ_REPLACE_MALLOC']:
-    DIRS += ['/memory/replace']
-
 if CONFIG['NS_TRACE_MALLOC']:
     DIRS += ['/tools/trace-malloc']
 
 if CONFIG['MOZ_ENABLE_GNOME_COMPONENT']:
     DIRS += ['/toolkit/system/gnome']
 
 # if QtNetwork is present, it will do its own network monitoring
 if not CONFIG['MOZ_ENABLE_QTNETWORK'] and CONFIG['MOZ_ENABLE_DBUS']: