Bug 883696 (part 2) - Include full paths in #include statements in js/src/{assembler,yarr}/. r=luke.
authorNicholas Nethercote <nnethercote@mozilla.com>
Thu, 27 Jun 2013 14:43:29 -0700
changeset 136752 7e729e2c3822f343ce9890aa2995c9b63b9f0e34
parent 136751 41ab7286a2e2c9b81ff54f082d0459ac40cb2da0
child 136753 634b48dc2f065f14ac13bd8c9a60c811622c225e
push id30253
push usernnethercote@mozilla.com
push dateFri, 28 Jun 2013 02:19:51 +0000
treeherdermozilla-inbound@699228670afb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersluke
bugs883696
milestone25.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 883696 (part 2) - Include full paths in #include statements in js/src/{assembler,yarr}/. r=luke.
js/src/Makefile.in
js/src/assembler/TestMain.cpp
js/src/assembler/assembler/ARMAssembler.cpp
js/src/assembler/assembler/ARMAssembler.h
js/src/assembler/assembler/ARMv7Assembler.h
js/src/assembler/assembler/AssemblerBufferWithConstantPool.h
js/src/assembler/assembler/LinkBuffer.h
js/src/assembler/assembler/MIPSAssembler.h
js/src/assembler/assembler/MacroAssembler.h
js/src/assembler/assembler/MacroAssemblerARM.cpp
js/src/assembler/assembler/MacroAssemblerARM.h
js/src/assembler/assembler/MacroAssemblerARMv7.h
js/src/assembler/assembler/MacroAssemblerMIPS.h
js/src/assembler/assembler/MacroAssemblerSparc.h
js/src/assembler/assembler/MacroAssemblerX86.h
js/src/assembler/assembler/MacroAssemblerX86Common.cpp
js/src/assembler/assembler/MacroAssemblerX86Common.h
js/src/assembler/assembler/MacroAssemblerX86_64.h
js/src/assembler/assembler/RepatchBuffer.h
js/src/assembler/assembler/SparcAssembler.h
js/src/assembler/assembler/X86Assembler.h
js/src/assembler/jit/ExecutableAllocator.cpp
js/src/assembler/jit/ExecutableAllocatorOS2.cpp
js/src/assembler/jit/ExecutableAllocatorWin.cpp
js/src/assembler/wtf/Assertions.cpp
js/src/assembler/wtf/Assertions.h
js/src/assembler/wtf/Platform.h
js/src/yarr/BumpPointerAllocator.h
js/src/yarr/MatchResult.h
js/src/yarr/OSAllocator.h
js/src/yarr/OSAllocatorOS2.cpp
js/src/yarr/OSAllocatorPosix.cpp
js/src/yarr/OSAllocatorWin.cpp
js/src/yarr/PageAllocation.h
js/src/yarr/PageBlock.cpp
js/src/yarr/Yarr.h
js/src/yarr/YarrCanonicalizeUCS2.cpp
js/src/yarr/YarrCanonicalizeUCS2.h
js/src/yarr/YarrCanonicalizeUCS2.js
js/src/yarr/YarrInterpreter.cpp
js/src/yarr/YarrJIT.cpp
js/src/yarr/YarrJIT.h
js/src/yarr/YarrParser.h
js/src/yarr/YarrPattern.cpp
js/src/yarr/YarrPattern.h
js/src/yarr/YarrSyntaxChecker.cpp
js/src/yarr/YarrSyntaxChecker.h
js/src/yarr/wtfbridge.h
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -112,21 +112,16 @@ ifdef JS_HAS_CTYPES
 VPATH += $(srcdir)/ctypes
 
 ifdef MOZ_NATIVE_FFI
 LOCAL_INCLUDES = $(MOZ_FFI_CFLAGS)
 else
 LOCAL_INCLUDES = -Ictypes/libffi/include
 endif
 
-LOCAL_INCLUDES += \
-    -I. \
-    $(NULL)
-
-
 ifdef MOZ_NATIVE_FFI
 EXTRA_DSO_LDOPTS += $(MOZ_FFI_LIBS)
 else
 ifeq ($(OS_ARCH),OS2)
 SHARED_LIBRARY_LIBS += \
     ctypes/libffi/.libs/ffi.a \
     $(NULL)
 else
