Issue #1675 - Move regexp to new-regexp to make bz porting simpler.

46 files changed, 67 insertions, 67 deletions

diff --git a/js/src/moz.build b/js/src/moz.build
index 9cad8e52e1..6664007adb 100644
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -123,7 +123,7 @@ if CONFIG['JS_BUNDLED_EDITLINE']:
     DIRS += ['editline']
 
 if CONFIG['JS_NEW_REGEXP']:
-    DIRS += ['regexp']
+    DIRS += ['new-regexp']
 
 if not CONFIG['JS_DISABLE_SHELL']:
     DIRS += ['shell']
diff --git a/js/src/regexp/RegExpTypes.h b/js/src/new-regexp/RegExpTypes.h
index e260b5bb6d..e260b5bb6d 100644
--- a/js/src/regexp/RegExpTypes.h
+++ b/js/src/new-regexp/RegExpTypes.h
diff --git a/js/src/regexp/VERSION b/js/src/new-regexp/VERSION
index c7d35a2bb8..c7d35a2bb8 100644
--- a/js/src/regexp/VERSION
+++ b/js/src/new-regexp/VERSION
diff --git a/js/src/regexp/gen-regexp-special-case.cc b/js/src/new-regexp/gen-regexp-special-case.cc
index b4a8c3da48..5a82c5d277 100644
--- a/js/src/regexp/gen-regexp-special-case.cc
+++ b/js/src/new-regexp/gen-regexp-special-case.cc
@@ -7,7 +7,7 @@
 #include <iostream>
 #include <sstream>
 
