diff --git a/jdk/make/CompileDemos.gmk b/jdk/make/CompileDemos.gmk
index 123711d102c..1d1f99897c1 100644
--- a/jdk/make/CompileDemos.gmk
+++ b/jdk/make/CompileDemos.gmk
@@ -314,19 +314,6 @@ $(eval $(call SetupJVMTIDemo,compiledMethodLoad, agent_util))
 $(eval $(call SetupJVMTIDemo,gctest, agent_util))
 $(eval $(call SetupJVMTIDemo,heapTracker, agent_util java_crw_demo))
 $(eval $(call SetupJVMTIDemo,heapViewer, agent_util))
-
-# On AIX, hprof requires 'dladdr' from src/aix/porting/porting_aix.cpp
-BUILD_LIBHPROF_AIX_EXTRA_SRC :=
-BUILD_LIBHPROF_AIX_EXTRA_CFLAGS :=
-ifeq ($(OPENJDK_TARGET_OS), aix)
-  BUILD_LIBHPROF_AIX_EXTRA_SRC += $(JDK_TOPDIR)/src/aix/porting
-  BUILD_LIBHPROF_AIX_EXTRA_CFLAGS += -I$(JDK_TOPDIR)/src/aix/porting
-endif
-
-$(eval $(call SetupJVMTIDemo,hprof, java_crw_demo, \
-    $(BUILD_LIBHPROF_AIX_EXTRA_CFLAGS), C, \
-    -ldl, ws2_32.lib winmm.lib, -lsocket -lnsl, -lpthread, $(BUILD_LIBHPROF_AIX_EXTRA_SRC)))
-
 $(eval $(call SetupJVMTIDemo,minst, agent_util java_crw_demo))
 $(eval $(call SetupJVMTIDemo,mtrace, agent_util java_crw_demo))
 $(eval $(call SetupJVMTIDemo,waiters, agent_util, , C++))
diff --git a/jdk/make/copy/Copy-jdk.hprof.agent.gmk b/jdk/make/copy/Copy-jdk.hprof.agent.gmk
index 738af52b20d..069e915514f 100644
--- a/jdk/make/copy/Copy-jdk.hprof.agent.gmk
+++ b/jdk/make/copy/Copy-jdk.hprof.agent.gmk
@@ -27,7 +27,7 @@ include CopyCommon.gmk
 
 ################################################################################
 
-HPROF_SRC := $(JDK_TOPDIR)/src/demo/share/jvmti/hprof/jvm.hprof.txt
+HPROF_SRC := $(JDK_TOPDIR)/src/jdk.hprof.agent/share/native/libhprof/jvm.hprof.txt
 
 $(LIB_DST_DIR)/jvm.hprof.txt: $(HPROF_SRC)
 	$(call install-file)
diff --git a/jdk/make/lib/Lib-jdk.hprof.agent.gmk b/jdk/make/lib/Lib-jdk.hprof.agent.gmk
index 7b7ef69b2e0..a58687da251 100644
--- a/jdk/make/lib/Lib-jdk.hprof.agent.gmk
+++ b/jdk/make/lib/Lib-jdk.hprof.agent.gmk
@@ -27,11 +27,11 @@ include LibCommon.gmk
 
 ################################################################################
 
-BUILD_LIBHPROF_SRC := $(JDK_TOPDIR)/src/demo/share/jvmti/hprof \
-    $(JDK_TOPDIR)/src/demo/$(OPENJDK_TARGET_OS_API_DIR)/jvmti/hprof
+BUILD_LIBHPROF_SRC := $(call FindSrcDirsForLib, jdk.hprof.agent, hprof)
+
 BUILD_LIBHPROF_CFLAGS := $(addprefix -I, $(BUILD_LIBHPROF_SRC)) \
     -I$(JDK_TOPDIR)/src/demo/share/jvmti/java_crw_demo
-
+    
 BUILD_LIBHPROF_LDFLAGS :=
 
 LIBHPROF_OPTIMIZATION := HIGHEST
