diff -r 518b01b064ff -r 5b173b4ca846 hotspot/src/share/vm/runtime/hpi.hpp
--- a/hotspot/src/share/vm/runtime/hpi.hpp	Tue Nov 23 15:01:43 2010 -0500
+++ b/hotspot/src/share/vm/runtime/hpi.hpp	Tue Nov 23 13:22:55 2010 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2009, 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,14 @@
  *
  */
 
+#ifndef SHARE_VM_RUNTIME_HPI_HPP
+#define SHARE_VM_RUNTIME_HPI_HPP
+
+#include "prims/hpi_imported.h"
+#include "runtime/os.hpp"
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/top.hpp"
+
 //
 // C++ wrapper to HPI.
 //
@@ -232,3 +240,5 @@
         (char *buf, int len),
         ("buf = %p, len = %d", buf, len),
         (buf, len));
+
+#endif // SHARE_VM_RUNTIME_HPI_HPP