-#include "regexp/special-case.h"
+#include "new-regexp/special-case.h"
 
 namespace v8 {
 namespace internal {
diff --git a/js/src/regexp/import-irregexp.py b/js/src/new-regexp/import-irregexp.py
index 870387232c..870387232c 100644
--- a/js/src/regexp/import-irregexp.py
+++ b/js/src/new-regexp/import-irregexp.py
diff --git a/js/src/regexp/moz.build b/js/src/new-regexp/moz.build
index 2a8fab2ef6..2a8fab2ef6 100644
--- a/js/src/regexp/moz.build
+++ b/js/src/new-regexp/moz.build
diff --git a/js/src/regexp/property-sequences.cc b/js/src/new-regexp/property-sequences.cc
index e07d6da531..ca1a7f2c3c 100644
--- a/js/src/regexp/property-sequences.cc
+++ b/js/src/new-regexp/property-sequences.cc
@@ -4,7 +4,7 @@
 
 #ifdef V8_INTL_SUPPORT
 
-#include "regexp/property-sequences.h"
+#include "new-regexp/property-sequences.h"
 
 namespace v8 {
 namespace internal {
diff --git a/js/src/regexp/property-sequences.h b/js/src/new-regexp/property-sequences.h
index ed39e23795..f079da7ac6 100644
--- a/js/src/regexp/property-sequences.h
+++ b/js/src/new-regexp/property-sequences.h
@@ -7,7 +7,7 @@
 
 #ifdef V8_INTL_SUPPORT
 
-#include "regexp/regexp-shim.h"
+#include "new-regexp/regexp-shim.h"
 
 namespace v8 {
 namespace internal {
diff --git a/js/src/regexp/regexp-ast.cc b/js/src/new-regexp/regexp-ast.cc
index 8f7dd69478..8de26720fa 100644
--- a/js/src/regexp/regexp-ast.cc
+++ b/js/src/new-regexp/regexp-ast.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "regexp/regexp-ast.h"
+#include "new-regexp/regexp-ast.h"
 
 namespace v8 {
 namespace internal {
diff --git a/js/src/regexp/regexp-ast.h b/js/src/new-regexp/regexp-ast.h
index 311929d0b9..32bbcf0bf9 100644
--- a/js/src/regexp/regexp-ast.h
+++ b/js/src/new-regexp/regexp-ast.h
@@ -5,7 +5,7 @@
 #ifndef V8_REGEXP_REGEXP_AST_H_
 #define V8_REGEXP_REGEXP_AST_H_
 
-#include "regexp/regexp-shim.h"
+#include "new-regexp/regexp-shim.h"
 
 namespace v8 {
 namespace internal {
diff --git a/js/src/regexp/regexp-bytecode-generator-inl.h b/js/src/new-regexp/regexp-bytecode-generator-inl.h
index 69a054fd20..a2d1ac1cb0 100644
--- a/js/src/regexp/regexp-bytecode-generator-inl.h
+++ b/js/src/new-regexp/regexp-bytecode-generator-inl.h
@@ -5,9 +5,9 @@
 #ifndef V8_REGEXP_REGEXP_BYTECODE_GENERATOR_INL_H_
 #define V8_REGEXP_REGEXP_BYTECODE_GENERATOR_INL_H_
 
-#include "regexp/regexp-bytecode-generator.h"
+#include "new-regexp/regexp-bytecode-generator.h"
 
-#include "regexp/regexp-bytecodes.h"
+#include "new-regexp/regexp-bytecodes.h"
 
 namespace v8 {
 namespace internal {
diff --git a/js/src/regexp/regexp-bytecode-generator.cc b/js/src/new-regexp/regexp-bytecode-generator.cc
index db151de851..2670322d37 100644
--- a/js/src/regexp/regexp-bytecode-generator.cc
+++ b/js/src/new-regexp/regexp-bytecode-generator.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "regexp/regexp-bytecode-generator.h"
+#include "new-regexp/regexp-bytecode-generator.h"
 
-#include "regexp/regexp-bytecode-generator-inl.h"
-#include "regexp/regexp-bytecode-peephole.h"
-#include "regexp/regexp-bytecodes.h"
-#include "regexp/regexp-macro-assembler.h"
+#include "new-regexp/regexp-bytecode-generator-inl.h"
+#include "new-regexp/regexp-bytecode-peephole.h"
+#include "new-regexp/regexp-bytecodes.h"
+#include "new-regexp/regexp-macro-assembler.h"
 
 namespace v8 {
 namespace internal {
diff --git a/js/src/regexp/regexp-bytecode-generator.h b/js/src/new-regexp/regexp-bytecode-generator.h
index f5502464d4..274fd3953d 100644
--- a/js/src/regexp/regexp-bytecode-generator.h
+++ b/js/src/new-regexp/regexp-bytecode-generator.h
@@ -5,7 +5,7 @@
 #ifndef V8_REGEXP_REGEXP_BYTECODE_GENERATOR_H_
 #define V8_REGEXP_REGEXP_BYTECODE_GENERATOR_H_
 
-#include "regexp/regexp-macro-assembler.h"
+#include "new-regexp/regexp-macro-assembler.h"
 
 namespace v8 {
 namespace internal {
diff --git a/js/src/regexp/regexp-bytecode-peephole.cc b/js/src/new-regexp/regexp-bytecode-peephole.cc
index 4266b4a807..f105a50945 100644
--- a/js/src/regexp/regexp-bytecode-peephole.cc
+++ b/js/src/new-regexp/regexp-bytecode-peephole.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "regexp/regexp-bytecode-peephole.h"
+#include "new-regexp/regexp-bytecode-peephole.h"
 
-#include "regexp/regexp-bytecodes.h"
+#include "new-regexp/regexp-bytecodes.h"
 
 namespace v8 {
 namespace internal {
diff --git a/js/src/regexp/regexp-bytecode-peephole.h b/js/src/new-regexp/regexp-bytecode-peephole.h
index 31d5a2d480..781f0c9143 100644
--- a/js/src/regexp/regexp-bytecode-peephole.h
+++ b/js/src/new-regexp/regexp-bytecode-peephole.h
@@ -5,7 +5,7 @@
 #ifndef V8_REGEXP_REGEXP_BYTECODE_PEEPHOLE_H_
 #define V8_REGEXP_REGEXP_BYTECODE_PEEPHOLE_H_
 
-#include "regexp/regexp-shim.h"
+#include "new-regexp/regexp-shim.h"
 
 namespace v8 {
 namespace internal {
diff --git a/js/src/regexp/regexp-bytecodes.cc b/js/src/new-regexp/regexp-bytecodes.cc
index ae8f93ac9e..679a7c06a7 100644
--- a/js/src/regexp/regexp-bytecodes.cc
+++ b/js/src/new-regexp/regexp-bytecodes.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "regexp/regexp-bytecodes.h"
+#include "new-regexp/regexp-bytecodes.h"
 
 #include <cctype>
 
diff --git a/js/src/regexp/regexp-bytecodes.h b/js/src/new-regexp/regexp-bytecodes.h
index 1cfef1b2d4..e5ab7cf661 100644
--- a/js/src/regexp/regexp-bytecodes.h
+++ b/js/src/new-regexp/regexp-bytecodes.h
@@ -5,7 +5,7 @@
 #ifndef V8_REGEXP_REGEXP_BYTECODES_H_
 #define V8_REGEXP_REGEXP_BYTECODES_H_
 
-#include "regexp/regexp-shim.h"
+#include "new-regexp/regexp-shim.h"
 
 namespace v8 {
 namespace internal {
diff --git a/js/src/regexp/regexp-compiler-tonode.cc b/js/src/new-regexp/regexp-compiler-tonode.cc
index 257030589d..7de167eefe 100644
--- a/js/src/regexp/regexp-compiler-tonode.cc
+++ b/js/src/new-regexp/regexp-compiler-tonode.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "regexp/regexp-compiler.h"
+#include "new-regexp/regexp-compiler.h"
 
-#include "regexp/regexp.h"
+#include "new-regexp/regexp.h"
 #ifdef V8_INTL_SUPPORT
-#include "regexp/special-case.h"
+#include "new-regexp/special-case.h"
 #endif  // V8_INTL_SUPPORT
 
 #ifdef V8_INTL_SUPPORT
diff --git a/js/src/regexp/regexp-compiler.cc b/js/src/new-regexp/regexp-compiler.cc
index c0070061f8..98771354cf 100644
--- a/js/src/regexp/regexp-compiler.cc
+++ b/js/src/new-regexp/regexp-compiler.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "regexp/regexp-compiler.h"
+#include "new-regexp/regexp-compiler.h"
 
-#include "regexp/regexp-macro-assembler-arch.h"
+#include "new-regexp/regexp-macro-assembler-arch.h"
 #ifdef V8_INTL_SUPPORT
-#include "regexp/special-case.h"
+#include "new-regexp/special-case.h"
 #endif  // V8_INTL_SUPPORT
 
 #ifdef V8_INTL_SUPPORT
diff --git a/js/src/regexp/regexp-compiler.h b/js/src/new-regexp/regexp-compiler.h
index 1954f1a4c4..186d5e838c 100644
--- a/js/src/regexp/regexp-compiler.h
+++ b/js/src/new-regexp/regexp-compiler.h
@@ -7,7 +7,7 @@
 
 #include <bitset>
 
-#include "regexp/regexp-nodes.h"
+#include "new-regexp/regexp-nodes.h"
 
 namespace v8 {
 namespace internal {
diff --git a/js/src/regexp/regexp-dotprinter.cc b/js/src/new-regexp/regexp-dotprinter.cc
index 9bf800dfc2..2bf393c32b 100644
--- a/js/src/regexp/regexp-dotprinter.cc
+++ b/js/src/new-regexp/regexp-dotprinter.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "regexp/regexp-dotprinter.h"
+#include "new-regexp/regexp-dotprinter.h"
 
-#include "regexp/regexp-compiler.h"
+#include "new-regexp/regexp-compiler.h"
 
 namespace v8 {
 namespace internal {
diff --git a/js/src/regexp/regexp-dotprinter.h b/js/src/new-regexp/regexp-dotprinter.h
index e5781184c0..0bd03e77f4 100644
--- a/js/src/regexp/regexp-dotprinter.h
+++ b/js/src/new-regexp/regexp-dotprinter.h
@@ -5,7 +5,7 @@
 #ifndef V8_REGEXP_REGEXP_DOTPRINTER_H_
 #define V8_REGEXP_REGEXP_DOTPRINTER_H_
 
-#include "regexp/regexp-shim.h"
+#include "new-regexp/regexp-shim.h"
 
 namespace v8 {
 namespace internal {
diff --git a/js/src/regexp/regexp-error.cc b/js/src/new-regexp/regexp-error.cc
index 3906f9d9ff..9db98d4b83 100644
--- a/js/src/regexp/regexp-error.cc
+++ b/js/src/new-regexp/regexp-error.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "regexp/regexp-error.h"
+#include "new-regexp/regexp-error.h"
 
 namespace v8 {
 namespace internal {
diff --git a/js/src/regexp/regexp-error.h b/js/src/new-regexp/regexp-error.h
index 4b495f07d1..4b495f07d1 100644
--- a/js/src/regexp/regexp-error.h
+++ b/js/src/new-regexp/regexp-error.h
diff --git a/js/src/regexp/regexp-interpreter.cc b/js/src/new-regexp/regexp-interpreter.cc
index 356d358d68..7a492fca2a 100644
--- a/js/src/regexp/regexp-interpreter.cc
+++ b/js/src/new-regexp/regexp-interpreter.cc
@@ -4,12 +4,12 @@
 
 // A simple interpreter for the Irregexp byte code.
 
-#include "regexp/regexp-interpreter.h"
+#include "new-regexp/regexp-interpreter.h"
 
-#include "regexp/regexp-bytecodes.h"
-#include "regexp/regexp-macro-assembler.h"
-#include "regexp/regexp-stack.h"  // For kMaximumStackSize.
-#include "regexp/regexp.h"
+#include "new-regexp/regexp-bytecodes.h"
+#include "new-regexp/regexp-macro-assembler.h"
+#include "new-regexp/regexp-stack.h"  // For kMaximumStackSize.
+#include "new-regexp/regexp.h"
 
 #ifdef V8_INTL_SUPPORT
 #include "unicode/uchar.h"
diff --git a/js/src/regexp/regexp-interpreter.h b/js/src/new-regexp/regexp-interpreter.h
index c3f6c119e8..b4c0da2b7b 100644
--- a/js/src/regexp/regexp-interpreter.h
+++ b/js/src/new-regexp/regexp-interpreter.h
@@ -7,7 +7,7 @@
 #ifndef V8_REGEXP_REGEXP_INTERPRETER_H_
 #define V8_REGEXP_REGEXP_INTERPRETER_H_
 
-#include "regexp/regexp.h"
+#include "new-regexp/regexp.h"
 
 namespace v8 {
 namespace internal {
diff --git a/js/src/regexp/regexp-macro-assembler-arch.h b/js/src/new-regexp/regexp-macro-assembler-arch.h
index aecd59e273..8aeb8c433f 100644
--- a/js/src/regexp/regexp-macro-assembler-arch.h
+++ b/js/src/new-regexp/regexp-macro-assembler-arch.h
@@ -16,7 +16,7 @@
 #define RegexpMacroAssemblerArch_h
 
 #include "jit/MacroAssembler.h"
-#include "regexp/regexp-macro-assembler.h"
+#include "new-regexp/regexp-macro-assembler.h"
 
 namespace v8 {
 namespace internal {
diff --git a/js/src/regexp/regexp-macro-assembler-tracer.cc b/js/src/new-regexp/regexp-macro-assembler-tracer.cc
index b71a0f48e9..8eb587c3c8 100644
--- a/js/src/regexp/regexp-macro-assembler-tracer.cc
+++ b/js/src/new-regexp/regexp-macro-assembler-tracer.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "regexp/regexp-macro-assembler-tracer.h"
+#include "new-regexp/regexp-macro-assembler-tracer.h"
 
 
 namespace v8 {
diff --git a/js/src/regexp/regexp-macro-assembler-tracer.h b/js/src/new-regexp/regexp-macro-assembler-tracer.h
index 5332e59b89..0596a18ba1 100644
--- a/js/src/regexp/regexp-macro-assembler-tracer.h
+++ b/js/src/new-regexp/regexp-macro-assembler-tracer.h
@@ -5,7 +5,7 @@
 #ifndef V8_REGEXP_REGEXP_MACRO_ASSEMBLER_TRACER_H_
 #define V8_REGEXP_REGEXP_MACRO_ASSEMBLER_TRACER_H_
 
-#include "regexp/regexp-macro-assembler.h"
+#include "new-regexp/regexp-macro-assembler.h"
 
 namespace v8 {
 namespace internal {
diff --git a/js/src/regexp/regexp-macro-assembler.cc b/js/src/new-regexp/regexp-macro-assembler.cc
index 7f8de25437..52c1cb1ba3 100644
--- a/js/src/regexp/regexp-macro-assembler.cc
+++ b/js/src/new-regexp/regexp-macro-assembler.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "regexp/regexp-macro-assembler.h"
+#include "new-regexp/regexp-macro-assembler.h"
 
-#include "regexp/regexp-stack.h"
+#include "new-regexp/regexp-stack.h"
 
 #ifdef V8_INTL_SUPPORT
 #include "unicode/uchar.h"
diff --git a/js/src/regexp/regexp-macro-assembler.h b/js/src/new-regexp/regexp-macro-assembler.h
index ef3961a70a..60d712dfc3 100644
--- a/js/src/regexp/regexp-macro-assembler.h
+++ b/js/src/new-regexp/regexp-macro-assembler.h
@@ -5,9 +5,9 @@
 #ifndef V8_REGEXP_REGEXP_MACRO_ASSEMBLER_H_
 #define V8_REGEXP_REGEXP_MACRO_ASSEMBLER_H_
 
-#include "regexp/regexp-ast.h"
-#include "regexp/regexp-shim.h"
-#include "regexp/regexp.h"
+#include "new-regexp/regexp-ast.h"
+#include "new-regexp/regexp-shim.h"
+#include "new-regexp/regexp.h"
 
 namespace v8 {
 namespace internal {
diff --git a/js/src/regexp/regexp-native-macro-assembler.cc b/js/src/new-regexp/regexp-native-macro-assembler.cc
index 67bf77cbd8..01453a9374 100644
--- a/js/src/regexp/regexp-native-macro-assembler.cc
+++ b/js/src/new-regexp/regexp-native-macro-assembler.cc
@@ -10,8 +10,8 @@
 
 #include "jit/Linker.h"
 #include "gc/Zone.h"
-#include "regexp/regexp-macro-assembler-arch.h"
-#include "regexp/regexp-stack.h"
+#include "new-regexp/regexp-macro-assembler-arch.h"
+#include "new-regexp/regexp-stack.h"
 #include "vm/MatchPairs.h"
 
 #include "jit/MacroAssembler-inl.h"
diff --git a/js/src/regexp/regexp-nodes.h b/js/src/new-regexp/regexp-nodes.h
index 50c843c20c..099687c25e 100644
--- a/js/src/regexp/regexp-nodes.h
+++ b/js/src/new-regexp/regexp-nodes.h
@@ -5,7 +5,7 @@
 #ifndef V8_REGEXP_REGEXP_NODES_H_
 #define V8_REGEXP_REGEXP_NODES_H_
 
-#include "regexp/regexp-macro-assembler.h"
+#include "new-regexp/regexp-macro-assembler.h"
 
 namespace v8 {
 namespace internal {
diff --git a/js/src/regexp/regexp-parser.cc b/js/src/new-regexp/regexp-parser.cc
index e2bbb6ed03..a26e354389 100644
--- a/js/src/regexp/regexp-parser.cc
+++ b/js/src/new-regexp/regexp-parser.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "regexp/regexp-parser.h"
+#include "new-regexp/regexp-parser.h"
 
 #include <vector>
 
-#include "regexp/property-sequences.h"
-#include "regexp/regexp-macro-assembler.h"
-#include "regexp/regexp.h"
+#include "new-regexp/property-sequences.h"
+#include "new-regexp/regexp-macro-assembler.h"
+#include "new-regexp/regexp.h"
 
 #ifdef V8_INTL_SUPPORT
 #include "unicode/uniset.h"
diff --git a/js/src/regexp/regexp-parser.h b/js/src/new-regexp/regexp-parser.h
index 4b0ec3832f..1b2a9fe18c 100644
--- a/js/src/regexp/regexp-parser.h
+++ b/js/src/new-regexp/regexp-parser.h
@@ -5,8 +5,8 @@
 #ifndef V8_REGEXP_REGEXP_PARSER_H_
 #define V8_REGEXP_REGEXP_PARSER_H_
 
-#include "regexp/regexp-ast.h"
-#include "regexp/regexp-error.h"
+#include "new-regexp/regexp-ast.h"
+#include "new-regexp/regexp-error.h"
 
 namespace v8 {
 namespace internal {
diff --git a/js/src/regexp/regexp-shim.cc b/js/src/new-regexp/regexp-shim.cc
index 275fafdf0b..51a9e2d83b 100644
--- a/js/src/regexp/regexp-shim.cc
+++ b/js/src/new-regexp/regexp-shim.cc
@@ -10,8 +10,8 @@
 
 #include <iostream>
 
-#include "regexp/regexp-shim.h"
-#include "regexp/regexp-stack.h"
+#include "new-regexp/regexp-shim.h"
+#include "new-regexp/regexp-stack.h"
 
 #include "mozilla/Sprintf.h" // for SprintfLiteral
 
diff --git a/js/src/regexp/regexp-shim.h b/js/src/new-regexp/regexp-shim.h
index aa8c98be86..c49c25ff13 100644
--- a/js/src/regexp/regexp-shim.h
+++ b/js/src/new-regexp/regexp-shim.h
@@ -25,10 +25,10 @@
 #include "jit/Label.h"
 #include "jit/shared/Assembler-shared.h"
 #include "js/Value.h"
-#include "regexp/RegExpTypes.h"
-#include "regexp/util/flags.h"
-#include "regexp/util/vector.h"
-#include "regexp/util/zone.h"
+#include "new-regexp/RegExpTypes.h"
+#include "new-regexp/util/flags.h"
+#include "new-regexp/util/vector.h"
+#include "new-regexp/util/zone.h"
 #include "vm/NativeObject.h"
 
 // Forward declaration of classes
diff --git a/js/src/regexp/regexp-stack.cc b/js/src/new-regexp/regexp-stack.cc
index b8819e48b6..c8944541c7 100644
--- a/js/src/regexp/regexp-stack.cc
+++ b/js/src/new-regexp/regexp-stack.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "regexp/regexp-stack.h"
+#include "new-regexp/regexp-stack.h"
 
 
 namespace v8 {
diff --git a/js/src/regexp/regexp-stack.h b/js/src/new-regexp/regexp-stack.h
index 0b452c0059..e32d0ed1f5 100644
--- a/js/src/regexp/regexp-stack.h
+++ b/js/src/new-regexp/regexp-stack.h
@@ -5,7 +5,7 @@
 #ifndef V8_REGEXP_REGEXP_STACK_H_
 #define V8_REGEXP_REGEXP_STACK_H_
 
-#include "regexp/regexp-shim.h"
+#include "new-regexp/regexp-shim.h"
 
 namespace v8 {
 namespace internal {
diff --git a/js/src/regexp/regexp.h b/js/src/new-regexp/regexp.h
index a36662b78a..f1e403bf03 100644
--- a/js/src/regexp/regexp.h
+++ b/js/src/new-regexp/regexp.h
@@ -5,8 +5,8 @@
 #ifndef V8_REGEXP_REGEXP_H_
 #define V8_REGEXP_REGEXP_H_
 
-#include "regexp/regexp-error.h"
-#include "regexp/regexp-shim.h"
+#include "new-regexp/regexp-error.h"
+#include "new-regexp/regexp-shim.h"
 
 namespace v8 {
 namespace internal {
diff --git a/js/src/regexp/special-case.cc b/js/src/new-regexp/special-case.cc
index 6b12d28d7d..d767b94c20 100644
--- a/js/src/regexp/special-case.cc
+++ b/js/src/new-regexp/special-case.cc
@@ -11,7 +11,7 @@
 // Semantics: Canonicalize) step 3.
 
 #ifdef V8_INTL_SUPPORT
-#include "regexp/special-case.h"
+#include "new-regexp/special-case.h"
 
 #include "unicode/uniset.h"
 namespace v8 {
diff --git a/js/src/regexp/special-case.h b/js/src/new-regexp/special-case.h
index 3aca983028..31dfd78582 100644
--- a/js/src/regexp/special-case.h
+++ b/js/src/new-regexp/special-case.h
@@ -6,7 +6,7 @@
 #define V8_REGEXP_SPECIAL_CASE_H_
 
 #ifdef V8_INTL_SUPPORT
-#include "regexp/regexp-shim.h"
+#include "new-regexp/regexp-shim.h"
 
 #include "unicode/uchar.h"
 #include "unicode/uniset.h"
diff --git a/js/src/regexp/util/flags.h b/js/src/new-regexp/util/flags.h
index 1fa421fc0c..1fa421fc0c 100644
--- a/js/src/regexp/util/flags.h
+++ b/js/src/new-regexp/util/flags.h
diff --git a/js/src/regexp/util/unicode.cc b/js/src/new-regexp/util/unicode.cc
index da8cef4445..ba9ea607cc 100644
--- a/js/src/regexp/util/unicode.cc
+++ b/js/src/new-regexp/util/unicode.cc
@@ -5,7 +5,7 @@
 // This file is a subset of:
 //  https://github.com/v8/v8/blob/master/src/strings/unicode.cc
 
-#include "regexp/regexp-shim.h"
+#include "new-regexp/regexp-shim.h"
 
 #ifdef V8_INTL_SUPPORT
 #include "unicode/uchar.h"
diff --git a/js/src/regexp/util/vector.h b/js/src/new-regexp/util/vector.h
index 435318ce71..435318ce71 100644
--- a/js/src/regexp/util/vector.h
+++ b/js/src/new-regexp/util/vector.h
diff --git a/js/src/regexp/util/zone.h b/js/src/new-regexp/util/zone.h
index 5a963dd562..7183f77b70 100644
--- a/js/src/regexp/util/zone.h
+++ b/js/src/new-regexp/util/zone.h
@@ -13,7 +13,7 @@
 
 #include "ds/LifoAlloc.h"
 #include "ds/Sort.h"
-#include "regexp/util/vector.h"
+#include "new-regexp/util/vector.h"
 
 namespace v8 {
 namespace internal {