--- a/hotspot/src/cpu/zero/vm/stack_zero.cpp	Tue Jan 12 16:01:54 2016 +0100
+++ b/hotspot/src/cpu/zero/vm/stack_zero.cpp	Tue Jan 12 13:14:41 2016 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -25,9 +25,16 @@
 
 #include "precompiled.hpp"
 #include "interpreter/interpreterRuntime.hpp"
+#include "runtime/thread.hpp"
 #include "stack_zero.hpp"
 #include "stack_zero.inline.hpp"
 
+// Inlined causes circular inclusion with thread.hpp
+ZeroStack::ZeroStack()
+    : _base(NULL), _top(NULL), _sp(NULL) {
+    _shadow_pages_size = JavaThread::stack_shadow_zone_size();
+  }
+
 int ZeroStack::suggest_size(Thread *thread) const {
   assert(needs_setup(), "already set up");
   int abi_available = abi_stack_available(thread);