--- a/hotspot/src/share/vm/opto/adlcVMDeps.hpp	Tue Nov 23 15:01:43 2010 -0500
+++ b/hotspot/src/share/vm/opto/adlcVMDeps.hpp	Tue Nov 23 13:22:55 2010 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2010, 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
@@ -22,6 +22,15 @@
  *
  */
 
+#ifndef SHARE_VM_OPTO_ADLCVMDEPS_HPP
+#define SHARE_VM_OPTO_ADLCVMDEPS_HPP
+
+// adlcVMDeps.hpp is used by both adlc and vm builds.
+// Only include allocation.hpp when we're not building adlc.
+#ifndef SHARE_VM_ADLC_ARENA_HPP
+#include "memory/allocation.hpp"
+#endif
+
 // Declare commonly known constant and data structures between the
 // ADLC and the VM
 //
@@ -42,3 +51,5 @@
   static const char* oop_reloc_type()  { return "relocInfo::oop_type"; }
   static const char* none_reloc_type() { return "relocInfo::none"; }
 };
+
+#endif // SHARE_VM_OPTO_ADLCVMDEPS_HPP