diff --git a/src/hotspot/os/aix/safepointMechanism_aix.cpp b/src/hotspot/os/aix/safepointMechanism_aix.cpp
index ef39149d740..0a36c89bec6 100644
--- a/src/hotspot/os/aix/safepointMechanism_aix.cpp
+++ b/src/hotspot/os/aix/safepointMechanism_aix.cpp
@@ -24,10 +24,10 @@
 
 #include "precompiled.hpp"
 #include "logging/log.hpp"
+#include "nmt/memTracker.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/os.hpp"
 #include "runtime/safepointMechanism.hpp"
-#include "services/memTracker.hpp"
 #include <sys/mman.h>
 
 void SafepointMechanism::pd_initialize() {
diff --git a/src/hotspot/os/bsd/os_bsd.cpp b/src/hotspot/os/bsd/os_bsd.cpp
index a38aa09d084..20eb3bec17f 100644
--- a/src/hotspot/os/bsd/os_bsd.cpp
+++ b/src/hotspot/os/bsd/os_bsd.cpp
@@ -34,6 +34,7 @@
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/allocation.inline.hpp"
+#include "nmt/memTracker.hpp"
 #include "oops/oop.inline.hpp"
 #include "os_bsd.inline.hpp"
 #include "os_posix.inline.hpp"
@@ -60,7 +61,6 @@
 #include "runtime/threads.hpp"
 #include "runtime/timer.hpp"
 #include "services/attachListener.hpp"
-#include "services/memTracker.hpp"
 #include "services/runtimeService.hpp"
 #include "signals_posix.hpp"
 #include "utilities/align.hpp"
diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index db942feabcf..6063e23da70 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -36,10 +36,11 @@
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/allocation.inline.hpp"
+#include "nmt/memTracker.hpp"
 #include "oops/oop.inline.hpp"
+#include "osContainer_linux.hpp"
 #include "os_linux.inline.hpp"
 #include "os_posix.inline.hpp"
-#include "osContainer_linux.hpp"
 #include "prims/jniFastGetField.hpp"
 #include "prims/jvm_misc.hpp"
 #include "runtime/arguments.hpp"
@@ -64,19 +65,18 @@
 #include "runtime/threadSMR.hpp"
 #include "runtime/timer.hpp"
 #include "runtime/vm_version.hpp"
-#include "signals_posix.hpp"
 #include "semaphore_posix.hpp"
-#include "services/memTracker.hpp"
 #include "services/runtimeService.hpp"
+#include "signals_posix.hpp"
 #include "utilities/align.hpp"
 #include "utilities/checkedCast.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/decoder.hpp"
 #include "utilities/defaultStream.hpp"
-#include "utilities/events.hpp"
 #include "utilities/elfFile.hpp"
-#include "utilities/growableArray.hpp"
+#include "utilities/events.hpp"
 #include "utilities/globalDefinitions.hpp"
+#include "utilities/growableArray.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/powerOfTwo.hpp"
 #include "utilities/vmError.hpp"
diff --git a/src/hotspot/os/posix/os_posix.cpp b/src/hotspot/os/posix/os_posix.cpp
index 11dbead5d39..2df22204412 100644
--- a/src/hotspot/os/posix/os_posix.cpp
+++ b/src/hotspot/os/posix/os_posix.cpp
@@ -27,20 +27,20 @@
 #include "jvmtifiles/jvmti.h"
 #include "logging/log.hpp"
 #include "memory/allocation.inline.hpp"
+#include "nmt/memTracker.hpp"
 #include "os_posix.inline.hpp"
-#include "runtime/globals_extension.hpp"
-#include "runtime/osThread.hpp"
-#include "runtime/frame.inline.hpp"
-#include "runtime/interfaceSupport.inline.hpp"
-#include "runtime/sharedRuntime.hpp"
-#include "services/attachListener.hpp"
-#include "services/memTracker.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/atomic.hpp"
+#include "runtime/frame.inline.hpp"
+#include "runtime/globals_extension.hpp"
+#include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/java.hpp"
 #include "runtime/orderAccess.hpp"
+#include "runtime/osThread.hpp"
 #include "runtime/park.hpp"
 #include "runtime/perfMemory.hpp"
+#include "runtime/sharedRuntime.hpp"
+#include "services/attachListener.hpp"
 #include "utilities/align.hpp"
 #include "utilities/checkedCast.hpp"
 #include "utilities/debug.hpp"
diff --git a/src/hotspot/os/posix/perfMemory_posix.cpp b/src/hotspot/os/posix/perfMemory_posix.cpp
index 7c39c5af466..8736e05bc62 100644
--- a/src/hotspot/os/posix/perfMemory_posix.cpp
+++ b/src/hotspot/os/posix/perfMemory_posix.cpp
@@ -29,13 +29,13 @@
 #include "logging/log.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
+#include "nmt/memTracker.hpp"
 #include "oops/oop.inline.hpp"
 #include "os_posix.inline.hpp"
 #include "runtime/globals_extension.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/os.hpp"
 #include "runtime/perfMemory.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/exceptions.hpp"
 #if defined(LINUX)
 #include "os_linux.hpp"
diff --git a/src/hotspot/os/windows/os_windows.cpp b/src/hotspot/os/windows/os_windows.cpp
index 45a240fea27..2cb3f7e754a 100644
--- a/src/hotspot/os/windows/os_windows.cpp
+++ b/src/hotspot/os/windows/os_windows.cpp
@@ -38,6 +38,7 @@
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/allocation.inline.hpp"
+#include "nmt/memTracker.hpp"
 #include "oops/oop.inline.hpp"
 #include "os_windows.inline.hpp"
 #include "prims/jniFastGetField.hpp"
@@ -63,12 +64,11 @@
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/statSampler.hpp"
 #include "runtime/stubRoutines.hpp"
-#include "runtime/threads.hpp"
 #include "runtime/threadCritical.hpp"
+#include "runtime/threads.hpp"
 #include "runtime/timer.hpp"
 #include "runtime/vm_version.hpp"
 #include "services/attachListener.hpp"
-#include "services/memTracker.hpp"
 #include "services/runtimeService.hpp"
 #include "symbolengine.hpp"
 #include "utilities/align.hpp"
diff --git a/src/hotspot/os/windows/perfMemory_windows.cpp b/src/hotspot/os/windows/perfMemory_windows.cpp
index 8fa1aa5c34d..5a4f95d044f 100644
--- a/src/hotspot/os/windows/perfMemory_windows.cpp
+++ b/src/hotspot/os/windows/perfMemory_windows.cpp
@@ -27,13 +27,13 @@
 #include "logging/log.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
+#include "nmt/memTracker.hpp"
 #include "oops/oop.inline.hpp"
 #include "os_windows.inline.hpp"
 #include "runtime/globals_extension.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/os.hpp"
 #include "runtime/perfMemory.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/exceptions.hpp"
 #include "utilities/formatBuffer.hpp"
 
diff --git a/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp b/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
index db5e1ed4bf2..b211330409d 100644
--- a/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
+++ b/src/hotspot/os_cpu/linux_x86/os_linux_x86.cpp
@@ -32,6 +32,7 @@
 #include "jvm.h"
 #include "logging/log.hpp"
 #include "memory/allocation.inline.hpp"
+#include "nmt/memTracker.hpp"
 #include "os_linux.hpp"
 #include "os_posix.hpp"
 #include "prims/jniFastGetField.hpp"
@@ -48,7 +49,6 @@
 #include "runtime/stubRoutines.hpp"
 #include "runtime/timer.hpp"
 #include "signals_posix.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/align.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/events.hpp"
diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp
index daab34857c0..14e901d7b08 100644
--- a/src/hotspot/share/cds/filemap.cpp
+++ b/src/hotspot/share/cds/filemap.cpp
@@ -45,13 +45,14 @@
 #include "classfile/vmSymbols.hpp"
 #include "jvm.h"
 #include "logging/log.hpp"
-#include "logging/logStream.hpp"
 #include "logging/logMessage.hpp"
+#include "logging/logStream.hpp"
 #include "memory/iterator.inline.hpp"
 #include "memory/metadataFactory.hpp"
 #include "memory/metaspaceClosure.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/universe.hpp"
+#include "nmt/memTracker.hpp"
 #include "oops/compressedOops.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/objArrayOop.hpp"
@@ -63,7 +64,6 @@
 #include "runtime/mutexLocker.hpp"
 #include "runtime/os.hpp"
 #include "runtime/vm_version.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/align.hpp"
 #include "utilities/bitMap.inline.hpp"
 #include "utilities/classpathStream.hpp"
diff --git a/src/hotspot/share/cds/metaspaceShared.cpp b/src/hotspot/share/cds/metaspaceShared.cpp
index 0713212c100..9f3a554bd11 100644
--- a/src/hotspot/share/cds/metaspaceShared.cpp
+++ b/src/hotspot/share/cds/metaspaceShared.cpp
@@ -29,8 +29,9 @@
 #include "cds/cds_globals.hpp"
 #include "cds/cdsConfig.hpp"
 #include "cds/cdsProtectionDomain.hpp"
-#include "cds/classListWriter.hpp"
+#include "cds/cds_globals.hpp"
 #include "cds/classListParser.hpp"
+#include "cds/classListWriter.hpp"
 #include "cds/classPrelinker.hpp"
 #include "cds/cppVtables.hpp"
 #include "cds/dumpAllocStats.hpp"
@@ -45,8 +46,8 @@
 #include "classfile/javaClasses.inline.hpp"
 #include "classfile/loaderConstraints.hpp"
 #include "classfile/placeholders.hpp"
-#include "classfile/symbolTable.hpp"
 #include "classfile/stringTable.hpp"
+#include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "classfile/systemDictionaryShared.hpp"
 #include "classfile/vmClasses.hpp"
@@ -63,6 +64,7 @@
 #include "memory/metaspaceClosure.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
+#include "nmt/memTracker.hpp"
 #include "oops/compressedKlass.hpp"
 #include "oops/instanceMirrorKlass.hpp"
 #include "oops/klass.inline.hpp"
@@ -77,14 +79,13 @@
 #include "runtime/os.inline.hpp"
 #include "runtime/safepointVerifiers.hpp"
 #include "runtime/sharedRuntime.hpp"
-#include "runtime/vmThread.hpp"
 #include "runtime/vmOperations.hpp"
+#include "runtime/vmThread.hpp"
 #include "sanitizers/leak.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/align.hpp"
 #include "utilities/bitMap.inline.hpp"
-#include "utilities/ostream.hpp"
 #include "utilities/defaultStream.hpp"
+#include "utilities/ostream.hpp"
 #include "utilities/resourceHash.hpp"
 
 ReservedSpace MetaspaceShared::_symbol_rs;
diff --git a/src/hotspot/share/compiler/compilationMemoryStatistic.cpp b/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
index 182ab9fd2ed..8395d221c92 100644
--- a/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
+++ b/src/hotspot/share/compiler/compilationMemoryStatistic.cpp
@@ -34,12 +34,12 @@
 #include "compiler/compilerThread.hpp"
 #include "memory/arena.hpp"
 #include "memory/resourceArea.hpp"
+#include "nmt/nmtCommon.hpp"
 #include "oops/symbol.hpp"
 #ifdef COMPILER2
 #include "opto/node.hpp" // compile.hpp is not self-contained
 #include "opto/compile.hpp"
 #endif
-#include "services/nmtCommon.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/os.hpp"
 #include "utilities/globalDefinitions.hpp"
diff --git a/src/hotspot/share/gc/g1/g1BlockOffsetTable.cpp b/src/hotspot/share/gc/g1/g1BlockOffsetTable.cpp
index c8b60b4c982..71107387564 100644
--- a/src/hotspot/share/gc/g1/g1BlockOffsetTable.cpp
+++ b/src/hotspot/share/gc/g1/g1BlockOffsetTable.cpp
@@ -27,11 +27,9 @@
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/heapRegion.inline.hpp"
 #include "logging/log.hpp"
+#include "nmt/memTracker.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/java.hpp"
-#include "services/memTracker.hpp"
-
-
 
 //////////////////////////////////////////////////////////////////////
 // G1BlockOffsetTable
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
index f46ac31ceeb..c30ea3d69d0 100644
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
@@ -64,6 +64,7 @@
 #include "memory/metaspaceUtils.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
+#include "nmt/memTracker.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/atomic.hpp"
@@ -73,7 +74,6 @@
 #include "runtime/orderAccess.hpp"
 #include "runtime/prefetch.inline.hpp"
 #include "runtime/threads.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/align.hpp"
 #include "utilities/formatBuffer.hpp"
 #include "utilities/growableArray.hpp"
diff --git a/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp
index 5265d23b555..bdb732f6ebb 100644
--- a/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp
+++ b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.cpp
@@ -26,11 +26,11 @@
 #include "gc/g1/g1PageBasedVirtualSpace.hpp"
 #include "gc/shared/pretouchTask.hpp"
 #include "gc/shared/workerThread.hpp"
+#include "nmt/memTracker.hpp"
 #include "oops/markWord.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/os.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/align.hpp"
 #include "utilities/bitMap.inline.hpp"
 
diff --git a/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.cpp b/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.cpp
index 028b2a07487..5f903960cce 100644
--- a/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.cpp
+++ b/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.cpp
@@ -29,8 +29,8 @@
 #include "gc/shared/gc_globals.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/virtualspace.hpp"
+#include "nmt/memTracker.hpp"
 #include "runtime/mutexLocker.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/align.hpp"
 #include "utilities/bitMap.inline.hpp"
 #include "utilities/powerOfTwo.hpp"
diff --git a/src/hotspot/share/gc/parallel/objectStartArray.cpp b/src/hotspot/share/gc/parallel/objectStartArray.cpp
index 3e4820aa941..804b936393c 100644
--- a/src/hotspot/share/gc/parallel/objectStartArray.cpp
+++ b/src/hotspot/share/gc/parallel/objectStartArray.cpp
@@ -26,9 +26,9 @@
 #include "gc/parallel/objectStartArray.inline.hpp"
 #include "gc/shared/cardTableBarrierSet.hpp"
 #include "memory/allocation.inline.hpp"
+#include "nmt/memTracker.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/java.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/align.hpp"
 
 uint ObjectStartArray::_card_shift = 0;
diff --git a/src/hotspot/share/gc/parallel/parMarkBitMap.cpp b/src/hotspot/share/gc/parallel/parMarkBitMap.cpp
index 9cdd91652f0..54db633af52 100644
--- a/src/hotspot/share/gc/parallel/parMarkBitMap.cpp
+++ b/src/hotspot/share/gc/parallel/parMarkBitMap.cpp
@@ -26,10 +26,10 @@
 #include "gc/parallel/parMarkBitMap.inline.hpp"
 #include "gc/parallel/psCompactionManager.inline.hpp"
 #include "gc/parallel/psParallelCompact.inline.hpp"
+#include "nmt/memTracker.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/os.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/align.hpp"
 #include "utilities/bitMap.inline.hpp"
 
diff --git a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
index 57452cf07e5..190e01d9674 100644
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp
@@ -24,8 +24,8 @@
 
 #include "precompiled.hpp"
 #include "code/codeCache.hpp"
-#include "gc/parallel/parallelArguments.hpp"
 #include "gc/parallel/objectStartArray.inline.hpp"
+#include "gc/parallel/parallelArguments.hpp"
 #include "gc/parallel/parallelInitLogger.hpp"
 #include "gc/parallel/parallelScavengeHeap.inline.hpp"
 #include "gc/parallel/psAdaptiveSizePolicy.hpp"
@@ -35,10 +35,10 @@
 #include "gc/parallel/psScavenge.hpp"
 #include "gc/parallel/psVMOperations.hpp"
 #include "gc/shared/gcHeapSummary.hpp"
+#include "gc/shared/gcInitLogger.hpp"
 #include "gc/shared/gcLocker.inline.hpp"
 #include "gc/shared/gcWhen.hpp"
 #include "gc/shared/genArguments.hpp"
-#include "gc/shared/gcInitLogger.hpp"
 #include "gc/shared/locationPrinter.inline.hpp"
 #include "gc/shared/scavengableNMethods.hpp"
 #include "gc/shared/suspendibleThreadSet.hpp"
@@ -47,12 +47,12 @@
 #include "memory/metaspaceCounters.hpp"
 #include "memory/metaspaceUtils.hpp"
 #include "memory/universe.hpp"
+#include "nmt/memTracker.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/java.hpp"
 #include "runtime/vmThread.hpp"
 #include "services/memoryManager.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/vmError.hpp"
 
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
index b8ee8ef6163..496f6dd3529 100644
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
@@ -67,6 +67,7 @@
 #include "memory/metaspaceUtils.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
+#include "nmt/memTracker.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/instanceClassLoaderKlass.inline.hpp"
 #include "oops/instanceKlass.inline.hpp"
@@ -80,7 +81,6 @@
 #include "runtime/safepoint.hpp"
 #include "runtime/threads.hpp"
 #include "runtime/vmThread.hpp"
-#include "services/memTracker.hpp"
 #include "services/memoryService.hpp"
 #include "utilities/align.hpp"
 #include "utilities/debug.hpp"
diff --git a/src/hotspot/share/gc/serial/serialBlockOffsetTable.cpp b/src/hotspot/share/gc/serial/serialBlockOffsetTable.cpp
index 0fdeab92bab..721a8de5abc 100644
--- a/src/hotspot/share/gc/serial/serialBlockOffsetTable.cpp
+++ b/src/hotspot/share/gc/serial/serialBlockOffsetTable.cpp
@@ -30,9 +30,9 @@
 #include "logging/log.hpp"
 #include "memory/iterator.hpp"
 #include "memory/universe.hpp"
+#include "nmt/memTracker.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/java.hpp"
-#include "services/memTracker.hpp"
 
 //////////////////////////////////////////////////////////////////////
 // BlockOffsetSharedArray
diff --git a/src/hotspot/share/gc/shared/cardTable.cpp b/src/hotspot/share/gc/shared/cardTable.cpp
index ea173af015a..a5025a4e5a2 100644
--- a/src/hotspot/share/gc/shared/cardTable.cpp
+++ b/src/hotspot/share/gc/shared/cardTable.cpp
@@ -30,10 +30,10 @@
 #include "gc/shared/space.inline.hpp"
 #include "logging/log.hpp"
 #include "memory/virtualspace.hpp"
+#include "nmt/memTracker.hpp"
 #include "runtime/init.hpp"
 #include "runtime/java.hpp"
 #include "runtime/os.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/align.hpp"
 #if INCLUDE_PARALLELGC
 #include "gc/parallel/objectStartArray.hpp"
diff --git a/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp b/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp
index 24448b61e19..b7d706df6e3 100644
--- a/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp
+++ b/src/hotspot/share/gc/shared/cardTableBarrierSet.cpp
@@ -25,15 +25,15 @@
 #include "precompiled.hpp"
 #include "compiler/compilerDefinitions.inline.hpp"
 #include "gc/shared/cardTable.hpp"
-#include "gc/shared/cardTableBarrierSetAssembler.hpp"
 #include "gc/shared/cardTableBarrierSet.inline.hpp"
+#include "gc/shared/cardTableBarrierSetAssembler.hpp"
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/space.inline.hpp"
 #include "logging/log.hpp"
 #include "memory/virtualspace.hpp"
+#include "nmt/memTracker.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/javaThread.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/align.hpp"
 #include "utilities/macros.hpp"
 #ifdef COMPILER1
diff --git a/src/hotspot/share/gc/shared/oopStorage.cpp b/src/hotspot/share/gc/shared/oopStorage.cpp
index e91f9f2cd41..4d1a720bb34 100644
--- a/src/hotspot/share/gc/shared/oopStorage.cpp
+++ b/src/hotspot/share/gc/shared/oopStorage.cpp
@@ -28,6 +28,7 @@
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/allocation.inline.hpp"
+#include "nmt/memTracker.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/handles.inline.hpp"
@@ -39,7 +40,6 @@
 #include "runtime/os.hpp"
 #include "runtime/safefetch.hpp"
 #include "runtime/safepoint.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/align.hpp"
 #include "utilities/count_trailing_zeros.hpp"
 #include "utilities/debug.hpp"
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.cpp b/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.cpp
index cc5e58aee25..25062c5317d 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.cpp
@@ -30,7 +30,7 @@
 #include "gc/shenandoah/shenandoahHeapRegionSet.hpp"
 #include "gc/shenandoah/shenandoahUtils.hpp"
 #include "runtime/atomic.hpp"
-#include "services/memTracker.hpp"
+#include "nmt/memTracker.hpp"
 #include "utilities/copy.hpp"
 
 ShenandoahCollectionSet::ShenandoahCollectionSet(ShenandoahHeap* heap, ReservedSpace space, char* heap_base) :
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
index b6d77d1147e..13f9d430ca5 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
@@ -76,6 +76,8 @@
 #include "code/codeCache.hpp"
 #include "memory/classLoaderMetaspace.hpp"
 #include "memory/metaspaceUtils.hpp"
+#include "nmt/mallocTracker.hpp"
+#include "nmt/memTracker.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "prims/jvmtiTagMap.hpp"
 #include "runtime/atomic.hpp"
@@ -85,8 +87,6 @@
 #include "runtime/orderAccess.hpp"
 #include "runtime/safepointMechanism.hpp"
 #include "runtime/vmThread.hpp"
-#include "services/mallocTracker.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/events.hpp"
 #include "utilities/powerOfTwo.hpp"
 
diff --git a/src/hotspot/share/gc/x/xPhysicalMemory.cpp b/src/hotspot/share/gc/x/xPhysicalMemory.cpp
index 9519ae93ee1..ca093f73d71 100644
--- a/src/hotspot/share/gc/x/xPhysicalMemory.cpp
+++ b/src/hotspot/share/gc/x/xPhysicalMemory.cpp
@@ -31,11 +31,11 @@
 #include "gc/x/xNUMA.inline.hpp"
 #include "gc/x/xPhysicalMemory.inline.hpp"
 #include "logging/log.hpp"
+#include "nmt/memTracker.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/globals_extension.hpp"
 #include "runtime/init.hpp"
 #include "runtime/os.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/align.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
diff --git a/src/hotspot/share/gc/x/xVirtualMemory.cpp b/src/hotspot/share/gc/x/xVirtualMemory.cpp
index 650f22f3283..1d66cdd069e 100644
--- a/src/hotspot/share/gc/x/xVirtualMemory.cpp
+++ b/src/hotspot/share/gc/x/xVirtualMemory.cpp
@@ -27,7 +27,7 @@
 #include "gc/x/xAddressSpaceLimit.hpp"
 #include "gc/x/xGlobals.hpp"
 #include "gc/x/xVirtualMemory.inline.hpp"
-#include "services/memTracker.hpp"
+#include "nmt/memTracker.hpp"
 #include "utilities/align.hpp"
 #include "utilities/debug.hpp"
 
diff --git a/src/hotspot/share/gc/z/zNMT.cpp b/src/hotspot/share/gc/z/zNMT.cpp
index d8753dc2283..fa6c3cd6540 100644
--- a/src/hotspot/share/gc/z/zNMT.cpp
+++ b/src/hotspot/share/gc/z/zNMT.cpp
@@ -27,7 +27,7 @@
 #include "gc/z/zNMT.hpp"
 #include "gc/z/zVirtualMemory.hpp"
 #include "memory/allocation.hpp"
-#include "services/memTracker.hpp"
+#include "nmt/memTracker.hpp"
 #include "utilities/nativeCallStack.hpp"
 
 ZNMT::Reservation ZNMT::_reservations[ZMaxVirtualReservations] = {};
diff --git a/src/hotspot/share/jfr/periodic/jfrNativeMemoryEvent.cpp b/src/hotspot/share/jfr/periodic/jfrNativeMemoryEvent.cpp
index d440a5070b8..2b861081215 100644
--- a/src/hotspot/share/jfr/periodic/jfrNativeMemoryEvent.cpp
+++ b/src/hotspot/share/jfr/periodic/jfrNativeMemoryEvent.cpp
@@ -25,8 +25,8 @@
 #include "precompiled.hpp"
 #include "jfr/jfrEvents.hpp"
 #include "jfr/periodic/jfrNativeMemoryEvent.hpp"
-#include "services/memTracker.hpp"
-#include "services/nmtUsage.hpp"
+#include "nmt/memTracker.hpp"
+#include "nmt/nmtUsage.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/ticks.hpp"
 
diff --git a/src/hotspot/share/jfr/periodic/jfrNativeMemoryEvent.hpp b/src/hotspot/share/jfr/periodic/jfrNativeMemoryEvent.hpp
index fde4c284ab3..710198efddd 100644
--- a/src/hotspot/share/jfr/periodic/jfrNativeMemoryEvent.hpp
+++ b/src/hotspot/share/jfr/periodic/jfrNativeMemoryEvent.hpp
@@ -26,7 +26,7 @@
 #define SHARE_JFR_PERIODIC_JFRNATIVEMEMORYEVENT_HPP
 
 #include "memory/allocation.hpp"
-#include "services/nmtUsage.hpp"
+#include "nmt/nmtUsage.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/ticks.hpp"
 
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.cpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.cpp
index 78ef7f5b523..5cd9e6b253b 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.cpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.cpp
@@ -33,18 +33,19 @@
 #include "gc/shared/gcWhen.hpp"
 #include "jfr/leakprofiler/leakProfiler.hpp"
 #include "jfr/recorder/checkpoint/jfrCheckpointWriter.hpp"
-#include "jfr/recorder/checkpoint/types/jfrType.hpp"
-#include "jfr/recorder/jfrRecorder.hpp"
 #include "jfr/recorder/checkpoint/types/jfrThreadGroup.hpp"
 #include "jfr/recorder/checkpoint/types/jfrThreadState.hpp"
+#include "jfr/recorder/checkpoint/types/jfrType.hpp"
+#include "jfr/recorder/jfrRecorder.hpp"
 #include "jfr/support/jfrThreadLocal.hpp"
-#include "jfr/writers/jfrJavaEventWriter.hpp"
 #include "jfr/utilities/jfrThreadIterator.hpp"
+#include "jfr/writers/jfrJavaEventWriter.hpp"
 #include "memory/iterator.hpp"
 #include "memory/metaspace.hpp"
 #include "memory/metaspaceUtils.hpp"
 #include "memory/referenceType.hpp"
 #include "memory/universe.hpp"
+#include "nmt/nmtCommon.hpp"
 #include "oops/compressedOops.hpp"
 #include "runtime/flags/jvmFlag.hpp"
 #include "runtime/javaThread.hpp"
@@ -53,7 +54,6 @@
 #include "runtime/safepoint.hpp"
 #include "runtime/synchronizer.hpp"
 #include "runtime/vmOperations.hpp"
-#include "services/nmtCommon.hpp"
 #ifdef COMPILER2
 #include "opto/compile.hpp"
 #include "opto/node.hpp"
diff --git a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.cpp b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.cpp
index 6f73fdece3c..20c11009947 100644
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.cpp
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.cpp
@@ -34,10 +34,10 @@
 #include "jfr/utilities/jfrIterator.hpp"
 #include "jfr/utilities/jfrLinkedList.inline.hpp"
 #include "memory/resourceArea.hpp"
+#include "nmt/memTracker.hpp"
 #include "runtime/javaThread.hpp"
 #include "runtime/semaphore.hpp"
 #include "runtime/thread.inline.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/macros.hpp"
 
 class JfrSerializerRegistration : public JfrCHeapObj {
diff --git a/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.cpp b/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.cpp
index 254869c03b1..78309f00913 100644
--- a/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.cpp
+++ b/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.cpp
@@ -25,9 +25,9 @@
 #include "precompiled.hpp"
 #include "jfr/recorder/storage/jfrVirtualMemory.hpp"
 #include "memory/virtualspace.hpp"
+#include "nmt/memTracker.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/os.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 /*
diff --git a/src/hotspot/share/jfr/utilities/jfrAllocation.cpp b/src/hotspot/share/jfr/utilities/jfrAllocation.cpp
index a9d164c40b0..e9e41ac7cd8 100644
--- a/src/hotspot/share/jfr/utilities/jfrAllocation.cpp
+++ b/src/hotspot/share/jfr/utilities/jfrAllocation.cpp
@@ -27,9 +27,9 @@
 #include "jfr/utilities/jfrAllocation.hpp"
 #include "logging/log.hpp"
 #include "memory/allocation.inline.hpp"
+#include "nmt/memTracker.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/vm_version.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/nativeCallStack.hpp"
diff --git a/src/hotspot/share/jfr/utilities/jfrHashtable.hpp b/src/hotspot/share/jfr/utilities/jfrHashtable.hpp
index 54ba3eef044..530f19ac2c6 100644
--- a/src/hotspot/share/jfr/utilities/jfrHashtable.hpp
+++ b/src/hotspot/share/jfr/utilities/jfrHashtable.hpp
@@ -26,8 +26,8 @@
 #define SHARE_JFR_UTILITIES_JFRHASHTABLE_HPP
 
 #include "jfr/utilities/jfrAllocation.hpp"
+#include "nmt/memTracker.hpp"
 #include "runtime/atomic.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/macros.hpp"
 
diff --git a/src/hotspot/share/memory/allocation.cpp b/src/hotspot/share/memory/allocation.cpp
index 64b00a13694..57dc88620c0 100644
--- a/src/hotspot/share/memory/allocation.cpp
+++ b/src/hotspot/share/memory/allocation.cpp
@@ -28,10 +28,10 @@
 #include "memory/arena.hpp"
 #include "memory/metaspace.hpp"
 #include "memory/resourceArea.hpp"
+#include "nmt/memTracker.hpp"
 #include "runtime/os.hpp"
 #include "runtime/task.hpp"
 #include "runtime/threadCritical.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/ostream.hpp"
 
 // allocate using malloc; will fail if no memory available
diff --git a/src/hotspot/share/memory/arena.cpp b/src/hotspot/share/memory/arena.cpp
index f767255116c..44f1648921f 100644
--- a/src/hotspot/share/memory/arena.cpp
+++ b/src/hotspot/share/memory/arena.cpp
@@ -29,11 +29,11 @@
 #include "memory/allocation.inline.hpp"
 #include "memory/arena.hpp"
 #include "memory/resourceArea.hpp"
+#include "nmt/memTracker.inline.hpp"
 #include "runtime/os.hpp"
 #include "runtime/task.hpp"
 #include "runtime/threadCritical.hpp"
 #include "runtime/trimNativeHeap.hpp"
-#include "services/memTracker.inline.hpp"
 #include "utilities/align.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/ostream.hpp"
diff --git a/src/hotspot/share/memory/heap.cpp b/src/hotspot/share/memory/heap.cpp
index 3f584ccd1f1..98e59f58184 100644
--- a/src/hotspot/share/memory/heap.cpp
+++ b/src/hotspot/share/memory/heap.cpp
@@ -24,10 +24,10 @@
 
 #include "precompiled.hpp"
 #include "memory/heap.hpp"
+#include "nmt/memTracker.hpp"
 #include "oops/oop.inline.hpp"
-#include "runtime/os.hpp"
 #include "runtime/mutexLocker.hpp"
-#include "services/memTracker.hpp"
+#include "runtime/os.hpp"
 #include "utilities/align.hpp"
 #include "utilities/checkedCast.hpp"
 #include "utilities/powerOfTwo.hpp"
diff --git a/src/hotspot/share/memory/heapInspection.cpp b/src/hotspot/share/memory/heapInspection.cpp
index 820814f755c..262dc62d977 100644
--- a/src/hotspot/share/memory/heapInspection.cpp
+++ b/src/hotspot/share/memory/heapInspection.cpp
@@ -33,10 +33,10 @@
 #include "memory/heapInspection.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
+#include "nmt/memTracker.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/os.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/stack.inline.hpp"
diff --git a/src/hotspot/share/memory/metaspace.cpp b/src/hotspot/share/memory/metaspace.cpp
index b0d47dcce0d..de36cd8c7a8 100644
--- a/src/hotspot/share/memory/metaspace.cpp
+++ b/src/hotspot/share/memory/metaspace.cpp
@@ -31,7 +31,6 @@
 #include "logging/logStream.hpp"
 #include "memory/classLoaderMetaspace.hpp"
 #include "memory/metaspace.hpp"
-#include "memory/metaspaceCriticalAllocation.hpp"
 #include "memory/metaspace/chunkHeaderPool.hpp"
 #include "memory/metaspace/chunkManager.hpp"
 #include "memory/metaspace/commitLimiter.hpp"
@@ -42,11 +41,13 @@
 #include "memory/metaspace/metaspaceSettings.hpp"
 #include "memory/metaspace/runningCounters.hpp"
 #include "memory/metaspace/virtualSpaceList.hpp"
-#include "memory/metaspaceTracer.hpp"
+#include "memory/metaspaceCriticalAllocation.hpp"
 #include "memory/metaspaceStats.hpp"
+#include "memory/metaspaceTracer.hpp"
 #include "memory/metaspaceUtils.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
+#include "nmt/memTracker.hpp"
 #include "oops/compressedKlass.inline.hpp"
 #include "oops/compressedOops.hpp"
 #include "prims/jvmtiExport.hpp"
@@ -54,7 +55,6 @@
 #include "runtime/globals_extension.hpp"
 #include "runtime/init.hpp"
 #include "runtime/java.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/copy.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/formatBuffer.hpp"
diff --git a/src/hotspot/share/memory/metaspace/metaspaceDCmd.cpp b/src/hotspot/share/memory/metaspace/metaspaceDCmd.cpp
index db6d3631450..32fee96ad7d 100644
--- a/src/hotspot/share/memory/metaspace/metaspaceDCmd.cpp
+++ b/src/hotspot/share/memory/metaspace/metaspaceDCmd.cpp
@@ -29,9 +29,9 @@
 #include "memory/metaspace/metaspaceReporter.hpp"
 #include "memory/metaspaceUtils.hpp"
 #include "memory/resourceArea.hpp"
+#include "nmt/nmtCommon.hpp"
 #include "runtime/vmOperations.hpp"
 #include "services/diagnosticCommand.hpp"
-#include "services/nmtCommon.hpp"
 
 namespace metaspace {
 
diff --git a/src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp b/src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp
index 1ebda015eb3..dc5f7a6cdf1 100644
--- a/src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp
+++ b/src/hotspot/share/memory/metaspace/virtualSpaceNode.cpp
@@ -39,12 +39,12 @@
 #include "memory/metaspace/rootChunkArea.hpp"
 #include "memory/metaspace/runningCounters.hpp"
 #include "memory/metaspace/virtualSpaceNode.hpp"
+#include "nmt/memTracker.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/os.hpp"
 #include "sanitizers/address.hpp"
 #include "sanitizers/leak.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/align.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
diff --git a/src/hotspot/share/memory/resourceArea.cpp b/src/hotspot/share/memory/resourceArea.cpp
index bc01a7baaaa..f281274d98a 100644
--- a/src/hotspot/share/memory/resourceArea.cpp
+++ b/src/hotspot/share/memory/resourceArea.cpp
@@ -25,9 +25,9 @@
 #include "precompiled.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.inline.hpp"
+#include "nmt/memTracker.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/javaThread.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/vmError.hpp"
 
 void ResourceArea::bias_to(MEMFLAGS new_flags) {
diff --git a/src/hotspot/share/memory/resourceArea.inline.hpp b/src/hotspot/share/memory/resourceArea.inline.hpp
index 0cd7b8a28b9..d3e8364773a 100644
--- a/src/hotspot/share/memory/resourceArea.inline.hpp
+++ b/src/hotspot/share/memory/resourceArea.inline.hpp
@@ -26,8 +26,7 @@
 #define SHARE_MEMORY_RESOURCEAREA_INLINE_HPP
 
 #include "memory/resourceArea.hpp"
-
-#include "services/memTracker.hpp"
+#include "nmt/memTracker.hpp"
 
 inline char* ResourceArea::allocate_bytes(size_t size, AllocFailType alloc_failmode) {
 #ifdef ASSERT
diff --git a/src/hotspot/share/memory/virtualspace.cpp b/src/hotspot/share/memory/virtualspace.cpp
index 1a99b967436..fd73cbb3362 100644
--- a/src/hotspot/share/memory/virtualspace.cpp
+++ b/src/hotspot/share/memory/virtualspace.cpp
@@ -26,6 +26,7 @@
 #include "logging/log.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/virtualspace.hpp"
+#include "nmt/memTracker.hpp"
 #include "oops/compressedKlass.hpp"
 #include "oops/compressedOops.hpp"
 #include "oops/markWord.hpp"
@@ -33,7 +34,6 @@
 #include "runtime/globals_extension.hpp"
 #include "runtime/java.hpp"
 #include "runtime/os.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/align.hpp"
 #include "utilities/formatBuffer.hpp"
 #include "utilities/powerOfTwo.hpp"
diff --git a/src/hotspot/share/services/allocationSite.hpp b/src/hotspot/share/nmt/allocationSite.hpp
similarity index 93%
rename from src/hotspot/share/services/allocationSite.hpp
rename to src/hotspot/share/nmt/allocationSite.hpp
index 41ff2629509..5093bb39f0c 100644
--- a/src/hotspot/share/services/allocationSite.hpp
+++ b/src/hotspot/share/nmt/allocationSite.hpp
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_SERVICES_ALLOCATIONSITE_HPP
-#define SHARE_SERVICES_ALLOCATIONSITE_HPP
+#ifndef SHARE_NMT_ALLOCATIONSITE_HPP
+#define SHARE_NMT_ALLOCATIONSITE_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/nativeCallStack.hpp"
@@ -52,4 +52,4 @@ class AllocationSite {
   MEMFLAGS flag() const { return _flag; }
 };
 
-#endif // SHARE_SERVICES_ALLOCATIONSITE_HPP
+#endif // SHARE_NMT_ALLOCATIONSITE_HPP
diff --git a/src/hotspot/share/services/mallocHeader.cpp b/src/hotspot/share/nmt/mallocHeader.cpp
similarity index 96%
rename from src/hotspot/share/services/mallocHeader.cpp
rename to src/hotspot/share/nmt/mallocHeader.cpp
index 55f8169851a..57d1c4a313a 100644
--- a/src/hotspot/share/services/mallocHeader.cpp
+++ b/src/hotspot/share/nmt/mallocHeader.cpp
@@ -24,15 +24,13 @@
  */
 #include "precompiled.hpp"
 
-#include "services/mallocHeader.inline.hpp"
-
+#include "nmt/mallocHeader.inline.hpp"
+#include "nmt/mallocSiteTable.hpp"
 #include "runtime/os.hpp"
-#include "services/mallocSiteTable.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/nativeCallStack.hpp"
 #include "utilities/ostream.hpp"
 
-
 void MallocHeader::print_block_on_error(outputStream* st, address bad_address) const {
   assert(bad_address >= (address)this, "sanity");
 
diff --git a/src/hotspot/share/services/mallocHeader.hpp b/src/hotspot/share/nmt/mallocHeader.hpp
similarity index 98%
rename from src/hotspot/share/services/mallocHeader.hpp
rename to src/hotspot/share/nmt/mallocHeader.hpp
index 9a2ba3ff053..c0fae5803ce 100644
--- a/src/hotspot/share/services/mallocHeader.hpp
+++ b/src/hotspot/share/nmt/mallocHeader.hpp
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef SHARE_SERVICES_MALLOCHEADER_HPP
-#define SHARE_SERVICES_MALLOCHEADER_HPP
+#ifndef SHARE_NMT_MALLOCHEADER_HPP
+#define SHARE_NMT_MALLOCHEADER_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -165,4 +165,4 @@ public:
 STATIC_ASSERT(sizeof(MallocHeader) == (sizeof(uint64_t) * 2));
 
 
-#endif // SHARE_SERVICES_MALLOCHEADER_HPP
+#endif // SHARE_NMT_MALLOCHEADER_HPP
diff --git a/src/hotspot/share/services/mallocHeader.inline.hpp b/src/hotspot/share/nmt/mallocHeader.inline.hpp
similarity index 97%
rename from src/hotspot/share/services/mallocHeader.inline.hpp
rename to src/hotspot/share/nmt/mallocHeader.inline.hpp
index 669438c85fa..d763241b36d 100644
--- a/src/hotspot/share/services/mallocHeader.inline.hpp
+++ b/src/hotspot/share/nmt/mallocHeader.inline.hpp
@@ -23,10 +23,10 @@
  *
  */
 
-#ifndef SHARE_SERVICES_MALLOCHEADER_INLINE_HPP
-#define SHARE_SERVICES_MALLOCHEADER_INLINE_HPP
+#ifndef SHARE_NMT_MALLOCHEADER_INLINE_HPP
+#define SHARE_NMT_MALLOCHEADER_INLINE_HPP
 
-#include "services/mallocHeader.hpp"
+#include "nmt/mallocHeader.hpp"
 
 #include "jvm_io.h"
 #include "utilities/debug.hpp"
@@ -163,4 +163,4 @@ inline bool MallocHeader::check_block_integrity(char* msg, size_t msglen, addres
   return true;
 }
 
-#endif // SHARE_SERVICES_MALLOCHEADER_INLINE_HPP
+#endif // SHARE_NMT_MALLOCHEADER_INLINE_HPP
diff --git a/src/hotspot/share/services/mallocSiteTable.cpp b/src/hotspot/share/nmt/mallocSiteTable.cpp
similarity index 99%
rename from src/hotspot/share/services/mallocSiteTable.cpp
rename to src/hotspot/share/nmt/mallocSiteTable.cpp
index 2780e86d892..0fdf9e0f83d 100644
--- a/src/hotspot/share/services/mallocSiteTable.cpp
+++ b/src/hotspot/share/nmt/mallocSiteTable.cpp
@@ -23,10 +23,9 @@
  */
 #include "precompiled.hpp"
 
-
 #include "memory/allocation.inline.hpp"
+#include "nmt/mallocSiteTable.hpp"
 #include "runtime/atomic.hpp"
-#include "services/mallocSiteTable.hpp"
 
 // Malloc site hashtable buckets
 MallocSiteHashtableEntry**  MallocSiteTable::_table = nullptr;
diff --git a/src/hotspot/share/services/mallocSiteTable.hpp b/src/hotspot/share/nmt/mallocSiteTable.hpp
similarity index 96%
rename from src/hotspot/share/services/mallocSiteTable.hpp
rename to src/hotspot/share/nmt/mallocSiteTable.hpp
index 2b602527e98..47fe82b590a 100644
--- a/src/hotspot/share/services/mallocSiteTable.hpp
+++ b/src/hotspot/share/nmt/mallocSiteTable.hpp
@@ -22,14 +22,14 @@
  *
  */
 
-#ifndef SHARE_SERVICES_MALLOCSITETABLE_HPP
-#define SHARE_SERVICES_MALLOCSITETABLE_HPP
+#ifndef SHARE_NMT_MALLOCSITETABLE_HPP
+#define SHARE_NMT_MALLOCSITETABLE_HPP
 
 #include "memory/allocation.hpp"
+#include "nmt/allocationSite.hpp"
+#include "nmt/mallocTracker.hpp"
+#include "nmt/nmtCommon.hpp"
 #include "runtime/atomic.hpp"
-#include "services/allocationSite.hpp"
-#include "services/mallocTracker.hpp"
-#include "services/nmtCommon.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/nativeCallStack.hpp"
 
@@ -198,4 +198,4 @@ class MallocSiteTable : AllStatic {
   static const MallocSiteHashtableEntry*  _hash_entry_allocation_site;
 };
 
-#endif // SHARE_SERVICES_MALLOCSITETABLE_HPP
+#endif // SHARE_NMT_MALLOCSITETABLE_HPP
diff --git a/src/hotspot/share/services/mallocTracker.cpp b/src/hotspot/share/nmt/mallocTracker.cpp
similarity index 98%
rename from src/hotspot/share/services/mallocTracker.cpp
rename to src/hotspot/share/nmt/mallocTracker.cpp
index 0793ca6f4e9..5c02226654c 100644
--- a/src/hotspot/share/services/mallocTracker.cpp
+++ b/src/hotspot/share/nmt/mallocTracker.cpp
@@ -29,16 +29,16 @@
 #include "jvm_io.h"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
+#include "nmt/mallocHeader.inline.hpp"
+#include "nmt/mallocSiteTable.hpp"
+#include "nmt/mallocTracker.hpp"
+#include "nmt/memTracker.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/os.hpp"
 #include "runtime/safefetch.hpp"
-#include "services/mallocHeader.inline.hpp"
 #include "services/mallocLimit.hpp"
-#include "services/mallocSiteTable.hpp"
-#include "services/mallocTracker.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/ostream.hpp"
 #include "utilities/vmError.hpp"
diff --git a/src/hotspot/share/services/mallocTracker.hpp b/src/hotspot/share/nmt/mallocTracker.hpp
similarity index 98%
rename from src/hotspot/share/services/mallocTracker.hpp
rename to src/hotspot/share/nmt/mallocTracker.hpp
index cf9a623c0bd..ae56d31d786 100644
--- a/src/hotspot/share/services/mallocTracker.hpp
+++ b/src/hotspot/share/nmt/mallocTracker.hpp
@@ -23,14 +23,14 @@
  *
  */
 
-#ifndef SHARE_SERVICES_MALLOCTRACKER_HPP
-#define SHARE_SERVICES_MALLOCTRACKER_HPP
+#ifndef SHARE_NMT_MALLOCTRACKER_HPP
+#define SHARE_NMT_MALLOCTRACKER_HPP
 
 #include "memory/allocation.hpp"
+#include "nmt/mallocHeader.hpp"
+#include "nmt/nmtCommon.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/threadCritical.hpp"
-#include "services/mallocHeader.hpp"
-#include "services/nmtCommon.hpp"
 #include "utilities/nativeCallStack.hpp"
 
 class outputStream;
@@ -315,4 +315,4 @@ class MallocTracker : AllStatic {
   }
 };
 
-#endif // SHARE_SERVICES_MALLOCTRACKER_HPP
+#endif // SHARE_NMT_MALLOCTRACKER_HPP
diff --git a/src/hotspot/share/services/mallocTracker.inline.hpp b/src/hotspot/share/nmt/mallocTracker.inline.hpp
similarity index 93%
rename from src/hotspot/share/services/mallocTracker.inline.hpp
rename to src/hotspot/share/nmt/mallocTracker.inline.hpp
index 75eaf7c1054..f226d56bc3d 100644
--- a/src/hotspot/share/services/mallocTracker.inline.hpp
+++ b/src/hotspot/share/nmt/mallocTracker.inline.hpp
@@ -23,11 +23,11 @@
  *
  */
 
-#ifndef SHARE_SERVICES_MALLOCTRACKER_INLINE_HPP
-#define SHARE_SERVICES_MALLOCTRACKER_INLINE_HPP
+#ifndef SHARE_NMT_MALLOCTRACKER_INLINE_HPP
+#define SHARE_NMT_MALLOCTRACKER_INLINE_HPP
 
+#include "nmt/mallocTracker.hpp"
 #include "services/mallocLimit.hpp"
-#include "services/mallocTracker.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 
@@ -69,4 +69,4 @@ inline bool MallocTracker::check_exceeds_limit(size_t s, MEMFLAGS f) {
 }
 
 
-#endif // SHARE_SERVICES_MALLOCTRACKER_INLINE_HPP
+#endif // SHARE_NMT_MALLOCTRACKER_INLINE_HPP
diff --git a/src/hotspot/share/services/memBaseline.cpp b/src/hotspot/share/nmt/memBaseline.cpp
similarity index 99%
rename from src/hotspot/share/services/memBaseline.cpp
rename to src/hotspot/share/nmt/memBaseline.cpp
index df9c4d85aa8..637acc52458 100644
--- a/src/hotspot/share/services/memBaseline.cpp
+++ b/src/hotspot/share/nmt/memBaseline.cpp
@@ -26,10 +26,10 @@
 #include "classfile/classLoaderDataGraph.inline.hpp"
 #include "memory/allocation.hpp"
 #include "memory/metaspaceUtils.hpp"
+#include "nmt/memBaseline.hpp"
+#include "nmt/memTracker.hpp"
 #include "runtime/javaThread.hpp"
 #include "runtime/safepoint.hpp"
-#include "services/memBaseline.hpp"
-#include "services/memTracker.hpp"
 
 /*
  * Sizes are sorted in descenting order for reporting
diff --git a/src/hotspot/share/services/memBaseline.hpp b/src/hotspot/share/nmt/memBaseline.hpp
similarity index 96%
rename from src/hotspot/share/services/memBaseline.hpp
rename to src/hotspot/share/nmt/memBaseline.hpp
index fa44a454704..903f5580511 100644
--- a/src/hotspot/share/services/memBaseline.hpp
+++ b/src/hotspot/share/nmt/memBaseline.hpp
@@ -22,15 +22,15 @@
  *
  */
 
-#ifndef SHARE_SERVICES_MEMBASELINE_HPP
-#define SHARE_SERVICES_MEMBASELINE_HPP
+#ifndef SHARE_NMT_MEMBASELINE_HPP
+#define SHARE_NMT_MEMBASELINE_HPP
 
 #include "memory/metaspaceStats.hpp"
+#include "nmt/mallocSiteTable.hpp"
+#include "nmt/mallocTracker.hpp"
+#include "nmt/nmtCommon.hpp"
+#include "nmt/virtualMemoryTracker.hpp"
 #include "runtime/mutex.hpp"
-#include "services/mallocSiteTable.hpp"
-#include "services/mallocTracker.hpp"
-#include "services/nmtCommon.hpp"
-#include "services/virtualMemoryTracker.hpp"
 #include "utilities/linkedlist.hpp"
 
 typedef LinkedListIterator<MallocSite>                   MallocSiteIterator;
@@ -212,4 +212,4 @@ class MemBaseline {
   void virtual_memory_sites_to_reservation_site_order();
 };
 
-#endif // SHARE_SERVICES_MEMBASELINE_HPP
+#endif // SHARE_NMT_MEMBASELINE_HPP
diff --git a/src/hotspot/share/services/memReporter.cpp b/src/hotspot/share/nmt/memReporter.cpp
similarity index 99%
rename from src/hotspot/share/services/memReporter.cpp
rename to src/hotspot/share/nmt/memReporter.cpp
index 235ce96dba7..48470478b9b 100644
--- a/src/hotspot/share/services/memReporter.cpp
+++ b/src/hotspot/share/nmt/memReporter.cpp
@@ -26,10 +26,10 @@
 #include "memory/allocation.hpp"
 #include "memory/metaspace.hpp"
 #include "memory/metaspaceUtils.hpp"
-#include "services/mallocTracker.hpp"
-#include "services/memReporter.hpp"
-#include "services/threadStackTracker.hpp"
-#include "services/virtualMemoryTracker.hpp"
+#include "nmt/mallocTracker.hpp"
+#include "nmt/memReporter.hpp"
+#include "nmt/threadStackTracker.hpp"
+#include "nmt/virtualMemoryTracker.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 // Diff two counters, express them as signed, with range checks
diff --git a/src/hotspot/share/services/memReporter.hpp b/src/hotspot/share/nmt/memReporter.hpp
similarity index 97%
rename from src/hotspot/share/services/memReporter.hpp
rename to src/hotspot/share/nmt/memReporter.hpp
index b9e31d4bc4b..875f5b1d453 100644
--- a/src/hotspot/share/services/memReporter.hpp
+++ b/src/hotspot/share/nmt/memReporter.hpp
@@ -22,15 +22,15 @@
  *
  */
 
-#ifndef SHARE_SERVICES_MEMREPORTER_HPP
-#define SHARE_SERVICES_MEMREPORTER_HPP
+#ifndef SHARE_NMT_MEMREPORTER_HPP
+#define SHARE_NMT_MEMREPORTER_HPP
 
 #include "memory/metaspace.hpp"
+#include "nmt/mallocTracker.hpp"
+#include "nmt/memBaseline.hpp"
+#include "nmt/nmtCommon.hpp"
+#include "nmt/virtualMemoryTracker.hpp"
 #include "oops/instanceKlass.hpp"
-#include "services/memBaseline.hpp"
-#include "services/nmtCommon.hpp"
-#include "services/mallocTracker.hpp"
-#include "services/virtualMemoryTracker.hpp"
 
 /*
  * Base class that provides helpers
@@ -265,4 +265,4 @@ class MemDetailDiffReporter : public MemSummaryDiffReporter {
     size_t current_committed, size_t early_reserved, size_t early_committed, MEMFLAGS flag) const;
 };
 
-#endif // SHARE_SERVICES_MEMREPORTER_HPP
+#endif // SHARE_NMT_MEMREPORTER_HPP
diff --git a/src/hotspot/share/services/memTracker.cpp b/src/hotspot/share/nmt/memTracker.cpp
similarity index 95%
rename from src/hotspot/share/services/memTracker.cpp
rename to src/hotspot/share/nmt/memTracker.cpp
index fa2f78abc43..192be9ecc1d 100644
--- a/src/hotspot/share/services/memTracker.cpp
+++ b/src/hotspot/share/nmt/memTracker.cpp
@@ -27,19 +27,19 @@
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/metaspaceUtils.hpp"
+#include "nmt/mallocTracker.hpp"
+#include "nmt/memBaseline.hpp"
+#include "nmt/memReporter.hpp"
+#include "nmt/memTracker.hpp"
+#include "nmt/nmtCommon.hpp"
+#include "nmt/nmtPreInit.hpp"
+#include "nmt/threadStackTracker.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/orderAccess.hpp"
-#include "runtime/vmThread.hpp"
 #include "runtime/vmOperations.hpp"
-#include "services/memBaseline.hpp"
-#include "services/memReporter.hpp"
+#include "runtime/vmThread.hpp"
 #include "services/mallocLimit.hpp"
-#include "services/mallocTracker.hpp"
-#include "services/memTracker.hpp"
-#include "services/nmtCommon.hpp"
-#include "services/nmtPreInit.hpp"
-#include "services/threadStackTracker.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/defaultStream.hpp"
 #include "utilities/vmError.hpp"
diff --git a/src/hotspot/share/services/memTracker.hpp b/src/hotspot/share/nmt/memTracker.hpp
similarity index 96%
rename from src/hotspot/share/services/memTracker.hpp
rename to src/hotspot/share/nmt/memTracker.hpp
index fb687c202b0..a863c45a658 100644
--- a/src/hotspot/share/services/memTracker.hpp
+++ b/src/hotspot/share/nmt/memTracker.hpp
@@ -22,15 +22,15 @@
  *
  */
 
-#ifndef SHARE_SERVICES_MEMTRACKER_HPP
-#define SHARE_SERVICES_MEMTRACKER_HPP
+#ifndef SHARE_NMT_MEMTRACKER_HPP
+#define SHARE_NMT_MEMTRACKER_HPP
 
+#include "nmt/mallocTracker.hpp"
+#include "nmt/nmtCommon.hpp"
+#include "nmt/threadStackTracker.hpp"
+#include "nmt/virtualMemoryTracker.hpp"
 #include "runtime/mutexLocker.hpp"
 #include "runtime/threadCritical.hpp"
-#include "services/mallocTracker.hpp"
-#include "services/nmtCommon.hpp"
-#include "services/threadStackTracker.hpp"
-#include "services/virtualMemoryTracker.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/nativeCallStack.hpp"
 
@@ -250,4 +250,4 @@ class MemTracker : AllStatic {
   static Mutex*           _query_lock;
 };
 
-#endif // SHARE_SERVICES_MEMTRACKER_HPP
+#endif // SHARE_NMT_MEMTRACKER_HPP
diff --git a/src/hotspot/share/services/memTracker.inline.hpp b/src/hotspot/share/nmt/memTracker.inline.hpp
similarity index 85%
rename from src/hotspot/share/services/memTracker.inline.hpp
rename to src/hotspot/share/nmt/memTracker.inline.hpp
index 6c08f1154d0..500f2a75d8c 100644
--- a/src/hotspot/share/services/memTracker.inline.hpp
+++ b/src/hotspot/share/nmt/memTracker.inline.hpp
@@ -23,11 +23,12 @@
  *
  */
 
-#ifndef SHARE_SERVICES_MEMTRACKER_INLINE_HPP
-#define SHARE_SERVICES_MEMTRACKER_INLINE_HPP
+#ifndef SHARE_NMT_MEMTRACKER_INLINE_HPP
+#define SHARE_NMT_MEMTRACKER_INLINE_HPP
 
-#include "services/mallocTracker.inline.hpp"
-#include "services/memTracker.hpp"
+#include "nmt/memTracker.hpp"
+
+#include "nmt/mallocTracker.inline.hpp"
 
 inline bool MemTracker::check_exceeds_limit(size_t s, MEMFLAGS f) {
   if (!enabled()) {
@@ -36,4 +37,4 @@ inline bool MemTracker::check_exceeds_limit(size_t s, MEMFLAGS f) {
   return MallocTracker::check_exceeds_limit(s, f);
 }
 
-#endif // SHARE_SERVICES_MEMTRACKER_INLINE_HPP
+#endif // SHARE_NMT_MEMTRACKER_INLINE_HPP
diff --git a/src/hotspot/share/services/nmtCommon.cpp b/src/hotspot/share/nmt/nmtCommon.cpp
similarity index 98%
rename from src/hotspot/share/services/nmtCommon.cpp
rename to src/hotspot/share/nmt/nmtCommon.cpp
index 53d9daa5b52..dadb830f291 100644
--- a/src/hotspot/share/services/nmtCommon.cpp
+++ b/src/hotspot/share/nmt/nmtCommon.cpp
@@ -22,7 +22,7 @@
  *
  */
 #include "precompiled.hpp"
-#include "services/nmtCommon.hpp"
+#include "nmt/nmtCommon.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 STATIC_ASSERT(NMT_off > NMT_unknown);
diff --git a/src/hotspot/share/services/nmtCommon.hpp b/src/hotspot/share/nmt/nmtCommon.hpp
similarity index 97%
rename from src/hotspot/share/services/nmtCommon.hpp
rename to src/hotspot/share/nmt/nmtCommon.hpp
index 71a48f656d0..4dafaed04ce 100644
--- a/src/hotspot/share/services/nmtCommon.hpp
+++ b/src/hotspot/share/nmt/nmtCommon.hpp
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef SHARE_SERVICES_NMTCOMMON_HPP
-#define SHARE_SERVICES_NMTCOMMON_HPP
+#ifndef SHARE_NMT_NMTCOMMON_HPP
+#define SHARE_NMT_NMTCOMMON_HPP
 
 #include "memory/allocation.hpp" // for MEMFLAGS only
 #include "utilities/align.hpp"
@@ -139,4 +139,4 @@ class NMTUtil : AllStatic {
 };
 
 
-#endif // SHARE_SERVICES_NMTCOMMON_HPP
+#endif // SHARE_NMT_NMTCOMMON_HPP
diff --git a/src/hotspot/share/services/nmtDCmd.cpp b/src/hotspot/share/nmt/nmtDCmd.cpp
similarity index 98%
rename from src/hotspot/share/services/nmtDCmd.cpp
rename to src/hotspot/share/nmt/nmtDCmd.cpp
index d6f80613b37..80b2ed6141a 100644
--- a/src/hotspot/share/services/nmtDCmd.cpp
+++ b/src/hotspot/share/nmt/nmtDCmd.cpp
@@ -23,12 +23,12 @@
  */
 #include "precompiled.hpp"
 #include "memory/resourceArea.hpp"
+#include "nmt/memReporter.hpp"
+#include "nmt/memTracker.hpp"
+#include "nmt/nmtDCmd.hpp"
 #include "runtime/mutexLocker.hpp"
-#include "runtime/vmThread.hpp"
 #include "runtime/vmOperations.hpp"
-#include "services/nmtDCmd.hpp"
-#include "services/memReporter.hpp"
-#include "services/memTracker.hpp"
+#include "runtime/vmThread.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 NMTDCmd::NMTDCmd(outputStream* output,
diff --git a/src/hotspot/share/services/nmtDCmd.hpp b/src/hotspot/share/nmt/nmtDCmd.hpp
similarity index 92%
rename from src/hotspot/share/services/nmtDCmd.hpp
rename to src/hotspot/share/nmt/nmtDCmd.hpp
index 9a06abb9144..c70d17a481f 100644
--- a/src/hotspot/share/services/nmtDCmd.hpp
+++ b/src/hotspot/share/nmt/nmtDCmd.hpp
@@ -22,13 +22,13 @@
  *
  */
 
-#ifndef SHARE_SERVICES_NMTDCMD_HPP
-#define SHARE_SERVICES_NMTDCMD_HPP
+#ifndef SHARE_NMT_NMTDCMD_HPP
+#define SHARE_NMT_NMTDCMD_HPP
 
+#include "nmt/mallocTracker.hpp"
+#include "nmt/memBaseline.hpp"
 #include "services/diagnosticArgument.hpp"
 #include "services/diagnosticFramework.hpp"
-#include "services/memBaseline.hpp"
-#include "services/mallocTracker.hpp"
 
 /**
  * Native memory tracking DCmd implementation
@@ -70,4 +70,4 @@ class NMTDCmd: public DCmdWithParser {
   bool check_detail_tracking_level(outputStream* out);
 };
 
-#endif // SHARE_SERVICES_NMTDCMD_HPP
+#endif // SHARE_NMT_NMTDCMD_HPP
diff --git a/src/hotspot/share/services/nmtPreInit.cpp b/src/hotspot/share/nmt/nmtPreInit.cpp
similarity index 99%
rename from src/hotspot/share/services/nmtPreInit.cpp
rename to src/hotspot/share/nmt/nmtPreInit.cpp
index 35aec38a6f4..a8ff18f3b62 100644
--- a/src/hotspot/share/services/nmtPreInit.cpp
+++ b/src/hotspot/share/nmt/nmtPreInit.cpp
@@ -24,12 +24,12 @@
  */
 
 #include "precompiled.hpp"
+#include "nmt/nmtPreInit.hpp"
 #include "runtime/os.hpp"
-#include "services/nmtPreInit.hpp"
 #include "utilities/align.hpp"
 #include "utilities/debug.hpp"
-#include "utilities/ostream.hpp"
 #include "utilities/globalDefinitions.hpp"
+#include "utilities/ostream.hpp"
 
 // Obviously we cannot use os::malloc for any dynamic allocation during pre-NMT-init, so we must use
 // raw malloc; to make this very clear, wrap them.
diff --git a/src/hotspot/share/services/nmtPreInit.hpp b/src/hotspot/share/nmt/nmtPreInit.hpp
similarity index 98%
rename from src/hotspot/share/services/nmtPreInit.hpp
rename to src/hotspot/share/nmt/nmtPreInit.hpp
index 7705c5180d3..38a34616b3f 100644
--- a/src/hotspot/share/services/nmtPreInit.hpp
+++ b/src/hotspot/share/nmt/nmtPreInit.hpp
@@ -23,18 +23,17 @@
  *
  */
 
-#ifndef SHARE_SERVICES_NMT_PREINIT_HPP
-#define SHARE_SERVICES_NMT_PREINIT_HPP
+#ifndef SHARE_NMT_NMT_PREINIT_HPP
+#define SHARE_NMT_NMT_PREINIT_HPP
 
 #include "memory/allStatic.hpp"
-#ifdef ASSERT
-#include "runtime/atomic.hpp"
-#endif
-#include "services/memTracker.hpp"
-#include "utilities/checkedCast.hpp"
+#include "nmt/memTracker.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
+#ifdef ASSERT
+#include "runtime/atomic.hpp"
+#endif
 
 class outputStream;
 
@@ -378,5 +377,5 @@ public:
   DEBUG_ONLY(static void verify();)
 };
 
-#endif // SHARE_SERVICES_NMT_PREINIT_HPP
+#endif // SHARE_NMT_NMT_PREINIT_HPP
 
diff --git a/src/hotspot/share/services/nmtUsage.cpp b/src/hotspot/share/nmt/nmtUsage.cpp
similarity index 95%
rename from src/hotspot/share/services/nmtUsage.cpp
rename to src/hotspot/share/nmt/nmtUsage.cpp
index 03229ce4171..a00b3cdc90d 100644
--- a/src/hotspot/share/services/nmtUsage.cpp
+++ b/src/hotspot/share/nmt/nmtUsage.cpp
@@ -23,12 +23,12 @@
  */
 
 #include "precompiled.hpp"
+#include "nmt/mallocTracker.hpp"
+#include "nmt/nmtCommon.hpp"
+#include "nmt/nmtUsage.hpp"
+#include "nmt/threadStackTracker.hpp"
+#include "nmt/virtualMemoryTracker.hpp"
 #include "runtime/threadCritical.hpp"
-#include "services/nmtCommon.hpp"
-#include "services/nmtUsage.hpp"
-#include "services/mallocTracker.hpp"
-#include "services/threadStackTracker.hpp"
-#include "services/virtualMemoryTracker.hpp"
 
 // Enabled all options for snapshot.
 const NMTUsageOptions NMTUsage::OptionsAll = { true, true, true };
diff --git a/src/hotspot/share/services/nmtUsage.hpp b/src/hotspot/share/nmt/nmtUsage.hpp
similarity index 94%
rename from src/hotspot/share/services/nmtUsage.hpp
rename to src/hotspot/share/nmt/nmtUsage.hpp
index 38b7b43913f..cfff59db9af 100644
--- a/src/hotspot/share/services/nmtUsage.hpp
+++ b/src/hotspot/share/nmt/nmtUsage.hpp
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_SERVICES_NMTUSAGE_HPP
-#define SHARE_SERVICES_NMTUSAGE_HPP
+#ifndef SHARE_NMT_NMTUSAGE_HPP
+#define SHARE_NMT_NMTUSAGE_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -65,4 +65,4 @@ public:
   size_t committed(MEMFLAGS flag) const;
 };
 
-#endif // SHARE_SERVICES_NMTUSAGE_HPP
+#endif // SHARE_NMT_NMTUSAGE_HPP
diff --git a/src/hotspot/share/services/threadStackTracker.cpp b/src/hotspot/share/nmt/threadStackTracker.cpp
similarity index 96%
rename from src/hotspot/share/services/threadStackTracker.cpp
rename to src/hotspot/share/nmt/threadStackTracker.cpp
index decacc64c5d..6060b636153 100644
--- a/src/hotspot/share/services/threadStackTracker.cpp
+++ b/src/hotspot/share/nmt/threadStackTracker.cpp
@@ -24,11 +24,11 @@
 
 #include "precompiled.hpp"
 
+#include "nmt/mallocTracker.hpp"
+#include "nmt/memTracker.hpp"
+#include "nmt/threadStackTracker.hpp"
+#include "nmt/virtualMemoryTracker.hpp"
 #include "runtime/threadCritical.hpp"
-#include "services/mallocTracker.hpp"
-#include "services/memTracker.hpp"
-#include "services/virtualMemoryTracker.hpp"
-#include "services/threadStackTracker.hpp"
 
 volatile size_t ThreadStackTracker::_thread_count = 0;
 SortedLinkedList<SimpleThreadStackSite, ThreadStackTracker::compare_thread_stack_base>* ThreadStackTracker::_simple_thread_stacks = nullptr;
diff --git a/src/hotspot/share/services/threadStackTracker.hpp b/src/hotspot/share/nmt/threadStackTracker.hpp
similarity index 92%
rename from src/hotspot/share/services/threadStackTracker.hpp
rename to src/hotspot/share/nmt/threadStackTracker.hpp
index db7fc0e8569..6e2ec361954 100644
--- a/src/hotspot/share/services/threadStackTracker.hpp
+++ b/src/hotspot/share/nmt/threadStackTracker.hpp
@@ -22,14 +22,14 @@
  *
  */
 
-#ifndef SHARE_SERVICES_THREADSTACKTRACKER_HPP
-#define SHARE_SERVICES_THREADSTACKTRACKER_HPP
+#ifndef SHARE_NMT_THREADSTACKTRACKER_HPP
+#define SHARE_NMT_THREADSTACKTRACKER_HPP
 
-#include "services/allocationSite.hpp"
-#include "services/mallocSiteTable.hpp"
-#include "services/nmtCommon.hpp"
-#include "utilities/nativeCallStack.hpp"
+#include "nmt/allocationSite.hpp"
+#include "nmt/mallocSiteTable.hpp"
+#include "nmt/nmtCommon.hpp"
 #include "utilities/linkedlist.hpp"
+#include "utilities/nativeCallStack.hpp"
 
 class SimpleThreadStackSite : public AllocationSite {
   const address _base;
@@ -82,5 +82,5 @@ public:
   static bool walk_simple_thread_stack_site(MallocSiteWalker* walker);
 };
 
-#endif // SHARE_SERVICES_THREADSTACKTRACKER_HPP
+#endif // SHARE_NMT_THREADSTACKTRACKER_HPP
 
diff --git a/src/hotspot/share/services/virtualMemoryTracker.cpp b/src/hotspot/share/nmt/virtualMemoryTracker.cpp
similarity index 99%
rename from src/hotspot/share/services/virtualMemoryTracker.cpp
rename to src/hotspot/share/nmt/virtualMemoryTracker.cpp
index ebb32ecbeeb..65bd9afa2d6 100644
--- a/src/hotspot/share/services/virtualMemoryTracker.cpp
+++ b/src/hotspot/share/nmt/virtualMemoryTracker.cpp
@@ -23,13 +23,13 @@
  */
 #include "precompiled.hpp"
 #include "logging/log.hpp"
-#include "memory/metaspaceUtils.hpp"
 #include "memory/metaspaceStats.hpp"
+#include "memory/metaspaceUtils.hpp"
+#include "nmt/memTracker.hpp"
+#include "nmt/threadStackTracker.hpp"
+#include "nmt/virtualMemoryTracker.hpp"
 #include "runtime/os.hpp"
 #include "runtime/threadCritical.hpp"
-#include "services/memTracker.hpp"
-#include "services/threadStackTracker.hpp"
-#include "services/virtualMemoryTracker.hpp"
 #include "utilities/ostream.hpp"
 
 size_t VirtualMemorySummary::_snapshot[CALC_OBJ_SIZE_IN_TYPE(VirtualMemorySnapshot, size_t)];
diff --git a/src/hotspot/share/services/virtualMemoryTracker.hpp b/src/hotspot/share/nmt/virtualMemoryTracker.hpp
similarity index 98%
rename from src/hotspot/share/services/virtualMemoryTracker.hpp
rename to src/hotspot/share/nmt/virtualMemoryTracker.hpp
index 172c3cc7d0c..b6f89c278ce 100644
--- a/src/hotspot/share/services/virtualMemoryTracker.hpp
+++ b/src/hotspot/share/nmt/virtualMemoryTracker.hpp
@@ -22,19 +22,18 @@
  *
  */
 
-#ifndef SHARE_SERVICES_VIRTUALMEMORYTRACKER_HPP
-#define SHARE_SERVICES_VIRTUALMEMORYTRACKER_HPP
+#ifndef SHARE_NMT_VIRTUALMEMORYTRACKER_HPP
+#define SHARE_NMT_VIRTUALMEMORYTRACKER_HPP
 
 #include "memory/allocation.hpp"
 #include "memory/metaspace.hpp" // For MetadataType
 #include "memory/metaspaceStats.hpp"
-#include "services/allocationSite.hpp"
-#include "services/nmtCommon.hpp"
+#include "nmt/allocationSite.hpp"
+#include "nmt/nmtCommon.hpp"
 #include "utilities/linkedlist.hpp"
 #include "utilities/nativeCallStack.hpp"
 #include "utilities/ostream.hpp"
 
-
 /*
  * Virtual memory counter
  */
@@ -413,5 +412,5 @@ class VirtualMemoryTracker : AllStatic {
   static SortedLinkedList<ReservedMemoryRegion, compare_reserved_region_base>* _reserved_regions;
 };
 
-#endif // SHARE_SERVICES_VIRTUALMEMORYTRACKER_HPP
+#endif // SHARE_NMT_VIRTUALMEMORYTRACKER_HPP
 
diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
index 003f47b1e9c..c408bc23be7 100644
--- a/src/hotspot/share/oops/method.cpp
+++ b/src/hotspot/share/oops/method.cpp
@@ -41,14 +41,15 @@
 #include "interpreter/interpreter.hpp"
 #include "interpreter/oopMapCache.hpp"
 #include "logging/log.hpp"
-#include "logging/logTag.hpp"
 #include "logging/logStream.hpp"
+#include "logging/logTag.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/metadataFactory.hpp"
 #include "memory/metaspaceClosure.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
+#include "nmt/memTracker.hpp"
 #include "oops/constMethod.hpp"
 #include "oops/constantPool.hpp"
 #include "oops/klass.inline.hpp"
@@ -72,7 +73,6 @@
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/signature.hpp"
 #include "runtime/vm_version.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/align.hpp"
 #include "utilities/quickSort.hpp"
 #include "utilities/vmError.hpp"
diff --git a/src/hotspot/share/precompiled/precompiled.hpp b/src/hotspot/share/precompiled/precompiled.hpp
index c6b8668010e..c53a78de87b 100644
--- a/src/hotspot/share/precompiled/precompiled.hpp
+++ b/src/hotspot/share/precompiled/precompiled.hpp
@@ -42,6 +42,7 @@
 #include "memory/memRegion.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
+#include "nmt/memTracker.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/klass.hpp"
 #include "oops/method.hpp"
@@ -57,7 +58,6 @@
 #include "runtime/orderAccess.hpp"
 #include "runtime/os.hpp"
 #include "runtime/timer.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/align.hpp"
 #include "utilities/bitMap.hpp"
 #include "utilities/copy.hpp"
diff --git a/src/hotspot/share/prims/jni.cpp b/src/hotspot/share/prims/jni.cpp
index 2d73feba613..33dcfb6c3fe 100644
--- a/src/hotspot/share/prims/jni.cpp
+++ b/src/hotspot/share/prims/jni.cpp
@@ -52,6 +52,7 @@
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
+#include "nmt/memTracker.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/arrayOop.hpp"
 #include "oops/instanceKlass.inline.hpp"
@@ -88,7 +89,6 @@
 #include "runtime/synchronizer.hpp"
 #include "runtime/thread.inline.hpp"
 #include "runtime/vmOperations.hpp"
-#include "services/memTracker.hpp"
 #include "services/runtimeService.hpp"
 #include "utilities/defaultStream.hpp"
 #include "utilities/dtrace.hpp"
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
index e0f1b071c30..7afc0ea2c0c 100644
--- a/src/hotspot/share/prims/whitebox.cpp
+++ b/src/hotspot/share/prims/whitebox.cpp
@@ -56,6 +56,8 @@
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
+#include "nmt/mallocSiteTable.hpp"
+#include "nmt/memTracker.hpp"
 #include "oops/array.hpp"
 #include "oops/compressedOops.hpp"
 #include "oops/constantPool.inline.hpp"
@@ -88,9 +90,7 @@
 #include "runtime/threadSMR.hpp"
 #include "runtime/vframe.hpp"
 #include "runtime/vm_version.hpp"
-#include "services/mallocSiteTable.hpp"
 #include "services/memoryService.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/align.hpp"
 #include "utilities/checkedCast.hpp"
 #include "utilities/debug.hpp"
@@ -121,9 +121,9 @@
 #include "jvmci/jvmciRuntime.hpp"
 #endif
 #ifdef LINUX
-#include "os_linux.hpp"
-#include "osContainer_linux.hpp"
 #include "cgroupSubsystem_linux.hpp"
+#include "osContainer_linux.hpp"
+#include "os_linux.hpp"
 #endif
 
 #define CHECK_JNI_EXCEPTION_(env, value)                               \
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
index 33686a3b6e9..9b229c171c0 100644
--- a/src/hotspot/share/runtime/arguments.cpp
+++ b/src/hotspot/share/runtime/arguments.cpp
@@ -42,6 +42,7 @@
 #include "logging/logStream.hpp"
 #include "logging/logTag.hpp"
 #include "memory/allocation.inline.hpp"
+#include "nmt/nmtCommon.hpp"
 #include "oops/compressedKlass.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/oop.inline.hpp"
@@ -59,7 +60,6 @@
 #include "runtime/synchronizer.hpp"
 #include "runtime/vm_version.hpp"
 #include "services/management.hpp"
-#include "services/nmtCommon.hpp"
 #include "utilities/align.hpp"
 #include "utilities/checkedCast.hpp"
 #include "utilities/debug.hpp"
diff --git a/src/hotspot/share/runtime/init.cpp b/src/hotspot/share/runtime/init.cpp
index 17dfb445792..3343521af62 100644
--- a/src/hotspot/share/runtime/init.cpp
+++ b/src/hotspot/share/runtime/init.cpp
@@ -32,20 +32,20 @@
 #include "interpreter/bytecodes.hpp"
 #include "logging/logAsyncWriter.hpp"
 #include "memory/universe.hpp"
+#include "nmt/memTracker.hpp"
+#include "prims/downcallLinker.hpp"
 #include "prims/jvmtiExport.hpp"
 #include "prims/methodHandles.hpp"
-#include "prims/downcallLinker.hpp"
-#include "runtime/globals.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/continuation.hpp"
 #include "runtime/flags/jvmFlag.hpp"
+#include "runtime/globals.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/icache.hpp"
 #include "runtime/init.hpp"
 #include "runtime/safepoint.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "sanitizers/leak.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/macros.hpp"
 #if INCLUDE_JVMCI
 #include "jvmci/jvmci.hpp"
diff --git a/src/hotspot/share/runtime/java.cpp b/src/hotspot/share/runtime/java.cpp
index d075b6cb9c8..a5e0d55fe14 100644
--- a/src/hotspot/share/runtime/java.cpp
+++ b/src/hotspot/share/runtime/java.cpp
@@ -46,6 +46,7 @@
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
+#include "nmt/memTracker.hpp"
 #include "oops/constantPool.hpp"
 #include "oops/generateOopMap.hpp"
 #include "oops/instanceKlass.hpp"
@@ -76,7 +77,6 @@
 #include "runtime/vmThread.hpp"
 #include "runtime/vm_version.hpp"
 #include "sanitizers/leak.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/dtrace.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
diff --git a/src/hotspot/share/runtime/os.cpp b/src/hotspot/share/runtime/os.cpp
index 41b951b8801..0fea576269b 100644
--- a/src/hotspot/share/runtime/os.cpp
+++ b/src/hotspot/share/runtime/os.cpp
@@ -39,10 +39,15 @@
 #include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
+#include "nmt/mallocHeader.inline.hpp"
+#include "nmt/mallocTracker.hpp"
+#include "nmt/memTracker.inline.hpp"
+#include "nmt/nmtCommon.hpp"
+#include "nmt/nmtPreInit.hpp"
 #include "oops/compressedKlass.inline.hpp"
 #include "oops/oop.inline.hpp"
-#include "prims/jvmtiAgent.hpp"
 #include "prims/jvm_misc.hpp"
+#include "prims/jvmtiAgent.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/frame.inline.hpp"
@@ -63,11 +68,6 @@
 #include "runtime/vm_version.hpp"
 #include "sanitizers/address.hpp"
 #include "services/attachListener.hpp"
-#include "services/mallocTracker.hpp"
-#include "services/mallocHeader.inline.hpp"
-#include "services/memTracker.inline.hpp"
-#include "services/nmtPreInit.hpp"
-#include "services/nmtCommon.hpp"
 #include "services/threadService.hpp"
 #include "utilities/align.hpp"
 #include "utilities/checkedCast.hpp"
diff --git a/src/hotspot/share/runtime/park.cpp b/src/hotspot/share/runtime/park.cpp
index 03560974d05..56eb00b5019 100644
--- a/src/hotspot/share/runtime/park.cpp
+++ b/src/hotspot/share/runtime/park.cpp
@@ -24,8 +24,8 @@
 
 #include "precompiled.hpp"
 #include "memory/allocation.inline.hpp"
+#include "nmt/memTracker.hpp"
 #include "runtime/javaThread.hpp"
-#include "services/memTracker.hpp"
 
 // Lifecycle management for TSM ParkEvents.
 // ParkEvents are type-stable (TSM).
diff --git a/src/hotspot/share/runtime/safepointMechanism.cpp b/src/hotspot/share/runtime/safepointMechanism.cpp
index 63f237df7e8..624583db3d1 100644
--- a/src/hotspot/share/runtime/safepointMechanism.cpp
+++ b/src/hotspot/share/runtime/safepointMechanism.cpp
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "logging/log.hpp"
+#include "nmt/memTracker.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/javaThread.inline.hpp"
 #include "runtime/orderAccess.hpp"
@@ -31,7 +32,6 @@
 #include "runtime/osThread.hpp"
 #include "runtime/safepointMechanism.inline.hpp"
 #include "runtime/stackWatermarkSet.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 uintptr_t SafepointMechanism::_poll_word_armed_value;
diff --git a/src/hotspot/share/runtime/thread.cpp b/src/hotspot/share/runtime/thread.cpp
index 1023ab8bac2..851e5139f8a 100644
--- a/src/hotspot/share/runtime/thread.cpp
+++ b/src/hotspot/share/runtime/thread.cpp
@@ -34,6 +34,7 @@
 #include "memory/allocation.inline.hpp"
 #include "memory/iterator.hpp"
 #include "memory/resourceArea.hpp"
+#include "nmt/memTracker.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/handles.inline.hpp"
@@ -45,7 +46,6 @@
 #include "runtime/safepointMechanism.inline.hpp"
 #include "runtime/thread.inline.hpp"
 #include "runtime/threadSMR.inline.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/spinYield.hpp"
 #if INCLUDE_JFR
diff --git a/src/hotspot/share/runtime/threads.cpp b/src/hotspot/share/runtime/threads.cpp
index 276c3e362f0..b07f6e21d20 100644
--- a/src/hotspot/share/runtime/threads.cpp
+++ b/src/hotspot/share/runtime/threads.cpp
@@ -52,17 +52,18 @@
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
+#include "nmt/memTracker.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/klass.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/symbol.hpp"
-#include "prims/jvmtiAgentList.hpp"
 #include "prims/jvm_misc.hpp"
+#include "prims/jvmtiAgentList.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/fieldDescriptor.inline.hpp"
 #include "runtime/flags/jvmFlagLimit.hpp"
-#include "runtime/handles.inline.hpp"
 #include "runtime/globals.hpp"
+#include "runtime/handles.inline.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/java.hpp"
 #include "runtime/javaCalls.hpp"
@@ -83,8 +84,8 @@
 #include "runtime/statSampler.hpp"
 #include "runtime/stubCodeGenerator.hpp"
 #include "runtime/thread.inline.hpp"
-#include "runtime/threads.hpp"
 #include "runtime/threadSMR.inline.hpp"
+#include "runtime/threads.hpp"
 #include "runtime/timer.hpp"
 #include "runtime/timerTrace.hpp"
 #include "runtime/trimNativeHeap.hpp"
@@ -92,7 +93,6 @@
 #include "runtime/vm_version.hpp"
 #include "services/attachListener.hpp"
 #include "services/management.hpp"
-#include "services/memTracker.hpp"
 #include "services/threadIdTable.hpp"
 #include "services/threadService.hpp"
 #include "utilities/dtrace.hpp"
diff --git a/src/hotspot/share/services/diagnosticCommand.cpp b/src/hotspot/share/services/diagnosticCommand.cpp
index a54f2ebaa70..98bfcbafd29 100644
--- a/src/hotspot/share/services/diagnosticCommand.cpp
+++ b/src/hotspot/share/services/diagnosticCommand.cpp
@@ -24,9 +24,9 @@
 
 #include "precompiled.hpp"
 #include "cds/cds_globals.hpp"
+#include "classfile/classLoaderDataGraph.hpp"
 #include "classfile/classLoaderHierarchyDCmd.hpp"
 #include "classfile/classLoaderStats.hpp"
-#include "classfile/classLoaderDataGraph.hpp"
 #include "classfile/javaClasses.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "classfile/vmClasses.hpp"
@@ -40,6 +40,7 @@
 #include "memory/metaspace/metaspaceDCmd.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
+#include "nmt/nmtDCmd.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/objArrayOop.inline.hpp"
 #include "oops/oop.inline.hpp"
@@ -59,7 +60,6 @@
 #include "services/diagnosticFramework.hpp"
 #include "services/heapDumper.hpp"
 #include "services/management.hpp"
-#include "services/nmtDCmd.hpp"
 #include "services/writeableFlags.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/events.hpp"
@@ -67,8 +67,8 @@
 #include "utilities/macros.hpp"
 #include "utilities/parseInteger.hpp"
 #ifdef LINUX
-#include "trimCHeapDCmd.hpp"
 #include "mallocInfoDcmd.hpp"
+#include "trimCHeapDCmd.hpp"
 #endif
 
 static void loadAgentModule(TRAPS) {
diff --git a/src/hotspot/share/services/mallocLimit.cpp b/src/hotspot/share/services/mallocLimit.cpp
index 4f96bb582f2..392b20f61ef 100644
--- a/src/hotspot/share/services/mallocLimit.cpp
+++ b/src/hotspot/share/services/mallocLimit.cpp
@@ -26,10 +26,10 @@
 #include "precompiled.hpp"
 
 #include "memory/allocation.hpp"
+#include "nmt/nmtCommon.hpp"
 #include "runtime/java.hpp"
 #include "runtime/globals.hpp"
 #include "services/mallocLimit.hpp"
-#include "services/nmtCommon.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/parseInteger.hpp"
 #include "utilities/ostream.hpp"
diff --git a/src/hotspot/share/utilities/debug.cpp b/src/hotspot/share/utilities/debug.cpp
index c918d8d04b3..d39335c6307 100644
--- a/src/hotspot/share/utilities/debug.cpp
+++ b/src/hotspot/share/utilities/debug.cpp
@@ -37,6 +37,9 @@
 #include "memory/allocation.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
+#include "nmt/mallocTracker.hpp"
+#include "nmt/memTracker.hpp"
+#include "nmt/virtualMemoryTracker.hpp"
 #include "oops/klass.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/atomic.hpp"
@@ -54,9 +57,6 @@
 #include "runtime/vframe.hpp"
 #include "runtime/vm_version.hpp"
 #include "services/heapDumper.hpp"
-#include "services/mallocTracker.hpp"
-#include "services/memTracker.hpp"
-#include "services/virtualMemoryTracker.hpp"
 #include "utilities/defaultStream.hpp"
 #include "utilities/events.hpp"
 #include "utilities/formatBuffer.hpp"
diff --git a/src/hotspot/share/utilities/nativeCallStack.hpp b/src/hotspot/share/utilities/nativeCallStack.hpp
index 841b2cb2045..d61867c1dea 100644
--- a/src/hotspot/share/utilities/nativeCallStack.hpp
+++ b/src/hotspot/share/utilities/nativeCallStack.hpp
@@ -26,7 +26,7 @@
 #define SHARE_UTILITIES_NATIVECALLSTACK_HPP
 
 #include "memory/allocation.hpp"
-#include "services/nmtCommon.hpp"
+#include "nmt/nmtCommon.hpp"
 #include "utilities/ostream.hpp"
 
 /*
diff --git a/src/hotspot/share/utilities/vmError.cpp b/src/hotspot/share/utilities/vmError.cpp
index 2f4aec97868..9cf434fa218 100644
--- a/src/hotspot/share/utilities/vmError.cpp
+++ b/src/hotspot/share/utilities/vmError.cpp
@@ -38,14 +38,15 @@
 #include "memory/metaspaceUtils.hpp"
 #include "memory/resourceArea.inline.hpp"
 #include "memory/universe.hpp"
+#include "nmt/memTracker.hpp"
 #include "oops/compressedOops.hpp"
 #include "prims/whitebox.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/flags/jvmFlag.hpp"
 #include "runtime/frame.inline.hpp"
-#include "runtime/javaThread.inline.hpp"
 #include "runtime/init.hpp"
+#include "runtime/javaThread.inline.hpp"
 #include "runtime/os.inline.hpp"
 #include "runtime/osThread.hpp"
 #include "runtime/safefetch.hpp"
@@ -55,10 +56,9 @@
 #include "runtime/threads.hpp"
 #include "runtime/threadSMR.hpp"
 #include "runtime/trimNativeHeap.hpp"
-#include "runtime/vmThread.hpp"
 #include "runtime/vmOperations.hpp"
+#include "runtime/vmThread.hpp"
 #include "runtime/vm_version.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/decoder.hpp"
 #include "utilities/defaultStream.hpp"
diff --git a/test/hotspot/gtest/nmt/test_nmt_buffer_overflow_detection.cpp b/test/hotspot/gtest/nmt/test_nmt_buffer_overflow_detection.cpp
index ce30fb8d61d..d293f59367c 100644
--- a/test/hotspot/gtest/nmt/test_nmt_buffer_overflow_detection.cpp
+++ b/test/hotspot/gtest/nmt/test_nmt_buffer_overflow_detection.cpp
@@ -24,8 +24,8 @@
 
 #include "precompiled.hpp"
 #include "memory/allocation.hpp"
+#include "nmt/memTracker.hpp"
 #include "runtime/os.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/ostream.hpp"
 #include "unittest.hpp"
diff --git a/test/hotspot/gtest/nmt/test_nmt_cornercases.cpp b/test/hotspot/gtest/nmt/test_nmt_cornercases.cpp
index 695c586b1d8..f590b2509b2 100644
--- a/test/hotspot/gtest/nmt/test_nmt_cornercases.cpp
+++ b/test/hotspot/gtest/nmt/test_nmt_cornercases.cpp
@@ -24,10 +24,10 @@
 
 #include "precompiled.hpp"
 #include "memory/allocation.hpp"
+#include "nmt/mallocHeader.inline.hpp"
+#include "nmt/mallocTracker.hpp"
+#include "nmt/memTracker.hpp"
 #include "runtime/os.hpp"
-#include "services/mallocHeader.inline.hpp"
-#include "services/mallocTracker.hpp"
-#include "services/memTracker.hpp"
 #include "testutils.hpp"
 #include "unittest.hpp"
 
diff --git a/test/hotspot/gtest/nmt/test_nmt_locationprinting.cpp b/test/hotspot/gtest/nmt/test_nmt_locationprinting.cpp
index 8760f22baa9..cafeeb424f0 100644
--- a/test/hotspot/gtest/nmt/test_nmt_locationprinting.cpp
+++ b/test/hotspot/gtest/nmt/test_nmt_locationprinting.cpp
@@ -24,9 +24,9 @@
 
 #include "precompiled.hpp"
 #include "memory/allocation.hpp"
+#include "nmt/mallocHeader.inline.hpp"
+#include "nmt/memTracker.hpp"
 #include "runtime/os.hpp"
-#include "services/mallocHeader.inline.hpp"
-#include "services/memTracker.hpp"
 #include "unittest.hpp"
 
 // Uncomment to get test output
diff --git a/test/hotspot/gtest/nmt/test_nmt_malloclimit.cpp b/test/hotspot/gtest/nmt/test_nmt_malloclimit.cpp
index ab235258756..003063144f3 100644
--- a/test/hotspot/gtest/nmt/test_nmt_malloclimit.cpp
+++ b/test/hotspot/gtest/nmt/test_nmt_malloclimit.cpp
@@ -24,14 +24,13 @@
 
 #include "precompiled.hpp"
 #include "memory/allocation.hpp"
+#include "nmt/memTracker.hpp"
+#include "nmt/nmtCommon.hpp"
 #include "runtime/os.hpp"
 #include "services/mallocLimit.hpp"
-#include "services/memTracker.hpp"
-#include "services/nmtCommon.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/ostream.hpp"
-
 #include "testutils.hpp"
 #include "unittest.hpp"
 
diff --git a/test/hotspot/gtest/nmt/test_nmt_reserved_region.cpp b/test/hotspot/gtest/nmt/test_nmt_reserved_region.cpp
index 753a374fdbb..0708ce5f300 100644
--- a/test/hotspot/gtest/nmt/test_nmt_reserved_region.cpp
+++ b/test/hotspot/gtest/nmt/test_nmt_reserved_region.cpp
@@ -23,9 +23,9 @@
  */
 
 #include "precompiled.hpp"
+#include "nmt/memTracker.hpp"
+#include "nmt/virtualMemoryTracker.hpp"
 #include "runtime/os.hpp"
-#include "services/memTracker.hpp"
-#include "services/virtualMemoryTracker.hpp"
 #include "unittest.hpp"
 
 // Tests the assignment operator of ReservedMemoryRegion
diff --git a/test/hotspot/gtest/nmt/test_nmt_totals.cpp b/test/hotspot/gtest/nmt/test_nmt_totals.cpp
index 9f1319f4f04..bf2c1397e7d 100644
--- a/test/hotspot/gtest/nmt/test_nmt_totals.cpp
+++ b/test/hotspot/gtest/nmt/test_nmt_totals.cpp
@@ -24,9 +24,9 @@
 
 #include "precompiled.hpp"
 #include "memory/allocation.hpp"
+#include "nmt/mallocTracker.hpp"
+#include "nmt/memTracker.hpp"
 #include "runtime/os.hpp"
-#include "services/mallocTracker.hpp"
-#include "services/memTracker.hpp"
 #include "unittest.hpp"
 
 // convenience log. switch on if debugging tests. Don't use tty, plain stdio only.
diff --git a/test/hotspot/gtest/nmt/test_nmtpreinit.cpp b/test/hotspot/gtest/nmt/test_nmtpreinit.cpp
index 9befda97bdc..745e4ac3476 100644
--- a/test/hotspot/gtest/nmt/test_nmtpreinit.cpp
+++ b/test/hotspot/gtest/nmt/test_nmtpreinit.cpp
@@ -24,9 +24,9 @@
 
 #include "precompiled.hpp"
 #include "memory/allocation.hpp"
+#include "nmt/memTracker.hpp"
+#include "nmt/nmtPreInit.hpp"
 #include "runtime/os.hpp"
-#include "services/memTracker.hpp"
-#include "services/nmtPreInit.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/ostream.hpp"
 #include "unittest.hpp"
diff --git a/test/hotspot/gtest/nmt/test_nmtpreinitmap.cpp b/test/hotspot/gtest/nmt/test_nmtpreinitmap.cpp
index cf4a77c3976..f0802e25a44 100644
--- a/test/hotspot/gtest/nmt/test_nmtpreinitmap.cpp
+++ b/test/hotspot/gtest/nmt/test_nmtpreinitmap.cpp
@@ -25,8 +25,8 @@
 #include "precompiled.hpp"
 #include "jvm_io.h"
 #include "memory/allocation.hpp"
+#include "nmt/nmtPreInit.hpp"
 #include "runtime/os.hpp"
-#include "services/nmtPreInit.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/ostream.hpp"
 #include "unittest.hpp"
diff --git a/test/hotspot/gtest/runtime/test_committed_virtualmemory.cpp b/test/hotspot/gtest/runtime/test_committed_virtualmemory.cpp
index 98353e5ea50..5d6bd01af42 100644
--- a/test/hotspot/gtest/runtime/test_committed_virtualmemory.cpp
+++ b/test/hotspot/gtest/runtime/test_committed_virtualmemory.cpp
@@ -22,9 +22,9 @@
  */
 
 #include "precompiled.hpp"
+#include "nmt/memTracker.hpp"
+#include "nmt/virtualMemoryTracker.hpp"
 #include "runtime/thread.hpp"
-#include "services/memTracker.hpp"
-#include "services/virtualMemoryTracker.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
 #include "unittest.hpp"
diff --git a/test/hotspot/gtest/runtime/test_os.cpp b/test/hotspot/gtest/runtime/test_os.cpp
index 035210218c4..337484eeaec 100644
--- a/test/hotspot/gtest/runtime/test_os.cpp
+++ b/test/hotspot/gtest/runtime/test_os.cpp
@@ -24,12 +24,12 @@
 #include "precompiled.hpp"
 #include "memory/allocation.hpp"
 #include "memory/resourceArea.hpp"
+#include "nmt/memTracker.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/os.inline.hpp"
 #include "runtime/thread.hpp"
 #include "runtime/threads.hpp"
-#include "services/memTracker.hpp"
 #include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
diff --git a/test/hotspot/gtest/runtime/test_virtualMemoryTracker.cpp b/test/hotspot/gtest/runtime/test_virtualMemoryTracker.cpp
index 4aa058dc160..596934e39a8 100644
--- a/test/hotspot/gtest/runtime/test_virtualMemoryTracker.cpp
+++ b/test/hotspot/gtest/runtime/test_virtualMemoryTracker.cpp
@@ -33,8 +33,8 @@
 #include "precompiled.hpp"
 
 #include "memory/virtualspace.hpp"
-#include "services/memTracker.hpp"
-#include "services/virtualMemoryTracker.hpp"
+#include "nmt/memTracker.hpp"
+#include "nmt/virtualMemoryTracker.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
 #include "unittest.hpp"