diff --git a/jdk/src/demo/share/jvmti/hprof/sample.makefile.txt b/jdk/src/demo/share/jvmti/hprof/sample.makefile.txt
deleted file mode 100644
index e8f84dc8577..00000000000
--- a/jdk/src/demo/share/jvmti/hprof/sample.makefile.txt
+++ /dev/null
@@ -1,205 +0,0 @@
-#
-# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-#   - Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#
-#   - Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in the
-#     documentation and/or other materials provided with the distribution.
-#
-#   - Neither the name of Oracle nor the names of its
-#     contributors may be used to endorse or promote products derived
-#     from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-########################################################################
-#
-# Sample GNU Makefile for building 
-#
-#  Example uses:    
-#       gnumake JDK=<java_home> OSNAME=solaris [OPT=true] [LIBARCH=sparc]
-#       gnumake JDK=<java_home> OSNAME=solaris [OPT=true] [LIBARCH=sparcv9]
-#       gnumake JDK=<java_home> OSNAME=linux   [OPT=true]
-#       gnumake JDK=<java_home> OSNAME=win32   [OPT=true]
-#
-########################################################################
-
-# Source lists
-LIBNAME=hprof
-SOURCES= \
-    debug_malloc.c	\
-    hprof_blocks.c	\
-    hprof_class.c	\
-    hprof_cpu.c		\
-    hprof_error.c	\
-    hprof_event.c	\
-    hprof_frame.c	\
-    hprof_init.c	\
-    hprof_io.c		\
-    hprof_ioname.c	\
-    hprof_listener.c	\
-    hprof_loader.c	\
-    hprof_monitor.c	\
-    hprof_object.c	\
-    hprof_reference.c	\
-    hprof_site.c	\
-    hprof_stack.c	\
-    hprof_string.c	\
-    hprof_table.c	\
-    hprof_tag.c		\
-    hprof_tls.c		\
-    hprof_trace.c	\
-    hprof_tracker.c	\
-    hprof_util.c	\
-    hprof_md.c
-
-JAVA_SOURCES=Tracker.java
-
-# Name of jar file that needs to be created
-#JARFILE=hprof.jar
-
-# Solaris Sun C Compiler Version 5.5
-ifeq ($(OSNAME), solaris)
-    # Sun Solaris Compiler options needed
-    COMMON_FLAGS=-mt -KPIC
-    # Options that help find errors
-    COMMON_FLAGS+= -Xa -v -xstrconst -xc99=%none
-    # To make hprof logging code available
-    COMMON_FLAGS+= -DHPROF_LOGGING
-    # Check LIBARCH for any special compiler options
-    LIBARCH=$(shell uname -p)
-    ifeq ($(LIBARCH), sparc)
-        COMMON_FLAGS+=-xarch=v8 -xregs=no%appl
-    endif
-    ifeq ($(LIBARCH), sparcv9)
-        COMMON_FLAGS+=-xarch=v9 -xregs=no%appl
-    endif
-    ifeq ($(OPT), true)
-        CFLAGS=-xO2 $(COMMON_FLAGS)  -DNDEBUG
-    else
-        CFLAGS=-g $(COMMON_FLAGS) -DDEBUG
-    endif
-    # Object files needed to create library
-    OBJECTS=$(SOURCES:%.c=%.o)
-    # Library name and options needed to build it
-    LIBRARY=lib$(LIBNAME).so
-    LDFLAGS=-z defs -ztext
-    # Libraries we are dependent on
-    LIBRARIES=-lsocket -lnsl -ldl -lc
-    # Building a shared library
-    LINK_SHARED=$(LINK.c) -G -o $@
-endif
-
-# Linux GNU C Compiler
-ifeq ($(OSNAME), linux)
-    # GNU Compiler options needed to build it
-    COMMON_FLAGS=-fno-strict-aliasing -fPIC -fno-omit-frame-pointer
-    # Options that help find errors
-    COMMON_FLAGS+= -W -Wall  -Wno-unused -Wno-parentheses
-    # To allow access to dladdr()
-    COMMON_FLAGS+= -D_GNU_SOURCE
-    # To prevent include of procfs.h
-    COMMON_FLAGS+= -DLINUX
-    # To make sure code is reentrant
-    COMMON_FLAGS+= -D_REENTRANT
-    # To make hprof logging code available
-    COMMON_FLAGS+= -DHPROF_LOGGING
-    ifeq ($(OPT), true)
-        CFLAGS=-O2 $(COMMON_FLAGS)  -DNDEBUG
-    else
-        CFLAGS=-g $(COMMON_FLAGS)  -DDEBUG
-    endif
-    # Object files needed to create library
-    OBJECTS=$(SOURCES:%.c=%.o)
-    # Library name and options needed to build it
-    LIBRARY=lib$(LIBNAME).so
-    LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
-    # Libraries we are dependent on
-    LIBRARIES= -ldl -lc
-    # Building a shared library
-    LINK_SHARED=$(LINK.c) -shared -o $@
-endif
-
-# Windows Microsoft C/C++ Optimizing Compiler Version 12
-ifeq ($(OSNAME), win32)
-    CC=cl
-    # Compiler options needed to build it
-    COMMON_FLAGS=-Gy -DWIN32
-    # Options that help find errors
-    COMMON_FLAGS+=-W0 -WX
-    # To make hprof logging code available
-    COMMON_FLAGS+= -DHPROF_LOGGING
-    ifeq ($(OPT), true)
-        CFLAGS= -Ox -Op -Zi $(COMMON_FLAGS)  -DNDEBUG
-    else
-        CFLAGS= -Od -Zi $(COMMON_FLAGS)  -DDEBUG
-    endif
-    # Add java_crw_demo source
-    SOURCES += ../java_crw_demo.c
-    # Object files needed to create library
-    OBJECTS=$(SOURCES:%.c=%.obj)
-    # Library name and options needed to build it
-    LIBRARY=$(LIBNAME).dll
-    LDFLAGS=
-    # Libraries we are dependent on
-    LIBRARIES=wsock32.lib winmm.lib
-    # Building a shared library
-    LINK_SHARED=link -dll -out:$@
-endif
-
-# Common -I options
-CFLAGS += -I.
-CFLAGS += -I../java_crw_demo
-CFLAGS += -I$(JDK)/include -I$(JDK)/include/$(OSNAME)
-
-# Default rule (build both native library and jar file)
-all: hprof_md.c $(LIBRARY) $(JARFILE)
-
-# Get platform specific hprof_md.c
-hprof_md.c:
-	rm -f $@
-	cp $(OSNAME)/hprof_md.c $@
-
-# Build native library
-$(LIBRARY): $(OBJECTS)
-	$(LINK_SHARED) $(OBJECTS) $(LIBRARIES)
-
-# Build jar file
-$(JARFILE): $(JAVA_SOURCES)
-	rm -f -r classes
-	mkdir -p classes
-	$(JDK)/bin/javac -d classes $(JAVA_SOURCES)
-	(cd classes; $(JDK)/bin/jar cf ../$@ *)
-
-# Cleanup the built bits
-clean:
-	rm -f -r classes
-	rm -f $(LIBRARY) $(JARFILE) $(OBJECTS)
-
-# Simple tester
-test: all
-	LD_LIBRARY_PATH=. $(JDK)/bin/java -agentlib:$(LIBNAME) -Xbootclasspath/a:./$(JARFILE) -version
-
-# Compilation rule only needed on Windows
-ifeq ($(OSNAME), win32)
-%.obj: %.c
-	$(COMPILE.c) $<
-endif
-
diff --git a/jdk/src/demo/share/jvmti/index.html b/jdk/src/demo/share/jvmti/index.html
index b66ac8d9bfa..4b479c12468 100644
--- a/jdk/src/demo/share/jvmti/index.html
+++ b/jdk/src/demo/share/jvmti/index.html
@@ -54,17 +54,16 @@ variable (Windows).
 This is system and platform specific.
 If you are using 64bit Solaris (e.g. 'java -d64'), 
 you should use LD_LIBRARY_PATH64.
