diff -r de8045923ad2 -r c6b5a99cea9e src/share/vm/runtime/thread.hpp
--- a/src/share/vm/runtime/thread.hpp	Mon Dec 18 18:18:10 2017 -0500
+++ b/src/share/vm/runtime/thread.hpp	Wed Feb 28 05:31:04 2018 +0000
@@ -51,11 +51,9 @@
 #include "gc_implementation/g1/dirtyCardQueue.hpp"
 #include "gc_implementation/g1/satbQueue.hpp"
 #endif // INCLUDE_ALL_GCS
-#ifdef ZERO
 #ifdef TARGET_ARCH_zero
 # include "stack_zero.hpp"
 #endif
-#endif
 
 class ThreadSafepointState;
 class ThreadProfiler;