diff -r 7a2a740815b7 -r caf115bb98ad src/hotspot/share/runtime/globals.cpp
--- a/src/hotspot/share/runtime/globals.cpp	Tue May 15 11:28:29 2018 -0700
+++ b/src/hotspot/share/runtime/globals.cpp	Tue May 15 20:24:34 2018 +0200
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "jfr/jfrEvents.hpp"
 #include "jvm.h"
 #include "memory/allocation.inline.hpp"
 #include "oops/oop.inline.hpp"
@@ -34,7 +35,6 @@
 #include "runtime/flags/jvmFlagRangeList.hpp"
 #include "runtime/os.hpp"
 #include "runtime/sharedRuntime.hpp"
-#include "trace/tracing.hpp"
 #include "utilities/defaultStream.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/ostream.hpp"