--- a/hotspot/src/share/vm/memory/universe.cpp	Thu Jun 22 15:26:34 2017 -0700
+++ b/hotspot/src/share/vm/memory/universe.cpp	Thu Jun 22 20:47:22 2017 -0400
@@ -73,7 +73,9 @@
 #include "runtime/vm_operations.hpp"
 #include "services/memoryService.hpp"
 #include "utilities/copy.hpp"
+#include "utilities/debug.hpp"
 #include "utilities/events.hpp"
+#include "utilities/formatBuffer.hpp"
 #include "utilities/hashtable.inline.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/ostream.hpp"