--- old/src/hotspot/share/trace/traceDataTypes.hpp	2018-04-09 14:16:41.270128429 +0200
+++ new/src/hotspot/share/trace/traceDataTypes.hpp	2018-04-09 14:16:40.519081147 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2018, 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
@@ -30,31 +30,6 @@
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/ticks.hpp"
 
-enum {
-  CONTENT_TYPE_NONE             = 0,
-  CONTENT_TYPE_CLASS            = 20,
-  CONTENT_TYPE_THREAD           = 22,
-  CONTENT_TYPE_STACKTRACE       = 23,
-  CONTENT_TYPE_BYTES            = 24,
-  CONTENT_TYPE_EPOCHMILLIS      = 25,
-  CONTENT_TYPE_MILLIS           = 26,
-  CONTENT_TYPE_NANOS            = 27,
-  CONTENT_TYPE_TICKS            = 28,
-  CONTENT_TYPE_ADDRESS          = 29,
-  CONTENT_TYPE_PERCENTAGE       = 30,
-
-  JVM_CONTENT_TYPES_START       = 33,
-  JVM_CONTENT_TYPES_END         = 255
-};
-
-enum ReservedEvent {
-  EVENT_METADATA,
-  EVENT_CHECKPOINT,
-  EVENT_BUFFERLOST,
-
-  NUM_RESERVED_EVENTS = JVM_CONTENT_TYPES_END
-};
-
 typedef u8 traceid;
 
 class ClassLoaderData;