--- a/hotspot/src/share/vm/gc/g1/g1GCPhaseTimes.cpp	Mon Jul 17 16:31:51 2017 -0700
+++ b/hotspot/src/share/vm/gc/g1/g1GCPhaseTimes.cpp	Mon Jul 17 09:30:07 2017 +0200
@@ -32,6 +32,7 @@
 #include "logging/log.hpp"
 #include "runtime/timer.hpp"
 #include "runtime/os.hpp"
+#include "utilities/macros.hpp"
 
 static const char* Indents[5] = {"", "  ", "    ", "      ", "        "};
 

--- a/hotspot/src/share/vm/gc/g1/g1GCPhaseTimes.hpp	Mon Jul 17 16:31:51 2017 -0700
+++ b/hotspot/src/share/vm/gc/g1/g1GCPhaseTimes.hpp	Mon Jul 17 09:30:07 2017 +0200
@@ -27,6 +27,7 @@
 
 #include "logging/logLevel.hpp"
 #include "memory/allocation.hpp"
+#include "utilities/macros.hpp"
 
 class LineBuffer;
 

--- a/hotspot/src/share/vm/gc/g1/g1RootProcessor.cpp	Mon Jul 17 16:31:51 2017 -0700
+++ b/hotspot/src/share/vm/gc/g1/g1RootProcessor.cpp	Mon Jul 17 09:30:07 2017 +0200
@@ -41,6 +41,7 @@
 #include "runtime/fprofiler.hpp"
 #include "runtime/mutex.hpp"
 #include "services/management.hpp"
+#include "utilities/macros.hpp"
 
 void G1RootProcessor::worker_has_discovered_all_strong_classes() {
   assert(ClassUnloadingWithConcurrentMark, "Currently only needed when doing G1 Class Unloading");