--- a/hotspot/src/share/vm/classfile/classLoaderData.cpp	Tue Nov 18 03:38:50 2014 -0800
+++ b/hotspot/src/share/vm/classfile/classLoaderData.cpp	Wed Nov 19 16:08:01 2014 +0100
@@ -65,9 +65,8 @@
 #include "utilities/growableArray.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/ostream.hpp"
-
 #if INCLUDE_TRACE
- #include "trace/tracing.hpp"
+#include "trace/tracing.hpp"
 #endif
 
 ClassLoaderData * ClassLoaderData::_the_null_class_loader_data = NULL;
@@ -978,4 +977,4 @@
   event.commit();
 }
 
-#endif /* INCLUDE_TRACE */
+#endif // INCLUDE_TRACE

--- a/hotspot/src/share/vm/classfile/classLoaderData.hpp	Tue Nov 18 03:38:50 2014 -0800
+++ b/hotspot/src/share/vm/classfile/classLoaderData.hpp	Wed Nov 19 16:08:01 2014 +0100
@@ -31,8 +31,9 @@
 #include "memory/metaspaceCounters.hpp"
 #include "runtime/mutex.hpp"
 #include "utilities/growableArray.hpp"
+#include "utilities/macros.hpp"
 #if INCLUDE_TRACE
-# include "utilities/ticks.hpp"
+#include "utilities/ticks.hpp"
 #endif
 
 //

--- a/hotspot/src/share/vm/classfile/systemDictionary.cpp	Tue Nov 18 03:38:50 2014 -0800
+++ b/hotspot/src/share/vm/classfile/systemDictionary.cpp	Wed Nov 19 16:08:01 2014 +0100
@@ -65,9 +65,8 @@
 #include "services/threadService.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/ticks.hpp"
-
 #if INCLUDE_TRACE
- #include "trace/tracing.hpp"
+#include "trace/tracing.hpp"
 #endif
 
 Dictionary*            SystemDictionary::_dictionary          = NULL;
@@ -2660,7 +2659,7 @@
                                       class_loader->klass() : (Klass*)NULL);
     event.commit();
   }
-#endif /* INCLUDE_TRACE */
+#endif // INCLUDE_TRACE
 }
 
 #ifndef PRODUCT

--- a/hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.cpp	Tue Nov 18 03:38:50 2014 -0800
+++ b/hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.cpp	Wed Nov 19 16:08:01 2014 +0100
@@ -29,8 +29,8 @@
 #include "memory/heapInspection.hpp"
 #include "trace/tracing.hpp"
 #include "utilities/globalDefinitions.hpp"
+#include "utilities/macros.hpp"
 #include "utilities/ticks.hpp"
