Simplify macro-assembler.h include dance.

src/macro-assembler.h

Index: src/macro-assembler.h
diff --git a/src/macro-assembler.h b/src/macro-assembler.h
index 22728f42e0f15f724073d8aa927627bcc0115f9c..c865a5fb0c387af9033a2cfac556445654f03a99 100644
--- a/src/macro-assembler.h
+++ b/src/macro-assembler.h
@@ -5,6 +5,8 @@
 #ifndef V8_MACRO_ASSEMBLER_H_
 #define V8_MACRO_ASSEMBLER_H_
 
+#include "src/assembler.h"
+
 
 // Helper types to make boolean flag easier to read at call-site.
 enum InvokeFlag {
@@ -32,52 +34,41 @@ enum AllocationFlags {
 };
 
 
-// Invalid depth in prototype chain.
-const int kInvalidProtoDepth = -1;
-
 #if V8_TARGET_ARCH_IA32
-#include "src/assembler.h"
 #include "src/ia32/assembler-ia32.h"
 #include "src/ia32/assembler-ia32-inl.h"
 #include "src/ia32/macro-assembler-ia32.h"
 #elif V8_TARGET_ARCH_X64
-#include "src/assembler.h"
 #include "src/x64/assembler-x64.h"
 #include "src/x64/assembler-x64-inl.h"
 #include "src/x64/macro-assembler-x64.h"
 #elif V8_TARGET_ARCH_ARM64
-#include "src/arm64/constants-arm64.h"
-#include "src/assembler.h"
-#include "src/arm64/assembler-arm64.h"  // NOLINT
+#include "src/arm64/assembler-arm64.h"
 #include "src/arm64/assembler-arm64-inl.h"
-#include "src/arm64/macro-assembler-arm64.h"  // NOLINT
+#include "src/arm64/constants-arm64.h"
+#include "src/arm64/macro-assembler-arm64.h"
 #include "src/arm64/macro-assembler-arm64-inl.h"
 #elif V8_TARGET_ARCH_ARM
-#include "src/arm/constants-arm.h"
-#include "src/assembler.h"
-#include "src/arm/assembler-arm.h"  // NOLINT
+#include "src/arm/assembler-arm.h"
 #include "src/arm/assembler-arm-inl.h"
-#include "src/arm/macro-assembler-arm.h"  // NOLINT
+#include "src/arm/constants-arm.h"
+#include "src/arm/macro-assembler-arm.h"
 #elif V8_TARGET_ARCH_PPC
-#include "src/ppc/constants-ppc.h"
-#include "src/assembler.h"          // NOLINT
-#include "src/ppc/assembler-ppc.h"  // NOLINT
+#include "src/ppc/assembler-ppc.h"
 #include "src/ppc/assembler-ppc-inl.h"
+#include "src/ppc/constants-ppc.h"
 #include "src/ppc/macro-assembler-ppc.h"
 #elif V8_TARGET_ARCH_MIPS
-#include "src/mips/constants-mips.h"
-#include "src/assembler.h"            // NOLINT
-#include "src/mips/assembler-mips.h"  // NOLINT
+#include "src/mips/assembler-mips.h"
 #include "src/mips/assembler-mips-inl.h"
+#include "src/mips/constants-mips.h"
 #include "src/mips/macro-assembler-mips.h"
 #elif V8_TARGET_ARCH_MIPS64
-#include "src/mips64/constants-mips64.h"
-#include "src/assembler.h"                // NOLINT
-#include "src/mips64/assembler-mips64.h"  // NOLINT
+#include "src/mips64/assembler-mips64.h"
 #include "src/mips64/assembler-mips64-inl.h"
+#include "src/mips64/constants-mips64.h"
 #include "src/mips64/macro-assembler-mips64.h"
 #elif V8_TARGET_ARCH_X87
-#include "src/assembler.h"
 #include "src/x87/assembler-x87.h"
 #include "src/x87/assembler-x87-inl.h"
 #include "src/x87/macro-assembler-x87.h"