--- old/src/share/vm/gc/g1/g1EvacStats.hpp	2015-11-05 20:29:33.826292901 -0500
+++ new/src/share/vm/gc/g1/g1EvacStats.hpp	2015-11-05 20:29:33.718957188 -0500
@@ -26,7 +26,8 @@
 #define SHARE_VM_gc_G1_G1EVACSTATS_HPP
 
 #include "gc/shared/plab.hpp"
-#include "runtime/atomic.hpp"
+#include "memory/allocation.inline.hpp"
+#include "runtime/atomic.inline.hpp"
 
 // Records various memory allocation statistics gathered during evacuation.
 class G1EvacStats : public PLABStats {
--- old/src/share/vm/runtime/java.cpp	2015-11-05 20:29:33.824646407 -0500
+++ new/src/share/vm/runtime/java.cpp	2015-11-05 20:29:33.716332983 -0500
@@ -49,6 +49,7 @@
 #include "runtime/arguments.hpp"
 #include "runtime/biasedLocking.hpp"
 #include "runtime/compilationPolicy.hpp"
+#include "runtime/deoptimization.hpp"
 #include "runtime/fprofiler.hpp"
 #include "runtime/init.hpp"
 #include "runtime/interfaceSupport.hpp"