-Some agents such as hprof (heap/cpu profiler) and jdwp (debugger backend)
+Some agents such as the jdwp (debugger backend)
 are located inside the primary JDK directories and will always be found
 in those locations.
 
 <p>
 The agents that instrument classfiles 
 (i.e. BCI, usually through the java_crw_demo library) 
-such as hprof, heapTracker, mtrace, and minst, 
+such as heapTracker, mtrace, and minst, 
 also need to have the Java classes they use available in the bootclasspath.
-The one used by hprof is already in the bootclasspath, and the
-other agents will make attempts at automatically adding their jar file
+The agents will make attempts at automatically adding their jar file
 (e.g. heapTracker.jar, mtrace.jar, or minst.jar) to the bootclasspath
 with AddToBootstrapClassLoaderSearch from JVM TI at startup
 (see the agent_util code).
@@ -150,19 +149,6 @@ This is a small agent that gets information about threads
 waiting on monitors.
 </li>
 
-<li>
-<A HREF="hprof">hprof</A>
-<br>
-This is a large agent that does heap and cpu profiling.
-This demo agent is actually built into the 
-
-Java Runtime Environment (JRE).
-It uses Bytecode Instrumentation (BCI) via the java_crw_demo library.
-<br>
-<b>Note:</b> hprof is NOT a small or simple agent, the other smaller demos
-should be looked at first.
-</li>
-
 </ul>
 
 
