--- a/hotspot/src/share/vm/runtime/vmStructs.hpp	Mon Aug 21 17:08:54 2017 -0700
+++ b/hotspot/src/share/vm/runtime/vmStructs.hpp	Tue Aug 22 08:37:17 2017 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
 #define SHARE_VM_RUNTIME_VMSTRUCTS_HPP
 
 #include "utilities/debug.hpp"
+#include "utilities/globalDefinitions.hpp"
 #ifdef COMPILER1
 #include "c1/c1_Runtime1.hpp"
 #endif

--- a/hotspot/test/native/runtime/test_vmStructs.cpp	Mon Aug 21 17:08:54 2017 -0700
+++ b/hotspot/test/native/runtime/test_vmStructs.cpp	Tue Aug 22 08:37:17 2017 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,11 +22,12 @@
  */
 
 #include "precompiled.hpp"
-#include "runtime/vmStructs.hpp"
 #include "utilities/macros.hpp"
 #include "unittest.hpp"
 
 #if INCLUDE_VM_STRUCTS
+#include "runtime/vmStructs.hpp"
+
 TEST(VMStructs, last_entries)  {
   // Make sure last entry in the each array is indeed the correct end marker.
   // The reason why these are static is to make sure they are zero initialized.