-
 #if INCLUDE_SERVICES
 
 void ObjectCountEventSender::send(const KlassInfoEntry* entry, GCId gc_id, const Ticks& timestamp) {

--- a/hotspot/src/share/vm/runtime/vmStructs.cpp	Tue Nov 18 03:38:50 2014 -0800
+++ b/hotspot/src/share/vm/runtime/vmStructs.cpp	Wed Nov 19 16:08:01 2014 +0100
@@ -173,7 +173,7 @@
 #endif // INCLUDE_ALL_GCS
 
 #if INCLUDE_TRACE
- #include "runtime/vmStructs_trace.hpp"
+#include "runtime/vmStructs_trace.hpp"
 #endif
 
 #ifdef COMPILER2

--- a/hotspot/src/share/vm/trace/noTraceBackend.hpp	Tue Nov 18 03:38:50 2014 -0800
+++ b/hotspot/src/share/vm/trace/noTraceBackend.hpp	Wed Nov 19 16:08:01 2014 +0100
@@ -41,4 +41,4 @@
 
 typedef NoTraceBackend Tracing;
 
-#endif
+#endif // SHARE_VM_TRACE_NOTRACEBACKEND_HPP

--- a/hotspot/src/share/vm/trace/traceBackend.hpp	Tue Nov 18 03:38:50 2014 -0800
+++ b/hotspot/src/share/vm/trace/traceBackend.hpp	Wed Nov 19 16:08:01 2014 +0100
@@ -25,9 +25,7 @@
 #define SHARE_VM_TRACE_TRACEBACKEND_HPP
 
 #include "utilities/macros.hpp"
-
 #if INCLUDE_TRACE
-
 #include "runtime/globals.hpp"
 #include "runtime/os.hpp"
 #include "trace/traceTime.hpp"
@@ -58,9 +56,7 @@
 
 typedef TraceBackend Tracing;
 
-#else /* INCLUDE_TRACE */
-
+#else // !INCLUDE_TRACE
 #include "trace/noTraceBackend.hpp"
-
-#endif /* INCLUDE_TRACE */
-#endif /* SHARE_VM_TRACE_TRACEBACKEND_HPP */
+#endif // INCLUDE_TRACE
+#endif // SHARE_VM_TRACE_TRACEBACKEND_HPP

--- 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

--- a/hotspot/src/share/vm/trace/traceEventClasses.xsl	Tue Nov 18 03:38:50 2014 -0800
+++ b/hotspot/src/share/vm/trace/traceEventClasses.xsl	Wed Nov 19 16:08:01 2014 +0100
@@ -41,17 +41,14 @@
 #include "trace/traceEvent.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/ticks.hpp"
-
 #if INCLUDE_TRACE
-
-
 #include "trace/traceStream.hpp"
 #include "utilities/ostream.hpp"
 
   <xsl:apply-templates select="trace/events/struct" mode="trace"/>
   <xsl:apply-templates select="trace/events/event" mode="trace"/>
 
-#else
+#else // !INCLUDE_TRACE
 
 class TraceEvent {
 public:
@@ -66,9 +63,8 @@
   <xsl:apply-templates select="trace/events/struct" mode="empty"/>
   <xsl:apply-templates select="trace/events/event" mode="empty"/>
 
-#endif
-
-#endif
+#endif // INCLUDE_TRACE
+#endif // TRACEFILES_TRACEEVENTCLASSES_HPP
 </xsl:template>
 
 <xsl:template match="struct" mode="trace">

--- a/hotspot/src/share/vm/trace/traceEventIds.xsl	Tue Nov 18 03:38:50 2014 -0800
+++ b/hotspot/src/share/vm/trace/traceEventIds.xsl	Wed Nov 19 16:08:01 2014 +0100
@@ -29,13 +29,11 @@
 <xsl:template match="/">
   <xsl:call-template name="file-header"/>
 
-#ifndef TRACEFILES_JFREVENTIDS_HPP
-#define TRACEFILES_JFREVENTIDS_HPP
+#ifndef TRACEFILES_TRACEEVENTIDS_HPP
+#define TRACEFILES_TRACEEVENTIDS_HPP
 
 #include "utilities/macros.hpp"
-
 #if INCLUDE_TRACE
-
 #include "trace/traceDataTypes.hpp"
 
 /**
@@ -67,8 +65,8 @@
 typedef enum TraceEventId  TraceEventId;
 typedef enum TraceStructId TraceStructId;
 
-#endif
-#endif
+#endif // INCLUDE_TRACE
+#endif // TRACEFILES_TRACEEVENTIDS_HPP
 </xsl:template>
 
 </xsl:stylesheet>

--- a/hotspot/src/share/vm/trace/traceMacros.hpp	Tue Nov 18 03:38:50 2014 -0800
+++ b/hotspot/src/share/vm/trace/traceMacros.hpp	Wed Nov 19 16:08:01 2014 +0100
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_TRACE_TRACE_MACRO_HPP
-#define SHARE_VM_TRACE_TRACE_MACRO_HPP
+#ifndef SHARE_VM_TRACE_TRACEMACROS_HPP
+#define SHARE_VM_TRACE_TRACEMACROS_HPP
 
 #define EVENT_THREAD_EXIT(thread)
 #define EVENT_THREAD_DESTRUCT(thread)
@@ -41,4 +41,4 @@
 #define TRACE_TEMPLATES(template)
 #define TRACE_INTRINSICS(do_intrinsic, do_class, do_name, do_signature, do_alias)
 
-#endif
+#endif // SHARE_VM_TRACE_TRACEMACROS_HPP

--- a/hotspot/src/share/vm/trace/traceStream.hpp	Tue Nov 18 03:38:50 2014 -0800
+++ b/hotspot/src/share/vm/trace/traceStream.hpp	Wed Nov 19 16:08:01 2014 +0100
@@ -26,9 +26,7 @@
 #define SHARE_VM_TRACE_TRACESTREAM_HPP
 
 #include "utilities/macros.hpp"
-
 #if INCLUDE_TRACE
-
 #include "oops/klass.hpp"
 #include "oops/method.hpp"
 #include "oops/symbol.hpp"
@@ -117,5 +115,5 @@
   }
 };
 
-#endif /* INCLUDE_TRACE */
-#endif /* SHARE_VM_TRACE_TRACESTREAM_HPP */
+#endif // INCLUDE_TRACE
+#endif // SHARE_VM_TRACE_TRACESTREAM_HPP

--- a/hotspot/src/share/vm/trace/traceTypes.xsl	Tue Nov 18 03:38:50 2014 -0800
+++ b/hotspot/src/share/vm/trace/traceTypes.xsl	Wed Nov 19 16:08:01 2014 +0100
@@ -29,15 +29,14 @@
 <xsl:template match="/">
   <xsl:call-template name="file-header"/>
 
-#ifndef TRACEFILES_JFRTYPES_HPP
-#define TRACEFILES_JFRTYPES_HPP
+#ifndef TRACEFILES_TRACETYPES_HPP
+#define TRACEFILES_TRACETYPES_HPP
 
 #include "oops/symbol.hpp"
 #include "trace/traceDataTypes.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/ticks.hpp"
 
-
 enum JVMContentType {
   _not_a_content_type = (JVM_CONTENT_TYPES_START - 1),
   
@@ -58,7 +57,7 @@
 };
 
 /**
- * Create typedefs for the JRA types:
+ * Create typedefs for the TRACE types:
  *   typedef s8 TYPE_LONG;
  *   typedef s4 TYPE_INTEGER;
  *   typedef const char * TYPE_STRING;
@@ -68,7 +67,7 @@
 typedef <xsl:value-of select="@type"/>  TYPE_<xsl:value-of select="@symbol"/>;
 </xsl:for-each>
 
-#endif // JFRFILES_JFRTYPES_HPP
+#endif // TRACEFILES_TRACETYPES_HPP
 </xsl:template>
 
 </xsl:stylesheet>

--- a/hotspot/src/share/vm/trace/tracing.hpp	Tue Nov 18 03:38:50 2014 -0800
+++ b/hotspot/src/share/vm/trace/tracing.hpp	Wed Nov 19 16:08:01 2014 +0100
@@ -28,4 +28,4 @@
 #include "tracefiles/traceEventClasses.hpp"
 #include "tracefiles/traceEventIds.hpp"
 
-#endif
+#endif // SHARE_VM_TRACE_TRACING_HPP