From 65df7ef133814c8c655770e458f7742dedd4e958 Mon Sep 17 00:00:00 2001
From: iklam <ilam3388@gmail.com>
Date: Thu, 23 Jul 2026 17:23:01 -0700
Subject: [PATCH 1/5] step1

---
 src/hotspot/share/runtime/lockStack.inline.hpp     |  4 ++--
 src/hotspot/share/runtime/objectMonitor.inline.hpp |  2 +-
 src/hotspot/share/runtime/vframe.inline.hpp        | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/hotspot/share/runtime/lockStack.inline.hpp b/src/hotspot/share/runtime/lockStack.inline.hpp
index a9ad3553db8f4..eb5d2efb33af8 100644
--- a/src/hotspot/share/runtime/lockStack.inline.hpp
+++ b/src/hotspot/share/runtime/lockStack.inline.hpp
@@ -32,9 +32,9 @@
 #include "memory/iterator.hpp"
 #include "runtime/javaThread.hpp"
 #include "runtime/objectMonitor.inline.hpp"
-#include "runtime/safepoint.hpp"
+//NONEED #include "runtime/safepoint.hpp"
 #include "runtime/stackWatermark.hpp"
-#include "runtime/stackWatermarkSet.inline.hpp"
+//NONEED #include "runtime/stackWatermarkSet.inline.hpp"
 #include "runtime/synchronizer.hpp"
 #include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
diff --git a/src/hotspot/share/runtime/objectMonitor.inline.hpp b/src/hotspot/share/runtime/objectMonitor.inline.hpp
index efdc33cd44120..5dd50fef8db8a 100644
--- a/src/hotspot/share/runtime/objectMonitor.inline.hpp
+++ b/src/hotspot/share/runtime/objectMonitor.inline.hpp
@@ -34,7 +34,7 @@
 #include "runtime/atomicAccess.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/javaThread.inline.hpp"
-#include "runtime/lockStack.inline.hpp"
+//NONEED #include "runtime/lockStack.inline.hpp"
 #include "runtime/synchronizer.hpp"
 #include "runtime/threadIdentifier.hpp"
 #include "utilities/checkedCast.hpp"
diff --git a/src/hotspot/share/runtime/vframe.inline.hpp b/src/hotspot/share/runtime/vframe.inline.hpp
index b3e7b2800c543..f6dcf6f928df6 100644
--- a/src/hotspot/share/runtime/vframe.inline.hpp
+++ b/src/hotspot/share/runtime/vframe.inline.hpp
@@ -27,11 +27,11 @@
 
 #include "runtime/vframe.hpp"
 