diff --git a/jdk/src/demo/aix/jvmti/hprof/porting_aix.c b/jdk/src/jdk.hprof.agent/aix/native/libhprof/porting_aix.c
similarity index 100%
rename from jdk/src/demo/aix/jvmti/hprof/porting_aix.c
rename to jdk/src/jdk.hprof.agent/aix/native/libhprof/porting_aix.c
diff --git a/jdk/src/demo/aix/jvmti/hprof/porting_aix.h b/jdk/src/jdk.hprof.agent/aix/native/libhprof/porting_aix.h
similarity index 100%
rename from jdk/src/demo/aix/jvmti/hprof/porting_aix.h
rename to jdk/src/jdk.hprof.agent/aix/native/libhprof/porting_aix.h
diff --git a/jdk/src/demo/share/jvmti/hprof/README.txt b/jdk/src/jdk.hprof.agent/share/native/libhprof/README.txt
similarity index 94%
rename from jdk/src/demo/share/jvmti/hprof/README.txt
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/README.txt
index cfefddb9b6a..b57b287c634 100644
--- a/jdk/src/demo/share/jvmti/hprof/README.txt
+++ b/jdk/src/jdk.hprof.agent/share/native/libhprof/README.txt
@@ -106,12 +106,8 @@ Design and Implementation:
 
     * Sources in the JDK workspace
         The sources and Makefiles live in:
