--- a/hotspot/src/share/vm/opto/output.hpp	Tue Nov 23 15:01:43 2010 -0500
+++ b/hotspot/src/share/vm/opto/output.hpp	Tue Nov 23 13:22:55 2010 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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,24 @@
  *
  */
 
+#ifndef SHARE_VM_OPTO_OUTPUT_HPP
+#define SHARE_VM_OPTO_OUTPUT_HPP
+
+#include "opto/block.hpp"
+#include "opto/node.hpp"
+#ifdef TARGET_ARCH_MODEL_x86_32
+# include "adfiles/ad_x86_32.hpp"
+#endif
+#ifdef TARGET_ARCH_MODEL_x86_64
+# include "adfiles/ad_x86_64.hpp"
+#endif
+#ifdef TARGET_ARCH_MODEL_sparc
+# include "adfiles/ad_sparc.hpp"
+#endif
+#ifdef TARGET_ARCH_MODEL_zero
+# include "adfiles/ad_zero.hpp"
+#endif
+
 class Arena;
 class Bundle;
 class Block;
@@ -213,3 +231,5 @@
 #endif
 
 };
+
+#endif // SHARE_VM_OPTO_OUTPUT_HPP