--- a/src/hotspot/cpu/aarch64/interpreterRT_aarch64.hpp	Wed Mar 21 17:09:34 2018 -0400
+++ b/src/hotspot/cpu/aarch64/interpreterRT_aarch64.hpp	Wed Mar 21 19:45:24 2018 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -26,8 +26,8 @@
 #ifndef CPU_AARCH64_VM_INTERPRETERRT_AARCH64_HPP
 #define CPU_AARCH64_VM_INTERPRETERRT_AARCH64_HPP
 
-#include "asm/macroAssembler.hpp"
-#include "memory/allocation.hpp"
+// This is included in the middle of class Interpreter.
+// Do not include files here.
 
 // native method calls
 
@@ -47,12 +47,7 @@
 
  public:
   // Creation
-  SignatureHandlerGenerator(const methodHandle& method, CodeBuffer* buffer) : NativeSignatureIterator(method) {
-    _masm = new MacroAssembler(buffer);
-    _num_int_args = (method->is_static() ? 1 : 0);
-    _num_fp_args = 0;
-    _stack_offset = 0;
-  }
+  SignatureHandlerGenerator(const methodHandle& method, CodeBuffer* buffer);
 
   // Code generation
   void generate(uint64_t fingerprint);