diff -r 47339ceb8cb0 -r c04a5c989f26 hotspot/src/share/vm/prims/jvmtiExport.hpp
--- a/hotspot/src/share/vm/prims/jvmtiExport.hpp	Thu Dec 02 14:00:03 2010 -0500
+++ b/hotspot/src/share/vm/prims/jvmtiExport.hpp	Wed Dec 01 15:04:06 2010 +0100
@@ -25,7 +25,6 @@
 #ifndef SHARE_VM_PRIMS_JVMTIEXPORT_HPP
 #define SHARE_VM_PRIMS_JVMTIEXPORT_HPP
 
-#include "code/jvmticmlr.h"
 #include "jvmtifiles/jvmti.h"
 #include "memory/allocation.hpp"
 #include "memory/iterator.hpp"
@@ -36,6 +35,9 @@
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/growableArray.hpp"
 
+// Must be included after jvmti.h.
+#include "code/jvmticmlr.h"
+
 // Forward declarations
 
 class JvmtiEventControllerPrivate;