summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKim Barrett <kbarrett@openjdk.org>2024-02-29 06:24:42 +0000
committerKim Barrett <kbarrett@openjdk.org>2024-02-29 06:24:42 +0000
commit998d0baab0fd051c38d9fd6021628eb863b80554 (patch)
treed43ecac5ea2a84c2e591705670d36e86af1008f6
parent0735c8ab266be9c580bd4434305ee1decfe8b589 (diff)
8324799: Use correct extension for C++ test headersjdk-23+12
Reviewed-by: jwaters, gli, coleenp, lmesnik
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/DynamicCodeGenerated/libDynamicCodeGenerated.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/FollowReferences/FieldIndices/libFieldIndicesTest.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/GetClassFields/FilteredFields/libFilteredFieldsTest.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/GetLocalVariable/libGetSetLocalUnsuspended.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/SuspendWithCurrentThread/libSuspendWithCurrentThread.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/events/Breakpoint/breakpoint01/libbreakpoint01.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/events/ClassLoad/classload01/libclassload01.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/events/ClassPrepare/classprep01/libclassprep01.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/events/Exception/exception01/libexception01.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/events/ExceptionCatch/excatch01/libexcatch01.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc01/libfieldacc01.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc02/libfieldacc02.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc03/libfieldacc03.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc04/libfieldacc04.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/events/FieldModification/fieldmod01/libfieldmod01.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/events/FieldModification/fieldmod02/libfieldmod02.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/events/FramePop/framepop01/libframepop01.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/events/FramePop/framepop02/libframepop02.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/events/MethodEntry/mentry01/libmentry01.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/events/MethodEntry/mentry02/libmentry02.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/events/MethodExit/mexit01/libmexit01.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/events/MethodExit/mexit02/libmexit02.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/events/MonitorContendedEnter/mcontenter01/libmcontenter01.cpp4
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/events/MonitorContendedEntered/mcontentered01/libmcontentered01.cpp4
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/events/MonitorWait/monitorwait01/libmonitorwait01.cpp4
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/events/MonitorWaited/monitorwaited01/libmonitorwaited01.cpp4
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind01/libnativemethbind01.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind02/libnativemethbind02.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind03/libnativemethbind03.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind04/libnativemethbind04.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep01/libsinglestep01.cpp5
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep02/libsinglestep02.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep03/libsinglestep03.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/events/ThreadEnd/threadend01/libthreadend01.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/events/ThreadEnd/threadend02/libthreadend02.cpp4
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/events/ThreadStart/threadstart01/libthreadstart01.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/events/ThreadStart/threadstart02/libthreadstart02.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/events/ThreadStart/threadstart03/libthreadstart03.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/events/VMObjectAlloc/vmobjalloc01/libvmobjalloc01.cpp4
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/negative/GetAllThreadsNullTest/libGetAllThreadsNullTest.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/negative/contmon03/libcontmon03.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/negative/framecnt02/libframecnt02.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/negative/framecnt03/libframecnt03.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/negative/frameloc03/libframeloc03.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/negative/getstacktr02/libgetstacktr02.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/negative/getstacktr09/libgetstacktr09.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/negative/thrinfo02/libthrinfo02.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/negative/thrstat04/libthrstat04.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/stress/StackTrace/NotSuspended/libGetStackTraceNotSuspendedStress.cpp4
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/stress/StackTrace/Suspended/libGetStackTraceSuspendedStress.cpp4
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/stress/ThreadLocalStorage/SetGetThreadLocalStorageStressTest/libSetGetThreadLocalStorageStress.cpp4
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/thread/GetAllThreads/allthr01/liballthr01.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/thread/GetCurrentContendedMonitor/contmon01/libcontmon01.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/thread/GetCurrentContendedMonitor/contmon02/libcontmon02.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/thread/GetFrameCount/framecnt01/libframecnt01.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/thread/GetFrameLocation/frameloc01/libframeloc01.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/thread/GetFrameLocation/frameloc02/libframeloc02.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/GetStackTraceAndRetransformTest/libGetStackTraceAndRetransformTest.cpp3
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/GetStackTraceCurrentThreadTest/libGetStackTraceCurrentThreadTest.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr03/libgetstacktr03.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr04/libgetstacktr04.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr05/libgetstacktr05.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr06/libgetstacktr06.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr07/libgetstacktr07.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr08/libgetstacktr08.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadInfo/thrinfo01/libthrinfo01.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat01/libthrstat01.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat02/libthrstat02.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat03/libthrstat03.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat05/libthrstat05.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThread/resumethrd01/libresumethrd01.cpp4
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThread/resumethrd02/libresumethrd02.cpp4
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThreadList/resumethrdlst01/libresumethrdlst01.cpp4
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThreadList/resumethrdlst02/libresumethrdlst02.cpp4
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThread/suspendthrd01/libsuspendthrd01.cpp4
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThread/suspendthrd02/libsuspendthrd02.cpp4
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThreadList/suspendthrdlst01/libsuspendthrdlst01.cpp4
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThreadList/suspendthrdlst02/libsuspendthrdlst02.cpp4
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/vthread/BoundVThreadTest/libBoundVThreadTest.cpp4
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/vthread/BreakpointInYieldTest/libBreakpointInYieldTest.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/vthread/ContFramePopTest/libContFramePopTest.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/vthread/ContStackDepthTest/libContStackDepthTest.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/vthread/ContYieldBreakPointTest/libContYieldBreakPointTest.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/vthread/ContinuationTest/libContinuationTest.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/vthread/FollowReferences/libVThreadStackRefTest.cpp4
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/vthread/ForceEarlyReturnTest/libForceEarlyReturnTest.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/vthread/GetSetLocalTest/libGetSetLocalTest.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadStateMountedTest/libGetThreadStateMountedTest.cpp4
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/vthread/InterruptThreadTest/libInterruptThreadTest.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/vthread/MethodExitTest/libMethodExitTest.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/vthread/NullAsCurrentThreadTest/libNullAsCurrentThreadTest.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/vthread/PinnedTaskTest/libPinnedTaskTest.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/vthread/PopFrameTest/libPopFrameTest.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/vthread/RawMonitorTest/libRawMonitorTest.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/vthread/SelfSuspendDisablerTest/libSelfSuspendDisablerTest.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/vthread/StopThreadTest/libStopThreadTest.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume1/libSuspendResume1.cpp4
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume2/libSuspendResume2.cpp4
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResumeAll/libSuspendResumeAll.cpp4
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/vthread/ThreadListStackTracesTest/libThreadListStackTracesTest.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/vthread/ThreadStateTest/libThreadStateTest.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/vthread/ToggleNotifyJvmtiTest/libToggleNotifyJvmtiTest.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadEventTest/libVThreadEventTest.cpp4
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadMonitorTest/libVThreadMonitorTest.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadNotifyFramePopTest/libVThreadNotifyFramePopTest.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadTLSTest/libVThreadTLSTest.cpp4
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadTest/libVThreadTest.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadUnsupportedTest/libVThreadUnsupportedTest.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/vthread/VirtualStackTraceTest/libVirtualStackTraceTest.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/vthread/VirtualThreadStartTest/libVirtualThreadStartTest.cpp2
-rw-r--r--test/hotspot/jtreg/serviceability/jvmti/vthread/WaitNotifySuspendedVThreadTest/libWaitNotifySuspendedVThread.cpp2
-rw-r--r--test/hotspot/jtreg/testlibrary/jvmti/libJvmtiUtils.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent00.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent01.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent02.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent03.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine09/agent00.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps001/addcaps001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps002/addcaps002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps003/addcaps003.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/Agent_OnLoad/agentonload001/agentonload001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/Agent_OnUnload/agentonunload001/agentonunload001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/Allocate/alloc001/alloc001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002/attach002Agent00.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002a/attach002aAgent00.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach008/attach008Agent00.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach009/attach009Agent00.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach012/attach012Agent00.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach014/attach014Agent00.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Agent00.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Agent01.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Target.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach020/attach020Agent00.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach021/attach021Agent00.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach022/attach022Agent00.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach037/attach037Agent00.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach038/attach038Agent00.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach039/attach039Agent00.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach040/attach040Agent00.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach041/attach041Agent00.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach042/attach042Agent00.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent00.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent01.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent02.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent03.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach046/attach046Agent00.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach050/attach050Agent00.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/sharedAgents/simpleAgent00.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk001/classfloadhk001.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk002/classfloadhk002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk003/classfloadhk003.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk004/classfloadhk004.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk005/classfloadhk005.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk006/classfloadhk006.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk007/classfloadhk007.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk008/classfloadhk008.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk009/classfloadhk009.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearBreakpoint/clrbrk001/clrbrk001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearBreakpoint/clrbrk002/clrbrk002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearBreakpoint/clrbrk005/clrbrk005.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldAccessWatch/clrfldw001/clrfldw001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldAccessWatch/clrfldw002/clrfldw002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldModificationWatch/clrfmodw001/clrfmodw001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldModificationWatch/clrfmodw002/clrfmodw002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodLoad/compmethload001/compmethload001.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodUnload/compmethunload001/compmethunload001.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/CreateRawMonitor/crrawmon001/crrawmon001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/CreateRawMonitor/crrawmon002/crrawmon002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/DataDumpRequest/datadumpreq001/datadumpreq001.cpp8
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/Deallocate/dealloc001/dealloc001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/DestroyRawMonitor/drrawmon001/drrawmon001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/DestroyRawMonitor/drrawmon003/drrawmon003.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/DestroyRawMonitor/drrawmon004/drrawmon004.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/DisposeEnvironment/disposeenv001/disposeenv001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/DisposeEnvironment/disposeenv002/disposeenv002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/DynamicCodeGenerated/dyncodgen001/dyncodgen001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceEarlyReturn/ForceEarlyReturn001/ForceEarlyReturn001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceGarbageCollection/forcegc001/forcegc001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceGarbageCollection/forcegc002/forcegc002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionFinish/gcfinish001/gcfinish001.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionStart/gcstart001/gcstart001.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionStart/gcstart002/gcstart002.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GenerateEvents/genevents001/genevents001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetArgumentsSize/argsize001/argsize001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetArgumentsSize/argsize002/argsize002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetAvailableProcessors/getavailproc001/getavailproc001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetBytecodes/bytecodes001/bytecodes001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetBytecodes/bytecodes002/bytecodes002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetBytecodes/bytecodes003/bytecodes003.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCapabilities/getcaps001/getcaps001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCapabilities/getcaps002/getcaps002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld005/getclfld005.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld006/getclfld006.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld007/getclfld007.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoader/getclsldr001/getclsldr001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoader/getclsldr002/getclsldr002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoader/getclsldr003/getclsldr003.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoaderClasses/clsldrclss001/clsldrclss001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoaderClasses/clsldrclss002/clsldrclss002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassMethods/getclmthd005/getclmthd005.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassMethods/getclmthd006/getclmthd006.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassMethods/getclmthd007/getclmthd007.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf004/getclmdf004.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf005/getclmdf005.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf006/getclmdf006.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf007/getclmdf007.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassSignature/getclsig004/getclsig004.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassSignature/getclsig005/getclsig005.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassSignature/getclsig006/getclsig006.cpp8
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassStatus/getclstat005/getclstat005.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassStatus/getclstat006/getclstat006.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassStatus/getclstat007/getclstat007.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCurrentThreadCpuTime/curthrcputime001/curthrcputime001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCurrentThreadCpuTimerInfo/curthrtimerinfo001/curthrtimerinfo001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetEnv/GetEnv001/GetEnv001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetEnvironmentLocalStorage/getenvstor001/getenvstor001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetErrorName/geterrname001/geterrname001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetErrorName/geterrname002/geterrname002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetExtensionEvents/extevents001/extevents001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetExtensionFunctions/extfuncs001/extfuncs001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldDeclaringClass/getfldecl001/getfldecl001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldDeclaringClass/getfldecl002/getfldecl002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldDeclaringClass/getfldecl004/getfldecl004.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldModifiers/getfldmdf003/getfldmdf003.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldModifiers/getfldmdf004/getfldmdf004.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldName/getfldnm003/getfldnm003.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldName/getfldnm004/getfldnm004.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldName/getfldnm005/getfldnm005.cpp8
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetImplementedInterfaces/getintrf005/getintrf005.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetImplementedInterfaces/getintrf006/getintrf006.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetImplementedInterfaces/getintrf007/getintrf007.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJLocationFormat/getjlocfmt001/getjlocfmt001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJLocationFormat/getjlocfmt002/getjlocfmt002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJNIFunctionTable/getjniftab001/getjniftab001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJNIFunctionTable/getjniftab002/getjniftab002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLineNumberTable/linetab001/linetab001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLineNumberTable/linetab002/linetab002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLineNumberTable/linetab003/linetab003.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLoadedClasses/loadedclss001/loadedclss001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLoadedClasses/loadedclss002/loadedclss002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariable/getlocal001/getlocal001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariable/getlocal002/getlocal002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab001/localtab001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab002/localtab002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab003/localtab003.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab004/localtab004.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab005/localtab005.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMaxLocals/maxloc001/maxloc001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMaxLocals/maxloc002/maxloc002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodDeclaringClass/declcls001/declcls001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodDeclaringClass/declcls002/declcls002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodDeclaringClass/declcls003/declcls003.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodLocation/methloc002/methloc002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodModifiers/methmod001/methmod001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodModifiers/methmod002/methmod002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodName/methname001/methname001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodName/methname002/methname002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodName/methname003/methname003.cpp8
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectHashCode/objhashcode001/objhashcode001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage001/objmonusage001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage002/objmonusage002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage003/objmonusage003.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage004/objmonusage004.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage005/objmonusage005.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage006/objmonusage006.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectSize/objsize001/objsize001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectsWithTags/objwithtags001/objwithtags001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetOwnedMonitorInfo/ownmoninf001/ownmoninf001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetOwnedMonitorInfo/ownmoninf002/ownmoninf002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetOwnedMonitorInfo/ownmoninf003/ownmoninf003.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPhase/getphase001/getphase001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPhase/getphase002/getphase002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPotentialCapabilities/getpotcaps001/getpotcaps001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceDebugExtension/srcdebugex001/srcdebugex001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceDebugExtension/srcdebugex002/srcdebugex002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceDebugExtension/srcdebugex003/srcdebugex003.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceFileName/getsrcfn004/getsrcfn004.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceFileName/getsrcfn005/getsrcfn005.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceFileName/getsrcfn006/getsrcfn006.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperties/getsysprops001/getsysprops001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperties/getsysprops002/getsysprops002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperty/getsysprop001/getsysprop001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperty/getsysprop002/getsysprop002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTag/gettag001/gettag001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTime/thrcputime001/thrcputime001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTime/thrcputime002/thrcputime002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTimerInfo/thrtimerinfo001/thrtimerinfo001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadGroupChildren/getthrdgrpchld001/getthrdgrpchld001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadGroupInfo/thrgrpinfo001/thrgrpinfo001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadGroupInfo/thrgrpinfo002/thrgrpinfo002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadLocalStorage/getthrdstor001/getthrdstor001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTime/gettime001/gettime001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTimerInfo/timerinfo001/timerinfo001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTopThreadGroups/topthrgrp001/topthrgrp001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTopThreadGroups/topthrgrp002/topthrgrp002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetVersionNumber/getvern001/getvern001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/InterruptThread/intrpthrd001/intrpthrd001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/InterruptThread/intrpthrd002/intrpthrd002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/InterruptThread/intrpthrd003/intrpthrd003.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsArrayClass/isarray004/isarray004.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsArrayClass/isarray005/isarray005.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsFieldSynthetic/isfldsin002/isfldsin002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsFieldSynthetic/isfldsin003/isfldsin003.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsInterface/isintrf004/isintrf004.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsInterface/isintrf005/isintrf005.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodNative/isnative001/isnative001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodNative/isnative002/isnative002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodObsolete/isobsolete001/isobsolete001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodSynthetic/issynth001/issynth001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodSynthetic/issynth002/issynth002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap001/iterheap001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap002/iterheap002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap003/iterheap003.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap004/iterheap004.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap005/iterheap005.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap006/iterheap006.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap007/iterheap007.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls001/iterinstcls001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls002/iterinstcls002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls003/iterinstcls003.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls004/iterinstcls004.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls005/iterinstcls005.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls006/iterinstcls006.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls007/iterinstcls007.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj001/iterobjreachobj001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj002/iterobjreachobj002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj003/iterobjreachobj003.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj004/iterobjreachobj004.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj005/iterobjreachobj005.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj001/iterreachobj001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj002/iterreachobj002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj003/iterreachobj003.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj004/iterreachobj004.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj005/iterreachobj005.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/abort/Abort.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/callbacks/Callbacks.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/concrete-klass-filter/ConcreteKlassFilter.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/filter-tagged/HeapFilter.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/non-concrete-klass-filter/NonConcreteKlassFilter.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/NotifyFramePop/nframepop001/nframepop001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/NotifyFramePop/nframepop002/nframepop002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/NotifyFramePop/nframepop003/nframepop003.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/ObjectFree/objfree001/objfree001.cpp8
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/ObjectFree/objfree002/objfree002.cpp8
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe001/popframe001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe002/popframe002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe003/popframe003.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe004/popframe004.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe005/popframe005.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe006/popframe006.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe007/popframe007.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe008/popframe008.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe009/popframe009.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe010/popframe010.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe011/popframe011.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter001/rawmonenter001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter002/rawmonenter002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter003/rawmonenter003.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter004/rawmonenter004.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit001/rawmonexit001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit002/rawmonexit002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit003/rawmonexit003.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit005/rawmonexit005.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy001/rawmnntfy001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy002/rawmnntfy002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy003/rawmnntfy003.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy004/rawmnntfy004.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall001/rawmnntfyall001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall002/rawmnntfyall002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall003/rawmnntfyall003.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall004/rawmnntfyall004.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait001/rawmnwait001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait002/rawmnwait002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait003/rawmnwait003.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait004/rawmnwait004.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait005/rawmnwait005.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/StressRedefine/stressRedefine.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass001/redefclass001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass002/redefclass002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass003/redefclass003.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass004/redefclass004.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass005/redefclass005.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass006/redefclass006.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass008/redefclass008.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass009/redefclass009.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass010/redefclass010.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass011/redefclass011.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass012/redefclass012.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass013/redefclass013.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass014/redefclass014.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass015/redefclass015.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass016/redefclass016.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass017/redefclass017.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass018/redefclass018.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass019/redefclass019.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass020/redefclass020.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass021/redefclass021.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass022/redefclass022.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass023/redefclass023.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass024/redefclass024.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass025/redefclass025.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass026/redefclass026.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass027/redefclass027.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass028/redefclass028.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass029/redefclass029.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass030/redefclass030.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass031/redefclass031.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RelinquishCapabilities/relcaps001/relcaps001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RelinquishCapabilities/relcaps002/relcaps002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThread/resumethrd001/resumethrd001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThread/resumethrd002/resumethrd002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThreadList/resumethrdlst001/resumethrdlst001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThreadList/resumethrdlst002/resumethrdlst002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform002/retransform002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform003/retransform003.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform004/retransform004.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RunAgentThread/agentthr001/agentthr001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RunAgentThread/agentthr002/agentthr002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/RunAgentThread/agentthr003/agentthr003.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk002/setbrk002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk003/setbrk003.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk005/setbrk005.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk007/setbrk007.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk008/setbrk008.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor001/setenvstor001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor002/setenvstor002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor003/setenvstor003.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb001/setevntcallb001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb002/setevntcallb002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb003/setevntcallb003.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventNotificationMode/setnotif001/setnotif001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetExtensionEventCallback/setextevent001/setextevent001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw001/setfldw001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw002/setfldw002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw003/setfldw003.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw004/setfldw004.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw005/setfldw005.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw006/setfldw006.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw001/setfmodw001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw002/setfmodw002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw003/setfmodw003.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw004/setfmodw004.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw005/setfmodw005.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw006/setfmodw006.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetJNIFunctionTable/setjniftab001/setjniftab001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetJNIFunctionTable/setjniftab002/setjniftab002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal001/setlocal001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal002/setlocal002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal003/setlocal003.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal004/setlocal004.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix001/SetNativeMethodPrefix001.cpp8
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix002/SetNativeMethodPrefix002.cpp8
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix002/SetNativeMethodPrefix002Main.cpp10
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetSystemProperty/setsysprop002/setsysprop002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetSystemProperty/setsysprop003/setsysprop003.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetTag/settag001/settag001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor001/setthrdstor001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor002/setthrdstor002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor003/setthrdstor003.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetVerboseFlag/setvrbflag001/setvrbflag001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetVerboseFlag/setvrbflag002/setvrbflag002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/StopThread/stopthrd006/stopthrd006.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/StopThread/stopthrd007/stopthrd007.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThread/suspendthrd001/suspendthrd001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThread/suspendthrd002/suspendthrd002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThread/suspendthrd003/suspendthrd003.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThreadList/suspendthrdlst001/suspendthrdlst001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThreadList/suspendthrdlst002/suspendthrdlst002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/VMDeath/vmdeath001/vmdeath001.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/VMInit/vminit001/vminit001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP01/ap01t001/ap01t001.cpp8
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP02/ap02t001/ap02t001.cpp8
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP03/ap03t001/ap03t001.cpp8
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t001/ap04t001.cpp8
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t002/ap04t002.cpp8
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t003/ap04t003.cpp8
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP05/ap05t001/ap05t001.cpp8
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP05/ap05t002/ap05t002.cpp8
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP06/ap06t001/ap06t001.cpp8
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP07/ap07t001/ap07t001.cpp8
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP07/ap07t002/ap07t002.cpp8
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP09/ap09t001/ap09t001.cpp8
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP10/ap10t001/ap10t001.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP11/ap11t001/ap11t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP12/ap12t001/ap12t001.cpp8
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI01/bi01t001/bi01t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI01/bi01t002/bi01t002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI02/bi02t001/bi02t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI02/bi02t002/bi02t002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI03/bi03t001/bi03t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI03/bi03t002/bi03t002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI04/bi04t002/bi04t002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t001/cm01t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t002/cm01t002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t003/cm01t003.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t004/cm01t004.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t005/cm01t005.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t006/cm01t006.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t007/cm01t007.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t008/cm01t008.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t009/cm01t009.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t010/cm01t010.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t011/cm01t011.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t012/cm01t012.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t013/cm01t013.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t014/cm01t014.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t015/cm01t015.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t016/cm01t016.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t017/cm01t017.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t018/cm01t018.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t019/cm01t019.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t020/cm01t020.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t021/cm01t021.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM02/cm02t001/cm02t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM03/cm03t001/cm03t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC01/tc01t001/tc01t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC02/tc02t001/tc02t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC03/tc03t001/tc03t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC03/tc03t002/tc03t002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC04/tc04t001/tc04t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC05/tc05t001/tc05t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM01/em01t001/em01t001.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM01/em01t002/em01t002.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t001/em02t001.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t002/em02t002.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t003/em02t003.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t004/em02t004.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t005/em02t005.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t006/em02t006.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t007/em02t007.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t008/em02t008.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t009/em02t009.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t010/em02t010.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t011/em02t011.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t012/em02t012.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM04/em04t001/em04t001.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM05/em05t001/em05t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM05/em05t002/em05t002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM06/em06t001/em06t001.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM07/em07t001/em07t001.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM07/em07t002/em07t002.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/extension/EX03/ex03t001/ex03t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF01/gf01t001/gf01t001.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF04/gf04t001/gf04t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF06/gf06t001/gf06t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF08/gf08t001/gf08t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF08/gf08t002/gf08t002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF08/gf08t003/gf08t003.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS103/hs103t002/hs103t002.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS104/hs104t001/hs104t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS104/hs104t002/hs104t002.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t001/hs201t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t002/hs201t002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t003/hs201t003.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS202/hs202t001/hs202t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS202/hs202t002/hs202t002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t001/hs203t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t002/hs203t002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t003/hs203t003.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t004/hs203t004.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t002/hs204t002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t003/hs204t003.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t004/hs204t004.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t001/hs301t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t002/hs301t002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t003/hs301t003.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t004/hs301t004.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t005/hs301t005.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t001/hs302t001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t002/hs302t002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t003/hs302t003.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t004/hs302t004.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t005/hs302t005.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t006/hs302t006.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t007/hs302t007.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t008/hs302t008.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t009/hs302t009.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t010/hs302t010.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t011/hs302t011.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t012/hs302t012.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI01/ji01t001/ji01t001.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t001/ji03t001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t002/ji03t002.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t003/ji03t003.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t004/ji03t004.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI05/ji05t001/ji05t001.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI06/ji06t001/ji06t001.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA01/ma01t001/ma01t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA01/ma01t001/ma01t001a.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA02/ma02t001/ma02t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA02/ma02t001/ma02t001a.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA03/ma03t001/ma03t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA03/ma03t001/ma03t001a.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t001/ma04t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t001/ma04t001a.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t002/ma04t002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t002/ma04t002a.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t003/ma04t003.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t003/ma04t003a.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA05/ma05t001/ma05t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA05/ma05t001/ma05t001a.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA06/ma06t001/ma06t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA06/ma06t001/ma06t001a.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA07/ma07t001/ma07t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA07/ma07t001/ma07t001a.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA08/ma08t001/ma08t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA08/ma08t001/ma08t001a.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t001/ma10t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t001/ma10t001a.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t002/ma10t002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t002/ma10t002a.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t003/ma10t003.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t003/ma10t003a.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t004/ma10t004.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t004/ma10t004a.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t005/ma10t005.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t005/ma10t005a.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006a.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t007/ma10t007.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t007/ma10t007a.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t008/ma10t008.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t008/ma10t008a.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t001/sp01t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t002/sp01t002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t003/sp01t003.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t001/sp02t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t002/sp02t002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t003/sp02t003.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP03/sp03t001/sp03t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP03/sp03t002/sp03t002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t001/sp04t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t002/sp04t002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP05/sp05t002/sp05t002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP05/sp05t003/sp05t003.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t001/sp06t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t002/sp06t002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t003/sp06t003.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP07/sp07t001/sp07t001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP07/sp07t002/sp07t002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref001/followref001.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref002/followref002.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref003/followref003.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref004/followref004.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref005/followref005.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref006/followref006.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretbase/earlyretbase.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretfp/earlyretfp.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretint/earlyretint.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretlong/earlyretlong.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretobj/earlyretobj.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretstr/earlyretstr.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretvoid/earlyretvoid.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetAllStackTraces/getallstktr001/getallstktr001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetConstantPool/getcpool001/getcpool001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetLineNumberTable/linetab004/linetab004.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetLocalVariable/getlocal003/getlocal003.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetLocalVariable/getlocal004/getlocal004.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/IsSynthetic/issynth001/issynth001.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/agentthr/agentthr.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/clsldrclss00x/clsldrclss00x.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/events/redefineCFLH/JvmtiTest/JvmtiTest.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/heapref/heapref.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/refignore/refignore.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/setNullVMInit/JvmtiTest/JvmtiTest.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/timers/JvmtiTest/JvmtiTest.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/StackTraceController.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/ThreadController.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/Deadlock.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/LockingThreads.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/RecursiveMonitoringThread.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/JVMTIagent.cpp8
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/aod/aod.cpp6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/aod/aod.hpp (renamed from test/hotspot/jtreg/vmTestbase/nsk/share/aod/aod.h)12
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/BooleanArrayCriticalLocker.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/ByteArrayCriticalLocker.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/CharArrayCriticalLocker.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/DoubleArrayCriticalLocker.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/FloatArrayCriticalLocker.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/IntArrayCriticalLocker.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/LongArrayCriticalLocker.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/ShortArrayCriticalLocker.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/StringCriticalLocker.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIGlobalRefLocker.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNILocalRefLocker.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIRefLocker.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIWeakGlobalRefLocker.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/jdi/MonitorEnterExecutor.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/jni/ExceptionCheckingJniEnv.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/jni/JNIreferences.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/jni/README8
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/jni/jni_tools.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/jni/jni_tools.hpp (renamed from test/hotspot/jtreg/vmTestbase/nsk/share/jni/jni_tools.h)6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/AddToBootstrapClassLoaderSearch/bootclssearch_agent.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/AddToSystemClassLoaderSearch/systemclssearch_agent.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/Injector.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/JVMTITools.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/JVMTITools.hpp (renamed from test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/JVMTITools.h)10
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/README14
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/agent_common/agent_common.hpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/agent_tools.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/aod/jvmti_aod.hpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/hotswap/HotSwap.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_FollowRefObjects.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_tools.cpp8
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_tools.hpp (renamed from test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_tools.h)32
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/locks/JNIMonitorLocker.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/locks/LockingThread.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/native/README6
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_list.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_tools.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_tools.hpp (renamed from test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_tools.h)4
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/stress/strace/nsk_strace.hpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/nsk/stress/strace/strace005.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jvmti/share/IndyRedefineClass.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jvmti/stepBreakPopReturn/stepBreakPopReturn.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/jni/nativeAndMH/nativeAndMH.cpp2
-rw-r--r--test/hotspot/jtreg/vmTestbase/vm/mlvm/share/mlvmJvmtiUtils.cpp4
-rw-r--r--test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/redefineClasses.cpp8
-rw-r--r--test/hotspot/jtreg/vmTestbase/vm/share/ProcessUtils.cpp2
-rw-r--r--test/jdk/java/foreign/enablenativeaccess/org/openjdk/foreigntest/unnamed/libLinkerInvokerUnnamed.cpp2
-rw-r--r--test/jdk/java/foreign/enablenativeaccess/panama_module/org/openjdk/foreigntest/libLinkerInvokerModule.cpp2
-rw-r--r--test/jdk/java/foreign/libAsyncInvokers.cpp4
-rw-r--r--test/jdk/java/foreign/loaderLookup/libLoaderLookupInvoker.cpp2
-rw-r--r--test/jdk/java/foreign/stackwalk/libAsyncStackWalk.cpp4
-rw-r--r--test/lib/jdk/test/lib/jvmti/jvmti_common.hpp (renamed from test/lib/jdk/test/lib/jvmti/jvmti_common.h)86
-rw-r--r--test/lib/jdk/test/lib/jvmti/jvmti_thread.hpp (renamed from test/lib/jdk/test/lib/jvmti/jvmti_thread.h)56
-rw-r--r--test/lib/native/testlib_threads.hpp (renamed from test/lib/native/testlib_threads.h)14
729 files changed, 1283 insertions, 1283 deletions
diff --git a/test/hotspot/jtreg/serviceability/jvmti/DynamicCodeGenerated/libDynamicCodeGenerated.cpp b/test/hotspot/jtreg/serviceability/jvmti/DynamicCodeGenerated/libDynamicCodeGenerated.cpp
index f13ba00aa41..5e8e026dbba 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/DynamicCodeGenerated/libDynamicCodeGenerated.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/DynamicCodeGenerated/libDynamicCodeGenerated.cpp
@@ -23,7 +23,7 @@
#include <string.h>
#include <jvmti.h>
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
static jvmtiEnv* jvmti = nullptr;
diff --git a/test/hotspot/jtreg/serviceability/jvmti/FollowReferences/FieldIndices/libFieldIndicesTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/FollowReferences/FieldIndices/libFieldIndicesTest.cpp
index 042edbc6792..b8d83eb5085 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/FollowReferences/FieldIndices/libFieldIndicesTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/FollowReferences/FieldIndices/libFieldIndicesTest.cpp
@@ -24,7 +24,7 @@
#include <string.h>
#include <stdint.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/GetClassFields/FilteredFields/libFilteredFieldsTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/GetClassFields/FilteredFields/libFilteredFieldsTest.cpp
index 24c36444ac2..28bfaaa03bd 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/GetClassFields/FilteredFields/libFilteredFieldsTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/GetClassFields/FilteredFields/libFilteredFieldsTest.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/GetLocalVariable/libGetSetLocalUnsuspended.cpp b/test/hotspot/jtreg/serviceability/jvmti/GetLocalVariable/libGetSetLocalUnsuspended.cpp
index 9ae5005ee6c..79ab3dd0ad8 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/GetLocalVariable/libGetSetLocalUnsuspended.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/GetLocalVariable/libGetSetLocalUnsuspended.cpp
@@ -23,7 +23,7 @@
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/SuspendWithCurrentThread/libSuspendWithCurrentThread.cpp b/test/hotspot/jtreg/serviceability/jvmti/SuspendWithCurrentThread/libSuspendWithCurrentThread.cpp
index 61d41a33835..7e12be32d21 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/SuspendWithCurrentThread/libSuspendWithCurrentThread.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/SuspendWithCurrentThread/libSuspendWithCurrentThread.cpp
@@ -24,7 +24,7 @@
#include <string.h>
#include <atomic>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/Breakpoint/breakpoint01/libbreakpoint01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/Breakpoint/breakpoint01/libbreakpoint01.cpp
index 2f4917c13f9..9f6c4f941de 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/Breakpoint/breakpoint01/libbreakpoint01.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/Breakpoint/breakpoint01/libbreakpoint01.cpp
@@ -27,7 +27,7 @@
#include "jni_md.h"
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/ClassLoad/classload01/libclassload01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/ClassLoad/classload01/libclassload01.cpp
index 8766b2047a9..f8d8af90e9e 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/ClassLoad/classload01/libclassload01.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/ClassLoad/classload01/libclassload01.cpp
@@ -27,7 +27,7 @@
#include <jvmti.h>
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/ClassPrepare/classprep01/libclassprep01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/ClassPrepare/classprep01/libclassprep01.cpp
index 607b1d2792f..934ccaf4e3c 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/ClassPrepare/classprep01/libclassprep01.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/ClassPrepare/classprep01/libclassprep01.cpp
@@ -26,7 +26,7 @@
#include <inttypes.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/Exception/exception01/libexception01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/Exception/exception01/libexception01.cpp
index ebb086adcaa..0910053dfe2 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/Exception/exception01/libexception01.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/Exception/exception01/libexception01.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/ExceptionCatch/excatch01/libexcatch01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/ExceptionCatch/excatch01/libexcatch01.cpp
index f7d74e6f2bf..8c600ed61e6 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/ExceptionCatch/excatch01/libexcatch01.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/ExceptionCatch/excatch01/libexcatch01.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc01/libfieldacc01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc01/libfieldacc01.cpp
index cad086cb7ef..2b34dc48e93 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc01/libfieldacc01.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc01/libfieldacc01.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <inttypes.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc02/libfieldacc02.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc02/libfieldacc02.cpp
index c733fb1cbc7..240f38a8186 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc02/libfieldacc02.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc02/libfieldacc02.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <inttypes.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc03/libfieldacc03.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc03/libfieldacc03.cpp
index 769a26c9c7d..6529adaceac 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc03/libfieldacc03.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc03/libfieldacc03.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <inttypes.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc04/libfieldacc04.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc04/libfieldacc04.cpp
index 2239294c52c..e699d90671d 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc04/libfieldacc04.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/FieldAccess/fieldacc04/libfieldacc04.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <inttypes.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/FieldModification/fieldmod01/libfieldmod01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/FieldModification/fieldmod01/libfieldmod01.cpp
index 26da8fedefb..0e8f5c0417e 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/FieldModification/fieldmod01/libfieldmod01.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/FieldModification/fieldmod01/libfieldmod01.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <inttypes.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/FieldModification/fieldmod02/libfieldmod02.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/FieldModification/fieldmod02/libfieldmod02.cpp
index 23e3c5f22d9..a2c21182391 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/FieldModification/fieldmod02/libfieldmod02.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/FieldModification/fieldmod02/libfieldmod02.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <inttypes.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/FramePop/framepop01/libframepop01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/FramePop/framepop01/libframepop01.cpp
index 04eb17d6d4c..8da891b2779 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/FramePop/framepop01/libframepop01.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/FramePop/framepop01/libframepop01.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <inttypes.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/FramePop/framepop02/libframepop02.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/FramePop/framepop02/libframepop02.cpp
index 21e8f4e7e06..61c9a91184b 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/FramePop/framepop02/libframepop02.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/FramePop/framepop02/libframepop02.cpp
@@ -26,7 +26,7 @@
#include <string.h>
#include <time.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/MethodEntry/mentry01/libmentry01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/MethodEntry/mentry01/libmentry01.cpp
index b5dec318029..8bed8ac6ecb 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/MethodEntry/mentry01/libmentry01.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/MethodEntry/mentry01/libmentry01.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <inttypes.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/MethodEntry/mentry02/libmentry02.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/MethodEntry/mentry02/libmentry02.cpp
index 43202de0ad7..4895771a92e 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/MethodEntry/mentry02/libmentry02.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/MethodEntry/mentry02/libmentry02.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/MethodExit/mexit01/libmexit01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/MethodExit/mexit01/libmexit01.cpp
index c6980f10484..079b5ec3023 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/MethodExit/mexit01/libmexit01.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/MethodExit/mexit01/libmexit01.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <inttypes.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/MethodExit/mexit02/libmexit02.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/MethodExit/mexit02/libmexit02.cpp
index d7d24a3f4e6..54e4e6ea680 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/MethodExit/mexit02/libmexit02.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/MethodExit/mexit02/libmexit02.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <inttypes.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/MonitorContendedEnter/mcontenter01/libmcontenter01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/MonitorContendedEnter/mcontenter01/libmcontenter01.cpp
index 77ea808dc23..4dbb9f71969 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/MonitorContendedEnter/mcontenter01/libmcontenter01.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/MonitorContendedEnter/mcontenter01/libmcontenter01.cpp
@@ -26,8 +26,8 @@
#include <jni.h>
#include <jvmti.h>
-#include "jvmti_common.h"
-#include "jvmti_thread.h"
+#include "jvmti_common.hpp"
+#include "jvmti_thread.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/MonitorContendedEntered/mcontentered01/libmcontentered01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/MonitorContendedEntered/mcontentered01/libmcontentered01.cpp
index c46ccac6933..207ceeb6ac3 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/MonitorContendedEntered/mcontentered01/libmcontentered01.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/MonitorContendedEntered/mcontentered01/libmcontentered01.cpp
@@ -24,8 +24,8 @@
#include <stdio.h>
#include <string.h>
#include <jvmti.h>
-#include "jvmti_common.h"
-#include "jvmti_thread.h"
+#include "jvmti_common.hpp"
+#include "jvmti_thread.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWait/monitorwait01/libmonitorwait01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWait/monitorwait01/libmonitorwait01.cpp
index b85fa20ca16..6e3b86b941f 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWait/monitorwait01/libmonitorwait01.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWait/monitorwait01/libmonitorwait01.cpp
@@ -24,8 +24,8 @@
#include <stdio.h>
#include <string.h>
#include <jvmti.h>
-#include "jvmti_common.h"
-#include "jvmti_thread.h"
+#include "jvmti_common.hpp"
+#include "jvmti_thread.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWaited/monitorwaited01/libmonitorwaited01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWaited/monitorwaited01/libmonitorwaited01.cpp
index 013dbd66d81..8f66851a084 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWaited/monitorwaited01/libmonitorwaited01.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/MonitorWaited/monitorwaited01/libmonitorwaited01.cpp
@@ -24,8 +24,8 @@
#include <stdio.h>
#include <string.h>
#include <jvmti.h>
-#include "jvmti_common.h"
-#include "jvmti_thread.h"
+#include "jvmti_common.hpp"
+#include "jvmti_thread.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind01/libnativemethbind01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind01/libnativemethbind01.cpp
index c0f7261b38f..09d3ec41334 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind01/libnativemethbind01.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind01/libnativemethbind01.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include <jvmti.h>
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind02/libnativemethbind02.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind02/libnativemethbind02.cpp
index 747952d4a10..1a8806f0bb9 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind02/libnativemethbind02.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind02/libnativemethbind02.cpp
@@ -24,7 +24,7 @@
#include <stdlib.h>
#include <string.h>
#include <jvmti.h>
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind03/libnativemethbind03.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind03/libnativemethbind03.cpp
index d637f7dc713..5fd58a3a43b 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind03/libnativemethbind03.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind03/libnativemethbind03.cpp
@@ -24,7 +24,7 @@
#include <stdlib.h>
#include <string.h>
#include <jvmti.h>
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind04/libnativemethbind04.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind04/libnativemethbind04.cpp
index 871028423ef..49645af7528 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind04/libnativemethbind04.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/NativeMethodBind/nativemethbind04/libnativemethbind04.cpp
@@ -24,7 +24,7 @@
#include <stdlib.h>
#include <string.h>
#include <jvmti.h>
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep01/libsinglestep01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep01/libsinglestep01.cpp
index 7c4d6ef2ea7..87da7a6bf22 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep01/libsinglestep01.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep01/libsinglestep01.cpp
@@ -1,6 +1,5 @@
/*
- * Copyright (c) 200
- * git 3, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -25,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include <jvmti.h>
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep02/libsinglestep02.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep02/libsinglestep02.cpp
index f5437de1f3d..984454dfbaf 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep02/libsinglestep02.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep02/libsinglestep02.cpp
@@ -25,7 +25,7 @@
#include <stdlib.h>
#include <string.h>
#include <jvmti.h>
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep03/libsinglestep03.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep03/libsinglestep03.cpp
index 51ac700efad..ddc1e8f73e5 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep03/libsinglestep03.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/SingleStep/singlestep03/libsinglestep03.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include <jvmti.h>
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/ThreadEnd/threadend01/libthreadend01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/ThreadEnd/threadend01/libthreadend01.cpp
index b39276eeb00..69e76d6d92e 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/ThreadEnd/threadend01/libthreadend01.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/ThreadEnd/threadend01/libthreadend01.cpp
@@ -25,7 +25,7 @@
#include <stdlib.h>
#include <string.h>
#include <jvmti.h>
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/ThreadEnd/threadend02/libthreadend02.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/ThreadEnd/threadend02/libthreadend02.cpp
index 2ffc67d3d8e..48f9da3785e 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/ThreadEnd/threadend02/libthreadend02.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/ThreadEnd/threadend02/libthreadend02.cpp
@@ -25,8 +25,8 @@
#include <stdlib.h>
#include <string.h>
#include <jvmti.h>
-#include "jvmti_common.h"
-#include "jvmti_thread.h"
+#include "jvmti_common.hpp"
+#include "jvmti_thread.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/ThreadStart/threadstart01/libthreadstart01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/ThreadStart/threadstart01/libthreadstart01.cpp
index 2ebaf2d9f0f..abf2e0e2bc3 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/ThreadStart/threadstart01/libthreadstart01.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/ThreadStart/threadstart01/libthreadstart01.cpp
@@ -25,7 +25,7 @@
#include <stdlib.h>
#include <string.h>
#include <jvmti.h>
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/ThreadStart/threadstart02/libthreadstart02.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/ThreadStart/threadstart02/libthreadstart02.cpp
index 1ab67b64603..061d6cf376a 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/ThreadStart/threadstart02/libthreadstart02.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/ThreadStart/threadstart02/libthreadstart02.cpp
@@ -25,7 +25,7 @@
#include <stdlib.h>
#include <string.h>
#include <jvmti.h>
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/ThreadStart/threadstart03/libthreadstart03.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/ThreadStart/threadstart03/libthreadstart03.cpp
index 6373f8df19c..560a1c77ee2 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/ThreadStart/threadstart03/libthreadstart03.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/ThreadStart/threadstart03/libthreadstart03.cpp
@@ -25,7 +25,7 @@
#include <stdlib.h>
#include <string.h>
#include <jvmti.h>
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/events/VMObjectAlloc/vmobjalloc01/libvmobjalloc01.cpp b/test/hotspot/jtreg/serviceability/jvmti/events/VMObjectAlloc/vmobjalloc01/libvmobjalloc01.cpp
index 46006b00ad4..82c0ac8b54a 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/events/VMObjectAlloc/vmobjalloc01/libvmobjalloc01.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/events/VMObjectAlloc/vmobjalloc01/libvmobjalloc01.cpp
@@ -23,8 +23,8 @@
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
-#include "jvmti_thread.h"
+#include "jvmti_common.hpp"
+#include "jvmti_thread.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/negative/GetAllThreadsNullTest/libGetAllThreadsNullTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/negative/GetAllThreadsNullTest/libGetAllThreadsNullTest.cpp
index 1231a9e1ce1..1dd9713ce34 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/negative/GetAllThreadsNullTest/libGetAllThreadsNullTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/negative/GetAllThreadsNullTest/libGetAllThreadsNullTest.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/negative/contmon03/libcontmon03.cpp b/test/hotspot/jtreg/serviceability/jvmti/negative/contmon03/libcontmon03.cpp
index f9188a371ff..b51cb079ae9 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/negative/contmon03/libcontmon03.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/negative/contmon03/libcontmon03.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/negative/framecnt02/libframecnt02.cpp b/test/hotspot/jtreg/serviceability/jvmti/negative/framecnt02/libframecnt02.cpp
index 0b4286991f7..7b860ab4d22 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/negative/framecnt02/libframecnt02.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/negative/framecnt02/libframecnt02.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/negative/framecnt03/libframecnt03.cpp b/test/hotspot/jtreg/serviceability/jvmti/negative/framecnt03/libframecnt03.cpp
index b72c7b87ab1..4747ad3c692 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/negative/framecnt03/libframecnt03.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/negative/framecnt03/libframecnt03.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/negative/frameloc03/libframeloc03.cpp b/test/hotspot/jtreg/serviceability/jvmti/negative/frameloc03/libframeloc03.cpp
index b763d0433ee..e7791751442 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/negative/frameloc03/libframeloc03.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/negative/frameloc03/libframeloc03.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/negative/getstacktr02/libgetstacktr02.cpp b/test/hotspot/jtreg/serviceability/jvmti/negative/getstacktr02/libgetstacktr02.cpp
index b12b322bba4..9e98b584a31 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/negative/getstacktr02/libgetstacktr02.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/negative/getstacktr02/libgetstacktr02.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/negative/getstacktr09/libgetstacktr09.cpp b/test/hotspot/jtreg/serviceability/jvmti/negative/getstacktr09/libgetstacktr09.cpp
index bdac7128c3b..b8b65cc7546 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/negative/getstacktr09/libgetstacktr09.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/negative/getstacktr09/libgetstacktr09.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/negative/thrinfo02/libthrinfo02.cpp b/test/hotspot/jtreg/serviceability/jvmti/negative/thrinfo02/libthrinfo02.cpp
index 6ab0c456704..7bb8bd861bc 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/negative/thrinfo02/libthrinfo02.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/negative/thrinfo02/libthrinfo02.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/negative/thrstat04/libthrstat04.cpp b/test/hotspot/jtreg/serviceability/jvmti/negative/thrstat04/libthrstat04.cpp
index b63e84d0c49..ebc957deab2 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/negative/thrstat04/libthrstat04.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/negative/thrstat04/libthrstat04.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/stress/StackTrace/NotSuspended/libGetStackTraceNotSuspendedStress.cpp b/test/hotspot/jtreg/serviceability/jvmti/stress/StackTrace/NotSuspended/libGetStackTraceNotSuspendedStress.cpp
index ee2dc9d2859..903a76d4acf 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/stress/StackTrace/NotSuspended/libGetStackTraceNotSuspendedStress.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/stress/StackTrace/NotSuspended/libGetStackTraceNotSuspendedStress.cpp
@@ -23,8 +23,8 @@
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
-#include "jvmti_thread.h"
+#include "jvmti_common.hpp"
+#include "jvmti_thread.hpp"
#define MAX_FRAME_COUNT 80
diff --git a/test/hotspot/jtreg/serviceability/jvmti/stress/StackTrace/Suspended/libGetStackTraceSuspendedStress.cpp b/test/hotspot/jtreg/serviceability/jvmti/stress/StackTrace/Suspended/libGetStackTraceSuspendedStress.cpp
index 639b40d4839..037448a6428 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/stress/StackTrace/Suspended/libGetStackTraceSuspendedStress.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/stress/StackTrace/Suspended/libGetStackTraceSuspendedStress.cpp
@@ -23,8 +23,8 @@
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
-#include "jvmti_thread.h"
+#include "jvmti_common.hpp"
+#include "jvmti_thread.hpp"
#define MAX_FRAME_COUNT 80
diff --git a/test/hotspot/jtreg/serviceability/jvmti/stress/ThreadLocalStorage/SetGetThreadLocalStorageStressTest/libSetGetThreadLocalStorageStress.cpp b/test/hotspot/jtreg/serviceability/jvmti/stress/ThreadLocalStorage/SetGetThreadLocalStorageStressTest/libSetGetThreadLocalStorageStress.cpp
index 1c09fac92ba..a8faa71970d 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/stress/ThreadLocalStorage/SetGetThreadLocalStorageStressTest/libSetGetThreadLocalStorageStress.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/stress/ThreadLocalStorage/SetGetThreadLocalStorageStressTest/libSetGetThreadLocalStorageStress.cpp
@@ -23,8 +23,8 @@
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
-#include "jvmti_thread.h"
+#include "jvmti_common.hpp"
+#include "jvmti_thread.hpp"
/* constant names */
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetAllThreads/allthr01/liballthr01.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetAllThreads/allthr01/liballthr01.cpp
index 442913b4ea2..611711a0f7e 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetAllThreads/allthr01/liballthr01.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetAllThreads/allthr01/liballthr01.cpp
@@ -25,7 +25,7 @@
#include <stdlib.h>
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetCurrentContendedMonitor/contmon01/libcontmon01.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetCurrentContendedMonitor/contmon01/libcontmon01.cpp
index e3d95e113a0..992fb9a96cc 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetCurrentContendedMonitor/contmon01/libcontmon01.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetCurrentContendedMonitor/contmon01/libcontmon01.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetCurrentContendedMonitor/contmon02/libcontmon02.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetCurrentContendedMonitor/contmon02/libcontmon02.cpp
index 65a2211a004..39190270a30 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetCurrentContendedMonitor/contmon02/libcontmon02.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetCurrentContendedMonitor/contmon02/libcontmon02.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetFrameCount/framecnt01/libframecnt01.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetFrameCount/framecnt01/libframecnt01.cpp
index c9dd399138a..ced257caef2 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetFrameCount/framecnt01/libframecnt01.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetFrameCount/framecnt01/libframecnt01.cpp
@@ -23,7 +23,7 @@
#include <stdio.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetFrameLocation/frameloc01/libframeloc01.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetFrameLocation/frameloc01/libframeloc01.cpp
index 89855a8d66e..5922ee0400c 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetFrameLocation/frameloc01/libframeloc01.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetFrameLocation/frameloc01/libframeloc01.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetFrameLocation/frameloc02/libframeloc02.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetFrameLocation/frameloc02/libframeloc02.cpp
index 53e9378fc8d..4fd96984a7b 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetFrameLocation/frameloc02/libframeloc02.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetFrameLocation/frameloc02/libframeloc02.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/GetStackTraceAndRetransformTest/libGetStackTraceAndRetransformTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/GetStackTraceAndRetransformTest/libGetStackTraceAndRetransformTest.cpp
index eea96df83f7..3e7b2fa950d 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/GetStackTraceAndRetransformTest/libGetStackTraceAndRetransformTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/GetStackTraceAndRetransformTest/libGetStackTraceAndRetransformTest.cpp
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2023, Datadog, Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -24,7 +25,7 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
#include "../get_stack_trace.hpp"
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/GetStackTraceCurrentThreadTest/libGetStackTraceCurrentThreadTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/GetStackTraceCurrentThreadTest/libGetStackTraceCurrentThreadTest.cpp
index 17e721a151e..d58c952fe84 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/GetStackTraceCurrentThreadTest/libGetStackTraceCurrentThreadTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/GetStackTraceCurrentThreadTest/libGetStackTraceCurrentThreadTest.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
#include "../get_stack_trace.hpp"
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr03/libgetstacktr03.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr03/libgetstacktr03.cpp
index 51c6f5dc4c4..78224f7f12e 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr03/libgetstacktr03.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr03/libgetstacktr03.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
#include "../get_stack_trace.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr04/libgetstacktr04.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr04/libgetstacktr04.cpp
index 0cdbb7d0271..3a7bb8b1f06 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr04/libgetstacktr04.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr04/libgetstacktr04.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
#include "../get_stack_trace.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr05/libgetstacktr05.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr05/libgetstacktr05.cpp
index 19c6eb3967e..094fc6a64c7 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr05/libgetstacktr05.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr05/libgetstacktr05.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
#include "../get_stack_trace.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr06/libgetstacktr06.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr06/libgetstacktr06.cpp
index f0f17d50b17..7b687b03ea9 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr06/libgetstacktr06.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr06/libgetstacktr06.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
#include "../get_stack_trace.hpp"
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr07/libgetstacktr07.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr07/libgetstacktr07.cpp
index baa5f8e90d9..b7f383ed232 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr07/libgetstacktr07.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr07/libgetstacktr07.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
#include "../get_stack_trace.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr08/libgetstacktr08.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr08/libgetstacktr08.cpp
index c3f6ad667b1..2543d1ceaf2 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr08/libgetstacktr08.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetStackTrace/getstacktr08/libgetstacktr08.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
#include "../get_stack_trace.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadInfo/thrinfo01/libthrinfo01.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadInfo/thrinfo01/libthrinfo01.cpp
index e040b88ba88..1695071929d 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadInfo/thrinfo01/libthrinfo01.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadInfo/thrinfo01/libthrinfo01.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat01/libthrstat01.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat01/libthrstat01.cpp
index 4d54648a73f..41f9b2a8d66 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat01/libthrstat01.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat01/libthrstat01.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat02/libthrstat02.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat02/libthrstat02.cpp
index 588b2268f6d..3f12a04e82d 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat02/libthrstat02.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat02/libthrstat02.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat03/libthrstat03.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat03/libthrstat03.cpp
index 36a632ff32c..817ae62cc8b 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat03/libthrstat03.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat03/libthrstat03.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat05/libthrstat05.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat05/libthrstat05.cpp
index 3fd9b535de4..fef814a0a7d 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat05/libthrstat05.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/GetThreadState/thrstat05/libthrstat05.cpp
@@ -26,7 +26,7 @@
#include <stdio.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThread/resumethrd01/libresumethrd01.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThread/resumethrd01/libresumethrd01.cpp
index d3b2f5745b5..37d52e43d07 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThread/resumethrd01/libresumethrd01.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThread/resumethrd01/libresumethrd01.cpp
@@ -23,8 +23,8 @@
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
-#include "jvmti_thread.h"
+#include "jvmti_common.hpp"
+#include "jvmti_thread.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThread/resumethrd02/libresumethrd02.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThread/resumethrd02/libresumethrd02.cpp
index 665c1a4da93..83ced2ded6a 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThread/resumethrd02/libresumethrd02.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThread/resumethrd02/libresumethrd02.cpp
@@ -23,8 +23,8 @@
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
-#include "jvmti_thread.h"
+#include "jvmti_common.hpp"
+#include "jvmti_thread.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThreadList/resumethrdlst01/libresumethrdlst01.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThreadList/resumethrdlst01/libresumethrdlst01.cpp
index 42c4a4579fe..cc1708340a6 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThreadList/resumethrdlst01/libresumethrdlst01.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThreadList/resumethrdlst01/libresumethrdlst01.cpp
@@ -23,8 +23,8 @@
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
-#include "jvmti_thread.h"
+#include "jvmti_common.hpp"
+#include "jvmti_thread.hpp"
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThreadList/resumethrdlst02/libresumethrdlst02.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThreadList/resumethrdlst02/libresumethrdlst02.cpp
index 5d622b926db..91a0dc79175 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThreadList/resumethrdlst02/libresumethrdlst02.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/ResumeThreadList/resumethrdlst02/libresumethrdlst02.cpp
@@ -23,8 +23,8 @@
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
-#include "jvmti_thread.h"
+#include "jvmti_common.hpp"
+#include "jvmti_thread.hpp"
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThread/suspendthrd01/libsuspendthrd01.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThread/suspendthrd01/libsuspendthrd01.cpp
index 300a479d4ce..053023529cd 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThread/suspendthrd01/libsuspendthrd01.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThread/suspendthrd01/libsuspendthrd01.cpp
@@ -23,8 +23,8 @@
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
-#include "jvmti_thread.h"
+#include "jvmti_common.hpp"
+#include "jvmti_thread.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThread/suspendthrd02/libsuspendthrd02.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThread/suspendthrd02/libsuspendthrd02.cpp
index 9ab8e053a51..0f8316f3c74 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThread/suspendthrd02/libsuspendthrd02.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThread/suspendthrd02/libsuspendthrd02.cpp
@@ -23,8 +23,8 @@
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
-#include "jvmti_thread.h"
+#include "jvmti_common.hpp"
+#include "jvmti_thread.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThreadList/suspendthrdlst01/libsuspendthrdlst01.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThreadList/suspendthrdlst01/libsuspendthrdlst01.cpp
index 30fb104beff..70cfb81f10f 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThreadList/suspendthrdlst01/libsuspendthrdlst01.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThreadList/suspendthrdlst01/libsuspendthrdlst01.cpp
@@ -23,8 +23,8 @@
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
-#include "jvmti_thread.h"
+#include "jvmti_common.hpp"
+#include "jvmti_thread.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThreadList/suspendthrdlst02/libsuspendthrdlst02.cpp b/test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThreadList/suspendthrdlst02/libsuspendthrdlst02.cpp
index 2ccc96c2596..8982b95b514 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThreadList/suspendthrdlst02/libsuspendthrdlst02.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/thread/SuspendThreadList/suspendthrdlst02/libsuspendthrdlst02.cpp
@@ -23,8 +23,8 @@
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
-#include "jvmti_thread.h"
+#include "jvmti_common.hpp"
+#include "jvmti_thread.hpp"
#include <time.h>
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/BoundVThreadTest/libBoundVThreadTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/BoundVThreadTest/libBoundVThreadTest.cpp
index 0fa0f065ae8..ff332ae454c 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/BoundVThreadTest/libBoundVThreadTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/BoundVThreadTest/libBoundVThreadTest.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, 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
@@ -23,7 +23,7 @@
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/BreakpointInYieldTest/libBreakpointInYieldTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/BreakpointInYieldTest/libBreakpointInYieldTest.cpp
index aa9f3bbd52a..0e647672c21 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/BreakpointInYieldTest/libBreakpointInYieldTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/BreakpointInYieldTest/libBreakpointInYieldTest.cpp
@@ -23,7 +23,7 @@
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/ContFramePopTest/libContFramePopTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/ContFramePopTest/libContFramePopTest.cpp
index 1840b6ccac7..9b8ab8b7af2 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/ContFramePopTest/libContFramePopTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/ContFramePopTest/libContFramePopTest.cpp
@@ -23,7 +23,7 @@
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/ContStackDepthTest/libContStackDepthTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/ContStackDepthTest/libContStackDepthTest.cpp
index 9bafe3bd5d0..60a3f17fbb0 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/ContStackDepthTest/libContStackDepthTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/ContStackDepthTest/libContStackDepthTest.cpp
@@ -23,7 +23,7 @@
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/ContYieldBreakPointTest/libContYieldBreakPointTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/ContYieldBreakPointTest/libContYieldBreakPointTest.cpp
index e8ac3886461..7a9af14f478 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/ContYieldBreakPointTest/libContYieldBreakPointTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/ContYieldBreakPointTest/libContYieldBreakPointTest.cpp
@@ -23,7 +23,7 @@
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/ContinuationTest/libContinuationTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/ContinuationTest/libContinuationTest.cpp
index 81cc1368ad8..c647fcfb469 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/ContinuationTest/libContinuationTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/ContinuationTest/libContinuationTest.cpp
@@ -23,7 +23,7 @@
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/FollowReferences/libVThreadStackRefTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/FollowReferences/libVThreadStackRefTest.cpp
index 3034e9e1475..9946364deee 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/FollowReferences/libVThreadStackRefTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/FollowReferences/libVThreadStackRefTest.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, 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
@@ -23,7 +23,7 @@
#include <jni.h>
#include <jvmti.h>
-#include <jvmti_common.h>
+#include <jvmti_common.hpp>
#include <atomic>
#include <string.h>
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/ForceEarlyReturnTest/libForceEarlyReturnTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/ForceEarlyReturnTest/libForceEarlyReturnTest.cpp
index 4407c5d074d..e659bd304f8 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/ForceEarlyReturnTest/libForceEarlyReturnTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/ForceEarlyReturnTest/libForceEarlyReturnTest.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/GetSetLocalTest/libGetSetLocalTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/GetSetLocalTest/libGetSetLocalTest.cpp
index 20b2edb1e9d..46cce443f4d 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/GetSetLocalTest/libGetSetLocalTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/GetSetLocalTest/libGetSetLocalTest.cpp
@@ -23,7 +23,7 @@
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadStateMountedTest/libGetThreadStateMountedTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadStateMountedTest/libGetThreadStateMountedTest.cpp
index 4de5ebe1e89..e6ee99eb23f 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadStateMountedTest/libGetThreadStateMountedTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/GetThreadStateMountedTest/libGetThreadStateMountedTest.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, 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
@@ -23,7 +23,7 @@
#include <jni.h>
#include <jvmti.h>
-#include <jvmti_common.h>
+#include <jvmti_common.hpp>
#include <atomic>
static jvmtiEnv *jvmti = nullptr;
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/InterruptThreadTest/libInterruptThreadTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/InterruptThreadTest/libInterruptThreadTest.cpp
index 6be49bfb456..8208e9bb1b4 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/InterruptThreadTest/libInterruptThreadTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/InterruptThreadTest/libInterruptThreadTest.cpp
@@ -25,7 +25,7 @@
#include <atomic>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/MethodExitTest/libMethodExitTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/MethodExitTest/libMethodExitTest.cpp
index fb6b0bab587..78e14223377 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/MethodExitTest/libMethodExitTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/MethodExitTest/libMethodExitTest.cpp
@@ -23,7 +23,7 @@
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/NullAsCurrentThreadTest/libNullAsCurrentThreadTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/NullAsCurrentThreadTest/libNullAsCurrentThreadTest.cpp
index 82c51dfed75..ec808cfc058 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/NullAsCurrentThreadTest/libNullAsCurrentThreadTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/NullAsCurrentThreadTest/libNullAsCurrentThreadTest.cpp
@@ -23,7 +23,7 @@
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/PinnedTaskTest/libPinnedTaskTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/PinnedTaskTest/libPinnedTaskTest.cpp
index d50d1ab4b8b..91f5e6fecc2 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/PinnedTaskTest/libPinnedTaskTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/PinnedTaskTest/libPinnedTaskTest.cpp
@@ -22,7 +22,7 @@
*/
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/PopFrameTest/libPopFrameTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/PopFrameTest/libPopFrameTest.cpp
index 327b7d1cb2a..4001296e967 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/PopFrameTest/libPopFrameTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/PopFrameTest/libPopFrameTest.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/RawMonitorTest/libRawMonitorTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/RawMonitorTest/libRawMonitorTest.cpp
index 1e7c49af7a9..1903e256392 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/RawMonitorTest/libRawMonitorTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/RawMonitorTest/libRawMonitorTest.cpp
@@ -25,7 +25,7 @@
#include <atomic>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/SelfSuspendDisablerTest/libSelfSuspendDisablerTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/SelfSuspendDisablerTest/libSelfSuspendDisablerTest.cpp
index 74a1a3efc0d..a7d61b90e51 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/SelfSuspendDisablerTest/libSelfSuspendDisablerTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/SelfSuspendDisablerTest/libSelfSuspendDisablerTest.cpp
@@ -23,7 +23,7 @@
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
static jvmtiEnv *jvmti = nullptr;
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/StopThreadTest/libStopThreadTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/StopThreadTest/libStopThreadTest.cpp
index ade0e7fb67c..36f70a971a0 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/StopThreadTest/libStopThreadTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/StopThreadTest/libStopThreadTest.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume1/libSuspendResume1.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume1/libSuspendResume1.cpp
index 9854008c142..f05e619e0bd 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume1/libSuspendResume1.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume1/libSuspendResume1.cpp
@@ -23,8 +23,8 @@
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
-#include "jvmti_thread.h"
+#include "jvmti_common.hpp"
+#include "jvmti_thread.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume2/libSuspendResume2.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume2/libSuspendResume2.cpp
index 97cae4f0f0c..68066c04575 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume2/libSuspendResume2.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResume2/libSuspendResume2.cpp
@@ -23,8 +23,8 @@
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
-#include "jvmti_thread.h"
+#include "jvmti_common.hpp"
+#include "jvmti_thread.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResumeAll/libSuspendResumeAll.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResumeAll/libSuspendResumeAll.cpp
index 4aef71c8737..e53484b575b 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResumeAll/libSuspendResumeAll.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/SuspendResumeAll/libSuspendResumeAll.cpp
@@ -23,8 +23,8 @@
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
-#include "jvmti_thread.h"
+#include "jvmti_common.hpp"
+#include "jvmti_thread.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/ThreadListStackTracesTest/libThreadListStackTracesTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/ThreadListStackTracesTest/libThreadListStackTracesTest.cpp
index 3edb2871cc2..918f547375b 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/ThreadListStackTracesTest/libThreadListStackTracesTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/ThreadListStackTracesTest/libThreadListStackTracesTest.cpp
@@ -25,7 +25,7 @@
#include <jvmti.h>
#include <stdio.h>
#include <string.h>
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
static jvmtiEnv* jvmti = nullptr;
static const jint MAX_FRAME_COUNT = 32;
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/ThreadStateTest/libThreadStateTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/ThreadStateTest/libThreadStateTest.cpp
index c07b0924cfe..10dfdfda347 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/ThreadStateTest/libThreadStateTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/ThreadStateTest/libThreadStateTest.cpp
@@ -25,7 +25,7 @@
#include <jvmti.h>
#include <stdio.h>
#include <string.h>
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
// set by Agent_OnLoad
static jvmtiEnv* jvmti = nullptr;
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/ToggleNotifyJvmtiTest/libToggleNotifyJvmtiTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/ToggleNotifyJvmtiTest/libToggleNotifyJvmtiTest.cpp
index 9ecece684ab..b09565f886a 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/ToggleNotifyJvmtiTest/libToggleNotifyJvmtiTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/ToggleNotifyJvmtiTest/libToggleNotifyJvmtiTest.cpp
@@ -24,7 +24,7 @@
#include <cstdlib>
#include <cstring>
#include <jvmti.h>
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadEventTest/libVThreadEventTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadEventTest/libVThreadEventTest.cpp
index 24b678eb18e..afd06e66b32 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadEventTest/libVThreadEventTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadEventTest/libVThreadEventTest.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, 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
@@ -24,7 +24,7 @@
#include <cstring>
#include <jvmti.h>
#include <atomic>
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadMonitorTest/libVThreadMonitorTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadMonitorTest/libVThreadMonitorTest.cpp
index c05404658fe..af0861ee031 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadMonitorTest/libVThreadMonitorTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadMonitorTest/libVThreadMonitorTest.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "jni.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadNotifyFramePopTest/libVThreadNotifyFramePopTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadNotifyFramePopTest/libVThreadNotifyFramePopTest.cpp
index d5254293ab1..30382a87ee9 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadNotifyFramePopTest/libVThreadNotifyFramePopTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadNotifyFramePopTest/libVThreadNotifyFramePopTest.cpp
@@ -23,7 +23,7 @@
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadTLSTest/libVThreadTLSTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadTLSTest/libVThreadTLSTest.cpp
index ac4da3a76a7..278f4499503 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadTLSTest/libVThreadTLSTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadTLSTest/libVThreadTLSTest.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, 2024, 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
@@ -24,7 +24,7 @@
#include <cstdlib>
#include <cstring>
#include <jvmti.h>
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadTest/libVThreadTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadTest/libVThreadTest.cpp
index 701797bcfc2..9433a4dcfaf 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadTest/libVThreadTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadTest/libVThreadTest.cpp
@@ -23,7 +23,7 @@
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadUnsupportedTest/libVThreadUnsupportedTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadUnsupportedTest/libVThreadUnsupportedTest.cpp
index 5b299a46f48..eb5ea872b91 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadUnsupportedTest/libVThreadUnsupportedTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/VThreadUnsupportedTest/libVThreadUnsupportedTest.cpp
@@ -25,7 +25,7 @@
#include <atomic>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/VirtualStackTraceTest/libVirtualStackTraceTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/VirtualStackTraceTest/libVirtualStackTraceTest.cpp
index 744e75ac29f..9e613d5b0f9 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/VirtualStackTraceTest/libVirtualStackTraceTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/VirtualStackTraceTest/libVirtualStackTraceTest.cpp
@@ -24,7 +24,7 @@
#include <cstdlib>
#include <cstring>
#include <jvmti.h>
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/VirtualThreadStartTest/libVirtualThreadStartTest.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/VirtualThreadStartTest/libVirtualThreadStartTest.cpp
index 262712dfb0c..711edaff9d3 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/VirtualThreadStartTest/libVirtualThreadStartTest.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/VirtualThreadStartTest/libVirtualThreadStartTest.cpp
@@ -24,7 +24,7 @@
#include <cstdlib>
#include <cstring>
#include <jvmti.h>
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/serviceability/jvmti/vthread/WaitNotifySuspendedVThreadTest/libWaitNotifySuspendedVThread.cpp b/test/hotspot/jtreg/serviceability/jvmti/vthread/WaitNotifySuspendedVThreadTest/libWaitNotifySuspendedVThread.cpp
index 44b931c0ff9..bcaa1d605f7 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/vthread/WaitNotifySuspendedVThreadTest/libWaitNotifySuspendedVThread.cpp
+++ b/test/hotspot/jtreg/serviceability/jvmti/vthread/WaitNotifySuspendedVThreadTest/libWaitNotifySuspendedVThread.cpp
@@ -23,7 +23,7 @@
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
jrawMonitorID monitor;
jrawMonitorID monitor_completed;
diff --git a/test/hotspot/jtreg/testlibrary/jvmti/libJvmtiUtils.cpp b/test/hotspot/jtreg/testlibrary/jvmti/libJvmtiUtils.cpp
index 28afafda3a7..a5b2b268ff1 100644
--- a/test/hotspot/jtreg/testlibrary/jvmti/libJvmtiUtils.cpp
+++ b/test/hotspot/jtreg/testlibrary/jvmti/libJvmtiUtils.cpp
@@ -23,7 +23,7 @@
#include <string.h>
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent00.cpp
index 5d819851e4b..a4c5eafd87f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent00.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent00.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include <jni.h>
-#include <aod.h>
+#include <aod.hpp>
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent01.cpp b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent01.cpp
index d2c5f13cd34..5209cfd393d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent01.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent01.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include <jni.h>
-#include <aod.h>
+#include <aod.hpp>
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent02.cpp b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent02.cpp
index 257511c60f3..f8e5b20c18e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent02.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent02.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include <jni.h>
-#include <aod.h>
+#include <aod.hpp>
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent03.cpp b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent03.cpp
index 66bbc6a990a..f2d3586ee6b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent03.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine07/agent03.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include <jni.h>
-#include <aod.h>
+#include <aod.hpp>
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine09/agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine09/agent00.cpp
index e7e6452603f..799a34d26d0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine09/agent00.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/aod/VirtualMachine/VirtualMachine09/agent00.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include <jni.h>
-#include <aod.h>
+#include <aod.hpp>
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps001/addcaps001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps001/addcaps001.cpp
index bd94696a05c..711ceda69cc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps001/addcaps001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps001/addcaps001.cpp
@@ -25,8 +25,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps002/addcaps002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps002/addcaps002.cpp
index 5ca00c75a5a..b15f99e15d5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps002/addcaps002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps002/addcaps002.cpp
@@ -25,8 +25,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps003/addcaps003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps003/addcaps003.cpp
index ac26876e642..bfbb0048ae2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps003/addcaps003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AddCapabilities/addcaps003/addcaps003.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Agent_OnLoad/agentonload001/agentonload001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Agent_OnLoad/agentonload001/agentonload001.cpp
index 54219da3c87..68701a3365b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Agent_OnLoad/agentonload001/agentonload001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Agent_OnLoad/agentonload001/agentonload001.cpp
@@ -23,7 +23,7 @@
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Agent_OnUnload/agentonunload001/agentonunload001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Agent_OnUnload/agentonunload001/agentonunload001.cpp
index 2a54325a06b..27970b4d8ca 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Agent_OnUnload/agentonunload001/agentonunload001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Agent_OnUnload/agentonunload001/agentonunload001.cpp
@@ -23,7 +23,7 @@
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Allocate/alloc001/alloc001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Allocate/alloc001/alloc001.cpp
index 48641848a81..9500c40b747 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Allocate/alloc001/alloc001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Allocate/alloc001/alloc001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002/attach002Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002/attach002Agent00.cpp
index a9a7ff072c8..068aab82e45 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002/attach002Agent00.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002/attach002Agent00.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <jni.h>
#include <jvmti.h>
-#include <aod.h>
+#include <aod.hpp>
#include <jvmti_aod.hpp>
#include "ExceptionCheckingJniEnv.hpp"
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002a/attach002aAgent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002a/attach002aAgent00.cpp
index 8c98faca1cd..638189059a2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002a/attach002aAgent00.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach002a/attach002aAgent00.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <jni.h>
#include <jvmti.h>
-#include <aod.h>
+#include <aod.hpp>
#include <jvmti_aod.hpp>
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach008/attach008Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach008/attach008Agent00.cpp
index bd14beb64e5..d3b809707fd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach008/attach008Agent00.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach008/attach008Agent00.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <jni.h>
#include <jvmti.h>
-#include <aod.h>
+#include <aod.hpp>
#include <jvmti_aod.hpp>
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach009/attach009Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach009/attach009Agent00.cpp
index f64b04a584b..6df1e963fad 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach009/attach009Agent00.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach009/attach009Agent00.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <jni.h>
#include <jvmti.h>
-#include <aod.h>
+#include <aod.hpp>
#include <jvmti_aod.hpp>
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach012/attach012Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach012/attach012Agent00.cpp
index 00d0a2136df..202cbd3f7bc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach012/attach012Agent00.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach012/attach012Agent00.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <jni.h>
#include <jvmti.h>
-#include <aod.h>
+#include <aod.hpp>
#include <jvmti_aod.hpp>
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach014/attach014Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach014/attach014Agent00.cpp
index dca2fafa6ce..5fcecea31d3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach014/attach014Agent00.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach014/attach014Agent00.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <jni.h>
#include <jvmti.h>
-#include <aod.h>
+#include <aod.hpp>
#include <jvmti_aod.hpp>
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Agent00.cpp
index aba296f123e..64e5a4ae9a4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Agent00.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Agent00.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <jni.h>
#include <jvmti.h>
-#include <aod.h>
+#include <aod.hpp>
#include <jvmti_aod.hpp>
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Agent01.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Agent01.cpp
index 1e0afaf8a5f..3f76856bb22 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Agent01.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Agent01.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <jni.h>
#include <jvmti.h>
-#include <aod.h>
+#include <aod.hpp>
#include <jvmti_aod.hpp>
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Target.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Target.cpp
index 06d120b09c9..1054cc239af 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Target.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach015/attach015Target.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <jni.h>
#include <jvmti.h>
-#include <aod.h>
+#include <aod.hpp>
#include <jvmti_aod.hpp>
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach020/attach020Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach020/attach020Agent00.cpp
index afbdc2362c0..c4aad94da9a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach020/attach020Agent00.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach020/attach020Agent00.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <jni.h>
#include <jvmti.h>
-#include <aod.h>
+#include <aod.hpp>
#include <jvmti_aod.hpp>
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach021/attach021Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach021/attach021Agent00.cpp
index e1d8e169f1c..77af92fecb8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach021/attach021Agent00.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach021/attach021Agent00.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <jni.h>
#include <jvmti.h>
-#include <aod.h>
+#include <aod.hpp>
#include <jvmti_aod.hpp>
#include "ExceptionCheckingJniEnv.hpp"
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach022/attach022Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach022/attach022Agent00.cpp
index 2b786563c22..fb6cb99a555 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach022/attach022Agent00.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach022/attach022Agent00.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <jni.h>
#include <jvmti.h>
-#include <aod.h>
+#include <aod.hpp>
#include <jvmti_aod.hpp>
#include "ExceptionCheckingJniEnv.hpp"
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach037/attach037Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach037/attach037Agent00.cpp
index a3c06877749..a81f6d7f65c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach037/attach037Agent00.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach037/attach037Agent00.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <jni.h>
#include <jvmti.h>
-#include <aod.h>
+#include <aod.hpp>
#include <jvmti_aod.hpp>
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach038/attach038Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach038/attach038Agent00.cpp
index 7bffa508ebe..f6ac9354880 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach038/attach038Agent00.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach038/attach038Agent00.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <jni.h>
#include <jvmti.h>
-#include <aod.h>
+#include <aod.hpp>
#include <jvmti_aod.hpp>
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach039/attach039Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach039/attach039Agent00.cpp
index 5ce7b2d3da1..52d86335c11 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach039/attach039Agent00.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach039/attach039Agent00.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <jni.h>
#include <jvmti.h>
-#include <aod.h>
+#include <aod.hpp>
#include <jvmti_aod.hpp>
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach040/attach040Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach040/attach040Agent00.cpp
index 797bb765bb6..cabc1c43b63 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach040/attach040Agent00.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach040/attach040Agent00.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <jni.h>
#include <jvmti.h>
-#include <aod.h>
+#include <aod.hpp>
#include <jvmti_aod.hpp>
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach041/attach041Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach041/attach041Agent00.cpp
index 926e4f7075f..db4b44f6751 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach041/attach041Agent00.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach041/attach041Agent00.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <jni.h>
#include <jvmti.h>
-#include <aod.h>
+#include <aod.hpp>
#include <jvmti_aod.hpp>
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach042/attach042Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach042/attach042Agent00.cpp
index 9901cfa12a6..4682f1c4088 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach042/attach042Agent00.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach042/attach042Agent00.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <jni.h>
#include <jvmti.h>
-#include <aod.h>
+#include <aod.hpp>
#include <jvmti_aod.hpp>
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent00.cpp
index 9535d3b3a32..5a486492799 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent00.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent00.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <jni.h>
#include <jvmti.h>
-#include <aod.h>
+#include <aod.hpp>
#include <jvmti_aod.hpp>
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent01.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent01.cpp
index 79319560a5c..8843c19d338 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent01.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent01.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <jni.h>
#include <jvmti.h>
-#include <aod.h>
+#include <aod.hpp>
#include <jvmti_aod.hpp>
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent02.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent02.cpp
index 0f98fd83c5e..f0ce8965cda 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent02.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent02.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <jni.h>
#include <jvmti.h>
-#include <aod.h>
+#include <aod.hpp>
#include <jvmti_aod.hpp>
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent03.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent03.cpp
index e25fd5ae9de..3834e868a7b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent03.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach045/attach045Agent03.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <jni.h>
#include <jvmti.h>
-#include <aod.h>
+#include <aod.hpp>
#include <jvmti_aod.hpp>
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach046/attach046Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach046/attach046Agent00.cpp
index fdb98860ff9..4b5c9e7d56f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach046/attach046Agent00.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach046/attach046Agent00.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <jni.h>
#include <jvmti.h>
-#include <aod.h>
+#include <aod.hpp>
#include <jvmti_aod.hpp>
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach050/attach050Agent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach050/attach050Agent00.cpp
index 535b2327d32..e9cc956557b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach050/attach050Agent00.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/attach050/attach050Agent00.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <jni.h>
#include <jvmti.h>
-#include <aod.h>
+#include <aod.hpp>
#include <jvmti_aod.hpp>
#define ON_UNLOAD_MARKER "attach050.on_unload"
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/sharedAgents/simpleAgent00.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/sharedAgents/simpleAgent00.cpp
index f94f22b0dd7..0c1fc89de01 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/sharedAgents/simpleAgent00.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/AttachOnDemand/sharedAgents/simpleAgent00.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <jni.h>
#include <jvmti.h>
-#include <aod.h>
+#include <aod.hpp>
#include <jvmti_aod.hpp>
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk001/classfloadhk001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk001/classfloadhk001.cpp
index acdb9ca8554..49faf6b32b6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk001/classfloadhk001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk001/classfloadhk001.cpp
@@ -29,9 +29,9 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "nsk_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk002/classfloadhk002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk002/classfloadhk002.cpp
index 102ed9f2fa4..510eddb4b1d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk002/classfloadhk002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk002/classfloadhk002.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk003/classfloadhk003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk003/classfloadhk003.cpp
index db68fe5966a..96ca8df0d17 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk003/classfloadhk003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk003/classfloadhk003.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk004/classfloadhk004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk004/classfloadhk004.cpp
index e90c5d55c73..1c0152913d0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk004/classfloadhk004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk004/classfloadhk004.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk005/classfloadhk005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk005/classfloadhk005.cpp
index 86546abbf47..81b0a68267e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk005/classfloadhk005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk005/classfloadhk005.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk006/classfloadhk006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk006/classfloadhk006.cpp
index ec7d197d5c7..2870eec7f49 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk006/classfloadhk006.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk006/classfloadhk006.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk007/classfloadhk007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk007/classfloadhk007.cpp
index 1a0560a0bdd..9d2a20d3eb7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk007/classfloadhk007.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk007/classfloadhk007.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk008/classfloadhk008.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk008/classfloadhk008.cpp
index 434adaef20b..fd0de631d3b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk008/classfloadhk008.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk008/classfloadhk008.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk009/classfloadhk009.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk009/classfloadhk009.cpp
index 8d869cd1b6a..4115a078c3a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk009/classfloadhk009.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClassFileLoadHook/classfloadhk009/classfloadhk009.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearBreakpoint/clrbrk001/clrbrk001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearBreakpoint/clrbrk001/clrbrk001.cpp
index cd151419af9..21328b3be6d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearBreakpoint/clrbrk001/clrbrk001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearBreakpoint/clrbrk001/clrbrk001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearBreakpoint/clrbrk002/clrbrk002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearBreakpoint/clrbrk002/clrbrk002.cpp
index 29bf4235a83..bd13e4ea6d5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearBreakpoint/clrbrk002/clrbrk002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearBreakpoint/clrbrk002/clrbrk002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearBreakpoint/clrbrk005/clrbrk005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearBreakpoint/clrbrk005/clrbrk005.cpp
index 7de7c31af7a..8433c0cf366 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearBreakpoint/clrbrk005/clrbrk005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearBreakpoint/clrbrk005/clrbrk005.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldAccessWatch/clrfldw001/clrfldw001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldAccessWatch/clrfldw001/clrfldw001.cpp
index 0002c8fbe35..c3c70ee070d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldAccessWatch/clrfldw001/clrfldw001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldAccessWatch/clrfldw001/clrfldw001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldAccessWatch/clrfldw002/clrfldw002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldAccessWatch/clrfldw002/clrfldw002.cpp
index ea87cba1652..c3a91f338b7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldAccessWatch/clrfldw002/clrfldw002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldAccessWatch/clrfldw002/clrfldw002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldModificationWatch/clrfmodw001/clrfmodw001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldModificationWatch/clrfmodw001/clrfmodw001.cpp
index 888f61780ed..c155a06075f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldModificationWatch/clrfmodw001/clrfmodw001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldModificationWatch/clrfmodw001/clrfmodw001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldModificationWatch/clrfmodw002/clrfmodw002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldModificationWatch/clrfmodw002/clrfmodw002.cpp
index 11d61d9529a..e35eed1d1e7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldModificationWatch/clrfmodw002/clrfmodw002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ClearFieldModificationWatch/clrfmodw002/clrfmodw002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodLoad/compmethload001/compmethload001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodLoad/compmethload001/compmethload001.cpp
index 61392981238..66e49496316 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodLoad/compmethload001/compmethload001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodLoad/compmethload001/compmethload001.cpp
@@ -26,9 +26,9 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "nsk_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodUnload/compmethunload001/compmethunload001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodUnload/compmethunload001/compmethunload001.cpp
index 56ae37574c6..28766be6202 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodUnload/compmethunload001/compmethunload001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CompiledMethodUnload/compmethunload001/compmethunload001.cpp
@@ -26,9 +26,9 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "nsk_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CreateRawMonitor/crrawmon001/crrawmon001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CreateRawMonitor/crrawmon001/crrawmon001.cpp
index 266bc453c76..d3f37f0c65a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CreateRawMonitor/crrawmon001/crrawmon001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CreateRawMonitor/crrawmon001/crrawmon001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CreateRawMonitor/crrawmon002/crrawmon002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CreateRawMonitor/crrawmon002/crrawmon002.cpp
index ec6507b3bc0..a0089d51297 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CreateRawMonitor/crrawmon002/crrawmon002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/CreateRawMonitor/crrawmon002/crrawmon002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DataDumpRequest/datadumpreq001/datadumpreq001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DataDumpRequest/datadumpreq001/datadumpreq001.cpp
index b66aca80ea2..bce556cbac8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DataDumpRequest/datadumpreq001/datadumpreq001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DataDumpRequest/datadumpreq001/datadumpreq001.cpp
@@ -27,10 +27,10 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
-#include "jni_tools.h"
+#include "nsk_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
+#include "jni_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Deallocate/dealloc001/dealloc001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Deallocate/dealloc001/dealloc001.cpp
index b8e99da573d..1d6e7a571db 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Deallocate/dealloc001/dealloc001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/Deallocate/dealloc001/dealloc001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DestroyRawMonitor/drrawmon001/drrawmon001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DestroyRawMonitor/drrawmon001/drrawmon001.cpp
index d0be4d73019..f065e61f086 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DestroyRawMonitor/drrawmon001/drrawmon001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DestroyRawMonitor/drrawmon001/drrawmon001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DestroyRawMonitor/drrawmon003/drrawmon003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DestroyRawMonitor/drrawmon003/drrawmon003.cpp
index b4b12b10407..0a96421133a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DestroyRawMonitor/drrawmon003/drrawmon003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DestroyRawMonitor/drrawmon003/drrawmon003.cpp
@@ -26,7 +26,7 @@
#include <stdlib.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DestroyRawMonitor/drrawmon004/drrawmon004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DestroyRawMonitor/drrawmon004/drrawmon004.cpp
index 0545fc7039b..61e002b9af7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DestroyRawMonitor/drrawmon004/drrawmon004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DestroyRawMonitor/drrawmon004/drrawmon004.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DisposeEnvironment/disposeenv001/disposeenv001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DisposeEnvironment/disposeenv001/disposeenv001.cpp
index d2423fe3301..8b73fd6d6e5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DisposeEnvironment/disposeenv001/disposeenv001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DisposeEnvironment/disposeenv001/disposeenv001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DisposeEnvironment/disposeenv002/disposeenv002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DisposeEnvironment/disposeenv002/disposeenv002.cpp
index 884e83ba8a0..3a57006677b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DisposeEnvironment/disposeenv002/disposeenv002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DisposeEnvironment/disposeenv002/disposeenv002.cpp
@@ -25,8 +25,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DynamicCodeGenerated/dyncodgen001/dyncodgen001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DynamicCodeGenerated/dyncodgen001/dyncodgen001.cpp
index edbc92f4198..5c5a6a50b99 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DynamicCodeGenerated/dyncodgen001/dyncodgen001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/DynamicCodeGenerated/dyncodgen001/dyncodgen001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceEarlyReturn/ForceEarlyReturn001/ForceEarlyReturn001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceEarlyReturn/ForceEarlyReturn001/ForceEarlyReturn001.cpp
index 9ca8cc34fc7..6ea09a5cfda 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceEarlyReturn/ForceEarlyReturn001/ForceEarlyReturn001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceEarlyReturn/ForceEarlyReturn001/ForceEarlyReturn001.cpp
@@ -23,8 +23,8 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include <jvmti_tools.h>
-#include "JVMTITools.h"
+#include <jvmti_tools.hpp>
+#include "JVMTITools.hpp"
#include "agent_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceGarbageCollection/forcegc001/forcegc001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceGarbageCollection/forcegc001/forcegc001.cpp
index a69ec032161..e4c8dc2a375 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceGarbageCollection/forcegc001/forcegc001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceGarbageCollection/forcegc001/forcegc001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceGarbageCollection/forcegc002/forcegc002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceGarbageCollection/forcegc002/forcegc002.cpp
index e50350aceda..1df20dcdecf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceGarbageCollection/forcegc002/forcegc002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ForceGarbageCollection/forcegc002/forcegc002.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionFinish/gcfinish001/gcfinish001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionFinish/gcfinish001/gcfinish001.cpp
index d8e8bfc3e0d..970e4ff57c1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionFinish/gcfinish001/gcfinish001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionFinish/gcfinish001/gcfinish001.cpp
@@ -27,9 +27,9 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "nsk_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionStart/gcstart001/gcstart001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionStart/gcstart001/gcstart001.cpp
index a9b4dead1e3..9e4d2d7f0f0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionStart/gcstart001/gcstart001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionStart/gcstart001/gcstart001.cpp
@@ -27,9 +27,9 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "nsk_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionStart/gcstart002/gcstart002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionStart/gcstart002/gcstart002.cpp
index e612df34479..792c326a96a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionStart/gcstart002/gcstart002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GarbageCollectionStart/gcstart002/gcstart002.cpp
@@ -27,9 +27,9 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "nsk_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GenerateEvents/genevents001/genevents001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GenerateEvents/genevents001/genevents001.cpp
index e562b8b72bb..13de99039af 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GenerateEvents/genevents001/genevents001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GenerateEvents/genevents001/genevents001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetArgumentsSize/argsize001/argsize001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetArgumentsSize/argsize001/argsize001.cpp
index 2534ffa80cf..3c0afdfb62d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetArgumentsSize/argsize001/argsize001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetArgumentsSize/argsize001/argsize001.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetArgumentsSize/argsize002/argsize002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetArgumentsSize/argsize002/argsize002.cpp
index f2e89cc81d2..e957529cc02 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetArgumentsSize/argsize002/argsize002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetArgumentsSize/argsize002/argsize002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetAvailableProcessors/getavailproc001/getavailproc001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetAvailableProcessors/getavailproc001/getavailproc001.cpp
index eabda28089b..5b24e64edcc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetAvailableProcessors/getavailproc001/getavailproc001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetAvailableProcessors/getavailproc001/getavailproc001.cpp
@@ -25,8 +25,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetBytecodes/bytecodes001/bytecodes001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetBytecodes/bytecodes001/bytecodes001.cpp
index 474c55016cf..9743c8f762d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetBytecodes/bytecodes001/bytecodes001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetBytecodes/bytecodes001/bytecodes001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetBytecodes/bytecodes002/bytecodes002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetBytecodes/bytecodes002/bytecodes002.cpp
index 081c792197e..4dfb24d5140 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetBytecodes/bytecodes002/bytecodes002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetBytecodes/bytecodes002/bytecodes002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetBytecodes/bytecodes003/bytecodes003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetBytecodes/bytecodes003/bytecodes003.cpp
index c2ce7fe19f8..7167631a5e4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetBytecodes/bytecodes003/bytecodes003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetBytecodes/bytecodes003/bytecodes003.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCapabilities/getcaps001/getcaps001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCapabilities/getcaps001/getcaps001.cpp
index 148a2dcccdb..a81afef8275 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCapabilities/getcaps001/getcaps001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCapabilities/getcaps001/getcaps001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCapabilities/getcaps002/getcaps002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCapabilities/getcaps002/getcaps002.cpp
index f55958517cb..fa03fb1b34f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCapabilities/getcaps002/getcaps002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCapabilities/getcaps002/getcaps002.cpp
@@ -25,8 +25,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld005/getclfld005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld005/getclfld005.cpp
index d8c8f2b358d..a41634ea25d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld005/getclfld005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld005/getclfld005.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld006/getclfld006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld006/getclfld006.cpp
index de920467f83..e1b17bf6420 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld006/getclfld006.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld006/getclfld006.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld007/getclfld007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld007/getclfld007.cpp
index 0b14d24ac7a..3cd33384330 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld007/getclfld007.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassFields/getclfld007/getclfld007.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoader/getclsldr001/getclsldr001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoader/getclsldr001/getclsldr001.cpp
index 287783525ef..90ece1bd2ce 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoader/getclsldr001/getclsldr001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoader/getclsldr001/getclsldr001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoader/getclsldr002/getclsldr002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoader/getclsldr002/getclsldr002.cpp
index 7eb18c8da2b..f46e0bb13da 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoader/getclsldr002/getclsldr002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoader/getclsldr002/getclsldr002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoader/getclsldr003/getclsldr003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoader/getclsldr003/getclsldr003.cpp
index 785a7679c89..43961c06bd1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoader/getclsldr003/getclsldr003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoader/getclsldr003/getclsldr003.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoaderClasses/clsldrclss001/clsldrclss001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoaderClasses/clsldrclss001/clsldrclss001.cpp
index 8dfabd9c7ad..938c50a5606 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoaderClasses/clsldrclss001/clsldrclss001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoaderClasses/clsldrclss001/clsldrclss001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoaderClasses/clsldrclss002/clsldrclss002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoaderClasses/clsldrclss002/clsldrclss002.cpp
index 83d38c0cde4..50e6207e57f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoaderClasses/clsldrclss002/clsldrclss002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassLoaderClasses/clsldrclss002/clsldrclss002.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassMethods/getclmthd005/getclmthd005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassMethods/getclmthd005/getclmthd005.cpp
index 6fbb6d37960..e4327bdb890 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassMethods/getclmthd005/getclmthd005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassMethods/getclmthd005/getclmthd005.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassMethods/getclmthd006/getclmthd006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassMethods/getclmthd006/getclmthd006.cpp
index c6eb039972b..b0f1add000b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassMethods/getclmthd006/getclmthd006.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassMethods/getclmthd006/getclmthd006.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassMethods/getclmthd007/getclmthd007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassMethods/getclmthd007/getclmthd007.cpp
index 88a4446a0b9..79e5d144d0d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassMethods/getclmthd007/getclmthd007.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassMethods/getclmthd007/getclmthd007.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf004/getclmdf004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf004/getclmdf004.cpp
index 0496d0abcc8..21334b3801b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf004/getclmdf004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf004/getclmdf004.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf005/getclmdf005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf005/getclmdf005.cpp
index 7341e49aa56..3716402cc10 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf005/getclmdf005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf005/getclmdf005.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf006/getclmdf006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf006/getclmdf006.cpp
index c8c00f4a7a3..de562a2a2b9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf006/getclmdf006.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf006/getclmdf006.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf007/getclmdf007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf007/getclmdf007.cpp
index 233bad3418b..cd698d4af9e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf007/getclmdf007.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassModifiers/getclmdf007/getclmdf007.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassSignature/getclsig004/getclsig004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassSignature/getclsig004/getclsig004.cpp
index 3d12ad670d0..ceb349091aa 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassSignature/getclsig004/getclsig004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassSignature/getclsig004/getclsig004.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassSignature/getclsig005/getclsig005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassSignature/getclsig005/getclsig005.cpp
index 6139cc546ca..2c60d39dc18 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassSignature/getclsig005/getclsig005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassSignature/getclsig005/getclsig005.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassSignature/getclsig006/getclsig006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassSignature/getclsig006/getclsig006.cpp
index f698634b82c..246823d67ea 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassSignature/getclsig006/getclsig006.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassSignature/getclsig006/getclsig006.cpp
@@ -26,10 +26,10 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
-#include "jni_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "nsk_tools.hpp"
+#include "jni_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassStatus/getclstat005/getclstat005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassStatus/getclstat005/getclstat005.cpp
index ff099aacac2..ba6b1a19746 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassStatus/getclstat005/getclstat005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassStatus/getclstat005/getclstat005.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassStatus/getclstat006/getclstat006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassStatus/getclstat006/getclstat006.cpp
index 01f3a5c3944..666fa3e0db0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassStatus/getclstat006/getclstat006.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassStatus/getclstat006/getclstat006.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassStatus/getclstat007/getclstat007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassStatus/getclstat007/getclstat007.cpp
index 3a1066bb744..4958e015c3a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassStatus/getclstat007/getclstat007.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetClassStatus/getclstat007/getclstat007.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCurrentThreadCpuTime/curthrcputime001/curthrcputime001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCurrentThreadCpuTime/curthrcputime001/curthrcputime001.cpp
index e93d85df63f..7e2d7d6f8f4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCurrentThreadCpuTime/curthrcputime001/curthrcputime001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCurrentThreadCpuTime/curthrcputime001/curthrcputime001.cpp
@@ -25,8 +25,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCurrentThreadCpuTimerInfo/curthrtimerinfo001/curthrtimerinfo001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCurrentThreadCpuTimerInfo/curthrtimerinfo001/curthrtimerinfo001.cpp
index 826a516e45f..cbb40a0df06 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCurrentThreadCpuTimerInfo/curthrtimerinfo001/curthrtimerinfo001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetCurrentThreadCpuTimerInfo/curthrtimerinfo001/curthrtimerinfo001.cpp
@@ -25,8 +25,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetEnv/GetEnv001/GetEnv001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetEnv/GetEnv001/GetEnv001.cpp
index 32fcc2ce0c2..cad70dfbd13 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetEnv/GetEnv001/GetEnv001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetEnv/GetEnv001/GetEnv001.cpp
@@ -26,8 +26,8 @@
#include <stdlib.h>
#include <jvmti.h>
#include "agent_common.hpp"
-#include <jvmti_tools.h>
-#include "JVMTITools.h"
+#include <jvmti_tools.hpp>
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetEnvironmentLocalStorage/getenvstor001/getenvstor001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetEnvironmentLocalStorage/getenvstor001/getenvstor001.cpp
index d6ba854ee16..b4735fe338c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetEnvironmentLocalStorage/getenvstor001/getenvstor001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetEnvironmentLocalStorage/getenvstor001/getenvstor001.cpp
@@ -25,8 +25,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetErrorName/geterrname001/geterrname001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetErrorName/geterrname001/geterrname001.cpp
index c8e81c29016..d06c4a05339 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetErrorName/geterrname001/geterrname001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetErrorName/geterrname001/geterrname001.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetErrorName/geterrname002/geterrname002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetErrorName/geterrname002/geterrname002.cpp
index df020dd5b95..6b52d237e76 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetErrorName/geterrname002/geterrname002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetErrorName/geterrname002/geterrname002.cpp
@@ -22,9 +22,9 @@
*/
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetExtensionEvents/extevents001/extevents001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetExtensionEvents/extevents001/extevents001.cpp
index fb3f956a628..e071724a97b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetExtensionEvents/extevents001/extevents001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetExtensionEvents/extevents001/extevents001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetExtensionFunctions/extfuncs001/extfuncs001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetExtensionFunctions/extfuncs001/extfuncs001.cpp
index 9be1826fd8c..b6fc95128d6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetExtensionFunctions/extfuncs001/extfuncs001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetExtensionFunctions/extfuncs001/extfuncs001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldDeclaringClass/getfldecl001/getfldecl001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldDeclaringClass/getfldecl001/getfldecl001.cpp
index 6e5ec876b3b..385dbd23354 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldDeclaringClass/getfldecl001/getfldecl001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldDeclaringClass/getfldecl001/getfldecl001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldDeclaringClass/getfldecl002/getfldecl002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldDeclaringClass/getfldecl002/getfldecl002.cpp
index 9c31e486d1b..77b926f1383 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldDeclaringClass/getfldecl002/getfldecl002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldDeclaringClass/getfldecl002/getfldecl002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldDeclaringClass/getfldecl004/getfldecl004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldDeclaringClass/getfldecl004/getfldecl004.cpp
index b41f5120216..cc967123c5c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldDeclaringClass/getfldecl004/getfldecl004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldDeclaringClass/getfldecl004/getfldecl004.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldModifiers/getfldmdf003/getfldmdf003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldModifiers/getfldmdf003/getfldmdf003.cpp
index 5d1120689f3..2ef792ba9a1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldModifiers/getfldmdf003/getfldmdf003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldModifiers/getfldmdf003/getfldmdf003.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldModifiers/getfldmdf004/getfldmdf004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldModifiers/getfldmdf004/getfldmdf004.cpp
index 18465cc28f3..672a62b8946 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldModifiers/getfldmdf004/getfldmdf004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldModifiers/getfldmdf004/getfldmdf004.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldName/getfldnm003/getfldnm003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldName/getfldnm003/getfldnm003.cpp
index 3006880307b..9a6fcf21e65 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldName/getfldnm003/getfldnm003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldName/getfldnm003/getfldnm003.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldName/getfldnm004/getfldnm004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldName/getfldnm004/getfldnm004.cpp
index c6c7fc07ac5..0f035f3a84c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldName/getfldnm004/getfldnm004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldName/getfldnm004/getfldnm004.cpp
@@ -26,7 +26,7 @@
#include <inttypes.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldName/getfldnm005/getfldnm005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldName/getfldnm005/getfldnm005.cpp
index cd245ce3f06..66945b246f8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldName/getfldnm005/getfldnm005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetFieldName/getfldnm005/getfldnm005.cpp
@@ -26,10 +26,10 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
-#include "jni_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "nsk_tools.hpp"
+#include "jni_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetImplementedInterfaces/getintrf005/getintrf005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetImplementedInterfaces/getintrf005/getintrf005.cpp
index c919db03786..e778581353c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetImplementedInterfaces/getintrf005/getintrf005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetImplementedInterfaces/getintrf005/getintrf005.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetImplementedInterfaces/getintrf006/getintrf006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetImplementedInterfaces/getintrf006/getintrf006.cpp
index b41a2908f77..37e286d4493 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetImplementedInterfaces/getintrf006/getintrf006.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetImplementedInterfaces/getintrf006/getintrf006.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetImplementedInterfaces/getintrf007/getintrf007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetImplementedInterfaces/getintrf007/getintrf007.cpp
index c3b2bbff3ae..2193e5dc972 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetImplementedInterfaces/getintrf007/getintrf007.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetImplementedInterfaces/getintrf007/getintrf007.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJLocationFormat/getjlocfmt001/getjlocfmt001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJLocationFormat/getjlocfmt001/getjlocfmt001.cpp
index 79ea2c4c09b..3502af000ab 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJLocationFormat/getjlocfmt001/getjlocfmt001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJLocationFormat/getjlocfmt001/getjlocfmt001.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJLocationFormat/getjlocfmt002/getjlocfmt002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJLocationFormat/getjlocfmt002/getjlocfmt002.cpp
index dd5411979e0..54612f3cb73 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJLocationFormat/getjlocfmt002/getjlocfmt002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJLocationFormat/getjlocfmt002/getjlocfmt002.cpp
@@ -22,9 +22,9 @@
*/
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJNIFunctionTable/getjniftab001/getjniftab001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJNIFunctionTable/getjniftab001/getjniftab001.cpp
index 8a65252fb4e..cc320129a98 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJNIFunctionTable/getjniftab001/getjniftab001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJNIFunctionTable/getjniftab001/getjniftab001.cpp
@@ -29,7 +29,7 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
#include "native_thread.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJNIFunctionTable/getjniftab002/getjniftab002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJNIFunctionTable/getjniftab002/getjniftab002.cpp
index dabe15e4c22..3d06018f556 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJNIFunctionTable/getjniftab002/getjniftab002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetJNIFunctionTable/getjniftab002/getjniftab002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLineNumberTable/linetab001/linetab001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLineNumberTable/linetab001/linetab001.cpp
index 76d4f3454c6..b2a03a4a629 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLineNumberTable/linetab001/linetab001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLineNumberTable/linetab001/linetab001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLineNumberTable/linetab002/linetab002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLineNumberTable/linetab002/linetab002.cpp
index 86851c63a16..9592167e1cd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLineNumberTable/linetab002/linetab002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLineNumberTable/linetab002/linetab002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLineNumberTable/linetab003/linetab003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLineNumberTable/linetab003/linetab003.cpp
index 3a8df96017a..340d206a62c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLineNumberTable/linetab003/linetab003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLineNumberTable/linetab003/linetab003.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLoadedClasses/loadedclss001/loadedclss001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLoadedClasses/loadedclss001/loadedclss001.cpp
index 58cd7942bb8..43804aaffd5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLoadedClasses/loadedclss001/loadedclss001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLoadedClasses/loadedclss001/loadedclss001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLoadedClasses/loadedclss002/loadedclss002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLoadedClasses/loadedclss002/loadedclss002.cpp
index 5a678f31b4b..813f15e4c3a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLoadedClasses/loadedclss002/loadedclss002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLoadedClasses/loadedclss002/loadedclss002.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariable/getlocal001/getlocal001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariable/getlocal001/getlocal001.cpp
index d0bc2e86440..c5ec07035f8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariable/getlocal001/getlocal001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariable/getlocal001/getlocal001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariable/getlocal002/getlocal002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariable/getlocal002/getlocal002.cpp
index 81ec0592821..672404c23b1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariable/getlocal002/getlocal002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariable/getlocal002/getlocal002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab001/localtab001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab001/localtab001.cpp
index 9eed04fac18..8f4750437bd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab001/localtab001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab001/localtab001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab002/localtab002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab002/localtab002.cpp
index 11a7734e77e..649f065ffa5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab002/localtab002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab002/localtab002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab003/localtab003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab003/localtab003.cpp
index b8892b42fa2..74d54ad0b5b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab003/localtab003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab003/localtab003.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab004/localtab004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab004/localtab004.cpp
index e714b0f944e..5b45b23b808 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab004/localtab004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab004/localtab004.cpp
@@ -26,9 +26,9 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "nsk_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab005/localtab005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab005/localtab005.cpp
index d3b8f364cf9..5c1de0b9b0e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab005/localtab005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetLocalVariableTable/localtab005/localtab005.cpp
@@ -26,9 +26,9 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "nsk_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMaxLocals/maxloc001/maxloc001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMaxLocals/maxloc001/maxloc001.cpp
index 8834d19950f..a716af1a686 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMaxLocals/maxloc001/maxloc001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMaxLocals/maxloc001/maxloc001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMaxLocals/maxloc002/maxloc002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMaxLocals/maxloc002/maxloc002.cpp
index fcfde0cd4e4..6d8aa8baccf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMaxLocals/maxloc002/maxloc002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMaxLocals/maxloc002/maxloc002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodDeclaringClass/declcls001/declcls001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodDeclaringClass/declcls001/declcls001.cpp
index 42b0ed7d0e2..490d63ce6dc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodDeclaringClass/declcls001/declcls001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodDeclaringClass/declcls001/declcls001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodDeclaringClass/declcls002/declcls002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodDeclaringClass/declcls002/declcls002.cpp
index 868107ff887..837ef437bb8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodDeclaringClass/declcls002/declcls002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodDeclaringClass/declcls002/declcls002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodDeclaringClass/declcls003/declcls003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodDeclaringClass/declcls003/declcls003.cpp
index 15a54e906ba..833edd6e75a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodDeclaringClass/declcls003/declcls003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodDeclaringClass/declcls003/declcls003.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodLocation/methloc002/methloc002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodLocation/methloc002/methloc002.cpp
index 782e36b2f4d..2dbb504ed12 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodLocation/methloc002/methloc002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodLocation/methloc002/methloc002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodModifiers/methmod001/methmod001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodModifiers/methmod001/methmod001.cpp
index 5637c579d9a..8572908762b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodModifiers/methmod001/methmod001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodModifiers/methmod001/methmod001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodModifiers/methmod002/methmod002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodModifiers/methmod002/methmod002.cpp
index 81211b43e3b..c5545532e44 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodModifiers/methmod002/methmod002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodModifiers/methmod002/methmod002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodName/methname001/methname001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodName/methname001/methname001.cpp
index 9d4cfe6a761..08191498d93 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodName/methname001/methname001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodName/methname001/methname001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodName/methname002/methname002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodName/methname002/methname002.cpp
index 194c28e6f69..5d28fd33a86 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodName/methname002/methname002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodName/methname002/methname002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodName/methname003/methname003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodName/methname003/methname003.cpp
index 1385d466579..e64e7a8007b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodName/methname003/methname003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetMethodName/methname003/methname003.cpp
@@ -26,10 +26,10 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
-#include "jni_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "nsk_tools.hpp"
+#include "jni_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectHashCode/objhashcode001/objhashcode001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectHashCode/objhashcode001/objhashcode001.cpp
index 2735f0ada71..885b354ce25 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectHashCode/objhashcode001/objhashcode001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectHashCode/objhashcode001/objhashcode001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage001/objmonusage001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage001/objmonusage001.cpp
index 44a5f743865..bb9111d897f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage001/objmonusage001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage001/objmonusage001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage002/objmonusage002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage002/objmonusage002.cpp
index dc062bc5b4f..c92d2802296 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage002/objmonusage002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage002/objmonusage002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage003/objmonusage003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage003/objmonusage003.cpp
index 3df3a1a73e4..6e0a7d3b155 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage003/objmonusage003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage003/objmonusage003.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage004/objmonusage004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage004/objmonusage004.cpp
index e1dc46c8a4d..6375403aa95 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage004/objmonusage004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage004/objmonusage004.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage005/objmonusage005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage005/objmonusage005.cpp
index 85b71b20585..eaf5c9668dc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage005/objmonusage005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage005/objmonusage005.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage006/objmonusage006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage006/objmonusage006.cpp
index 721b426be67..252e3e9a934 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage006/objmonusage006.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectMonitorUsage/objmonusage006/objmonusage006.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectSize/objsize001/objsize001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectSize/objsize001/objsize001.cpp
index 7cd36918e56..a18c3d8a76e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectSize/objsize001/objsize001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectSize/objsize001/objsize001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectsWithTags/objwithtags001/objwithtags001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectsWithTags/objwithtags001/objwithtags001.cpp
index dd1d354e43b..d1cd1129430 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectsWithTags/objwithtags001/objwithtags001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetObjectsWithTags/objwithtags001/objwithtags001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetOwnedMonitorInfo/ownmoninf001/ownmoninf001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetOwnedMonitorInfo/ownmoninf001/ownmoninf001.cpp
index 1496bc7910d..c01b9d69438 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetOwnedMonitorInfo/ownmoninf001/ownmoninf001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetOwnedMonitorInfo/ownmoninf001/ownmoninf001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetOwnedMonitorInfo/ownmoninf002/ownmoninf002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetOwnedMonitorInfo/ownmoninf002/ownmoninf002.cpp
index 5ee86d9c386..3837e255809 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetOwnedMonitorInfo/ownmoninf002/ownmoninf002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetOwnedMonitorInfo/ownmoninf002/ownmoninf002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetOwnedMonitorInfo/ownmoninf003/ownmoninf003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetOwnedMonitorInfo/ownmoninf003/ownmoninf003.cpp
index d486e1d1413..5f7ada614e8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetOwnedMonitorInfo/ownmoninf003/ownmoninf003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetOwnedMonitorInfo/ownmoninf003/ownmoninf003.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPhase/getphase001/getphase001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPhase/getphase001/getphase001.cpp
index d1c9557cbd1..d1c7566b6af 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPhase/getphase001/getphase001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPhase/getphase001/getphase001.cpp
@@ -22,9 +22,9 @@
*/
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPhase/getphase002/getphase002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPhase/getphase002/getphase002.cpp
index 0d51f44f2b1..d1d8443b921 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPhase/getphase002/getphase002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPhase/getphase002/getphase002.cpp
@@ -22,9 +22,9 @@
*/
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPotentialCapabilities/getpotcaps001/getpotcaps001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPotentialCapabilities/getpotcaps001/getpotcaps001.cpp
index 64c866b9208..daddc8a20a4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPotentialCapabilities/getpotcaps001/getpotcaps001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetPotentialCapabilities/getpotcaps001/getpotcaps001.cpp
@@ -25,8 +25,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceDebugExtension/srcdebugex001/srcdebugex001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceDebugExtension/srcdebugex001/srcdebugex001.cpp
index 354e50bc141..58b8a0195ef 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceDebugExtension/srcdebugex001/srcdebugex001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceDebugExtension/srcdebugex001/srcdebugex001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceDebugExtension/srcdebugex002/srcdebugex002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceDebugExtension/srcdebugex002/srcdebugex002.cpp
index 6599bf20bc3..033313e17eb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceDebugExtension/srcdebugex002/srcdebugex002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceDebugExtension/srcdebugex002/srcdebugex002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceDebugExtension/srcdebugex003/srcdebugex003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceDebugExtension/srcdebugex003/srcdebugex003.cpp
index 314098d028d..5763103ac18 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceDebugExtension/srcdebugex003/srcdebugex003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceDebugExtension/srcdebugex003/srcdebugex003.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceFileName/getsrcfn004/getsrcfn004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceFileName/getsrcfn004/getsrcfn004.cpp
index 02301c71995..bdaeed82f6d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceFileName/getsrcfn004/getsrcfn004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceFileName/getsrcfn004/getsrcfn004.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceFileName/getsrcfn005/getsrcfn005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceFileName/getsrcfn005/getsrcfn005.cpp
index 2229193e5fa..b5c387546ea 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceFileName/getsrcfn005/getsrcfn005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceFileName/getsrcfn005/getsrcfn005.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceFileName/getsrcfn006/getsrcfn006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceFileName/getsrcfn006/getsrcfn006.cpp
index a7323e32292..2f7cbe7a56d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceFileName/getsrcfn006/getsrcfn006.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSourceFileName/getsrcfn006/getsrcfn006.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperties/getsysprops001/getsysprops001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperties/getsysprops001/getsysprops001.cpp
index 38771209698..da45f7748d2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperties/getsysprops001/getsysprops001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperties/getsysprops001/getsysprops001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperties/getsysprops002/getsysprops002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperties/getsysprops002/getsysprops002.cpp
index 793f48de414..fa51345a148 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperties/getsysprops002/getsysprops002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperties/getsysprops002/getsysprops002.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperty/getsysprop001/getsysprop001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperty/getsysprop001/getsysprop001.cpp
index 8e8a5e99c6d..652e04171ff 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperty/getsysprop001/getsysprop001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperty/getsysprop001/getsysprop001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperty/getsysprop002/getsysprop002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperty/getsysprop002/getsysprop002.cpp
index af448621abb..885bb264551 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperty/getsysprop002/getsysprop002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetSystemProperty/getsysprop002/getsysprop002.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTag/gettag001/gettag001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTag/gettag001/gettag001.cpp
index 766526aa33d..e74f57b3b46 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTag/gettag001/gettag001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTag/gettag001/gettag001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTime/thrcputime001/thrcputime001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTime/thrcputime001/thrcputime001.cpp
index 903b115279b..aa1757f0e3e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTime/thrcputime001/thrcputime001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTime/thrcputime001/thrcputime001.cpp
@@ -25,8 +25,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTime/thrcputime002/thrcputime002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTime/thrcputime002/thrcputime002.cpp
index f930bf52c54..938ae04ceb1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTime/thrcputime002/thrcputime002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTime/thrcputime002/thrcputime002.cpp
@@ -25,8 +25,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTimerInfo/thrtimerinfo001/thrtimerinfo001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTimerInfo/thrtimerinfo001/thrtimerinfo001.cpp
index c63821397b9..a7d741c4263 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTimerInfo/thrtimerinfo001/thrtimerinfo001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadCpuTimerInfo/thrtimerinfo001/thrtimerinfo001.cpp
@@ -25,8 +25,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadGroupChildren/getthrdgrpchld001/getthrdgrpchld001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadGroupChildren/getthrdgrpchld001/getthrdgrpchld001.cpp
index ea01150c0a1..6e823d230aa 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadGroupChildren/getthrdgrpchld001/getthrdgrpchld001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadGroupChildren/getthrdgrpchld001/getthrdgrpchld001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadGroupInfo/thrgrpinfo001/thrgrpinfo001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadGroupInfo/thrgrpinfo001/thrgrpinfo001.cpp
index e5140290246..c578a8df9cd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadGroupInfo/thrgrpinfo001/thrgrpinfo001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadGroupInfo/thrgrpinfo001/thrgrpinfo001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadGroupInfo/thrgrpinfo002/thrgrpinfo002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadGroupInfo/thrgrpinfo002/thrgrpinfo002.cpp
index f272e46c7f2..7ea27fdee6f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadGroupInfo/thrgrpinfo002/thrgrpinfo002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadGroupInfo/thrgrpinfo002/thrgrpinfo002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadLocalStorage/getthrdstor001/getthrdstor001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadLocalStorage/getthrdstor001/getthrdstor001.cpp
index 098b52e5619..79254fcfe54 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadLocalStorage/getthrdstor001/getthrdstor001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetThreadLocalStorage/getthrdstor001/getthrdstor001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTime/gettime001/gettime001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTime/gettime001/gettime001.cpp
index f77aa5f86c6..3f50ec721cc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTime/gettime001/gettime001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTime/gettime001/gettime001.cpp
@@ -25,8 +25,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTimerInfo/timerinfo001/timerinfo001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTimerInfo/timerinfo001/timerinfo001.cpp
index 40ac8d8e76e..9d53767b3ac 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTimerInfo/timerinfo001/timerinfo001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTimerInfo/timerinfo001/timerinfo001.cpp
@@ -25,8 +25,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTopThreadGroups/topthrgrp001/topthrgrp001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTopThreadGroups/topthrgrp001/topthrgrp001.cpp
index f74230b02cb..624fbdd0791 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTopThreadGroups/topthrgrp001/topthrgrp001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTopThreadGroups/topthrgrp001/topthrgrp001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTopThreadGroups/topthrgrp002/topthrgrp002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTopThreadGroups/topthrgrp002/topthrgrp002.cpp
index eba1d765b88..2a0ab2e71f5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTopThreadGroups/topthrgrp002/topthrgrp002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetTopThreadGroups/topthrgrp002/topthrgrp002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetVersionNumber/getvern001/getvern001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetVersionNumber/getvern001/getvern001.cpp
index 84d1ac96565..78ac1fa445a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetVersionNumber/getvern001/getvern001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/GetVersionNumber/getvern001/getvern001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/InterruptThread/intrpthrd001/intrpthrd001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/InterruptThread/intrpthrd001/intrpthrd001.cpp
index cfcd3574942..f413d63bd76 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/InterruptThread/intrpthrd001/intrpthrd001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/InterruptThread/intrpthrd001/intrpthrd001.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/InterruptThread/intrpthrd002/intrpthrd002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/InterruptThread/intrpthrd002/intrpthrd002.cpp
index ac5cf26ac1e..9f9affc6722 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/InterruptThread/intrpthrd002/intrpthrd002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/InterruptThread/intrpthrd002/intrpthrd002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/InterruptThread/intrpthrd003/intrpthrd003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/InterruptThread/intrpthrd003/intrpthrd003.cpp
index 36cd52f7d9a..c29d495c1f8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/InterruptThread/intrpthrd003/intrpthrd003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/InterruptThread/intrpthrd003/intrpthrd003.cpp
@@ -24,9 +24,9 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsArrayClass/isarray004/isarray004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsArrayClass/isarray004/isarray004.cpp
index f10cdc8be50..7976427a24a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsArrayClass/isarray004/isarray004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsArrayClass/isarray004/isarray004.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsArrayClass/isarray005/isarray005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsArrayClass/isarray005/isarray005.cpp
index 6ed9d0b1d14..8cee41638d2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsArrayClass/isarray005/isarray005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsArrayClass/isarray005/isarray005.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsFieldSynthetic/isfldsin002/isfldsin002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsFieldSynthetic/isfldsin002/isfldsin002.cpp
index 1f8107c2bc0..5babeef5787 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsFieldSynthetic/isfldsin002/isfldsin002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsFieldSynthetic/isfldsin002/isfldsin002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsFieldSynthetic/isfldsin003/isfldsin003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsFieldSynthetic/isfldsin003/isfldsin003.cpp
index 6adc02ee24f..2ffd6ca0e9a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsFieldSynthetic/isfldsin003/isfldsin003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsFieldSynthetic/isfldsin003/isfldsin003.cpp
@@ -26,7 +26,7 @@
#include <inttypes.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsInterface/isintrf004/isintrf004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsInterface/isintrf004/isintrf004.cpp
index 236c1bd4d2c..6287e5846a2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsInterface/isintrf004/isintrf004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsInterface/isintrf004/isintrf004.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsInterface/isintrf005/isintrf005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsInterface/isintrf005/isintrf005.cpp
index d1652883251..c014249ed4d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsInterface/isintrf005/isintrf005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsInterface/isintrf005/isintrf005.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodNative/isnative001/isnative001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodNative/isnative001/isnative001.cpp
index 72693d57bc4..500d16405e6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodNative/isnative001/isnative001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodNative/isnative001/isnative001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodNative/isnative002/isnative002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodNative/isnative002/isnative002.cpp
index 3ed9ab714c8..6c8dd65b0d1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodNative/isnative002/isnative002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodNative/isnative002/isnative002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodObsolete/isobsolete001/isobsolete001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodObsolete/isobsolete001/isobsolete001.cpp
index ddac43299c6..0d7aeb1f4c3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodObsolete/isobsolete001/isobsolete001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodObsolete/isobsolete001/isobsolete001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodSynthetic/issynth001/issynth001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodSynthetic/issynth001/issynth001.cpp
index a803ae21f68..e30eb3a0ab3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodSynthetic/issynth001/issynth001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodSynthetic/issynth001/issynth001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodSynthetic/issynth002/issynth002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodSynthetic/issynth002/issynth002.cpp
index 6866aed4e11..ae2c3106344 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodSynthetic/issynth002/issynth002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IsMethodSynthetic/issynth002/issynth002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap001/iterheap001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap001/iterheap001.cpp
index 7c3ee2aa16d..dc2a5c3a0ba 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap001/iterheap001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap001/iterheap001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap002/iterheap002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap002/iterheap002.cpp
index 5c7687422e4..975e677bd1d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap002/iterheap002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap002/iterheap002.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap003/iterheap003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap003/iterheap003.cpp
index 37cbd1f1e70..6e92cfc8a22 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap003/iterheap003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap003/iterheap003.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap004/iterheap004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap004/iterheap004.cpp
index 3c0d39b7c3e..d3858cece51 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap004/iterheap004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap004/iterheap004.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap005/iterheap005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap005/iterheap005.cpp
index 4b27c06522f..d0fda690c14 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap005/iterheap005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap005/iterheap005.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap006/iterheap006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap006/iterheap006.cpp
index dfdeeb0f6b9..5655bca5ffc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap006/iterheap006.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap006/iterheap006.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap007/iterheap007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap007/iterheap007.cpp
index 2932b30ea06..3639386f737 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap007/iterheap007.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverHeap/iterheap007/iterheap007.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls001/iterinstcls001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls001/iterinstcls001.cpp
index 8f7a49e2093..9f0600104ce 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls001/iterinstcls001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls001/iterinstcls001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls002/iterinstcls002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls002/iterinstcls002.cpp
index 2fb127ec7f8..1ab2a4c3ba7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls002/iterinstcls002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls002/iterinstcls002.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls003/iterinstcls003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls003/iterinstcls003.cpp
index 5db17bbefb5..5c77f2f52db 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls003/iterinstcls003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls003/iterinstcls003.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls004/iterinstcls004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls004/iterinstcls004.cpp
index a7c14847c92..b77258c773a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls004/iterinstcls004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls004/iterinstcls004.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls005/iterinstcls005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls005/iterinstcls005.cpp
index 8e4a64c5505..23da29f1867 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls005/iterinstcls005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls005/iterinstcls005.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls006/iterinstcls006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls006/iterinstcls006.cpp
index c727dbf39f6..c025d8cbb80 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls006/iterinstcls006.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls006/iterinstcls006.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls007/iterinstcls007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls007/iterinstcls007.cpp
index 94ac9c3a928..935b64104cb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls007/iterinstcls007.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverInstancesOfClass/iterinstcls007/iterinstcls007.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj001/iterobjreachobj001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj001/iterobjreachobj001.cpp
index 27197a3851d..7ed00c2580f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj001/iterobjreachobj001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj001/iterobjreachobj001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj002/iterobjreachobj002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj002/iterobjreachobj002.cpp
index 6208a1ad2a1..3b759579147 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj002/iterobjreachobj002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj002/iterobjreachobj002.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj003/iterobjreachobj003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj003/iterobjreachobj003.cpp
index ce883701a36..ccdd97a431a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj003/iterobjreachobj003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj003/iterobjreachobj003.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj004/iterobjreachobj004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj004/iterobjreachobj004.cpp
index ecb4044dabb..ff90ec1b0ba 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj004/iterobjreachobj004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj004/iterobjreachobj004.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj005/iterobjreachobj005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj005/iterobjreachobj005.cpp
index d16ce2a8402..5e74b8b607f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj005/iterobjreachobj005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverObjectsReachableFromObject/iterobjreachobj005/iterobjreachobj005.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj001/iterreachobj001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj001/iterreachobj001.cpp
index 52a0bd1f183..727b1046245 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj001/iterreachobj001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj001/iterreachobj001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj002/iterreachobj002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj002/iterreachobj002.cpp
index c40edc647fb..236094b5015 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj002/iterreachobj002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj002/iterreachobj002.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj003/iterreachobj003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj003/iterreachobj003.cpp
index 00816ce7e16..d091687f492 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj003/iterreachobj003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj003/iterreachobj003.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj004/iterreachobj004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj004/iterreachobj004.cpp
index 5a11a7f1b52..9b9d14603a7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj004/iterreachobj004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj004/iterreachobj004.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj005/iterreachobj005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj005/iterreachobj005.cpp
index c49934795f9..30956305257 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj005/iterreachobj005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateOverReachableObjects/iterreachobj005/iterreachobj005.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/abort/Abort.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/abort/Abort.cpp
index dd019e5b925..7df6157b375 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/abort/Abort.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/abort/Abort.cpp
@@ -25,8 +25,8 @@
#include <stdlib.h>
#include "jvmti.h"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
#include "agent_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/callbacks/Callbacks.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/callbacks/Callbacks.cpp
index b155ae5ee0a..334937d3d04 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/callbacks/Callbacks.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/callbacks/Callbacks.cpp
@@ -25,8 +25,8 @@
#include <stdlib.h>
#include "jvmti.h"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
#include "agent_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/concrete-klass-filter/ConcreteKlassFilter.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/concrete-klass-filter/ConcreteKlassFilter.cpp
index c1db6f2d110..3ab2c751187 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/concrete-klass-filter/ConcreteKlassFilter.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/concrete-klass-filter/ConcreteKlassFilter.cpp
@@ -25,8 +25,8 @@
#include <stdlib.h>
#include "jvmti.h"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
#include "agent_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/filter-tagged/HeapFilter.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/filter-tagged/HeapFilter.cpp
index 0e9eb749ca3..4115c60d228 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/filter-tagged/HeapFilter.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/filter-tagged/HeapFilter.cpp
@@ -25,8 +25,8 @@
#include <stdlib.h>
#include "jvmti.h"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
#include "agent_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/non-concrete-klass-filter/NonConcreteKlassFilter.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/non-concrete-klass-filter/NonConcreteKlassFilter.cpp
index 8fae6f47a5c..37e3af0c689 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/non-concrete-klass-filter/NonConcreteKlassFilter.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/IterateThroughHeap/non-concrete-klass-filter/NonConcreteKlassFilter.cpp
@@ -25,8 +25,8 @@
#include <stdlib.h>
#include "jvmti.h"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
#include "agent_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NotifyFramePop/nframepop001/nframepop001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NotifyFramePop/nframepop001/nframepop001.cpp
index dbb2c0ed3cd..eec81b91cb1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NotifyFramePop/nframepop001/nframepop001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NotifyFramePop/nframepop001/nframepop001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NotifyFramePop/nframepop002/nframepop002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NotifyFramePop/nframepop002/nframepop002.cpp
index 1930030ed1f..333cd0298c4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NotifyFramePop/nframepop002/nframepop002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NotifyFramePop/nframepop002/nframepop002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NotifyFramePop/nframepop003/nframepop003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NotifyFramePop/nframepop003/nframepop003.cpp
index 5e08ff01624..d389b123987 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NotifyFramePop/nframepop003/nframepop003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/NotifyFramePop/nframepop003/nframepop003.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ObjectFree/objfree001/objfree001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ObjectFree/objfree001/objfree001.cpp
index a3f577526a3..22a1a227377 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ObjectFree/objfree001/objfree001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ObjectFree/objfree001/objfree001.cpp
@@ -27,10 +27,10 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
-#include "jni_tools.h"
+#include "nsk_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
+#include "jni_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ObjectFree/objfree002/objfree002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ObjectFree/objfree002/objfree002.cpp
index 114a610bbb3..462feb7b416 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ObjectFree/objfree002/objfree002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ObjectFree/objfree002/objfree002.cpp
@@ -27,10 +27,10 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
-#include "jni_tools.h"
+#include "nsk_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
+#include "jni_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe001/popframe001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe001/popframe001.cpp
index 38d8242fa7d..9b8381e9dcb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe001/popframe001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe001/popframe001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe002/popframe002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe002/popframe002.cpp
index 0e0da876c43..401a53d8026 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe002/popframe002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe002/popframe002.cpp
@@ -25,7 +25,7 @@
#include <stdlib.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe003/popframe003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe003/popframe003.cpp
index bdfad4808d7..7d9726a2dbf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe003/popframe003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe003/popframe003.cpp
@@ -25,7 +25,7 @@
#include <stdlib.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe004/popframe004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe004/popframe004.cpp
index 400927f0a27..642324f87b4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe004/popframe004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe004/popframe004.cpp
@@ -25,8 +25,8 @@
#include <stdlib.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
-#include "jvmti_common.h"
+#include "JVMTITools.hpp"
+#include "jvmti_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe005/popframe005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe005/popframe005.cpp
index 0a067071f0e..a4143f14e2a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe005/popframe005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe005/popframe005.cpp
@@ -25,8 +25,8 @@
#include <stdlib.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include <jvmti_tools.h>
-#include "JVMTITools.h"
+#include <jvmti_tools.hpp>
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe006/popframe006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe006/popframe006.cpp
index c00e5b7e55d..154e70e3c16 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe006/popframe006.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe006/popframe006.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe007/popframe007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe007/popframe007.cpp
index 55764f61739..a2e9716a513 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe007/popframe007.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe007/popframe007.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe008/popframe008.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe008/popframe008.cpp
index e1e8aae1520..209cd2be05e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe008/popframe008.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe008/popframe008.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe009/popframe009.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe009/popframe009.cpp
index cc68e67e1aa..faa4318f140 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe009/popframe009.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe009/popframe009.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe010/popframe010.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe010/popframe010.cpp
index 2068d1869ee..b9a8b431037 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe010/popframe010.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe010/popframe010.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe011/popframe011.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe011/popframe011.cpp
index ee761aafe12..0a61c485a65 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe011/popframe011.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/PopFrame/popframe011/popframe011.cpp
@@ -25,7 +25,7 @@
#include <stdlib.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter001/rawmonenter001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter001/rawmonenter001.cpp
index f0e8c91211b..4f02bc3fa58 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter001/rawmonenter001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter001/rawmonenter001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter002/rawmonenter002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter002/rawmonenter002.cpp
index 1be27f432ae..3744dd9d436 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter002/rawmonenter002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter002/rawmonenter002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter003/rawmonenter003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter003/rawmonenter003.cpp
index 138eae8cd49..4ebdbf2eb92 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter003/rawmonenter003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter003/rawmonenter003.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter004/rawmonenter004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter004/rawmonenter004.cpp
index 364cbfe60b0..8fd60c13121 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter004/rawmonenter004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorEnter/rawmonenter004/rawmonenter004.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit001/rawmonexit001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit001/rawmonexit001.cpp
index c5cd25185ae..50f4eeb4477 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit001/rawmonexit001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit001/rawmonexit001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit002/rawmonexit002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit002/rawmonexit002.cpp
index 00d5d55675a..12da226126f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit002/rawmonexit002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit002/rawmonexit002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit003/rawmonexit003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit003/rawmonexit003.cpp
index 5ada5c195bb..70f1f8f2db1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit003/rawmonexit003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit003/rawmonexit003.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit005/rawmonexit005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit005/rawmonexit005.cpp
index 253049d6385..fd056d74efa 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit005/rawmonexit005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorExit/rawmonexit005/rawmonexit005.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy001/rawmnntfy001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy001/rawmnntfy001.cpp
index fa51be46dbd..e727177607e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy001/rawmnntfy001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy001/rawmnntfy001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy002/rawmnntfy002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy002/rawmnntfy002.cpp
index eca766f29e9..f5a5ff41f05 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy002/rawmnntfy002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy002/rawmnntfy002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy003/rawmnntfy003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy003/rawmnntfy003.cpp
index 26475eb47a7..65258a6811b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy003/rawmnntfy003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy003/rawmnntfy003.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy004/rawmnntfy004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy004/rawmnntfy004.cpp
index 2ca2a2043a3..822fd63dfb6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy004/rawmnntfy004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotify/rawmnntfy004/rawmnntfy004.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall001/rawmnntfyall001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall001/rawmnntfyall001.cpp
index 4c4d9001b37..0415de825f9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall001/rawmnntfyall001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall001/rawmnntfyall001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall002/rawmnntfyall002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall002/rawmnntfyall002.cpp
index 05b1576eb66..7da2cd42545 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall002/rawmnntfyall002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall002/rawmnntfyall002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall003/rawmnntfyall003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall003/rawmnntfyall003.cpp
index 30cfeae544e..01f5810b3a7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall003/rawmnntfyall003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall003/rawmnntfyall003.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall004/rawmnntfyall004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall004/rawmnntfyall004.cpp
index e20d7f8dac3..4cce57edcf8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall004/rawmnntfyall004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorNotifyAll/rawmnntfyall004/rawmnntfyall004.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait001/rawmnwait001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait001/rawmnwait001.cpp
index 6c2481f5c65..05237468940 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait001/rawmnwait001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait001/rawmnwait001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait002/rawmnwait002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait002/rawmnwait002.cpp
index ed7e3cc2cda..37a206965e1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait002/rawmnwait002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait002/rawmnwait002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait003/rawmnwait003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait003/rawmnwait003.cpp
index ed6b16379ef..e81e7266d23 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait003/rawmnwait003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait003/rawmnwait003.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait004/rawmnwait004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait004/rawmnwait004.cpp
index 91d46a1c18c..76f27382123 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait004/rawmnwait004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait004/rawmnwait004.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait005/rawmnwait005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait005/rawmnwait005.cpp
index 02e24a5f275..b09490f3fa6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait005/rawmnwait005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RawMonitorWait/rawmnwait005/rawmnwait005.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/StressRedefine/stressRedefine.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/StressRedefine/stressRedefine.cpp
index 9c142b28ea1..0d407dee86c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/StressRedefine/stressRedefine.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/StressRedefine/stressRedefine.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <jvmti.h>
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass001/redefclass001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass001/redefclass001.cpp
index 98f506bc46e..54f3d456784 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass001/redefclass001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass001/redefclass001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <jvmti.h>
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass002/redefclass002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass002/redefclass002.cpp
index 08712cef641..e709de40e0d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass002/redefclass002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass002/redefclass002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <jvmti.h>
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass003/redefclass003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass003/redefclass003.cpp
index f4965cb55c9..d45bea4d043 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass003/redefclass003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass003/redefclass003.cpp
@@ -24,9 +24,9 @@
#include <stdio.h>
#include <string.h>
#include <jvmti.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass004/redefclass004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass004/redefclass004.cpp
index 0bc8942c7e5..c19fd9113eb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass004/redefclass004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass004/redefclass004.cpp
@@ -24,9 +24,9 @@
#include <stdio.h>
#include <string.h>
#include <jvmti.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass005/redefclass005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass005/redefclass005.cpp
index 77d36e05fe8..86af7ae9a58 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass005/redefclass005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass005/redefclass005.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <jvmti.h>
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass006/redefclass006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass006/redefclass006.cpp
index 15bf054e20c..57f12dc83fc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass006/redefclass006.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass006/redefclass006.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <jvmti.h>
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass008/redefclass008.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass008/redefclass008.cpp
index 262c50d3ea7..565b3a02f00 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass008/redefclass008.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass008/redefclass008.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <jvmti.h>
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass009/redefclass009.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass009/redefclass009.cpp
index bd7274c35c2..8c03608f480 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass009/redefclass009.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass009/redefclass009.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <jvmti.h>
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass010/redefclass010.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass010/redefclass010.cpp
index 50dbc52e3dd..a8abe779bba 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass010/redefclass010.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass010/redefclass010.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <jvmti.h>
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass011/redefclass011.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass011/redefclass011.cpp
index 0863ac1e41a..ed6a20429f5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass011/redefclass011.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass011/redefclass011.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass012/redefclass012.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass012/redefclass012.cpp
index 61749ca62ce..45d6bb234af 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass012/redefclass012.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass012/redefclass012.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass013/redefclass013.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass013/redefclass013.cpp
index 5ad518703c6..36396b4c2cf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass013/redefclass013.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass013/redefclass013.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass014/redefclass014.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass014/redefclass014.cpp
index a676b944133..e38de4903f3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass014/redefclass014.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass014/redefclass014.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass015/redefclass015.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass015/redefclass015.cpp
index cf936f71a03..7a47e55699c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass015/redefclass015.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass015/redefclass015.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass016/redefclass016.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass016/redefclass016.cpp
index 7a076bc3dd6..0682eaea6c5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass016/redefclass016.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass016/redefclass016.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass017/redefclass017.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass017/redefclass017.cpp
index 89810051210..77908ed1499 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass017/redefclass017.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass017/redefclass017.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass018/redefclass018.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass018/redefclass018.cpp
index f3fc7f4b3e3..044f23c6235 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass018/redefclass018.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass018/redefclass018.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass019/redefclass019.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass019/redefclass019.cpp
index f904e7b278d..d8ca1cbf4ea 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass019/redefclass019.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass019/redefclass019.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass020/redefclass020.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass020/redefclass020.cpp
index 5388dfd68bd..5f431995812 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass020/redefclass020.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass020/redefclass020.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass021/redefclass021.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass021/redefclass021.cpp
index 0fd0fe07dd1..233818a21da 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass021/redefclass021.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass021/redefclass021.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass022/redefclass022.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass022/redefclass022.cpp
index 242f2c5003d..93aa706a9cd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass022/redefclass022.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass022/redefclass022.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass023/redefclass023.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass023/redefclass023.cpp
index 96f54156016..d9bb42e8756 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass023/redefclass023.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass023/redefclass023.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass024/redefclass024.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass024/redefclass024.cpp
index b67124fadf2..becd61705c6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass024/redefclass024.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass024/redefclass024.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass025/redefclass025.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass025/redefclass025.cpp
index 78bc6e5dbcc..a008e284bfd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass025/redefclass025.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass025/redefclass025.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass026/redefclass026.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass026/redefclass026.cpp
index 9bdefdd07a8..91a61032a77 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass026/redefclass026.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass026/redefclass026.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass027/redefclass027.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass027/redefclass027.cpp
index 6a601f97f23..451480cb7f0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass027/redefclass027.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass027/redefclass027.cpp
@@ -25,8 +25,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
-#include "jni_tools.h"
+#include "JVMTITools.hpp"
+#include "jni_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass028/redefclass028.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass028/redefclass028.cpp
index 8072b360fa5..934e483da1d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass028/redefclass028.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass028/redefclass028.cpp
@@ -28,10 +28,10 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
+#include "nsk_tools.hpp"
#include "native_thread.hpp"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass029/redefclass029.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass029/redefclass029.cpp
index 30f9aa6f647..d2b4b720c55 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass029/redefclass029.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass029/redefclass029.cpp
@@ -28,10 +28,10 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
+#include "nsk_tools.hpp"
#include "native_thread.hpp"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass030/redefclass030.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass030/redefclass030.cpp
index 91a3c8a5714..35505044ef1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass030/redefclass030.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass030/redefclass030.cpp
@@ -28,10 +28,10 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
+#include "nsk_tools.hpp"
#include "native_thread.hpp"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass031/redefclass031.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass031/redefclass031.cpp
index 4acbf125cc9..af250e1e40a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass031/redefclass031.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RedefineClasses/redefclass031/redefclass031.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <jvmti.h>
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RelinquishCapabilities/relcaps001/relcaps001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RelinquishCapabilities/relcaps001/relcaps001.cpp
index 394c2c60d1a..34cb1e8615c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RelinquishCapabilities/relcaps001/relcaps001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RelinquishCapabilities/relcaps001/relcaps001.cpp
@@ -25,8 +25,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RelinquishCapabilities/relcaps002/relcaps002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RelinquishCapabilities/relcaps002/relcaps002.cpp
index 5f47cd01b95..8ed84ee549e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RelinquishCapabilities/relcaps002/relcaps002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RelinquishCapabilities/relcaps002/relcaps002.cpp
@@ -25,8 +25,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted.cpp
index 63fce380e23..43cfad13c64 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResourceExhausted/resexhausted.cpp
@@ -24,7 +24,7 @@
#include <stdlib.h>
#include <string.h>
#include <errno.h>
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#include "agent_common.hpp"
#define PASSED 0
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThread/resumethrd001/resumethrd001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThread/resumethrd001/resumethrd001.cpp
index 86f20a8cfc7..435232d367c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThread/resumethrd001/resumethrd001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThread/resumethrd001/resumethrd001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThread/resumethrd002/resumethrd002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThread/resumethrd002/resumethrd002.cpp
index 947e4fa8db6..7bc34d71bdc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThread/resumethrd002/resumethrd002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThread/resumethrd002/resumethrd002.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThreadList/resumethrdlst001/resumethrdlst001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThreadList/resumethrdlst001/resumethrdlst001.cpp
index b75ce98d039..3a2374199d9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThreadList/resumethrdlst001/resumethrdlst001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThreadList/resumethrdlst001/resumethrdlst001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThreadList/resumethrdlst002/resumethrdlst002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThreadList/resumethrdlst002/resumethrdlst002.cpp
index 9438fc45be6..0461cc52f85 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThreadList/resumethrdlst002/resumethrdlst002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/ResumeThreadList/resumethrdlst002/resumethrdlst002.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform002/retransform002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform002/retransform002.cpp
index 65e46b4f0de..c5801d24e79 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform002/retransform002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform002/retransform002.cpp
@@ -25,8 +25,8 @@
#include <stdlib.h>
#include <jvmti.h>
#include "agent_common.hpp"
-#include <jvmti_tools.h>
-#include "JVMTITools.h"
+#include <jvmti_tools.hpp>
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform003/retransform003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform003/retransform003.cpp
index 72408ffaeb1..cda8481533d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform003/retransform003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform003/retransform003.cpp
@@ -26,8 +26,8 @@
#include <stdlib.h>
#include <jvmti.h>
#include "agent_common.hpp"
-#include <jvmti_tools.h>
-#include "JVMTITools.h"
+#include <jvmti_tools.hpp>
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform004/retransform004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform004/retransform004.cpp
index 0ed219b0ad3..6d400b7df29 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform004/retransform004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RetransformClasses/retransform004/retransform004.cpp
@@ -26,8 +26,8 @@
#include <stdlib.h>
#include <jvmti.h>
#include "agent_common.hpp"
-#include <jvmti_tools.h>
-#include "JVMTITools.h"
+#include <jvmti_tools.hpp>
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RunAgentThread/agentthr001/agentthr001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RunAgentThread/agentthr001/agentthr001.cpp
index a354f0d8a9d..60248189773 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RunAgentThread/agentthr001/agentthr001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RunAgentThread/agentthr001/agentthr001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RunAgentThread/agentthr002/agentthr002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RunAgentThread/agentthr002/agentthr002.cpp
index 574b873d07d..8c0ea9be4a0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RunAgentThread/agentthr002/agentthr002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RunAgentThread/agentthr002/agentthr002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RunAgentThread/agentthr003/agentthr003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RunAgentThread/agentthr003/agentthr003.cpp
index 1a2db084ff1..61d1729e542 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RunAgentThread/agentthr003/agentthr003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/RunAgentThread/agentthr003/agentthr003.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk002/setbrk002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk002/setbrk002.cpp
index a5672997c50..835ae6d9ec0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk002/setbrk002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk002/setbrk002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk003/setbrk003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk003/setbrk003.cpp
index e678a85bb80..117bc4f12e5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk003/setbrk003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk003/setbrk003.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk005/setbrk005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk005/setbrk005.cpp
index 07d64f0beea..ece5a09fea4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk005/setbrk005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk005/setbrk005.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk007/setbrk007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk007/setbrk007.cpp
index 3256f1fbac4..1cd65eee9cd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk007/setbrk007.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk007/setbrk007.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk008/setbrk008.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk008/setbrk008.cpp
index 47208a1e90c..db43f5675ff 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk008/setbrk008.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetBreakpoint/setbrk008/setbrk008.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor001/setenvstor001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor001/setenvstor001.cpp
index 328f0689b8b..6244dec42e5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor001/setenvstor001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor001/setenvstor001.cpp
@@ -25,8 +25,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor002/setenvstor002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor002/setenvstor002.cpp
index ba252ee1bc8..f870c0a0deb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor002/setenvstor002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor002/setenvstor002.cpp
@@ -25,8 +25,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor003/setenvstor003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor003/setenvstor003.cpp
index eeb27146ac6..e907967a2fa 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor003/setenvstor003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor003/setenvstor003.cpp
@@ -25,8 +25,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb001/setevntcallb001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb001/setevntcallb001.cpp
index 06a0cc4cff7..1f7e06b04a7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb001/setevntcallb001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb001/setevntcallb001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb002/setevntcallb002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb002/setevntcallb002.cpp
index 909d72160b8..f35f623e66b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb002/setevntcallb002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb002/setevntcallb002.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb003/setevntcallb003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb003/setevntcallb003.cpp
index 3b38cc613d3..daf2ffdc6fb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb003/setevntcallb003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventCallbacks/setevntcallb003/setevntcallb003.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventNotificationMode/setnotif001/setnotif001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventNotificationMode/setnotif001/setnotif001.cpp
index 955a0aa9759..fd54a60fe5a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventNotificationMode/setnotif001/setnotif001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEventNotificationMode/setnotif001/setnotif001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetExtensionEventCallback/setextevent001/setextevent001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetExtensionEventCallback/setextevent001/setextevent001.cpp
index c672c74285e..ec1e3d21276 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetExtensionEventCallback/setextevent001/setextevent001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetExtensionEventCallback/setextevent001/setextevent001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw001/setfldw001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw001/setfldw001.cpp
index e6c59c75a06..57286ce78a0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw001/setfldw001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw001/setfldw001.cpp
@@ -26,7 +26,7 @@
#include <ctype.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw002/setfldw002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw002/setfldw002.cpp
index c2e4247a075..557412d7051 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw002/setfldw002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw002/setfldw002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw003/setfldw003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw003/setfldw003.cpp
index e89c1d863cf..f77a95c81d0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw003/setfldw003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw003/setfldw003.cpp
@@ -26,7 +26,7 @@
#include <inttypes.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw004/setfldw004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw004/setfldw004.cpp
index b5c1e944672..c6f7bc9ddb1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw004/setfldw004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw004/setfldw004.cpp
@@ -26,7 +26,7 @@
#include <inttypes.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw005/setfldw005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw005/setfldw005.cpp
index 43339333c46..7222d2a73c6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw005/setfldw005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw005/setfldw005.cpp
@@ -26,7 +26,7 @@
#include <inttypes.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw006/setfldw006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw006/setfldw006.cpp
index 1ebd4b716f8..defe0959f16 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw006/setfldw006.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldAccessWatch/setfldw006/setfldw006.cpp
@@ -26,7 +26,7 @@
#include <inttypes.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw001/setfmodw001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw001/setfmodw001.cpp
index 1f55e593b14..28851bc6838 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw001/setfmodw001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw001/setfmodw001.cpp
@@ -26,7 +26,7 @@
#include <ctype.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw002/setfmodw002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw002/setfmodw002.cpp
index 93ca7c9ddb3..02ed16ce347 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw002/setfmodw002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw002/setfmodw002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw003/setfmodw003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw003/setfmodw003.cpp
index b35ceba30fd..5bfcbe73a4e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw003/setfmodw003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw003/setfmodw003.cpp
@@ -26,7 +26,7 @@
#include <inttypes.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw004/setfmodw004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw004/setfmodw004.cpp
index d5c6d480168..af545b823b4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw004/setfmodw004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw004/setfmodw004.cpp
@@ -26,7 +26,7 @@
#include <inttypes.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw005/setfmodw005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw005/setfmodw005.cpp
index cf095d556e8..8a18391a713 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw005/setfmodw005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw005/setfmodw005.cpp
@@ -26,7 +26,7 @@
#include <inttypes.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw006/setfmodw006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw006/setfmodw006.cpp
index 7caea17a87a..18191588a47 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw006/setfmodw006.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetFieldModificationWatch/setfmodw006/setfmodw006.cpp
@@ -26,7 +26,7 @@
#include <inttypes.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetJNIFunctionTable/setjniftab001/setjniftab001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetJNIFunctionTable/setjniftab001/setjniftab001.cpp
index 97e3ccef0ae..2fdb6e3193f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetJNIFunctionTable/setjniftab001/setjniftab001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetJNIFunctionTable/setjniftab001/setjniftab001.cpp
@@ -29,7 +29,7 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
#include "native_thread.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetJNIFunctionTable/setjniftab002/setjniftab002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetJNIFunctionTable/setjniftab002/setjniftab002.cpp
index e566e1f2e2c..6d296ec531f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetJNIFunctionTable/setjniftab002/setjniftab002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetJNIFunctionTable/setjniftab002/setjniftab002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal001/setlocal001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal001/setlocal001.cpp
index fa51baa5f9c..8193058eba7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal001/setlocal001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal001/setlocal001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal002/setlocal002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal002/setlocal002.cpp
index d1fb791ff42..1a7b412061c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal002/setlocal002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal002/setlocal002.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal003/setlocal003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal003/setlocal003.cpp
index 91720a49896..793f22ec40f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal003/setlocal003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal003/setlocal003.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal004/setlocal004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal004/setlocal004.cpp
index 9442c03be87..37598107c45 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal004/setlocal004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetLocalVariable/setlocal004/setlocal004.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix001/SetNativeMethodPrefix001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix001/SetNativeMethodPrefix001.cpp
index 2d2cbbc3d1f..61420296b65 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix001/SetNativeMethodPrefix001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix001/SetNativeMethodPrefix001.cpp
@@ -25,10 +25,10 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
-#include "jni_tools.h"
+#include "nsk_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
+#include "jni_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix002/SetNativeMethodPrefix002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix002/SetNativeMethodPrefix002.cpp
index a667badf603..2749d15d070 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix002/SetNativeMethodPrefix002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix002/SetNativeMethodPrefix002.cpp
@@ -25,10 +25,10 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
-#include "jni_tools.h"
+#include "nsk_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
+#include "jni_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix002/SetNativeMethodPrefix002Main.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix002/SetNativeMethodPrefix002Main.cpp
index e491f439367..75b4fe2affd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix002/SetNativeMethodPrefix002Main.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetNativeMethodPrefix/SetNativeMethodPrefix002/SetNativeMethodPrefix002Main.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -24,10 +24,10 @@
#include <string.h>
#include <jvmti.h>
-#include "nsk_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
-#include "jni_tools.h"
+#include "nsk_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
+#include "jni_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetSystemProperty/setsysprop002/setsysprop002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetSystemProperty/setsysprop002/setsysprop002.cpp
index 1af7de39bb8..eef3388696e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetSystemProperty/setsysprop002/setsysprop002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetSystemProperty/setsysprop002/setsysprop002.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetSystemProperty/setsysprop003/setsysprop003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetSystemProperty/setsysprop003/setsysprop003.cpp
index 73fe3e52e3e..856e4208ee1 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetSystemProperty/setsysprop003/setsysprop003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetSystemProperty/setsysprop003/setsysprop003.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetTag/settag001/settag001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetTag/settag001/settag001.cpp
index add34f000e9..e5929d5152a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetTag/settag001/settag001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetTag/settag001/settag001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor001/setthrdstor001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor001/setthrdstor001.cpp
index 995c7c46a75..83e28a9b1ba 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor001/setthrdstor001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor001/setthrdstor001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor002/setthrdstor002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor002/setthrdstor002.cpp
index e8be6f316a3..c59b256bb1a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor002/setthrdstor002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor002/setthrdstor002.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor003/setthrdstor003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor003/setthrdstor003.cpp
index 867903f8d5d..375378687e3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor003/setthrdstor003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetThreadLocalStorage/setthrdstor003/setthrdstor003.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetVerboseFlag/setvrbflag001/setvrbflag001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetVerboseFlag/setvrbflag001/setvrbflag001.cpp
index 12d64b55a65..5582151a257 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetVerboseFlag/setvrbflag001/setvrbflag001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetVerboseFlag/setvrbflag001/setvrbflag001.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetVerboseFlag/setvrbflag002/setvrbflag002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetVerboseFlag/setvrbflag002/setvrbflag002.cpp
index 9393cbddfa1..9d134e0a3c3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetVerboseFlag/setvrbflag002/setvrbflag002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetVerboseFlag/setvrbflag002/setvrbflag002.cpp
@@ -22,9 +22,9 @@
*/
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/StopThread/stopthrd006/stopthrd006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/StopThread/stopthrd006/stopthrd006.cpp
index e757611384d..16d88f7b891 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/StopThread/stopthrd006/stopthrd006.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/StopThread/stopthrd006/stopthrd006.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/StopThread/stopthrd007/stopthrd007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/StopThread/stopthrd007/stopthrd007.cpp
index 1f3b64724c3..487b1b2f012 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/StopThread/stopthrd007/stopthrd007.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/StopThread/stopthrd007/stopthrd007.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThread/suspendthrd001/suspendthrd001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThread/suspendthrd001/suspendthrd001.cpp
index c6068682942..e340c488d62 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThread/suspendthrd001/suspendthrd001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThread/suspendthrd001/suspendthrd001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThread/suspendthrd002/suspendthrd002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThread/suspendthrd002/suspendthrd002.cpp
index 0027d2dd2f3..01145556a95 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThread/suspendthrd002/suspendthrd002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThread/suspendthrd002/suspendthrd002.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThread/suspendthrd003/suspendthrd003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThread/suspendthrd003/suspendthrd003.cpp
index f4b5d30751b..bd3226739f7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThread/suspendthrd003/suspendthrd003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThread/suspendthrd003/suspendthrd003.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThreadList/suspendthrdlst001/suspendthrdlst001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThreadList/suspendthrdlst001/suspendthrdlst001.cpp
index fc71cd8b2f8..4a5817c25de 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThreadList/suspendthrdlst001/suspendthrdlst001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThreadList/suspendthrdlst001/suspendthrdlst001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThreadList/suspendthrdlst002/suspendthrdlst002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThreadList/suspendthrdlst002/suspendthrdlst002.cpp
index 2f7f69f9123..2868fbf5439 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThreadList/suspendthrdlst002/suspendthrdlst002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/SuspendThreadList/suspendthrdlst002/suspendthrdlst002.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/VMDeath/vmdeath001/vmdeath001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/VMDeath/vmdeath001/vmdeath001.cpp
index 3b581a96671..9f692a799ac 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/VMDeath/vmdeath001/vmdeath001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/VMDeath/vmdeath001/vmdeath001.cpp
@@ -29,9 +29,9 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "nsk_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/VMInit/vminit001/vminit001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/VMInit/vminit001/vminit001.cpp
index d4fc26dea45..4e22da84a5d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/VMInit/vminit001/vminit001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/VMInit/vminit001/vminit001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP01/ap01t001/ap01t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP01/ap01t001/ap01t001.cpp
index 427e107dc32..b0795077bd2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP01/ap01t001/ap01t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP01/ap01t001/ap01t001.cpp
@@ -27,10 +27,10 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
-#include "jni_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "nsk_tools.hpp"
+#include "jni_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP02/ap02t001/ap02t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP02/ap02t001/ap02t001.cpp
index 541144c4546..11f3f63751e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP02/ap02t001/ap02t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP02/ap02t001/ap02t001.cpp
@@ -26,10 +26,10 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
-#include "jni_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "nsk_tools.hpp"
+#include "jni_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP03/ap03t001/ap03t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP03/ap03t001/ap03t001.cpp
index d24cf193d15..e50e1ff537b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP03/ap03t001/ap03t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP03/ap03t001/ap03t001.cpp
@@ -26,10 +26,10 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
-#include "jni_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "nsk_tools.hpp"
+#include "jni_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t001/ap04t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t001/ap04t001.cpp
index 163e4d40cd0..e9eaf32a6bc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t001/ap04t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t001/ap04t001.cpp
@@ -26,10 +26,10 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
-#include "jni_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "nsk_tools.hpp"
+#include "jni_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t002/ap04t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t002/ap04t002.cpp
index 7e36fb72bb6..dd983b0e918 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t002/ap04t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t002/ap04t002.cpp
@@ -26,10 +26,10 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
-#include "jni_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "nsk_tools.hpp"
+#include "jni_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t003/ap04t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t003/ap04t003.cpp
index dab0d59e475..b596cdda2d3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t003/ap04t003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP04/ap04t003/ap04t003.cpp
@@ -26,10 +26,10 @@
#include <jvmti.h>
#include "agent_common.hpp"
#include "ExceptionCheckingJniEnv.hpp"
-#include "nsk_tools.h"
-#include "jni_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "nsk_tools.hpp"
+#include "jni_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP05/ap05t001/ap05t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP05/ap05t001/ap05t001.cpp
index 2c56f5f6423..4d233dcab4f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP05/ap05t001/ap05t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP05/ap05t001/ap05t001.cpp
@@ -26,10 +26,10 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
-#include "jni_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "nsk_tools.hpp"
+#include "jni_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP05/ap05t002/ap05t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP05/ap05t002/ap05t002.cpp
index b02a3269b87..3378d836886 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP05/ap05t002/ap05t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP05/ap05t002/ap05t002.cpp
@@ -26,10 +26,10 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
-#include "jni_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "nsk_tools.hpp"
+#include "jni_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP06/ap06t001/ap06t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP06/ap06t001/ap06t001.cpp
index 9f61e8857ff..d720267675c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP06/ap06t001/ap06t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP06/ap06t001/ap06t001.cpp
@@ -26,10 +26,10 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
-#include "jni_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "nsk_tools.hpp"
+#include "jni_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP07/ap07t001/ap07t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP07/ap07t001/ap07t001.cpp
index 64c4660160d..d44092febdd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP07/ap07t001/ap07t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP07/ap07t001/ap07t001.cpp
@@ -26,10 +26,10 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
-#include "jni_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "nsk_tools.hpp"
+#include "jni_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP07/ap07t002/ap07t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP07/ap07t002/ap07t002.cpp
index 1cda6ecdd56..9986c6b191a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP07/ap07t002/ap07t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP07/ap07t002/ap07t002.cpp
@@ -26,10 +26,10 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
-#include "jni_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "nsk_tools.hpp"
+#include "jni_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP09/ap09t001/ap09t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP09/ap09t001/ap09t001.cpp
index 38cd09ba78b..aa429f46baf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP09/ap09t001/ap09t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP09/ap09t001/ap09t001.cpp
@@ -26,10 +26,10 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
-#include "jni_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "nsk_tools.hpp"
+#include "jni_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP10/ap10t001/ap10t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP10/ap10t001/ap10t001.cpp
index 3d74fa547cb..cfa75bb2f3d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP10/ap10t001/ap10t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP10/ap10t001/ap10t001.cpp
@@ -26,9 +26,9 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "nsk_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP11/ap11t001/ap11t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP11/ap11t001/ap11t001.cpp
index e2141b0f58c..b47b4c6a76e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP11/ap11t001/ap11t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP11/ap11t001/ap11t001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP12/ap12t001/ap12t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP12/ap12t001/ap12t001.cpp
index b55e20c7894..2f5e46f7ec7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP12/ap12t001/ap12t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/allocation/AP12/ap12t001/ap12t001.cpp
@@ -27,10 +27,10 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
-#include "jni_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "nsk_tools.hpp"
+#include "jni_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI01/bi01t001/bi01t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI01/bi01t001/bi01t001.cpp
index bdd53e18378..6b3df432d5e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI01/bi01t001/bi01t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI01/bi01t001/bi01t001.cpp
@@ -25,8 +25,8 @@
#include "jvmti.h"
#include "agent_common.hpp"
#include "ExceptionCheckingJniEnv.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI01/bi01t002/bi01t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI01/bi01t002/bi01t002.cpp
index aa9ce5eaa0e..71b8b62e9da 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI01/bi01t002/bi01t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI01/bi01t002/bi01t002.cpp
@@ -25,8 +25,8 @@
#include "jvmti.h"
#include "agent_common.hpp"
#include "ExceptionCheckingJniEnv.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI02/bi02t001/bi02t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI02/bi02t001/bi02t001.cpp
index 07ee6e76074..ea558bc0cd4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI02/bi02t001/bi02t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI02/bi02t001/bi02t001.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI02/bi02t002/bi02t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI02/bi02t002/bi02t002.cpp
index 049a9e65cee..403c199c8d5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI02/bi02t002/bi02t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI02/bi02t002/bi02t002.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI03/bi03t001/bi03t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI03/bi03t001/bi03t001.cpp
index ee6b8772a58..dddc47377ca 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI03/bi03t001/bi03t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI03/bi03t001/bi03t001.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI03/bi03t002/bi03t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI03/bi03t002/bi03t002.cpp
index d9d5ee8b1f2..e681eeaab9b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI03/bi03t002/bi03t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI03/bi03t002/bi03t002.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI04/bi04t002/bi04t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI04/bi04t002/bi04t002.cpp
index c40934a0c78..17733d4ba54 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI04/bi04t002/bi04t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/bcinstr/BI04/bi04t002/bi04t002.cpp
@@ -25,8 +25,8 @@
#include "jvmti.h"
#include "agent_common.hpp"
#include "ExceptionCheckingJniEnv.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t001/cm01t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t001/cm01t001.cpp
index a52aa847985..7845cac2086 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t001/cm01t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t001/cm01t001.cpp
@@ -23,9 +23,9 @@
#include <stdio.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t002/cm01t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t002/cm01t002.cpp
index e3cd8b665d5..c45392500e5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t002/cm01t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t002/cm01t002.cpp
@@ -23,9 +23,9 @@
#include <stdio.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t003/cm01t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t003/cm01t003.cpp
index e96b34d137d..02d50b4819c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t003/cm01t003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t003/cm01t003.cpp
@@ -23,9 +23,9 @@
#include <stdio.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t004/cm01t004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t004/cm01t004.cpp
index 48716fa95c0..570c12f7073 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t004/cm01t004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t004/cm01t004.cpp
@@ -23,9 +23,9 @@
#include <stdio.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t005/cm01t005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t005/cm01t005.cpp
index 2e56ba954e2..ae806ed9cb7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t005/cm01t005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t005/cm01t005.cpp
@@ -23,9 +23,9 @@
#include <stdio.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t006/cm01t006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t006/cm01t006.cpp
index 43c81676684..2bd74172902 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t006/cm01t006.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t006/cm01t006.cpp
@@ -23,9 +23,9 @@
#include <stdio.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t007/cm01t007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t007/cm01t007.cpp
index 65f24b3f63c..6c6e1b9d7e2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t007/cm01t007.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t007/cm01t007.cpp
@@ -23,9 +23,9 @@
#include <stdio.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t008/cm01t008.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t008/cm01t008.cpp
index 0dd52d8b193..8348698b2bb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t008/cm01t008.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t008/cm01t008.cpp
@@ -23,9 +23,9 @@
#include <stdio.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t009/cm01t009.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t009/cm01t009.cpp
index 97444e7fd22..eb843879ceb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t009/cm01t009.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t009/cm01t009.cpp
@@ -23,9 +23,9 @@
#include <stdio.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t010/cm01t010.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t010/cm01t010.cpp
index cecc241a1ba..507012417c5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t010/cm01t010.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t010/cm01t010.cpp
@@ -23,9 +23,9 @@
#include <stdio.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t011/cm01t011.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t011/cm01t011.cpp
index 5c3ad40d1db..d3843d9fbfa 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t011/cm01t011.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t011/cm01t011.cpp
@@ -23,9 +23,9 @@
#include <stdio.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t012/cm01t012.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t012/cm01t012.cpp
index 5d0c3b148ff..c72f4ecacd3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t012/cm01t012.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t012/cm01t012.cpp
@@ -23,9 +23,9 @@
#include <stdio.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t013/cm01t013.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t013/cm01t013.cpp
index 8fbd33e0d70..7edbd56f444 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t013/cm01t013.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t013/cm01t013.cpp
@@ -23,9 +23,9 @@
#include <stdio.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t014/cm01t014.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t014/cm01t014.cpp
index 701c63e3111..5abbc391dbb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t014/cm01t014.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t014/cm01t014.cpp
@@ -23,9 +23,9 @@
#include <stdio.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t015/cm01t015.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t015/cm01t015.cpp
index adc36f958cd..a1c2d712892 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t015/cm01t015.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t015/cm01t015.cpp
@@ -23,9 +23,9 @@
#include <stdio.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t016/cm01t016.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t016/cm01t016.cpp
index 4f4b712164f..40728346f18 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t016/cm01t016.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t016/cm01t016.cpp
@@ -23,9 +23,9 @@
#include <stdio.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t017/cm01t017.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t017/cm01t017.cpp
index 3182e7f571a..f43dae8772f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t017/cm01t017.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t017/cm01t017.cpp
@@ -23,9 +23,9 @@
#include <stdio.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t018/cm01t018.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t018/cm01t018.cpp
index f544f313772..380a5516243 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t018/cm01t018.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t018/cm01t018.cpp
@@ -23,9 +23,9 @@
#include <stdio.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t019/cm01t019.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t019/cm01t019.cpp
index 3690b7f06f9..5e55adfa63d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t019/cm01t019.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t019/cm01t019.cpp
@@ -23,9 +23,9 @@
#include <stdio.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t020/cm01t020.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t020/cm01t020.cpp
index 5034bffae00..0eea0f25f8f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t020/cm01t020.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t020/cm01t020.cpp
@@ -23,9 +23,9 @@
#include <stdio.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t021/cm01t021.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t021/cm01t021.cpp
index a212fe4a479..72148eafcc0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t021/cm01t021.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM01/cm01t021/cm01t021.cpp
@@ -23,9 +23,9 @@
#include <stdio.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM02/cm02t001/cm02t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM02/cm02t001/cm02t001.cpp
index d39cfe885f8..f9f5516fd96 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM02/cm02t001/cm02t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM02/cm02t001/cm02t001.cpp
@@ -23,9 +23,9 @@
#include <stdio.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM03/cm03t001/cm03t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM03/cm03t001/cm03t001.cpp
index 2c4aac9742a..67cd9ddd976 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM03/cm03t001/cm03t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/capability/CM03/cm03t001/cm03t001.cpp
@@ -23,9 +23,9 @@
#include <stdio.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC01/tc01t001/tc01t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC01/tc01t001/tc01t001.cpp
index aa279374966..a720b90c1f2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC01/tc01t001/tc01t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC01/tc01t001/tc01t001.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC02/tc02t001/tc02t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC02/tc02t001/tc02t001.cpp
index a6312dda8ab..39779183c04 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC02/tc02t001/tc02t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC02/tc02t001/tc02t001.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC03/tc03t001/tc03t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC03/tc03t001/tc03t001.cpp
index e2d2598b717..ff7d346d237 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC03/tc03t001/tc03t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC03/tc03t001/tc03t001.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC03/tc03t002/tc03t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC03/tc03t002/tc03t002.cpp
index d9f85f9620b..11c74e3a9e2 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC03/tc03t002/tc03t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC03/tc03t002/tc03t002.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC04/tc04t001/tc04t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC04/tc04t001/tc04t001.cpp
index 5b92f93cea3..80117ea70fd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC04/tc04t001/tc04t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC04/tc04t001/tc04t001.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC05/tc05t001/tc05t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC05/tc05t001/tc05t001.cpp
index b60f302cca4..9680d01847a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC05/tc05t001/tc05t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/contention/TC05/tc05t001/tc05t001.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM01/em01t001/em01t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM01/em01t001/em01t001.cpp
index f69c15276eb..cfc70e44e96 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM01/em01t001/em01t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM01/em01t001/em01t001.cpp
@@ -25,9 +25,9 @@
#include "jvmti.h"
#include "agent_common.hpp"
#include "ExceptionCheckingJniEnv.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
-#include "JVMTITools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM01/em01t002/em01t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM01/em01t002/em01t002.cpp
index 9aea4163380..7a65d9f0453 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM01/em01t002/em01t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM01/em01t002/em01t002.cpp
@@ -25,9 +25,9 @@
#include "jvmti.h"
#include "agent_common.hpp"
#include "ExceptionCheckingJniEnv.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
-#include "JVMTITools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t001/em02t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t001/em02t001.cpp
index 08c09ab17e2..06bdd4c66b0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t001/em02t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t001/em02t001.cpp
@@ -25,9 +25,9 @@
#include "jvmti.h"
#include "agent_common.hpp"
#include "ExceptionCheckingJniEnv.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
-#include "JVMTITools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t002/em02t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t002/em02t002.cpp
index 913a37fba4d..947d6b9b178 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t002/em02t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t002/em02t002.cpp
@@ -24,9 +24,9 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
-#include "JVMTITools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t003/em02t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t003/em02t003.cpp
index 574410aa9aa..88fb29e9c17 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t003/em02t003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t003/em02t003.cpp
@@ -24,9 +24,9 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
-#include "JVMTITools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t004/em02t004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t004/em02t004.cpp
index 80b1522d93c..d852ec2df2c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t004/em02t004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t004/em02t004.cpp
@@ -24,9 +24,9 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
-#include "JVMTITools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t005/em02t005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t005/em02t005.cpp
index 9f26e4e59b7..1a502487fba 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t005/em02t005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t005/em02t005.cpp
@@ -24,9 +24,9 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
-#include "JVMTITools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t006/em02t006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t006/em02t006.cpp
index 5510e29e6f8..1c6ccd98520 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t006/em02t006.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t006/em02t006.cpp
@@ -24,9 +24,9 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
-#include "JVMTITools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t007/em02t007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t007/em02t007.cpp
index 6d747f378bd..a288a75a5ed 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t007/em02t007.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t007/em02t007.cpp
@@ -24,9 +24,9 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
-#include "JVMTITools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t008/em02t008.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t008/em02t008.cpp
index f185e39b022..4d4b73b12a6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t008/em02t008.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t008/em02t008.cpp
@@ -24,9 +24,9 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
-#include "JVMTITools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t009/em02t009.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t009/em02t009.cpp
index 2b89909c1e0..1e52bd762c5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t009/em02t009.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t009/em02t009.cpp
@@ -24,9 +24,9 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
-#include "JVMTITools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t010/em02t010.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t010/em02t010.cpp
index 228d82a00e8..a1cb6acec4f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t010/em02t010.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t010/em02t010.cpp
@@ -25,9 +25,9 @@
#include "jvmti.h"
#include "agent_common.hpp"
#include "ExceptionCheckingJniEnv.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
-#include "JVMTITools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t011/em02t011.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t011/em02t011.cpp
index 08c898a83cf..24873548a07 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t011/em02t011.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t011/em02t011.cpp
@@ -25,9 +25,9 @@
#include "jvmti.h"
#include "agent_common.hpp"
#include "ExceptionCheckingJniEnv.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
-#include "JVMTITools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t012/em02t012.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t012/em02t012.cpp
index 6d0d2c67ce8..402ffd638ef 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t012/em02t012.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM02/em02t012/em02t012.cpp
@@ -25,9 +25,9 @@
#include "jvmti.h"
#include "agent_common.hpp"
#include "ExceptionCheckingJniEnv.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
-#include "JVMTITools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM04/em04t001/em04t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM04/em04t001/em04t001.cpp
index edbbf37b1a5..a7244db3441 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM04/em04t001/em04t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM04/em04t001/em04t001.cpp
@@ -25,9 +25,9 @@
#include <stdlib.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
-#include "JVMTITools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
+#include "JVMTITools.hpp"
#include "nsk_list.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM05/em05t001/em05t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM05/em05t001/em05t001.cpp
index 3a67969199e..191bdcde960 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM05/em05t001/em05t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM05/em05t001/em05t001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM05/em05t002/em05t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM05/em05t002/em05t002.cpp
index 6e074572d6d..aa4563349c0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM05/em05t002/em05t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM05/em05t002/em05t002.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM06/em06t001/em06t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM06/em06t001/em06t001.cpp
index 47ddac07781..c1616e864ed 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM06/em06t001/em06t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM06/em06t001/em06t001.cpp
@@ -24,9 +24,9 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
-#include "JVMTITools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM07/em07t001/em07t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM07/em07t001/em07t001.cpp
index 04a06839b75..d2f3a2fde3c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM07/em07t001/em07t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM07/em07t001/em07t001.cpp
@@ -24,9 +24,9 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
-#include "JVMTITools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM07/em07t002/em07t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM07/em07t002/em07t002.cpp
index 8d5acc3508b..86d5f5de9f7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM07/em07t002/em07t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/events/EM07/em07t002/em07t002.cpp
@@ -25,9 +25,9 @@
#include <stdlib.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
-#include "JVMTITools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
+#include "JVMTITools.hpp"
#include "nsk_list.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/extension/EX03/ex03t001/ex03t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/extension/EX03/ex03t001/ex03t001.cpp
index 29715cfa43a..e9325b6342c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/extension/EX03/ex03t001/ex03t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/extension/EX03/ex03t001/ex03t001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF01/gf01t001/gf01t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF01/gf01t001/gf01t001.cpp
index 9828e1eaf10..f8549ba4c87 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF01/gf01t001/gf01t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF01/gf01t001/gf01t001.cpp
@@ -29,9 +29,9 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "nsk_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF04/gf04t001/gf04t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF04/gf04t001/gf04t001.cpp
index dc16e3e7f63..2a0116d3e55 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF04/gf04t001/gf04t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF04/gf04t001/gf04t001.cpp
@@ -25,8 +25,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF06/gf06t001/gf06t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF06/gf06t001/gf06t001.cpp
index 9fb579b8c09..55c5fb89816 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF06/gf06t001/gf06t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF06/gf06t001/gf06t001.cpp
@@ -25,8 +25,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF08/gf08t001/gf08t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF08/gf08t001/gf08t001.cpp
index 01b60923c1f..3d84b69adca 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF08/gf08t001/gf08t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF08/gf08t001/gf08t001.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF08/gf08t002/gf08t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF08/gf08t002/gf08t002.cpp
index efe58cf62f9..db242bd7122 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF08/gf08t002/gf08t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF08/gf08t002/gf08t002.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF08/gf08t003/gf08t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF08/gf08t003/gf08t003.cpp
index 05a1cda01c2..54b73e891b0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF08/gf08t003/gf08t003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/general_functions/GF08/gf08t003/gf08t003.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS103/hs103t002/hs103t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS103/hs103t002/hs103t002.cpp
index 34ee8dc6d37..4a5de9ea92e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS103/hs103t002/hs103t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS103/hs103t002/hs103t002.cpp
@@ -29,9 +29,9 @@
#include <jvmti.h>
#include "agent_common.hpp"
#include <string.h>
-#include "jni_tools.h"
-#include "jvmti_tools.h"
-#include "JVMTITools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS104/hs104t001/hs104t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS104/hs104t001/hs104t001.cpp
index c4341c689a7..1dc0396299a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS104/hs104t001/hs104t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS104/hs104t001/hs104t001.cpp
@@ -24,8 +24,8 @@
#include <jvmti.h>
#include "agent_common.hpp"
#include <string.h>
-#include "jvmti_tools.h"
-#include "JVMTITools.h"
+#include "jvmti_tools.hpp"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS104/hs104t002/hs104t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS104/hs104t002/hs104t002.cpp
index c7e10f6f8fe..f83a51fa33f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS104/hs104t002/hs104t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS104/hs104t002/hs104t002.cpp
@@ -24,9 +24,9 @@
#include <jvmti.h>
#include "agent_common.hpp"
#include <string.h>
-#include "jvmti_tools.h"
-#include "JVMTITools.h"
-#include "jni_tools.h"
+#include "jvmti_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jni_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t001/hs201t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t001/hs201t001.cpp
index 652a12f1b0e..ee511063826 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t001/hs201t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t001/hs201t001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t002/hs201t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t002/hs201t002.cpp
index b2a2ee5e193..62033fde30b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t002/hs201t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t002/hs201t002.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t003/hs201t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t003/hs201t003.cpp
index c515a96022f..6c6caa033c3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t003/hs201t003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t003/hs201t003.cpp
@@ -27,10 +27,10 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
+#include "nsk_tools.hpp"
#include "native_thread.hpp"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS202/hs202t001/hs202t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS202/hs202t001/hs202t001.cpp
index 2be9d32adc0..e3f15e233fb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS202/hs202t001/hs202t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS202/hs202t001/hs202t001.cpp
@@ -24,8 +24,8 @@
#include <jvmti.h>
#include "agent_common.hpp"
#include <string.h>
-#include "jvmti_tools.h"
-#include "JVMTITools.h"
+#include "jvmti_tools.hpp"
+#include "JVMTITools.hpp"
/*
hs202t001:
1. Set breakpoints in several methods when Object.wait(),
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS202/hs202t002/hs202t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS202/hs202t002/hs202t002.cpp
index 681e8bb2912..f081ff0f030 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS202/hs202t002/hs202t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS202/hs202t002/hs202t002.cpp
@@ -25,8 +25,8 @@
#include "agent_common.hpp"
#include <string.h>
#include <stdarg.h>
-#include "jvmti_tools.h"
-#include "JVMTITools.h"
+#include "jvmti_tools.hpp"
+#include "JVMTITools.hpp"
/*
hs202t002:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t001/hs203t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t001/hs203t001.cpp
index 81c2c75902a..467d6cf01cb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t001/hs203t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t001/hs203t001.cpp
@@ -25,8 +25,8 @@
#include <jvmti.h>
#include "agent_common.hpp"
#include <jni.h>
-#include "jvmti_tools.h"
-#include "JVMTITools.h"
+#include "jvmti_tools.hpp"
+#include "JVMTITools.hpp"
/*
README
******
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t002/hs203t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t002/hs203t002.cpp
index 8bfdb52947d..d263186114e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t002/hs203t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t002/hs203t002.cpp
@@ -25,8 +25,8 @@
#include "agent_common.hpp"
#include <jni.h>
#include <string.h>
-#include "jvmti_tools.h"
-#include "JVMTITools.h"
+#include "jvmti_tools.hpp"
+#include "JVMTITools.hpp"
/*
T002:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t003/hs203t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t003/hs203t003.cpp
index 2a5247c4437..7c59a16a535 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t003/hs203t003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t003/hs203t003.cpp
@@ -26,9 +26,9 @@
#include "agent_common.hpp"
#include <jni.h>
#include <string.h>
-#include "jvmti_tools.h"
-#include "jni_tools.h"
-#include "JVMTITools.h"
+#include "jvmti_tools.hpp"
+#include "jni_tools.hpp"
+#include "JVMTITools.hpp"
/*
hs203T003:
1. Set FieldAccessWatch, FieldModificatoinWatch for a field.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t004/hs203t004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t004/hs203t004.cpp
index 768f8f04b7d..a2023f7f546 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t004/hs203t004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t004/hs203t004.cpp
@@ -26,9 +26,9 @@
#include "agent_common.hpp"
#include <jni.h>
#include <string.h>
-#include "jvmti_tools.h"
-#include "JVMTITools.h"
-#include "jni_tools.h"
+#include "jvmti_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jni_tools.hpp"
extern "C" {
#define FILE_NAME "nsk/jvmti/scenarios/hotswap/HS203/hs203t004/MyThread"
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t002/hs204t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t002/hs204t002.cpp
index 3084cebfc3d..3b8be254638 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t002/hs204t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t002/hs204t002.cpp
@@ -25,8 +25,8 @@
#include "agent_common.hpp"
#include <jni.h>
#include <string.h>
-#include "jvmti_tools.h"
-#include "JVMTITools.h"
+#include "jvmti_tools.hpp"
+#include "JVMTITools.hpp"
/*
*1. Enable event ClassPrepare.
*2. Upon occurrence of ClassPrepare, set a breakpoint in class static
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t003/hs204t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t003/hs204t003.cpp
index 67e089572f4..46f5f784bdd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t003/hs204t003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t003/hs204t003.cpp
@@ -26,9 +26,9 @@
#include <jvmti.h>
#include "agent_common.hpp"
#include <jni.h>
-#include "jvmti_tools.h"
-#include "jni_tools.h"
-#include "JVMTITools.h"
+#include "jvmti_tools.hpp"
+#include "jni_tools.hpp"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t004/hs204t004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t004/hs204t004.cpp
index c4f00877c0b..1db6093dde7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t004/hs204t004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS204/hs204t004/hs204t004.cpp
@@ -25,8 +25,8 @@
#include "agent_common.hpp"
#include <jni.h>
#include <string.h>
-#include "jvmti_tools.h"
-#include "JVMTITools.h"
+#include "jvmti_tools.hpp"
+#include "JVMTITools.hpp"
/*
1. Enable event ClassPrepare.
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t001/hs301t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t001/hs301t001.cpp
index 4018f41594b..3a93a57f224 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t001/hs301t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t001/hs301t001.cpp
@@ -25,8 +25,8 @@
#include <jvmti.h>
#include "agent_common.hpp"
#include <string.h>
-#include "jvmti_tools.h"
-#include "jni_tools.h"
+#include "jvmti_tools.hpp"
+#include "jni_tools.hpp"
extern "C" {
#define FILE_NAME "nsk/jvmti/scenarios/hotswap/HS301/hs301t001/MyClass"
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t002/hs301t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t002/hs301t002.cpp
index ddcd2baabd1..135993fa0cf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t002/hs301t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t002/hs301t002.cpp
@@ -28,8 +28,8 @@
#include <jvmti.h>
#include "agent_common.hpp"
#include <string.h>
-#include "jvmti_tools.h"
-#include "jni_tools.h"
+#include "jvmti_tools.hpp"
+#include "jni_tools.hpp"
extern "C" {
#define FILE_NAME "nsk/jvmti/scenarios/hotswap/HS301/hs301t002/MyClass"
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t003/hs301t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t003/hs301t003.cpp
index fc5aafdb3d8..785b53157d7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t003/hs301t003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t003/hs301t003.cpp
@@ -24,7 +24,7 @@
#include <jvmti.h>
#include "agent_common.hpp"
#include <string.h>
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
#define FILE_NAME "nsk/jvmti/scenarios/hotswap/HS301/hs301t003/MyClass"
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t004/hs301t004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t004/hs301t004.cpp
index e6f863497da..59c27c244b0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t004/hs301t004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t004/hs301t004.cpp
@@ -24,7 +24,7 @@
#include <jvmti.h>
#include "agent_common.hpp"
#include <string.h>
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
#define FILE_NAME "nsk/jvmti/scenarios/hotswap/HS301/hs301t004/MyClass"
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t005/hs301t005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t005/hs301t005.cpp
index d8847b27009..ff3bbce6a15 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t005/hs301t005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS301/hs301t005/hs301t005.cpp
@@ -24,7 +24,7 @@
#include <jvmti.h>
#include "agent_common.hpp"
#include <string.h>
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t001/hs302t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t001/hs302t001.cpp
index d00def9b2ba..67a37e4b27f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t001/hs302t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t001/hs302t001.cpp
@@ -24,7 +24,7 @@
#include <jvmti.h>
#include "agent_common.hpp"
#include <string.h>
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t002/hs302t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t002/hs302t002.cpp
index 91739e8ff58..173f97cd410 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t002/hs302t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t002/hs302t002.cpp
@@ -24,7 +24,7 @@
#include <jvmti.h>
#include "agent_common.hpp"
#include <string.h>
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t003/hs302t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t003/hs302t003.cpp
index b1ac4467c9b..3f9f8cc5c8f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t003/hs302t003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t003/hs302t003.cpp
@@ -24,7 +24,7 @@
#include <jvmti.h>
#include "agent_common.hpp"
#include <string.h>
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t004/hs302t004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t004/hs302t004.cpp
index ad02fce9e72..e9ab190b9f9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t004/hs302t004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t004/hs302t004.cpp
@@ -24,7 +24,7 @@
#include <jvmti.h>
#include "agent_common.hpp"
#include <string.h>
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
#define FILE_NAME "nsk/jvmti/scenarios/hotswap/HS302/hs302t004r/MyClass"
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t005/hs302t005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t005/hs302t005.cpp
index 87d81ae74e4..2e794561cb7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t005/hs302t005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t005/hs302t005.cpp
@@ -24,7 +24,7 @@
#include <jvmti.h>
#include "agent_common.hpp"
#include <string.h>
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t006/hs302t006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t006/hs302t006.cpp
index d1c1a025e9f..885c2bf2910 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t006/hs302t006.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t006/hs302t006.cpp
@@ -24,7 +24,7 @@
#include <jvmti.h>
#include "agent_common.hpp"
#include <string.h>
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t007/hs302t007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t007/hs302t007.cpp
index 4de6976d2c8..036bedcf9ee 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t007/hs302t007.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t007/hs302t007.cpp
@@ -24,7 +24,7 @@
#include <jvmti.h>
#include "agent_common.hpp"
#include <string.h>
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
#define FILE_NAME "nsk/jvmti/scenarios/hotswap/HS302/hs302t007r/MyClass"
#define CLASS_NAME "Lnsk/jvmti/scenarios/hotswap/HS302/hs302t007r/MyClass;"
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t008/hs302t008.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t008/hs302t008.cpp
index 3e23cf7ba92..d30b767cddc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t008/hs302t008.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t008/hs302t008.cpp
@@ -24,7 +24,7 @@
#include <jvmti.h>
#include "agent_common.hpp"
#include <string.h>
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t009/hs302t009.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t009/hs302t009.cpp
index 3d19429f219..18c51111f42 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t009/hs302t009.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t009/hs302t009.cpp
@@ -24,7 +24,7 @@
#include <jvmti.h>
#include "agent_common.hpp"
#include <string.h>
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
#define FILE_NAME "nsk/jvmti/scenarios/hotswap/HS302/hs302t009r/MyClass"
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t010/hs302t010.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t010/hs302t010.cpp
index b491692909a..cab1f02215e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t010/hs302t010.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t010/hs302t010.cpp
@@ -24,7 +24,7 @@
#include <jvmti.h>
#include "agent_common.hpp"
#include <string.h>
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t011/hs302t011.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t011/hs302t011.cpp
index fcb438194fd..bd3756b1493 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t011/hs302t011.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t011/hs302t011.cpp
@@ -24,7 +24,7 @@
#include <jvmti.h>
#include "agent_common.hpp"
#include <string.h>
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t012/hs302t012.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t012/hs302t012.cpp
index 964cdff2a02..b384834f022 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t012/hs302t012.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS302/hs302t012/hs302t012.cpp
@@ -24,7 +24,7 @@
#include <jvmti.h>
#include "agent_common.hpp"
#include <string.h>
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI01/ji01t001/ji01t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI01/ji01t001/ji01t001.cpp
index b6479f44c62..018b1c7d753 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI01/ji01t001/ji01t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI01/ji01t001/ji01t001.cpp
@@ -29,9 +29,9 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
-#include "nsk_tools.h"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
+#include "nsk_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t001/ji03t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t001/ji03t001.cpp
index 853c44c5e09..927aa19974b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t001/ji03t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t001/ji03t001.cpp
@@ -28,7 +28,7 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t002/ji03t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t002/ji03t002.cpp
index 2cbca0d623d..297a94aca8e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t002/ji03t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t002/ji03t002.cpp
@@ -29,7 +29,7 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t003/ji03t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t003/ji03t003.cpp
index 5679f0988d6..bab6880c5c0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t003/ji03t003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t003/ji03t003.cpp
@@ -29,7 +29,7 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t004/ji03t004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t004/ji03t004.cpp
index 8e62b3d247c..94cf69dab51 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t004/ji03t004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI03/ji03t004/ji03t004.cpp
@@ -29,7 +29,7 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI05/ji05t001/ji05t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI05/ji05t001/ji05t001.cpp
index 337f0148310..550a29158bf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI05/ji05t001/ji05t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI05/ji05t001/ji05t001.cpp
@@ -29,9 +29,9 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "nsk_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
#include "native_thread.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI06/ji06t001/ji06t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI06/ji06t001/ji06t001.cpp
index e0fb28cba60..83a32bb2e4c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI06/ji06t001/ji06t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/jni_interception/JI06/ji06t001/ji06t001.cpp
@@ -29,9 +29,9 @@
#include <jvmti.h>
#include "agent_common.hpp"
-#include "nsk_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "nsk_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
#include "native_thread.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA01/ma01t001/ma01t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA01/ma01t001/ma01t001.cpp
index ef9bf83c999..01fd4b40564 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA01/ma01t001/ma01t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA01/ma01t001/ma01t001.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA01/ma01t001/ma01t001a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA01/ma01t001/ma01t001a.cpp
index 6e0c854a7b1..cc77d601568 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA01/ma01t001/ma01t001a.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA01/ma01t001/ma01t001a.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA02/ma02t001/ma02t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA02/ma02t001/ma02t001.cpp
index fe03af10199..b4c638460f5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA02/ma02t001/ma02t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA02/ma02t001/ma02t001.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA02/ma02t001/ma02t001a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA02/ma02t001/ma02t001a.cpp
index 8b22aafec9a..fbe59eb4ba7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA02/ma02t001/ma02t001a.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA02/ma02t001/ma02t001a.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA03/ma03t001/ma03t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA03/ma03t001/ma03t001.cpp
index fcfedcc7e72..a09722b7b40 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA03/ma03t001/ma03t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA03/ma03t001/ma03t001.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA03/ma03t001/ma03t001a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA03/ma03t001/ma03t001a.cpp
index e41e93480c5..d75b0da0f0c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA03/ma03t001/ma03t001a.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA03/ma03t001/ma03t001a.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t001/ma04t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t001/ma04t001.cpp
index 626f0ed66fb..d9cedfaa4fd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t001/ma04t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t001/ma04t001.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t001/ma04t001a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t001/ma04t001a.cpp
index 5936b57c75e..9b60f2a1258 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t001/ma04t001a.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t001/ma04t001a.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t002/ma04t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t002/ma04t002.cpp
index ce4c180980e..52459a7994f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t002/ma04t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t002/ma04t002.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t002/ma04t002a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t002/ma04t002a.cpp
index 602fb4f251b..7f716d009ce 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t002/ma04t002a.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t002/ma04t002a.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t003/ma04t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t003/ma04t003.cpp
index c39f53eac43..cf4a492372d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t003/ma04t003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t003/ma04t003.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t003/ma04t003a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t003/ma04t003a.cpp
index ec4fcc562ed..5345b56cba5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t003/ma04t003a.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA04/ma04t003/ma04t003a.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA05/ma05t001/ma05t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA05/ma05t001/ma05t001.cpp
index 4cbf1f75f03..45d968d4c7e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA05/ma05t001/ma05t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA05/ma05t001/ma05t001.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA05/ma05t001/ma05t001a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA05/ma05t001/ma05t001a.cpp
index 817cf517fcd..1f4d927eff5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA05/ma05t001/ma05t001a.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA05/ma05t001/ma05t001a.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA06/ma06t001/ma06t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA06/ma06t001/ma06t001.cpp
index a4a29658419..75edd25bcbd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA06/ma06t001/ma06t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA06/ma06t001/ma06t001.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA06/ma06t001/ma06t001a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA06/ma06t001/ma06t001a.cpp
index 6239ed7d520..a58f6b41422 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA06/ma06t001/ma06t001a.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA06/ma06t001/ma06t001a.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA07/ma07t001/ma07t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA07/ma07t001/ma07t001.cpp
index 7912d69f506..1d64b011f6c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA07/ma07t001/ma07t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA07/ma07t001/ma07t001.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA07/ma07t001/ma07t001a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA07/ma07t001/ma07t001a.cpp
index 848201dcd30..0f8a27bd50e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA07/ma07t001/ma07t001a.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA07/ma07t001/ma07t001a.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA08/ma08t001/ma08t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA08/ma08t001/ma08t001.cpp
index a20cba6757e..97a71e18c40 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA08/ma08t001/ma08t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA08/ma08t001/ma08t001.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA08/ma08t001/ma08t001a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA08/ma08t001/ma08t001a.cpp
index 7e9eb9e5f6a..b2b75ec12db 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA08/ma08t001/ma08t001a.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA08/ma08t001/ma08t001a.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t001/ma10t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t001/ma10t001.cpp
index 9bd9c987070..d20b710a942 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t001/ma10t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t001/ma10t001.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t001/ma10t001a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t001/ma10t001a.cpp
index 381046c0f3d..8b0b1d7da03 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t001/ma10t001a.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t001/ma10t001a.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t002/ma10t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t002/ma10t002.cpp
index b33421ef0e1..d5e3316b846 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t002/ma10t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t002/ma10t002.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t002/ma10t002a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t002/ma10t002a.cpp
index b9d9f2ee319..0ac0b4f3ec0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t002/ma10t002a.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t002/ma10t002a.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t003/ma10t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t003/ma10t003.cpp
index 484b687ee34..cd1ac4209e6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t003/ma10t003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t003/ma10t003.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t003/ma10t003a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t003/ma10t003a.cpp
index 488f0d891ec..2bb125adb1b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t003/ma10t003a.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t003/ma10t003a.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t004/ma10t004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t004/ma10t004.cpp
index 96c9fc36c9f..8db5995868e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t004/ma10t004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t004/ma10t004.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t004/ma10t004a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t004/ma10t004a.cpp
index 3e5bdf5ab28..66d16ceeb47 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t004/ma10t004a.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t004/ma10t004a.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t005/ma10t005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t005/ma10t005.cpp
index 757b44162d2..ace612850aa 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t005/ma10t005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t005/ma10t005.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t005/ma10t005a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t005/ma10t005a.cpp
index d937a3ec9eb..1573873a9ff 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t005/ma10t005a.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t005/ma10t005a.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006.cpp
index 5bd1addd5fc..2c6a186656e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006a.cpp
index 52fc30cfd74..3fca05a0c90 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006a.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t006/ma10t006a.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t007/ma10t007.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t007/ma10t007.cpp
index 1f574b9ee9d..6df71ba2da9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t007/ma10t007.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t007/ma10t007.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t007/ma10t007a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t007/ma10t007a.cpp
index e637f878584..02945011bed 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t007/ma10t007a.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t007/ma10t007a.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t008/ma10t008.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t008/ma10t008.cpp
index 4ad797aac23..9479471a95a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t008/ma10t008.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t008/ma10t008.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t008/ma10t008a.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t008/ma10t008a.cpp
index c21c87c91b8..45f156675fb 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t008/ma10t008a.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/multienv/MA10/ma10t008/ma10t008a.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
#define PASSED 0
#define STATUS_FAILED 2
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t001/sp01t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t001/sp01t001.cpp
index f481d4270bf..40db16504b6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t001/sp01t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t001/sp01t001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t002/sp01t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t002/sp01t002.cpp
index 8593c4a8134..cb98f699891 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t002/sp01t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t002/sp01t002.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t003/sp01t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t003/sp01t003.cpp
index 0036869e8cd..5bc99822347 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t003/sp01t003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP01/sp01t003/sp01t003.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t001/sp02t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t001/sp02t001.cpp
index 3fb2ec89706..e727438b67a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t001/sp02t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t001/sp02t001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t002/sp02t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t002/sp02t002.cpp
index 9ac6413e392..25648754de4 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t002/sp02t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t002/sp02t002.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t003/sp02t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t003/sp02t003.cpp
index 439390bf636..7068025eef0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t003/sp02t003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t003/sp02t003.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP03/sp03t001/sp03t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP03/sp03t001/sp03t001.cpp
index eaab8e80781..d9f1e6faf27 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP03/sp03t001/sp03t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP03/sp03t001/sp03t001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP03/sp03t002/sp03t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP03/sp03t002/sp03t002.cpp
index f22f7175c1a..0445c199298 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP03/sp03t002/sp03t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP03/sp03t002/sp03t002.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t001/sp04t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t001/sp04t001.cpp
index 6b4d3e3596a..0f7298ff7df 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t001/sp04t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t001/sp04t001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t002/sp04t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t002/sp04t002.cpp
index c97ae1a11f6..410c77ebd26 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t002/sp04t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t002/sp04t002.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP05/sp05t002/sp05t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP05/sp05t002/sp05t002.cpp
index 404d43bc1c1..caadaf29460 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP05/sp05t002/sp05t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP05/sp05t002/sp05t002.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP05/sp05t003/sp05t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP05/sp05t003/sp05t003.cpp
index 36a45499ec2..3c297299f6a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP05/sp05t003/sp05t003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP05/sp05t003/sp05t003.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t001/sp06t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t001/sp06t001.cpp
index 14191b8fb48..b4a0f2e924c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t001/sp06t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t001/sp06t001.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t002/sp06t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t002/sp06t002.cpp
index cb71f459180..a84073a595b 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t002/sp06t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t002/sp06t002.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t003/sp06t003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t003/sp06t003.cpp
index fee9803fbc1..cc2811d520d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t003/sp06t003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP06/sp06t003/sp06t003.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP07/sp07t001/sp07t001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP07/sp07t001/sp07t001.cpp
index 96c53b203e4..7210f4aef2e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP07/sp07t001/sp07t001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP07/sp07t001/sp07t001.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP07/sp07t002/sp07t002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP07/sp07t002/sp07t002.cpp
index 1b331e68a8a..0f92263796c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP07/sp07t002/sp07t002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/sampling/SP07/sp07t002/sp07t002.cpp
@@ -23,9 +23,9 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "jvmti_tools.h"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref001/followref001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref001/followref001.cpp
index 974e5ecc51c..ff431aa2203 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref001/followref001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref001/followref001.cpp
@@ -25,8 +25,8 @@
#include <stdint.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref002/followref002.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref002/followref002.cpp
index 5730b83d18a..6366b430776 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref002/followref002.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref002/followref002.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref003/followref003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref003/followref003.cpp
index f6d28a95b59..cb0385ee653 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref003/followref003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref003/followref003.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref004/followref004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref004/followref004.cpp
index 9e1d672eb34..e73534de8b6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref004/followref004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref004/followref004.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include <jvmti.h>
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
#include "jvmti_FollowRefObjects.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref005/followref005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref005/followref005.cpp
index 70450399689..333ddcccf83 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref005/followref005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref005/followref005.cpp
@@ -23,8 +23,8 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
#include "jvmti_FollowRefObjects.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref006/followref006.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref006/followref006.cpp
index 824247d8ff1..54485fb809a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref006/followref006.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/FollowReferences/followref006/followref006.cpp
@@ -24,8 +24,8 @@
#include <string.h>
#include <jvmti.h>
#include "agent_common.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
#include "jvmti_FollowRefObjects.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretbase/earlyretbase.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretbase/earlyretbase.cpp
index 2c849c3376d..47b9618d19c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretbase/earlyretbase.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretbase/earlyretbase.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretfp/earlyretfp.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretfp/earlyretfp.cpp
index 94ae952aa6b..9a0ce3d8550 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretfp/earlyretfp.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretfp/earlyretfp.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretint/earlyretint.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretint/earlyretint.cpp
index 8be8483a1cd..feb51d5fc40 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretint/earlyretint.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretint/earlyretint.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretlong/earlyretlong.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretlong/earlyretlong.cpp
index 7f6bf7bfc48..170d6839bef 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretlong/earlyretlong.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretlong/earlyretlong.cpp
@@ -24,9 +24,9 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretobj/earlyretobj.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretobj/earlyretobj.cpp
index 7b615acb868..6faf82f9ed9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretobj/earlyretobj.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretobj/earlyretobj.cpp
@@ -26,7 +26,7 @@
#include <inttypes.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretstr/earlyretstr.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretstr/earlyretstr.cpp
index d1b5d1f21d2..6ebb50026a3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretstr/earlyretstr.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretstr/earlyretstr.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretvoid/earlyretvoid.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretvoid/earlyretvoid.cpp
index a85e30bc10a..4919d27e9e7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretvoid/earlyretvoid.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/ForceEarlyReturn/earlyretvoid/earlyretvoid.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetAllStackTraces/getallstktr001/getallstktr001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetAllStackTraces/getallstktr001/getallstktr001.cpp
index cb0464b9bba..c1f0443186f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetAllStackTraces/getallstktr001/getallstktr001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetAllStackTraces/getallstktr001/getallstktr001.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetConstantPool/getcpool001/getcpool001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetConstantPool/getcpool001/getcpool001.cpp
index 617f94696ba..997e6c667e6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetConstantPool/getcpool001/getcpool001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetConstantPool/getcpool001/getcpool001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetLineNumberTable/linetab004/linetab004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetLineNumberTable/linetab004/linetab004.cpp
index f9c4fbb4065..d54f2d838d6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetLineNumberTable/linetab004/linetab004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetLineNumberTable/linetab004/linetab004.cpp
@@ -28,7 +28,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetLocalVariable/getlocal003/getlocal003.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetLocalVariable/getlocal003/getlocal003.cpp
index 17dbc710818..684444de335 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetLocalVariable/getlocal003/getlocal003.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetLocalVariable/getlocal003/getlocal003.cpp
@@ -24,9 +24,9 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetLocalVariable/getlocal004/getlocal004.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetLocalVariable/getlocal004/getlocal004.cpp
index 75428b875a0..b2d92e6a444 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetLocalVariable/getlocal004/getlocal004.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/GetLocalVariable/getlocal004/getlocal004.cpp
@@ -24,9 +24,9 @@
#include <stdio.h>
#include <string.h>
#include "jvmti.h"
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/IsSynthetic/issynth001/issynth001.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/IsSynthetic/issynth001/issynth001.cpp
index 7c7a93f45d2..f0a3ae3739c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/IsSynthetic/issynth001/issynth001.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/IsSynthetic/issynth001/issynth001.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/agentthr/agentthr.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/agentthr/agentthr.cpp
index 7c1d5e1ba45..3fb998ebade 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/agentthr/agentthr.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/agentthr/agentthr.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/clsldrclss00x/clsldrclss00x.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/clsldrclss00x/clsldrclss00x.cpp
index 1d4dd96fb11..1dc9202a731 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/clsldrclss00x/clsldrclss00x.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/clsldrclss00x/clsldrclss00x.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/events/redefineCFLH/JvmtiTest/JvmtiTest.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/events/redefineCFLH/JvmtiTest/JvmtiTest.cpp
index 5454563c443..a0b807e7d1d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/events/redefineCFLH/JvmtiTest/JvmtiTest.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/events/redefineCFLH/JvmtiTest/JvmtiTest.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <jvmti.h>
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/heapref/heapref.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/heapref/heapref.cpp
index 22d0c0717be..0772a387a32 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/heapref/heapref.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/heapref/heapref.cpp
@@ -25,9 +25,9 @@
#include <string.h>
#include <stdlib.h>
#include "jvmti.h"
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/refignore/refignore.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/refignore/refignore.cpp
index 4a0265c8c93..b850edd75b0 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/refignore/refignore.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/refignore/refignore.cpp
@@ -25,9 +25,9 @@
#include <string.h>
#include <stdlib.h>
#include "jvmti.h"
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/setNullVMInit/JvmtiTest/JvmtiTest.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/setNullVMInit/JvmtiTest/JvmtiTest.cpp
index 8aacce1a399..8743b6c0ec5 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/setNullVMInit/JvmtiTest/JvmtiTest.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/setNullVMInit/JvmtiTest/JvmtiTest.cpp
@@ -33,7 +33,7 @@
#include <string.h>
#include <inttypes.h>
#include "jvmti.h"
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#include "agent_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/timers/JvmtiTest/JvmtiTest.cpp b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/timers/JvmtiTest/JvmtiTest.cpp
index e6db341b3f9..6491f3e6686 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/timers/JvmtiTest/JvmtiTest.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/timers/JvmtiTest/JvmtiTest.cpp
@@ -37,7 +37,7 @@
#include "jvmti.h"
#include "agent_common.hpp"
-#include "jni_tools.h"
+#include "jni_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/StackTraceController.cpp b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/StackTraceController.cpp
index 3e46cc25368..1f3f3a019bf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/StackTraceController.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/StackTraceController.cpp
@@ -23,7 +23,7 @@
#include <jni.h>
#include <stdio.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/ThreadController.cpp b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/ThreadController.cpp
index e5fbc02b46d..90fd4df97e6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/ThreadController.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/ThreadController.cpp
@@ -25,7 +25,7 @@
#include <jni.h>
#include <jvmti.h>
#include <stdio.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/Deadlock.cpp b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/Deadlock.cpp
index 5c9a22e2464..c45fee989f7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/Deadlock.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/Deadlock.cpp
@@ -21,7 +21,7 @@
* questions.
*/
#include <jni.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/LockingThreads.cpp b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/LockingThreads.cpp
index 604b0620c5b..0b208187d97 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/LockingThreads.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/LockingThreads.cpp
@@ -21,7 +21,7 @@
* questions.
*/
#include <jni.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/RecursiveMonitoringThread.cpp b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/RecursiveMonitoringThread.cpp
index 6926c8f712e..5c7a3351943 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/RecursiveMonitoringThread.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/monitoring/share/thread/RecursiveMonitoringThread.cpp
@@ -23,7 +23,7 @@
#include <jni.h>
#include <stdio.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/JVMTIagent.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/JVMTIagent.cpp
index 59395c6fcf6..9c33f5c7797 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/JVMTIagent.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/JVMTIagent.cpp
@@ -34,10 +34,10 @@
#include <string.h>
#include <jvmti.h>
-#include "nsk_tools.h"
-#include "jni_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "nsk_tools.hpp"
+#include "jni_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/aod/aod.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/aod/aod.cpp
index b3b076b2ef7..7f622c24f75 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/aod/aod.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/aod/aod.cpp
@@ -23,9 +23,9 @@
#include <string.h>
#include <stdlib.h>
#include <jni.h>
-#include <jni_tools.h>
-#include <nsk_tools.h>
-#include <aod.h>
+#include <jni_tools.hpp>
+#include <nsk_tools.hpp>
+#include <aod.hpp>
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/aod/aod.h b/test/hotspot/jtreg/vmTestbase/nsk/share/aod/aod.hpp
index 335720c01b6..f56b0eba757 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/aod/aod.h
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/aod/aod.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2024, 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
@@ -20,12 +20,12 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
-#ifndef NSK_SHARE_AOD_H
-#define NSK_SHARE_AOD_H
+#ifndef NSK_SHARE_AOD_HPP
+#define NSK_SHARE_AOD_HPP
#include <jni.h>
-#include <jni_tools.h>
-#include <nsk_tools.h>
+#include <jni_tools.hpp>
+#include <nsk_tools.hpp>
extern "C" {
@@ -76,4 +76,4 @@ JNIEnv* nsk_aod_createJNIEnv(JavaVM* vm);
}
-#endif /* END OF NSK_SHARE_AOD_H */
+#endif /* END OF NSK_SHARE_AOD_HPP */
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/BooleanArrayCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/BooleanArrayCriticalLocker.cpp
index 2ad70dfe076..5b3978fe768 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/BooleanArrayCriticalLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/BooleanArrayCriticalLocker.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <time.h>
#include "ExceptionCheckingJniEnv.hpp"
-#include "jni_tools.h"
+#include "jni_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/ByteArrayCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/ByteArrayCriticalLocker.cpp
index 1feb98d9ef5..fa11c9e79c9 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/ByteArrayCriticalLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/ByteArrayCriticalLocker.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <time.h>
#include "ExceptionCheckingJniEnv.hpp"
-#include "jni_tools.h"
+#include "jni_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/CharArrayCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/CharArrayCriticalLocker.cpp
index 9c6231a0a16..28967200f94 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/CharArrayCriticalLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/CharArrayCriticalLocker.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <time.h>
#include "ExceptionCheckingJniEnv.hpp"
-#include "jni_tools.h"
+#include "jni_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/DoubleArrayCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/DoubleArrayCriticalLocker.cpp
index 773ffc533a1..2c42700e27e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/DoubleArrayCriticalLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/DoubleArrayCriticalLocker.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <time.h>
#include "ExceptionCheckingJniEnv.hpp"
-#include "jni_tools.h"
+#include "jni_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/FloatArrayCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/FloatArrayCriticalLocker.cpp
index e24138792fb..1ee47059d61 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/FloatArrayCriticalLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/FloatArrayCriticalLocker.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <time.h>
#include "ExceptionCheckingJniEnv.hpp"
-#include "jni_tools.h"
+#include "jni_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/IntArrayCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/IntArrayCriticalLocker.cpp
index b863984f9ac..e0efd81f840 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/IntArrayCriticalLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/IntArrayCriticalLocker.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <time.h>
#include "ExceptionCheckingJniEnv.hpp"
-#include "jni_tools.h"
+#include "jni_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/LongArrayCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/LongArrayCriticalLocker.cpp
index dae07c708db..265a7333ae3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/LongArrayCriticalLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/LongArrayCriticalLocker.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <time.h>
#include "ExceptionCheckingJniEnv.hpp"
-#include "jni_tools.h"
+#include "jni_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/ShortArrayCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/ShortArrayCriticalLocker.cpp
index 2b03591a709..bbc4cb24064 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/ShortArrayCriticalLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/ShortArrayCriticalLocker.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <time.h>
#include "ExceptionCheckingJniEnv.hpp"
-#include "jni_tools.h"
+#include "jni_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/StringCriticalLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/StringCriticalLocker.cpp
index a8049b2bea9..df3c98f7e31 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/StringCriticalLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jni/StringCriticalLocker.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <time.h>
#include "ExceptionCheckingJniEnv.hpp"
-#include "jni_tools.h"
+#include "jni_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIGlobalRefLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIGlobalRefLocker.cpp
index 4bbbef6e204..d141f6d8544 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIGlobalRefLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIGlobalRefLocker.cpp
@@ -25,7 +25,7 @@
#include <stdio.h>
#include <time.h>
#include "ExceptionCheckingJniEnv.hpp"
-#include "jni_tools.h"
+#include "jni_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNILocalRefLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNILocalRefLocker.cpp
index 127322728a5..005954d0fbc 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNILocalRefLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNILocalRefLocker.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <time.h>
#include "ExceptionCheckingJniEnv.hpp"
-#include "jni_tools.h"
+#include "jni_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIRefLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIRefLocker.cpp
index 0fb552a8b03..9478e72eb43 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIRefLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIRefLocker.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <time.h>
#include "ExceptionCheckingJniEnv.hpp"
-#include "jni_tools.h"
+#include "jni_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIWeakGlobalRefLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIWeakGlobalRefLocker.cpp
index f4c35b20d90..6d1986f533e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIWeakGlobalRefLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/gc/lock/jniref/JNIWeakGlobalRefLocker.cpp
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <time.h>
#include "ExceptionCheckingJniEnv.hpp"
-#include "jni_tools.h"
+#include "jni_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/MonitorEnterExecutor.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/MonitorEnterExecutor.cpp
index f85bbeeda18..5988e55ad79 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/MonitorEnterExecutor.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/MonitorEnterExecutor.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2024, 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
@@ -21,7 +21,7 @@
* questions.
*/
#include "jni.h"
-#include "nsk_tools.h"
+#include "nsk_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jni/ExceptionCheckingJniEnv.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jni/ExceptionCheckingJniEnv.cpp
index ca3e5dfff74..65f087dbcd6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jni/ExceptionCheckingJniEnv.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jni/ExceptionCheckingJniEnv.cpp
@@ -27,7 +27,7 @@
#include <string.h>
#include "ExceptionCheckingJniEnv.hpp"
-#include "nsk_tools.h"
+#include "nsk_tools.hpp"
namespace {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jni/JNIreferences.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jni/JNIreferences.cpp
index 50b59a157e9..21285d32825 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jni/JNIreferences.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jni/JNIreferences.cpp
@@ -22,7 +22,7 @@
*/
#include "jni.h"
#include <stdlib.h>
-#include "nsk_tools.h"
+#include "nsk_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jni/README b/test/hotspot/jtreg/vmTestbase/nsk/share/jni/README
index 0da5b570439..ab76d94ab92 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jni/README
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jni/README
@@ -1,4 +1,4 @@
-Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2003, 2024, 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
@@ -25,8 +25,8 @@ This directory contains source files of testbase_nsk JNI framework,
which provides support for JNI tests and accessing JNI environment.
Source files:
- jni_tools.h
- jni_tools.c
+ jni_tools.hpp
+ jni_tools.cpp
Naming conventions:
macroses: NSK_JNI_*
@@ -34,7 +34,7 @@ which provides support for JNI tests and accessing JNI environment.
---------------------------------------------------------------------------------
-jni_tools.h
+jni_tools.hpp
Provides functions and macroses for invocation of JNI functions
and checking JNI errors and pending exceptions:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jni/jni_tools.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jni/jni_tools.cpp
index 2f5a5ff3bc0..c6059e18a49 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jni/jni_tools.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jni/jni_tools.cpp
@@ -40,8 +40,8 @@
/*************************************************************/
-#include "nsk_tools.h"
-#include "jni_tools.h"
+#include "nsk_tools.hpp"
+#include "jni_tools.hpp"
/*************************************************************/
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jni/jni_tools.h b/test/hotspot/jtreg/vmTestbase/nsk/share/jni/jni_tools.hpp
index 07153e9cdd4..f8f74d152ad 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jni/jni_tools.h
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jni/jni_tools.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -30,11 +30,11 @@
/*************************************************************/
-#include "nsk_tools.h"
+#include "nsk_tools.hpp"
/*************************************************************/
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
/* printf format specifier for jlong */
#ifdef _WIN32
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/AddToBootstrapClassLoaderSearch/bootclssearch_agent.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/AddToBootstrapClassLoaderSearch/bootclssearch_agent.cpp
index 56466d9a651..bc20d23041a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/AddToBootstrapClassLoaderSearch/bootclssearch_agent.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/AddToBootstrapClassLoaderSearch/bootclssearch_agent.cpp
@@ -24,8 +24,8 @@
#include <stdlib.h>
#include <string.h>
#include "jvmti.h"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
#include "agent_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/AddToSystemClassLoaderSearch/systemclssearch_agent.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/AddToSystemClassLoaderSearch/systemclssearch_agent.cpp
index 64df36a6102..2cf7d1f44ca 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/AddToSystemClassLoaderSearch/systemclssearch_agent.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/AddToSystemClassLoaderSearch/systemclssearch_agent.cpp
@@ -24,8 +24,8 @@
#include <stdlib.h>
#include <string.h>
#include "jvmti.h"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
#include "agent_common.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/Injector.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/Injector.cpp
index cbf680175e7..ee61ed71232 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/Injector.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/Injector.cpp
@@ -23,8 +23,8 @@
#include <stdlib.h>
#include <string.h>
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
#include "Injector.hpp"
/* ========================================================================== */
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/JVMTITools.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/JVMTITools.cpp
index 16a02dfc2a4..e80d70d4f23 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/JVMTITools.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/JVMTITools.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -23,5 +23,5 @@
#include <stdio.h>
#include <string.h>
-#include "JVMTITools.h"
+#include "JVMTITools.hpp"
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/JVMTITools.h b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/JVMTITools.hpp
index e51d9ab91c1..b38cb64a36e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/JVMTITools.h
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/JVMTITools.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -21,11 +21,11 @@
* questions.
*/
-#ifndef _NSK_SHARE_JVMTI_JVMTITOOLS_H_
-#define _NSK_SHARE_JVMTI_JVMTITOOLS_H_
+#ifndef _NSK_SHARE_JVMTI_JVMTITOOLS_HPP_
+#define _NSK_SHARE_JVMTI_JVMTITOOLS_HPP_
#include "jvmti.h"
-#include "jvmti_common.h"
+#include "jvmti_common.hpp"
-#endif /* _NSK_SHARE_JVMTI_JVMTITOOLS_H_ */
+#endif /* _NSK_SHARE_JVMTI_JVMTITOOLS_HPP_ */
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/README b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/README
index 52e7ca3d31c..bc8a50afea6 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/README
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/README
@@ -25,13 +25,13 @@ This directory contains source files of testbase_nsk JVMTI framework,
which provides support for JVMTI tests and accessing JVMTI environment.
Source files:
- jvmti_tools.h
- jvmti_tools.c
- agent_tools.c
+ jvmti_tools.hpp
+ jvmti_tools.cpp
+ agent_tools.cpp
Injector.hpp
Injector.cpp
- JVMTITools.h
- JVMTITools.c
+ JVMTITools.hpp
+ JVMTITools.cpp
Naming conventions:
macroses: NSK_JVMTI_*
@@ -39,7 +39,7 @@ which provides support for JVMTI tests and accessing JVMTI environment.
---------------------------------------------------------------------------------
-jvmti_tools.h
+jvmti_tools.hpp
Provides functions and macroses for invocation of JVMTI functions
and checking JVMTI errors:
@@ -135,7 +135,7 @@ or with saving error code:
---------------------------------------------------------------------------------
-JVMTITools.h
+JVMTITools.hpp
Provides set of functions which convert JVMTI binary data to
a null-terminated character string:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/agent_common/agent_common.hpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/agent_common/agent_common.hpp
index 35b162dd26c..f313b6450de 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/agent_common/agent_common.hpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/agent_common/agent_common.hpp
@@ -24,7 +24,7 @@
#define NSK_JVMTI_AGENT_COMMON_DEFINED
#include "jvmti.h"
-#include "../jvmti_tools.h"
+#include "../jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/agent_tools.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/agent_tools.cpp
index 0f4dc828d8b..0b43e5ac782 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/agent_tools.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/agent_tools.cpp
@@ -25,8 +25,8 @@
#include <string.h>
#include "native_thread.hpp"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/aod/jvmti_aod.hpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/aod/jvmti_aod.hpp
index 9e34051da34..d6d090d01b3 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/aod/jvmti_aod.hpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/aod/jvmti_aod.hpp
@@ -23,9 +23,9 @@
#ifndef NSK_SHARE_JVMTI_AOD_HPP
#define NSK_SHARE_JVMTI_AOD_HPP
-#include <aod.h>
+#include <aod.hpp>
#include <jvmti.h>
-#include <jvmti_tools.h>
+#include <jvmti_tools.hpp>
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/hotswap/HotSwap.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/hotswap/HotSwap.cpp
index fdc94900d88..b47be9bb74a 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/hotswap/HotSwap.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/hotswap/HotSwap.cpp
@@ -24,8 +24,8 @@
#include <stdlib.h>
#include <string.h>
#include <atomic>
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
#include "Injector.hpp"
#include "agent_common.hpp"
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_FollowRefObjects.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_FollowRefObjects.cpp
index d9e5c494474..497fd4f9132 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_FollowRefObjects.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_FollowRefObjects.cpp
@@ -23,8 +23,8 @@
#include <string.h>
#include <jvmti.h>
-#include "jni_tools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
#include "jvmti_FollowRefObjects.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_tools.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_tools.cpp
index e07c453fd0e..83ac3855b45 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_tools.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_tools.cpp
@@ -33,10 +33,10 @@
/*************************************************************/
-#include "nsk_tools.h"
-#include "jni_tools.h"
-#include "jvmti_tools.h"
-#include "JVMTITools.h"
+#include "nsk_tools.hpp"
+#include "jni_tools.hpp"
+#include "jvmti_tools.hpp"
+#include "JVMTITools.hpp"
/*************************************************************/
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_tools.h b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_tools.hpp
index 31eac286158..4a3d3e7bf4f 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_tools.h
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/jvmti_tools.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -30,9 +30,9 @@
/*************************************************************/
-#include "nsk_tools.h"
-#include "jni_tools.h"
-#include "JVMTITools.h"
+#include "nsk_tools.hpp"
+#include "jni_tools.hpp"
+#include "JVMTITools.hpp"
extern "C" {
@@ -81,7 +81,7 @@ int nsk_jvmti_parseOptions(const char options[]);
/**
* Creates JVMTI environment for the JVMTI test.
- * If something fails, complains an error and returns NULL.
+ * If something fails, complains an error and returns null.
*/
jvmtiEnv* nsk_jvmti_createJVMTIEnv(JavaVM* jvm, void* reserved);
@@ -102,19 +102,19 @@ int nsk_jvmti_init_MA(jvmtiEventCallbacks* callbacks);
/**
* Returns thread object associated with agent thread..
- * If something fails, complains an error and returns NULL.
+ * If something fails, complains an error and returns null.
*/
jthread nsk_jvmti_getAgentThread();
/**
* Returns JNI environment constructed for agent thread.
- * If something fails, complains an error and returns NULL.
+ * If something fails, complains an error and returns null.
*/
JNIEnv* nsk_jvmti_getAgentJNIEnv();
/**
* Returns JVMTI environment constructed for agent.
- * If something fails, complains an error and returns NULL.
+ * If something fails, complains an error and returns null.
*/
jvmtiEnv* nsk_jvmti_getAgentJVMTIEnv();
@@ -170,14 +170,14 @@ jint nsk_jvmti_getStatus();
/**
* Finds first class with given signatire among loaded classes.
- * If no class found or something fails, complains an error and returns NULL.
+ * If no class found or something fails, complains an error and returns null.
* On success creates and returns global reference to the found class.
*/
jclass nsk_jvmti_classBySignature(const char signature[]);
/**
* Finds first thread with given name among alive threads.
- * If no thread found or something fails, complains an error and returns NULL.
+ * If no thread found or something fails, complains an error and returns null.
* On success creates and returns global reference to the found thread.
*/
jthread nsk_jvmti_threadByName(const char name[]);
@@ -223,7 +223,7 @@ jlocation nsk_jvmti_clearLineBreakpoint(jclass cls, jmethodID method, int line);
/********************* Events management *********************/
/**
- * Enables or disables all events of given list for given thread or NULL.
+ * Enables or disables all events of given list for given thread or null.
* If something fails, complains an error and returns 0 (NSK_FALSE).
*/
int nsk_jvmti_enableEvents(jvmtiEventMode enable, int size,
@@ -258,14 +258,14 @@ int nsk_jvmti_disableNotification(jvmtiEnv *jvmti, jvmtiEvent event, jthread thr
/******************** Access test options ********************/
/**
- * Returns value of given option name; or NULL if no such option found.
- * If search name is NULL then complains an error and returns NULL.
+ * Returns value of given option name; or null if no such option found.
+ * If search name is null then complains an error and returns null.
*/
const char* nsk_jvmti_findOptionValue(const char name[]);
/**
* Returns string value of given option; or defaultValue if no such option found.
- * If options is specified but has empty value then complains an error and returns NULL.
+ * If options is specified but has empty value then complains an error and returns null.
*/
const char* nsk_jvmti_findOptionStringValue(const char name[], const char* defaultValue);
@@ -282,13 +282,13 @@ int nsk_jvmti_getOptionsCount();
/**
* Returns name of i-th parsed option.
- * If no such option then complains an error and returns NULL.
+ * If no such option then complains an error and returns null.
*/
const char* nsk_jvmti_getOptionName(int i);
/**
* Returns value of i-th parsed option.
- * If no such option then complains an error and returns NULL.
+ * If no such option then complains an error and returns null.
*/
const char* nsk_jvmti_getOptionValue(int i);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/locks/JNIMonitorLocker.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/locks/JNIMonitorLocker.cpp
index a82f4cca5fa..f54e15ff6cf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/locks/JNIMonitorLocker.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/locks/JNIMonitorLocker.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -21,7 +21,7 @@
* questions.
*/
#include "jni.h"
-#include "nsk_tools.h"
+#include "nsk_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/locks/LockingThread.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/locks/LockingThread.cpp
index 4bb08c1aad3..908a5cc56c7 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/locks/LockingThread.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/locks/LockingThread.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2024, 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
@@ -21,7 +21,7 @@
* questions.
*/
#include "jni.h"
-#include "nsk_tools.h"
+#include "nsk_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/native/README b/test/hotspot/jtreg/vmTestbase/nsk/share/native/README
index f6c18e86e8f..42467aa009d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/native/README
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/native/README
@@ -25,8 +25,8 @@ This directory contains source files of testbase_nsk native
framework, which provides support for native tests.
Source files:
- nsk_tools.h
- nsk_tools.c
+ nsk_tools.hpp
+ nsk_tools.cpp
Naming conventions:
macroses: NSK_*
@@ -54,7 +54,7 @@ provides support for lists of various objects
---------------------------------------------------------------------------------
-nsk_tools.h
+nsk_tools.hpp
Provides functions and macroses for the most usefull actions:
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_list.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_list.cpp
index 068c92bf807..736ddafdfaf 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_list.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_list.cpp
@@ -25,7 +25,7 @@
#include <stdlib.h>
#include <string.h>
#include "nsk_list.hpp"
-#include "nsk_tools.h"
+#include "nsk_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_tools.cpp b/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_tools.cpp
index 3ba69427fd6..5d41ac31131 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_tools.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_tools.cpp
@@ -31,7 +31,7 @@
/*************************************************************/
-#include "nsk_tools.h"
+#include "nsk_tools.hpp"
/*************************************************************/
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_tools.h b/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_tools.hpp
index 12760fd458c..6b262617c5c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_tools.h
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_tools.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -160,7 +160,7 @@ void nsk_printHexBytes(const char indent[], int columns,
/*************************************************************/
/**
- * Returns str or "<NULL>" if str is NULL; useful for printing strings.
+ * Returns str or "<NULL>" if str is null; useful for printing strings.
*/
const char* nsk_null_string(const char* str);
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/stress/strace/nsk_strace.hpp b/test/hotspot/jtreg/vmTestbase/nsk/stress/strace/nsk_strace.hpp
index 9a03b990df7..5cc6efdb7a8 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/stress/strace/nsk_strace.hpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/strace/nsk_strace.hpp
@@ -22,7 +22,7 @@
*/
#include <stdlib.h>
-#include "jni_tools.h"
+#include "jni_tools.hpp"
#ifndef _IS_NSK_STRACE_DEFINED_
#define _IS_NSK_STRACE_DEFINED_
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/stress/strace/strace005.cpp b/test/hotspot/jtreg/vmTestbase/nsk/stress/strace/strace005.cpp
index 96cde50ce74..1539727d8fd 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/stress/strace/strace005.cpp
+++ b/test/hotspot/jtreg/vmTestbase/nsk/stress/strace/strace005.cpp
@@ -23,7 +23,7 @@
#include <stdio.h>
#include "nsk_strace.hpp"
-#include "nsk_tools.h"
+#include "nsk_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jvmti/share/IndyRedefineClass.cpp b/test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jvmti/share/IndyRedefineClass.cpp
index 46791f3a8f1..60c0111d2d4 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jvmti/share/IndyRedefineClass.cpp
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jvmti/share/IndyRedefineClass.cpp
@@ -26,8 +26,8 @@
#include <stdlib.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
#include "mlvmJvmtiUtils.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jvmti/stepBreakPopReturn/stepBreakPopReturn.cpp b/test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jvmti/stepBreakPopReturn/stepBreakPopReturn.cpp
index ad369489038..413450892a5 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jvmti/stepBreakPopReturn/stepBreakPopReturn.cpp
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/indy/func/jvmti/stepBreakPopReturn/stepBreakPopReturn.cpp
@@ -26,8 +26,8 @@
#include <stdlib.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
#include "mlvmJvmtiUtils.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/jni/nativeAndMH/nativeAndMH.cpp b/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/jni/nativeAndMH/nativeAndMH.cpp
index 27dfa84dead..7c1f8622e44 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/jni/nativeAndMH/nativeAndMH.cpp
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/meth/stress/jni/nativeAndMH/nativeAndMH.cpp
@@ -25,7 +25,7 @@
#include <string.h>
#include <stdlib.h>
#include "jni.h"
-#include "jni_tools.h"
+#include "jni_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/vm/mlvm/share/mlvmJvmtiUtils.cpp b/test/hotspot/jtreg/vmTestbase/vm/mlvm/share/mlvmJvmtiUtils.cpp
index 71573cc2cc1..7f3b149df72 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/mlvm/share/mlvmJvmtiUtils.cpp
+++ b/test/hotspot/jtreg/vmTestbase/vm/mlvm/share/mlvmJvmtiUtils.cpp
@@ -26,8 +26,8 @@
#include <stdlib.h>
#include "jvmti.h"
#include "agent_common.hpp"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
#include "mlvmJvmtiUtils.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/redefineClasses.cpp b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/redefineClasses.cpp
index eac0d3fe601..530de16c2d4 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/redefineClasses.cpp
+++ b/test/hotspot/jtreg/vmTestbase/vm/runtime/defmeth/shared/redefineClasses.cpp
@@ -25,10 +25,10 @@
#include <string.h>
#include <jvmti.h>
-#include "jni_tools.h"
-#include "nsk_tools.h"
-#include "JVMTITools.h"
-#include "jvmti_tools.h"
+#include "jni_tools.hpp"
+#include "nsk_tools.hpp"
+#include "JVMTITools.hpp"
+#include "jvmti_tools.hpp"
extern "C" {
diff --git a/test/hotspot/jtreg/vmTestbase/vm/share/ProcessUtils.cpp b/test/hotspot/jtreg/vmTestbase/vm/share/ProcessUtils.cpp
index c97e7017f4c..c69025fe4c2 100644
--- a/test/hotspot/jtreg/vmTestbase/vm/share/ProcessUtils.cpp
+++ b/test/hotspot/jtreg/vmTestbase/vm/share/ProcessUtils.cpp
@@ -31,7 +31,7 @@
#include <unistd.h>
#include <signal.h>
#endif /* _WIN32 */
-#include "jni_tools.h"
+#include "jni_tools.hpp"
extern "C" {
diff --git a/test/jdk/java/foreign/enablenativeaccess/org/openjdk/foreigntest/unnamed/libLinkerInvokerUnnamed.cpp b/test/jdk/java/foreign/enablenativeaccess/org/openjdk/foreigntest/unnamed/libLinkerInvokerUnnamed.cpp
index cc8469cc68f..0bead404098 100644
--- a/test/jdk/java/foreign/enablenativeaccess/org/openjdk/foreigntest/unnamed/libLinkerInvokerUnnamed.cpp
+++ b/test/jdk/java/foreign/enablenativeaccess/org/openjdk/foreigntest/unnamed/libLinkerInvokerUnnamed.cpp
@@ -22,7 +22,7 @@
*/
#include "jni.h"
-#include "testlib_threads.h"
+#include "testlib_threads.hpp"
void call(void* ctxt) {
JavaVM* jvm = (JavaVM*) ctxt;
diff --git a/test/jdk/java/foreign/enablenativeaccess/panama_module/org/openjdk/foreigntest/libLinkerInvokerModule.cpp b/test/jdk/java/foreign/enablenativeaccess/panama_module/org/openjdk/foreigntest/libLinkerInvokerModule.cpp
index 7056d702209..4591d7a506a 100644
--- a/test/jdk/java/foreign/enablenativeaccess/panama_module/org/openjdk/foreigntest/libLinkerInvokerModule.cpp
+++ b/test/jdk/java/foreign/enablenativeaccess/panama_module/org/openjdk/foreigntest/libLinkerInvokerModule.cpp
@@ -22,7 +22,7 @@
*/
#include "jni.h"
-#include "testlib_threads.h"
+#include "testlib_threads.hpp"
typedef struct {
JavaVM* jvm;
diff --git a/test/jdk/java/foreign/libAsyncInvokers.cpp b/test/jdk/java/foreign/libAsyncInvokers.cpp
index e7d48cbfbca..a2ac3b07a58 100644
--- a/test/jdk/java/foreign/libAsyncInvokers.cpp
+++ b/test/jdk/java/foreign/libAsyncInvokers.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, 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
@@ -21,7 +21,7 @@
* questions.
*/
-#include "testlib_threads.h"
+#include "testlib_threads.hpp"
#include "shared.h"
diff --git a/test/jdk/java/foreign/loaderLookup/libLoaderLookupInvoker.cpp b/test/jdk/java/foreign/loaderLookup/libLoaderLookupInvoker.cpp
index 607588cd56c..fff6f80239d 100644
--- a/test/jdk/java/foreign/loaderLookup/libLoaderLookupInvoker.cpp
+++ b/test/jdk/java/foreign/loaderLookup/libLoaderLookupInvoker.cpp
@@ -22,7 +22,7 @@
*/
#include "jni.h"
-#include "testlib_threads.h"
+#include "testlib_threads.hpp"
struct Context {
JavaVM* jvm;
diff --git a/test/jdk/java/foreign/stackwalk/libAsyncStackWalk.cpp b/test/jdk/java/foreign/stackwalk/libAsyncStackWalk.cpp
index 568cd8402d7..5461966d055 100644
--- a/test/jdk/java/foreign/stackwalk/libAsyncStackWalk.cpp
+++ b/test/jdk/java/foreign/stackwalk/libAsyncStackWalk.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2024, 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
@@ -21,7 +21,7 @@
* questions.
*/
-#include "testlib_threads.h"
+#include "testlib_threads.hpp"
#ifdef _WIN64
#define EXPORT __declspec(dllexport)
diff --git a/test/lib/jdk/test/lib/jvmti/jvmti_common.h b/test/lib/jdk/test/lib/jvmti/jvmti_common.hpp
index 6a0bcf25331..9fdd4cf4cb8 100644
--- a/test/lib/jdk/test/lib/jvmti/jvmti_common.h
+++ b/test/lib/jdk/test/lib/jvmti/jvmti_common.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -21,8 +21,8 @@
* questions.
*/
-#ifndef JVMTI_COMMON_H
-#define JVMTI_COMMON_H
+#ifndef JVMTI_COMMON_HPP
+#define JVMTI_COMMON_HPP
#include <stdio.h>
#include <stdlib.h>
@@ -60,8 +60,8 @@
const char* TranslateState(jint flags);
const char* TranslateError(jvmtiError err);
-static jvmtiExtensionFunction GetVirtualThread_func = NULL;
-static jvmtiExtensionFunction GetCarrierThread_func = NULL;
+static jvmtiExtensionFunction GetVirtualThread_func = nullptr;
+static jvmtiExtensionFunction GetCarrierThread_func = nullptr;
/**
* Convert the digits of the given value argument to a null-terminated
@@ -203,15 +203,15 @@ deallocate(jvmtiEnv *jvmti, JNIEnv* jni, void* ptr) {
static char*
get_method_class_name(jvmtiEnv *jvmti, JNIEnv* jni, jmethodID method) {
- jclass klass = NULL;
- char* cname = NULL;
- char* result = NULL;
+ jclass klass = nullptr;
+ char* cname = nullptr;
+ char* result = nullptr;
jvmtiError err;
err = jvmti->GetMethodDeclaringClass(method, &klass);
check_jvmti_status(jni, err, "get_method_class_name: error in JVMTI GetMethodDeclaringClass");
- err = jvmti->GetClassSignature(klass, &cname, NULL);
+ err = jvmti->GetClassSignature(klass, &cname, nullptr);
check_jvmti_status(jni, err, "get_method_class_name: error in JVMTI GetClassSignature");
size_t len = strlen(cname) - 2; // get rid of leading 'L' and trailing ';'
@@ -228,14 +228,14 @@ get_method_class_name(jvmtiEnv *jvmti, JNIEnv* jni, jmethodID method) {
static void
print_method(jvmtiEnv *jvmti, JNIEnv* jni, jmethodID method, jint depth) {
- char* cname = NULL;
- char* mname = NULL;
- char* msign = NULL;
+ char* cname = nullptr;
+ char* mname = nullptr;
+ char* msign = nullptr;
jvmtiError err;
cname = get_method_class_name(jvmti, jni, method);
- err = jvmti->GetMethodName(method, &mname, &msign, NULL);
+ err = jvmti->GetMethodName(method, &mname, &msign, nullptr);
check_jvmti_status(jni, err, "print_method: error in JVMTI GetMethodName");
LOG("%2d: %s: %s%s\n", depth, cname, mname, msign);
@@ -297,14 +297,14 @@ get_thread_name(jvmtiEnv *jvmti, JNIEnv* jni, jthread thread) {
memset(&thr_info, 0, sizeof(thr_info));
err = jvmti->GetThreadInfo(thread, &thr_info);
if (err == JVMTI_ERROR_WRONG_PHASE || err == JVMTI_ERROR_THREAD_NOT_ALIVE) {
- return NULL; // VM or target thread completed its work
+ return nullptr; // VM or target thread completed its work
}
check_jvmti_status(jni, err, "get_thread_name: error in JVMTI GetThreadInfo call");
static const char* UNNAMED_STR = "<Unnamed thread>";
static size_t UNNAMED_LEN = strlen(UNNAMED_STR);
char* tname = thr_info.name;
- if (tname == NULL) {
+ if (tname == nullptr) {
err = jvmti->Allocate((jlong)(UNNAMED_LEN + 1), (unsigned char**)&tname);
check_jvmti_status(jni, err, "get_method_class_name: error in JVMTI Allocate");
strncpy(tname, UNNAMED_STR, UNNAMED_LEN);
@@ -315,10 +315,10 @@ get_thread_name(jvmtiEnv *jvmti, JNIEnv* jni, jthread thread) {
static char*
get_method_name(jvmtiEnv *jvmti, JNIEnv* jni, jmethodID method) {
- char* mname = NULL;
+ char* mname = nullptr;
jvmtiError err;
- err = jvmti->GetMethodName(method, &mname, NULL, NULL);
+ err = jvmti->GetMethodName(method, &mname, nullptr, nullptr);
check_jvmti_status(jni, err, "get_method_name: error in JVMTI GetMethodName call");
return mname;
@@ -326,7 +326,7 @@ get_method_name(jvmtiEnv *jvmti, JNIEnv* jni, jmethodID method) {
static jclass
find_class(jvmtiEnv *jvmti, JNIEnv *jni, jobject loader, const char* cname) {
- jclass *classes = NULL;
+ jclass *classes = nullptr;
jint count = 0;
jvmtiError err;
@@ -335,10 +335,10 @@ find_class(jvmtiEnv *jvmti, JNIEnv *jni, jobject loader, const char* cname) {
// Find the jmethodID of the specified method
while (--count >= 0) {
- char* name = NULL;
+ char* name = nullptr;
jclass klass = classes[count];
- err = jvmti->GetClassSignature(klass, &name, NULL);
+ err = jvmti->GetClassSignature(klass, &name, nullptr);
check_jvmti_status(jni, err, "find_class: error in JVMTI GetClassSignature call");
bool found = (strcmp(name, cname) == 0);
@@ -347,13 +347,13 @@ find_class(jvmtiEnv *jvmti, JNIEnv *jni, jobject loader, const char* cname) {
return klass;
}
}
- return NULL;
+ return nullptr;
}
static jmethodID
find_method(jvmtiEnv *jvmti, JNIEnv *jni, jclass klass, const char* mname) {
- jmethodID *methods = NULL;
- jmethodID method = NULL;
+ jmethodID *methods = nullptr;
+ jmethodID method = nullptr;
jint count = 0;
jvmtiError err;
@@ -362,11 +362,11 @@ find_method(jvmtiEnv *jvmti, JNIEnv *jni, jclass klass, const char* mname) {
// Find the jmethodID of the specified method
while (--count >= 0) {
- char* name = NULL;
+ char* name = nullptr;
jmethodID meth = methods[count];
- err = jvmti->GetMethodName(meth, &name, NULL, NULL);
+ err = jvmti->GetMethodName(meth, &name, nullptr, nullptr);
check_jvmti_status(jni, err, "find_method: error in JVMTI GetMethodName call");
bool found = (strcmp(name, mname) == 0);
@@ -387,7 +387,7 @@ print_current_stack_trace(jvmtiEnv *jvmti, JNIEnv* jni) {
jvmtiFrameInfo frames[MAX_FRAME_COUNT_PRINT_STACK_TRACE];
jint count = 0;
- jvmtiError err = jvmti->GetStackTrace(NULL, 0, MAX_FRAME_COUNT_PRINT_STACK_TRACE, frames, &count);
+ jvmtiError err = jvmti->GetStackTrace(nullptr, 0, MAX_FRAME_COUNT_PRINT_STACK_TRACE, frames, &count);
check_jvmti_status(jni, err, "print_stack_trace: error in JVMTI GetStackTrace");
LOG("JVMTI Stack Trace for current thread: frame count: %d\n", count);
@@ -759,19 +759,19 @@ isThreadExpected(jvmtiEnv *jvmti, jthread thread) {
}
jthread find_thread_by_name(jvmtiEnv* jvmti, JNIEnv* jni, const char name[]) {
- jthread* threads = NULL;
+ jthread* threads = nullptr;
jint count = 0;
- jthread found_thread = NULL;
+ jthread found_thread = nullptr;
- if (name == NULL) {
- return NULL;
+ if (name == nullptr) {
+ return nullptr;
}
check_jvmti_status(jni, jvmti->GetAllThreads(&count, &threads), "");
for (int i = 0; i < count; i++) {
jvmtiThreadInfo info = get_thread_info(jvmti, jni, threads[i]);
- if (info.name != NULL && strcmp(name, info.name) == 0) {
+ if (info.name != nullptr && strcmp(name, info.name) == 0) {
found_thread = threads[i];
break;
}
@@ -793,22 +793,22 @@ static const jvmtiEvent
static jvmtiExtensionFunction
find_ext_function(jvmtiEnv* jvmti, JNIEnv* jni, const char* fname) {
jint extCount = 0;
- jvmtiExtensionFunctionInfo* extList = NULL;
+ jvmtiExtensionFunctionInfo* extList = nullptr;
jvmtiError err = jvmti->GetExtensionFunctions(&extCount, &extList);
check_jvmti_status(jni, err, "jvmti_common find_ext_function: Error in JVMTI GetExtensionFunctions");
for (int i = 0; i < extCount; i++) {
- if (strstr(extList[i].id, (char*)fname) != NULL) {
+ if (strstr(extList[i].id, (char*)fname) != nullptr) {
return extList[i].func;
}
}
- return NULL;
+ return nullptr;
}
static jvmtiError
GetVirtualThread(jvmtiEnv* jvmti, JNIEnv* jni, jthread cthread, jthread* vthread_ptr) {
- if (GetVirtualThread_func == NULL) { // lazily initialize function pointer
+ if (GetVirtualThread_func == nullptr) { // lazily initialize function pointer
GetVirtualThread_func = find_ext_function(jvmti, jni, "GetVirtualThread");
}
jvmtiError err = (*GetVirtualThread_func)(jvmti, cthread, vthread_ptr);
@@ -818,7 +818,7 @@ GetVirtualThread(jvmtiEnv* jvmti, JNIEnv* jni, jthread cthread, jthread* vthread
static jvmtiError
GetCarrierThread(jvmtiEnv* jvmti, JNIEnv* jni, jthread vthread, jthread* cthread_ptr) {
- if (GetCarrierThread_func == NULL) { // lazily initialize function pointer
+ if (GetCarrierThread_func == nullptr) { // lazily initialize function pointer
GetCarrierThread_func = find_ext_function(jvmti, jni, "GetCarrierThread");
}
jvmtiError err = (*GetCarrierThread_func)(jvmti, vthread, cthread_ptr);
@@ -828,7 +828,7 @@ GetCarrierThread(jvmtiEnv* jvmti, JNIEnv* jni, jthread vthread, jthread* cthread
static jthread
get_virtual_thread(jvmtiEnv* jvmti, JNIEnv* jni, jthread cthread) {
- jthread vthread = NULL;
+ jthread vthread = nullptr;
jvmtiError err = GetVirtualThread(jvmti, jni, cthread, &vthread);
check_jvmti_status(jni, err, "jvmti_common get_virtual_thread: Error in JVMTI extension GetVirtualThread");
return vthread;
@@ -836,7 +836,7 @@ get_virtual_thread(jvmtiEnv* jvmti, JNIEnv* jni, jthread cthread) {
static jthread
get_carrier_thread(jvmtiEnv* jvmti, JNIEnv* jni, jthread vthread) {
- jthread cthread = NULL;
+ jthread cthread = nullptr;
jvmtiError err = GetCarrierThread(jvmti, jni, vthread, &cthread);
check_jvmti_status(jni, err, "jvmti_common get_carrier_thread: Error in JVMTI extension GetCarrierThread");
@@ -846,26 +846,26 @@ get_carrier_thread(jvmtiEnv* jvmti, JNIEnv* jni, jthread vthread) {
static jvmtiExtensionEventInfo*
find_ext_event(jvmtiEnv* jvmti, const char* ename) {
jint extCount = 0;
- jvmtiExtensionEventInfo* extList = NULL;
+ jvmtiExtensionEventInfo* extList = nullptr;
jvmtiError err = jvmti->GetExtensionEvents(&extCount, &extList);
if (err != JVMTI_ERROR_NONE) {
LOG("jvmti_common find_ext_event: Error in JVMTI GetExtensionFunctions: %s(%d)\n",TranslateError(err), err);
- return NULL;
+ return nullptr;
}
for (int i = 0; i < extCount; i++) {
- if (strstr(extList[i].id, (char*)ename) != NULL) {
+ if (strstr(extList[i].id, (char*)ename) != nullptr) {
return &extList[i];
}
}
- return NULL;
+ return nullptr;
}
static jvmtiError
set_ext_event_callback(jvmtiEnv* jvmti, const char* ename, jvmtiExtensionEvent callback) {
jvmtiExtensionEventInfo* info = find_ext_event(jvmti, ename);
- if (info == NULL) {
+ if (info == nullptr) {
LOG("jvmti_common set_ext_event_callback: Extension event was not found: %s\n", ename);
return JVMTI_ERROR_NOT_AVAILABLE;
}
diff --git a/test/lib/jdk/test/lib/jvmti/jvmti_thread.h b/test/lib/jdk/test/lib/jvmti/jvmti_thread.hpp
index ed27eb521d4..9d1c612bed4 100644
--- a/test/lib/jdk/test/lib/jvmti/jvmti_thread.h
+++ b/test/lib/jdk/test/lib/jvmti/jvmti_thread.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2024, 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
@@ -21,8 +21,8 @@
* questions.
*/
-#ifndef JVMTI_THREAD_H
-#define JVMTI_THREAD_H
+#ifndef JVMTI_THREAD_HPP
+#define JVMTI_THREAD_HPP
#include <stdio.h>
#include <stdlib.h>
@@ -55,14 +55,14 @@ extern "C" {
#define STATUS_PASSED 0
#define STATUS_FAILED 2
-static jvmtiEnv* agent_jvmti_env = NULL;
-static JNIEnv* agent_jni_env = NULL;
+static jvmtiEnv* agent_jvmti_env = nullptr;
+static JNIEnv* agent_jni_env = nullptr;
static volatile int current_agent_status = STATUS_PASSED;
-static jthread jvmti_agent_thread = NULL;
-static jvmtiStartFunction agent_thread_proc = NULL;
-static void* agent_thread_arg = NULL;
+static jthread jvmti_agent_thread = nullptr;
+static jvmtiStartFunction agent_thread_proc = nullptr;
+static void* agent_thread_arg = nullptr;
void set_agent_fail_status() {
current_agent_status = STATUS_FAILED;
@@ -185,7 +185,7 @@ static void JNICALL agent_thread_wrapper(jvmtiEnv* jvmti_env, JNIEnv* agentJNI,
{
/* gelete global ref for agent thread */
agentJNI->DeleteGlobalRef(jvmti_agent_thread);
- jvmti_agent_thread = NULL;
+ jvmti_agent_thread = nullptr;
}
}
@@ -198,37 +198,37 @@ static jthread start_agent_thread_wrapper(JNIEnv *jni_env, jvmtiEnv* jvmti_env)
const char* THREAD_CTOR_NAME = "<init>";
const char* THREAD_CTOR_SIGNATURE = "(Ljava/lang/String;)V";
- jobject threadName = NULL;
- jclass threadClass = NULL;
- jmethodID threadCtor = NULL;
- jobject threadObject = NULL;
- jobject threadGlobalRef = NULL;
+ jobject threadName = nullptr;
+ jclass threadClass = nullptr;
+ jmethodID threadCtor = nullptr;
+ jobject threadObject = nullptr;
+ jobject threadGlobalRef = nullptr;
jvmtiError err;
threadClass = jni_env->FindClass(THREAD_CLASS_NAME);
- if (threadClass == NULL) {
- return NULL;
+ if (threadClass == nullptr) {
+ return nullptr;
}
threadCtor = jni_env->GetMethodID(threadClass, THREAD_CTOR_NAME, THREAD_CTOR_SIGNATURE);
- if (threadCtor == NULL) {
- return NULL;
+ if (threadCtor == nullptr) {
+ return nullptr;
}
threadName = jni_env->NewStringUTF(THREAD_NAME);
- if (threadName == NULL) {
- return NULL;
+ if (threadName == nullptr) {
+ return nullptr;
}
threadObject = jni_env->NewObject(threadClass, threadCtor, threadName);
- if (threadObject == NULL) {
- return NULL;
+ if (threadObject == nullptr) {
+ return nullptr;
}
threadGlobalRef = jni_env->NewGlobalRef(threadObject);
- if (threadGlobalRef == NULL) {
+ if (threadGlobalRef == nullptr) {
jni_env->DeleteLocalRef(threadObject);
- return NULL;
+ return nullptr;
}
jvmti_agent_thread = (jthread)threadGlobalRef;
@@ -236,7 +236,7 @@ static jthread start_agent_thread_wrapper(JNIEnv *jni_env, jvmtiEnv* jvmti_env)
if (err != JVMTI_ERROR_NONE) {
jni_env->DeleteGlobalRef(threadGlobalRef);
jni_env->DeleteLocalRef(threadObject);
- return NULL;
+ return nullptr;
}
return jvmti_agent_thread;
}
@@ -245,9 +245,9 @@ static jthread start_agent_thread_wrapper(JNIEnv *jni_env, jvmtiEnv* jvmti_env)
static jthread run_agent_thread(JNIEnv *jni_env, jvmtiEnv* jvmti_env) {
/* start agent thread wrapper */
jthread thread = start_agent_thread_wrapper(jni_env, jvmti_env);
- if (thread == NULL) {
+ if (thread == nullptr) {
set_agent_fail_status();
- return NULL;
+ return nullptr;
}
return thread;
@@ -265,7 +265,7 @@ static jint sync_debuggee_status(JNIEnv* jni_env, jvmtiEnv* jvmti_env, jint debu
/* we don't enter if-stmt in second call */
if (agent_data.thread_state == NEW) {
- if (run_agent_thread(jni_env, jvmti_env) == NULL) {
+ if (run_agent_thread(jni_env, jvmti_env) == nullptr) {
return result;
}
diff --git a/test/lib/native/testlib_threads.h b/test/lib/native/testlib_threads.hpp
index 575a5a3c15f..3a7b18eccf6 100644
--- a/test/lib/native/testlib_threads.h
+++ b/test/lib/native/testlib_threads.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, 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
@@ -21,8 +21,8 @@
* questions.
*/
-#ifndef TEST_LIB_NATIVE_THREAD_H
-#define TEST_LIB_NATIVE_THREAD_H
+#ifndef TEST_LIB_NATIVE_THREAD_HPP
+#define TEST_LIB_NATIVE_THREAD_HPP
// Header only library for using threads in tests
@@ -70,8 +70,8 @@ void run_in_new_thread_and_join(PROCEDURE proc, void* context) {
helper.proc = proc;
helper.context = context;
#ifdef _WIN32
- HANDLE thread = CreateThread(NULL, 0, procedure, &helper, 0, NULL);
- if (thread == NULL) {
+ HANDLE thread = CreateThread(nullptr, 0, procedure, &helper, 0, nullptr);
+ if (thread == nullptr) {
fatal("failed to create thread", GetLastError());
}
if (WaitForSingleObject(thread, INFINITE) != WAIT_OBJECT_0) {
@@ -90,7 +90,7 @@ void run_in_new_thread_and_join(PROCEDURE proc, void* context) {
fatal("failed to create thread", result);
}
pthread_attr_destroy(&attr);
- result = pthread_join(thread, NULL);
+ result = pthread_join(thread, nullptr);
if (result != 0) {
fatal("failed to join thread", result);
}
@@ -99,4 +99,4 @@ void run_in_new_thread_and_join(PROCEDURE proc, void* context) {
}
-#endif // TEST_LIB_NATIVE_THREAD_H
+#endif // TEST_LIB_NATIVE_THREAD_HPP