--- a/src/hotspot/cpu/sparc/interpreterRT_sparc.hpp	Wed Mar 21 17:09:34 2018 -0400
+++ b/src/hotspot/cpu/sparc/interpreterRT_sparc.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.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,9 @@
 #ifndef CPU_SPARC_VM_INTERPRETERRT_SPARC_HPP
 #define CPU_SPARC_VM_INTERPRETERRT_SPARC_HPP
 
-#include "memory/allocation.hpp"
+// This is included in the middle of class Interpreter.
+// Do not include files here.
+
 
 static int binary_search(int key, LookupswitchPair* array, int n);
 
@@ -52,9 +54,7 @@
 
  public:
   // Creation
-  SignatureHandlerGenerator(const methodHandle& method, CodeBuffer* buffer) : NativeSignatureIterator(method) {
-    _masm = new MacroAssembler(buffer);
-  }
+  SignatureHandlerGenerator(const methodHandle& method, CodeBuffer* buffer);
 
   // Code generation
   void generate( uint64_t fingerprint );