-                src/share/classes/com/sun/demo/jvmti/hprof/*
-                src/share/demo/jvmti/hprof/*
+                src/jdk.hprof.agent/*
                 src/share/demo/jvmti/java_crw_demo/*
-                src/solaris/demo/jvmti/hprof/*
-                src/windows/demo/jvmti/hprof/*
-                make/java/java_hprof_demo/*
-                make/java/java_crw_demo/*
+                make/lib/Lib-jdk.hprof.agent.gmk
    
 --------
diff --git a/jdk/src/demo/share/jvmti/hprof/debug_malloc.c b/jdk/src/jdk.hprof.agent/share/native/libhprof/debug_malloc.c
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/debug_malloc.c
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/debug_malloc.c
diff --git a/jdk/src/demo/share/jvmti/hprof/debug_malloc.h b/jdk/src/jdk.hprof.agent/share/native/libhprof/debug_malloc.h
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/debug_malloc.h
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/debug_malloc.h
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof.h b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof.h
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof.h
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof.h
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_b_spec.h b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_b_spec.h
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_b_spec.h
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_b_spec.h
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_blocks.c b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_blocks.c
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_blocks.c
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_blocks.c
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_blocks.h b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_blocks.h
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_blocks.h
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_blocks.h
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_check.c b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_check.c
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_check.c
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_check.c
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_check.h b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_check.h
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_check.h
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_check.h
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_class.c b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_class.c
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_class.c
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_class.c
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_class.h b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_class.h
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_class.h
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_class.h
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_cpu.c b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_cpu.c
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_cpu.c
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_cpu.c
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_cpu.h b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_cpu.h
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_cpu.h
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_cpu.h
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_error.c b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_error.c
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_error.c
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_error.c
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_error.h b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_error.h
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_error.h
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_error.h
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_event.c b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_event.c
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_event.c
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_event.c
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_event.h b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_event.h
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_event.h
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_event.h
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_frame.c b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_frame.c
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_frame.c
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_frame.c
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_frame.h b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_frame.h
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_frame.h
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_frame.h
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_init.c b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_init.c
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_init.c
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_init.c
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_init.h b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_init.h
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_init.h
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_init.h
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_io.c b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_io.c
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_io.c
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_io.c
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_io.h b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_io.h
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_io.h
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_io.h
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_ioname.c b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_ioname.c
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_ioname.c
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_ioname.c
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_ioname.h b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_ioname.h
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_ioname.h
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_ioname.h
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_listener.c b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_listener.c
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_listener.c
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_listener.c
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_listener.h b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_listener.h
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_listener.h
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_listener.h
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_loader.c b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_loader.c
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_loader.c
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_loader.c
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_loader.h b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_loader.h
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_loader.h
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_loader.h
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_md.h b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_md.h
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_md.h
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_md.h
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_monitor.c b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_monitor.c
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_monitor.c
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_monitor.c
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_monitor.h b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_monitor.h
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_monitor.h
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_monitor.h
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_object.c b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_object.c
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_object.c
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_object.c
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_object.h b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_object.h
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_object.h
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_object.h
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_reference.c b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_reference.c
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_reference.c
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_reference.c
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_reference.h b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_reference.h
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_reference.h
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_reference.h
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_site.c b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_site.c
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_site.c
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_site.c
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_site.h b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_site.h
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_site.h
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_site.h
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_stack.c b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_stack.c
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_stack.c
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_stack.c
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_stack.h b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_stack.h
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_stack.h
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_stack.h
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_string.c b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_string.c
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_string.c
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_string.c
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_string.h b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_string.h
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_string.h
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_string.h
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_table.c b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_table.c
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_table.c
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_table.c
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_table.h b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_table.h
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_table.h
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_table.h
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_tag.c b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_tag.c
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_tag.c
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_tag.c
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_tag.h b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_tag.h
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_tag.h
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_tag.h
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_tls.c b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_tls.c
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_tls.c
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_tls.c
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_tls.h b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_tls.h
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_tls.h
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_tls.h
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_trace.c b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_trace.c
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_trace.c
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_trace.c
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_trace.h b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_trace.h
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_trace.h
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_trace.h
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_tracker.c b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_tracker.c
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_tracker.c
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_tracker.c
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_tracker.h b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_tracker.h
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_tracker.h
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_tracker.h
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_util.c b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_util.c
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_util.c
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_util.c
diff --git a/jdk/src/demo/share/jvmti/hprof/hprof_util.h b/jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_util.h
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/hprof_util.h
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/hprof_util.h
diff --git a/jdk/src/demo/share/jvmti/hprof/jvm.hprof.txt b/jdk/src/jdk.hprof.agent/share/native/libhprof/jvm.hprof.txt
similarity index 100%
rename from jdk/src/demo/share/jvmti/hprof/jvm.hprof.txt
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/jvm.hprof.txt
diff --git a/jdk/src/demo/share/jvmti/hprof/manual.html b/jdk/src/jdk.hprof.agent/share/native/libhprof/manual.html
similarity index 99%
rename from jdk/src/demo/share/jvmti/hprof/manual.html
rename to jdk/src/jdk.hprof.agent/share/native/libhprof/manual.html
index a62610dad66..f4ddc2ec6bc 100644
--- a/jdk/src/demo/share/jvmti/hprof/manual.html
+++ b/jdk/src/jdk.hprof.agent/share/native/libhprof/manual.html
@@ -1731,14 +1731,6 @@ stack depth<br>
 </table>
 <br>
 <p></p>
-<h2><a name="mozTocId589424" class="mozTocH4"></a>Source Code<br>
-</h2>
-The source to HPROF is available in the JDK download in the
-demo/jvmti/hprof directory.
-<p><font size="-1"><b>*As used on this web site, the terms "Java
-Virtual Machine" or "JVM" mean a virtual machine for the Java platform.</b></font>
-</p>
-<p></p>
 <hr><!-- hhmts start -->
 Last modified: 2005<!-- hhmts end -->
 </body>
diff --git a/jdk/src/demo/unix/jvmti/hprof/hprof_md.c b/jdk/src/jdk.hprof.agent/unix/native/libhprof/hprof_md.c
similarity index 100%
rename from jdk/src/demo/unix/jvmti/hprof/hprof_md.c
rename to jdk/src/jdk.hprof.agent/unix/native/libhprof/hprof_md.c
diff --git a/jdk/src/demo/windows/jvmti/hprof/hprof_md.c b/jdk/src/jdk.hprof.agent/windows/native/libhprof/hprof_md.c
similarity index 100%
rename from jdk/src/demo/windows/jvmti/hprof/hprof_md.c
rename to jdk/src/jdk.hprof.agent/windows/native/libhprof/hprof_md.c