--- a/hotspot/src/share/vm/trace/traceEvent.hpp	Tue Nov 18 03:38:50 2014 -0800
+++ b/hotspot/src/share/vm/trace/traceEvent.hpp	Wed Nov 19 16:08:01 2014 +0100
@@ -33,7 +33,6 @@
 };
 
 #if INCLUDE_TRACE
-
 #include "trace/traceBackend.hpp"
 #include "trace/tracing.hpp"
 #include "tracefiles/traceEventIds.hpp"
@@ -154,6 +153,5 @@
   }
 };
 
-#endif /* INCLUDE_TRACE */
-
-#endif /* SHARE_VM_TRACE_TRACEEVENT_HPP */
+#endif // INCLUDE_TRACE
+#endif // SHARE_VM_TRACE_TRACEEVENT_HPP