--- a/src/share/vm/graal/graalCompiler.hpp	Fri May 09 17:59:15 2014 +0200
+++ b/src/share/vm/graal/graalCompiler.hpp	Fri May 09 18:46:41 2014 +0200
@@ -26,23 +26,23 @@
 
 #include "compiler/abstractCompiler.hpp"
 
-#define LEAF_GRAPH_ARRAY_SIZE (8192)
-
 class GraalCompiler : public AbstractCompiler {
 
 private:
 
-  bool                  _initialized;
+#ifdef COMPILERGRAAL
+  // Set to true once VMToCompiler.startCompiler() returns
+  bool _started;
+#endif
 
   static GraalCompiler* _instance;
-  address               _external_deopt_i2c_entry;
+ 
 public:
 
   GraalCompiler();
 
   static GraalCompiler* instance() { return _instance; }
 
-
   virtual const char* name() { return "Graal"; }
 
   virtual bool supports_native()                 { return true; }
@@ -57,6 +57,7 @@
   // Initialization
   virtual void initialize();
 
+#ifdef COMPILERGRAAL
   // Compilation entry point for methods
   virtual void compile_method(ciEnv* env, ciMethod* target, int entry_bci);
 
@@ -65,31 +66,8 @@
   // Print compilation timers and statistics
   virtual void print_timers();
 
-  void exit();
-
-  address get_external_deopt_i2c_entry() {return _external_deopt_i2c_entry;}
-
-  static BasicType kindToBasicType(jchar ch);
-
-  static BufferBlob* initialize_buffer_blob();
-
-  static address create_external_deopt_i2c();
+  void shutdown();
+#endif
 };
 
-// Tracing macros
-
-#define IF_TRACE_graal_1 if (!(TraceGraal >= 1)) ; else
-#define IF_TRACE_graal_2 if (!(TraceGraal >= 2)) ; else
-#define IF_TRACE_graal_3 if (!(TraceGraal >= 3)) ; else
-#define IF_TRACE_graal_4 if (!(TraceGraal >= 4)) ; else
-#define IF_TRACE_graal_5 if (!(TraceGraal >= 5)) ; else
-
-// using commas and else to keep one-instruction semantics
-
-#define TRACE_graal_1 if (!(TraceGraal >= 1 && (tty->print("TraceGraal-1: "), true))) ; else tty->print_cr
-#define TRACE_graal_2 if (!(TraceGraal >= 2 && (tty->print("   TraceGraal-2: "), true))) ; else tty->print_cr
-#define TRACE_graal_3 if (!(TraceGraal >= 3 && (tty->print("      TraceGraal-3: "), true))) ; else tty->print_cr
-#define TRACE_graal_4 if (!(TraceGraal >= 4 && (tty->print("         TraceGraal-4: "), true))) ; else tty->print_cr
-#define TRACE_graal_5 if (!(TraceGraal >= 5 && (tty->print("            TraceGraal-5: "), true))) ; else tty->print_cr
-
 #endif // SHARE_VM_GRAAL_GRAAL_COMPILER_HPP