Include fixes

Author: jsikstro

src/hotspot/share/gc/z/zPage.hpp

@@ -26,10 +26,10 @@
 
 #include "gc/z/zGenerationId.hpp"
 #include "gc/z/zLiveMap.hpp"
+#include "gc/z/zMemory.hpp"
 #include "gc/z/zPageAge.hpp"
 #include "gc/z/zPageType.hpp"
 #include "gc/z/zRememberedSet.hpp"
-#include "gc/z/zVirtualMemory.hpp"
 #include "memory/allocation.hpp"
 #include "oops/oopsHierarchy.hpp"
 

src/hotspot/share/gc/z/zPageAllocator.cpp

@@ -32,6 +32,7 @@
 #include "gc/z/zGlobals.hpp"
 #include "gc/z/zLargePages.inline.hpp"
 #include "gc/z/zLock.inline.hpp"
+#include "gc/z/zMappedCache.hpp"
 #include "gc/z/zMemory.inline.hpp"
 #include "gc/z/zNUMA.hpp"
 #include "gc/z/zPage.inline.hpp"
@@ -66,7 +67,7 @@ static void sort_zoffset_ptrs(void* at, size_t size) {
     });
 }
 
-struct ZSegmentStash {
+class ZSegmentStash {
 private:
   ZGranuleMap<zoffset>* _physical_mappings;
   ZArray<zoffset> _stash;

src/hotspot/share/gc/z/zPageAllocator.hpp

@@ -24,13 +24,11 @@
 #ifndef SHARE_GC_Z_ZPAGEALLOCATOR_HPP
 #define SHARE_GC_Z_ZPAGEALLOCATOR_HPP
 
-#include "gc/z/zAddress.hpp"
 #include "gc/z/zAllocationFlags.hpp"
 #include "gc/z/zArray.hpp"
 #include "gc/z/zGranuleMap.hpp"
 #include "gc/z/zList.hpp"
 #include "gc/z/zLock.hpp"
-#include "gc/z/zMappedCache.hpp"
 #include "gc/z/zPage.hpp"
 #include "gc/z/zPageAge.hpp"
 #include "gc/z/zPageType.hpp"
@@ -45,17 +43,16 @@ class ZGeneration;
 class ZPageAllocation;
 class ZPageAllocator;
 class ZPageAllocatorStats;
+class ZSegmentStash;
 class ZUncommitter;
 class ZWorkers;
-struct ZSegmentStash;
 
 class ZPageAllocator {
   friend class VMStructs;
   friend class ZUncommitter;
 
 private:
   mutable ZLock              _lock;
-
   ZVirtualMemoryManager      _virtual;
   ZPhysicalMemoryManager     _physical;
   ZGranuleMap<zoffset>       _physical_mappings;