--- old/src/share/vm/prims/jvmtiExtensions.hpp	2010-11-16 18:18:32.000000000 +0100
+++ new/src/share/vm/prims/jvmtiExtensions.hpp	2010-11-16 18:18:32.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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,9 +22,14 @@
  *
  */
 
-#ifndef _JVMTI_EXTENSIONS_H_
-#define _JVMTI_EXTENSIONS_H_
+#ifndef SHARE_VM_PRIMS_JVMTIEXTENSIONS_HPP
+#define SHARE_VM_PRIMS_JVMTIEXTENSIONS_HPP
 
+#ifndef JVMTI_KERNEL
+#include "jvmtifiles/jvmti.h"
+#include "jvmtifiles/jvmtiEnv.hpp"
+#include "memory/allocation.hpp"
+#endif
 
 // JvmtiExtensions
 //
@@ -55,4 +60,4 @@
                                        jvmtiExtensionEvent callback);
 };
 
-#endif  /* _JVMTI_EXTENSIONS_H_ */
+#endif // SHARE_VM_PRIMS_JVMTIEXTENSIONS_HPP