--- old/src/hotspot/cpu/s390/interpreterRT_s390.hpp	2018-03-20 18:39:15.781180280 -0400
+++ new/src/hotspot/cpu/s390/interpreterRT_s390.hpp	2018-03-20 18:39:15.098116889 -0400
@@ -26,8 +26,6 @@
 #ifndef CPU_S390_VM_INTERPRETERRT_S390_HPP
 #define CPU_S390_VM_INTERPRETERRT_S390_HPP
 
-#include "memory/allocation.hpp"
-
 static int binary_search(int key, LookupswitchPair* array, int n);
 
 static address iload (JavaThread* thread);
@@ -51,10 +49,7 @@
 
  public:
   // creation
-  SignatureHandlerGenerator(const methodHandle& method, CodeBuffer* buffer) : NativeSignatureIterator(method) {
-    _masm = new MacroAssembler(buffer);
-    _fp_arg_nr = 0;
-  }
+  SignatureHandlerGenerator(const methodHandle& method, CodeBuffer* buffer);
 
   // code generation
   void generate(uint64_t fingerprint);