-#include "classfile/javaClasses.inline.hpp"
-#include "oops/stackChunkOop.inline.hpp"
-#include "runtime/continuationJavaClasses.inline.hpp"
-#include "runtime/frame.inline.hpp"
-#include "runtime/handles.inline.hpp"
+//NONEED #include "classfile/javaClasses.inline.hpp"
+//NONEED #include "oops/stackChunkOop.inline.hpp"
+//NONEED #include "runtime/continuationJavaClasses.inline.hpp"
+//NONEED #include "runtime/frame.inline.hpp"
+//NONEED #include "runtime/handles.inline.hpp"
 #include "runtime/javaThread.inline.hpp"
 
 inline vframeStreamCommon::vframeStreamCommon(JavaThread* thread,

From 6714c0bde28c0588ae81d64767837dc07b755e82 Mon Sep 17 00:00:00 2001
From: iklam <ilam3388@gmail.com>
Date: Thu, 23 Jul 2026 17:30:55 -0700
Subject: [PATCH 2/5] step2

---
 src/hotspot/share/runtime/fieldDescriptor.inline.hpp |  2 +-
 .../share/runtime/interfaceSupport.inline.hpp        |  8 ++++----
 src/hotspot/share/runtime/perfData.inline.hpp        |  4 ++--
 .../share/runtime/stackChunkFrameStream.inline.hpp   | 12 ++++++------
 src/hotspot/share/runtime/thread.inline.hpp          |  2 +-
 src/hotspot/share/runtime/threadSMR.inline.hpp       |  4 ++--
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/hotspot/share/runtime/fieldDescriptor.inline.hpp b/src/hotspot/share/runtime/fieldDescriptor.inline.hpp
index 6d6290f0fa166..471ae0d505774 100644
--- a/src/hotspot/share/runtime/fieldDescriptor.inline.hpp
+++ b/src/hotspot/share/runtime/fieldDescriptor.inline.hpp
@@ -28,7 +28,7 @@
 #include "runtime/fieldDescriptor.hpp"
 
 #include "oops/fieldInfo.inline.hpp"
-#include "runtime/handles.inline.hpp"
+//NONEED #include "runtime/handles.inline.hpp"
 #include "runtime/signature.hpp"
 
 // All fieldDescriptor inline functions that (directly or indirectly) use "_cp()" or "_cp->"
diff --git a/src/hotspot/share/runtime/interfaceSupport.inline.hpp b/src/hotspot/share/runtime/interfaceSupport.inline.hpp
index 7809e66058fb3..db34d721c5fe6 100644
--- a/src/hotspot/share/runtime/interfaceSupport.inline.hpp
+++ b/src/hotspot/share/runtime/interfaceSupport.inline.hpp
@@ -30,15 +30,15 @@
 
 #include "gc/shared/gc_globals.hpp"
 #include "runtime/globals.hpp"
-#include "runtime/handles.inline.hpp"
+//NONEED #include "runtime/handles.inline.hpp"
 #include "runtime/javaThread.inline.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/orderAccess.hpp"
 #include "runtime/os.hpp"
 #include "runtime/safepointMechanism.inline.hpp"
-#include "runtime/safepointVerifiers.hpp"
-#include "runtime/threadWXSetters.inline.hpp"
-#include "runtime/vmOperations.hpp"
+//NONEED #include "runtime/safepointVerifiers.hpp"
+//NONEED #include "runtime/threadWXSetters.inline.hpp"
+/*NEED*/ #include "runtime/vmOperations.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/preserveException.hpp"
diff --git a/src/hotspot/share/runtime/perfData.inline.hpp b/src/hotspot/share/runtime/perfData.inline.hpp
index ca0b27e25bce6..e7dcedc9f783f 100644
--- a/src/hotspot/share/runtime/perfData.inline.hpp
+++ b/src/hotspot/share/runtime/perfData.inline.hpp
@@ -28,8 +28,8 @@
 #include "runtime/perfData.hpp"
 
 #include "utilities/globalCounter.inline.hpp"
-#include "utilities/globalDefinitions.hpp"
-#include "utilities/growableArray.hpp"
+//NONEED #include "utilities/globalDefinitions.hpp"
+//NONEED #include "utilities/growableArray.hpp"
 
 inline int PerfDataList::length() {
   return _set->length();
diff --git a/src/hotspot/share/runtime/stackChunkFrameStream.inline.hpp b/src/hotspot/share/runtime/stackChunkFrameStream.inline.hpp
index e3696d03b4c46..35190a232e076 100644
--- a/src/hotspot/share/runtime/stackChunkFrameStream.inline.hpp
+++ b/src/hotspot/share/runtime/stackChunkFrameStream.inline.hpp
@@ -27,15 +27,15 @@
 
 #include "runtime/stackChunkFrameStream.hpp"
 
-#include "code/codeCache.inline.hpp"
+//NONEED #include "code/codeCache.inline.hpp"
 #include "compiler/oopMap.hpp"
-#include "interpreter/interpreter.hpp"
+//NONEED #include "interpreter/interpreter.hpp"
 #include "logging/log.hpp"
-#include "oops/instanceStackChunkKlass.inline.hpp"
+//NONEED #include "oops/instanceStackChunkKlass.inline.hpp"
 #include "oops/method.hpp"
-#include "oops/oop.hpp"
-#include "oops/stackChunkOop.inline.hpp"
-#include "runtime/frame.inline.hpp"
+//NONEED #include "oops/oop.hpp"
+//NONEED #include "oops/stackChunkOop.inline.hpp"
+//NONEED #include "runtime/frame.inline.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/devirtualizer.inline.hpp"
 #include "utilities/globalDefinitions.hpp"
diff --git a/src/hotspot/share/runtime/thread.inline.hpp b/src/hotspot/share/runtime/thread.inline.hpp
index b4cf3ec589a36..052681ab7a61a 100644
--- a/src/hotspot/share/runtime/thread.inline.hpp
+++ b/src/hotspot/share/runtime/thread.inline.hpp
@@ -30,7 +30,7 @@
 
 #include "gc/shared/tlab_globals.hpp"
 #include "runtime/atomicAccess.hpp"
-#include "utilities/permitForbiddenFunctions.hpp"
+//NONEED #include "utilities/permitForbiddenFunctions.hpp"
 
 #ifdef MACOS_AARCH64
 #include "runtime/os.hpp"
diff --git a/src/hotspot/share/runtime/threadSMR.inline.hpp b/src/hotspot/share/runtime/threadSMR.inline.hpp
index 05d29ff2b902e..65a21c0aa8fb3 100644
--- a/src/hotspot/share/runtime/threadSMR.inline.hpp
+++ b/src/hotspot/share/runtime/threadSMR.inline.hpp
@@ -28,12 +28,12 @@
 #include "runtime/threadSMR.hpp"
 
 #include "gc/shared/gc_globals.hpp"
-#include "gc/shared/tlab_globals.hpp"
+//NONEED #include "gc/shared/tlab_globals.hpp"
 #include "memory/iterator.hpp"
 #include "runtime/atomicAccess.hpp"
 #include "runtime/javaThread.hpp"
 #include "runtime/prefetch.inline.hpp"
-#include "utilities/debug.hpp"
+//NONEED #include "utilities/debug.hpp"
 #include "utilities/macros.hpp"
 
 ThreadsList::Iterator::Iterator(ThreadsList* list, uint i) :

From 0e5750050cfc55d436a97d3ef76c9b586376f94f Mon Sep 17 00:00:00 2001
From: iklam <ilam3388@gmail.com>
Date: Thu, 23 Jul 2026 17:49:06 -0700
Subject: [PATCH 3/5] step3

---
 src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp   | 1 +
 src/hotspot/share/interpreter/interpreterRuntime.cpp     | 1 +
 src/hotspot/share/runtime/basicLock.inline.hpp           | 2 +-
 src/hotspot/share/runtime/continuationHelper.inline.hpp  | 1 +
 src/hotspot/share/runtime/continuationWrapper.inline.hpp | 6 +++---
 src/hotspot/share/runtime/frame.inline.hpp               | 8 ++++----
 src/hotspot/share/runtime/interfaceSupport.inline.hpp    | 2 +-
 src/hotspot/share/runtime/javaThread.inline.hpp          | 2 +-
 src/hotspot/share/runtime/objectMonitor.inline.hpp       | 2 +-
 9 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp b/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp
index e561252ab2580..c4ca9f636f59d 100644
--- a/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp
+++ b/src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp
@@ -43,6 +43,7 @@
 #include "gc/g1/g1YoungGCPostEvacuateTasks.hpp"
 #include "gc/shared/bufferNode.hpp"
 #include "gc/shared/partialArrayState.hpp"
+#include "gc/shared/tlab_globals.hpp"
 #include "jfr/jfrEvents.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/compressedOops.inline.hpp"
diff --git a/src/hotspot/share/interpreter/interpreterRuntime.cpp b/src/hotspot/share/interpreter/interpreterRuntime.cpp
index a8f3d50108321..2f098be7a1421 100644
--- a/src/hotspot/share/interpreter/interpreterRuntime.cpp
+++ b/src/hotspot/share/interpreter/interpreterRuntime.cpp
@@ -76,6 +76,7 @@
 #include "utilities/copy.hpp"
 #include "utilities/events.hpp"
 #include "utilities/exceptions.hpp"
+#include "utilities/preserveException.hpp"
 #if INCLUDE_JFR
 #include "jfr/jfr.inline.hpp"
 #endif
diff --git a/src/hotspot/share/runtime/basicLock.inline.hpp b/src/hotspot/share/runtime/basicLock.inline.hpp
index 9f0f26ee9570d..1ce32e6723591 100644
--- a/src/hotspot/share/runtime/basicLock.inline.hpp
+++ b/src/hotspot/share/runtime/basicLock.inline.hpp
@@ -27,7 +27,7 @@
 
 #include "runtime/basicLock.hpp"
 
-#include "runtime/objectMonitor.inline.hpp"
+//NONEED #include "runtime/objectMonitor.inline.hpp"
 
 inline ObjectMonitor* BasicLock::object_monitor_cache() const {
   assert(UseObjectMonitorTable, "must be");
diff --git a/src/hotspot/share/runtime/continuationHelper.inline.hpp b/src/hotspot/share/runtime/continuationHelper.inline.hpp
index 7bbdbd4935d29..fa926cb2c610e 100644
--- a/src/hotspot/share/runtime/continuationHelper.inline.hpp
+++ b/src/hotspot/share/runtime/continuationHelper.inline.hpp
@@ -31,6 +31,7 @@
 #include "compiler/oopMap.inline.hpp"
 #include "interpreter/oopMapCache.hpp"
 #include "runtime/frame.inline.hpp"
+#include "runtime/handles.inline.hpp"
 #include "runtime/objectMonitor.hpp"
 #include "runtime/stackValue.hpp"
 #include "runtime/synchronizer.hpp"
diff --git a/src/hotspot/share/runtime/continuationWrapper.inline.hpp b/src/hotspot/share/runtime/continuationWrapper.inline.hpp
index 1f9226f8bd352..1f0b77a8b76d6 100644
--- a/src/hotspot/share/runtime/continuationWrapper.inline.hpp
+++ b/src/hotspot/share/runtime/continuationWrapper.inline.hpp
@@ -27,12 +27,12 @@
 
 // There is no continuationWrapper.hpp file
 
-#include "classfile/javaClasses.inline.hpp"
+//NONEED #include "classfile/javaClasses.inline.hpp"
 #include "memory/allocation.hpp"
-#include "oops/oop.inline.hpp"
+//NONEED #include "oops/oop.inline.hpp"
 #include "oops/oopsHierarchy.hpp"
 #include "oops/stackChunkOop.hpp"
-#include "runtime/continuationEntry.inline.hpp"
+//NONEED #include "runtime/continuationEntry.inline.hpp"
 #include "runtime/continuationJavaClasses.inline.hpp"
 #include "runtime/javaThread.hpp"
 
diff --git a/src/hotspot/share/runtime/frame.inline.hpp b/src/hotspot/share/runtime/frame.inline.hpp
index fbd51d117cfbd..76e5c2c1bda0d 100644
--- a/src/hotspot/share/runtime/frame.inline.hpp
+++ b/src/hotspot/share/runtime/frame.inline.hpp
@@ -27,13 +27,13 @@
 
 #include "runtime/frame.hpp"
 
-#include "code/codeBlob.inline.hpp"
+//NONEED #include "code/codeBlob.inline.hpp"
 #include "code/nmethod.inline.hpp"
-#include "interpreter/interpreter.hpp"
+//NONEED #include "interpreter/interpreter.hpp"
 #include "oops/method.hpp"
-#include "oops/stackChunkOop.inline.hpp"
+/*NEED*/ #include "oops/stackChunkOop.inline.hpp"
 #include "runtime/continuation.hpp"
-#include "runtime/registerMap.hpp"
+//NONEED #include "runtime/registerMap.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "utilities/macros.hpp"
 #ifdef ZERO
diff --git a/src/hotspot/share/runtime/interfaceSupport.inline.hpp b/src/hotspot/share/runtime/interfaceSupport.inline.hpp
index db34d721c5fe6..b43bc9d1e787d 100644
--- a/src/hotspot/share/runtime/interfaceSupport.inline.hpp
+++ b/src/hotspot/share/runtime/interfaceSupport.inline.hpp
@@ -41,7 +41,7 @@
 /*NEED*/ #include "runtime/vmOperations.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
-#include "utilities/preserveException.hpp"
+/*NEED*/ #include "utilities/preserveException.hpp"
 
 // Wrapper for all entry points to the virtual machine.
 
diff --git a/src/hotspot/share/runtime/javaThread.inline.hpp b/src/hotspot/share/runtime/javaThread.inline.hpp
index 5b4556b566682..5b19684bd7ea2 100644
--- a/src/hotspot/share/runtime/javaThread.inline.hpp
+++ b/src/hotspot/share/runtime/javaThread.inline.hpp
@@ -29,7 +29,7 @@
 #include "runtime/javaThread.hpp"
 
 #include "classfile/javaClasses.hpp"
-#include "gc/shared/tlab_globals.hpp"
+//NONEED #include "gc/shared/tlab_globals.hpp"
 #include "memory/universe.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/oopHandle.inline.hpp"
diff --git a/src/hotspot/share/runtime/objectMonitor.inline.hpp b/src/hotspot/share/runtime/objectMonitor.inline.hpp
index 5dd50fef8db8a..451abc1021ed0 100644
--- a/src/hotspot/share/runtime/objectMonitor.inline.hpp
+++ b/src/hotspot/share/runtime/objectMonitor.inline.hpp
@@ -29,7 +29,7 @@
 
 #include "classfile/vmSymbols.hpp"
 #include "logging/log.hpp"
-#include "oops/access.inline.hpp"
+//NONEED #include "oops/access.inline.hpp"
 #include "oops/markWord.hpp"
 #include "runtime/atomicAccess.hpp"
 #include "runtime/globals.hpp"

From e80b66a826ff09a9d9a588d7afb1fbe8ccd0e9e4 Mon Sep 17 00:00:00 2001
From: iklam <ilam3388@gmail.com>
Date: Thu, 23 Jul 2026 21:04:32 -0700
Subject: [PATCH 4/5] fixes

---
 src/hotspot/share/cds/aotArtifactFinder.cpp                | 1 +
 src/hotspot/share/cds/aotClassInitializer.cpp              | 1 +
 src/hotspot/share/cds/aotLinkedClassBulkLoader.cpp         | 1 +
 src/hotspot/share/cds/aotMappedHeapWriter.cpp              | 1 +
 src/hotspot/share/cds/aotOopChecker.cpp                    | 1 +
 src/hotspot/share/cds/regeneratedClasses.cpp               | 1 +
 src/hotspot/share/compiler/compilationPolicy.cpp           | 1 +
 src/hotspot/share/oops/stackChunkOop.cpp                   | 1 +
 src/hotspot/share/prims/jniCheck.cpp                       | 1 +
 src/hotspot/share/runtime/continuationHelper.inline.hpp    | 1 +
 src/hotspot/share/runtime/perfData.cpp                     | 1 +
 src/hotspot/share/runtime/stackChunkFrameStream.inline.hpp | 2 +-
 src/hotspot/share/runtime/stackWatermark.cpp               | 1 +
 src/hotspot/share/runtime/thread.inline.hpp                | 2 +-
 src/hotspot/share/runtime/vmOperations.cpp                 | 1 +
 src/hotspot/share/utilities/vmError.cpp                    | 1 +
 16 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/hotspot/share/cds/aotArtifactFinder.cpp b/src/hotspot/share/cds/aotArtifactFinder.cpp
index 1c274e958bfc5..a75a6a62e81fa 100644
--- a/src/hotspot/share/cds/aotArtifactFinder.cpp
+++ b/src/hotspot/share/cds/aotArtifactFinder.cpp
@@ -35,6 +35,7 @@
 #include "classfile/vmClasses.hpp"
 #include "logging/log.hpp"
 #include "memory/metaspaceClosure.hpp"
+#include "memory/resourceArea.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/objArrayKlass.hpp"
 #include "oops/trainingData.hpp"
diff --git a/src/hotspot/share/cds/aotClassInitializer.cpp b/src/hotspot/share/cds/aotClassInitializer.cpp
index 9ef96282aeb73..082da9a35e95a 100644
--- a/src/hotspot/share/cds/aotClassInitializer.cpp
+++ b/src/hotspot/share/cds/aotClassInitializer.cpp
@@ -31,6 +31,7 @@
 #include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionaryShared.hpp"
 #include "classfile/vmSymbols.hpp"
+#include "memory/resourceArea.hpp"
 #include "oops/instanceKlass.inline.hpp"
 #include "oops/symbol.hpp"
 #include "runtime/java.hpp"
diff --git a/src/hotspot/share/cds/aotLinkedClassBulkLoader.cpp b/src/hotspot/share/cds/aotLinkedClassBulkLoader.cpp
index 8129e6a5a814a..992228c93eaea 100644
--- a/src/hotspot/share/cds/aotLinkedClassBulkLoader.cpp
+++ b/src/hotspot/share/cds/aotLinkedClassBulkLoader.cpp
@@ -43,6 +43,7 @@
 #include "runtime/handles.inline.hpp"
 #include "runtime/java.hpp"
 #include "runtime/serviceThread.hpp"
+#include "runtime/vmThread.hpp"
 #include "utilities/growableArray.hpp"
 
 void AOTLinkedClassBulkLoader::serialize(SerializeClosure* soc) {
diff --git a/src/hotspot/share/cds/aotMappedHeapWriter.cpp b/src/hotspot/share/cds/aotMappedHeapWriter.cpp
index 272f548d73126..24df4cbbfb714 100644
--- a/src/hotspot/share/cds/aotMappedHeapWriter.cpp
+++ b/src/hotspot/share/cds/aotMappedHeapWriter.cpp
@@ -36,6 +36,7 @@
 #include "memory/allocation.inline.hpp"
 #include "memory/iterator.inline.hpp"
 #include "memory/oopFactory.hpp"
+#include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
 #include "oops/compressedOops.hpp"
 #include "oops/objArrayOop.inline.hpp"
diff --git a/src/hotspot/share/cds/aotOopChecker.cpp b/src/hotspot/share/cds/aotOopChecker.cpp
index 3c0a142a059fe..1c7dcf2b243d6 100644
--- a/src/hotspot/share/cds/aotOopChecker.cpp
+++ b/src/hotspot/share/cds/aotOopChecker.cpp
@@ -28,6 +28,7 @@
 #include "classfile/javaClasses.hpp"
 #include "classfile/symbolTable.hpp"
 #include "classfile/vmClasses.hpp"
+#include "memory/resourceArea.hpp"
 #include "oops/instanceKlass.inline.hpp"
 #include "runtime/fieldDescriptor.inline.hpp"
 #include "utilities/debug.hpp"
diff --git a/src/hotspot/share/cds/regeneratedClasses.cpp b/src/hotspot/share/cds/regeneratedClasses.cpp
index 724d5b0cad4e6..d7e739cee54b5 100644
--- a/src/hotspot/share/cds/regeneratedClasses.cpp
+++ b/src/hotspot/share/cds/regeneratedClasses.cpp
@@ -26,6 +26,7 @@
 #include "cds/regeneratedClasses.hpp"
 #include "classfile/javaClasses.hpp"
 #include "classfile/vmSymbols.hpp"
+#include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/method.hpp"
diff --git a/src/hotspot/share/compiler/compilationPolicy.cpp b/src/hotspot/share/compiler/compilationPolicy.cpp
index 81c03587416a8..0897974d10903 100644
--- a/src/hotspot/share/compiler/compilationPolicy.cpp
+++ b/src/hotspot/share/compiler/compilationPolicy.cpp
@@ -28,6 +28,7 @@
 #include "compiler/compileBroker.hpp"
 #include "compiler/compilerDefinitions.inline.hpp"
 #include "compiler/compilerOracle.hpp"
+#include "interpreter/abstractInterpreter.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/method.inline.hpp"
 #include "oops/methodData.hpp"
diff --git a/src/hotspot/share/oops/stackChunkOop.cpp b/src/hotspot/share/oops/stackChunkOop.cpp
index 67e5e474cceca..12233baf53f41 100644
--- a/src/hotspot/share/oops/stackChunkOop.cpp
+++ b/src/hotspot/share/oops/stackChunkOop.cpp
@@ -24,6 +24,7 @@
 
 #include "code/nmethod.hpp"
 #include "code/scopeDesc.hpp"
+#include "compiler/oopMap.inline.hpp"
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/barrierSetStackChunk.hpp"
 #include "logging/log.hpp"
diff --git a/src/hotspot/share/prims/jniCheck.cpp b/src/hotspot/share/prims/jniCheck.cpp
index 5f4cf10ebf486..5a32de7731dac 100644
--- a/src/hotspot/share/prims/jniCheck.cpp
+++ b/src/hotspot/share/prims/jniCheck.cpp
@@ -31,6 +31,7 @@
 #include "logging/logTag.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/guardedMemory.hpp"
+#include "memory/resourceArea.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/symbol.hpp"
diff --git a/src/hotspot/share/runtime/continuationHelper.inline.hpp b/src/hotspot/share/runtime/continuationHelper.inline.hpp
index fa926cb2c610e..0fff7daa7f346 100644
--- a/src/hotspot/share/runtime/continuationHelper.inline.hpp
+++ b/src/hotspot/share/runtime/continuationHelper.inline.hpp
@@ -30,6 +30,7 @@
 #include "code/scopeDesc.hpp"
 #include "compiler/oopMap.inline.hpp"
 #include "interpreter/oopMapCache.hpp"
+#include "memory/resourceArea.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/objectMonitor.hpp"
diff --git a/src/hotspot/share/runtime/perfData.cpp b/src/hotspot/share/runtime/perfData.cpp
index 1502995203d72..1aa9a77202353 100644
--- a/src/hotspot/share/runtime/perfData.cpp
+++ b/src/hotspot/share/runtime/perfData.cpp
@@ -26,6 +26,7 @@
 #include "jvm.h"
 #include "logging/log.hpp"
 #include "memory/allocation.inline.hpp"
+#include "memory/resourceArea.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/handles.inline.hpp"
diff --git a/src/hotspot/share/runtime/stackChunkFrameStream.inline.hpp b/src/hotspot/share/runtime/stackChunkFrameStream.inline.hpp
index 35190a232e076..33acbe18ace3f 100644
--- a/src/hotspot/share/runtime/stackChunkFrameStream.inline.hpp
+++ b/src/hotspot/share/runtime/stackChunkFrameStream.inline.hpp
@@ -29,7 +29,7 @@
 
 //NONEED #include "code/codeCache.inline.hpp"
 #include "compiler/oopMap.hpp"
-//NONEED #include "interpreter/interpreter.hpp"
+/*NEED*/ #include "interpreter/interpreter.hpp"
 #include "logging/log.hpp"
 //NONEED #include "oops/instanceStackChunkKlass.inline.hpp"
 #include "oops/method.hpp"
diff --git a/src/hotspot/share/runtime/stackWatermark.cpp b/src/hotspot/share/runtime/stackWatermark.cpp
index 97d6581f08bbf..e17321e377217 100644
--- a/src/hotspot/share/runtime/stackWatermark.cpp
+++ b/src/hotspot/share/runtime/stackWatermark.cpp
@@ -23,6 +23,7 @@
  */
 
 #include "logging/log.hpp"
+#include "memory/resourceArea.hpp"
 #include "runtime/atomicAccess.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/javaThread.hpp"
diff --git a/src/hotspot/share/runtime/thread.inline.hpp b/src/hotspot/share/runtime/thread.inline.hpp
index 052681ab7a61a..284a47c43e163 100644
--- a/src/hotspot/share/runtime/thread.inline.hpp
+++ b/src/hotspot/share/runtime/thread.inline.hpp
@@ -30,7 +30,7 @@
 
 #include "gc/shared/tlab_globals.hpp"
 #include "runtime/atomicAccess.hpp"
-//NONEED #include "utilities/permitForbiddenFunctions.hpp"
+/*NEED*/ #include "utilities/permitForbiddenFunctions.hpp"
 
 #ifdef MACOS_AARCH64
 #include "runtime/os.hpp"
diff --git a/src/hotspot/share/runtime/vmOperations.cpp b/src/hotspot/share/runtime/vmOperations.cpp
index 90666245c5e9d..21940376095ac 100644
--- a/src/hotspot/share/runtime/vmOperations.cpp
+++ b/src/hotspot/share/runtime/vmOperations.cpp
@@ -50,6 +50,7 @@
 #include "runtime/threads.hpp"
 #include "runtime/threadSMR.inline.hpp"
 #include "runtime/vmOperations.hpp"
+#include "runtime/vmThread.hpp"
 #include "services/threadService.hpp"
 #include "utilities/growableArray.hpp"
 #include "utilities/ticks.hpp"
diff --git a/src/hotspot/share/utilities/vmError.cpp b/src/hotspot/share/utilities/vmError.cpp
index 045fcc23d6319..95b35e9ddee5d 100644
--- a/src/hotspot/share/utilities/vmError.cpp
+++ b/src/hotspot/share/utilities/vmError.cpp
@@ -32,6 +32,7 @@
 #include "compiler/disassembler.hpp"
 #include "gc/shared/gcConfig.hpp"
 #include "gc/shared/gcLogPrecious.hpp"
+#include "interpreter/interpreter.hpp"
 #include "jvm.h"
 #include "logging/logConfiguration.hpp"
 #include "memory/allocation.hpp"

From 196351a81bc16ff8cc9985439a4aa4eae8cc1709 Mon Sep 17 00:00:00 2001
From: iklam <ilam3388@gmail.com>
Date: Thu, 23 Jul 2026 21:37:45 -0700
Subject: [PATCH 5/5] more fixes

---
 src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp         | 1 +
 src/hotspot/share/runtime/frame.inline.hpp             | 6 +++---
 test/hotspot/gtest/classfile/test_stringConversion.cpp | 1 +
 test/hotspot/gtest/runtime/test_synchronizer.cpp       | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp b/src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp
index c1c820cb554d8..fd889c935c6a8 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentRefine.cpp
@@ -42,6 +42,7 @@
 #include "memory/iterator.hpp"
 #include "runtime/java.hpp"
 #include "runtime/mutexLocker.hpp"
+#include "runtime/vmThread.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/ticks.hpp"
diff --git a/src/hotspot/share/runtime/frame.inline.hpp b/src/hotspot/share/runtime/frame.inline.hpp
index 76e5c2c1bda0d..1f2b30ef8c04c 100644
--- a/src/hotspot/share/runtime/frame.inline.hpp
+++ b/src/hotspot/share/runtime/frame.inline.hpp
@@ -27,13 +27,13 @@
 
 #include "runtime/frame.hpp"
 
-//NONEED #include "code/codeBlob.inline.hpp"
+/*NEED*/ #include "code/codeBlob.inline.hpp"
 #include "code/nmethod.inline.hpp"
-//NONEED #include "interpreter/interpreter.hpp"
+/*NEED*/ #include "interpreter/interpreter.hpp"
 #include "oops/method.hpp"
 /*NEED*/ #include "oops/stackChunkOop.inline.hpp"
 #include "runtime/continuation.hpp"
-//NONEED #include "runtime/registerMap.hpp"
+/*NEED*/ #include "runtime/registerMap.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "utilities/macros.hpp"
 #ifdef ZERO
diff --git a/test/hotspot/gtest/classfile/test_stringConversion.cpp b/test/hotspot/gtest/classfile/test_stringConversion.cpp
index c11e88615950b..4711ef169a3cd 100644
--- a/test/hotspot/gtest/classfile/test_stringConversion.cpp
+++ b/test/hotspot/gtest/classfile/test_stringConversion.cpp
@@ -21,6 +21,7 @@
  * questions.
  */
 
+#include "memory/resourceArea.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "unittest.hpp"
 
diff --git a/test/hotspot/gtest/runtime/test_synchronizer.cpp b/test/hotspot/gtest/runtime/test_synchronizer.cpp
index acda3566db353..83ad8e7a106c5 100644
--- a/test/hotspot/gtest/runtime/test_synchronizer.cpp
+++ b/test/hotspot/gtest/runtime/test_synchronizer.cpp
@@ -23,6 +23,7 @@
 
 #include "classfile/vmClasses.hpp"
 #include "memory/allocation.hpp"
+#include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/objectMonitor.hpp"