--- a/hotspot/src/share/vm/runtime/mutexLocker.cpp	Thu Mar 02 14:19:49 2017 +0100
+++ b/hotspot/src/share/vm/runtime/mutexLocker.cpp	Fri Mar 03 12:02:35 2017 +0100
@@ -124,7 +124,7 @@
 Monitor* PeriodicTask_lock            = NULL;
 Monitor* RedefineClasses_lock         = NULL;
 
-#ifdef INCLUDE_TRACE
+#if INCLUDE_TRACE
 Mutex*   JfrStacktrace_lock           = NULL;
 Monitor* JfrMsg_lock                  = NULL;
 Mutex*   JfrBuffer_lock               = NULL;
@@ -276,7 +276,7 @@
     def(Compilation_lock           , PaddedMonitor, leaf,        false, Monitor::_safepoint_check_never);
   }
 
-#ifdef INCLUDE_TRACE
+#if INCLUDE_TRACE
   def(JfrMsg_lock                  , PaddedMonitor, leaf,        true,  Monitor::_safepoint_check_always);
   def(JfrBuffer_lock               , PaddedMutex  , leaf,        true,  Monitor::_safepoint_check_never);
   def(JfrThreadGroups_lock         , PaddedMutex  , leaf,        true,  Monitor::_safepoint_check_always);

--- a/hotspot/src/share/vm/runtime/mutexLocker.hpp	Thu Mar 02 14:19:49 2017 +0100
+++ b/hotspot/src/share/vm/runtime/mutexLocker.hpp	Fri Mar 03 12:02:35 2017 +0100
@@ -124,7 +124,7 @@
 extern Monitor* PeriodicTask_lock;               // protects the periodic task structure
 extern Monitor* RedefineClasses_lock;            // locks classes from parallel redefinition
 
-#ifdef INCLUDE_TRACE
+#if INCLUDE_TRACE
 extern Mutex*   JfrStacktrace_lock;              // used to guard access to the JFR stacktrace table
 extern Monitor* JfrMsg_lock;                     // protects JFR messaging
 extern Mutex*   JfrBuffer_lock;                  // protects JFR buffer operations