@@ -677,13 +672,11 @@ selfhosted.out.h: $(selfhosted_out_h_dep
 # flags wind up being applied to all code in js/src, not just
 # the code in js/src/assembler.
 CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1
 
 ifneq (,$(ENABLE_YARR_JIT))
 CXXFLAGS +=  -DENABLE_JIT=1
 endif
 
-INCLUDES +=	-I$(srcdir)/assembler -I$(srcdir)/yarr
-
 #
 # END kludges for the Nitro assembler
 ###############################################
--- a/js/src/assembler/TestMain.cpp
+++ b/js/src/assembler/TestMain.cpp
@@ -12,22 +12,22 @@
 #define ENABLE_ASSEMBLER 1
 
 // satisfies  ENABLE(JIT)
 #define ENABLE_JIT 1
 
 #define USE_SYSTEM_MALLOC 1
 // leads to FORCE_SYSTEM_MALLOC in wtf/FastMalloc.cpp
 
-#include <jit/ExecutableAllocator.h>
-#include <assembler/LinkBuffer.h>
-#include <assembler/CodeLocation.h>
-#include <assembler/RepatchBuffer.h>
+#include "assembler/jit/ExecutableAllocator.h"
+#include "assembler/assembler/LinkBuffer.h"
+#include "assembler/assembler/CodeLocation.h"
+#include "assembler/assembler/RepatchBuffer.h"
 
-#include <assembler/MacroAssembler.h>
+#include "assembler/assembler/MacroAssembler.h"
 
 #include <stdio.h>
 
 /////////////////////////////////////////////////////////////////
 // Temporary scaffolding for selecting the arch
 #undef ARCH_x86
 #undef ARCH_amd64
 #undef ARCH_arm
--- a/js/src/assembler/assembler/ARMAssembler.cpp
+++ b/js/src/assembler/assembler/ARMAssembler.cpp
@@ -27,17 +27,17 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "assembler/wtf/Platform.h"
 
 #if ENABLE_ASSEMBLER && WTF_CPU_ARM_TRADITIONAL
 
-#include "ARMAssembler.h"
+#include "assembler/assembler/ARMAssembler.h"
 
 namespace JSC {
 
 // Patching helpers
 
 void ARMAssembler::patchConstantPoolLoad(void* loadAddr, void* constPoolAddr)
 {
     ARMWord *ldr = reinterpret_cast<ARMWord*>(loadAddr);
--- a/js/src/assembler/assembler/ARMAssembler.h
+++ b/js/src/assembler/assembler/ARMAssembler.h
@@ -33,17 +33,17 @@
 
 #include "assembler/wtf/Platform.h"
 
 // Some debug code uses s(n)printf for instruction logging.
 #include <stdio.h>
 
 #if ENABLE_ASSEMBLER && WTF_CPU_ARM_TRADITIONAL
 
-#include "AssemblerBufferWithConstantPool.h"
+#include "assembler/assembler/AssemblerBufferWithConstantPool.h"
 #include "assembler/wtf/Assertions.h"
 
 // TODO: We don't print the condition code in our spew lines. Doing this
 // is awkward whilst maintaining a consistent field width.
 namespace js {
     namespace ion {
         class Assembler;
     }
--- a/js/src/assembler/assembler/ARMv7Assembler.h
+++ b/js/src/assembler/assembler/ARMv7Assembler.h
@@ -30,19 +30,18 @@
 
 #ifndef assembler_assembler_ARMv7Assembler_h
 #define assembler_assembler_ARMv7Assembler_h
 
 #include "assembler/wtf/Platform.h"
 
 #if ENABLE(ASSEMBLER) && CPU(ARM_THUMB2)
 
-#include "AssemblerBuffer.h"
+#include "assembler/assembler/AssemblerBuffer.h"
 #include "assembler/wtf/Assertions.h"
-#include "assembler/wtf/Vector.h"
 #include <stdint.h>
 
 namespace JSC {
 
 namespace ARMRegisters {
     typedef enum {
         r0,
         r1,
--- a/js/src/assembler/assembler/AssemblerBufferWithConstantPool.h
+++ b/js/src/assembler/assembler/AssemblerBufferWithConstantPool.h
@@ -30,17 +30,17 @@
 
 #ifndef assembler_assembler_AssemblerBufferWithConstantPool_h
 #define assembler_assembler_AssemblerBufferWithConstantPool_h
 
 #include "assembler/wtf/Platform.h"
 
 #if ENABLE_ASSEMBLER
 
-#include "AssemblerBuffer.h"
+#include "assembler/assembler/AssemblerBuffer.h"
 #include "assembler/wtf/SegmentedVector.h"
 #include "assembler/wtf/Assertions.h"
 
 #define ASSEMBLER_HAS_CONSTANT_POOL 1
 
 namespace JSC {
 
 /*
--- a/js/src/assembler/assembler/LinkBuffer.h
+++ b/js/src/assembler/assembler/LinkBuffer.h
@@ -29,17 +29,17 @@
 
 #ifndef assembler_assembler_LinkBuffer_h
 #define assembler_assembler_LinkBuffer_h
 
 #include "assembler/wtf/Platform.h"
 
 #if ENABLE_ASSEMBLER
 
-#include <assembler/MacroAssembler.h>
+#include "assembler/assembler/MacroAssembler.h"
 
 namespace JSC {
 
 // LinkBuffer:
 //
 // This class assists in linking code generated by the macro assembler, once code generation
 // has been completed, and the code has been copied to is final location in memory.  At this
 // time pointers to labels within the code may be resolved, and relative offsets to external
--- a/js/src/assembler/assembler/MIPSAssembler.h
+++ b/js/src/assembler/assembler/MIPSAssembler.h
@@ -26,21 +26,20 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef assembler_assembler_MIPSAssembler_h
 #define assembler_assembler_MIPSAssembler_h
 
 #if ENABLE(ASSEMBLER) && CPU(MIPS)
 
-#include "AssemblerBuffer.h"
+#include "assembler/assembler/AssemblerBuffer.h"
 #include "assembler/wtf/Assertions.h"
 #include "assembler/wtf/SegmentedVector.h"
 
-#include "methodjit/Logging.h"
 #define IPFX  "        %s"
 #define ISPFX "        "
 #ifdef JS_METHODJIT_SPEW
 # define MAYBE_PAD (isOOLPath ? ">  " : "")
 #else
 # define MAYBE_PAD ""
 #endif
 
--- a/js/src/assembler/assembler/MacroAssembler.h
+++ b/js/src/assembler/assembler/MacroAssembler.h
@@ -30,37 +30,37 @@
 #ifndef assembler_assembler_MacroAssembler_h
 #define assembler_assembler_MacroAssembler_h
 
 #include "assembler/wtf/Platform.h"
 
 #if ENABLE_ASSEMBLER
 
 #if WTF_CPU_ARM_THUMB2
-#include "MacroAssemblerARMv7.h"
+#include "assembler/assembler/MacroAssemblerARMv7.h"
 namespace JSC { typedef MacroAssemblerARMv7 MacroAssemblerBase; }
 
 #elif WTF_CPU_ARM_TRADITIONAL
-#include "MacroAssemblerARM.h"
+#include "assembler/assembler/MacroAssemblerARM.h"
 namespace JSC { typedef MacroAssemblerARM MacroAssemblerBase; }
 
 #elif WTF_CPU_MIPS
-#include "MacroAssemblerMIPS.h"
+#include "assembler/assembler/MacroAssemblerMIPS.h"
 namespace JSC { typedef MacroAssemblerMIPS MacroAssemblerBase; }
 
 #elif WTF_CPU_X86
-#include "MacroAssemblerX86.h"
+#include "assembler/assembler/MacroAssemblerX86.h"
 namespace JSC { typedef MacroAssemblerX86 MacroAssemblerBase; }
 
 #elif WTF_CPU_X86_64
-#include "MacroAssemblerX86_64.h"
+#include "assembler/assembler/MacroAssemblerX86_64.h"
 namespace JSC { typedef MacroAssemblerX86_64 MacroAssemblerBase; }
 
 #elif WTF_CPU_SPARC
-#include "MacroAssemblerSparc.h"
+#include "assembler/assembler/MacroAssemblerSparc.h"
 namespace JSC { typedef MacroAssemblerSparc MacroAssemblerBase; }
 
 #else
 #error "The MacroAssembler is not supported on this platform."
 #endif
 
 
 namespace JSC {
--- a/js/src/assembler/assembler/MacroAssemblerARM.cpp
+++ b/js/src/assembler/assembler/MacroAssemblerARM.cpp
@@ -27,17 +27,17 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * 
  * ***** END LICENSE BLOCK ***** */
 
 #include "assembler/wtf/Platform.h"
 
 #if ENABLE_ASSEMBLER && WTF_CPU_ARM_TRADITIONAL
 
-#include "MacroAssemblerARM.h"
+#include "assembler/assembler/MacroAssemblerARM.h"
 
 #if WTF_OS_LINUX || WTF_OS_ANDROID
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <elf.h>
 
--- a/js/src/assembler/assembler/MacroAssemblerARM.h
+++ b/js/src/assembler/assembler/MacroAssemblerARM.h
@@ -31,18 +31,18 @@
 
 #ifndef assembler_assembler_MacroAssemblerARM_h
 #define assembler_assembler_MacroAssemblerARM_h
 
 #include "assembler/wtf/Platform.h"
 
 #if ENABLE_ASSEMBLER && WTF_CPU_ARM_TRADITIONAL
 
-#include "ARMAssembler.h"
-#include "AbstractMacroAssembler.h"
+#include "assembler/assembler/ARMAssembler.h"
+#include "assembler/assembler/AbstractMacroAssembler.h"
 
 namespace JSC {
 
 class MacroAssemblerARM : public AbstractMacroAssembler<ARMAssembler> {
     static const int DoubleConditionMask = 0x0f;
     static const int DoubleConditionBitSpecial = 0x8;
 public:
     enum Condition {
--- a/js/src/assembler/assembler/MacroAssemblerARMv7.h
+++ b/js/src/assembler/assembler/MacroAssemblerARMv7.h
@@ -30,18 +30,18 @@
 
 #ifndef assembler_assembler_MacroAssemblerARMv7_h
 #define assembler_assembler_MacroAssemblerARMv7_h
 
 #include "assembler/wtf/Platform.h"
 
 #if ENABLE(ASSEMBLER)
 
-#include "ARMv7Assembler.h"
-#include "AbstractMacroAssembler.h"
+#include "assembler/assembler/ARMv7Assembler.h"
+#include "assembler/assembler/AbstractMacroAssembler.h"
 
 namespace JSC {
 
 class MacroAssemblerARMv7 : public AbstractMacroAssembler<ARMv7Assembler> {
     // FIXME: switch dataTempRegister & addressTempRegister, or possibly use r7?
     //        - dTR is likely used more than aTR, and we'll get better instruction
     //        encoding if it's in the low 8 registers.
     static const ARMRegisters::RegisterID dataTempRegister = ARMRegisters::ip;
--- a/js/src/assembler/assembler/MacroAssemblerMIPS.h
+++ b/js/src/assembler/assembler/MacroAssemblerMIPS.h
@@ -24,18 +24,18 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef assembler_assembler_MacroAssemblerMIPS_h
 #define assembler_assembler_MacroAssemblerMIPS_h
 
 #if ENABLE(ASSEMBLER) && CPU(MIPS)
 
-#include "AbstractMacroAssembler.h"
-#include "MIPSAssembler.h"
+#include "assembler/assembler/AbstractMacroAssembler.h"
+#include "assembler/assembler/MIPSAssembler.h"
 
 namespace JSC {
 
 class MacroAssemblerMIPS : public AbstractMacroAssembler<MIPSAssembler> {
 public:
     typedef MIPSRegisters::FPRegisterID FPRegisterID;
 
     MacroAssemblerMIPS()
--- a/js/src/assembler/assembler/MacroAssemblerSparc.h
+++ b/js/src/assembler/assembler/MacroAssemblerSparc.h
@@ -2,22 +2,22 @@
  * vim: set ts=8 sts=4 et sw=4 tw=99: */
 /* 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/. */
 
 #ifndef assembler_assembler_MacroAssemblerSparc_h
 #define assembler_assembler_MacroAssemblerSparc_h
 
-#include <assembler/wtf/Platform.h>
+#include "assembler/wtf/Platform.h"
 
 #if ENABLE_ASSEMBLER && WTF_CPU_SPARC
 
-#include "SparcAssembler.h"
-#include "AbstractMacroAssembler.h"
+#include "assembler/assembler/SparcAssembler.h"
+#include "assembler/assembler/AbstractMacroAssembler.h"
 
 namespace JSC {
 
     class MacroAssemblerSparc : public AbstractMacroAssembler<SparcAssembler> {
     public:
         enum Condition {
             Equal = SparcAssembler::ConditionE,
             NotEqual = SparcAssembler::ConditionNE,
--- a/js/src/assembler/assembler/MacroAssemblerX86.h
+++ b/js/src/assembler/assembler/MacroAssemblerX86.h
@@ -29,17 +29,17 @@
 
 #ifndef assembler_assembler_MacroAssemblerX86_h
 #define assembler_assembler_MacroAssemblerX86_h
 
 #include "assembler/wtf/Platform.h"
 
 #if ENABLE_ASSEMBLER && WTF_CPU_X86
 
-#include "MacroAssemblerX86Common.h"
+#include "assembler/assembler/MacroAssemblerX86Common.h"
 
 namespace JSC {
 
 class MacroAssemblerX86 : public MacroAssemblerX86Common {
 public:
     MacroAssemblerX86()
         : m_isSSE2Present(isSSE2Present())
     {
--- a/js/src/assembler/assembler/MacroAssemblerX86Common.cpp
+++ b/js/src/assembler/assembler/MacroAssemblerX86Common.cpp
@@ -4,17 +4,17 @@
  * 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 "assembler/wtf/Platform.h"
 
 /* SSE checks only make sense on Intel platforms. */
 #if WTF_CPU_X86 || WTF_CPU_X86_64
 
-#include "MacroAssemblerX86Common.h"
+#include "assembler/assembler/MacroAssemblerX86Common.h"
 
 using namespace JSC;
 MacroAssemblerX86Common::SSECheckState MacroAssemblerX86Common::s_sseCheckState = NotCheckedSSE;
 
 #ifdef DEBUG
 bool MacroAssemblerX86Common::s_floatingPointDisabled = false;
 #endif
 
--- a/js/src/assembler/assembler/MacroAssemblerX86Common.h
+++ b/js/src/assembler/assembler/MacroAssemblerX86Common.h
@@ -29,18 +29,18 @@
 
 #ifndef assembler_assembler_MacroAssemblerX86Common_h
 #define assembler_assembler_MacroAssemblerX86Common_h
 
 #include "assembler/wtf/Platform.h"
 
 #if ENABLE_ASSEMBLER
 
-#include "X86Assembler.h"
-#include "AbstractMacroAssembler.h"
+#include "assembler/assembler/X86Assembler.h"
+#include "assembler/assembler/AbstractMacroAssembler.h"
 
 #if WTF_COMPILER_MSVC
 #if WTF_CPU_X86_64
 /* for __cpuid */
 #include <intrin.h>
 #endif
 #endif
 
--- a/js/src/assembler/assembler/MacroAssemblerX86_64.h
+++ b/js/src/assembler/assembler/MacroAssemblerX86_64.h
@@ -31,17 +31,17 @@
 #define assembler_assembler_MacroAssemblerX86_64_h
 
 #include "mozilla/DebugOnly.h"
 
 #include "assembler/wtf/Platform.h"
 
 #if ENABLE_ASSEMBLER && WTF_CPU_X86_64
 
-#include "MacroAssemblerX86Common.h"
+#include "assembler/assembler/MacroAssemblerX86Common.h"
 
 #define REPTACH_OFFSET_CALL_R11 3
 
 namespace JSC {
 
 class MacroAssemblerX86_64 : public MacroAssemblerX86Common {
 protected:
     static const intptr_t MinInt32 = 0xFFFFFFFF80000000;
--- a/js/src/assembler/assembler/RepatchBuffer.h
+++ b/js/src/assembler/assembler/RepatchBuffer.h
@@ -29,18 +29,18 @@
 
 #ifndef assembler_assembler_RepatchBuffer_h
 #define assembler_assembler_RepatchBuffer_h
 
 #include "assembler/wtf/Platform.h"
 
 #if ENABLE_ASSEMBLER
 
-#include <assembler/MacroAssembler.h>
-#include <moco/MocoStubs.h> //MOCO
+#include "assembler/assembler/MacroAssembler.h"
+#include "assembler/moco/MocoStubs.h" //MOCO
 
 namespace JSC {
 
 // RepatchBuffer:
 //
 // This class is used to modify code after code generation has been completed,
 // and after the code has potentially already been executed.  This mechanism is
 // used to apply optimizations to the code.
--- a/js/src/assembler/assembler/SparcAssembler.h
+++ b/js/src/assembler/assembler/SparcAssembler.h
@@ -2,27 +2,26 @@
  * vim: set ts=8 sts=4 et sw=4 tw=99: */
 /* 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/. */
 
 #ifndef assembler_assembler_SparcAssembler_h
 #define assembler_assembler_SparcAssembler_h
 
-#include <assembler/wtf/Platform.h>
+#include "assembler/wtf/Platform.h"
 
 // Some debug code uses s(n)printf for instruction logging.
 #include <stdio.h>
 
 #if ENABLE_ASSEMBLER && WTF_CPU_SPARC
 
-#include "AssemblerBufferWithConstantPool.h"
-#include <assembler/wtf/Assertions.h>
+#include "assembler/assembler/AssemblerBufferWithConstantPool.h"
+#include "assembler/wtf/Assertions.h"
 
-#include "methodjit/Logging.h"
 #define IPFX  "        %s"
 #define ISPFX "        "
 #ifdef JS_METHODJIT_SPEW
 # define MAYBE_PAD (isOOLPath ? ">  " : "")
 #else
 # define MAYBE_PAD ""
 #endif
 
--- a/js/src/assembler/assembler/X86Assembler.h
+++ b/js/src/assembler/assembler/X86Assembler.h
@@ -31,17 +31,17 @@
 #define assembler_assembler_X86Assembler_h
 
 #include <stdarg.h>
 
 #include "assembler/wtf/Platform.h"
 
 #if ENABLE_ASSEMBLER && (WTF_CPU_X86 || WTF_CPU_X86_64)
 
-#include "AssemblerBuffer.h"
+#include "assembler/assembler/AssemblerBuffer.h"
 #include "assembler/wtf/Assertions.h"
 #include "js/Vector.h"
 
 namespace JSC {
 
 inline bool CAN_SIGN_EXTEND_8_32(int32_t value) { return value == (int32_t)(signed char)value; }
 inline bool CAN_ZERO_EXTEND_8_32(int32_t value) { return value == (int32_t)(unsigned char)value; }
 inline bool CAN_ZERO_EXTEND_32_64(int32_t value) { return value >= 0; }
--- a/js/src/assembler/jit/ExecutableAllocator.cpp
+++ b/js/src/assembler/jit/ExecutableAllocator.cpp
@@ -20,17 +20,17 @@
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#include "ExecutableAllocator.h"
+#include "assembler/jit/ExecutableAllocator.h"
 
 #include "js/MemoryMetrics.h"
 
 #if ENABLE_ASSEMBLER
 
 namespace JSC {
 
 size_t ExecutableAllocator::pageSize = 0;
--- a/js/src/assembler/jit/ExecutableAllocatorOS2.cpp
+++ b/js/src/assembler/jit/ExecutableAllocatorOS2.cpp
@@ -19,17 +19,17 @@
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 
-#include "ExecutableAllocator.h"
+#include "assembler/jit/ExecutableAllocator.h"
 
 #if ENABLE_ASSEMBLER && WTF_OS_OS2
 
 #define INCL_DOS
 #include <os2.h>
 
 namespace JSC {
 
--- a/js/src/assembler/jit/ExecutableAllocatorWin.cpp
+++ b/js/src/assembler/jit/ExecutableAllocatorWin.cpp
@@ -18,17 +18,17 @@
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "ExecutableAllocator.h"
+#include "assembler/jit/ExecutableAllocator.h"
 
 #if ENABLE_ASSEMBLER && WTF_OS_WINDOWS
 
 #include "jswin.h"
 
 extern uint64_t random_next(uint64_t *, int);
 
 namespace JSC {
--- a/js/src/assembler/wtf/Assertions.cpp
+++ b/js/src/assembler/wtf/Assertions.cpp
@@ -19,17 +19,17 @@
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "Assertions.h"
+#include "assembler/wtf/Assertions.h"
 
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
 
 #if WTF_COMPILER_MSVC
 #ifndef WINVER
 #define WINVER 0x0500
--- a/js/src/assembler/wtf/Assertions.h
+++ b/js/src/assembler/wtf/Assertions.h
@@ -21,17 +21,17 @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
 #ifndef assembler_wtf_Assertions_h
 #define assembler_wtf_Assertions_h
 
-#include "Platform.h"
+#include "assembler/wtf/Platform.h"
 #include "mozilla/Assertions.h"
 
 #ifndef DEBUG
    /*
     * Prevent unused-variable warnings by defining the macro WTF uses to test
     * for assertions taking effect.
     */
 #  define ASSERT_DISABLED 1
--- a/js/src/assembler/wtf/Platform.h
+++ b/js/src/assembler/wtf/Platform.h
@@ -1215,17 +1215,17 @@
 #define ENABLE_THREADING_OPENMP 1
 #endif
 
 #if !defined(ENABLE_PARALLEL_JOBS) && !ENABLE_SINGLE_THREADED && (ENABLE_THREADING_GENERIC || ENABLE_THREADING_LIBDISPATCH || ENABLE_THREADING_OPENMP)
 #define ENABLE_PARALLEL_JOBS 1
 #endif
 
 #if ENABLE_GLIB_SUPPORT
-#include "GTypedefs.h"
+//#include "GTypedefs.h"
 #endif
 
 /* FIXME: This define won't be needed once #27551 is fully landed. However, 
    since most ports try to support sub-project independence, adding new headers
    to WTF causes many ports to break, and so this way we can address the build
    breakages one port at a time. */
 #define WTF_USE_EXPORT_MACROS 0
 
--- a/js/src/yarr/BumpPointerAllocator.h
+++ b/js/src/yarr/BumpPointerAllocator.h
@@ -25,17 +25,17 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  *
  * ***** END LICENSE BLOCK ***** */
 
 #ifndef yarr_BumpPointerAllocator_h
 #define yarr_BumpPointerAllocator_h
 
-#include "PageAllocation.h"
+#include "yarr/PageAllocation.h"
 
 namespace WTF {
 
 #if WTF_CPU_SPARC
 #define MINIMUM_BUMP_POOL_SIZE 0x2000
 #elif WTF_CPU_IA64
 #define MINIMUM_BUMP_POOL_SIZE 0x4000
 #else
--- a/js/src/yarr/MatchResult.h
+++ b/js/src/yarr/MatchResult.h
@@ -23,17 +23,17 @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
 #ifndef yarr_MatchResult_h
 #define yarr_MatchResult_h
 
-#include "wtfbridge.h"
+#include "yarr/wtfbridge.h"
 
 typedef uint64_t EncodedMatchResult;
 
 struct MatchResult {
     MatchResult(int start, int end)
         : start(start)
         , end(end)
     {
--- a/js/src/yarr/OSAllocator.h
+++ b/js/src/yarr/OSAllocator.h
@@ -26,17 +26,17 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #ifndef yarr_OSAllocator_h
 #define yarr_OSAllocator_h
 
 #include <stdlib.h>
-#include "wtfbridge.h"
+#include "yarr/wtfbridge.h"
 #include "assembler/wtf/VMTags.h"
 #include "assembler/wtf/Assertions.h"
 
 namespace WTF {
 
 class OSAllocator {
 public:
     enum Usage {
--- a/js/src/yarr/OSAllocatorOS2.cpp
+++ b/js/src/yarr/OSAllocatorOS2.cpp
@@ -29,19 +29,19 @@
 
 #include "assembler/wtf/Platform.h"
 
 #if ENABLE_ASSEMBLER && WTF_OS_OS2
 
 #define INCL_DOS
 #include <os2.h>
 
-#include "wtf/Assertions.h"
+#include "assembler/wtf/Assertions.h"
 
-#include "OSAllocator.h"
+#include "yarr/OSAllocator.h"
 
 namespace WTF {
 
 static inline ULONG protection(bool writable, bool executable)
 {
     return (PAG_READ | (writable ? PAG_WRITE : 0) | (executable ? PAG_EXECUTE : 0));
 }
 
--- a/js/src/yarr/OSAllocatorPosix.cpp
+++ b/js/src/yarr/OSAllocatorPosix.cpp
@@ -26,21 +26,21 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "assembler/wtf/Platform.h"
 
 #if WTF_OS_UNIX && !WTF_OS_SYMBIAN
 
-#include "OSAllocator.h"
+#include "yarr/OSAllocator.h"
 
 #include <errno.h>
 #include <sys/mman.h>
-#include "wtf/Assertions.h"
+#include "assembler/wtf/Assertions.h"
 
 namespace WTF {
 
 void* OSAllocator::reserveUncommitted(size_t bytes, Usage usage, bool writable, bool executable)
 {
     void* result = reserveAndCommit(bytes, usage, writable, executable);
 #if HAVE_MADV_FREE_REUSE
     // To support the "reserve then commit" model, we have to initially decommit.
--- a/js/src/yarr/OSAllocatorWin.cpp
+++ b/js/src/yarr/OSAllocatorWin.cpp
@@ -26,20 +26,20 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "assembler/wtf/Platform.h"
 
 #if ENABLE_ASSEMBLER && WTF_OS_WINDOWS
 
-#include "windows.h"
-#include "wtf/Assertions.h"
+#include <windows.h>
+#include "assembler/wtf/Assertions.h"
 
-#include "OSAllocator.h"
+#include "yarr/OSAllocator.h"
 
 namespace WTF {
 
 static inline DWORD protection(bool writable, bool executable)
 {
     return executable ?
         (writable ? PAGE_EXECUTE_READWRITE : PAGE_EXECUTE_READ) :
         (writable ? PAGE_READWRITE : PAGE_READONLY);
--- a/js/src/yarr/PageAllocation.h
+++ b/js/src/yarr/PageAllocation.h
@@ -25,19 +25,19 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  *
  * ***** END LICENSE BLOCK ***** */
 
 #ifndef yarr_PageAllocation_h
 #define yarr_PageAllocation_h
 
-#include "wtfbridge.h"
-#include "OSAllocator.h"
-#include "PageBlock.h"
+#include "yarr/wtfbridge.h"
+#include "yarr/OSAllocator.h"
+#include "yarr/PageBlock.h"
 #include "assembler/wtf/VMTags.h"
 
 #if WTF_OS_DARWIN
 #include <mach/mach_init.h>
 #include <mach/vm_map.h>
 #endif
 
 #if WTF_OS_HAIKU
--- a/js/src/yarr/PageBlock.cpp
+++ b/js/src/yarr/PageBlock.cpp
@@ -22,18 +22,18 @@
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "PageBlock.h"
-#include "wtf/Assertions.h"
+#include "yarr/PageBlock.h"
+#include "assembler/wtf/Assertions.h"
 
 #if WTF_OS_UNIX && !WTF_OS_SYMBIAN
 #include <unistd.h>
 #endif
 
 #if WTF_OS_WINDOWS
 #include <malloc.h>
 #include <windows.h>
--- a/js/src/yarr/Yarr.h
+++ b/js/src/yarr/Yarr.h
@@ -26,18 +26,18 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef yarr_Yarr_h
 #define yarr_Yarr_h
 
 #include <limits.h>
-#include "YarrInterpreter.h"
-#include "YarrPattern.h"
+#include "yarr/YarrInterpreter.h"
+#include "yarr/YarrPattern.h"
 
 namespace JSC { namespace Yarr {
 
 #define YarrStackSpaceForBackTrackInfoPatternCharacter 1 // Only for !fixed quantifiers.
 #define YarrStackSpaceForBackTrackInfoCharacterClass 1 // Only for !fixed quantifiers.
 #define YarrStackSpaceForBackTrackInfoBackReference 2
 #define YarrStackSpaceForBackTrackInfoAlternative 1 // One per alternative.
 #define YarrStackSpaceForBackTrackInfoParentheticalAssertion 1
--- a/js/src/yarr/YarrCanonicalizeUCS2.cpp
+++ b/js/src/yarr/YarrCanonicalizeUCS2.cpp
@@ -22,17 +22,17 @@
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
 // DO NOT EDIT! - this file autogenerated by YarrCanonicalizeUCS2.js
 
-#include "YarrCanonicalizeUCS2.h"
+#include "yarr/YarrCanonicalizeUCS2.h"
 
 #include <stddef.h>
 
 namespace JSC { namespace Yarr {
 
 const uint16_t ucs2CharacterSet0[] = { 0x01c4u, 0x01c5u, 0x01c6u, 0 };
 const uint16_t ucs2CharacterSet1[] = { 0x01c7u, 0x01c8u, 0x01c9u, 0 };
 const uint16_t ucs2CharacterSet2[] = { 0x01cau, 0x01cbu, 0x01ccu, 0 };
--- a/js/src/yarr/YarrCanonicalizeUCS2.h
+++ b/js/src/yarr/YarrCanonicalizeUCS2.h
@@ -25,17 +25,17 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
 #ifndef yarr_YarrCanonicalizeUCS2_h
 #define yarr_YarrCanonicalizeUCS2_h
 
 #include "mozilla/StandardInteger.h"
 
-#include "wtfbridge.h"
+#include "yarr/wtfbridge.h"
 
 namespace JSC { namespace Yarr {
 
 // This set of data (autogenerated using YarrCanonicalizeUCS2.js into YarrCanonicalizeUCS2.cpp)
 // provides information for each UCS2 code point as to the set of code points that it should
 // match under the ES5.1 case insensitive RegExp matching rules, specified in 15.10.2.8.
 enum UCS2CanonicalizationType {
     CanonicalizeUnique,               // No canonically equal values, e.g. 0x0.
--- a/js/src/yarr/YarrCanonicalizeUCS2.js
+++ b/js/src/yarr/YarrCanonicalizeUCS2.js
@@ -169,17 +169,17 @@ var copyright = (
     " * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE"      + "\n" +
     " * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. "      + "\n" +
     " */");
 
 print(copyright);
 print();
 print("// DO NOT EDIT! - this file autogenerated by YarrCanonicalizeUCS2.js");
 print();
-print('#include "YarrCanonicalizeUCS2.h"');
+print('#include "yarr/YarrCanonicalizeUCS2.h"');
 print();
 print('#include <stddef.h>');
 print();
 print("namespace JSC { namespace Yarr {");
 print();
 
 for (i in characterSetInfo) {
     var characters = ""
--- a/js/src/yarr/YarrInterpreter.cpp
+++ b/js/src/yarr/YarrInterpreter.cpp
@@ -21,21 +21,21 @@
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "YarrInterpreter.h"
+#include "yarr/YarrInterpreter.h"
 
-#include "Yarr.h"
-#include "YarrCanonicalizeUCS2.h"
-#include "BumpPointerAllocator.h"
+#include "yarr/Yarr.h"
+#include "yarr/YarrCanonicalizeUCS2.h"
+#include "yarr/BumpPointerAllocator.h"
 
 using namespace WTF;
 
 namespace JSC { namespace Yarr {
 
 template<typename CharType>
 class Interpreter {
 public:
--- a/js/src/yarr/YarrJIT.cpp
+++ b/js/src/yarr/YarrJIT.cpp
@@ -20,21 +20,21 @@
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#include "YarrJIT.h"
+#include "yarr/YarrJIT.h"
 
 #include "assembler/assembler/LinkBuffer.h"
-#include "Yarr.h"
-#include "YarrCanonicalizeUCS2.h"
+#include "yarr/Yarr.h"
+#include "yarr/YarrCanonicalizeUCS2.h"
 
 #if ENABLE_YARR_JIT
 
 using namespace WTF;
 
 namespace JSC { namespace Yarr {
 
 template<YarrJITCompileMode compileMode>
--- a/js/src/yarr/YarrJIT.h
+++ b/js/src/yarr/YarrJIT.h
@@ -29,19 +29,19 @@
 #define yarr_YarrJIT_h
 
 #include "assembler/wtf/Platform.h"
 
 #if ENABLE_YARR_JIT
 
 #include "assembler/assembler/MacroAssembler.h"
 
-#include "MatchResult.h"
-#include "Yarr.h"
-#include "YarrPattern.h"
+#include "yarr/MatchResult.h"
+#include "yarr/Yarr.h"
+#include "yarr/YarrPattern.h"
 
 #if WTF_CPU_X86 && !WTF_COMPILER_MSVC && !WTF_COMPILER_SUNCC
 #define YARR_CALL __attribute__ ((regparm (3)))
 #else
 #define YARR_CALL
 #endif
 
 #if JS_TRACE_LOGGING
--- a/js/src/yarr/YarrParser.h
+++ b/js/src/yarr/YarrParser.h
@@ -23,17 +23,17 @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
 #ifndef yarr_YarrParser_h
 #define yarr_YarrParser_h
 
-#include "Yarr.h"
+#include "yarr/Yarr.h"
 
 namespace JSC { namespace Yarr {
 
 enum BuiltInCharacterClassID {
     DigitClassID,
     SpaceClassID,
     WordClassID,
     NewlineClassID
--- a/js/src/yarr/YarrPattern.cpp
+++ b/js/src/yarr/YarrPattern.cpp
@@ -21,27 +21,27 @@
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#include "YarrPattern.h"
+#include "yarr/YarrPattern.h"
 
-#include "Yarr.h"
-#include "YarrCanonicalizeUCS2.h"
-#include "YarrParser.h"
+#include "yarr/Yarr.h"
+#include "yarr/YarrCanonicalizeUCS2.h"
+#include "yarr/YarrParser.h"
 
 using namespace WTF;
 
 namespace JSC { namespace Yarr {
 
-#include "RegExpJitTables.h"
+#include "yarr/RegExpJitTables.h"
 
 #if WTF_CPU_SPARC
 # define BASE_FRAME_SIZE 24
 #else
 # define BASE_FRAME_SIZE 0
 #endif
 
 class CharacterClassConstructor {
--- a/js/src/yarr/YarrPattern.h
+++ b/js/src/yarr/YarrPattern.h
@@ -24,18 +24,18 @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
 #ifndef yarr_YarrPattern_h
 #define yarr_YarrPattern_h
 
-#include "wtfbridge.h"
-#include "ASCIICType.h"
+#include "yarr/wtfbridge.h"
+#include "yarr/ASCIICType.h"
 
 namespace JSC { namespace Yarr {
 
 struct PatternDisjunction;
 
 enum ErrorCode {
     NoError,
     PatternTooLarge,
--- a/js/src/yarr/YarrSyntaxChecker.cpp
+++ b/js/src/yarr/YarrSyntaxChecker.cpp
@@ -20,19 +20,19 @@
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#include "YarrSyntaxChecker.h"
+#include "yarr/YarrSyntaxChecker.h"
 
-#include "YarrParser.h"
+#include "yarr/YarrParser.h"
 
 namespace JSC { namespace Yarr {
 
 class SyntaxChecker {
 public:
     void assertionBOL() {}
     void assertionEOL() {}
     void assertionWordBoundary(bool) {}
--- a/js/src/yarr/YarrSyntaxChecker.h
+++ b/js/src/yarr/YarrSyntaxChecker.h
@@ -23,18 +23,18 @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
 #ifndef yarr_YarrSyntaxChecker_h
 #define yarr_YarrSyntaxChecker_h
 
-#include "wtfbridge.h"
-#include "YarrParser.h"
+#include "yarr/wtfbridge.h"
+#include "yarr/YarrParser.h"
 
 namespace JSC { namespace Yarr {
 
 ErrorCode checkSyntax(const String& pattern);
 
 }} // JSC::YARR
 
 #endif /* yarr_YarrSyntaxChecker_h */
--- a/js/src/yarr/wtfbridge.h
+++ b/js/src/yarr/wtfbridge.h
@@ -14,17 +14,17 @@
 
 #include <stdio.h>
 #include <stdarg.h>
 #include "jsstr.h"
 #include "jsprvtd.h"
 #include "vm/String.h"
 #include "assembler/wtf/Platform.h"
 #include "assembler/jit/ExecutableAllocator.h"
-#include "CheckedArithmetic.h"
+#include "yarr/CheckedArithmetic.h"
 #include "js/TemplateLib.h"
 
 namespace JSC { namespace Yarr {
 
 /*
  * Basic type definitions.
  */