diff --git a/build/unix/elfhack/inject/moz.build b/build/unix/elfhack/inject/moz.build
index f13c1e24cb05..7b85138ff309 100644
--- a/build/unix/elfhack/inject/moz.build
+++ b/build/unix/elfhack/inject/moz.build
@@ -17,8 +17,6 @@ GENERATED_SOURCES += [
     "%s.c" % cpu,
 ]
 
-DEFINES['ELFHACK_BUILD'] = True
-
 NO_PGO = True
 
 NO_VISIBILITY_FLAGS = True
diff --git a/build/unix/elfhack/moz.build b/build/unix/elfhack/moz.build
index 95b58391968c..6ff073df54cd 100644
--- a/build/unix/elfhack/moz.build
+++ b/build/unix/elfhack/moz.build
@@ -25,6 +25,4 @@ HOST_SOURCES += [
 
 HostProgram('elfhack')
 
-DEFINES['ELFHACK_BUILD'] = True
-
 NO_PGO = True
diff --git a/mozilla-config.h.in b/mozilla-config.h.in
index c427e2aa876c..8d2c857a65d2 100644
--- a/mozilla-config.h.in
+++ b/mozilla-config.h.in
@@ -41,11 +41,8 @@
  * Note that this should be the first #include to make sure that prtypes.h does
  * not attempt to define PRUnichar.  This includes the following hunspell-specific
  * includes.
- *
- * We don't use this to build elfhack and elf-dynstr-gc since those builds happen
- * during the export tier.  Also, disable this when building assembly files too.
  */
-#if !defined(ELFHACK_BUILD) && !defined(__ASSEMBLER__)
+#if !defined(__ASSEMBLER__)
 #include "mozilla/Char16.h"
 #endif