8216167: Update include guards to reflect correct directories
authorcoleenp
Thu, 10 Jan 2019 15:13:51 -0500
changeset 53244 9807daeb47c4
parent 53243 8bea4144b21c
child 53251 2e1fd6414c4b
8216167: Update include guards to reflect correct directories Summary: Use script and some manual fixup to fix directores names in include guards. Reviewed-by: lfoltan, eosterlund, kbarrett
src/hotspot/cpu/aarch64/assembler_aarch64.hpp
src/hotspot/cpu/aarch64/assembler_aarch64.inline.hpp
src/hotspot/cpu/aarch64/bytecodes_aarch64.hpp
src/hotspot/cpu/aarch64/bytes_aarch64.hpp
src/hotspot/cpu/aarch64/c1_Defs_aarch64.hpp
src/hotspot/cpu/aarch64/c1_FpuStackSim_aarch64.hpp
src/hotspot/cpu/aarch64/c1_FrameMap_aarch64.hpp
src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp
src/hotspot/cpu/aarch64/c1_LinearScan_aarch64.hpp
src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.hpp
src/hotspot/cpu/aarch64/c1_globals_aarch64.hpp
src/hotspot/cpu/aarch64/c2_globals_aarch64.hpp
src/hotspot/cpu/aarch64/codeBuffer_aarch64.hpp
src/hotspot/cpu/aarch64/copy_aarch64.hpp
src/hotspot/cpu/aarch64/depChecker_aarch64.hpp
src/hotspot/cpu/aarch64/disassembler_aarch64.hpp
src/hotspot/cpu/aarch64/frame_aarch64.hpp
src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp
src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.hpp
src/hotspot/cpu/aarch64/globalDefinitions_aarch64.hpp
src/hotspot/cpu/aarch64/globals_aarch64.hpp
src/hotspot/cpu/aarch64/icache_aarch64.hpp
src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp
src/hotspot/cpu/aarch64/interpreterRT_aarch64.hpp
src/hotspot/cpu/aarch64/javaFrameAnchor_aarch64.hpp
src/hotspot/cpu/aarch64/jniTypes_aarch64.hpp
src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
src/hotspot/cpu/aarch64/macroAssembler_aarch64.inline.hpp
src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp
src/hotspot/cpu/aarch64/registerMap_aarch64.hpp
src/hotspot/cpu/aarch64/register_aarch64.hpp
src/hotspot/cpu/aarch64/relocInfo_aarch64.hpp
src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp
src/hotspot/cpu/aarch64/templateTable_aarch64.hpp
src/hotspot/cpu/aarch64/vmStructs_aarch64.hpp
src/hotspot/cpu/aarch64/vm_version_aarch64.hpp
src/hotspot/cpu/aarch64/vm_version_ext_aarch64.hpp
src/hotspot/cpu/aarch64/vmreg_aarch64.hpp
src/hotspot/cpu/aarch64/vmreg_aarch64.inline.hpp
src/hotspot/cpu/arm/assembler_arm.hpp
src/hotspot/cpu/arm/assembler_arm.inline.hpp
src/hotspot/cpu/arm/assembler_arm_32.hpp
src/hotspot/cpu/arm/bytes_arm.hpp
src/hotspot/cpu/arm/c1_Defs_arm.hpp
src/hotspot/cpu/arm/c1_FpuStackSim_arm.hpp
src/hotspot/cpu/arm/c1_FrameMap_arm.hpp
src/hotspot/cpu/arm/c1_LIRAssembler_arm.hpp
src/hotspot/cpu/arm/c1_LinearScan_arm.hpp
src/hotspot/cpu/arm/c1_MacroAssembler_arm.hpp
src/hotspot/cpu/arm/c1_globals_arm.hpp
src/hotspot/cpu/arm/c2_globals_arm.hpp
src/hotspot/cpu/arm/codeBuffer_arm.hpp
src/hotspot/cpu/arm/copy_arm.hpp
src/hotspot/cpu/arm/depChecker_arm.hpp
src/hotspot/cpu/arm/disassembler_arm.hpp
src/hotspot/cpu/arm/frame_arm.hpp
src/hotspot/cpu/arm/frame_arm.inline.hpp
src/hotspot/cpu/arm/gc/shared/cardTableBarrierSetAssembler_arm.hpp
src/hotspot/cpu/arm/globalDefinitions_arm.hpp
src/hotspot/cpu/arm/globals_arm.hpp
src/hotspot/cpu/arm/icache_arm.hpp
src/hotspot/cpu/arm/interp_masm_arm.hpp
src/hotspot/cpu/arm/interpreterRT_arm.hpp
src/hotspot/cpu/arm/javaFrameAnchor_arm.hpp
src/hotspot/cpu/arm/jniTypes_arm.hpp
src/hotspot/cpu/arm/macroAssembler_arm.hpp
src/hotspot/cpu/arm/macroAssembler_arm.inline.hpp
src/hotspot/cpu/arm/nativeInst_arm.hpp
src/hotspot/cpu/arm/nativeInst_arm_32.hpp
src/hotspot/cpu/arm/registerMap_arm.hpp
src/hotspot/cpu/arm/register_arm.hpp
src/hotspot/cpu/arm/relocInfo_arm.hpp
src/hotspot/cpu/arm/stubRoutines_arm.hpp
src/hotspot/cpu/arm/templateTable_arm.hpp
src/hotspot/cpu/arm/vmStructs_arm.hpp
src/hotspot/cpu/arm/vm_version_arm.hpp
src/hotspot/cpu/arm/vm_version_ext_arm.hpp
src/hotspot/cpu/arm/vmreg_arm.hpp
src/hotspot/cpu/arm/vmreg_arm.inline.hpp
src/hotspot/cpu/ppc/assembler_ppc.hpp
src/hotspot/cpu/ppc/assembler_ppc.inline.hpp
src/hotspot/cpu/ppc/bytes_ppc.hpp
src/hotspot/cpu/ppc/c1_Defs_ppc.hpp
src/hotspot/cpu/ppc/c1_FpuStackSim_ppc.hpp
src/hotspot/cpu/ppc/c1_FrameMap_ppc.hpp
src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.hpp
src/hotspot/cpu/ppc/c1_LinearScan_ppc.hpp
src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.hpp
src/hotspot/cpu/ppc/c1_globals_ppc.hpp
src/hotspot/cpu/ppc/c2_globals_ppc.hpp
src/hotspot/cpu/ppc/codeBuffer_ppc.hpp
src/hotspot/cpu/ppc/copy_ppc.hpp
src/hotspot/cpu/ppc/depChecker_ppc.hpp
src/hotspot/cpu/ppc/disassembler_ppc.hpp
src/hotspot/cpu/ppc/frame_ppc.hpp
src/hotspot/cpu/ppc/frame_ppc.inline.hpp
src/hotspot/cpu/ppc/globalDefinitions_ppc.hpp
src/hotspot/cpu/ppc/globals_ppc.hpp
src/hotspot/cpu/ppc/icache_ppc.hpp
src/hotspot/cpu/ppc/interp_masm_ppc.hpp
src/hotspot/cpu/ppc/interpreterRT_ppc.hpp
src/hotspot/cpu/ppc/javaFrameAnchor_ppc.hpp
src/hotspot/cpu/ppc/jniTypes_ppc.hpp
src/hotspot/cpu/ppc/macroAssembler_ppc.hpp
src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp
src/hotspot/cpu/ppc/nativeInst_ppc.hpp
src/hotspot/cpu/ppc/registerMap_ppc.hpp
src/hotspot/cpu/ppc/register_ppc.hpp
src/hotspot/cpu/ppc/relocInfo_ppc.hpp
src/hotspot/cpu/ppc/stubRoutines_ppc.hpp
src/hotspot/cpu/ppc/templateTable_ppc.hpp
src/hotspot/cpu/ppc/vmStructs_ppc.hpp
src/hotspot/cpu/ppc/vm_version_ext_ppc.hpp
src/hotspot/cpu/ppc/vm_version_ppc.hpp
src/hotspot/cpu/ppc/vmreg_ppc.hpp
src/hotspot/cpu/ppc/vmreg_ppc.inline.hpp
src/hotspot/cpu/s390/assembler_s390.hpp
src/hotspot/cpu/s390/assembler_s390.inline.hpp
src/hotspot/cpu/s390/bytes_s390.hpp
src/hotspot/cpu/s390/c1_Defs_s390.hpp
src/hotspot/cpu/s390/c1_FpuStackSim_s390.hpp
src/hotspot/cpu/s390/c1_FrameMap_s390.hpp
src/hotspot/cpu/s390/c1_LIRAssembler_s390.hpp
src/hotspot/cpu/s390/c1_LinearScan_s390.hpp
src/hotspot/cpu/s390/c1_MacroAssembler_s390.hpp
src/hotspot/cpu/s390/c1_globals_s390.hpp
src/hotspot/cpu/s390/c2_globals_s390.hpp
src/hotspot/cpu/s390/codeBuffer_s390.hpp
src/hotspot/cpu/s390/copy_s390.hpp
src/hotspot/cpu/s390/depChecker_s390.hpp
src/hotspot/cpu/s390/disassembler_s390.hpp
src/hotspot/cpu/s390/frame_s390.hpp
src/hotspot/cpu/s390/frame_s390.inline.hpp
src/hotspot/cpu/s390/globalDefinitions_s390.hpp
src/hotspot/cpu/s390/globals_s390.hpp
src/hotspot/cpu/s390/icache_s390.hpp
src/hotspot/cpu/s390/interp_masm_s390.hpp
src/hotspot/cpu/s390/interpreterRT_s390.hpp
src/hotspot/cpu/s390/javaFrameAnchor_s390.hpp
src/hotspot/cpu/s390/jniTypes_s390.hpp
src/hotspot/cpu/s390/macroAssembler_s390.hpp
src/hotspot/cpu/s390/macroAssembler_s390.inline.hpp
src/hotspot/cpu/s390/nativeInst_s390.hpp
src/hotspot/cpu/s390/registerMap_s390.hpp
src/hotspot/cpu/s390/registerSaver_s390.hpp
src/hotspot/cpu/s390/register_s390.hpp
src/hotspot/cpu/s390/relocInfo_s390.hpp
src/hotspot/cpu/s390/stubRoutines_s390.hpp
src/hotspot/cpu/s390/templateTable_s390.hpp
src/hotspot/cpu/s390/vmStructs_s390.hpp
src/hotspot/cpu/s390/vm_version_ext_s390.hpp
src/hotspot/cpu/s390/vm_version_s390.hpp
src/hotspot/cpu/s390/vmreg_s390.hpp
src/hotspot/cpu/s390/vmreg_s390.inline.hpp
src/hotspot/cpu/sparc/assembler_sparc.hpp
src/hotspot/cpu/sparc/assembler_sparc.inline.hpp
src/hotspot/cpu/sparc/bytes_sparc.hpp
src/hotspot/cpu/sparc/c1_Defs_sparc.hpp
src/hotspot/cpu/sparc/c1_FpuStackSim_sparc.hpp
src/hotspot/cpu/sparc/c1_FrameMap_sparc.hpp
src/hotspot/cpu/sparc/c1_LIRAssembler_sparc.hpp
src/hotspot/cpu/sparc/c1_LinearScan_sparc.hpp
src/hotspot/cpu/sparc/c1_MacroAssembler_sparc.hpp
src/hotspot/cpu/sparc/c1_globals_sparc.hpp
src/hotspot/cpu/sparc/c2_globals_sparc.hpp
src/hotspot/cpu/sparc/codeBuffer_sparc.hpp
src/hotspot/cpu/sparc/copy_sparc.hpp
src/hotspot/cpu/sparc/depChecker_sparc.hpp
src/hotspot/cpu/sparc/disassembler_sparc.hpp
src/hotspot/cpu/sparc/frame_sparc.hpp
src/hotspot/cpu/sparc/frame_sparc.inline.hpp
src/hotspot/cpu/sparc/globalDefinitions_sparc.hpp
src/hotspot/cpu/sparc/globals_sparc.hpp
src/hotspot/cpu/sparc/icache_sparc.hpp
src/hotspot/cpu/sparc/interp_masm_sparc.hpp
src/hotspot/cpu/sparc/interpreterRT_sparc.hpp
src/hotspot/cpu/sparc/javaFrameAnchor_sparc.hpp
src/hotspot/cpu/sparc/jniTypes_sparc.hpp
src/hotspot/cpu/sparc/macroAssembler_sparc.hpp
src/hotspot/cpu/sparc/macroAssembler_sparc.inline.hpp
src/hotspot/cpu/sparc/nativeInst_sparc.hpp
src/hotspot/cpu/sparc/registerMap_sparc.hpp
src/hotspot/cpu/sparc/register_sparc.hpp
src/hotspot/cpu/sparc/relocInfo_sparc.hpp
src/hotspot/cpu/sparc/stubRoutines_sparc.hpp
src/hotspot/cpu/sparc/templateTable_sparc.hpp
src/hotspot/cpu/sparc/vmStructs_sparc.hpp
src/hotspot/cpu/sparc/vm_version_ext_sparc.hpp
src/hotspot/cpu/sparc/vm_version_sparc.hpp
src/hotspot/cpu/sparc/vmreg_sparc.hpp
src/hotspot/cpu/sparc/vmreg_sparc.inline.hpp
src/hotspot/cpu/x86/assembler_x86.hpp
src/hotspot/cpu/x86/assembler_x86.inline.hpp
src/hotspot/cpu/x86/bytes_x86.hpp
src/hotspot/cpu/x86/c1_Defs_x86.hpp
src/hotspot/cpu/x86/c1_FpuStackSim_x86.hpp
src/hotspot/cpu/x86/c1_FrameMap_x86.hpp
src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp
src/hotspot/cpu/x86/c1_LinearScan_x86.hpp
src/hotspot/cpu/x86/c1_MacroAssembler_x86.hpp
src/hotspot/cpu/x86/c1_globals_x86.hpp
src/hotspot/cpu/x86/c2_globals_x86.hpp
src/hotspot/cpu/x86/codeBuffer_x86.hpp
src/hotspot/cpu/x86/copy_x86.hpp
src/hotspot/cpu/x86/depChecker_x86.hpp
src/hotspot/cpu/x86/disassembler_x86.hpp
src/hotspot/cpu/x86/frame_x86.hpp
src/hotspot/cpu/x86/frame_x86.inline.hpp
src/hotspot/cpu/x86/globalDefinitions_x86.hpp
src/hotspot/cpu/x86/globals_x86.hpp
src/hotspot/cpu/x86/icache_x86.hpp
src/hotspot/cpu/x86/interp_masm_x86.hpp
src/hotspot/cpu/x86/interpreterRT_x86.hpp
src/hotspot/cpu/x86/javaFrameAnchor_x86.hpp
src/hotspot/cpu/x86/jniTypes_x86.hpp
src/hotspot/cpu/x86/macroAssembler_x86.hpp
src/hotspot/cpu/x86/macroAssembler_x86.inline.hpp
src/hotspot/cpu/x86/nativeInst_x86.hpp
src/hotspot/cpu/x86/rdtsc_x86.hpp
src/hotspot/cpu/x86/registerMap_x86.hpp
src/hotspot/cpu/x86/register_x86.hpp
src/hotspot/cpu/x86/relocInfo_x86.hpp
src/hotspot/cpu/x86/stubRoutines_x86.hpp
src/hotspot/cpu/x86/templateTable_x86.hpp
src/hotspot/cpu/x86/vmStructs_x86.hpp
src/hotspot/cpu/x86/vm_version_ext_x86.hpp
src/hotspot/cpu/x86/vm_version_x86.hpp
src/hotspot/cpu/x86/vmreg_x86.hpp
src/hotspot/cpu/x86/vmreg_x86.inline.hpp
src/hotspot/cpu/zero/assembler_zero.hpp
src/hotspot/cpu/zero/assembler_zero.inline.hpp
src/hotspot/cpu/zero/bytecodeInterpreter_zero.hpp
src/hotspot/cpu/zero/bytecodeInterpreter_zero.inline.hpp
src/hotspot/cpu/zero/bytes_zero.hpp
src/hotspot/cpu/zero/codeBuffer_zero.hpp
src/hotspot/cpu/zero/copy_zero.hpp
src/hotspot/cpu/zero/cppInterpreter_zero.hpp
src/hotspot/cpu/zero/depChecker_zero.hpp
src/hotspot/cpu/zero/disassembler_zero.hpp
src/hotspot/cpu/zero/entryFrame_zero.hpp
src/hotspot/cpu/zero/entry_zero.hpp
src/hotspot/cpu/zero/fakeStubFrame_zero.hpp
src/hotspot/cpu/zero/frame_zero.hpp
src/hotspot/cpu/zero/frame_zero.inline.hpp
src/hotspot/cpu/zero/globalDefinitions_zero.hpp
src/hotspot/cpu/zero/globals_zero.hpp
src/hotspot/cpu/zero/icache_zero.hpp
src/hotspot/cpu/zero/interp_masm_zero.hpp
src/hotspot/cpu/zero/interpreterFrame_zero.hpp
src/hotspot/cpu/zero/interpreterRT_zero.hpp
src/hotspot/cpu/zero/javaFrameAnchor_zero.hpp
src/hotspot/cpu/zero/jniTypes_zero.hpp
src/hotspot/cpu/zero/macroAssembler_zero.hpp
src/hotspot/cpu/zero/macroAssembler_zero.inline.hpp
src/hotspot/cpu/zero/nativeInst_zero.hpp
src/hotspot/cpu/zero/registerMap_zero.hpp
src/hotspot/cpu/zero/register_zero.hpp
src/hotspot/cpu/zero/relocInfo_zero.hpp
src/hotspot/cpu/zero/stack_zero.hpp
src/hotspot/cpu/zero/stack_zero.inline.hpp
src/hotspot/cpu/zero/stubRoutines_zero.hpp
src/hotspot/cpu/zero/vmStructs_zero.hpp
src/hotspot/cpu/zero/vm_version_ext_zero.hpp
src/hotspot/cpu/zero/vm_version_zero.hpp
src/hotspot/cpu/zero/vmreg_zero.hpp
src/hotspot/cpu/zero/vmreg_zero.inline.hpp
src/hotspot/os/aix/c1_globals_aix.hpp
src/hotspot/os/aix/c2_globals_aix.hpp
src/hotspot/os/aix/globals_aix.hpp
src/hotspot/os/aix/libo4.hpp
src/hotspot/os/aix/libodm_aix.hpp
src/hotspot/os/aix/libperfstat_aix.hpp
src/hotspot/os/aix/loadlib_aix.hpp
src/hotspot/os/aix/misc_aix.hpp
src/hotspot/os/aix/osThread_aix.hpp
src/hotspot/os/aix/os_aix.hpp
src/hotspot/os/aix/os_aix.inline.hpp
src/hotspot/os/aix/os_share_aix.hpp
src/hotspot/os/aix/porting_aix.hpp
src/hotspot/os/aix/vmStructs_aix.hpp
src/hotspot/os/bsd/c1_globals_bsd.hpp
src/hotspot/os/bsd/c2_globals_bsd.hpp
src/hotspot/os/bsd/decoder_machO.hpp
src/hotspot/os/bsd/globals_bsd.hpp
src/hotspot/os/bsd/osThread_bsd.hpp
src/hotspot/os/bsd/os_bsd.hpp
src/hotspot/os/bsd/os_bsd.inline.hpp
src/hotspot/os/bsd/os_share_bsd.hpp
src/hotspot/os/bsd/semaphore_bsd.hpp
src/hotspot/os/bsd/vmStructs_bsd.hpp
src/hotspot/os/linux/c1_globals_linux.hpp
src/hotspot/os/linux/c2_globals_linux.hpp
src/hotspot/os/linux/globals_linux.hpp
src/hotspot/os/linux/osContainer_linux.hpp
src/hotspot/os/linux/osThread_linux.hpp
src/hotspot/os/linux/os_linux.hpp
src/hotspot/os/linux/os_linux.inline.hpp
src/hotspot/os/linux/os_share_linux.hpp
src/hotspot/os/linux/vmStructs_linux.hpp
src/hotspot/os/posix/os_posix.hpp
src/hotspot/os/posix/semaphore_posix.hpp
src/hotspot/os/solaris/c1_globals_solaris.hpp
src/hotspot/os/solaris/c2_globals_solaris.hpp
src/hotspot/os/solaris/globals_solaris.hpp
src/hotspot/os/solaris/osThread_solaris.hpp
src/hotspot/os/solaris/os_share_solaris.hpp
src/hotspot/os/solaris/os_solaris.hpp
src/hotspot/os/solaris/os_solaris.inline.hpp
src/hotspot/os/solaris/vmStructs_solaris.hpp
src/hotspot/os/windows/c1_globals_windows.hpp
src/hotspot/os/windows/c2_globals_windows.hpp
src/hotspot/os/windows/globals_windows.hpp
src/hotspot/os/windows/iphlp_interface.hpp
src/hotspot/os/windows/osThread_windows.hpp
src/hotspot/os/windows/os_share_windows.hpp
src/hotspot/os/windows/os_windows.hpp
src/hotspot/os/windows/os_windows.inline.hpp
src/hotspot/os/windows/pdh_interface.hpp
src/hotspot/os/windows/semaphore_windows.hpp
src/hotspot/os/windows/symbolengine.hpp
src/hotspot/os/windows/vmStructs_windows.hpp
src/hotspot/os/windows/windbghelp.hpp
src/hotspot/os_cpu/aix_ppc/atomic_aix_ppc.hpp
src/hotspot/os_cpu/aix_ppc/bytes_aix_ppc.inline.hpp
src/hotspot/os_cpu/aix_ppc/globals_aix_ppc.hpp
src/hotspot/os_cpu/aix_ppc/orderAccess_aix_ppc.hpp
src/hotspot/os_cpu/aix_ppc/os_aix_ppc.hpp
src/hotspot/os_cpu/aix_ppc/prefetch_aix_ppc.inline.hpp
src/hotspot/os_cpu/aix_ppc/thread_aix_ppc.hpp
src/hotspot/os_cpu/aix_ppc/vmStructs_aix_ppc.hpp
src/hotspot/os_cpu/bsd_x86/atomic_bsd_x86.hpp
src/hotspot/os_cpu/bsd_x86/bytes_bsd_x86.inline.hpp
src/hotspot/os_cpu/bsd_x86/copy_bsd_x86.inline.hpp
src/hotspot/os_cpu/bsd_x86/globals_bsd_x86.hpp
src/hotspot/os_cpu/bsd_x86/orderAccess_bsd_x86.hpp
src/hotspot/os_cpu/bsd_x86/os_bsd_x86.hpp
src/hotspot/os_cpu/bsd_x86/os_bsd_x86.inline.hpp
src/hotspot/os_cpu/bsd_x86/prefetch_bsd_x86.inline.hpp
src/hotspot/os_cpu/bsd_x86/thread_bsd_x86.hpp
src/hotspot/os_cpu/bsd_x86/vmStructs_bsd_x86.hpp
src/hotspot/os_cpu/bsd_zero/atomic_bsd_zero.hpp
src/hotspot/os_cpu/bsd_zero/bytes_bsd_zero.inline.hpp
src/hotspot/os_cpu/bsd_zero/globals_bsd_zero.hpp
src/hotspot/os_cpu/bsd_zero/orderAccess_bsd_zero.hpp
src/hotspot/os_cpu/bsd_zero/os_bsd_zero.hpp
src/hotspot/os_cpu/bsd_zero/prefetch_bsd_zero.inline.hpp
src/hotspot/os_cpu/bsd_zero/thread_bsd_zero.hpp
src/hotspot/os_cpu/bsd_zero/vmStructs_bsd_zero.hpp
src/hotspot/os_cpu/linux_aarch64/atomic_linux_aarch64.hpp
src/hotspot/os_cpu/linux_aarch64/bytes_linux_aarch64.inline.hpp
src/hotspot/os_cpu/linux_aarch64/copy_linux_aarch64.inline.hpp
src/hotspot/os_cpu/linux_aarch64/globals_linux_aarch64.hpp
src/hotspot/os_cpu/linux_aarch64/orderAccess_linux_aarch64.hpp
src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.hpp
src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.inline.hpp
src/hotspot/os_cpu/linux_aarch64/prefetch_linux_aarch64.inline.hpp
src/hotspot/os_cpu/linux_aarch64/thread_linux_aarch64.hpp
src/hotspot/os_cpu/linux_aarch64/vmStructs_linux_aarch64.hpp
src/hotspot/os_cpu/linux_arm/atomic_linux_arm.hpp
src/hotspot/os_cpu/linux_arm/bytes_linux_arm.inline.hpp
src/hotspot/os_cpu/linux_arm/copy_linux_arm.inline.hpp
src/hotspot/os_cpu/linux_arm/globals_linux_arm.hpp
src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.hpp
src/hotspot/os_cpu/linux_arm/os_linux_arm.hpp
src/hotspot/os_cpu/linux_arm/prefetch_linux_arm.inline.hpp
src/hotspot/os_cpu/linux_arm/thread_linux_arm.hpp
src/hotspot/os_cpu/linux_arm/vmStructs_linux_arm.hpp
src/hotspot/os_cpu/linux_ppc/atomic_linux_ppc.hpp
src/hotspot/os_cpu/linux_ppc/bytes_linux_ppc.inline.hpp
src/hotspot/os_cpu/linux_ppc/globals_linux_ppc.hpp
src/hotspot/os_cpu/linux_ppc/orderAccess_linux_ppc.hpp
src/hotspot/os_cpu/linux_ppc/os_linux_ppc.hpp
src/hotspot/os_cpu/linux_ppc/prefetch_linux_ppc.inline.hpp
src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.hpp
src/hotspot/os_cpu/linux_ppc/vmStructs_linux_ppc.hpp
src/hotspot/os_cpu/linux_s390/atomic_linux_s390.hpp
src/hotspot/os_cpu/linux_s390/bytes_linux_s390.inline.hpp
src/hotspot/os_cpu/linux_s390/globals_linux_s390.hpp
src/hotspot/os_cpu/linux_s390/orderAccess_linux_s390.hpp
src/hotspot/os_cpu/linux_s390/os_linux_s390.hpp
src/hotspot/os_cpu/linux_s390/prefetch_linux_s390.inline.hpp
src/hotspot/os_cpu/linux_s390/thread_linux_s390.hpp
src/hotspot/os_cpu/linux_s390/vmStructs_linux_s390.hpp
src/hotspot/os_cpu/linux_sparc/atomic_linux_sparc.hpp
src/hotspot/os_cpu/linux_sparc/globals_linux_sparc.hpp
src/hotspot/os_cpu/linux_sparc/orderAccess_linux_sparc.hpp
src/hotspot/os_cpu/linux_sparc/os_linux_sparc.hpp
src/hotspot/os_cpu/linux_sparc/prefetch_linux_sparc.inline.hpp
src/hotspot/os_cpu/linux_sparc/thread_linux_sparc.hpp
src/hotspot/os_cpu/linux_sparc/vmStructs_linux_sparc.hpp
src/hotspot/os_cpu/linux_x86/atomic_linux_x86.hpp
src/hotspot/os_cpu/linux_x86/bytes_linux_x86.inline.hpp
src/hotspot/os_cpu/linux_x86/copy_linux_x86.inline.hpp
src/hotspot/os_cpu/linux_x86/gc/z/zAddress_linux_x86.inline.hpp
src/hotspot/os_cpu/linux_x86/gc/z/zBackingFile_linux_x86.hpp
src/hotspot/os_cpu/linux_x86/gc/z/zBackingPath_linux_x86.hpp
src/hotspot/os_cpu/linux_x86/gc/z/zGlobals_linux_x86.hpp
src/hotspot/os_cpu/linux_x86/gc/z/zPhysicalMemoryBacking_linux_x86.hpp
src/hotspot/os_cpu/linux_x86/globals_linux_x86.hpp
src/hotspot/os_cpu/linux_x86/orderAccess_linux_x86.hpp
src/hotspot/os_cpu/linux_x86/os_linux_x86.hpp
src/hotspot/os_cpu/linux_x86/os_linux_x86.inline.hpp
src/hotspot/os_cpu/linux_x86/prefetch_linux_x86.inline.hpp
src/hotspot/os_cpu/linux_x86/thread_linux_x86.hpp
src/hotspot/os_cpu/linux_x86/vmStructs_linux_x86.hpp
src/hotspot/os_cpu/linux_zero/atomic_linux_zero.hpp
src/hotspot/os_cpu/linux_zero/bytes_linux_zero.inline.hpp
src/hotspot/os_cpu/linux_zero/globals_linux_zero.hpp
src/hotspot/os_cpu/linux_zero/orderAccess_linux_zero.hpp
src/hotspot/os_cpu/linux_zero/os_linux_zero.hpp
src/hotspot/os_cpu/linux_zero/prefetch_linux_zero.inline.hpp
src/hotspot/os_cpu/linux_zero/thread_linux_zero.hpp
src/hotspot/os_cpu/linux_zero/vmStructs_linux_zero.hpp
src/hotspot/os_cpu/solaris_sparc/atomic_solaris_sparc.hpp
src/hotspot/os_cpu/solaris_sparc/count_trailing_zeros_solaris_sparc.hpp
src/hotspot/os_cpu/solaris_sparc/globals_solaris_sparc.hpp
src/hotspot/os_cpu/solaris_sparc/orderAccess_solaris_sparc.hpp
src/hotspot/os_cpu/solaris_sparc/os_solaris_sparc.hpp
src/hotspot/os_cpu/solaris_sparc/prefetch_solaris_sparc.inline.hpp
src/hotspot/os_cpu/solaris_sparc/thread_solaris_sparc.hpp
src/hotspot/os_cpu/solaris_sparc/vmStructs_solaris_sparc.hpp
src/hotspot/os_cpu/solaris_x86/atomic_solaris_x86.hpp
src/hotspot/os_cpu/solaris_x86/bytes_solaris_x86.inline.hpp
src/hotspot/os_cpu/solaris_x86/copy_solaris_x86.inline.hpp
src/hotspot/os_cpu/solaris_x86/count_trailing_zeros_solaris_x86.hpp
src/hotspot/os_cpu/solaris_x86/globals_solaris_x86.hpp
src/hotspot/os_cpu/solaris_x86/orderAccess_solaris_x86.hpp
src/hotspot/os_cpu/solaris_x86/os_solaris_x86.hpp
src/hotspot/os_cpu/solaris_x86/os_solaris_x86.inline.hpp
src/hotspot/os_cpu/solaris_x86/prefetch_solaris_x86.inline.hpp
src/hotspot/os_cpu/solaris_x86/thread_solaris_x86.hpp
src/hotspot/os_cpu/solaris_x86/vmStructs_solaris_x86.hpp
src/hotspot/os_cpu/windows_x86/atomic_windows_x86.hpp
src/hotspot/os_cpu/windows_x86/bytes_windows_x86.inline.hpp
src/hotspot/os_cpu/windows_x86/copy_windows_x86.inline.hpp
src/hotspot/os_cpu/windows_x86/globals_windows_x86.hpp
src/hotspot/os_cpu/windows_x86/orderAccess_windows_x86.hpp
src/hotspot/os_cpu/windows_x86/os_windows_x86.hpp
src/hotspot/os_cpu/windows_x86/os_windows_x86.inline.hpp
src/hotspot/os_cpu/windows_x86/prefetch_windows_x86.inline.hpp
src/hotspot/os_cpu/windows_x86/thread_windows_x86.hpp
src/hotspot/os_cpu/windows_x86/unwind_windows_x86.hpp
src/hotspot/os_cpu/windows_x86/vmStructs_windows_x86.hpp
src/hotspot/share/adlc/adlc.hpp
src/hotspot/share/adlc/adlparse.hpp
src/hotspot/share/adlc/archDesc.hpp
src/hotspot/share/adlc/arena.hpp
src/hotspot/share/adlc/dict2.hpp
src/hotspot/share/adlc/filebuff.hpp
src/hotspot/share/adlc/forms.hpp
src/hotspot/share/adlc/formsopt.hpp
src/hotspot/share/adlc/formssel.hpp
src/hotspot/share/aot/aotCodeHeap.hpp
src/hotspot/share/aot/aotCompiledMethod.hpp
src/hotspot/share/aot/aotLoader.hpp
src/hotspot/share/aot/aotLoader.inline.hpp
src/hotspot/share/aot/compiledIC_aot.hpp
src/hotspot/share/asm/assembler.hpp
src/hotspot/share/asm/assembler.inline.hpp
src/hotspot/share/asm/codeBuffer.hpp
src/hotspot/share/asm/macroAssembler.hpp
src/hotspot/share/asm/macroAssembler.inline.hpp
src/hotspot/share/asm/register.hpp
src/hotspot/share/c1/c1_CFGPrinter.hpp
src/hotspot/share/c1/c1_Canonicalizer.hpp
src/hotspot/share/c1/c1_CodeStubs.hpp
src/hotspot/share/c1/c1_Compilation.hpp
src/hotspot/share/c1/c1_Compiler.hpp
src/hotspot/share/c1/c1_Decorators.hpp
src/hotspot/share/c1/c1_Defs.hpp
src/hotspot/share/c1/c1_FpuStackSim.hpp
src/hotspot/share/c1/c1_FrameMap.hpp
src/hotspot/share/c1/c1_GraphBuilder.hpp
src/hotspot/share/c1/c1_IR.hpp
src/hotspot/share/c1/c1_Instruction.hpp
src/hotspot/share/c1/c1_InstructionPrinter.hpp
src/hotspot/share/c1/c1_LIR.hpp
src/hotspot/share/c1/c1_LIRAssembler.hpp
src/hotspot/share/c1/c1_LIRGenerator.hpp
src/hotspot/share/c1/c1_LinearScan.hpp
src/hotspot/share/c1/c1_MacroAssembler.hpp
src/hotspot/share/c1/c1_Optimizer.hpp
src/hotspot/share/c1/c1_RangeCheckElimination.hpp
src/hotspot/share/c1/c1_Runtime1.hpp
src/hotspot/share/c1/c1_ValueMap.hpp
src/hotspot/share/c1/c1_ValueSet.hpp
src/hotspot/share/c1/c1_ValueSet.inline.hpp
src/hotspot/share/c1/c1_ValueStack.hpp
src/hotspot/share/c1/c1_ValueType.hpp
src/hotspot/share/c1/c1_globals.hpp
src/hotspot/share/ci/bcEscapeAnalyzer.hpp
src/hotspot/share/ci/ciArray.hpp
src/hotspot/share/ci/ciArrayKlass.hpp
src/hotspot/share/ci/ciBaseObject.hpp
src/hotspot/share/ci/ciCallProfile.hpp
src/hotspot/share/ci/ciCallSite.hpp
src/hotspot/share/ci/ciClassList.hpp
src/hotspot/share/ci/ciConstant.hpp
src/hotspot/share/ci/ciConstantPoolCache.hpp
src/hotspot/share/ci/ciEnv.hpp
src/hotspot/share/ci/ciExceptionHandler.hpp
src/hotspot/share/ci/ciField.hpp
src/hotspot/share/ci/ciFlags.hpp
src/hotspot/share/ci/ciInstance.hpp
src/hotspot/share/ci/ciInstanceKlass.hpp
src/hotspot/share/ci/ciKlass.hpp
src/hotspot/share/ci/ciMemberName.hpp
src/hotspot/share/ci/ciMetadata.hpp
src/hotspot/share/ci/ciMethod.hpp
src/hotspot/share/ci/ciMethodBlocks.hpp
src/hotspot/share/ci/ciMethodData.hpp
src/hotspot/share/ci/ciMethodHandle.hpp
src/hotspot/share/ci/ciMethodType.hpp
src/hotspot/share/ci/ciNullObject.hpp
src/hotspot/share/ci/ciObjArray.hpp
src/hotspot/share/ci/ciObjArrayKlass.hpp
src/hotspot/share/ci/ciObject.hpp
src/hotspot/share/ci/ciObjectFactory.hpp
src/hotspot/share/ci/ciReplay.hpp
src/hotspot/share/ci/ciSignature.hpp
src/hotspot/share/ci/ciStreams.hpp
src/hotspot/share/ci/ciSymbol.hpp
src/hotspot/share/ci/ciType.hpp
src/hotspot/share/ci/ciTypeArray.hpp
src/hotspot/share/ci/ciTypeArrayKlass.hpp
src/hotspot/share/ci/ciTypeFlow.hpp
src/hotspot/share/ci/ciUtilities.hpp
src/hotspot/share/ci/ciUtilities.inline.hpp
src/hotspot/share/ci/compilerInterface.hpp
src/hotspot/share/classfile/altHashing.hpp
src/hotspot/share/classfile/bytecodeAssembler.hpp
src/hotspot/share/classfile/classFileParser.hpp
src/hotspot/share/classfile/classFileStream.hpp
src/hotspot/share/classfile/classListParser.hpp
src/hotspot/share/classfile/classLoader.hpp
src/hotspot/share/classfile/classLoader.inline.hpp
src/hotspot/share/classfile/classLoaderData.hpp
src/hotspot/share/classfile/classLoaderData.inline.hpp
src/hotspot/share/classfile/classLoaderDataGraph.hpp
src/hotspot/share/classfile/classLoaderDataGraph.inline.hpp
src/hotspot/share/classfile/classLoaderExt.hpp
src/hotspot/share/classfile/classLoaderHierarchyDCmd.hpp
src/hotspot/share/classfile/classLoaderStats.hpp
src/hotspot/share/classfile/compactHashtable.hpp
src/hotspot/share/classfile/defaultMethods.hpp
src/hotspot/share/classfile/dictionary.hpp
src/hotspot/share/classfile/dictionary.inline.hpp
src/hotspot/share/classfile/javaAssertions.hpp
src/hotspot/share/classfile/javaClasses.hpp
src/hotspot/share/classfile/javaClasses.inline.hpp
src/hotspot/share/classfile/klassFactory.hpp
src/hotspot/share/classfile/loaderConstraints.hpp
src/hotspot/share/classfile/metadataOnStackMark.hpp
src/hotspot/share/classfile/moduleEntry.hpp
src/hotspot/share/classfile/modules.hpp
src/hotspot/share/classfile/packageEntry.hpp
src/hotspot/share/classfile/placeholders.hpp
src/hotspot/share/classfile/protectionDomainCache.hpp
src/hotspot/share/classfile/resolutionErrors.hpp
src/hotspot/share/classfile/sharedPathsMiscInfo.hpp
src/hotspot/share/classfile/stackMapFrame.hpp
src/hotspot/share/classfile/stackMapTable.hpp
src/hotspot/share/classfile/stackMapTableFormat.hpp
src/hotspot/share/classfile/stringTable.hpp
src/hotspot/share/classfile/symbolTable.hpp
src/hotspot/share/classfile/systemDictionary.hpp
src/hotspot/share/classfile/systemDictionaryShared.hpp
src/hotspot/share/classfile/verificationType.hpp
src/hotspot/share/classfile/verifier.hpp
src/hotspot/share/classfile/vmSymbols.hpp
src/hotspot/share/code/codeBlob.hpp
src/hotspot/share/code/codeCache.hpp
src/hotspot/share/code/compiledIC.hpp
src/hotspot/share/code/compiledMethod.hpp
src/hotspot/share/code/compiledMethod.inline.hpp
src/hotspot/share/code/compressedStream.hpp
src/hotspot/share/code/debugInfo.hpp
src/hotspot/share/code/debugInfoRec.hpp
src/hotspot/share/code/dependencies.hpp
src/hotspot/share/code/dependencyContext.hpp
src/hotspot/share/code/exceptionHandlerTable.hpp
src/hotspot/share/code/icBuffer.hpp
src/hotspot/share/code/location.hpp
src/hotspot/share/code/nativeInst.hpp
src/hotspot/share/code/nmethod.hpp
src/hotspot/share/code/oopRecorder.hpp
src/hotspot/share/code/pcDesc.hpp
src/hotspot/share/code/relocInfo.hpp
src/hotspot/share/code/relocInfo_ext.hpp
src/hotspot/share/code/scopeDesc.hpp
src/hotspot/share/code/stubs.hpp
src/hotspot/share/code/vmreg.hpp
src/hotspot/share/code/vmreg.inline.hpp
src/hotspot/share/code/vtableStubs.hpp
src/hotspot/share/compiler/abstractCompiler.hpp
src/hotspot/share/compiler/compileBroker.hpp
src/hotspot/share/compiler/compileLog.hpp
src/hotspot/share/compiler/compileTask.hpp
src/hotspot/share/compiler/compilerDefinitions.hpp
src/hotspot/share/compiler/compilerDirectives.hpp
src/hotspot/share/compiler/compilerOracle.hpp
src/hotspot/share/compiler/directivesParser.hpp
src/hotspot/share/compiler/disassembler.hpp
src/hotspot/share/compiler/methodLiveness.hpp
src/hotspot/share/compiler/methodMatcher.hpp
src/hotspot/share/compiler/oopMap.hpp
src/hotspot/share/gc/cms/adaptiveFreeList.hpp
src/hotspot/share/gc/cms/allocationStats.hpp
src/hotspot/share/gc/cms/cmsCollectorPolicy.hpp
src/hotspot/share/gc/cms/cmsHeap.hpp
src/hotspot/share/gc/cms/cmsLockVerifier.hpp
src/hotspot/share/gc/cms/cmsOopClosures.hpp
src/hotspot/share/gc/cms/cmsOopClosures.inline.hpp
src/hotspot/share/gc/cms/cmsVMOperations.hpp
src/hotspot/share/gc/cms/compactibleFreeListSpace.hpp
src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.hpp
src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.inline.hpp
src/hotspot/share/gc/cms/concurrentMarkSweepThread.hpp
src/hotspot/share/gc/cms/freeChunk.hpp
src/hotspot/share/gc/cms/gSpaceCounters.hpp
src/hotspot/share/gc/cms/jvmFlagConstraintsCMS.hpp
src/hotspot/share/gc/cms/parNewGeneration.hpp
src/hotspot/share/gc/cms/parNewGeneration.inline.hpp
src/hotspot/share/gc/cms/parOopClosures.hpp
src/hotspot/share/gc/cms/parOopClosures.inline.hpp
src/hotspot/share/gc/cms/promotionInfo.hpp
src/hotspot/share/gc/cms/promotionInfo.inline.hpp
src/hotspot/share/gc/cms/vmStructs_cms.hpp
src/hotspot/share/gc/cms/yieldingWorkgroup.hpp
src/hotspot/share/gc/epsilon/epsilonBarrierSet.hpp
src/hotspot/share/gc/epsilon/epsilonCollectorPolicy.hpp
src/hotspot/share/gc/epsilon/epsilonHeap.hpp
src/hotspot/share/gc/epsilon/epsilonMemoryPool.hpp
src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.hpp
src/hotspot/share/gc/epsilon/epsilonThreadLocalData.hpp
src/hotspot/share/gc/epsilon/epsilon_globals.hpp
src/hotspot/share/gc/epsilon/vmStructs_epsilon.hpp
src/hotspot/share/gc/g1/c2/g1BarrierSetC2.hpp
src/hotspot/share/gc/g1/collectionSetChooser.hpp
src/hotspot/share/gc/g1/dirtyCardQueue.hpp
src/hotspot/share/gc/g1/evacuationInfo.hpp
src/hotspot/share/gc/g1/g1AllocRegion.hpp
src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp
src/hotspot/share/gc/g1/g1Allocator.hpp
src/hotspot/share/gc/g1/g1Allocator.inline.hpp
src/hotspot/share/gc/g1/g1Analytics.hpp
src/hotspot/share/gc/g1/g1BarrierSet.hpp
src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp
src/hotspot/share/gc/g1/g1BiasedArray.hpp
src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp
src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp
src/hotspot/share/gc/g1/g1CardCounts.hpp
src/hotspot/share/gc/g1/g1CardTable.hpp
src/hotspot/share/gc/g1/g1CardTable.inline.hpp
src/hotspot/share/gc/g1/g1CodeBlobClosure.hpp
src/hotspot/share/gc/g1/g1CodeCacheRemSet.hpp
src/hotspot/share/gc/g1/g1CodeRootSetTable.hpp
src/hotspot/share/gc/g1/g1CollectedHeap.hpp
src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp
src/hotspot/share/gc/g1/g1CollectionSet.hpp
src/hotspot/share/gc/g1/g1CollectorPolicy.hpp
src/hotspot/share/gc/g1/g1CollectorState.hpp
src/hotspot/share/gc/g1/g1ConcurrentMark.hpp
src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp
src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.hpp
src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.inline.hpp
src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.hpp
src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp
src/hotspot/share/gc/g1/g1ConcurrentMarkThread.hpp
src/hotspot/share/gc/g1/g1ConcurrentMarkThread.inline.hpp
src/hotspot/share/gc/g1/g1ConcurrentRefine.hpp
src/hotspot/share/gc/g1/g1ConcurrentRefineThread.hpp
src/hotspot/share/gc/g1/g1EdenRegions.hpp
src/hotspot/share/gc/g1/g1EvacFailure.hpp
src/hotspot/share/gc/g1/g1EvacStats.hpp
src/hotspot/share/gc/g1/g1EvacStats.inline.hpp
src/hotspot/share/gc/g1/g1FromCardCache.hpp
src/hotspot/share/gc/g1/g1FullGCMarker.inline.hpp
src/hotspot/share/gc/g1/g1FullGCOopClosures.inline.hpp
src/hotspot/share/gc/g1/g1FullGCScope.hpp
src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp
src/hotspot/share/gc/g1/g1HRPrinter.hpp
src/hotspot/share/gc/g1/g1HeapRegionEventSender.hpp
src/hotspot/share/gc/g1/g1HeapRegionTraceType.hpp
src/hotspot/share/gc/g1/g1HeapSizingPolicy.hpp
src/hotspot/share/gc/g1/g1HeapTransition.hpp
src/hotspot/share/gc/g1/g1HeapVerifier.hpp
src/hotspot/share/gc/g1/g1HeterogeneousCollectorPolicy.hpp
src/hotspot/share/gc/g1/g1HeterogeneousHeapPolicy.hpp
src/hotspot/share/gc/g1/g1HeterogeneousHeapYoungGenSizer.hpp
src/hotspot/share/gc/g1/g1HotCardCache.hpp
src/hotspot/share/gc/g1/g1IHOPControl.hpp
src/hotspot/share/gc/g1/g1InCSetState.hpp
src/hotspot/share/gc/g1/g1InitialMarkToMixedTimeTracker.hpp
src/hotspot/share/gc/g1/g1MMUTracker.hpp
src/hotspot/share/gc/g1/g1MemoryPool.hpp
src/hotspot/share/gc/g1/g1MonitoringSupport.hpp
src/hotspot/share/gc/g1/g1OopClosures.hpp
src/hotspot/share/gc/g1/g1OopClosures.inline.hpp
src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.hpp
src/hotspot/share/gc/g1/g1ParScanThreadState.hpp
src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp
src/hotspot/share/gc/g1/g1Policy.hpp
src/hotspot/share/gc/g1/g1Predictions.hpp
src/hotspot/share/gc/g1/g1RegionMarkStatsCache.hpp
src/hotspot/share/gc/g1/g1RegionMarkStatsCache.inline.hpp
src/hotspot/share/gc/g1/g1RegionToSpaceMapper.hpp
src/hotspot/share/gc/g1/g1RemSet.hpp
src/hotspot/share/gc/g1/g1RemSetSummary.hpp
src/hotspot/share/gc/g1/g1RemSetTrackingPolicy.hpp
src/hotspot/share/gc/g1/g1RootClosures.hpp
src/hotspot/share/gc/g1/g1RootProcessor.hpp
src/hotspot/share/gc/g1/g1SATBMarkQueueSet.hpp
src/hotspot/share/gc/g1/g1StringDedup.hpp
src/hotspot/share/gc/g1/g1StringDedupQueue.hpp
src/hotspot/share/gc/g1/g1StringDedupStat.hpp
src/hotspot/share/gc/g1/g1SurvivorRegions.hpp
src/hotspot/share/gc/g1/g1VMOperations.hpp
src/hotspot/share/gc/g1/g1YCTypes.hpp
src/hotspot/share/gc/g1/g1YoungGenSizer.hpp
src/hotspot/share/gc/g1/g1YoungRemSetSamplingThread.hpp
src/hotspot/share/gc/g1/g1_globals.hpp
src/hotspot/share/gc/g1/heapRegion.hpp
src/hotspot/share/gc/g1/heapRegion.inline.hpp
src/hotspot/share/gc/g1/heapRegionBounds.hpp
src/hotspot/share/gc/g1/heapRegionBounds.inline.hpp
src/hotspot/share/gc/g1/heapRegionManager.hpp
src/hotspot/share/gc/g1/heapRegionManager.inline.hpp
src/hotspot/share/gc/g1/heapRegionRemSet.hpp
src/hotspot/share/gc/g1/heapRegionSet.hpp
src/hotspot/share/gc/g1/heapRegionSet.inline.hpp
src/hotspot/share/gc/g1/heapRegionTracer.hpp
src/hotspot/share/gc/g1/heapRegionType.hpp
src/hotspot/share/gc/g1/heterogeneousHeapRegionManager.hpp
src/hotspot/share/gc/g1/jvmFlagConstraintsG1.hpp
src/hotspot/share/gc/g1/sparsePRT.hpp
src/hotspot/share/gc/g1/survRateGroup.hpp
src/hotspot/share/gc/g1/vmStructs_g1.hpp
src/hotspot/share/gc/parallel/adjoiningGenerations.hpp
src/hotspot/share/gc/parallel/adjoiningGenerationsForHeteroHeap.hpp
src/hotspot/share/gc/parallel/adjoiningVirtualSpaces.hpp
src/hotspot/share/gc/parallel/asPSOldGen.hpp
src/hotspot/share/gc/parallel/asPSYoungGen.hpp
src/hotspot/share/gc/parallel/gcAdaptivePolicyCounters.hpp
src/hotspot/share/gc/parallel/gcTaskManager.hpp
src/hotspot/share/gc/parallel/gcTaskThread.hpp
src/hotspot/share/gc/parallel/generationSizer.hpp
src/hotspot/share/gc/parallel/heterogeneousGenerationSizer.hpp
src/hotspot/share/gc/parallel/immutableSpace.hpp
src/hotspot/share/gc/parallel/jvmFlagConstraintsParallel.hpp
src/hotspot/share/gc/parallel/mutableNUMASpace.hpp
src/hotspot/share/gc/parallel/mutableSpace.hpp
src/hotspot/share/gc/parallel/objectStartArray.hpp
src/hotspot/share/gc/parallel/objectStartArray.inline.hpp
src/hotspot/share/gc/parallel/parMarkBitMap.hpp
src/hotspot/share/gc/parallel/parMarkBitMap.inline.hpp
src/hotspot/share/gc/parallel/parallelArguments.hpp
src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp
src/hotspot/share/gc/parallel/parallelScavengeHeap.inline.hpp
src/hotspot/share/gc/parallel/pcTasks.hpp
src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp
src/hotspot/share/gc/parallel/psCardTable.hpp
src/hotspot/share/gc/parallel/psClosure.inline.hpp
src/hotspot/share/gc/parallel/psCompactionManager.hpp
src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp
src/hotspot/share/gc/parallel/psFileBackedVirtualspace.hpp
src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.hpp
src/hotspot/share/gc/parallel/psGenerationCounters.hpp
src/hotspot/share/gc/parallel/psMarkSweep.hpp
src/hotspot/share/gc/parallel/psMarkSweepDecorator.hpp
src/hotspot/share/gc/parallel/psMemoryPool.hpp
src/hotspot/share/gc/parallel/psOldGen.hpp
src/hotspot/share/gc/parallel/psParallelCompact.hpp
src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp
src/hotspot/share/gc/parallel/psPromotionLAB.hpp
src/hotspot/share/gc/parallel/psPromotionLAB.inline.hpp
src/hotspot/share/gc/parallel/psPromotionManager.hpp
src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp
src/hotspot/share/gc/parallel/psScavenge.hpp
src/hotspot/share/gc/parallel/psScavenge.inline.hpp
src/hotspot/share/gc/parallel/psTasks.hpp
src/hotspot/share/gc/parallel/psVMOperations.hpp
src/hotspot/share/gc/parallel/psVirtualspace.hpp
src/hotspot/share/gc/parallel/psYoungGen.hpp
src/hotspot/share/gc/parallel/spaceCounters.hpp
src/hotspot/share/gc/parallel/vmStructs_parallelgc.hpp
src/hotspot/share/gc/serial/cSpaceCounters.hpp
src/hotspot/share/gc/serial/defNewGeneration.hpp
src/hotspot/share/gc/serial/defNewGeneration.inline.hpp
src/hotspot/share/gc/serial/genMarkSweep.hpp
src/hotspot/share/gc/serial/markSweep.hpp
src/hotspot/share/gc/serial/markSweep.inline.hpp
src/hotspot/share/gc/serial/serialHeap.hpp
src/hotspot/share/gc/serial/tenuredGeneration.hpp
src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp
src/hotspot/share/gc/serial/vmStructs_serial.hpp
src/hotspot/share/gc/shared/accessBarrierSupport.hpp
src/hotspot/share/gc/shared/accessBarrierSupport.inline.hpp
src/hotspot/share/gc/shared/adaptiveSizePolicy.hpp
src/hotspot/share/gc/shared/ageTable.hpp
src/hotspot/share/gc/shared/ageTable.inline.hpp
src/hotspot/share/gc/shared/ageTableTracer.hpp
src/hotspot/share/gc/shared/allocTracer.hpp
src/hotspot/share/gc/shared/barrierSet.hpp
src/hotspot/share/gc/shared/barrierSet.inline.hpp
src/hotspot/share/gc/shared/barrierSetConfig.hpp
src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp
src/hotspot/share/gc/shared/barrierSetNMethod.hpp
src/hotspot/share/gc/shared/blockOffsetTable.hpp
src/hotspot/share/gc/shared/blockOffsetTable.inline.hpp
src/hotspot/share/gc/shared/cardGeneration.hpp
src/hotspot/share/gc/shared/cardGeneration.inline.hpp
src/hotspot/share/gc/shared/cardTable.hpp
src/hotspot/share/gc/shared/cardTableBarrierSet.hpp
src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp
src/hotspot/share/gc/shared/cardTableRS.hpp
src/hotspot/share/gc/shared/collectedHeap.hpp
src/hotspot/share/gc/shared/collectedHeap.inline.hpp
src/hotspot/share/gc/shared/collectorCounters.hpp
src/hotspot/share/gc/shared/collectorPolicy.hpp
src/hotspot/share/gc/shared/concurrentGCPhaseManager.hpp
src/hotspot/share/gc/shared/concurrentGCThread.hpp
src/hotspot/share/gc/shared/copyFailedInfo.hpp
src/hotspot/share/gc/shared/gcBehaviours.hpp
src/hotspot/share/gc/shared/gcCause.hpp
src/hotspot/share/gc/shared/gcConfiguration.hpp
src/hotspot/share/gc/shared/gcHeapSummary.hpp
src/hotspot/share/gc/shared/gcId.hpp
src/hotspot/share/gc/shared/gcLocker.hpp
src/hotspot/share/gc/shared/gcLocker.inline.hpp
src/hotspot/share/gc/shared/gcName.hpp
src/hotspot/share/gc/shared/gcPolicyCounters.hpp
src/hotspot/share/gc/shared/gcStats.hpp
src/hotspot/share/gc/shared/gcTimer.hpp
src/hotspot/share/gc/shared/gcTrace.hpp
src/hotspot/share/gc/shared/gcTraceTime.hpp
src/hotspot/share/gc/shared/gcTraceTime.inline.hpp
src/hotspot/share/gc/shared/gcUtil.hpp
src/hotspot/share/gc/shared/gcUtil.inline.hpp
src/hotspot/share/gc/shared/gcVMOperations.hpp
src/hotspot/share/gc/shared/gcWhen.hpp
src/hotspot/share/gc/shared/genCollectedHeap.hpp
src/hotspot/share/gc/shared/genMemoryPools.hpp
src/hotspot/share/gc/shared/genOopClosures.hpp
src/hotspot/share/gc/shared/genOopClosures.inline.hpp
src/hotspot/share/gc/shared/generation.hpp
src/hotspot/share/gc/shared/generationCounters.hpp
src/hotspot/share/gc/shared/generationSpec.hpp
src/hotspot/share/gc/shared/hSpaceCounters.hpp
src/hotspot/share/gc/shared/isGCActiveMark.hpp
src/hotspot/share/gc/shared/jvmFlagConstraintsGC.hpp
src/hotspot/share/gc/shared/markBitMap.hpp
src/hotspot/share/gc/shared/markBitMap.inline.hpp
src/hotspot/share/gc/shared/memAllocator.hpp
src/hotspot/share/gc/shared/memset_with_concurrent_readers.hpp
src/hotspot/share/gc/shared/modRefBarrierSet.hpp
src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp
src/hotspot/share/gc/shared/objectCountEventSender.hpp
src/hotspot/share/gc/shared/oopStorage.hpp
src/hotspot/share/gc/shared/oopStorage.inline.hpp
src/hotspot/share/gc/shared/owstTaskTerminator.hpp
src/hotspot/share/gc/shared/parallelCleaning.hpp
src/hotspot/share/gc/shared/plab.hpp
src/hotspot/share/gc/shared/plab.inline.hpp
src/hotspot/share/gc/shared/preservedMarks.hpp
src/hotspot/share/gc/shared/preservedMarks.inline.hpp
src/hotspot/share/gc/shared/referencePolicy.hpp
src/hotspot/share/gc/shared/referenceProcessor.hpp
src/hotspot/share/gc/shared/referenceProcessor.inline.hpp
src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.hpp
src/hotspot/share/gc/shared/referenceProcessorStats.hpp
src/hotspot/share/gc/shared/softRefGenPolicy.hpp
src/hotspot/share/gc/shared/softRefPolicy.hpp
src/hotspot/share/gc/shared/space.hpp
src/hotspot/share/gc/shared/space.inline.hpp
src/hotspot/share/gc/shared/spaceDecorator.hpp
src/hotspot/share/gc/shared/stringdedup/stringDedup.hpp
src/hotspot/share/gc/shared/stringdedup/stringDedup.inline.hpp
src/hotspot/share/gc/shared/stringdedup/stringDedupQueue.hpp
src/hotspot/share/gc/shared/stringdedup/stringDedupQueue.inline.hpp
src/hotspot/share/gc/shared/stringdedup/stringDedupStat.hpp
src/hotspot/share/gc/shared/stringdedup/stringDedupTable.hpp
src/hotspot/share/gc/shared/stringdedup/stringDedupThread.hpp
src/hotspot/share/gc/shared/stringdedup/stringDedupThread.inline.hpp
src/hotspot/share/gc/shared/strongRootsScope.hpp
src/hotspot/share/gc/shared/taskqueue.hpp
src/hotspot/share/gc/shared/taskqueue.inline.hpp
src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp
src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp
src/hotspot/share/gc/shared/weakProcessor.hpp
src/hotspot/share/gc/shared/weakProcessor.inline.hpp
src/hotspot/share/gc/shared/workerDataArray.hpp
src/hotspot/share/gc/shared/workerDataArray.inline.hpp
src/hotspot/share/gc/shared/workerManager.hpp
src/hotspot/share/gc/shared/workerPolicy.hpp
src/hotspot/share/gc/shared/workgroup.hpp
src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.hpp
src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.hpp
src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.hpp
src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.hpp
src/hotspot/share/gc/shenandoah/heuristics/shenandoahAggressiveHeuristics.hpp
src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.hpp
src/hotspot/share/gc/shenandoah/heuristics/shenandoahPassiveHeuristics.hpp
src/hotspot/share/gc/shenandoah/heuristics/shenandoahStaticHeuristics.hpp
src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalHeuristics.hpp
src/hotspot/share/gc/shenandoah/shenandoahAllocRequest.hpp
src/hotspot/share/gc/shenandoah/shenandoahAllocTracker.hpp
src/hotspot/share/gc/shenandoah/shenandoahAsserts.hpp
src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp
src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp
src/hotspot/share/gc/shenandoah/shenandoahBrooksPointer.hpp
src/hotspot/share/gc/shenandoah/shenandoahBrooksPointer.inline.hpp
src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.hpp
src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.hpp
src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.inline.hpp
src/hotspot/share/gc/shenandoah/shenandoahCollectorPolicy.hpp
src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.hpp
src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.inline.hpp
src/hotspot/share/gc/shenandoah/shenandoahControlThread.hpp
src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.hpp
src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp
src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp
src/hotspot/share/gc/shenandoah/shenandoahHeapLock.hpp
src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp
src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp
src/hotspot/share/gc/shenandoah/shenandoahHeapRegionCounters.hpp
src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.hpp
src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.inline.hpp
src/hotspot/share/gc/shenandoah/shenandoahHeuristics.hpp
src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.hpp
src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.hpp
src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.inline.hpp
src/hotspot/share/gc/shenandoah/shenandoahMemoryPool.hpp
src/hotspot/share/gc/shenandoah/shenandoahMetrics.hpp
src/hotspot/share/gc/shenandoah/shenandoahMonitoringSupport.hpp
src/hotspot/share/gc/shenandoah/shenandoahNumberSeq.hpp
src/hotspot/share/gc/shenandoah/shenandoahOopClosures.hpp
src/hotspot/share/gc/shenandoah/shenandoahOopClosures.inline.hpp
src/hotspot/share/gc/shenandoah/shenandoahPacer.hpp
src/hotspot/share/gc/shenandoah/shenandoahPacer.inline.hpp
src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp
src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp
src/hotspot/share/gc/shenandoah/shenandoahRuntime.hpp
src/hotspot/share/gc/shenandoah/shenandoahSATBMarkQueueSet.hpp
src/hotspot/share/gc/shenandoah/shenandoahSharedVariables.hpp
src/hotspot/share/gc/shenandoah/shenandoahStrDedupQueue.hpp
src/hotspot/share/gc/shenandoah/shenandoahStrDedupQueue.inline.hpp
src/hotspot/share/gc/shenandoah/shenandoahStringDedup.hpp
src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp
src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.inline.hpp
src/hotspot/share/gc/shenandoah/shenandoahTimingTracker.hpp
src/hotspot/share/gc/shenandoah/shenandoahTracer.hpp
src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.hpp
src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.inline.hpp
src/hotspot/share/gc/shenandoah/shenandoahUtils.hpp
src/hotspot/share/gc/shenandoah/shenandoahVMOperations.hpp
src/hotspot/share/gc/shenandoah/shenandoahVerifier.hpp
src/hotspot/share/gc/shenandoah/shenandoahWorkGroup.hpp
src/hotspot/share/gc/shenandoah/shenandoahWorkerPolicy.hpp
src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp
src/hotspot/share/gc/shenandoah/vmStructs_shenandoah.hpp
src/hotspot/share/gc/z/vmStructs_z.hpp
src/hotspot/share/gc/z/zForwardingTable.hpp
src/hotspot/share/gc/z/zForwardingTable.inline.hpp
src/hotspot/share/interpreter/abstractInterpreter.hpp
src/hotspot/share/interpreter/bytecode.hpp
src/hotspot/share/interpreter/bytecode.inline.hpp
src/hotspot/share/interpreter/bytecodeHistogram.hpp
src/hotspot/share/interpreter/bytecodeInterpreter.hpp
src/hotspot/share/interpreter/bytecodeInterpreter.inline.hpp
src/hotspot/share/interpreter/bytecodeInterpreterProfiling.hpp
src/hotspot/share/interpreter/bytecodeStream.hpp
src/hotspot/share/interpreter/bytecodeTracer.hpp
src/hotspot/share/interpreter/bytecodes.hpp
src/hotspot/share/interpreter/cppInterpreter.hpp
src/hotspot/share/interpreter/cppInterpreterGenerator.hpp
src/hotspot/share/interpreter/interp_masm.hpp
src/hotspot/share/interpreter/interpreter.hpp
src/hotspot/share/interpreter/interpreterRuntime.hpp
src/hotspot/share/interpreter/invocationCounter.hpp
src/hotspot/share/interpreter/linkResolver.hpp
src/hotspot/share/interpreter/oopMapCache.hpp
src/hotspot/share/interpreter/rewriter.hpp
src/hotspot/share/interpreter/templateInterpreter.hpp
src/hotspot/share/interpreter/templateInterpreterGenerator.hpp
src/hotspot/share/interpreter/templateTable.hpp
src/hotspot/share/jfr/dcmd/jfrDcmds.hpp
src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.hpp
src/hotspot/share/jfr/instrumentation/jfrJvmtiAgent.hpp
src/hotspot/share/jfr/jfr.hpp
src/hotspot/share/jfr/jfrEvents.hpp
src/hotspot/share/jfr/jni/jfrGetAllEventClasses.hpp
src/hotspot/share/jfr/jni/jfrJavaCall.hpp
src/hotspot/share/jfr/jni/jfrJavaSupport.hpp
src/hotspot/share/jfr/jni/jfrJniMethod.hpp
src/hotspot/share/jfr/jni/jfrJniMethodRegistration.hpp
src/hotspot/share/jfr/jni/jfrUpcalls.hpp
src/hotspot/share/jfr/leakprofiler/chains/bfsClosure.hpp
src/hotspot/share/jfr/leakprofiler/chains/bitset.hpp
src/hotspot/share/jfr/leakprofiler/chains/dfsClosure.hpp
src/hotspot/share/jfr/leakprofiler/chains/edge.hpp
src/hotspot/share/jfr/leakprofiler/chains/edgeQueue.hpp
src/hotspot/share/jfr/leakprofiler/chains/edgeStore.hpp
src/hotspot/share/jfr/leakprofiler/chains/edgeUtils.hpp
src/hotspot/share/jfr/leakprofiler/chains/objectSampleMarker.hpp
src/hotspot/share/jfr/leakprofiler/chains/rootSetClosure.hpp
src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.hpp
src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleDescription.hpp
src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleWriter.hpp
src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.hpp
src/hotspot/share/jfr/leakprofiler/emitEventOperation.hpp
src/hotspot/share/jfr/leakprofiler/leakProfiler.hpp
src/hotspot/share/jfr/leakprofiler/sampling/objectSample.hpp
src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.hpp
src/hotspot/share/jfr/leakprofiler/sampling/sampleList.hpp
src/hotspot/share/jfr/leakprofiler/sampling/samplePriorityQueue.hpp
src/hotspot/share/jfr/leakprofiler/startOperation.hpp
src/hotspot/share/jfr/leakprofiler/stopOperation.hpp
src/hotspot/share/jfr/leakprofiler/utilities/granularTimer.hpp
src/hotspot/share/jfr/leakprofiler/utilities/rootType.hpp
src/hotspot/share/jfr/leakprofiler/utilities/saveRestore.hpp
src/hotspot/share/jfr/leakprofiler/utilities/unifiedOop.hpp
src/hotspot/share/jfr/metadata/jfrSerializer.hpp
src/hotspot/share/jfr/periodic/jfrModuleEvent.hpp
src/hotspot/share/jfr/periodic/jfrNetworkUtilization.hpp
src/hotspot/share/jfr/periodic/jfrOSInterface.hpp
src/hotspot/share/jfr/periodic/jfrThreadCPULoadEvent.hpp
src/hotspot/share/jfr/periodic/jfrThreadDumpEvent.hpp
src/hotspot/share/jfr/periodic/sampling/jfrCallTrace.hpp
src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.hpp
src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointBlob.hpp
src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.hpp
src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointWriter.hpp
src/hotspot/share/jfr/recorder/checkpoint/jfrMetadataEvent.hpp
src/hotspot/share/jfr/recorder/checkpoint/types/jfrThreadGroup.hpp
src/hotspot/share/jfr/recorder/checkpoint/types/jfrThreadState.hpp
src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.hpp
src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.hpp
src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.hpp
src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.hpp
src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetWriter.hpp
src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.hpp
src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp
src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdBits.inline.hpp
src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.hpp
src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdMacros.hpp
src/hotspot/share/jfr/recorder/jfrEventSetting.hpp
src/hotspot/share/jfr/recorder/jfrEventSetting.inline.hpp
src/hotspot/share/jfr/recorder/jfrRecorder.hpp
src/hotspot/share/jfr/recorder/repository/jfrChunkRotation.hpp
src/hotspot/share/jfr/recorder/repository/jfrChunkState.hpp
src/hotspot/share/jfr/recorder/repository/jfrChunkWriter.hpp
src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.hpp
src/hotspot/share/jfr/recorder/repository/jfrRepository.hpp
src/hotspot/share/jfr/recorder/service/jfrEvent.hpp
src/hotspot/share/jfr/recorder/service/jfrMemorySizer.hpp
src/hotspot/share/jfr/recorder/service/jfrOptionSet.hpp
src/hotspot/share/jfr/recorder/service/jfrPostBox.hpp
src/hotspot/share/jfr/recorder/service/jfrRecorderService.hpp
src/hotspot/share/jfr/recorder/service/jfrRecorderThread.hpp
src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.hpp
src/hotspot/share/jfr/recorder/storage/jfrBuffer.hpp
src/hotspot/share/jfr/recorder/storage/jfrMemorySpace.hpp
src/hotspot/share/jfr/recorder/storage/jfrMemorySpace.inline.hpp
src/hotspot/share/jfr/recorder/storage/jfrMemorySpaceRetrieval.hpp
src/hotspot/share/jfr/recorder/storage/jfrStorage.hpp
src/hotspot/share/jfr/recorder/storage/jfrStorageControl.hpp
src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.hpp
src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.inline.hpp
src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.hpp
src/hotspot/share/jfr/recorder/stringpool/jfrStringPool.hpp
src/hotspot/share/jfr/recorder/stringpool/jfrStringPoolBuffer.hpp
src/hotspot/share/jfr/recorder/stringpool/jfrStringPoolWriter.hpp
src/hotspot/share/jfr/support/jfrAllocationTracer.hpp
src/hotspot/share/jfr/support/jfrEventClass.hpp
src/hotspot/share/jfr/support/jfrFlush.hpp
src/hotspot/share/jfr/support/jfrIntrinsics.hpp
src/hotspot/share/jfr/support/jfrKlassExtension.hpp
src/hotspot/share/jfr/support/jfrStackTraceMark.hpp
src/hotspot/share/jfr/support/jfrThreadExtension.hpp
src/hotspot/share/jfr/support/jfrThreadId.hpp
src/hotspot/share/jfr/support/jfrThreadLocal.hpp
src/hotspot/share/jfr/support/jfrTraceIdExtension.hpp
src/hotspot/share/jfr/utilities/jfrAllocation.hpp
src/hotspot/share/jfr/utilities/jfrBigEndian.hpp
src/hotspot/share/jfr/utilities/jfrDoublyLinkedList.hpp
src/hotspot/share/jfr/utilities/jfrHashtable.hpp
src/hotspot/share/jfr/utilities/jfrIterator.hpp
src/hotspot/share/jfr/utilities/jfrJavaLog.hpp
src/hotspot/share/jfr/utilities/jfrLogTagSets.hpp
src/hotspot/share/jfr/utilities/jfrRefCountPointer.hpp
src/hotspot/share/jfr/utilities/jfrResourceManager.hpp
src/hotspot/share/jfr/utilities/jfrSpinlockHelper.hpp
src/hotspot/share/jfr/utilities/jfrTime.hpp
src/hotspot/share/jfr/utilities/jfrTimeConverter.hpp
src/hotspot/share/jfr/utilities/jfrTryLock.hpp
src/hotspot/share/jfr/utilities/jfrTypes.hpp
src/hotspot/share/jfr/writers/jfrBigEndianWriter.hpp
src/hotspot/share/jfr/writers/jfrEncoders.hpp
src/hotspot/share/jfr/writers/jfrEncoding.hpp
src/hotspot/share/jfr/writers/jfrEventWriterHost.hpp
src/hotspot/share/jfr/writers/jfrEventWriterHost.inline.hpp
src/hotspot/share/jfr/writers/jfrJavaEventWriter.hpp
src/hotspot/share/jfr/writers/jfrMemoryWriterHost.hpp
src/hotspot/share/jfr/writers/jfrMemoryWriterHost.inline.hpp
src/hotspot/share/jfr/writers/jfrNativeEventWriter.hpp
src/hotspot/share/jfr/writers/jfrPosition.hpp
src/hotspot/share/jfr/writers/jfrPosition.inline.hpp
src/hotspot/share/jfr/writers/jfrStorageAdapter.hpp
src/hotspot/share/jfr/writers/jfrStorageHost.hpp
src/hotspot/share/jfr/writers/jfrStorageHost.inline.hpp
src/hotspot/share/jfr/writers/jfrStreamWriterHost.hpp
src/hotspot/share/jfr/writers/jfrStreamWriterHost.inline.hpp
src/hotspot/share/jfr/writers/jfrWriterHost.hpp
src/hotspot/share/jfr/writers/jfrWriterHost.inline.hpp
src/hotspot/share/jvmci/compilerRuntime.hpp
src/hotspot/share/jvmci/jvmciCodeInstaller.hpp
src/hotspot/share/jvmci/jvmciCompiler.hpp
src/hotspot/share/jvmci/jvmciCompilerToVM.hpp
src/hotspot/share/jvmci/jvmciEnv.hpp
src/hotspot/share/jvmci/jvmciJavaClasses.hpp
src/hotspot/share/jvmci/jvmciRuntime.hpp
src/hotspot/share/jvmci/jvmci_globals.hpp
src/hotspot/share/jvmci/systemDictionary_jvmci.hpp
src/hotspot/share/jvmci/vmStructs_compiler_runtime.hpp
src/hotspot/share/jvmci/vmStructs_jvmci.hpp
src/hotspot/share/jvmci/vmSymbols_jvmci.hpp
src/hotspot/share/libadt/dict.hpp
src/hotspot/share/libadt/set.hpp
src/hotspot/share/libadt/vectset.hpp
src/hotspot/share/logging/log.hpp
src/hotspot/share/logging/logConfiguration.hpp
src/hotspot/share/logging/logDecorations.hpp
src/hotspot/share/logging/logDecorators.hpp
src/hotspot/share/logging/logDiagnosticCommand.hpp
src/hotspot/share/logging/logFileOutput.hpp
src/hotspot/share/logging/logFileStreamOutput.hpp
src/hotspot/share/logging/logHandle.hpp
src/hotspot/share/logging/logLevel.hpp
src/hotspot/share/logging/logMessage.hpp
src/hotspot/share/logging/logMessageBuffer.hpp
src/hotspot/share/logging/logOutput.hpp
src/hotspot/share/logging/logOutputList.hpp
src/hotspot/share/logging/logPrefix.hpp
src/hotspot/share/logging/logSelection.hpp
src/hotspot/share/logging/logSelectionList.hpp
src/hotspot/share/logging/logStream.hpp
src/hotspot/share/logging/logTag.hpp
src/hotspot/share/logging/logTagSet.hpp
src/hotspot/share/logging/logTagSetDescriptions.hpp
src/hotspot/share/logging/logTag_ext.hpp
src/hotspot/share/memory/allocation.hpp
src/hotspot/share/memory/allocation.inline.hpp
src/hotspot/share/memory/arena.hpp
src/hotspot/share/memory/binaryTreeDictionary.hpp
src/hotspot/share/memory/binaryTreeDictionary.inline.hpp
src/hotspot/share/memory/filemap.hpp
src/hotspot/share/memory/freeList.hpp
src/hotspot/share/memory/guardedMemory.hpp
src/hotspot/share/memory/heap.hpp
src/hotspot/share/memory/heapInspection.hpp
src/hotspot/share/memory/heapShared.hpp
src/hotspot/share/memory/heapShared.inline.hpp
src/hotspot/share/memory/iterator.hpp
src/hotspot/share/memory/iterator.inline.hpp
src/hotspot/share/memory/memRegion.hpp
src/hotspot/share/memory/metadataFactory.hpp
src/hotspot/share/memory/metaspace.hpp
src/hotspot/share/memory/metaspace/blockFreelist.hpp
src/hotspot/share/memory/metaspace/chunkManager.hpp
src/hotspot/share/memory/metaspace/metaDebug.hpp
src/hotspot/share/memory/metaspace/metabase.hpp
src/hotspot/share/memory/metaspace/metablock.hpp
src/hotspot/share/memory/metaspace/metachunk.hpp
src/hotspot/share/memory/metaspace/metaspaceCommon.hpp
src/hotspot/share/memory/metaspace/metaspaceDCmd.hpp
src/hotspot/share/memory/metaspace/metaspaceStatistics.hpp
src/hotspot/share/memory/metaspace/occupancyMap.hpp
src/hotspot/share/memory/metaspace/printCLDMetaspaceInfoClosure.hpp
src/hotspot/share/memory/metaspace/printMetaspaceInfoKlassClosure.hpp
src/hotspot/share/memory/metaspace/smallBlocks.hpp
src/hotspot/share/memory/metaspace/spaceManager.hpp
src/hotspot/share/memory/metaspace/virtualSpaceList.hpp
src/hotspot/share/memory/metaspace/virtualSpaceNode.hpp
src/hotspot/share/memory/metaspaceChunkFreeListSummary.hpp
src/hotspot/share/memory/metaspaceClosure.hpp
src/hotspot/share/memory/metaspaceCounters.hpp
src/hotspot/share/memory/metaspaceGCThresholdUpdater.hpp
src/hotspot/share/memory/metaspaceShared.hpp
src/hotspot/share/memory/metaspaceShared.inline.hpp
src/hotspot/share/memory/metaspaceTracer.hpp
src/hotspot/share/memory/oopFactory.hpp
src/hotspot/share/memory/padded.hpp
src/hotspot/share/memory/padded.inline.hpp
src/hotspot/share/memory/referenceType.hpp
src/hotspot/share/memory/resourceArea.hpp
src/hotspot/share/memory/resourceArea.inline.hpp
src/hotspot/share/memory/universe.hpp
src/hotspot/share/memory/virtualspace.hpp
src/hotspot/share/metaprogramming/conditional.hpp
src/hotspot/share/metaprogramming/decay.hpp
src/hotspot/share/metaprogramming/enableIf.hpp
src/hotspot/share/metaprogramming/integralConstant.hpp
src/hotspot/share/metaprogramming/isConst.hpp
src/hotspot/share/metaprogramming/isFloatingPoint.hpp
src/hotspot/share/metaprogramming/isIntegral.hpp
src/hotspot/share/metaprogramming/isPointer.hpp
src/hotspot/share/metaprogramming/isRegisteredEnum.hpp
src/hotspot/share/metaprogramming/isSame.hpp
src/hotspot/share/metaprogramming/isSigned.hpp
src/hotspot/share/metaprogramming/isVolatile.hpp
src/hotspot/share/metaprogramming/primitiveConversions.hpp
src/hotspot/share/metaprogramming/removeCV.hpp
src/hotspot/share/metaprogramming/removePointer.hpp
src/hotspot/share/metaprogramming/removeReference.hpp
src/hotspot/share/oops/accessBackend.inline.hpp
src/hotspot/share/oops/annotations.hpp
src/hotspot/share/oops/array.hpp
src/hotspot/share/oops/array.inline.hpp
src/hotspot/share/oops/arrayKlass.hpp
src/hotspot/share/oops/arrayKlass.inline.hpp
src/hotspot/share/oops/arrayOop.hpp
src/hotspot/share/oops/compiledICHolder.hpp
src/hotspot/share/oops/constMethod.hpp
src/hotspot/share/oops/constantPool.hpp
src/hotspot/share/oops/constantPool.inline.hpp
src/hotspot/share/oops/cpCache.hpp
src/hotspot/share/oops/cpCache.inline.hpp
src/hotspot/share/oops/fieldInfo.hpp
src/hotspot/share/oops/fieldStreams.hpp
src/hotspot/share/oops/generateOopMap.hpp
src/hotspot/share/oops/instanceClassLoaderKlass.hpp
src/hotspot/share/oops/instanceClassLoaderKlass.inline.hpp
src/hotspot/share/oops/instanceKlass.hpp
src/hotspot/share/oops/instanceKlass.inline.hpp
src/hotspot/share/oops/instanceMirrorKlass.hpp
src/hotspot/share/oops/instanceMirrorKlass.inline.hpp
src/hotspot/share/oops/instanceOop.hpp
src/hotspot/share/oops/instanceRefKlass.hpp
src/hotspot/share/oops/instanceRefKlass.inline.hpp
src/hotspot/share/oops/klass.hpp
src/hotspot/share/oops/klass.inline.hpp
src/hotspot/share/oops/klassVtable.hpp
src/hotspot/share/oops/markOop.hpp
src/hotspot/share/oops/markOop.inline.hpp
src/hotspot/share/oops/metadata.hpp
src/hotspot/share/oops/method.hpp
src/hotspot/share/oops/method.inline.hpp
src/hotspot/share/oops/methodCounters.hpp
src/hotspot/share/oops/methodData.hpp
src/hotspot/share/oops/methodData.inline.hpp
src/hotspot/share/oops/objArrayKlass.hpp
src/hotspot/share/oops/objArrayKlass.inline.hpp
src/hotspot/share/oops/objArrayOop.hpp
src/hotspot/share/oops/objArrayOop.inline.hpp
src/hotspot/share/oops/oop.hpp
src/hotspot/share/oops/oop.inline.hpp
src/hotspot/share/oops/oopHandle.hpp
src/hotspot/share/oops/oopHandle.inline.hpp
src/hotspot/share/oops/oopsHierarchy.hpp
src/hotspot/share/oops/reflectionAccessorImplKlassHelper.hpp
src/hotspot/share/oops/symbol.hpp
src/hotspot/share/oops/typeArrayKlass.hpp
src/hotspot/share/oops/typeArrayKlass.inline.hpp
src/hotspot/share/oops/typeArrayOop.hpp
src/hotspot/share/oops/typeArrayOop.inline.hpp
src/hotspot/share/oops/verifyOopClosure.hpp
src/hotspot/share/oops/weakHandle.hpp
src/hotspot/share/oops/weakHandle.inline.hpp
src/hotspot/share/opto/ad.hpp
src/hotspot/share/opto/addnode.hpp
src/hotspot/share/opto/adlcVMDeps.hpp
src/hotspot/share/opto/arraycopynode.hpp
src/hotspot/share/opto/block.hpp
src/hotspot/share/opto/c2_globals.hpp
src/hotspot/share/opto/c2compiler.hpp
src/hotspot/share/opto/callGenerator.hpp
src/hotspot/share/opto/callnode.hpp
src/hotspot/share/opto/castnode.hpp
src/hotspot/share/opto/cfgnode.hpp
src/hotspot/share/opto/chaitin.hpp
src/hotspot/share/opto/coalesce.hpp
src/hotspot/share/opto/compile.hpp
src/hotspot/share/opto/connode.hpp
src/hotspot/share/opto/convertnode.hpp
src/hotspot/share/opto/countbitsnode.hpp
src/hotspot/share/opto/divnode.hpp
src/hotspot/share/opto/escape.hpp
src/hotspot/share/opto/graphKit.hpp
src/hotspot/share/opto/idealGraphPrinter.hpp
src/hotspot/share/opto/idealKit.hpp
src/hotspot/share/opto/indexSet.hpp
src/hotspot/share/opto/intrinsicnode.hpp
src/hotspot/share/opto/live.hpp
src/hotspot/share/opto/locknode.hpp
src/hotspot/share/opto/loopnode.hpp
src/hotspot/share/opto/machnode.hpp
src/hotspot/share/opto/macro.hpp
src/hotspot/share/opto/matcher.hpp
src/hotspot/share/opto/mathexactnode.hpp
src/hotspot/share/opto/memnode.hpp
src/hotspot/share/opto/movenode.hpp
src/hotspot/share/opto/mulnode.hpp
src/hotspot/share/opto/multnode.hpp
src/hotspot/share/opto/narrowptrnode.hpp
src/hotspot/share/opto/node.hpp
src/hotspot/share/opto/opaquenode.hpp
src/hotspot/share/opto/opcodes.hpp
src/hotspot/share/opto/optoreg.hpp
src/hotspot/share/opto/output.hpp
src/hotspot/share/opto/parse.hpp
src/hotspot/share/opto/phase.hpp
src/hotspot/share/opto/phaseX.hpp
src/hotspot/share/opto/phasetype.hpp
src/hotspot/share/opto/regalloc.hpp
src/hotspot/share/opto/regmask.hpp
src/hotspot/share/opto/replacednodes.hpp
src/hotspot/share/opto/rootnode.hpp
src/hotspot/share/opto/runtime.hpp
src/hotspot/share/opto/stringopts.hpp
src/hotspot/share/opto/subnode.hpp
src/hotspot/share/opto/superword.hpp
src/hotspot/share/opto/type.hpp
src/hotspot/share/opto/vectornode.hpp
src/hotspot/share/prims/forte.hpp
src/hotspot/share/prims/jniCheck.hpp
src/hotspot/share/prims/jniExport.hpp
src/hotspot/share/prims/jniFastGetField.hpp
src/hotspot/share/prims/jvm_misc.hpp
src/hotspot/share/prims/jvmtiAgentThread.hpp
src/hotspot/share/prims/jvmtiClassFileReconstituter.hpp
src/hotspot/share/prims/jvmtiCodeBlobEvents.hpp
src/hotspot/share/prims/jvmtiEnter.inline.hpp
src/hotspot/share/prims/jvmtiEnvBase.hpp
src/hotspot/share/prims/jvmtiEnvThreadState.hpp
src/hotspot/share/prims/jvmtiEventController.hpp
src/hotspot/share/prims/jvmtiEventController.inline.hpp
src/hotspot/share/prims/jvmtiExport.hpp
src/hotspot/share/prims/jvmtiExtensions.hpp
src/hotspot/share/prims/jvmtiGetLoadedClasses.hpp
src/hotspot/share/prims/jvmtiImpl.hpp
src/hotspot/share/prims/jvmtiManageCapabilities.hpp
src/hotspot/share/prims/jvmtiRawMonitor.hpp
src/hotspot/share/prims/jvmtiRedefineClasses.hpp
src/hotspot/share/prims/jvmtiTagMap.hpp
src/hotspot/share/prims/jvmtiThreadState.hpp
src/hotspot/share/prims/jvmtiThreadState.inline.hpp
src/hotspot/share/prims/jvmtiTrace.hpp
src/hotspot/share/prims/jvmtiUtil.hpp
src/hotspot/share/prims/methodComparator.hpp
src/hotspot/share/prims/methodHandles.hpp
src/hotspot/share/prims/nativeLookup.hpp
src/hotspot/share/prims/resolvedMethodTable.hpp
src/hotspot/share/prims/stackwalk.hpp
src/hotspot/share/prims/unsafe.hpp
src/hotspot/share/prims/wbtestmethods/parserTests.hpp
src/hotspot/share/prims/whitebox.hpp
src/hotspot/share/prims/whitebox.inline.hpp
src/hotspot/share/runtime/arguments.hpp
src/hotspot/share/runtime/atomic.hpp
src/hotspot/share/runtime/basicLock.hpp
src/hotspot/share/runtime/biasedLocking.hpp
src/hotspot/share/runtime/compilationPolicy.hpp
src/hotspot/share/runtime/deoptimization.hpp
src/hotspot/share/runtime/extendedPC.hpp
src/hotspot/share/runtime/fieldDescriptor.hpp
src/hotspot/share/runtime/fieldDescriptor.inline.hpp
src/hotspot/share/runtime/fieldType.hpp
src/hotspot/share/runtime/flags/flagSetting.hpp
src/hotspot/share/runtime/flags/jvmFlag.hpp
src/hotspot/share/runtime/flags/jvmFlagConstraintList.hpp
src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.hpp
src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.hpp
src/hotspot/share/runtime/flags/jvmFlagRangeList.hpp
src/hotspot/share/runtime/flags/jvmFlagWriteableList.hpp
src/hotspot/share/runtime/frame.hpp
src/hotspot/share/runtime/frame.inline.hpp
src/hotspot/share/runtime/globals.hpp
src/hotspot/share/runtime/globals_ext.hpp
src/hotspot/share/runtime/globals_extension.hpp
src/hotspot/share/runtime/handles.hpp
src/hotspot/share/runtime/handles.inline.hpp
src/hotspot/share/runtime/handshake.hpp
src/hotspot/share/runtime/icache.hpp
src/hotspot/share/runtime/init.hpp
src/hotspot/share/runtime/interfaceSupport.inline.hpp
src/hotspot/share/runtime/java.hpp
src/hotspot/share/runtime/javaCalls.hpp
src/hotspot/share/runtime/javaFrameAnchor.hpp
src/hotspot/share/runtime/jfieldIDWorkaround.hpp
src/hotspot/share/runtime/jniHandles.hpp
src/hotspot/share/runtime/jniHandles.inline.hpp
src/hotspot/share/runtime/jniPeriodicChecker.hpp
src/hotspot/share/runtime/memprofiler.hpp
src/hotspot/share/runtime/monitorChunk.hpp
src/hotspot/share/runtime/mutex.hpp
src/hotspot/share/runtime/mutexLocker.hpp
src/hotspot/share/runtime/objectMonitor.hpp
src/hotspot/share/runtime/objectMonitor.inline.hpp
src/hotspot/share/runtime/orderAccess.hpp
src/hotspot/share/runtime/os.hpp
src/hotspot/share/runtime/os.inline.hpp
src/hotspot/share/runtime/osThread.hpp
src/hotspot/share/runtime/os_ext.hpp
src/hotspot/share/runtime/os_perf.hpp
src/hotspot/share/runtime/park.hpp
src/hotspot/share/runtime/perfData.hpp
src/hotspot/share/runtime/perfData.inline.hpp
src/hotspot/share/runtime/perfMemory.hpp
src/hotspot/share/runtime/prefetch.hpp
src/hotspot/share/runtime/prefetch.inline.hpp
src/hotspot/share/runtime/reflection.hpp
src/hotspot/share/runtime/reflectionUtils.hpp
src/hotspot/share/runtime/registerMap.hpp
src/hotspot/share/runtime/relocator.hpp
src/hotspot/share/runtime/rframe.hpp
src/hotspot/share/runtime/rtmLocking.hpp
src/hotspot/share/runtime/safepoint.hpp
src/hotspot/share/runtime/safepointMechanism.hpp
src/hotspot/share/runtime/safepointMechanism.inline.hpp
src/hotspot/share/runtime/safepointVerifiers.hpp
src/hotspot/share/runtime/semaphore.hpp
src/hotspot/share/runtime/semaphore.inline.hpp
src/hotspot/share/runtime/serviceThread.hpp
src/hotspot/share/runtime/sharedRuntime.hpp
src/hotspot/share/runtime/sharedRuntimeMath.hpp
src/hotspot/share/runtime/signature.hpp
src/hotspot/share/runtime/stackValue.hpp
src/hotspot/share/runtime/stackValueCollection.hpp
src/hotspot/share/runtime/statSampler.hpp
src/hotspot/share/runtime/stubCodeGenerator.hpp
src/hotspot/share/runtime/stubRoutines.hpp
src/hotspot/share/runtime/sweeper.hpp
src/hotspot/share/runtime/synchronizer.hpp
src/hotspot/share/runtime/task.hpp
src/hotspot/share/runtime/thread.hpp
src/hotspot/share/runtime/thread.inline.hpp
src/hotspot/share/runtime/threadCritical.hpp
src/hotspot/share/runtime/threadHeapSampler.hpp
src/hotspot/share/runtime/threadLocalStorage.hpp
src/hotspot/share/runtime/threadSMR.hpp
src/hotspot/share/runtime/threadSMR.inline.hpp
src/hotspot/share/runtime/threadStatisticalInfo.hpp
src/hotspot/share/runtime/tieredThresholdPolicy.hpp
src/hotspot/share/runtime/timer.hpp
src/hotspot/share/runtime/timerTrace.hpp
src/hotspot/share/runtime/unhandledOops.hpp
src/hotspot/share/runtime/vframe.hpp
src/hotspot/share/runtime/vframe.inline.hpp
src/hotspot/share/runtime/vframeArray.hpp
src/hotspot/share/runtime/vframe_hp.hpp
src/hotspot/share/runtime/vmOperations.hpp
src/hotspot/share/runtime/vmStructs.hpp
src/hotspot/share/runtime/vmThread.hpp
src/hotspot/share/runtime/vm_version.hpp
src/hotspot/share/services/allocationSite.hpp
src/hotspot/share/services/attachListener.hpp
src/hotspot/share/services/classLoadingService.hpp
src/hotspot/share/services/diagnosticArgument.hpp
src/hotspot/share/services/diagnosticCommand.hpp
src/hotspot/share/services/diagnosticFramework.hpp
src/hotspot/share/services/dtraceAttacher.hpp
src/hotspot/share/services/gcNotifier.hpp
src/hotspot/share/services/heapDumper.hpp
src/hotspot/share/services/lowMemoryDetector.hpp
src/hotspot/share/services/mallocSiteTable.hpp
src/hotspot/share/services/mallocTracker.hpp
src/hotspot/share/services/mallocTracker.inline.hpp
src/hotspot/share/services/management.hpp
src/hotspot/share/services/memBaseline.hpp
src/hotspot/share/services/memReporter.hpp
src/hotspot/share/services/memTracker.hpp
src/hotspot/share/services/memoryManager.hpp
src/hotspot/share/services/memoryPool.hpp
src/hotspot/share/services/memoryService.hpp
src/hotspot/share/services/memoryUsage.hpp
src/hotspot/share/services/nmtCommon.hpp
src/hotspot/share/services/nmtDCmd.hpp
src/hotspot/share/services/runtimeService.hpp
src/hotspot/share/services/threadService.hpp
src/hotspot/share/services/virtualMemoryTracker.hpp
src/hotspot/share/services/writeableFlags.hpp
src/hotspot/share/utilities/accessFlags.hpp
src/hotspot/share/utilities/align.hpp
src/hotspot/share/utilities/bitMap.hpp
src/hotspot/share/utilities/bitMap.inline.hpp
src/hotspot/share/utilities/breakpoint.hpp
src/hotspot/share/utilities/bytes.hpp
src/hotspot/share/utilities/chunkedList.hpp
src/hotspot/share/utilities/compilerWarnings.hpp
src/hotspot/share/utilities/concurrentHashTable.hpp
src/hotspot/share/utilities/concurrentHashTable.inline.hpp
src/hotspot/share/utilities/concurrentHashTableTasks.inline.hpp
src/hotspot/share/utilities/constantTag.hpp
src/hotspot/share/utilities/copy.hpp
src/hotspot/share/utilities/count_trailing_zeros.hpp
src/hotspot/share/utilities/debug.hpp
src/hotspot/share/utilities/decoder.hpp
src/hotspot/share/utilities/decoder_elf.hpp
src/hotspot/share/utilities/defaultStream.hpp
src/hotspot/share/utilities/dtrace.hpp
src/hotspot/share/utilities/dtrace_disabled.hpp
src/hotspot/share/utilities/elfFile.hpp
src/hotspot/share/utilities/elfFuncDescTable.hpp
src/hotspot/share/utilities/elfStringTable.hpp
src/hotspot/share/utilities/elfSymbolTable.hpp
src/hotspot/share/utilities/events.hpp
src/hotspot/share/utilities/exceptions.hpp
src/hotspot/share/utilities/fakeRttiSupport.hpp
src/hotspot/share/utilities/formatBuffer.hpp
src/hotspot/share/utilities/globalCounter.hpp
src/hotspot/share/utilities/globalCounter.inline.hpp
src/hotspot/share/utilities/globalDefinitions.hpp
src/hotspot/share/utilities/globalDefinitions_gcc.hpp
src/hotspot/share/utilities/globalDefinitions_solstudio.hpp
src/hotspot/share/utilities/globalDefinitions_visCPP.hpp
src/hotspot/share/utilities/globalDefinitions_xlc.hpp
src/hotspot/share/utilities/growableArray.hpp
src/hotspot/share/utilities/hashtable.hpp
src/hotspot/share/utilities/hashtable.inline.hpp
src/hotspot/share/utilities/histogram.hpp
src/hotspot/share/utilities/intHisto.hpp
src/hotspot/share/utilities/json.hpp
src/hotspot/share/utilities/linkedlist.hpp
src/hotspot/share/utilities/macros.hpp
src/hotspot/share/utilities/nativeCallStack.hpp
src/hotspot/share/utilities/numberSeq.hpp
src/hotspot/share/utilities/ostream.hpp
src/hotspot/share/utilities/pair.hpp
src/hotspot/share/utilities/preserveException.hpp
src/hotspot/share/utilities/quickSort.hpp
src/hotspot/share/utilities/resourceHash.hpp
src/hotspot/share/utilities/sizes.hpp
src/hotspot/share/utilities/stack.hpp
src/hotspot/share/utilities/stack.inline.hpp
src/hotspot/share/utilities/stringUtils.hpp
src/hotspot/share/utilities/ticks.hpp
src/hotspot/share/utilities/utf8.hpp
src/hotspot/share/utilities/vmError.hpp
src/hotspot/share/utilities/xmlstream.hpp
--- a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2015, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_ASSEMBLER_AARCH64_HPP
-#define CPU_AARCH64_VM_ASSEMBLER_AARCH64_HPP
+#ifndef CPU_AARCH64_ASSEMBLER_AARCH64_HPP
+#define CPU_AARCH64_ASSEMBLER_AARCH64_HPP
 
 #include "asm/register.hpp"
 
@@ -2754,4 +2754,4 @@
 
 extern "C" void das(uint64_t start, int len);
 
-#endif // CPU_AARCH64_VM_ASSEMBLER_AARCH64_HPP
+#endif // CPU_AARCH64_ASSEMBLER_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/assembler_aarch64.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/assembler_aarch64.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,11 +23,11 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_ASSEMBLER_AARCH64_INLINE_HPP
-#define CPU_AARCH64_VM_ASSEMBLER_AARCH64_INLINE_HPP
+#ifndef CPU_AARCH64_ASSEMBLER_AARCH64_INLINE_HPP
+#define CPU_AARCH64_ASSEMBLER_AARCH64_INLINE_HPP
 
 #include "asm/assembler.inline.hpp"
 #include "asm/codeBuffer.hpp"
 #include "code/codeCache.hpp"
 
-#endif // CPU_AARCH64_VM_ASSEMBLER_AARCH64_INLINE_HPP
+#endif // CPU_AARCH64_ASSEMBLER_AARCH64_INLINE_HPP
--- a/src/hotspot/cpu/aarch64/bytecodes_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/bytecodes_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,9 +23,9 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_BYTECODES_AARCH64_HPP
-#define CPU_AARCH64_VM_BYTECODES_AARCH64_HPP
+#ifndef CPU_AARCH64_BYTECODES_AARCH64_HPP
+#define CPU_AARCH64_BYTECODES_AARCH64_HPP
 
 // No aarch64 specific bytecodes
 
-#endif // CPU_AARCH64_VM_BYTECODES_AARCH64_HPP
+#endif // CPU_AARCH64_BYTECODES_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/bytes_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/bytes_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_BYTES_AARCH64_HPP
-#define CPU_AARCH64_VM_BYTES_AARCH64_HPP
+#ifndef CPU_AARCH64_BYTES_AARCH64_HPP
+#define CPU_AARCH64_BYTES_AARCH64_HPP
 
 #include "memory/allocation.hpp"
 
@@ -63,4 +63,4 @@
 // The following header contains the implementations of swap_u2, swap_u4, and swap_u8[_base]
 #include OS_CPU_HEADER_INLINE(bytes)
 
-#endif // CPU_AARCH64_VM_BYTES_AARCH64_HPP
+#endif // CPU_AARCH64_BYTES_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/c1_Defs_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/c1_Defs_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_C1_DEFS_AARCH64_HPP
-#define CPU_AARCH64_VM_C1_DEFS_AARCH64_HPP
+#ifndef CPU_AARCH64_C1_DEFS_AARCH64_HPP
+#define CPU_AARCH64_C1_DEFS_AARCH64_HPP
 
 // native word offsets from memory address (little endian)
 enum {
@@ -78,4 +78,4 @@
   pd_float_saved_as_double = false
 };
 
-#endif // CPU_AARCH64_VM_C1_DEFS_AARCH64_HPP
+#endif // CPU_AARCH64_C1_DEFS_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/c1_FpuStackSim_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/c1_FpuStackSim_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,10 +23,10 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_C1_FPUSTACKSIM_HPP
-#define CPU_AARCH64_VM_C1_FPUSTACKSIM_HPP
+#ifndef CPU_AARCH64_C1_FPUSTACKSIM_AARCH64_HPP
+#define CPU_AARCH64_C1_FPUSTACKSIM_AARCH64_HPP
 
 // No FPU stack on AARCH64
 class FpuStackSim;
 
-#endif // CPU_AARCH64_VM_C1_FPUSTACKSIM_HPP
+#endif // CPU_AARCH64_C1_FPUSTACKSIM_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/c1_FrameMap_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/c1_FrameMap_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_C1_FRAMEMAP_AARCH64_HPP
-#define CPU_AARCH64_VM_C1_FRAMEMAP_AARCH64_HPP
+#ifndef CPU_AARCH64_C1_FRAMEMAP_AARCH64_HPP
+#define CPU_AARCH64_C1_FRAMEMAP_AARCH64_HPP
 
 //  On AArch64 the frame looks as follows:
 //
@@ -144,5 +144,4 @@
   static int last_cpu_reg()             { return pd_last_cpu_reg;  }
   static int last_byte_reg()            { return pd_last_byte_reg; }
 
-#endif // CPU_AARCH64_VM_C1_FRAMEMAP_AARCH64_HPP
-
+#endif // CPU_AARCH64_C1_FRAMEMAP_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_C1_LIRASSEMBLER_AARCH64_HPP
-#define CPU_AARCH64_VM_C1_LIRASSEMBLER_AARCH64_HPP
+#ifndef CPU_AARCH64_C1_LIRASSEMBLER_AARCH64_HPP
+#define CPU_AARCH64_C1_LIRASSEMBLER_AARCH64_HPP
 
 // ArrayCopyStub needs access to bailout
 friend class ArrayCopyStub;
@@ -81,4 +81,4 @@
   void store_parameter(jint c,     int offset_from_esp_in_words);
   void store_parameter(jobject c,  int offset_from_esp_in_words);
 
-#endif // CPU_AARCH64_VM_C1_LIRASSEMBLER_AARCH64_HPP
+#endif // CPU_AARCH64_C1_LIRASSEMBLER_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/c1_LinearScan_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/c1_LinearScan_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_C1_LINEARSCAN_HPP
-#define CPU_AARCH64_VM_C1_LINEARSCAN_HPP
+#ifndef CPU_AARCH64_C1_LINEARSCAN_AARCH64_HPP
+#define CPU_AARCH64_C1_LINEARSCAN_AARCH64_HPP
 
 inline bool LinearScan::is_processed_reg_num(int reg_num) {
   return reg_num <= FrameMap::last_cpu_reg() || reg_num >= pd_nof_cpu_regs_frame_map;
@@ -73,4 +73,4 @@
 }
 
 
-#endif // CPU_AARCH64_VM_C1_LINEARSCAN_HPP
+#endif // CPU_AARCH64_C1_LINEARSCAN_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2015, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_C1_MACROASSEMBLER_AARCH64_HPP
-#define CPU_AARCH64_VM_C1_MACROASSEMBLER_AARCH64_HPP
+#ifndef CPU_AARCH64_C1_MACROASSEMBLER_AARCH64_HPP
+#define CPU_AARCH64_C1_MACROASSEMBLER_AARCH64_HPP
 
 using MacroAssembler::build_frame;
 using MacroAssembler::null_check;
@@ -111,4 +111,4 @@
 
   void load_parameter(int offset_in_words, Register reg);
 
-#endif // CPU_AARCH64_VM_C1_MACROASSEMBLER_AARCH64_HPP
+#endif // CPU_AARCH64_C1_MACROASSEMBLER_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/c1_globals_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/c1_globals_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_C1_GLOBALS_AARCH64_HPP
-#define CPU_AARCH64_VM_C1_GLOBALS_AARCH64_HPP
+#ifndef CPU_AARCH64_C1_GLOBALS_AARCH64_HPP
+#define CPU_AARCH64_C1_GLOBALS_AARCH64_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -74,4 +74,4 @@
 define_pd_global(bool, CSEArrayLength,               false);
 define_pd_global(bool, TwoOperandLIRForm,            false );
 
-#endif // CPU_AARCH64_VM_C1_GLOBALS_AARCH64_HPP
+#endif // CPU_AARCH64_C1_GLOBALS_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/c2_globals_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/c2_globals_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_C2_GLOBALS_AARCH64_HPP
-#define CPU_AARCH64_VM_C2_GLOBALS_AARCH64_HPP
+#ifndef CPU_AARCH64_C2_GLOBALS_AARCH64_HPP
+#define CPU_AARCH64_C2_GLOBALS_AARCH64_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -87,4 +87,4 @@
 
 define_pd_global(bool,  TrapBasedRangeChecks,        false); // Not needed.
 
-#endif // CPU_AARCH64_VM_C2_GLOBALS_AARCH64_HPP
+#endif // CPU_AARCH64_C2_GLOBALS_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/codeBuffer_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/codeBuffer_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_CODEBUFFER_AARCH64_HPP
-#define CPU_AARCH64_VM_CODEBUFFER_AARCH64_HPP
+#ifndef CPU_AARCH64_CODEBUFFER_AARCH64_HPP
+#define CPU_AARCH64_CODEBUFFER_AARCH64_HPP
 
 private:
   void pd_initialize() {}
@@ -32,4 +32,4 @@
 public:
   void flush_bundle(bool start_new_bundle) {}
 
-#endif // CPU_AARCH64_VM_CODEBUFFER_AARCH64_HPP
+#endif // CPU_AARCH64_CODEBUFFER_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/copy_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/copy_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_COPY_AARCH64_HPP
-#define CPU_AARCH64_VM_COPY_AARCH64_HPP
+#ifndef CPU_AARCH64_COPY_AARCH64_HPP
+#define CPU_AARCH64_COPY_AARCH64_HPP
 
 // Inline functions for memory copy and fill.
 
@@ -56,4 +56,4 @@
   (void)memset(to, 0, count);
 }
 
-#endif // CPU_AARCH64_VM_COPY_AARCH64_HPP
+#endif // CPU_AARCH64_COPY_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/depChecker_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/depChecker_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,9 +23,9 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_DEPCHECKER_AARCH64_HPP
-#define CPU_AARCH64_VM_DEPCHECKER_AARCH64_HPP
+#ifndef CPU_AARCH64_DEPCHECKER_AARCH64_HPP
+#define CPU_AARCH64_DEPCHECKER_AARCH64_HPP
 
 // Nothing to do on aarch64
 
-#endif // CPU_AARCH64_VM_DEPCHECKER_AARCH64_HPP
+#endif // CPU_AARCH64_DEPCHECKER_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/disassembler_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/disassembler_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_DISASSEMBLER_AARCH64_HPP
-#define CPU_AARCH64_VM_DISASSEMBLER_AARCH64_HPP
+#ifndef CPU_AARCH64_DISASSEMBLER_AARCH64_HPP
+#define CPU_AARCH64_DISASSEMBLER_AARCH64_HPP
 
   static int pd_instruction_alignment() {
     return 1;
@@ -34,4 +34,4 @@
     return "";
   }
 
-#endif // CPU_AARCH64_VM_DISASSEMBLER_AARCH64_HPP
+#endif // CPU_AARCH64_DISASSEMBLER_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/frame_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/frame_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_FRAME_AARCH64_HPP
-#define CPU_AARCH64_VM_FRAME_AARCH64_HPP
+#ifndef CPU_AARCH64_FRAME_AARCH64_HPP
+#define CPU_AARCH64_FRAME_AARCH64_HPP
 
 #include "runtime/synchronizer.hpp"
 
@@ -160,4 +160,4 @@
 
   static jint interpreter_frame_expression_stack_direction() { return -1; }
 
-#endif // CPU_AARCH64_VM_FRAME_AARCH64_HPP
+#endif // CPU_AARCH64_FRAME_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_FRAME_AARCH64_INLINE_HPP
-#define CPU_AARCH64_VM_FRAME_AARCH64_INLINE_HPP
+#ifndef CPU_AARCH64_FRAME_AARCH64_INLINE_HPP
+#define CPU_AARCH64_FRAME_AARCH64_INLINE_HPP
 
 #include "code/codeCache.hpp"
 #include "code/vmreg.inline.hpp"
@@ -250,4 +250,4 @@
   *result_adr = obj;
 }
 
-#endif // CPU_AARCH64_VM_FRAME_AARCH64_INLINE_HPP
+#endif // CPU_AARCH64_FRAME_AARCH64_INLINE_HPP
--- a/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,4 +39,4 @@
 
 };
 
-#endif // #ifndef CPU_AARCH64_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_AARCH64_HPP
+#endif // CPU_AARCH64_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/globalDefinitions_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/globalDefinitions_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2015, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_GLOBALDEFINITIONS_AARCH64_HPP
-#define CPU_AARCH64_VM_GLOBALDEFINITIONS_AARCH64_HPP
+#ifndef CPU_AARCH64_GLOBALDEFINITIONS_AARCH64_HPP
+#define CPU_AARCH64_GLOBALDEFINITIONS_AARCH64_HPP
 
 const int StackAlignmentInBytes  = 16;
 
@@ -53,4 +53,4 @@
 
 #define THREAD_LOCAL_POLL
 
-#endif // CPU_AARCH64_VM_GLOBALDEFINITIONS_AARCH64_HPP
+#endif // CPU_AARCH64_GLOBALDEFINITIONS_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/globals_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/globals_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2015, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_GLOBALS_AARCH64_HPP
-#define CPU_AARCH64_VM_GLOBALS_AARCH64_HPP
+#ifndef CPU_AARCH64_GLOBALS_AARCH64_HPP
+#define CPU_AARCH64_GLOBALS_AARCH64_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -166,4 +166,4 @@
 #endif
 
 
-#endif // CPU_AARCH64_VM_GLOBALS_AARCH64_HPP
+#endif // CPU_AARCH64_GLOBALS_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/icache_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/icache_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_ICACHE_AARCH64_HPP
-#define CPU_AARCH64_VM_ICACHE_AARCH64_HPP
+#ifndef CPU_AARCH64_ICACHE_AARCH64_HPP
+#define CPU_AARCH64_ICACHE_AARCH64_HPP
 
 // Interface for updating the instruction cache.  Whenever the VM
 // modifies code, part of the processor instruction cache potentially
@@ -41,4 +41,4 @@
   }
 };
 
-#endif // CPU_AARCH64_VM_ICACHE_AARCH64_HPP
+#endif // CPU_AARCH64_ICACHE_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/interp_masm_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2015, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_INTERP_MASM_AARCH64_64_HPP
-#define CPU_AARCH64_VM_INTERP_MASM_AARCH64_64_HPP
+#ifndef CPU_AARCH64_INTERP_MASM_AARCH64_HPP
+#define CPU_AARCH64_INTERP_MASM_AARCH64_HPP
 
 #include "asm/macroAssembler.hpp"
 #include "interpreter/invocationCounter.hpp"
@@ -295,4 +295,4 @@
   }
 };
 
-#endif // CPU_AARCH64_VM_INTERP_MASM_AARCH64_64_HPP
+#endif // CPU_AARCH64_INTERP_MASM_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/interpreterRT_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/interpreterRT_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_INTERPRETERRT_AARCH64_HPP
-#define CPU_AARCH64_VM_INTERPRETERRT_AARCH64_HPP
+#ifndef CPU_AARCH64_INTERPRETERRT_AARCH64_HPP
+#define CPU_AARCH64_INTERPRETERRT_AARCH64_HPP
 
 // This is included in the middle of class Interpreter.
 // Do not include files here.
@@ -58,4 +58,4 @@
   static Register temp();
 };
 
-#endif // CPU_AARCH64_VM_INTERPRETERRT_AARCH64_HPP
+#endif // CPU_AARCH64_INTERPRETERRT_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/javaFrameAnchor_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/javaFrameAnchor_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_JAVAFRAMEANCHOR_AARCH64_HPP
-#define CPU_AARCH64_VM_JAVAFRAMEANCHOR_AARCH64_HPP
+#ifndef CPU_AARCH64_JAVAFRAMEANCHOR_AARCH64_HPP
+#define CPU_AARCH64_JAVAFRAMEANCHOR_AARCH64_HPP
 
 private:
 
@@ -84,4 +84,4 @@
   // Assert (last_Java_sp == NULL || fp == NULL)
   void set_last_Java_fp(intptr_t* fp)                { OrderAccess::release(); _last_Java_fp = fp; }
 
-#endif // CPU_AARCH64_VM_JAVAFRAMEANCHOR_AARCH64_HPP
+#endif // CPU_AARCH64_JAVAFRAMEANCHOR_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/jniTypes_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/jniTypes_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_JNITYPES_AARCH64_HPP
-#define CPU_AARCH64_VM_JNITYPES_AARCH64_HPP
+#ifndef CPU_AARCH64_JNITYPES_AARCH64_HPP
+#define CPU_AARCH64_JNITYPES_AARCH64_HPP
 
 #include "jni.h"
 #include "memory/allocation.hpp"
@@ -104,4 +104,4 @@
 #undef _JNI_SLOT_OFFSET
 };
 
-#endif // CPU_AARCH64_VM_JNITYPES_AARCH64_HPP
+#endif // CPU_AARCH64_JNITYPES_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2015, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_MACROASSEMBLER_AARCH64_HPP
-#define CPU_AARCH64_VM_MACROASSEMBLER_AARCH64_HPP
+#ifndef CPU_AARCH64_MACROASSEMBLER_AARCH64_HPP
+#define CPU_AARCH64_MACROASSEMBLER_AARCH64_HPP
 
 #include "asm/assembler.hpp"
 
@@ -1391,4 +1391,4 @@
   Label _branches;
 };
 
-#endif // CPU_AARCH64_VM_MACROASSEMBLER_AARCH64_HPP
+#endif // CPU_AARCH64_MACROASSEMBLER_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_MACROASSEMBLER_AARCH64_INLINE_HPP
-#define CPU_AARCH64_VM_MACROASSEMBLER_AARCH64_INLINE_HPP
+#ifndef CPU_AARCH64_MACROASSEMBLER_AARCH64_INLINE_HPP
+#define CPU_AARCH64_MACROASSEMBLER_AARCH64_INLINE_HPP
 
 #include "asm/assembler.hpp"
 
@@ -32,4 +32,4 @@
 
 #endif // ndef PRODUCT
 
-#endif // CPU_AARCH64_VM_MACROASSEMBLER_AARCH64_INLINE_HPP
+#endif // CPU_AARCH64_MACROASSEMBLER_AARCH64_INLINE_HPP
--- a/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_NATIVEINST_AARCH64_HPP
-#define CPU_AARCH64_VM_NATIVEINST_AARCH64_HPP
+#ifndef CPU_AARCH64_NATIVEINST_AARCH64_HPP
+#define CPU_AARCH64_NATIVEINST_AARCH64_HPP
 
 #include "asm/assembler.hpp"
 #include "runtime/icache.hpp"
@@ -703,4 +703,4 @@
   assert(nativeInstruction_at(addr)->is_Imm_LdSt(), "no immediate load/store found");
   return (NativeLdSt*)addr;
 }
-#endif // CPU_AARCH64_VM_NATIVEINST_AARCH64_HPP
+#endif // CPU_AARCH64_NATIVEINST_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/registerMap_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/registerMap_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_REGISTERMAP_AARCH64_HPP
-#define CPU_AARCH64_VM_REGISTERMAP_AARCH64_HPP
+#ifndef CPU_AARCH64_REGISTERMAP_AARCH64_HPP
+#define CPU_AARCH64_REGISTERMAP_AARCH64_HPP
 
 // machine-dependent implemention for register maps
   friend class frame;
@@ -42,4 +42,4 @@
   void pd_initialize() {}
   void pd_initialize_from(const RegisterMap* map) {}
 
-#endif // CPU_AARCH64_VM_REGISTERMAP_AARCH64_HPP
+#endif // CPU_AARCH64_REGISTERMAP_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/register_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/register_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_REGISTER_AARCH64_HPP
-#define CPU_AARCH64_VM_REGISTER_AARCH64_HPP
+#ifndef CPU_AARCH64_REGISTER_AARCH64_HPP
+#define CPU_AARCH64_REGISTER_AARCH64_HPP
 
 #include "asm/register.hpp"
 
@@ -258,4 +258,4 @@
   uint32_t bits() const { return _bitset; }
 };
 
-#endif // CPU_AARCH64_VM_REGISTER_AARCH64_HPP
+#endif // CPU_AARCH64_REGISTER_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/relocInfo_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/relocInfo_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_RELOCINFO_AARCH64_HPP
-#define CPU_AARCH64_VM_RELOCINFO_AARCH64_HPP
+#ifndef CPU_AARCH64_RELOCINFO_AARCH64_HPP
+#define CPU_AARCH64_RELOCINFO_AARCH64_HPP
 
   // machine-dependent parts of class relocInfo
  private:
@@ -41,4 +41,4 @@
   // listed in the oop section.
   static bool mustIterateImmediateOopsInCode() { return false; }
 
-#endif // CPU_AARCH64_VM_RELOCINFO_AARCH64_HPP
+#endif // CPU_AARCH64_RELOCINFO_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_STUBROUTINES_AARCH64_HPP
-#define CPU_AARCH64_VM_STUBROUTINES_AARCH64_HPP
+#ifndef CPU_AARCH64_STUBROUTINES_AARCH64_HPP
+#define CPU_AARCH64_STUBROUTINES_AARCH64_HPP
 
 // This file holds the platform specific parts of the StubRoutines
 // definition. See stubRoutines.hpp for a description on how to
@@ -195,4 +195,4 @@
   // end trigonometric tables block
 };
 
-#endif // CPU_AARCH64_VM_STUBROUTINES_AARCH64_HPP
+#endif // CPU_AARCH64_STUBROUTINES_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/templateTable_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/templateTable_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_TEMPLATETABLE_AARCH64_64_HPP
-#define CPU_AARCH64_VM_TEMPLATETABLE_AARCH64_64_HPP
+#ifndef CPU_AARCH64_TEMPLATETABLE_AARCH64_HPP
+#define CPU_AARCH64_TEMPLATETABLE_AARCH64_HPP
 
 static void prepare_invoke(int byte_no,
                              Register method,         // linked method (or i-klass)
@@ -39,4 +39,4 @@
   static void index_check(Register array, Register index);
   static void index_check_without_pop(Register array, Register index);
 
-#endif // CPU_AARCH64_VM_TEMPLATETABLE_AARCH64_64_HPP
+#endif // CPU_AARCH64_TEMPLATETABLE_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/vmStructs_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/vmStructs_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_VMSTRUCTS_AARCH64_HPP
-#define CPU_AARCH64_VM_VMSTRUCTS_AARCH64_HPP
+#ifndef CPU_AARCH64_VMSTRUCTS_AARCH64_HPP
+#define CPU_AARCH64_VMSTRUCTS_AARCH64_HPP
 
 // These are the CPU-specific fields, types and integer
 // constants required by the Serviceability Agent. This file is
@@ -39,4 +39,4 @@
 
 #define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
 
-#endif // CPU_AARCH64_VM_VMSTRUCTS_AARCH64_HPP
+#endif // CPU_AARCH64_VMSTRUCTS_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/vm_version_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_VM_VERSION_AARCH64_HPP
-#define CPU_AARCH64_VM_VM_VERSION_AARCH64_HPP
+#ifndef CPU_AARCH64_VM_VERSION_AARCH64_HPP
+#define CPU_AARCH64_VM_VERSION_AARCH64_HPP
 
 #include "runtime/globals_extension.hpp"
 #include "runtime/vm_version.hpp"
@@ -121,4 +121,4 @@
   }
 };
 
-#endif // CPU_AARCH64_VM_VM_VERSION_AARCH64_HPP
+#endif // CPU_AARCH64_VM_VERSION_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/vm_version_ext_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/vm_version_ext_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_VM_VERSION_EXT_AARCH64_HPP
-#define CPU_AARCH64_VM_VM_VERSION_EXT_AARCH64_HPP
+#ifndef CPU_AARCH64_VM_VERSION_EXT_AARCH64_HPP
+#define CPU_AARCH64_VM_VERSION_EXT_AARCH64_HPP
 
 #include "utilities/macros.hpp"
 #include "vm_version_aarch64.hpp"
@@ -51,4 +51,4 @@
 
 };
 
-#endif // CPU_AARCH64_VM_VM_VERSION_EXT_AARCH64_HPP
+#endif // CPU_AARCH64_VM_VERSION_EXT_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/vmreg_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/vmreg_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_VMREG_AARCH64_HPP
-#define CPU_AARCH64_VM_VMREG_AARCH64_HPP
+#ifndef CPU_AARCH64_VMREG_AARCH64_HPP
+#define CPU_AARCH64_VMREG_AARCH64_HPP
 
 inline bool is_Register() {
   return (unsigned int) value() < (unsigned int) ConcreteRegisterImpl::max_gpr;
@@ -52,4 +52,4 @@
   return is_even(value());
 }
 
-#endif // CPU_AARCH64_VM_VMREG_AARCH64_HPP
+#endif // CPU_AARCH64_VMREG_AARCH64_HPP
--- a/src/hotspot/cpu/aarch64/vmreg_aarch64.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/aarch64/vmreg_aarch64.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_AARCH64_VM_VMREG_AARCH64_INLINE_HPP
-#define CPU_AARCH64_VM_VMREG_AARCH64_INLINE_HPP
+#ifndef CPU_AARCH64_VMREG_AARCH64_INLINE_HPP
+#define CPU_AARCH64_VMREG_AARCH64_INLINE_HPP
 
 inline VMReg RegisterImpl::as_VMReg() {
   if( this==noreg ) return VMRegImpl::Bad();
@@ -35,4 +35,4 @@
   return VMRegImpl::as_VMReg((encoding() << 1) + ConcreteRegisterImpl::max_gpr);
 }
 
-#endif // CPU_AARCH64_VM_VMREG_AARCH64_INLINE_HPP
+#endif // CPU_AARCH64_VMREG_AARCH64_INLINE_HPP
--- a/src/hotspot/cpu/arm/assembler_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/assembler_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_ASSEMBLER_ARM_HPP
-#define CPU_ARM_VM_ASSEMBLER_ARM_HPP
+#ifndef CPU_ARM_ASSEMBLER_ARM_HPP
+#define CPU_ARM_ASSEMBLER_ARM_HPP
 
 #include "utilities/macros.hpp"
 
@@ -326,4 +326,4 @@
 #include "assembler_arm_32.hpp"
 
 
-#endif // CPU_ARM_VM_ASSEMBLER_ARM_HPP
+#endif // CPU_ARM_ASSEMBLER_ARM_HPP
--- a/src/hotspot/cpu/arm/assembler_arm.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/assembler_arm.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_ASSEMBLER_ARM_INLINE_HPP
-#define CPU_ARM_VM_ASSEMBLER_ARM_INLINE_HPP
+#ifndef CPU_ARM_ASSEMBLER_ARM_INLINE_HPP
+#define CPU_ARM_ASSEMBLER_ARM_INLINE_HPP
 
 
-#endif // CPU_ARM_VM_ASSEMBLER_ARM_INLINE_HPP
+#endif // CPU_ARM_ASSEMBLER_ARM_INLINE_HPP
--- a/src/hotspot/cpu/arm/assembler_arm_32.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/assembler_arm_32.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_ASSEMBLER_ARM_32_HPP
-#define CPU_ARM_VM_ASSEMBLER_ARM_32_HPP
+#ifndef CPU_ARM_ASSEMBLER_ARM_32_HPP
+#define CPU_ARM_ASSEMBLER_ARM_32_HPP
 
 // ARM Addressing Mode 1 - Data processing operands
 class AsmOperand {
@@ -1250,4 +1250,4 @@
 #endif // __SOFTFP__
 
 
-#endif // CPU_ARM_VM_ASSEMBLER_ARM_32_HPP
+#endif // CPU_ARM_ASSEMBLER_ARM_32_HPP
--- a/src/hotspot/cpu/arm/bytes_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/bytes_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_BYTES_ARM_HPP
-#define CPU_ARM_VM_BYTES_ARM_HPP
+#ifndef CPU_ARM_BYTES_ARM_HPP
+#define CPU_ARM_BYTES_ARM_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/macros.hpp"
@@ -186,4 +186,4 @@
 // The following header contains the implementations of swap_u2, swap_u4, and swap_u8
 #include OS_CPU_HEADER_INLINE(bytes)
 
-#endif // CPU_ARM_VM_BYTES_ARM_HPP
+#endif // CPU_ARM_BYTES_ARM_HPP
--- a/src/hotspot/cpu/arm/c1_Defs_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/c1_Defs_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_C1_DEFS_ARM_HPP
-#define CPU_ARM_VM_C1_DEFS_ARM_HPP
+#ifndef CPU_ARM_C1_DEFS_ARM_HPP
+#define CPU_ARM_C1_DEFS_ARM_HPP
 
 // native word offsets from memory address (little endian)
 enum {
@@ -78,4 +78,4 @@
 #define CARDTABLEBARRIERSET_POST_BARRIER_HELPER
 #define GENERATE_ADDRESS_IS_PREFERRED
 
-#endif // CPU_ARM_VM_C1_DEFS_ARM_HPP
+#endif // CPU_ARM_C1_DEFS_ARM_HPP
--- a/src/hotspot/cpu/arm/c1_FpuStackSim_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/c1_FpuStackSim_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,9 +22,9 @@
  *
  */
 
-#ifndef CPU_ARM_VM_C1_FPUSTACKSIM_ARM_HPP
-#define CPU_ARM_VM_C1_FPUSTACKSIM_ARM_HPP
+#ifndef CPU_ARM_C1_FPUSTACKSIM_ARM_HPP
+#define CPU_ARM_C1_FPUSTACKSIM_ARM_HPP
 
 // Nothing needed here
 
-#endif // CPU_ARM_VM_C1_FPUSTACKSIM_ARM_HPP
+#endif // CPU_ARM_C1_FPUSTACKSIM_ARM_HPP
--- a/src/hotspot/cpu/arm/c1_FrameMap_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/c1_FrameMap_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_C1_FRAMEMAP_ARM_HPP
-#define CPU_ARM_VM_C1_FRAMEMAP_ARM_HPP
+#ifndef CPU_ARM_C1_FRAMEMAP_ARM_HPP
+#define CPU_ARM_C1_FRAMEMAP_ARM_HPP
 
  public:
 
@@ -108,4 +108,4 @@
     return pd_last_cpu_reg;
   }
 
-#endif // CPU_ARM_VM_C1_FRAMEMAP_ARM_HPP
+#endif // CPU_ARM_C1_FRAMEMAP_ARM_HPP
--- a/src/hotspot/cpu/arm/c1_LIRAssembler_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/c1_LIRAssembler_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_C1_LIRASSEMBLER_ARM_HPP
-#define CPU_ARM_VM_C1_LIRASSEMBLER_ARM_HPP
+#ifndef CPU_ARM_C1_LIRASSEMBLER_ARM_HPP
+#define CPU_ARM_C1_LIRASSEMBLER_ARM_HPP
 
  private:
 
@@ -65,4 +65,4 @@
   void store_parameter(jint c,      int offset_from_sp_in_words);
   void store_parameter(Metadata* m, int offset_from_sp_in_words);
 
-#endif // CPU_ARM_VM_C1_LIRASSEMBLER_ARM_HPP
+#endif // CPU_ARM_C1_LIRASSEMBLER_ARM_HPP
--- a/src/hotspot/cpu/arm/c1_LinearScan_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/c1_LinearScan_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_C1_LINEARSCAN_ARM_HPP
-#define CPU_ARM_VM_C1_LINEARSCAN_ARM_HPP
+#ifndef CPU_ARM_C1_LINEARSCAN_ARM_HPP
+#define CPU_ARM_C1_LINEARSCAN_ARM_HPP
 
 inline bool LinearScan::is_processed_reg_num(int reg_num) {
   return reg_num < pd_nof_cpu_regs_processed_in_linearscan ||
@@ -68,4 +68,4 @@
   return true;
 }
 
-#endif // CPU_ARM_VM_C1_LINEARSCAN_ARM_HPP
+#endif // CPU_ARM_C1_LINEARSCAN_ARM_HPP
--- a/src/hotspot/cpu/arm/c1_MacroAssembler_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/c1_MacroAssembler_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_C1_MACROASSEMBLER_ARM_HPP
-#define CPU_ARM_VM_C1_MACROASSEMBLER_ARM_HPP
+#ifndef CPU_ARM_C1_MACROASSEMBLER_ARM_HPP
+#define CPU_ARM_C1_MACROASSEMBLER_ARM_HPP
 
  private:
 
@@ -66,4 +66,4 @@
   // This platform only uses signal-based null checks. The Label is not needed.
   void null_check(Register r, Label *Lnull = NULL) { MacroAssembler::null_check(r); }
 
-#endif // CPU_ARM_VM_C1_MACROASSEMBLER_ARM_HPP
+#endif // CPU_ARM_C1_MACROASSEMBLER_ARM_HPP
--- a/src/hotspot/cpu/arm/c1_globals_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/c1_globals_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_C1_GLOBALS_ARM_HPP
-#define CPU_ARM_VM_C1_GLOBALS_ARM_HPP
+#ifndef CPU_ARM_C1_GLOBALS_ARM_HPP
+#define CPU_ARM_C1_GLOBALS_ARM_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -70,4 +70,4 @@
 define_pd_global(bool, CSEArrayLength,               true);
 define_pd_global(bool, TwoOperandLIRForm,            false);
 
-#endif // CPU_ARM_VM_C1_GLOBALS_ARM_HPP
+#endif // CPU_ARM_C1_GLOBALS_ARM_HPP
--- a/src/hotspot/cpu/arm/c2_globals_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/c2_globals_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_C2_GLOBALS_ARM_HPP
-#define CPU_ARM_VM_C2_GLOBALS_ARM_HPP
+#ifndef CPU_ARM_C2_GLOBALS_ARM_HPP
+#define CPU_ARM_C2_GLOBALS_ARM_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -108,4 +108,4 @@
 // Ergonomics related flags
 define_pd_global(bool, NeverActAsServerClassMachine, false);
 
-#endif // CPU_ARM_VM_C2_GLOBALS_ARM_HPP
+#endif // CPU_ARM_C2_GLOBALS_ARM_HPP
--- a/src/hotspot/cpu/arm/codeBuffer_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/codeBuffer_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_CODEBUFFER_ARM_HPP
-#define CPU_ARM_VM_CODEBUFFER_ARM_HPP
+#ifndef CPU_ARM_CODEBUFFER_ARM_HPP
+#define CPU_ARM_CODEBUFFER_ARM_HPP
 
 private:
   void pd_initialize() {}
@@ -31,4 +31,4 @@
 public:
   void flush_bundle(bool start_new_bundle) {}
 
-#endif // CPU_ARM_VM_CODEBUFFER_ARM_HPP
+#endif // CPU_ARM_CODEBUFFER_ARM_HPP
--- a/src/hotspot/cpu/arm/copy_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/copy_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_COPY_ARM_HPP
-#define CPU_ARM_VM_COPY_ARM_HPP
+#ifndef CPU_ARM_COPY_ARM_HPP
+#define CPU_ARM_COPY_ARM_HPP
 
 #include "utilities/macros.hpp"
 
@@ -56,4 +56,4 @@
   memset(to, 0, count);
 }
 
-#endif // CPU_ARM_VM_COPY_ARM_HPP
+#endif // CPU_ARM_COPY_ARM_HPP
--- a/src/hotspot/cpu/arm/depChecker_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/depChecker_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,9 +22,9 @@
  *
  */
 
-#ifndef CPU_ARM_VM_DEPCHECKER_ARM_HPP
-#define CPU_ARM_VM_DEPCHECKER_ARM_HPP
+#ifndef CPU_ARM_DEPCHECKER_ARM_HPP
+#define CPU_ARM_DEPCHECKER_ARM_HPP
 
 // Nothing to do
 
-#endif // CPU_ARM_VM_DEPCHECKER_ARM_HPP
+#endif // CPU_ARM_DEPCHECKER_ARM_HPP
--- a/src/hotspot/cpu/arm/disassembler_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/disassembler_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_DISASSEMBLER_ARM_HPP
-#define CPU_ARM_VM_DISASSEMBLER_ARM_HPP
+#ifndef CPU_ARM_DISASSEMBLER_ARM_HPP
+#define CPU_ARM_DISASSEMBLER_ARM_HPP
 
   static int pd_instruction_alignment() {
     return sizeof(int);
@@ -33,4 +33,4 @@
     return "";
   }
 
-#endif // CPU_ARM_VM_DISASSEMBLER_ARM_HPP
+#endif // CPU_ARM_DISASSEMBLER_ARM_HPP
--- a/src/hotspot/cpu/arm/frame_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/frame_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_FRAME_ARM_HPP
-#define CPU_ARM_VM_FRAME_ARM_HPP
+#ifndef CPU_ARM_FRAME_ARM_HPP
+#define CPU_ARM_FRAME_ARM_HPP
 
 #include "runtime/synchronizer.hpp"
 
@@ -118,4 +118,4 @@
 
   static jint interpreter_frame_expression_stack_direction() { return -1; }
 
-#endif // CPU_ARM_VM_FRAME_ARM_HPP
+#endif // CPU_ARM_FRAME_ARM_HPP
--- a/src/hotspot/cpu/arm/frame_arm.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/frame_arm.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_FRAME_ARM_INLINE_HPP
-#define CPU_ARM_VM_FRAME_ARM_INLINE_HPP
+#ifndef CPU_ARM_FRAME_ARM_INLINE_HPP
+#define CPU_ARM_FRAME_ARM_INLINE_HPP
 
 #include "code/codeCache.hpp"
 #include "code/vmreg.inline.hpp"
@@ -228,4 +228,4 @@
   *result_adr = obj;
 }
 
-#endif // CPU_ARM_VM_FRAME_ARM_INLINE_HPP
+#endif // CPU_ARM_FRAME_ARM_INLINE_HPP
--- a/src/hotspot/cpu/arm/gc/shared/cardTableBarrierSetAssembler_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/gc/shared/cardTableBarrierSetAssembler_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,4 +43,4 @@
                             Address obj, Register new_val, Register tmp1, Register tmp2, Register tmp3, bool is_null);
 };
 
-#endif // #ifndef CPU_ARM_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_ARM_HPP
+#endif // CPU_ARM_GC_SHARED_CARDTABLEBARRIERSETASSEMBLER_ARM_HPP
--- a/src/hotspot/cpu/arm/globalDefinitions_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/globalDefinitions_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_GLOBALDEFINITIONS_ARM_HPP
-#define CPU_ARM_VM_GLOBALDEFINITIONS_ARM_HPP
+#ifndef CPU_ARM_GLOBALDEFINITIONS_ARM_HPP
+#define CPU_ARM_GLOBALDEFINITIONS_ARM_HPP
 
 const int StackAlignmentInBytes = 8;
 
@@ -59,4 +59,4 @@
 #endif
 #endif
 
-#endif // CPU_ARM_VM_GLOBALDEFINITIONS_ARM_HPP
+#endif // CPU_ARM_GLOBALDEFINITIONS_ARM_HPP
--- a/src/hotspot/cpu/arm/globals_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/globals_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_GLOBALS_ARM_HPP
-#define CPU_ARM_VM_GLOBALS_ARM_HPP
+#ifndef CPU_ARM_GLOBALS_ARM_HPP
+#define CPU_ARM_GLOBALS_ARM_HPP
 
 //
 // Sets the default values for platform dependent flags used by the runtime system.
@@ -87,4 +87,4 @@
                    range, \
                    constraint, \
                    writeable)
-#endif // CPU_ARM_VM_GLOBALS_ARM_HPP
+#endif // CPU_ARM_GLOBALS_ARM_HPP
--- a/src/hotspot/cpu/arm/icache_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/icache_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_ICACHE_ARM_HPP
-#define CPU_ARM_VM_ICACHE_ARM_HPP
+#ifndef CPU_ARM_ICACHE_ARM_HPP
+#define CPU_ARM_ICACHE_ARM_HPP
 
 // Interface for updating the instruction cache.  Whenever the VM modifies
 // code, part of the processor instruction cache potentially has to be flushed.
@@ -37,4 +37,4 @@
   };
 };
 
-#endif // CPU_ARM_VM_ICACHE_ARM_HPP
+#endif // CPU_ARM_ICACHE_ARM_HPP
--- a/src/hotspot/cpu/arm/interp_masm_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/interp_masm_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_INTERP_MASM_ARM_HPP
-#define CPU_ARM_VM_INTERP_MASM_ARM_HPP
+#ifndef CPU_ARM_INTERP_MASM_ARM_HPP
+#define CPU_ARM_INTERP_MASM_ARM_HPP
 
 #include "asm/macroAssembler.hpp"
 #include "interpreter/invocationCounter.hpp"
@@ -277,4 +277,4 @@
                          Register reg3 = noreg);
 };
 
-#endif // CPU_ARM_VM_INTERP_MASM_ARM_HPP
+#endif // CPU_ARM_INTERP_MASM_ARM_HPP
--- a/src/hotspot/cpu/arm/interpreterRT_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/interpreterRT_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_INTERPRETERRT_ARM_HPP
-#define CPU_ARM_VM_INTERPRETERRT_ARM_HPP
+#ifndef CPU_ARM_INTERPRETERRT_ARM_HPP
+#define CPU_ARM_INTERPRETERRT_ARM_HPP
 
 // native method calls
 
@@ -60,4 +60,4 @@
 // sharing). See normalize_fast_native_fingerprint
 #define SHARING_FAST_NATIVE_FINGERPRINTS
 
-#endif // CPU_ARM_VM_INTERPRETERRT_ARM_HPP
+#endif // CPU_ARM_INTERPRETERRT_ARM_HPP
--- a/src/hotspot/cpu/arm/javaFrameAnchor_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/javaFrameAnchor_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_JAVAFRAMEANCHOR_ARM_HPP
-#define CPU_ARM_VM_JAVAFRAMEANCHOR_ARM_HPP
+#ifndef CPU_ARM_JAVAFRAMEANCHOR_ARM_HPP
+#define CPU_ARM_JAVAFRAMEANCHOR_ARM_HPP
 
 private:
 
@@ -83,4 +83,4 @@
   // Assert (last_Java_sp == NULL || fp == NULL)
   void set_last_Java_fp(intptr_t* fp)                { _last_Java_fp = fp; }
 
-#endif // CPU_ARM_VM_JAVAFRAMEANCHOR_ARM_HPP
+#endif // CPU_ARM_JAVAFRAMEANCHOR_ARM_HPP
--- a/src/hotspot/cpu/arm/jniTypes_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/jniTypes_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_JNITYPES_ARM_HPP
-#define CPU_ARM_VM_JNITYPES_ARM_HPP
+#ifndef CPU_ARM_JNITYPES_ARM_HPP
+#define CPU_ARM_JNITYPES_ARM_HPP
 
 #include "jni.h"
 #include "memory/allocation.hpp"
@@ -79,4 +79,4 @@
 
 };
 
-#endif // CPU_ARM_VM_JNITYPES_ARM_HPP
+#endif // CPU_ARM_JNITYPES_ARM_HPP
--- a/src/hotspot/cpu/arm/macroAssembler_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/macroAssembler_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_MACROASSEMBLER_ARM_HPP
-#define CPU_ARM_VM_MACROASSEMBLER_ARM_HPP
+#ifndef CPU_ARM_MACROASSEMBLER_ARM_HPP
+#define CPU_ARM_MACROASSEMBLER_ARM_HPP
 
 #include "code/relocInfo.hpp"
 #include "code/relocInfo_ext.hpp"
@@ -1097,4 +1097,4 @@
 };
 
 
-#endif // CPU_ARM_VM_MACROASSEMBLER_ARM_HPP
+#endif // CPU_ARM_MACROASSEMBLER_ARM_HPP
--- a/src/hotspot/cpu/arm/macroAssembler_arm.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/macroAssembler_arm.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_MACROASSEMBLER_ARM_INLINE_HPP
-#define CPU_ARM_VM_MACROASSEMBLER_ARM_INLINE_HPP
+#ifndef CPU_ARM_MACROASSEMBLER_ARM_INLINE_HPP
+#define CPU_ARM_MACROASSEMBLER_ARM_INLINE_HPP
 
 #include "asm/assembler.inline.hpp"
 #include "asm/codeBuffer.hpp"
@@ -63,4 +63,4 @@
   }
 }
 
-#endif // CPU_ARM_VM_MACROASSEMBLER_ARM_INLINE_HPP
+#endif // CPU_ARM_MACROASSEMBLER_ARM_INLINE_HPP
--- a/src/hotspot/cpu/arm/nativeInst_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/nativeInst_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_NATIVEINST_ARM_HPP
-#define CPU_ARM_VM_NATIVEINST_ARM_HPP
+#ifndef CPU_ARM_NATIVEINST_ARM_HPP
+#define CPU_ARM_NATIVEINST_ARM_HPP
 
 #include "asm/macroAssembler.hpp"
 #include "runtime/icache.hpp"
@@ -33,4 +33,4 @@
 #include "nativeInst_arm_32.hpp"
 
 
-#endif // CPU_ARM_VM_NATIVEINST_ARM_HPP
+#endif // CPU_ARM_NATIVEINST_ARM_HPP
--- a/src/hotspot/cpu/arm/nativeInst_arm_32.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/nativeInst_arm_32.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_NATIVEINST_ARM_32_HPP
-#define CPU_ARM_VM_NATIVEINST_ARM_32_HPP
+#ifndef CPU_ARM_NATIVEINST_ARM_32_HPP
+#define CPU_ARM_NATIVEINST_ARM_32_HPP
 
 #include "asm/macroAssembler.hpp"
 #include "code/codeCache.hpp"
@@ -429,4 +429,4 @@
   return (NativeCall *) rawNativeCall_before(return_address);
 }
 
-#endif // CPU_ARM_VM_NATIVEINST_ARM_32_HPP
+#endif // CPU_ARM_NATIVEINST_ARM_32_HPP
--- a/src/hotspot/cpu/arm/registerMap_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/registerMap_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_REGISTERMAP_ARM_HPP
-#define CPU_ARM_VM_REGISTERMAP_ARM_HPP
+#ifndef CPU_ARM_REGISTERMAP_ARM_HPP
+#define CPU_ARM_REGISTERMAP_ARM_HPP
 
 // machine-dependent implemention for register maps
   friend class frame;
@@ -41,4 +41,4 @@
   void pd_initialize() {}
   void pd_initialize_from(const RegisterMap* map) {}
 
-#endif // CPU_ARM_VM_REGISTERMAP_ARM_HPP
+#endif // CPU_ARM_REGISTERMAP_ARM_HPP
--- a/src/hotspot/cpu/arm/register_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/register_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_REGISTER_ARM_HPP
-#define CPU_ARM_VM_REGISTER_ARM_HPP
+#ifndef CPU_ARM_REGISTER_ARM_HPP
+#define CPU_ARM_REGISTER_ARM_HPP
 
 #include "asm/register.hpp"
 #include "vm_version_arm.hpp"
@@ -437,4 +437,4 @@
 #define j_rarg3  c_rarg3
 
 
-#endif // CPU_ARM_VM_REGISTER_ARM_HPP
+#endif // CPU_ARM_REGISTER_ARM_HPP
--- a/src/hotspot/cpu/arm/relocInfo_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/relocInfo_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_RELOCINFO_ARM_HPP
-#define CPU_ARM_VM_RELOCINFO_ARM_HPP
+#ifndef CPU_ARM_RELOCINFO_ARM_HPP
+#define CPU_ARM_RELOCINFO_ARM_HPP
 
  private:
 
@@ -38,4 +38,4 @@
   // listed in the oop section.
   static bool mustIterateImmediateOopsInCode() { return false; }
 
-#endif // CPU_ARM_VM_RELOCINFO_ARM_HPP
+#endif // CPU_ARM_RELOCINFO_ARM_HPP
--- a/src/hotspot/cpu/arm/stubRoutines_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/stubRoutines_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_STUBROUTINES_ARM_HPP
-#define CPU_ARM_VM_STUBROUTINES_ARM_HPP
+#ifndef CPU_ARM_STUBROUTINES_ARM_HPP
+#define CPU_ARM_STUBROUTINES_ARM_HPP
 
 // This file holds the platform specific parts of the StubRoutines
 // definition. See stubRoutines.hpp for a description on how to
@@ -60,4 +60,4 @@
   static address atomic_store_long_entry()                 { return _atomic_store_long_entry; }
 
 
-#endif // CPU_ARM_VM_STUBROUTINES_ARM_HPP
+#endif // CPU_ARM_STUBROUTINES_ARM_HPP
--- a/src/hotspot/cpu/arm/templateTable_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/templateTable_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_TEMPLATETABLE_ARM_HPP
-#define CPU_ARM_VM_TEMPLATETABLE_ARM_HPP
+#ifndef CPU_ARM_TEMPLATETABLE_ARM_HPP
+#define CPU_ARM_TEMPLATETABLE_ARM_HPP
 
   static void prepare_invoke(int byte_no,
                              Register method,         // linked method (or i-klass)
@@ -59,4 +59,4 @@
 
   static void jvmti_post_fast_field_mod(TosState state);
 
-#endif // CPU_ARM_VM_TEMPLATETABLE_ARM_HPP
+#endif // CPU_ARM_TEMPLATETABLE_ARM_HPP
--- a/src/hotspot/cpu/arm/vmStructs_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/vmStructs_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_VMSTRUCTS_ARM_HPP
-#define CPU_ARM_VM_VMSTRUCTS_ARM_HPP
+#ifndef CPU_ARM_VMSTRUCTS_ARM_HPP
+#define CPU_ARM_VMSTRUCTS_ARM_HPP
 
 // These are the CPU-specific fields, types and integer
 // constants required by the Serviceability Agent. This file is
@@ -45,4 +45,4 @@
 
 #define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
 
-#endif // CPU_ARM_VM_VMSTRUCTS_ARM_HPP
+#endif // CPU_ARM_VMSTRUCTS_ARM_HPP
--- a/src/hotspot/cpu/arm/vm_version_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/vm_version_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_VM_VERSION_ARM_HPP
-#define CPU_ARM_VM_VM_VERSION_ARM_HPP
+#ifndef CPU_ARM_VM_VERSION_ARM_HPP
+#define CPU_ARM_VM_VERSION_ARM_HPP
 
 #include "runtime/globals_extension.hpp"
 #include "runtime/vm_version.hpp"
@@ -106,4 +106,4 @@
 
 };
 
-#endif // CPU_ARM_VM_VM_VERSION_ARM_HPP
+#endif // CPU_ARM_VM_VERSION_ARM_HPP
--- a/src/hotspot/cpu/arm/vm_version_ext_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/vm_version_ext_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_VM_VERSION_EXT_ARM_HPP
-#define CPU_ARM_VM_VM_VERSION_EXT_ARM_HPP
+#ifndef CPU_ARM_VM_VERSION_EXT_ARM_HPP
+#define CPU_ARM_VM_VERSION_EXT_ARM_HPP
 
 #include "utilities/macros.hpp"
 #include "vm_version_arm.hpp"
@@ -51,4 +51,4 @@
 
 };
 
-#endif // CPU_ARM_VM_VM_VERSION_EXT_ARM_HPP
+#endif // CPU_ARM_VM_VERSION_EXT_ARM_HPP
--- a/src/hotspot/cpu/arm/vmreg_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/vmreg_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_VMREG_ARM_HPP
-#define CPU_ARM_VM_VMREG_ARM_HPP
+#ifndef CPU_ARM_VMREG_ARM_HPP
+#define CPU_ARM_VMREG_ARM_HPP
 
   inline bool is_Register() {
     return (unsigned int) value() < (unsigned int) ConcreteRegisterImpl::max_gpr;
@@ -55,4 +55,4 @@
     }
   }
 
-#endif // CPU_ARM_VM_VMREG_ARM_HPP
+#endif // CPU_ARM_VMREG_ARM_HPP
--- a/src/hotspot/cpu/arm/vmreg_arm.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/arm/vmreg_arm.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ARM_VM_VMREG_ARM_INLINE_HPP
-#define CPU_ARM_VM_VMREG_ARM_INLINE_HPP
+#ifndef CPU_ARM_VMREG_ARM_INLINE_HPP
+#define CPU_ARM_VMREG_ARM_INLINE_HPP
 
 inline VMReg RegisterImpl::as_VMReg() {
   return VMRegImpl::as_VMReg(encoding() << ConcreteRegisterImpl::log_vmregs_per_gpr);
@@ -32,4 +32,4 @@
 inline VMReg FloatRegisterImpl::as_VMReg() {
   return VMRegImpl::as_VMReg((encoding() << ConcreteRegisterImpl::log_vmregs_per_fpr) + ConcreteRegisterImpl::max_gpr);
 }
-#endif // CPU_ARM_VM_VMREG_ARM_INLINE_HPP
+#endif // CPU_ARM_VMREG_ARM_INLINE_HPP
--- a/src/hotspot/cpu/ppc/assembler_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/assembler_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_ASSEMBLER_PPC_HPP
-#define CPU_PPC_VM_ASSEMBLER_PPC_HPP
+#ifndef CPU_PPC_ASSEMBLER_PPC_HPP
+#define CPU_PPC_ASSEMBLER_PPC_HPP
 
 #include "asm/register.hpp"
 
@@ -2450,4 +2450,4 @@
 };
 
 
-#endif // CPU_PPC_VM_ASSEMBLER_PPC_HPP
+#endif // CPU_PPC_ASSEMBLER_PPC_HPP
--- a/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/assembler_ppc.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_ASSEMBLER_PPC_INLINE_HPP
-#define CPU_PPC_VM_ASSEMBLER_PPC_INLINE_HPP
+#ifndef CPU_PPC_ASSEMBLER_PPC_INLINE_HPP
+#define CPU_PPC_ASSEMBLER_PPC_INLINE_HPP
 
 #include "asm/assembler.inline.hpp"
 #include "asm/codeBuffer.hpp"
@@ -1127,4 +1127,4 @@
   ori(d, d, i & 0xFFFF);
 }
 
-#endif // CPU_PPC_VM_ASSEMBLER_PPC_INLINE_HPP
+#endif // CPU_PPC_ASSEMBLER_PPC_INLINE_HPP
--- a/src/hotspot/cpu/ppc/bytes_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/bytes_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_BYTES_PPC_HPP
-#define CPU_PPC_VM_BYTES_PPC_HPP
+#ifndef CPU_PPC_BYTES_PPC_HPP
+#define CPU_PPC_BYTES_PPC_HPP
 
 #include "memory/allocation.hpp"
 
@@ -268,4 +268,4 @@
 
 #include OS_CPU_HEADER_INLINE(bytes)
 
-#endif // CPU_PPC_VM_BYTES_PPC_HPP
+#endif // CPU_PPC_BYTES_PPC_HPP
--- a/src/hotspot/cpu/ppc/c1_Defs_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/c1_Defs_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_C1_DEFS_PPC_HPP
-#define CPU_PPC_VM_C1_DEFS_PPC_HPP
+#ifndef CPU_PPC_C1_DEFS_PPC_HPP
+#define CPU_PPC_C1_DEFS_PPC_HPP
 
 // Native word offsets from memory address.
 enum {
@@ -73,4 +73,4 @@
   pd_float_saved_as_double = true
 };
 
-#endif // CPU_PPC_VM_C1_DEFS_PPC_HPP
+#endif // CPU_PPC_C1_DEFS_PPC_HPP
--- a/src/hotspot/cpu/ppc/c1_FpuStackSim_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/c1_FpuStackSim_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,10 +23,10 @@
  *
  */
 
-#ifndef CPU_PPC_VM_C1_FPUSTACKSIM_PPC_HPP
-#define CPU_PPC_VM_C1_FPUSTACKSIM_PPC_HPP
+#ifndef CPU_PPC_C1_FPUSTACKSIM_PPC_HPP
+#define CPU_PPC_C1_FPUSTACKSIM_PPC_HPP
 
 // No FPU stack on PPC.
 class FpuStackSim;
 
-#endif // CPU_PPC_VM_C1_FPUSTACKSIM_PPC_HPP
+#endif // CPU_PPC_C1_FPUSTACKSIM_PPC_HPP
--- a/src/hotspot/cpu/ppc/c1_FrameMap_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/c1_FrameMap_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_C1_FRAMEMAP_PPC_HPP
-#define CPU_PPC_VM_C1_FRAMEMAP_PPC_HPP
+#ifndef CPU_PPC_C1_FRAMEMAP_PPC_HPP
+#define CPU_PPC_C1_FRAMEMAP_PPC_HPP
 
  public:
 
@@ -199,4 +199,4 @@
   // R29: global TOC
   static bool reg_needs_save(Register r) { return r != R0 && r != R1 && r != R13 && r != R16 && r != R29; }
 
-#endif // CPU_PPC_VM_C1_FRAMEMAP_PPC_HPP
+#endif // CPU_PPC_C1_FRAMEMAP_PPC_HPP
--- a/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/c1_LIRAssembler_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_C1_LIRASSEMBLER_PPC_HPP
-#define CPU_PPC_VM_C1_LIRASSEMBLER_PPC_HPP
+#ifndef CPU_PPC_C1_LIRASSEMBLER_PPC_HPP
+#define CPU_PPC_C1_LIRASSEMBLER_PPC_HPP
 
  private:
 
@@ -77,4 +77,4 @@
     }
   }
 
-#endif // CPU_PPC_VM_C1_LIRASSEMBLER_PPC_HPP
+#endif // CPU_PPC_C1_LIRASSEMBLER_PPC_HPP
--- a/src/hotspot/cpu/ppc/c1_LinearScan_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/c1_LinearScan_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_C1_LINEARSCAN_PPC_HPP
-#define CPU_PPC_VM_C1_LINEARSCAN_PPC_HPP
+#ifndef CPU_PPC_C1_LINEARSCAN_PPC_HPP
+#define CPU_PPC_C1_LINEARSCAN_PPC_HPP
 
 inline bool LinearScan::is_processed_reg_num(int reg_num) {
   assert(FrameMap::R0_opr->cpu_regnr() == FrameMap::last_cpu_reg() + 1, "wrong assumption below");
@@ -70,4 +70,4 @@
   return false;
 }
 
-#endif // CPU_PPC_VM_C1_LINEARSCAN_PPC_HPP
+#endif // CPU_PPC_C1_LINEARSCAN_PPC_HPP
--- a/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_C1_MACROASSEMBLER_PPC_HPP
-#define CPU_PPC_VM_C1_MACROASSEMBLER_PPC_HPP
+#ifndef CPU_PPC_C1_MACROASSEMBLER_PPC_HPP
+#define CPU_PPC_C1_MACROASSEMBLER_PPC_HPP
 
   void pd_init() { /* nothing to do */ }
 
@@ -90,4 +90,4 @@
 
   address call_c_with_frame_resize(address dest, int frame_resize);
 
-#endif // CPU_PPC_VM_C1_MACROASSEMBLER_PPC_HPP
+#endif // CPU_PPC_C1_MACROASSEMBLER_PPC_HPP
--- a/src/hotspot/cpu/ppc/c1_globals_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/c1_globals_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_C1_GLOBALS_PPC_HPP
-#define CPU_PPC_VM_C1_GLOBALS_PPC_HPP
+#ifndef CPU_PPC_C1_GLOBALS_PPC_HPP
+#define CPU_PPC_C1_GLOBALS_PPC_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -65,4 +65,4 @@
 define_pd_global(bool,     CSEArrayLength,               true);
 define_pd_global(bool,     TwoOperandLIRForm,            false);
 
-#endif // CPU_PPC_VM_C1_GLOBALS_PPC_HPP
+#endif // CPU_PPC_C1_GLOBALS_PPC_HPP
--- a/src/hotspot/cpu/ppc/c2_globals_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/c2_globals_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_C2_GLOBALS_PPC_HPP
-#define CPU_PPC_VM_C2_GLOBALS_PPC_HPP
+#ifndef CPU_PPC_C2_GLOBALS_PPC_HPP
+#define CPU_PPC_C2_GLOBALS_PPC_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -101,4 +101,4 @@
 // Ergonomics related flags
 define_pd_global(bool,     NeverActAsServerClassMachine, false);
 
-#endif // CPU_PPC_VM_C2_GLOBALS_PPC_HPP
+#endif // CPU_PPC_C2_GLOBALS_PPC_HPP
--- a/src/hotspot/cpu/ppc/codeBuffer_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/codeBuffer_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_CODEBUFFER_PPC_HPP
-#define CPU_PPC_VM_CODEBUFFER_PPC_HPP
+#ifndef CPU_PPC_CODEBUFFER_PPC_HPP
+#define CPU_PPC_CODEBUFFER_PPC_HPP
 
 private:
   void pd_initialize() {}
@@ -32,4 +32,4 @@
 public:
   void flush_bundle(bool start_new_bundle) {}
 
-#endif // CPU_PPC_VM_CODEBUFFER_PPC_HPP
+#endif // CPU_PPC_CODEBUFFER_PPC_HPP
--- a/src/hotspot/cpu/ppc/copy_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/copy_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_COPY_PPC_HPP
-#define CPU_PPC_VM_COPY_PPC_HPP
+#ifndef CPU_PPC_COPY_PPC_HPP
+#define CPU_PPC_COPY_PPC_HPP
 
 #ifndef PPC64
 #error "copy currently only implemented for PPC64"
@@ -168,4 +168,4 @@
   (void)memset(to, 0, count);
 }
 
-#endif // CPU_PPC_VM_COPY_PPC_HPP
+#endif // CPU_PPC_COPY_PPC_HPP
--- a/src/hotspot/cpu/ppc/depChecker_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/depChecker_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,9 +23,9 @@
  *
  */
 
-#ifndef CPU_PPC_VM_DEPCHECKER_PPC_HPP
-#define CPU_PPC_VM_DEPCHECKER_PPC_HPP
+#ifndef CPU_PPC_DEPCHECKER_PPC_HPP
+#define CPU_PPC_DEPCHECKER_PPC_HPP
 
 // Nothing to do on ppc64
 
-#endif // CPU_PPC_VM_DEPCHECKER_PPC_HPP
+#endif // CPU_PPC_DEPCHECKER_PPC_HPP
--- a/src/hotspot/cpu/ppc/disassembler_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/disassembler_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_DISASSEMBLER_PPC_HPP
-#define CPU_PPC_VM_DISASSEMBLER_PPC_HPP
+#ifndef CPU_PPC_DISASSEMBLER_PPC_HPP
+#define CPU_PPC_DISASSEMBLER_PPC_HPP
 
   static int pd_instruction_alignment() {
     return sizeof(int);
@@ -34,4 +34,4 @@
     return "ppc64";
   }
 
-#endif // CPU_PPC_VM_DISASSEMBLER_PPC_HPP
+#endif // CPU_PPC_DISASSEMBLER_PPC_HPP
--- a/src/hotspot/cpu/ppc/frame_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/frame_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_FRAME_PPC_HPP
-#define CPU_PPC_VM_FRAME_PPC_HPP
+#ifndef CPU_PPC_FRAME_PPC_HPP
+#define CPU_PPC_FRAME_PPC_HPP
 
 #include "runtime/synchronizer.hpp"
 
@@ -427,4 +427,4 @@
 
   static jint interpreter_frame_expression_stack_direction() { return -1; }
 
-#endif // CPU_PPC_VM_FRAME_PPC_HPP
+#endif // CPU_PPC_FRAME_PPC_HPP
--- a/src/hotspot/cpu/ppc/frame_ppc.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/frame_ppc.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_FRAME_PPC_INLINE_HPP
-#define CPU_PPC_VM_FRAME_PPC_INLINE_HPP
+#ifndef CPU_PPC_FRAME_PPC_INLINE_HPP
+#define CPU_PPC_FRAME_PPC_INLINE_HPP
 
 #include "code/codeCache.hpp"
 #include "code/vmreg.inline.hpp"
@@ -220,4 +220,4 @@
   *((oop*)map->location(R3->as_VMReg())) = obj;
 }
 
-#endif // CPU_PPC_VM_FRAME_PPC_INLINE_HPP
+#endif // CPU_PPC_FRAME_PPC_INLINE_HPP
--- a/src/hotspot/cpu/ppc/globalDefinitions_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/globalDefinitions_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_GLOBALDEFINITIONS_PPC_HPP
-#define CPU_PPC_VM_GLOBALDEFINITIONS_PPC_HPP
+#ifndef CPU_PPC_GLOBALDEFINITIONS_PPC_HPP
+#define CPU_PPC_GLOBALDEFINITIONS_PPC_HPP
 
 #ifdef CC_INTERP
 #error "CC_INTERP is no longer supported. Removed in change 8145117."
@@ -60,4 +60,4 @@
 // Define the condition to use this -XX flag.
 #define USE_POLL_BIT_ONLY UseSIGTRAP
 
-#endif // CPU_PPC_VM_GLOBALDEFINITIONS_PPC_HPP
+#endif // CPU_PPC_GLOBALDEFINITIONS_PPC_HPP
--- a/src/hotspot/cpu/ppc/globals_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/globals_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_GLOBALS_PPC_HPP
-#define CPU_PPC_VM_GLOBALS_PPC_HPP
+#ifndef CPU_PPC_GLOBALS_PPC_HPP
+#define CPU_PPC_GLOBALS_PPC_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -207,4 +207,4 @@
   experimental(bool, UseRTMXendForLockBusy, true,                           \
           "Use RTM Xend instead of Xabort when lock busy")                  \
 
-#endif // CPU_PPC_VM_GLOBALS_PPC_HPP
+#endif // CPU_PPC_GLOBALS_PPC_HPP
--- a/src/hotspot/cpu/ppc/icache_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/icache_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_ICACHE_PPC_HPP
-#define CPU_PPC_VM_ICACHE_PPC_HPP
+#ifndef CPU_PPC_ICACHE_PPC_HPP
+#define CPU_PPC_ICACHE_PPC_HPP
 
 // Interface for updating the instruction cache.  Whenever the VM modifies
 // code, part of the processor instruction cache potentially has to be flushed.
@@ -49,4 +49,4 @@
   }
 };
 
-#endif // CPU_PPC_VM_ICACHE_PPC_HPP
+#endif // CPU_PPC_ICACHE_PPC_HPP
--- a/src/hotspot/cpu/ppc/interp_masm_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/interp_masm_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2017 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_INTERP_MASM_PPC_HPP
-#define CPU_PPC_VM_INTERP_MASM_PPC_HPP
+#ifndef CPU_PPC_INTERP_MASM_PPC_HPP
+#define CPU_PPC_INTERP_MASM_PPC_HPP
 
 #include "asm/macroAssembler.hpp"
 #include "interpreter/invocationCounter.hpp"
@@ -266,4 +266,4 @@
                           NotifyMethodExitMode mode, bool check_exceptions);
 };
 
-#endif // CPU_PPC_VM_INTERP_MASM_PPC_HPP
+#endif // CPU_PPC_INTERP_MASM_PPC_HPP
--- a/src/hotspot/cpu/ppc/interpreterRT_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/interpreterRT_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2014 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_INTERPRETERRT_PPC_HPP
-#define CPU_PPC_VM_INTERPRETERRT_PPC_HPP
+#ifndef CPU_PPC_INTERPRETERRT_PPC_HPP
+#define CPU_PPC_INTERPRETERRT_PPC_HPP
 
 // This is included in the middle of class Interpreter.
 // Do not include files here.
@@ -57,4 +57,4 @@
 // A function to get the signature.
 static address get_signature(JavaThread* thread, Method* method);
 
-#endif // CPU_PPC_VM_INTERPRETERRT_PPC_HPP
+#endif // CPU_PPC_INTERPRETERRT_PPC_HPP
--- a/src/hotspot/cpu/ppc/javaFrameAnchor_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/javaFrameAnchor_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2014 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_JAVAFRAMEANCHOR_PPC_HPP
-#define CPU_PPC_VM_JAVAFRAMEANCHOR_PPC_HPP
+#ifndef CPU_PPC_JAVAFRAMEANCHOR_PPC_HPP
+#define CPU_PPC_JAVAFRAMEANCHOR_PPC_HPP
 
 public:
   // Each arch must define reset, save, restore
@@ -75,4 +75,4 @@
 
   void set_last_Java_sp(intptr_t* sp) { OrderAccess::release(); _last_Java_sp = sp; }
 
-#endif // CPU_PPC_VM_JAVAFRAMEANCHOR_PPC_HPP
+#endif // CPU_PPC_JAVAFRAMEANCHOR_PPC_HPP
--- a/src/hotspot/cpu/ppc/jniTypes_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/jniTypes_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_JNITYPES_PPC_HPP
-#define CPU_PPC_VM_JNITYPES_PPC_HPP
+#ifndef CPU_PPC_JNITYPES_PPC_HPP
+#define CPU_PPC_JNITYPES_PPC_HPP
 
 #include "jni.h"
 #include "memory/allocation.hpp"
@@ -107,4 +107,4 @@
   static inline jdouble get_double(intptr_t *from) { return *(jdouble *)(from + 1); }
 };
 
-#endif // CPU_PPC_VM_JNITYPES_PPC_HPP
+#endif // CPU_PPC_JNITYPES_PPC_HPP
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2018, SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_MACROASSEMBLER_PPC_HPP
-#define CPU_PPC_VM_MACROASSEMBLER_PPC_HPP
+#ifndef CPU_PPC_MACROASSEMBLER_PPC_HPP
+#define CPU_PPC_MACROASSEMBLER_PPC_HPP
 
 #include "asm/assembler.hpp"
 #include "oops/accessDecorators.hpp"
@@ -970,4 +970,4 @@
    ~SkipIfEqualZero();
 };
 
-#endif // CPU_PPC_VM_MACROASSEMBLER_PPC_HPP
+#endif // CPU_PPC_MACROASSEMBLER_PPC_HPP
--- a/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_MACROASSEMBLER_PPC_INLINE_HPP
-#define CPU_PPC_VM_MACROASSEMBLER_PPC_INLINE_HPP
+#ifndef CPU_PPC_MACROASSEMBLER_PPC_INLINE_HPP
+#define CPU_PPC_MACROASSEMBLER_PPC_INLINE_HPP
 
 #include "asm/assembler.inline.hpp"
 #include "asm/macroAssembler.hpp"
@@ -480,4 +480,4 @@
 inline address MacroAssembler::function_entry() { return emit_fd(); }
 #endif
 
-#endif // CPU_PPC_VM_MACROASSEMBLER_PPC_INLINE_HPP
+#endif // CPU_PPC_MACROASSEMBLER_PPC_INLINE_HPP
--- a/src/hotspot/cpu/ppc/nativeInst_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/nativeInst_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_NATIVEINST_PPC_HPP
-#define CPU_PPC_VM_NATIVEINST_PPC_HPP
+#ifndef CPU_PPC_NATIVEINST_PPC_HPP
+#define CPU_PPC_NATIVEINST_PPC_HPP
 
 #include "asm/macroAssembler.hpp"
 #include "runtime/icache.hpp"
@@ -503,4 +503,4 @@
   }
 };
 
-#endif // CPU_PPC_VM_NATIVEINST_PPC_HPP
+#endif // CPU_PPC_NATIVEINST_PPC_HPP
--- a/src/hotspot/cpu/ppc/registerMap_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/registerMap_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_REGISTERMAP_PPC_HPP
-#define CPU_PPC_VM_REGISTERMAP_PPC_HPP
+#ifndef CPU_PPC_REGISTERMAP_PPC_HPP
+#define CPU_PPC_REGISTERMAP_PPC_HPP
 
 // machine-dependent implemention for register maps
   friend class frame;
@@ -42,4 +42,4 @@
   void pd_initialize() {}
   void pd_initialize_from(const RegisterMap* map) {}
 
-#endif // CPU_PPC_VM_REGISTERMAP_PPC_HPP
+#endif // CPU_PPC_REGISTERMAP_PPC_HPP
--- a/src/hotspot/cpu/ppc/register_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/register_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_REGISTER_PPC_HPP
-#define CPU_PPC_VM_REGISTER_PPC_HPP
+#ifndef CPU_PPC_REGISTER_PPC_HPP
+#define CPU_PPC_REGISTER_PPC_HPP
 
 #include "asm/register.hpp"
 
@@ -818,4 +818,4 @@
 #define R12_scratch2   AS_REGISTER(Register, R12)
 #endif
 
-#endif // CPU_PPC_VM_REGISTER_PPC_HPP
+#endif // CPU_PPC_REGISTER_PPC_HPP
--- a/src/hotspot/cpu/ppc/relocInfo_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/relocInfo_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_RELOCINFO_PPC_HPP
-#define CPU_PPC_VM_RELOCINFO_PPC_HPP
+#ifndef CPU_PPC_RELOCINFO_PPC_HPP
+#define CPU_PPC_RELOCINFO_PPC_HPP
 
   // machine-dependent parts of class relocInfo
  private:
@@ -49,4 +49,4 @@
   // listed in the oop section.
   static bool mustIterateImmediateOopsInCode() { return false; }
 
-#endif // CPU_PPC_VM_RELOCINFO_PPC_HPP
+#endif // CPU_PPC_RELOCINFO_PPC_HPP
--- a/src/hotspot/cpu/ppc/stubRoutines_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/stubRoutines_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2018, SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_STUBROUTINES_PPC_HPP
-#define CPU_PPC_VM_STUBROUTINES_PPC_HPP
+#ifndef CPU_PPC_STUBROUTINES_PPC_HPP
+#define CPU_PPC_STUBROUTINES_PPC_HPP
 
 // This file holds the platform specific parts of the StubRoutines
 // definition. See stubRoutines.hpp for a description on how to
@@ -72,4 +72,4 @@
   static juint* generate_crc_barret_constants(juint reverse_poly);
 };
 
-#endif // CPU_PPC_VM_STUBROUTINES_PPC_HPP
+#endif // CPU_PPC_STUBROUTINES_PPC_HPP
--- a/src/hotspot/cpu/ppc/templateTable_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/templateTable_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2013, 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_TEMPLATETABLE_PPC_HPP
-#define CPU_PPC_VM_TEMPLATETABLE_PPC_HPP
+#ifndef CPU_PPC_TEMPLATETABLE_PPC_HPP
+#define CPU_PPC_TEMPLATETABLE_PPC_HPP
 
   static void prepare_invoke(int byte_no, Register Rmethod, Register Rret_addr, Register Rindex, Register Rrecv, Register Rflags, Register Rscratch);
   static void invokevfinal_helper(Register Rmethod, Register Rflags, Register Rscratch1, Register Rscratch2);
@@ -35,4 +35,4 @@
   static void branch_conditional(ConditionRegister crx, TemplateTable::Condition cc, Label& L, bool invert = false);
   static void if_cmp_common(Register Rfirst, Register Rsecond, Register Rscratch1, Register Rscratch2, Condition cc, bool is_jint, bool cmp0);
 
-#endif // CPU_PPC_VM_TEMPLATETABLE_PPC_HPP
+#endif // CPU_PPC_TEMPLATETABLE_PPC_HPP
--- a/src/hotspot/cpu/ppc/vmStructs_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/vmStructs_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_VMSTRUCTS_PPC_HPP
-#define CPU_PPC_VM_VMSTRUCTS_PPC_HPP
+#ifndef CPU_PPC_VMSTRUCTS_PPC_HPP
+#define CPU_PPC_VMSTRUCTS_PPC_HPP
 
 // These are the CPU-specific fields, types and integer
 // constants required by the Serviceability Agent. This file is
@@ -38,4 +38,4 @@
 
 #define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
 
-#endif // CPU_PPC_VM_VMSTRUCTS_PPC_HPP
+#endif // CPU_PPC_VMSTRUCTS_PPC_HPP
--- a/src/hotspot/cpu/ppc/vm_version_ext_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/vm_version_ext_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_VM_VERSION_EXT_PPC_HPP
-#define CPU_PPC_VM_VM_VERSION_EXT_PPC_HPP
+#ifndef CPU_PPC_VM_VERSION_EXT_PPC_HPP
+#define CPU_PPC_VM_VERSION_EXT_PPC_HPP
 
 #include "utilities/macros.hpp"
 #include "vm_version_ppc.hpp"
@@ -59,4 +59,4 @@
   static const char* cpu_description(void);
 };
 
-#endif // CPU_PPC_VM_VM_VERSION_EXT_PPC_HPP
+#endif // CPU_PPC_VM_VERSION_EXT_PPC_HPP
--- a/src/hotspot/cpu/ppc/vm_version_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/vm_version_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_VM_VERSION_PPC_HPP
-#define CPU_PPC_VM_VM_VERSION_PPC_HPP
+#ifndef CPU_PPC_VM_VERSION_PPC_HPP
+#define CPU_PPC_VM_VERSION_PPC_HPP
 
 #include "runtime/globals_extension.hpp"
 #include "runtime/vm_version.hpp"
@@ -123,4 +123,4 @@
   static uint64_t _dscr_val;
 };
 
-#endif // CPU_PPC_VM_VM_VERSION_PPC_HPP
+#endif // CPU_PPC_VM_VERSION_PPC_HPP
--- a/src/hotspot/cpu/ppc/vmreg_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/vmreg_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_VMREG_PPC_HPP
-#define CPU_PPC_VM_VMREG_PPC_HPP
+#ifndef CPU_PPC_VMREG_PPC_HPP
+#define CPU_PPC_VMREG_PPC_HPP
 
 inline bool is_Register() {
   return (unsigned int)value() < (unsigned int)ConcreteRegisterImpl::max_gpr;
@@ -50,4 +50,4 @@
   return is_even(value());
 }
 
-#endif // CPU_PPC_VM_VMREG_PPC_HPP
+#endif // CPU_PPC_VMREG_PPC_HPP
--- a/src/hotspot/cpu/ppc/vmreg_ppc.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/ppc/vmreg_ppc.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_PPC_VM_VMREG_PPC_INLINE_HPP
-#define CPU_PPC_VM_VMREG_PPC_INLINE_HPP
+#ifndef CPU_PPC_VMREG_PPC_INLINE_HPP
+#define CPU_PPC_VMREG_PPC_INLINE_HPP
 
 inline VMReg RegisterImpl::as_VMReg() {
   if (this == noreg) return VMRegImpl::Bad();
@@ -50,4 +50,4 @@
 }
 
 
-#endif // CPU_PPC_VM_VMREG_PPC_INLINE_HPP
+#endif // CPU_PPC_VMREG_PPC_INLINE_HPP
--- a/src/hotspot/cpu/s390/assembler_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/assembler_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2017 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_ASSEMBLER_S390_HPP
-#define CPU_S390_VM_ASSEMBLER_S390_HPP
+#ifndef CPU_S390_ASSEMBLER_S390_HPP
+#define CPU_S390_ASSEMBLER_S390_HPP
 
 #undef  LUCY_DBG
 
@@ -3284,4 +3284,4 @@
 
 };
 
-#endif // CPU_S390_VM_ASSEMBLER_S390_HPP
+#endif // CPU_S390_ASSEMBLER_S390_HPP
--- a/src/hotspot/cpu/s390/assembler_s390.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/assembler_s390.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2017 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_ASSEMBLER_S390_INLINE_HPP
-#define CPU_S390_VM_ASSEMBLER_S390_INLINE_HPP
+#ifndef CPU_S390_ASSEMBLER_S390_INLINE_HPP
+#define CPU_S390_ASSEMBLER_S390_INLINE_HPP
 
 #include "asm/assembler.inline.hpp"
 #include "asm/codeBuffer.hpp"
@@ -1460,4 +1460,4 @@
   return (is_equal(pc, CGIT_ZOPC, RIE_MASK) || is_equal(pc, CIT_ZOPC, RIE_MASK));
 }
 
-#endif // CPU_S390_VM_ASSEMBLER_S390_INLINE_HPP
+#endif // CPU_S390_ASSEMBLER_S390_INLINE_HPP
--- a/src/hotspot/cpu/s390/bytes_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/bytes_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_BYTES_S390_HPP
-#define CPU_S390_VM_BYTES_S390_HPP
+#ifndef CPU_S390_BYTES_S390_HPP
+#define CPU_S390_BYTES_S390_HPP
 
 #include "memory/allocation.hpp"
 
@@ -63,4 +63,4 @@
   static inline void put_Java_u8(address p, u8 x) { put_native_u8(p, x); }
 };
 
-#endif // CPU_S390_VM_BYTES_S390_HPP
+#endif // CPU_S390_BYTES_S390_HPP
--- a/src/hotspot/cpu/s390/c1_Defs_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/c1_Defs_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_C1_DEFS_S390_HPP
-#define CPU_S390_VM_C1_DEFS_S390_HPP
+#ifndef CPU_S390_C1_DEFS_S390_HPP
+#define CPU_S390_C1_DEFS_S390_HPP
 
 // Native word offsets from memory address (big endian).
 enum {
@@ -68,4 +68,4 @@
   pd_float_saved_as_double = false
 };
 
-#endif // CPU_S390_VM_C1_DEFS_S390_HPP
+#endif // CPU_S390_C1_DEFS_S390_HPP
--- a/src/hotspot/cpu/s390/c1_FpuStackSim_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/c1_FpuStackSim_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,10 +23,10 @@
  *
  */
 
-#ifndef CPU_S390_VM_C1_FPUSTACKSIM_S390_HPP
-#define CPU_S390_VM_C1_FPUSTACKSIM_S390_HPP
+#ifndef CPU_S390_C1_FPUSTACKSIM_S390_HPP
+#define CPU_S390_C1_FPUSTACKSIM_S390_HPP
 
 // No FPU stack on ZARCH_64
 class FpuStackSim;
 
-#endif // CPU_S390_VM_C1_FPUSTACKSIM_S390_HPP
+#endif // CPU_S390_C1_FPUSTACKSIM_S390_HPP
--- a/src/hotspot/cpu/s390/c1_FrameMap_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/c1_FrameMap_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_C1_FRAMEMAP_S390_HPP
-#define CPU_S390_VM_C1_FRAMEMAP_S390_HPP
+#ifndef CPU_S390_C1_FRAMEMAP_S390_HPP
+#define CPU_S390_C1_FRAMEMAP_S390_HPP
 
  public:
 
@@ -138,4 +138,4 @@
   static int nof_caller_save_cpu_regs() { return pd_nof_caller_save_cpu_regs_frame_map; }
   static int last_cpu_reg()             { return pd_last_cpu_reg; }
 
-#endif // CPU_S390_VM_C1_FRAMEMAP_S390_HPP
+#endif // CPU_S390_C1_FRAMEMAP_S390_HPP
--- a/src/hotspot/cpu/s390/c1_LIRAssembler_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/c1_LIRAssembler_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_C1_LIRASSEMBLER_S390_HPP
-#define CPU_S390_VM_C1_LIRASSEMBLER_S390_HPP
+#ifndef CPU_S390_C1_LIRASSEMBLER_S390_HPP
+#define CPU_S390_C1_LIRASSEMBLER_S390_HPP
 
  private:
 
@@ -52,4 +52,4 @@
     _deopt_handler_size = DEBUG_ONLY(1*K) NOT_DEBUG(64)
   };
 
-#endif // CPU_S390_VM_C1_LIRASSEMBLER_S390_HPP
+#endif // CPU_S390_C1_LIRASSEMBLER_S390_HPP
--- a/src/hotspot/cpu/s390/c1_LinearScan_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/c1_LinearScan_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_C1_LINEARSCAN_S390_HPP
-#define CPU_S390_VM_C1_LINEARSCAN_S390_HPP
+#ifndef CPU_S390_C1_LINEARSCAN_S390_HPP
+#define CPU_S390_C1_LINEARSCAN_S390_HPP
 
 inline bool LinearScan::is_processed_reg_num(int reg_num) {
   // unallocated: Z_thread, Z_fp, Z_SP, Z_R0_scratch, Z_R1_scratch, Z_R14
@@ -61,4 +61,4 @@
   return false; // No special case behaviours.
 }
 
-#endif // CPU_S390_VM_C1_LINEARSCAN_S390_HPP
+#endif // CPU_S390_C1_LINEARSCAN_S390_HPP
--- a/src/hotspot/cpu/s390/c1_MacroAssembler_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/c1_MacroAssembler_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_C1_MACROASSEMBLER_S390_HPP
-#define CPU_S390_VM_C1_MACROASSEMBLER_S390_HPP
+#ifndef CPU_S390_C1_MACROASSEMBLER_S390_HPP
+#define CPU_S390_C1_MACROASSEMBLER_S390_HPP
 
   void pd_init() { /* nothing to do */ }
 
@@ -98,4 +98,4 @@
   // This platform only uses signal-based null checks. The Label is not needed.
   void null_check(Register r, Label *Lnull = NULL) { MacroAssembler::null_check(r); }
 
-#endif // CPU_S390_VM_C1_MACROASSEMBLER_S390_HPP
+#endif // CPU_S390_C1_MACROASSEMBLER_S390_HPP
--- a/src/hotspot/cpu/s390/c1_globals_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/c1_globals_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_C1_GLOBALS_S390_HPP
-#define CPU_S390_VM_C1_GLOBALS_S390_HPP
+#ifndef CPU_S390_C1_GLOBALS_S390_HPP
+#define CPU_S390_C1_GLOBALS_S390_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -70,4 +70,4 @@
 define_pd_global(bool,     CSEArrayLength,               true);
 define_pd_global(bool,     TwoOperandLIRForm,            true);
 
-#endif // CPU_S390_VM_C1_GLOBALS_S390_HPP
+#endif // CPU_S390_C1_GLOBALS_S390_HPP
--- a/src/hotspot/cpu/s390/c2_globals_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/c2_globals_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_C2_GLOBALS_S390_HPP
-#define CPU_S390_VM_C2_GLOBALS_S390_HPP
+#ifndef CPU_S390_C2_GLOBALS_S390_HPP
+#define CPU_S390_C2_GLOBALS_S390_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -91,4 +91,4 @@
 // Ergonomics related flags
 define_pd_global(bool, NeverActAsServerClassMachine, false);
 
-#endif // CPU_S390_VM_C2_GLOBALS_S390_HPP
+#endif // CPU_S390_C2_GLOBALS_S390_HPP
--- a/src/hotspot/cpu/s390/codeBuffer_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/codeBuffer_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_CODEBUFFER_S390_HPP
-#define CPU_S390_VM_CODEBUFFER_S390_HPP
+#ifndef CPU_S390_CODEBUFFER_S390_HPP
+#define CPU_S390_CODEBUFFER_S390_HPP
 
  private:
   void pd_initialize() {}
@@ -35,5 +35,4 @@
   void getCpuData(const CodeBuffer * const cb) {}
 
 #endif // CPU_S390_VM_CODEBUFFER_S390_HPP
-
-
+#endif // CPU_S390_CODEBUFFER_S390_HPP
--- a/src/hotspot/cpu/s390/copy_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/copy_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -25,8 +25,8 @@
 
 // Major contributions by LS
 
-#ifndef CPU_S390_VM_COPY_S390_HPP
-#define CPU_S390_VM_COPY_S390_HPP
+#ifndef CPU_S390_COPY_S390_HPP
+#define CPU_S390_COPY_S390_HPP
 
 // Inline functions for memory copy and fill.
 
@@ -1131,4 +1131,4 @@
 #endif
 }
 
-#endif // CPU_S390_VM_COPY_S390_HPP
+#endif // CPU_S390_COPY_S390_HPP
--- a/src/hotspot/cpu/s390/depChecker_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/depChecker_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,9 +23,9 @@
  *
  */
 
-#ifndef CPU_S390_VM_DEPCHECKER_S390_HPP
-#define CPU_S390_VM_DEPCHECKER_S390_HPP
+#ifndef CPU_S390_DEPCHECKER_S390_HPP
+#define CPU_S390_DEPCHECKER_S390_HPP
 
 // Nothing to do on z/Architecture
 
-#endif // CPU_S390_VM_DEPCHECKER_S390_HPP
+#endif // CPU_S390_DEPCHECKER_S390_HPP
--- a/src/hotspot/cpu/s390/disassembler_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/disassembler_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_DISASSEMBLER_S390_HPP
-#define CPU_S390_VM_DISASSEMBLER_S390_HPP
+#ifndef CPU_S390_DISASSEMBLER_S390_HPP
+#define CPU_S390_DISASSEMBLER_S390_HPP
 
   static int pd_instruction_alignment() {
     return 1;
@@ -34,4 +34,4 @@
     return "zarch";
   }
 
-#endif // CPU_S390_VM_DISASSEMBLER_S390_HPP
+#endif // CPU_S390_DISASSEMBLER_S390_HPP
--- a/src/hotspot/cpu/s390/frame_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/frame_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -25,8 +25,8 @@
 
 // Major contributions by ML, AHa.
 
-#ifndef CPU_S390_VM_FRAME_S390_HPP
-#define CPU_S390_VM_FRAME_S390_HPP
+#ifndef CPU_S390_FRAME_S390_HPP
+#define CPU_S390_FRAME_S390_HPP
 
 #include "runtime/synchronizer.hpp"
 
@@ -554,4 +554,4 @@
 
   static jint interpreter_frame_expression_stack_direction() { return -1; }
 
-#endif // CPU_S390_VM_FRAME_S390_HPP
+#endif // CPU_S390_FRAME_S390_HPP
--- a/src/hotspot/cpu/s390/frame_s390.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/frame_s390.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_FRAME_S390_INLINE_HPP
-#define CPU_S390_VM_FRAME_S390_INLINE_HPP
+#ifndef CPU_S390_FRAME_S390_INLINE_HPP
+#define CPU_S390_FRAME_S390_INLINE_HPP
 
 #include "code/codeCache.hpp"
 #include "code/vmreg.inline.hpp"
@@ -296,4 +296,4 @@
   return fp();
 }
 
-#endif // CPU_S390_VM_FRAME_S390_INLINE_HPP
+#endif // CPU_S390_FRAME_S390_INLINE_HPP
--- a/src/hotspot/cpu/s390/globalDefinitions_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/globalDefinitions_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_GLOBALDEFINITIONS_S390_HPP
-#define CPU_S390_VM_GLOBALDEFINITIONS_S390_HPP
+#ifndef CPU_S390_GLOBALDEFINITIONS_S390_HPP
+#define CPU_S390_GLOBALDEFINITIONS_S390_HPP
 
 #ifdef CC_INTERP
 #error "CC_INTERP is not supported on z/Architecture."
@@ -56,4 +56,4 @@
 
 #define THREAD_LOCAL_POLL
 
-#endif // CPU_S390_VM_GLOBALDEFINITIONS_S390_HPP
+#endif // CPU_S390_GLOBALDEFINITIONS_S390_HPP
--- a/src/hotspot/cpu/s390/globals_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/globals_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_GLOBALS_S390_HPP
-#define CPU_S390_VM_GLOBALS_S390_HPP
+#ifndef CPU_S390_GLOBALS_S390_HPP
+#define CPU_S390_GLOBALS_S390_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -128,4 +128,4 @@
   product(bool, TraceTraps, false, "Trace all traps the signal handler"       \
           "handles.")
 
-#endif // CPU_S390_VM_GLOBALS_S390_HPP
+#endif // CPU_S390_GLOBALS_S390_HPP
--- a/src/hotspot/cpu/s390/icache_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/icache_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_ICACHE_S390_HPP
-#define CPU_S390_VM_ICACHE_S390_HPP
+#ifndef CPU_S390_ICACHE_S390_HPP
+#define CPU_S390_ICACHE_S390_HPP
 
 // Interface for updating the instruction cache.  Whenever the VM modifies
 // code, part of the processor instruction cache potentially has to be flushed.
@@ -41,4 +41,4 @@
   // Use default implementation.
 };
 
-#endif // CPU_S390_VM_ICACHE_S390_HPP
+#endif // CPU_S390_ICACHE_S390_HPP
--- a/src/hotspot/cpu/s390/interp_masm_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/interp_masm_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2017 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_INTERP_MASM_ZARCH_64_64_HPP
-#define CPU_S390_VM_INTERP_MASM_ZARCH_64_64_HPP
+#ifndef CPU_S390_INTERP_MASM_S390_HPP
+#define CPU_S390_INTERP_MASM_S390_HPP
 
 #include "asm/macroAssembler.hpp"
 #include "interpreter/invocationCounter.hpp"
@@ -330,4 +330,4 @@
   void pop_interpreter_frame(Register return_pc, Register tmp1, Register tmp2);
 };
 
-#endif // CPU_S390_VM_INTERP_MASM_ZARCH_64_64_HPP
+#endif // CPU_S390_INTERP_MASM_S390_HPP
--- a/src/hotspot/cpu/s390/interpreterRT_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/interpreterRT_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_INTERPRETERRT_S390_HPP
-#define CPU_S390_VM_INTERPRETERRT_S390_HPP
+#ifndef CPU_S390_INTERPRETERRT_S390_HPP
+#define CPU_S390_INTERPRETERRT_S390_HPP
 
 // This is included in the middle of class Interpreter.
 // Do not include files here.
@@ -62,4 +62,4 @@
 
 static address get_signature(JavaThread* thread, Method* method);
 
-#endif // CPU_S390_VM_INTERPRETERRT_S390_HPP
+#endif // CPU_S390_INTERPRETERRT_S390_HPP
--- a/src/hotspot/cpu/s390/javaFrameAnchor_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/javaFrameAnchor_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_JAVAFRAMEANCHOR_S390_HPP
-#define CPU_S390_VM_JAVAFRAMEANCHOR_S390_HPP
+#ifndef CPU_S390_JAVAFRAMEANCHOR_S390_HPP
+#define CPU_S390_JAVAFRAMEANCHOR_S390_HPP
 
  public:
 
@@ -84,4 +84,4 @@
 
   address last_Java_pc(void)          { return _last_Java_pc; }
 
-#endif // CPU_S390_VM_JAVAFRAMEANCHOR_S390_HPP
+#endif // CPU_S390_JAVAFRAMEANCHOR_S390_HPP
--- a/src/hotspot/cpu/s390/jniTypes_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/jniTypes_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_JNITYPES_S390_HPP
-#define CPU_S390_VM_JNITYPES_S390_HPP
+#ifndef CPU_S390_JNITYPES_S390_HPP
+#define CPU_S390_JNITYPES_S390_HPP
 
 // This file holds platform-dependent routines used to write primitive
 // jni types to the array of arguments passed into JavaCalls::call.
@@ -138,4 +138,4 @@
   }
 };
 
-#endif // CPU_S390_VM_JNITYPES_S390_HPP
+#endif // CPU_S390_JNITYPES_S390_HPP
--- a/src/hotspot/cpu/s390/macroAssembler_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/macroAssembler_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2018, SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_MACROASSEMBLER_S390_HPP
-#define CPU_S390_VM_MACROASSEMBLER_S390_HPP
+#ifndef CPU_S390_MACROASSEMBLER_S390_HPP
+#define CPU_S390_MACROASSEMBLER_S390_HPP
 
 #include "asm/assembler.hpp"
 #include "oops/accessDecorators.hpp"
@@ -1107,4 +1107,4 @@
 inline bool AbstractAssembler::pd_check_instruction_mark() { return false; }
 #endif
 
-#endif // CPU_S390_VM_MACROASSEMBLER_S390_HPP
+#endif // CPU_S390_MACROASSEMBLER_S390_HPP
--- a/src/hotspot/cpu/s390/macroAssembler_s390.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/macroAssembler_s390.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_MACROASSEMBLER_S390_INLINE_HPP
-#define CPU_S390_VM_MACROASSEMBLER_S390_INLINE_HPP
+#ifndef CPU_S390_MACROASSEMBLER_S390_INLINE_HPP
+#define CPU_S390_MACROASSEMBLER_S390_INLINE_HPP
 
 #include "asm/assembler.inline.hpp"
 #include "asm/macroAssembler.hpp"
@@ -311,4 +311,4 @@
   set_top_ijava_frame_at_SP_as_last_Java_frame(sp, tmp1, true);
 }
 
-#endif // CPU_S390_VM_MACROASSEMBLER_S390_INLINE_HPP
+#endif // CPU_S390_MACROASSEMBLER_S390_INLINE_HPP
--- a/src/hotspot/cpu/s390/nativeInst_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/nativeInst_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -25,8 +25,8 @@
 
 // Major contributions by AHa, JL, LS
 
-#ifndef CPU_S390_VM_NATIVEINST_S390_HPP
-#define CPU_S390_VM_NATIVEINST_S390_HPP
+#ifndef CPU_S390_NATIVEINST_S390_HPP
+#define CPU_S390_NATIVEINST_S390_HPP
 
 #include "asm/macroAssembler.hpp"
 #include "runtime/icache.hpp"
@@ -663,4 +663,4 @@
   void verify() PRODUCT_RETURN;
 };
 
-#endif // CPU_S390_VM_NATIVEINST_S390_HPP
+#endif // CPU_S390_NATIVEINST_S390_HPP
--- a/src/hotspot/cpu/s390/registerMap_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/registerMap_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_REGISTERMAP_S390_HPP
-#define CPU_S390_VM_REGISTERMAP_S390_HPP
+#ifndef CPU_S390_REGISTERMAP_S390_HPP
+#define CPU_S390_REGISTERMAP_S390_HPP
 
 // Machine-dependent implementation for register maps.
 
@@ -41,4 +41,4 @@
   void pd_initialize() {}
   void pd_initialize_from(const RegisterMap* map) {}
 
-#endif // CPU_S390_VM_REGISTERMAP_S390_HPP
+#endif // CPU_S390_REGISTERMAP_S390_HPP
--- a/src/hotspot/cpu/s390/registerSaver_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/registerSaver_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_REGISTERSAVER_S390_HPP
-#define CPU_S390_VM_REGISTERSAVER_S390_HPP
+#ifndef CPU_S390_REGISTERSAVER_S390_HPP
+#define CPU_S390_REGISTERSAVER_S390_HPP
 
 class RegisterSaver {
   // Used for saving volatile registers.
@@ -79,4 +79,4 @@
 
 };
 
-#endif // CPU_S390_VM_REGISTERSAVER_S390_HPP
+#endif // CPU_S390_REGISTERSAVER_S390_HPP
--- a/src/hotspot/cpu/s390/register_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/register_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2017 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_REGISTER_S390_HPP
-#define CPU_S390_VM_REGISTER_S390_HPP
+#ifndef CPU_S390_REGISTER_S390_HPP
+#define CPU_S390_REGISTER_S390_HPP
 
 #include "asm/register.hpp"
 #include "vm_version_s390.hpp"
@@ -579,4 +579,4 @@
 #endif
 
 
-#endif // CPU_S390_VM_REGISTER_S390_HPP
+#endif // CPU_S390_REGISTER_S390_HPP
--- a/src/hotspot/cpu/s390/relocInfo_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/relocInfo_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_RELOCINFO_S390_HPP
-#define CPU_S390_VM_RELOCINFO_S390_HPP
+#ifndef CPU_S390_RELOCINFO_S390_HPP
+#define CPU_S390_RELOCINFO_S390_HPP
 
 //----------------------------
 //  relocInfo layout
@@ -118,4 +118,4 @@
   // Return indication if update happened.
   static bool update_oop_pool(address begin, address end, address newTarget, CodeBlob* cb);
 
-#endif // CPU_S390_VM_RELOCINFO_S390_HPP
+#endif // CPU_S390_RELOCINFO_S390_HPP
--- a/src/hotspot/cpu/s390/stubRoutines_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/stubRoutines_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2017, SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_STUBROUTINES_ZARCH_64_64_HPP
-#define CPU_S390_VM_STUBROUTINES_ZARCH_64_64_HPP
+#ifndef CPU_S390_STUBROUTINES_S390_HPP
+#define CPU_S390_STUBROUTINES_S390_HPP
 
 // This file holds the platform specific parts of the StubRoutines
 // definition. See stubRoutines.hpp for a description on how to extend it.
@@ -100,4 +100,4 @@
   static void generate_load_trot_table_addr(MacroAssembler* masm, Register table);
 };
 
-#endif // CPU_S390_VM_STUBROUTINES_ZARCH_64_64_HPP
+#endif // CPU_S390_STUBROUTINES_S390_HPP
--- a/src/hotspot/cpu/s390/templateTable_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/templateTable_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_TEMPLATETABLE_S390_HPP
-#define CPU_S390_VM_TEMPLATETABLE_S390_HPP
+#ifndef CPU_S390_TEMPLATETABLE_S390_HPP
+#define CPU_S390_TEMPLATETABLE_S390_HPP
 
   static void prepare_invoke(int byte_no,
                              Register method,         // linked method (or i-klass)
@@ -38,4 +38,4 @@
   static void index_check(Register array, Register index, unsigned int shift);
   static void index_check_without_pop(Register array, Register index);
 
-#endif // CPU_S390_VM_TEMPLATETABLE_S390_HPP
+#endif // CPU_S390_TEMPLATETABLE_S390_HPP
--- a/src/hotspot/cpu/s390/vmStructs_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/vmStructs_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_VMSTRUCTS_S390_HPP
-#define CPU_S390_VM_VMSTRUCTS_S390_HPP
+#ifndef CPU_S390_VMSTRUCTS_S390_HPP
+#define CPU_S390_VMSTRUCTS_S390_HPP
 
 // These are the CPU-specific fields, types and integer
 // constants required by the Serviceability Agent. This file is
@@ -38,4 +38,4 @@
 
 #define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
 
-#endif // CPU_S390_VM_VMSTRUCTS_S390_HPP
+#endif // CPU_S390_VMSTRUCTS_S390_HPP
--- a/src/hotspot/cpu/s390/vm_version_ext_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/vm_version_ext_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_VM_VERSION_EXT_S390_HPP
-#define CPU_S390_VM_VM_VERSION_EXT_S390_HPP
+#ifndef CPU_S390_VM_VERSION_EXT_S390_HPP
+#define CPU_S390_VM_VERSION_EXT_S390_HPP
 
 #include "utilities/macros.hpp"
 #include "vm_version_s390.hpp"
@@ -59,4 +59,4 @@
   static const char* cpu_description(void);
 };
 
-#endif // CPU_S390_VM_VM_VERSION_EXT_S390_HPP
+#endif // CPU_S390_VM_VERSION_EXT_S390_HPP
--- a/src/hotspot/cpu/s390/vm_version_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/vm_version_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_VM_VERSION_S390_HPP
-#define CPU_S390_VM_VM_VERSION_S390_HPP
+#ifndef CPU_S390_VM_VERSION_S390_HPP
+#define CPU_S390_VM_VERSION_S390_HPP
 
 
 #include "runtime/globals_extension.hpp"
@@ -487,4 +487,4 @@
   static unsigned long z_SIGSEGV();
 };
 
-#endif // CPU_S390_VM_VM_VERSION_S390_HPP
+#endif // CPU_S390_VM_VERSION_S390_HPP
--- a/src/hotspot/cpu/s390/vmreg_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/vmreg_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_VMREG_S390_HPP
-#define CPU_S390_VM_VMREG_S390_HPP
+#ifndef CPU_S390_VMREG_S390_HPP
+#define CPU_S390_VMREG_S390_HPP
 
 inline bool is_Register() {
   return (unsigned int)value() < (unsigned int)ConcreteRegisterImpl::max_gpr;
@@ -50,4 +50,4 @@
   return is_even(value());
 }
 
-#endif // CPU_S390_VM_VMREG_S390_HPP
+#endif // CPU_S390_VMREG_S390_HPP
--- a/src/hotspot/cpu/s390/vmreg_s390.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/s390/vmreg_s390.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_S390_VM_VMREG_S390_INLINE_HPP
-#define CPU_S390_VM_VMREG_S390_INLINE_HPP
+#ifndef CPU_S390_VMREG_S390_INLINE_HPP
+#define CPU_S390_VMREG_S390_INLINE_HPP
 
 inline VMReg RegisterImpl::as_VMReg() {
   if (this == noreg) {
@@ -41,4 +41,4 @@
   return VMRegImpl::as_VMReg((encoding() << 1) + ConcreteRegisterImpl::max_fpr);
 }
 
-#endif // CPU_S390_VM_VMREG_S390_INLINE_HPP
+#endif // CPU_S390_VMREG_S390_INLINE_HPP
--- a/src/hotspot/cpu/sparc/assembler_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/assembler_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_ASSEMBLER_SPARC_HPP
-#define CPU_SPARC_VM_ASSEMBLER_SPARC_HPP
+#ifndef CPU_SPARC_ASSEMBLER_SPARC_HPP
+#define CPU_SPARC_ASSEMBLER_SPARC_HPP
 
 #include "asm/register.hpp"
 
@@ -1328,4 +1328,4 @@
   }
 };
 
-#endif // CPU_SPARC_VM_ASSEMBLER_SPARC_HPP
+#endif // CPU_SPARC_ASSEMBLER_SPARC_HPP
--- a/src/hotspot/cpu/sparc/assembler_sparc.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/assembler_sparc.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_ASSEMBLER_SPARC_INLINE_HPP
-#define CPU_SPARC_VM_ASSEMBLER_SPARC_INLINE_HPP
+#ifndef CPU_SPARC_ASSEMBLER_SPARC_INLINE_HPP
+#define CPU_SPARC_ASSEMBLER_SPARC_INLINE_HPP
 
 #include "asm/assembler.hpp"
 
@@ -1127,4 +1127,4 @@
   emit_int32(op(arith_op) | rd(0) | op3(mpmul_op3) | rs1(0) | opf(mpmul_opf) | uimm(uimm5, 5));
 }
 
-#endif // CPU_SPARC_VM_ASSEMBLER_SPARC_INLINE_HPP
+#endif // CPU_SPARC_ASSEMBLER_SPARC_INLINE_HPP
--- a/src/hotspot/cpu/sparc/bytes_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/bytes_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_BYTES_SPARC_HPP
-#define CPU_SPARC_VM_BYTES_SPARC_HPP
+#ifndef CPU_SPARC_BYTES_SPARC_HPP
+#define CPU_SPARC_BYTES_SPARC_HPP
 
 #include "memory/allocation.hpp"
 
@@ -157,4 +157,4 @@
 // 1.17 99/06/22 16:37:35 bytes_i486.hpp
 //End
 
-#endif // CPU_SPARC_VM_BYTES_SPARC_HPP
+#endif // CPU_SPARC_BYTES_SPARC_HPP
--- a/src/hotspot/cpu/sparc/c1_Defs_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/c1_Defs_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_C1_DEFS_SPARC_HPP
-#define CPU_SPARC_VM_C1_DEFS_SPARC_HPP
+#ifndef CPU_SPARC_C1_DEFS_SPARC_HPP
+#define CPU_SPARC_C1_DEFS_SPARC_HPP
 
 // native word offsets from memory address (big endian)
 enum {
@@ -69,4 +69,4 @@
   pd_float_saved_as_double = false
 };
 
-#endif // CPU_SPARC_VM_C1_DEFS_SPARC_HPP
+#endif // CPU_SPARC_C1_DEFS_SPARC_HPP
--- a/src/hotspot/cpu/sparc/c1_FpuStackSim_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/c1_FpuStackSim_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,10 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_C1_FPUSTACKSIM_SPARC_HPP
-#define CPU_SPARC_VM_C1_FPUSTACKSIM_SPARC_HPP
+#ifndef CPU_SPARC_C1_FPUSTACKSIM_SPARC_HPP
+#define CPU_SPARC_C1_FPUSTACKSIM_SPARC_HPP
 
 // No FPU stack on SPARC
 class FpuStackSim;
 
-#endif // CPU_SPARC_VM_C1_FPUSTACKSIM_SPARC_HPP
+#endif // CPU_SPARC_C1_FPUSTACKSIM_SPARC_HPP
--- a/src/hotspot/cpu/sparc/c1_FrameMap_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/c1_FrameMap_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_C1_FRAMEMAP_SPARC_HPP
-#define CPU_SPARC_VM_C1_FRAMEMAP_SPARC_HPP
+#ifndef CPU_SPARC_C1_FRAMEMAP_SPARC_HPP
+#define CPU_SPARC_C1_FRAMEMAP_SPARC_HPP
 
  public:
 
@@ -182,4 +182,4 @@
   static int nof_caller_save_cpu_regs() { return pd_nof_caller_save_cpu_regs_frame_map; }
   static int last_cpu_reg()             { return pd_last_cpu_reg;  }
 
-#endif // CPU_SPARC_VM_C1_FRAMEMAP_SPARC_HPP
+#endif // CPU_SPARC_C1_FRAMEMAP_SPARC_HPP
--- a/src/hotspot/cpu/sparc/c1_LIRAssembler_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/c1_LIRAssembler_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_C1_LIRASSEMBLER_SPARC_HPP
-#define CPU_SPARC_VM_C1_LIRASSEMBLER_SPARC_HPP
+#ifndef CPU_SPARC_C1_LIRASSEMBLER_SPARC_HPP
+#define CPU_SPARC_C1_LIRASSEMBLER_SPARC_HPP
 
  private:
 
@@ -71,4 +71,4 @@
   void   pack64(LIR_Opr src, LIR_Opr dst);
   void unpack64(LIR_Opr src, LIR_Opr dst);
 
-#endif // CPU_SPARC_VM_C1_LIRASSEMBLER_SPARC_HPP
+#endif // CPU_SPARC_C1_LIRASSEMBLER_SPARC_HPP
--- a/src/hotspot/cpu/sparc/c1_LinearScan_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/c1_LinearScan_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_C1_LINEARSCAN_SPARC_HPP
-#define CPU_SPARC_VM_C1_LINEARSCAN_SPARC_HPP
+#ifndef CPU_SPARC_C1_LINEARSCAN_SPARC_HPP
+#define CPU_SPARC_C1_LINEARSCAN_SPARC_HPP
 
 inline bool LinearScan::is_processed_reg_num(int reg_num) {
   return reg_num < 26 || reg_num > 31;
@@ -67,4 +67,4 @@
   return false;
 }
 
-#endif // CPU_SPARC_VM_C1_LINEARSCAN_SPARC_HPP
+#endif // CPU_SPARC_C1_LINEARSCAN_SPARC_HPP
--- a/src/hotspot/cpu/sparc/c1_MacroAssembler_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/c1_MacroAssembler_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_C1_MACROASSEMBLER_SPARC_HPP
-#define CPU_SPARC_VM_C1_MACROASSEMBLER_SPARC_HPP
+#ifndef CPU_SPARC_C1_MACROASSEMBLER_SPARC_HPP
+#define CPU_SPARC_C1_MACROASSEMBLER_SPARC_HPP
 
   void pd_init() { /* nothing to do */ }
 
@@ -95,4 +95,4 @@
   void save_live_registers_no_oop_map(bool save_fpu_registers);
   void restore_live_registers(bool restore_fpu_registers);
 
-#endif // CPU_SPARC_VM_C1_MACROASSEMBLER_SPARC_HPP
+#endif // CPU_SPARC_C1_MACROASSEMBLER_SPARC_HPP
--- a/src/hotspot/cpu/sparc/c1_globals_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/c1_globals_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_C1_GLOBALS_SPARC_HPP
-#define CPU_SPARC_VM_C1_GLOBALS_SPARC_HPP
+#ifndef CPU_SPARC_C1_GLOBALS_SPARC_HPP
+#define CPU_SPARC_C1_GLOBALS_SPARC_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -68,4 +68,4 @@
 define_pd_global(bool, CSEArrayLength,               true );
 define_pd_global(bool, TwoOperandLIRForm,            false);
 
-#endif // CPU_SPARC_VM_C1_GLOBALS_SPARC_HPP
+#endif // CPU_SPARC_C1_GLOBALS_SPARC_HPP
--- a/src/hotspot/cpu/sparc/c2_globals_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/c2_globals_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_C2_GLOBALS_SPARC_HPP
-#define CPU_SPARC_VM_C2_GLOBALS_SPARC_HPP
+#ifndef CPU_SPARC_C2_GLOBALS_SPARC_HPP
+#define CPU_SPARC_C2_GLOBALS_SPARC_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -91,4 +91,4 @@
 // Ergonomics related flags
 define_pd_global(bool, NeverActAsServerClassMachine, false);
 
-#endif // CPU_SPARC_VM_C2_GLOBALS_SPARC_HPP
+#endif // CPU_SPARC_C2_GLOBALS_SPARC_HPP
--- a/src/hotspot/cpu/sparc/codeBuffer_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/codeBuffer_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_CODEBUFFER_SPARC_HPP
-#define CPU_SPARC_VM_CODEBUFFER_SPARC_HPP
+#ifndef CPU_SPARC_CODEBUFFER_SPARC_HPP
+#define CPU_SPARC_CODEBUFFER_SPARC_HPP
 
 private:
   void pd_initialize() {}
@@ -31,4 +31,4 @@
 public:
   void flush_bundle(bool start_new_bundle) {}
 
-#endif // CPU_SPARC_VM_CODEBUFFER_SPARC_HPP
+#endif // CPU_SPARC_CODEBUFFER_SPARC_HPP
--- a/src/hotspot/cpu/sparc/copy_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/copy_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_COPY_SPARC_HPP
-#define CPU_SPARC_VM_COPY_SPARC_HPP
+#ifndef CPU_SPARC_COPY_SPARC_HPP
+#define CPU_SPARC_COPY_SPARC_HPP
 
 // Inline functions for memory copy and fill.
 
@@ -210,4 +210,4 @@
   (void)memset(to, 0, count);
 }
 
-#endif // CPU_SPARC_VM_COPY_SPARC_HPP
+#endif // CPU_SPARC_COPY_SPARC_HPP
--- a/src/hotspot/cpu/sparc/depChecker_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/depChecker_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,9 +22,9 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_DEPCHECKER_SPARC_HPP
-#define CPU_SPARC_VM_DEPCHECKER_SPARC_HPP
+#ifndef CPU_SPARC_DEPCHECKER_SPARC_HPP
+#define CPU_SPARC_DEPCHECKER_SPARC_HPP
 
 // Nothing to do on Sparc
 
-#endif // CPU_SPARC_VM_DEPCHECKER_SPARC_HPP
+#endif // CPU_SPARC_DEPCHECKER_SPARC_HPP
--- a/src/hotspot/cpu/sparc/disassembler_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/disassembler_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_DISASSEMBLER_SPARC_HPP
-#define CPU_SPARC_VM_DISASSEMBLER_SPARC_HPP
+#ifndef CPU_SPARC_DISASSEMBLER_SPARC_HPP
+#define CPU_SPARC_DISASSEMBLER_SPARC_HPP
 
   static int pd_instruction_alignment() {
     return sizeof(int);
@@ -33,4 +33,4 @@
     return "v9only";
   }
 
-#endif // CPU_SPARC_VM_DISASSEMBLER_SPARC_HPP
+#endif // CPU_SPARC_DISASSEMBLER_SPARC_HPP
--- a/src/hotspot/cpu/sparc/frame_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/frame_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_FRAME_SPARC_HPP
-#define CPU_SPARC_VM_FRAME_SPARC_HPP
+#ifndef CPU_SPARC_FRAME_SPARC_HPP
+#define CPU_SPARC_FRAME_SPARC_HPP
 
 #include "runtime/synchronizer.hpp"
 
@@ -242,4 +242,4 @@
 
   static jint interpreter_frame_expression_stack_direction() { return -1; }
 
-#endif // CPU_SPARC_VM_FRAME_SPARC_HPP
+#endif // CPU_SPARC_FRAME_SPARC_HPP
--- a/src/hotspot/cpu/sparc/frame_sparc.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/frame_sparc.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_FRAME_SPARC_INLINE_HPP
-#define CPU_SPARC_VM_FRAME_SPARC_INLINE_HPP
+#ifndef CPU_SPARC_FRAME_SPARC_INLINE_HPP
+#define CPU_SPARC_FRAME_SPARC_INLINE_HPP
 
 #include "asm/macroAssembler.hpp"
 #include "code/vmreg.inline.hpp"
@@ -191,4 +191,4 @@
   *((oop*) map->location(O0->as_VMReg())) = obj;
 }
 
-#endif // CPU_SPARC_VM_FRAME_SPARC_INLINE_HPP
+#endif // CPU_SPARC_FRAME_SPARC_INLINE_HPP
--- a/src/hotspot/cpu/sparc/globalDefinitions_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/globalDefinitions_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_GLOBALDEFINITIONS_SPARC_HPP
-#define CPU_SPARC_VM_GLOBALDEFINITIONS_SPARC_HPP
+#ifndef CPU_SPARC_GLOBALDEFINITIONS_SPARC_HPP
+#define CPU_SPARC_GLOBALDEFINITIONS_SPARC_HPP
 
 // Size of Sparc Instructions
 const int BytesPerInstWord = 4;
@@ -55,4 +55,4 @@
 // SPARC have implemented the local polling
 #define THREAD_LOCAL_POLL
 
-#endif // CPU_SPARC_VM_GLOBALDEFINITIONS_SPARC_HPP
+#endif // CPU_SPARC_GLOBALDEFINITIONS_SPARC_HPP
--- a/src/hotspot/cpu/sparc/globals_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/globals_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_GLOBALS_SPARC_HPP
-#define CPU_SPARC_VM_GLOBALS_SPARC_HPP
+#ifndef CPU_SPARC_GLOBALS_SPARC_HPP
+#define CPU_SPARC_GLOBALS_SPARC_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -134,4 +134,4 @@
           "Distance to prefetch destination array in arraycopy")            \
           constraint(ArraycopyDstPrefetchDistanceConstraintFunc, AfterErgo) \
 
-#endif // CPU_SPARC_VM_GLOBALS_SPARC_HPP
+#endif // CPU_SPARC_GLOBALS_SPARC_HPP
--- a/src/hotspot/cpu/sparc/icache_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/icache_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_ICACHE_SPARC_HPP
-#define CPU_SPARC_VM_ICACHE_SPARC_HPP
+#ifndef CPU_SPARC_ICACHE_SPARC_HPP
+#define CPU_SPARC_ICACHE_SPARC_HPP
 
 // Interface for updating the instruction cache.  Whenever the VM modifies
 // code, part of the processor instruction cache potentially has to be flushed.
@@ -40,4 +40,4 @@
   // Use default implementation
 };
 
-#endif // CPU_SPARC_VM_ICACHE_SPARC_HPP
+#endif // CPU_SPARC_ICACHE_SPARC_HPP
--- a/src/hotspot/cpu/sparc/interp_masm_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/interp_masm_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_INTERP_MASM_SPARC_HPP
-#define CPU_SPARC_VM_INTERP_MASM_SPARC_HPP
+#ifndef CPU_SPARC_INTERP_MASM_SPARC_HPP
+#define CPU_SPARC_INTERP_MASM_SPARC_HPP
 
 #include "asm/macroAssembler.hpp"
 #include "interpreter/invocationCounter.hpp"
@@ -334,4 +334,4 @@
 
 };
 
-#endif // CPU_SPARC_VM_INTERP_MASM_SPARC_HPP
+#endif // CPU_SPARC_INTERP_MASM_SPARC_HPP
--- a/src/hotspot/cpu/sparc/interpreterRT_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/interpreterRT_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_INTERPRETERRT_SPARC_HPP
-#define CPU_SPARC_VM_INTERPRETERRT_SPARC_HPP
+#ifndef CPU_SPARC_INTERPRETERRT_SPARC_HPP
+#define CPU_SPARC_INTERPRETERRT_SPARC_HPP
 
 // This is included in the middle of class Interpreter.
 // Do not include files here.
@@ -60,4 +60,4 @@
   void generate( uint64_t fingerprint );
 };
 
-#endif // CPU_SPARC_VM_INTERPRETERRT_SPARC_HPP
+#endif // CPU_SPARC_INTERPRETERRT_SPARC_HPP
--- a/src/hotspot/cpu/sparc/javaFrameAnchor_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/javaFrameAnchor_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_JAVAFRAMEANCHOR_SPARC_HPP
-#define CPU_SPARC_VM_JAVAFRAMEANCHOR_SPARC_HPP
+#ifndef CPU_SPARC_JAVAFRAMEANCHOR_SPARC_HPP
+#define CPU_SPARC_JAVAFRAMEANCHOR_SPARC_HPP
 
 private:
   volatile int _flags;
@@ -99,4 +99,4 @@
     OrderAccess::fence();
   }
 
-#endif // CPU_SPARC_VM_JAVAFRAMEANCHOR_SPARC_HPP
+#endif // CPU_SPARC_JAVAFRAMEANCHOR_SPARC_HPP
--- a/src/hotspot/cpu/sparc/jniTypes_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/jniTypes_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_JNITYPES_SPARC_HPP
-#define CPU_SPARC_VM_JNITYPES_SPARC_HPP
+#ifndef CPU_SPARC_JNITYPES_SPARC_HPP
+#define CPU_SPARC_JNITYPES_SPARC_HPP
 
 #include "jni.h"
 #include "memory/allocation.hpp"
@@ -88,4 +88,4 @@
 
 };
 
-#endif // CPU_SPARC_VM_JNITYPES_SPARC_HPP
+#endif // CPU_SPARC_JNITYPES_SPARC_HPP
--- a/src/hotspot/cpu/sparc/macroAssembler_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/macroAssembler_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_MACROASSEMBLER_SPARC_HPP
-#define CPU_SPARC_VM_MACROASSEMBLER_SPARC_HPP
+#ifndef CPU_SPARC_MACROASSEMBLER_SPARC_HPP
+#define CPU_SPARC_MACROASSEMBLER_SPARC_HPP
 
 #include "asm/assembler.hpp"
 #include "utilities/macros.hpp"
@@ -1397,4 +1397,4 @@
    ~SkipIfEqual();
 };
 
-#endif // CPU_SPARC_VM_MACROASSEMBLER_SPARC_HPP
+#endif // CPU_SPARC_MACROASSEMBLER_SPARC_HPP
--- a/src/hotspot/cpu/sparc/macroAssembler_sparc.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/macroAssembler_sparc.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_MACROASSEMBLER_SPARC_INLINE_HPP
-#define CPU_SPARC_VM_MACROASSEMBLER_SPARC_INLINE_HPP
+#ifndef CPU_SPARC_MACROASSEMBLER_SPARC_INLINE_HPP
+#define CPU_SPARC_MACROASSEMBLER_SPARC_INLINE_HPP
 
 #include "asm/assembler.inline.hpp"
 #include "asm/macroAssembler.hpp"
@@ -719,4 +719,4 @@
   if (a.has_index()) { assert(offset == 0, ""); swap(a.base(), a.index(), d        ); }
   else               {                          swap(a.base(), a.disp() + offset, d); }
 }
-#endif // CPU_SPARC_VM_MACROASSEMBLER_SPARC_INLINE_HPP
+#endif // CPU_SPARC_MACROASSEMBLER_SPARC_INLINE_HPP
--- a/src/hotspot/cpu/sparc/nativeInst_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/nativeInst_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_NATIVEINST_SPARC_HPP
-#define CPU_SPARC_VM_NATIVEINST_SPARC_HPP
+#ifndef CPU_SPARC_NATIVEINST_SPARC_HPP
+#define CPU_SPARC_NATIVEINST_SPARC_HPP
 
 #include "asm/macroAssembler.hpp"
 #include "runtime/icache.hpp"
@@ -809,4 +809,4 @@
   static void insert(address code_pos);
 };
 
-#endif // CPU_SPARC_VM_NATIVEINST_SPARC_HPP
+#endif // CPU_SPARC_NATIVEINST_SPARC_HPP
--- a/src/hotspot/cpu/sparc/registerMap_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/registerMap_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_REGISTERMAP_SPARC_HPP
-#define CPU_SPARC_VM_REGISTERMAP_SPARC_HPP
+#ifndef CPU_SPARC_REGISTERMAP_SPARC_HPP
+#define CPU_SPARC_REGISTERMAP_SPARC_HPP
 
 // machine-dependent implemention for register maps
   friend class frame;
@@ -56,4 +56,4 @@
   // When popping out of compiled frames, we make all IRegs disappear.
   void make_integer_regs_unsaved() { _location_valid[0] = 0; }
 
-#endif // CPU_SPARC_VM_REGISTERMAP_SPARC_HPP
+#endif // CPU_SPARC_REGISTERMAP_SPARC_HPP
--- a/src/hotspot/cpu/sparc/register_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/register_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_REGISTER_SPARC_HPP
-#define CPU_SPARC_VM_REGISTER_SPARC_HPP
+#ifndef CPU_SPARC_REGISTER_SPARC_HPP
+#define CPU_SPARC_REGISTER_SPARC_HPP
 
 #include "asm/register.hpp"
 
@@ -337,4 +337,4 @@
   }
 };
 
-#endif // CPU_SPARC_VM_REGISTER_SPARC_HPP
+#endif // CPU_SPARC_REGISTER_SPARC_HPP
--- a/src/hotspot/cpu/sparc/relocInfo_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/relocInfo_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_RELOCINFO_SPARC_HPP
-#define CPU_SPARC_VM_RELOCINFO_SPARC_HPP
+#ifndef CPU_SPARC_RELOCINFO_SPARC_HPP
+#define CPU_SPARC_RELOCINFO_SPARC_HPP
 
   // machine-dependent parts of class relocInfo
  private:
@@ -54,4 +54,4 @@
 // 1.9 99/07/16 11:12:11 relocInfo_i486.hpp
 //End
 
-#endif // CPU_SPARC_VM_RELOCINFO_SPARC_HPP
+#endif // CPU_SPARC_RELOCINFO_SPARC_HPP
--- a/src/hotspot/cpu/sparc/stubRoutines_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/stubRoutines_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_STUBROUTINES_SPARC_HPP
-#define CPU_SPARC_VM_STUBROUTINES_SPARC_HPP
+#ifndef CPU_SPARC_STUBROUTINES_SPARC_HPP
+#define CPU_SPARC_STUBROUTINES_SPARC_HPP
 
 // This file holds the platform specific parts of the StubRoutines
 // definition. See stubRoutines.hpp for a description on how to
@@ -73,4 +73,4 @@
   static address crc_by128_masks_addr()  { return (address)_crc_by128_masks; }
 };
 
-#endif // CPU_SPARC_VM_STUBROUTINES_SPARC_HPP
+#endif // CPU_SPARC_STUBROUTINES_SPARC_HPP
--- a/src/hotspot/cpu/sparc/templateTable_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/templateTable_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_TEMPLATETABLE_SPARC_HPP
-#define CPU_SPARC_VM_TEMPLATETABLE_SPARC_HPP
+#ifndef CPU_SPARC_TEMPLATETABLE_SPARC_HPP
+#define CPU_SPARC_TEMPLATETABLE_SPARC_HPP
 
   static void prepare_invoke(int byte_no,
                              Register method,         // linked method (or i-klass)
@@ -40,4 +40,4 @@
   static void generate_vtable_call(Register Rrecv, Register Rindex, Register Rret);
   static void volatile_barrier(Assembler::Membar_mask_bits order_constraint);
 
-#endif // CPU_SPARC_VM_TEMPLATETABLE_SPARC_HPP
+#endif // CPU_SPARC_TEMPLATETABLE_SPARC_HPP
--- a/src/hotspot/cpu/sparc/vmStructs_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/vmStructs_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_VMSTRUCTS_SPARC_HPP
-#define CPU_SPARC_VM_VMSTRUCTS_SPARC_HPP
+#ifndef CPU_SPARC_VMSTRUCTS_SPARC_HPP
+#define CPU_SPARC_VMSTRUCTS_SPARC_HPP
 
 // These are the CPU-specific fields, types and integer
 // constants required by the Serviceability Agent. This file is
@@ -119,4 +119,4 @@
 
 #define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
 
-#endif // CPU_SPARC_VM_VMSTRUCTS_SPARC_HPP
+#endif // CPU_SPARC_VMSTRUCTS_SPARC_HPP
--- a/src/hotspot/cpu/sparc/vm_version_ext_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/vm_version_ext_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_VM_VERSION_EXT_SPARC_HPP
-#define CPU_SPARC_VM_VM_VERSION_EXT_SPARC_HPP
+#ifndef CPU_SPARC_VM_VERSION_EXT_SPARC_HPP
+#define CPU_SPARC_VM_VERSION_EXT_SPARC_HPP
 
 #include "utilities/macros.hpp"
 #include "vm_version_sparc.hpp"
@@ -66,4 +66,4 @@
   static const char* cpu_description(void);
 };
 
-#endif // CPU_SPARC_VM_VM_VERSION_EXT_SPARC_HPP
+#endif // CPU_SPARC_VM_VERSION_EXT_SPARC_HPP
--- a/src/hotspot/cpu/sparc/vm_version_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/vm_version_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_VM_VERSION_SPARC_HPP
-#define CPU_SPARC_VM_VM_VERSION_SPARC_HPP
+#ifndef CPU_SPARC_VM_VERSION_SPARC_HPP
+#define CPU_SPARC_VM_VERSION_SPARC_HPP
 
 #include "runtime/globals_extension.hpp"
 #include "runtime/vm_version.hpp"
@@ -373,4 +373,4 @@
   }
 };
 
-#endif // CPU_SPARC_VM_VM_VERSION_SPARC_HPP
+#endif // CPU_SPARC_VM_VERSION_SPARC_HPP
--- a/src/hotspot/cpu/sparc/vmreg_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/vmreg_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_VMREG_SPARC_HPP
-#define CPU_SPARC_VM_VMREG_SPARC_HPP
+#ifndef CPU_SPARC_VMREG_SPARC_HPP
+#define CPU_SPARC_VMREG_SPARC_HPP
 
 inline bool is_Register() { return value() >= 0 && value() < ConcreteRegisterImpl::max_gpr; }
 inline bool is_FloatRegister() { return value() >= ConcreteRegisterImpl::max_gpr &&
@@ -55,4 +55,4 @@
   return false;
 }
 
-#endif // CPU_SPARC_VM_VMREG_SPARC_HPP
+#endif // CPU_SPARC_VMREG_SPARC_HPP
--- a/src/hotspot/cpu/sparc/vmreg_sparc.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/sparc/vmreg_sparc.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_SPARC_VM_VMREG_SPARC_INLINE_HPP
-#define CPU_SPARC_VM_VMREG_SPARC_INLINE_HPP
+#ifndef CPU_SPARC_VMREG_SPARC_INLINE_HPP
+#define CPU_SPARC_VMREG_SPARC_INLINE_HPP
 
 inline VMReg RegisterImpl::as_VMReg() {
   if( this==noreg ) return VMRegImpl::Bad();
@@ -34,4 +34,4 @@
 
 
 
-#endif // CPU_SPARC_VM_VMREG_SPARC_INLINE_HPP
+#endif // CPU_SPARC_VMREG_SPARC_INLINE_HPP
--- a/src/hotspot/cpu/x86/assembler_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/assembler_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_ASSEMBLER_X86_HPP
-#define CPU_X86_VM_ASSEMBLER_X86_HPP
+#ifndef CPU_X86_ASSEMBLER_X86_HPP
+#define CPU_X86_ASSEMBLER_X86_HPP
 
 #include "asm/register.hpp"
 #include "vm_version_x86.hpp"
@@ -2310,4 +2310,4 @@
 
 };
 
-#endif // CPU_X86_VM_ASSEMBLER_X86_HPP
+#endif // CPU_X86_ASSEMBLER_X86_HPP
--- a/src/hotspot/cpu/x86/assembler_x86.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/assembler_x86.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_ASSEMBLER_X86_INLINE_HPP
-#define CPU_X86_VM_ASSEMBLER_X86_INLINE_HPP
+#ifndef CPU_X86_ASSEMBLER_X86_INLINE_HPP
+#define CPU_X86_ASSEMBLER_X86_INLINE_HPP
 
 #include "asm/assembler.inline.hpp"
 #include "asm/codeBuffer.hpp"
@@ -49,4 +49,4 @@
 inline void Assembler::prefixq(Address adr, XMMRegister reg) {}
 #endif // _LP64
 
-#endif // CPU_X86_VM_ASSEMBLER_X86_INLINE_HPP
+#endif // CPU_X86_ASSEMBLER_X86_INLINE_HPP
--- a/src/hotspot/cpu/x86/bytes_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/bytes_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_BYTES_X86_HPP
-#define CPU_X86_VM_BYTES_X86_HPP
+#ifndef CPU_X86_BYTES_X86_HPP
+#define CPU_X86_BYTES_X86_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/align.hpp"
@@ -124,4 +124,4 @@
 // The following header contains the implementations of swap_u2, swap_u4, and swap_u8[_base]
 #include OS_CPU_HEADER_INLINE(bytes)
 
-#endif // CPU_X86_VM_BYTES_X86_HPP
+#endif // CPU_X86_BYTES_X86_HPP
--- a/src/hotspot/cpu/x86/c1_Defs_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/c1_Defs_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_C1_DEFS_X86_HPP
-#define CPU_X86_VM_C1_DEFS_X86_HPP
+#ifndef CPU_X86_C1_DEFS_X86_HPP
+#define CPU_X86_C1_DEFS_X86_HPP
 
 // native word offsets from memory address (little endian)
 enum {
@@ -75,4 +75,4 @@
   pd_float_saved_as_double = true
 };
 
-#endif // CPU_X86_VM_C1_DEFS_X86_HPP
+#endif // CPU_X86_C1_DEFS_X86_HPP
--- a/src/hotspot/cpu/x86/c1_FpuStackSim_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/c1_FpuStackSim_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_C1_FPUSTACKSIM_X86_HPP
-#define CPU_X86_VM_C1_FPUSTACKSIM_X86_HPP
+#ifndef CPU_X86_C1_FPUSTACKSIM_X86_HPP
+#define CPU_X86_C1_FPUSTACKSIM_X86_HPP
 
 //  Simulates the FPU stack and maintains mapping [fpu-register -> stack offset]
 //  FPU registers are described as numbers from 0..nof_fpu_regs-1
@@ -69,4 +69,4 @@
   void print() PRODUCT_RETURN;
 };
 
-#endif // CPU_X86_VM_C1_FPUSTACKSIM_X86_HPP
+#endif // CPU_X86_C1_FPUSTACKSIM_X86_HPP
--- a/src/hotspot/cpu/x86/c1_FrameMap_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/c1_FrameMap_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_C1_FRAMEMAP_X86_HPP
-#define CPU_X86_VM_C1_FRAMEMAP_X86_HPP
+#ifndef CPU_X86_C1_FRAMEMAP_X86_HPP
+#define CPU_X86_C1_FRAMEMAP_X86_HPP
 
 //  On i486 the frame looks as follows:
 //
@@ -166,5 +166,4 @@
   static int last_cpu_reg()             { return adjust_reg_range(pd_last_cpu_reg);  }
   static int last_byte_reg()            { return adjust_reg_range(pd_last_byte_reg); }
 
-#endif // CPU_X86_VM_C1_FRAMEMAP_X86_HPP
-
+#endif // CPU_X86_C1_FRAMEMAP_X86_HPP
--- a/src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/c1_LIRAssembler_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_C1_LIRASSEMBLER_X86_HPP
-#define CPU_X86_VM_C1_LIRASSEMBLER_X86_HPP
+#ifndef CPU_X86_C1_LIRASSEMBLER_X86_HPP
+#define CPU_X86_C1_LIRASSEMBLER_X86_HPP
 
  private:
 
@@ -62,4 +62,4 @@
   void store_parameter(jobject c,   int offset_from_esp_in_words);
   void store_parameter(Metadata* c, int offset_from_esp_in_words);
 
-#endif // CPU_X86_VM_C1_LIRASSEMBLER_X86_HPP
+#endif // CPU_X86_C1_LIRASSEMBLER_X86_HPP
--- a/src/hotspot/cpu/x86/c1_LinearScan_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/c1_LinearScan_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_C1_LINEARSCAN_X86_HPP
-#define CPU_X86_VM_C1_LINEARSCAN_X86_HPP
+#ifndef CPU_X86_C1_LINEARSCAN_X86_HPP
+#define CPU_X86_C1_LINEARSCAN_X86_HPP
 
 inline bool LinearScan::is_processed_reg_num(int reg_num) {
 #ifndef _LP64
@@ -195,4 +195,4 @@
   void allocate();
 };
 
-#endif // CPU_X86_VM_C1_LINEARSCAN_X86_HPP
+#endif // CPU_X86_C1_LINEARSCAN_X86_HPP
--- a/src/hotspot/cpu/x86/c1_MacroAssembler_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/c1_MacroAssembler_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_C1_MACROASSEMBLER_X86_HPP
-#define CPU_X86_VM_C1_MACROASSEMBLER_X86_HPP
+#ifndef CPU_X86_C1_MACROASSEMBLER_X86_HPP
+#define CPU_X86_C1_MACROASSEMBLER_X86_HPP
 
 // C1_MacroAssembler contains high-level macros for C1
 
@@ -127,4 +127,4 @@
   void restore_live_registers_except_rax(bool restore_fpu_registers);
   void restore_live_registers(bool restore_fpu_registers);
 
-#endif // CPU_X86_VM_C1_MACROASSEMBLER_X86_HPP
+#endif // CPU_X86_C1_MACROASSEMBLER_X86_HPP
--- a/src/hotspot/cpu/x86/c1_globals_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/c1_globals_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_C1_GLOBALS_X86_HPP
-#define CPU_X86_VM_C1_GLOBALS_X86_HPP
+#ifndef CPU_X86_C1_GLOBALS_X86_HPP
+#define CPU_X86_C1_GLOBALS_X86_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -67,4 +67,4 @@
 define_pd_global(bool, CSEArrayLength,                 false);
 define_pd_global(bool, TwoOperandLIRForm,              true );
 
-#endif // CPU_X86_VM_C1_GLOBALS_X86_HPP
+#endif // CPU_X86_C1_GLOBALS_X86_HPP
--- a/src/hotspot/cpu/x86/c2_globals_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/c2_globals_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_C2_GLOBALS_X86_HPP
-#define CPU_X86_VM_C2_GLOBALS_X86_HPP
+#ifndef CPU_X86_C2_GLOBALS_X86_HPP
+#define CPU_X86_C2_GLOBALS_X86_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -99,4 +99,4 @@
 // Ergonomics related flags
 define_pd_global(bool, NeverActAsServerClassMachine, false);
 
-#endif // CPU_X86_VM_C2_GLOBALS_X86_HPP
+#endif // CPU_X86_C2_GLOBALS_X86_HPP
--- a/src/hotspot/cpu/x86/codeBuffer_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/codeBuffer_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_CODEBUFFER_X86_HPP
-#define CPU_X86_VM_CODEBUFFER_X86_HPP
+#ifndef CPU_X86_CODEBUFFER_X86_HPP
+#define CPU_X86_CODEBUFFER_X86_HPP
 
 private:
   void pd_initialize() {}
@@ -31,4 +31,4 @@
 public:
   void flush_bundle(bool start_new_bundle) {}
 
-#endif // CPU_X86_VM_CODEBUFFER_X86_HPP
+#endif // CPU_X86_CODEBUFFER_X86_HPP
--- a/src/hotspot/cpu/x86/copy_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/copy_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_COPY_X86_HPP
-#define CPU_X86_VM_COPY_X86_HPP
+#ifndef CPU_X86_COPY_X86_HPP
+#define CPU_X86_COPY_X86_HPP
 
 // Inline functions for memory copy and fill.
 
@@ -62,4 +62,4 @@
   (void)memset(to, 0, count);
 }
 
-#endif // CPU_X86_VM_COPY_X86_HPP
+#endif // CPU_X86_COPY_X86_HPP
--- a/src/hotspot/cpu/x86/depChecker_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/depChecker_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,9 +22,9 @@
  *
  */
 
-#ifndef CPU_X86_VM_DEPCHECKER_X86_HPP
-#define CPU_X86_VM_DEPCHECKER_X86_HPP
+#ifndef CPU_X86_DEPCHECKER_X86_HPP
+#define CPU_X86_DEPCHECKER_X86_HPP
 
 // Nothing to do on i486
 
-#endif // CPU_X86_VM_DEPCHECKER_X86_HPP
+#endif // CPU_X86_DEPCHECKER_X86_HPP
--- a/src/hotspot/cpu/x86/disassembler_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/disassembler_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_DISASSEMBLER_X86_HPP
-#define CPU_X86_VM_DISASSEMBLER_X86_HPP
+#ifndef CPU_X86_DISASSEMBLER_X86_HPP
+#define CPU_X86_DISASSEMBLER_X86_HPP
 
   static int pd_instruction_alignment() {
     return 1;
@@ -33,4 +33,4 @@
     return "";
   }
 
-#endif // CPU_X86_VM_DISASSEMBLER_X86_HPP
+#endif // CPU_X86_DISASSEMBLER_X86_HPP
--- a/src/hotspot/cpu/x86/frame_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/frame_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_FRAME_X86_HPP
-#define CPU_X86_VM_FRAME_X86_HPP
+#ifndef CPU_X86_FRAME_X86_HPP
+#define CPU_X86_FRAME_X86_HPP
 
 #include "runtime/synchronizer.hpp"
 
@@ -156,4 +156,4 @@
 
   static jint interpreter_frame_expression_stack_direction() { return -1; }
 
-#endif // CPU_X86_VM_FRAME_X86_HPP
+#endif // CPU_X86_FRAME_X86_HPP
--- a/src/hotspot/cpu/x86/frame_x86.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/frame_x86.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_FRAME_X86_INLINE_HPP
-#define CPU_X86_VM_FRAME_X86_INLINE_HPP
+#ifndef CPU_X86_FRAME_X86_INLINE_HPP
+#define CPU_X86_FRAME_X86_INLINE_HPP
 
 #include "code/codeCache.hpp"
 #include "code/vmreg.inline.hpp"
@@ -245,4 +245,4 @@
   *result_adr = obj;
 }
 
-#endif // CPU_X86_VM_FRAME_X86_INLINE_HPP
+#endif // CPU_X86_FRAME_X86_INLINE_HPP
--- a/src/hotspot/cpu/x86/globalDefinitions_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/globalDefinitions_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_GLOBALDEFINITIONS_X86_HPP
-#define CPU_X86_VM_GLOBALDEFINITIONS_X86_HPP
+#ifndef CPU_X86_GLOBALDEFINITIONS_X86_HPP
+#define CPU_X86_GLOBALDEFINITIONS_X86_HPP
 
 const int StackAlignmentInBytes  = 16;
 
@@ -67,4 +67,4 @@
 
 #define THREAD_LOCAL_POLL
 
-#endif // CPU_X86_VM_GLOBALDEFINITIONS_X86_HPP
+#endif // CPU_X86_GLOBALDEFINITIONS_X86_HPP
--- a/src/hotspot/cpu/x86/globals_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/globals_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_GLOBALS_X86_HPP
-#define CPU_X86_VM_GLOBALS_X86_HPP
+#ifndef CPU_X86_GLOBALS_X86_HPP
+#define CPU_X86_GLOBALS_X86_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -215,4 +215,4 @@
                                                                             \
   diagnostic(bool, UseLibmIntrinsic, true,                                  \
           "Use Libm Intrinsics")
-#endif // CPU_X86_VM_GLOBALS_X86_HPP
+#endif // CPU_X86_GLOBALS_X86_HPP
--- a/src/hotspot/cpu/x86/icache_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/icache_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_ICACHE_X86_HPP
-#define CPU_X86_VM_ICACHE_X86_HPP
+#ifndef CPU_X86_ICACHE_X86_HPP
+#define CPU_X86_ICACHE_X86_HPP
 
 // Interface for updating the instruction cache.  Whenever the VM modifies
 // code, part of the processor instruction cache potentially has to be flushed.
@@ -57,4 +57,4 @@
 #endif // AMD64
 };
 
-#endif // CPU_X86_VM_ICACHE_X86_HPP
+#endif // CPU_X86_ICACHE_X86_HPP
--- a/src/hotspot/cpu/x86/interp_masm_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/interp_masm_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_INTERP_MASM_X86_HPP
-#define CPU_X86_VM_INTERP_MASM_X86_HPP
+#ifndef CPU_X86_INTERP_MASM_X86_HPP
+#define CPU_X86_INTERP_MASM_X86_HPP
 
 #include "asm/macroAssembler.hpp"
 #include "interpreter/invocationCounter.hpp"
@@ -298,4 +298,4 @@
 
 };
 
-#endif // CPU_X86_VM_INTERP_MASM_X86_HPP
+#endif // CPU_X86_INTERP_MASM_X86_HPP
--- a/src/hotspot/cpu/x86/interpreterRT_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/interpreterRT_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_INTERPRETERRT_X86_HPP
-#define CPU_X86_VM_INTERPRETERRT_X86_HPP
+#ifndef CPU_X86_INTERPRETERRT_X86_HPP
+#define CPU_X86_INTERPRETERRT_X86_HPP
 
 // This is included in the middle of class Interpreter.
 // Do not include files here.
@@ -67,4 +67,4 @@
   static Register temp();
 };
 
-#endif // CPU_X86_VM_INTERPRETERRT_X86_HPP
+#endif // CPU_X86_INTERPRETERRT_X86_HPP
--- a/src/hotspot/cpu/x86/javaFrameAnchor_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/javaFrameAnchor_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_JAVAFRAMEANCHOR_X86_HPP
-#define CPU_X86_VM_JAVAFRAMEANCHOR_X86_HPP
+#ifndef CPU_X86_JAVAFRAMEANCHOR_X86_HPP
+#define CPU_X86_JAVAFRAMEANCHOR_X86_HPP
 
 private:
 
@@ -82,4 +82,4 @@
   // Assert (last_Java_sp == NULL || fp == NULL)
   void set_last_Java_fp(intptr_t* fp)                { _last_Java_fp = fp; }
 
-#endif // CPU_X86_VM_JAVAFRAMEANCHOR_X86_HPP
+#endif // CPU_X86_JAVAFRAMEANCHOR_X86_HPP
--- a/src/hotspot/cpu/x86/jniTypes_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/jniTypes_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_JNITYPES_X86_HPP
-#define CPU_X86_VM_JNITYPES_X86_HPP
+#ifndef CPU_X86_JNITYPES_X86_HPP
+#define CPU_X86_JNITYPES_X86_HPP
 
 #include "jni.h"
 #include "memory/allocation.hpp"
@@ -130,4 +130,4 @@
 #undef _JNI_SLOT_OFFSET
 };
 
-#endif // CPU_X86_VM_JNITYPES_X86_HPP
+#endif // CPU_X86_JNITYPES_X86_HPP
--- a/src/hotspot/cpu/x86/macroAssembler_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_MACROASSEMBLER_X86_HPP
-#define CPU_X86_VM_MACROASSEMBLER_X86_HPP
+#ifndef CPU_X86_MACROASSEMBLER_X86_HPP
+#define CPU_X86_MACROASSEMBLER_X86_HPP
 
 #include "asm/assembler.hpp"
 #include "utilities/macros.hpp"
@@ -1779,4 +1779,4 @@
    ~SkipIfEqual();
 };
 
-#endif // CPU_X86_VM_MACROASSEMBLER_X86_HPP
+#endif // CPU_X86_MACROASSEMBLER_X86_HPP
--- a/src/hotspot/cpu/x86/macroAssembler_x86.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,9 +22,9 @@
  *
  */
 
-#ifndef CPU_X86_VM_MACROASSEMBLER_X86_INLINE_HPP
-#define CPU_X86_VM_MACROASSEMBLER_X86_INLINE_HPP
+#ifndef CPU_X86_MACROASSEMBLER_X86_INLINE_HPP
+#define CPU_X86_MACROASSEMBLER_X86_INLINE_HPP
 
 // Still empty.
 
-#endif // CPU_X86_VM_MACROASSEMBLER_X86_INLINE_HPP
+#endif // CPU_X86_MACROASSEMBLER_X86_INLINE_HPP
--- a/src/hotspot/cpu/x86/nativeInst_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/nativeInst_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_NATIVEINST_X86_HPP
-#define CPU_X86_VM_NATIVEINST_X86_HPP
+#ifndef CPU_X86_NATIVEINST_X86_HPP
+#define CPU_X86_NATIVEINST_X86_HPP
 
 #include "asm/assembler.hpp"
 #include "runtime/icache.hpp"
@@ -753,4 +753,4 @@
 #endif // AMD64
 }
 
-#endif // CPU_X86_VM_NATIVEINST_X86_HPP
+#endif // CPU_X86_NATIVEINST_X86_HPP
--- a/src/hotspot/cpu/x86/rdtsc_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/rdtsc_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_RDTSC_X86_HPP
-#define CPU_X86_VM_RDTSC_X86_HPP
+#ifndef CPU_X86_RDTSC_X86_HPP
+#define CPU_X86_RDTSC_X86_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/macros.hpp"
@@ -47,4 +47,4 @@
   static bool  initialize();
 };
 
-#endif // CPU_X86_VM_RDTSC_X86_HPP
+#endif // CPU_X86_RDTSC_X86_HPP
--- a/src/hotspot/cpu/x86/registerMap_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/registerMap_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_REGISTERMAP_X86_HPP
-#define CPU_X86_VM_REGISTERMAP_X86_HPP
+#ifndef CPU_X86_REGISTERMAP_X86_HPP
+#define CPU_X86_REGISTERMAP_X86_HPP
 
 // machine-dependent implemention for register maps
   friend class frame;
@@ -37,4 +37,4 @@
   void pd_initialize() {}
   void pd_initialize_from(const RegisterMap* map) {}
 
-#endif // CPU_X86_VM_REGISTERMAP_X86_HPP
+#endif // CPU_X86_REGISTERMAP_X86_HPP
--- a/src/hotspot/cpu/x86/register_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/register_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_REGISTER_X86_HPP
-#define CPU_X86_VM_REGISTER_X86_HPP
+#ifndef CPU_X86_REGISTER_X86_HPP
+#define CPU_X86_REGISTER_X86_HPP
 
 #include "asm/register.hpp"
 
@@ -291,4 +291,4 @@
 
 };
 
-#endif // CPU_X86_VM_REGISTER_X86_HPP
+#endif // CPU_X86_REGISTER_X86_HPP
--- a/src/hotspot/cpu/x86/relocInfo_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/relocInfo_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_RELOCINFO_X86_HPP
-#define CPU_X86_VM_RELOCINFO_X86_HPP
+#ifndef CPU_X86_RELOCINFO_X86_HPP
+#define CPU_X86_RELOCINFO_X86_HPP
 
   // machine-dependent parts of class relocInfo
  private:
@@ -46,4 +46,4 @@
   // listed in the oop section.
   static bool mustIterateImmediateOopsInCode() { return true; }
 
-#endif // CPU_X86_VM_RELOCINFO_X86_HPP
+#endif // CPU_X86_RELOCINFO_X86_HPP
--- a/src/hotspot/cpu/x86/stubRoutines_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/stubRoutines_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_STUBROUTINES_X86_HPP
-#define CPU_X86_VM_STUBROUTINES_X86_HPP
+#ifndef CPU_X86_STUBROUTINES_X86_HPP
+#define CPU_X86_STUBROUTINES_X86_HPP
 
 // This file holds the platform specific parts of the StubRoutines
 // definition. See stubRoutines.hpp for a description on how to
@@ -248,4 +248,4 @@
 
 };
 
-#endif // CPU_X86_VM_STUBROUTINES_X86_HPP
+#endif // CPU_X86_STUBROUTINES_X86_HPP
--- a/src/hotspot/cpu/x86/templateTable_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/templateTable_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_TEMPLATETABLE_X86_HPP
-#define CPU_X86_VM_TEMPLATETABLE_X86_HPP
+#ifndef CPU_X86_TEMPLATETABLE_X86_HPP
+#define CPU_X86_TEMPLATETABLE_X86_HPP
 
   static void prepare_invoke(int byte_no,
                              Register method,         // linked method (or i-klass)
@@ -43,4 +43,4 @@
                                         Register obj, Register off, Register flags);
   static void fast_storefield_helper(Address field, Register rax);
 
-#endif // CPU_X86_VM_TEMPLATETABLE_X86_HPP
+#endif // CPU_X86_TEMPLATETABLE_X86_HPP
--- a/src/hotspot/cpu/x86/vmStructs_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/vmStructs_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_VMSTRUCTS_X86_HPP
-#define CPU_X86_VM_VMSTRUCTS_X86_HPP
+#ifndef CPU_X86_VMSTRUCTS_X86_HPP
+#define CPU_X86_VMSTRUCTS_X86_HPP
 
 // These are the CPU-specific fields, types and integer
 // constants required by the Serviceability Agent. This file is
@@ -77,4 +77,4 @@
   declare_preprocessor_constant("VM_Version::CPU_FMA", CPU_FMA)           \
   declare_preprocessor_constant("VM_Version::CPU_VZEROUPPER", CPU_VZEROUPPER)
 
-#endif // CPU_X86_VM_VMSTRUCTS_X86_HPP
+#endif // CPU_X86_VMSTRUCTS_X86_HPP
--- a/src/hotspot/cpu/x86/vm_version_ext_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/vm_version_ext_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_VM_VERSION_EXT_X86_HPP
-#define CPU_X86_VM_VM_VERSION_EXT_X86_HPP
+#ifndef CPU_X86_VM_VERSION_EXT_X86_HPP
+#define CPU_X86_VM_VERSION_EXT_X86_HPP
 
 #include "utilities/macros.hpp"
 #include "vm_version_x86.hpp"
@@ -97,4 +97,4 @@
   static void initialize();
 };
 
-#endif // CPU_X86_VM_VM_VERSION_EXT_X86_HPP
+#endif // CPU_X86_VM_VERSION_EXT_X86_HPP
--- a/src/hotspot/cpu/x86/vm_version_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/vm_version_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_VM_VERSION_X86_HPP
-#define CPU_X86_VM_VM_VERSION_X86_HPP
+#ifndef CPU_X86_VM_VERSION_X86_HPP
+#define CPU_X86_VM_VERSION_X86_HPP
 
 #include "runtime/globals_extension.hpp"
 #include "runtime/vm_version.hpp"
@@ -932,4 +932,4 @@
   static bool supports_on_spin_wait() { return supports_sse2(); }
 };
 
-#endif // CPU_X86_VM_VM_VERSION_X86_HPP
+#endif // CPU_X86_VM_VERSION_X86_HPP
--- a/src/hotspot/cpu/x86/vmreg_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/vmreg_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_VMREG_X86_HPP
-#define CPU_X86_VM_VMREG_X86_HPP
+#ifndef CPU_X86_VMREG_X86_HPP
+#define CPU_X86_VMREG_X86_HPP
 
 
 
@@ -93,4 +93,4 @@
   return is_even(value());
 }
 
-#endif // CPU_X86_VM_VMREG_X86_HPP
+#endif // CPU_X86_VMREG_X86_HPP
--- a/src/hotspot/cpu/x86/vmreg_x86.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/x86/vmreg_x86.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_X86_VM_VMREG_X86_INLINE_HPP
-#define CPU_X86_VM_VMREG_X86_INLINE_HPP
+#ifndef CPU_X86_VMREG_X86_INLINE_HPP
+#define CPU_X86_VMREG_X86_INLINE_HPP
 
 inline VMReg RegisterImpl::as_VMReg() {
   if( this==noreg ) return VMRegImpl::Bad();
@@ -46,4 +46,4 @@
   return VMRegImpl::as_VMReg(encoding() + ConcreteRegisterImpl::max_xmm);
 }
 
-#endif // CPU_X86_VM_VMREG_X86_INLINE_HPP
+#endif // CPU_X86_VMREG_X86_INLINE_HPP
--- a/src/hotspot/cpu/zero/assembler_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/assembler_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2008, 2009 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_ASSEMBLER_ZERO_HPP
-#define CPU_ZERO_VM_ASSEMBLER_ZERO_HPP
+#ifndef CPU_ZERO_ASSEMBLER_ZERO_HPP
+#define CPU_ZERO_ASSEMBLER_ZERO_HPP
 
 // In normal, CPU-specific ports of HotSpot these two classes are used
 // for generating assembly language.  We don't do any of this in zero,
@@ -59,4 +59,4 @@
 address ShouldNotCallThisStub();
 address ShouldNotCallThisEntry();
 
-#endif // CPU_ZERO_VM_ASSEMBLER_ZERO_HPP
+#endif // CPU_ZERO_ASSEMBLER_ZERO_HPP
--- a/src/hotspot/cpu/zero/assembler_zero.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/assembler_zero.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2009 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_ASSEMBLER_ZERO_INLINE_HPP
-#define CPU_ZERO_VM_ASSEMBLER_ZERO_INLINE_HPP
+#ifndef CPU_ZERO_ASSEMBLER_ZERO_INLINE_HPP
+#define CPU_ZERO_ASSEMBLER_ZERO_INLINE_HPP
 
 #include "asm/assembler.inline.hpp"
 #include "asm/codeBuffer.hpp"
@@ -33,4 +33,4 @@
 
 // This file is intentionally empty
 
-#endif // CPU_ZERO_VM_ASSEMBLER_ZERO_INLINE_HPP
+#endif // CPU_ZERO_ASSEMBLER_ZERO_INLINE_HPP
--- a/src/hotspot/cpu/zero/bytecodeInterpreter_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/bytecodeInterpreter_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2008, 2011 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_BYTECODEINTERPRETER_ZERO_HPP
-#define CPU_ZERO_VM_BYTECODEINTERPRETER_ZERO_HPP
+#ifndef CPU_ZERO_BYTECODEINTERPRETER_ZERO_HPP
+#define CPU_ZERO_BYTECODEINTERPRETER_ZERO_HPP
 
 // Platform specific for C++ based Interpreter
 
@@ -171,4 +171,4 @@
 #define SET_VMSLOTS_DOUBLE(value, offset) (((VMJavaVal64*)&vmslots[(offset) - 1])->d = (value))
 #define SET_VMSLOTS_LONG(value, offset)   (((VMJavaVal64*)&vmslots[(offset) - 1])->l = (value))
 
-#endif // CPU_ZERO_VM_BYTECODEINTERPRETER_ZERO_HPP
+#endif // CPU_ZERO_BYTECODEINTERPRETER_ZERO_HPP
--- a/src/hotspot/cpu/zero/bytecodeInterpreter_zero.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/bytecodeInterpreter_zero.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_BYTECODEINTERPRETER_ZERO_INLINE_HPP
-#define CPU_ZERO_VM_BYTECODEINTERPRETER_ZERO_INLINE_HPP
+#ifndef CPU_ZERO_BYTECODEINTERPRETER_ZERO_INLINE_HPP
+#define CPU_ZERO_BYTECODEINTERPRETER_ZERO_INLINE_HPP
 
 // Inline interpreter functions for zero
 
@@ -303,4 +303,4 @@
   return (jbyte) val;
 }
 
-#endif // CPU_ZERO_VM_BYTECODEINTERPRETER_ZERO_INLINE_HPP
+#endif // CPU_ZERO_BYTECODEINTERPRETER_ZERO_INLINE_HPP
--- a/src/hotspot/cpu/zero/bytes_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/bytes_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2008, 2009 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_BYTES_ZERO_HPP
-#define CPU_ZERO_VM_BYTES_ZERO_HPP
+#ifndef CPU_ZERO_BYTES_ZERO_HPP
+#define CPU_ZERO_BYTES_ZERO_HPP
 
 #include "memory/allocation.hpp"
 
@@ -160,4 +160,4 @@
 
 #endif // VM_LITTLE_ENDIAN
 
-#endif // CPU_ZERO_VM_BYTES_ZERO_HPP
+#endif // CPU_ZERO_BYTES_ZERO_HPP
--- a/src/hotspot/cpu/zero/codeBuffer_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/codeBuffer_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,10 +23,10 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_CODEBUFFER_ZERO_HPP
-#define CPU_ZERO_VM_CODEBUFFER_ZERO_HPP
+#ifndef CPU_ZERO_CODEBUFFER_ZERO_HPP
+#define CPU_ZERO_CODEBUFFER_ZERO_HPP
 
  private:
   void pd_initialize() {}
 
-#endif // CPU_ZERO_VM_CODEBUFFER_ZERO_HPP
+#endif // CPU_ZERO_CODEBUFFER_ZERO_HPP
--- a/src/hotspot/cpu/zero/copy_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/copy_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_COPY_ZERO_HPP
-#define CPU_ZERO_VM_COPY_ZERO_HPP
+#ifndef CPU_ZERO_COPY_ZERO_HPP
+#define CPU_ZERO_COPY_ZERO_HPP
 
 // Inline functions for memory copy and fill.
 
@@ -180,4 +180,4 @@
   memset(to, 0, count);
 }
 
-#endif // CPU_ZERO_VM_COPY_ZERO_HPP
+#endif // CPU_ZERO_COPY_ZERO_HPP
--- a/src/hotspot/cpu/zero/cppInterpreter_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/cppInterpreter_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2008, 2010, 2011 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_CPPINTERPRETER_ZERO_HPP
-#define CPU_ZERO_VM_CPPINTERPRETER_ZERO_HPP
+#ifndef CPU_ZERO_CPPINTERPRETER_ZERO_HPP
+#define CPU_ZERO_CPPINTERPRETER_ZERO_HPP
 
  protected:
   // Size of interpreter code
@@ -49,4 +49,4 @@
   static intptr_t* calculate_unwind_sp(ZeroStack* stack, oop method_handle);
   static void throw_exception(JavaThread* thread, Symbol* name,char *msg=NULL);
 
-#endif // CPU_ZERO_VM_CPPINTERPRETER_ZERO_HPP
+#endif // CPU_ZERO_CPPINTERPRETER_ZERO_HPP
--- a/src/hotspot/cpu/zero/depChecker_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/depChecker_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2009 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,9 +23,9 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_DEPCHECKER_ZERO_HPP
-#define CPU_ZERO_VM_DEPCHECKER_ZERO_HPP
+#ifndef CPU_ZERO_DEPCHECKER_ZERO_HPP
+#define CPU_ZERO_DEPCHECKER_ZERO_HPP
 
 // This file is intentionally empty
 
-#endif // CPU_ZERO_VM_DEPCHECKER_ZERO_HPP
+#endif // CPU_ZERO_DEPCHECKER_ZERO_HPP
--- a/src/hotspot/cpu/zero/disassembler_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/disassembler_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_DISASSEMBLER_ZERO_HPP
-#define CPU_ZERO_VM_DISASSEMBLER_ZERO_HPP
+#ifndef CPU_ZERO_DISASSEMBLER_ZERO_HPP
+#define CPU_ZERO_DISASSEMBLER_ZERO_HPP
 
   static int pd_instruction_alignment() {
     return 1;
@@ -34,4 +34,4 @@
     return "";
   }
 
-#endif // CPU_ZERO_VM_DISASSEMBLER_ZERO_HPP
+#endif // CPU_ZERO_DISASSEMBLER_ZERO_HPP
--- a/src/hotspot/cpu/zero/entryFrame_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/entryFrame_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2008, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_ENTRYFRAME_ZERO_HPP
-#define CPU_ZERO_VM_ENTRYFRAME_ZERO_HPP
+#ifndef CPU_ZERO_ENTRYFRAME_ZERO_HPP
+#define CPU_ZERO_ENTRYFRAME_ZERO_HPP
 
 #include "runtime/javaCalls.hpp"
 #include "stack_zero.hpp"
@@ -70,4 +70,4 @@
                      int   buflen) const;
 };
 
-#endif // CPU_ZERO_VM_ENTRYFRAME_ZERO_HPP
+#endif // CPU_ZERO_ENTRYFRAME_ZERO_HPP
--- a/src/hotspot/cpu/zero/entry_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/entry_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2008, 2009, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_ENTRY_ZERO_HPP
-#define CPU_ZERO_VM_ENTRY_ZERO_HPP
+#ifndef CPU_ZERO_ENTRY_ZERO_HPP
+#define CPU_ZERO_ENTRY_ZERO_HPP
 
 #include "interpreter/cppInterpreter.hpp"
 
@@ -78,4 +78,4 @@
   }
 };
 
-#endif // CPU_ZERO_VM_ENTRY_ZERO_HPP
+#endif // CPU_ZERO_ENTRY_ZERO_HPP
--- a/src/hotspot/cpu/zero/fakeStubFrame_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/fakeStubFrame_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2008, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_FAKESTUBFRAME_ZERO_HPP
-#define CPU_ZERO_VM_FAKESTUBFRAME_ZERO_HPP
+#ifndef CPU_ZERO_FAKESTUBFRAME_ZERO_HPP
+#define CPU_ZERO_FAKESTUBFRAME_ZERO_HPP
 
 #include "stack_zero.hpp"
 
@@ -57,4 +57,4 @@
                      int   buflen) const {}
 };
 
-#endif // CPU_ZERO_VM_FAKESTUBFRAME_ZERO_HPP
+#endif // CPU_ZERO_FAKESTUBFRAME_ZERO_HPP
--- a/src/hotspot/cpu/zero/frame_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/frame_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_FRAME_ZERO_HPP
-#define CPU_ZERO_VM_FRAME_ZERO_HPP
+#ifndef CPU_ZERO_FRAME_ZERO_HPP
+#define CPU_ZERO_FRAME_ZERO_HPP
 
 #include "runtime/synchronizer.hpp"
 
@@ -77,4 +77,4 @@
 
   static jint interpreter_frame_expression_stack_direction() { return -1; }
 
-#endif // CPU_ZERO_VM_FRAME_ZERO_HPP
+#endif // CPU_ZERO_FRAME_ZERO_HPP
--- a/src/hotspot/cpu/zero/frame_zero.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/frame_zero.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_FRAME_ZERO_INLINE_HPP
-#define CPU_ZERO_VM_FRAME_ZERO_INLINE_HPP
+#ifndef CPU_ZERO_FRAME_ZERO_INLINE_HPP
+#define CPU_ZERO_FRAME_ZERO_INLINE_HPP
 
 #include "code/codeCache.hpp"
 
@@ -164,4 +164,4 @@
   return (intptr_t *) -1;
 }
 
-#endif // CPU_ZERO_VM_FRAME_ZERO_INLINE_HPP
+#endif // CPU_ZERO_FRAME_ZERO_INLINE_HPP
--- a/src/hotspot/cpu/zero/globalDefinitions_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/globalDefinitions_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2009, 2015, Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_GLOBALDEFINITIONS_ZERO_HPP
-#define CPU_ZERO_VM_GLOBALDEFINITIONS_ZERO_HPP
+#ifndef CPU_ZERO_GLOBALDEFINITIONS_ZERO_HPP
+#define CPU_ZERO_GLOBALDEFINITIONS_ZERO_HPP
 
 #ifdef _LP64
 #define SUPPORTS_NATIVE_CX8
@@ -36,4 +36,4 @@
 // 32-bit integer argument values are extended to 64 bits.
 const bool CCallingConventionRequiresIntsAsLongs = false;
 
-#endif // CPU_ZERO_VM_GLOBALDEFINITIONS_ZERO_HPP
+#endif // CPU_ZERO_GLOBALDEFINITIONS_ZERO_HPP
--- a/src/hotspot/cpu/zero/globals_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/globals_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2008, 2009, 2010, 2011 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_GLOBALS_ZERO_HPP
-#define CPU_ZERO_VM_GLOBALS_ZERO_HPP
+#ifndef CPU_ZERO_GLOBALS_ZERO_HPP
+#define CPU_ZERO_GLOBALS_ZERO_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -97,4 +97,4 @@
           "Use fast method entry code for accessor methods")                \
                                                                             \
 
-#endif // CPU_ZERO_VM_GLOBALS_ZERO_HPP
+#endif // CPU_ZERO_GLOBALS_ZERO_HPP
--- a/src/hotspot/cpu/zero/icache_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/icache_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2009 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_ICACHE_ZERO_HPP
-#define CPU_ZERO_VM_ICACHE_ZERO_HPP
+#ifndef CPU_ZERO_ICACHE_ZERO_HPP
+#define CPU_ZERO_ICACHE_ZERO_HPP
 
 // Interface for updating the instruction cache.  Whenever the VM
 // modifies code, part of the processor instruction cache potentially
@@ -38,4 +38,4 @@
   static void invalidate_range(address start, int nbytes) {}
 };
 
-#endif // CPU_ZERO_VM_ICACHE_ZERO_HPP
+#endif // CPU_ZERO_ICACHE_ZERO_HPP
--- a/src/hotspot/cpu/zero/interp_masm_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/interp_masm_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_INTERP_MASM_ZERO_HPP
-#define CPU_ZERO_VM_INTERP_MASM_ZERO_HPP
+#ifndef CPU_ZERO_INTERP_MASM_ZERO_HPP
+#define CPU_ZERO_INTERP_MASM_ZERO_HPP
 
 #include "asm/codeBuffer.hpp"
 #include "asm/macroAssembler.hpp"
@@ -45,4 +45,4 @@
   }
 };
 
-#endif // CPU_ZERO_VM_INTERP_MASM_ZERO_HPP
+#endif // CPU_ZERO_INTERP_MASM_ZERO_HPP
--- a/src/hotspot/cpu/zero/interpreterFrame_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/interpreterFrame_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2008, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_INTERPRETERFRAME_ZERO_HPP
-#define CPU_ZERO_VM_INTERPRETERFRAME_ZERO_HPP
+#ifndef CPU_ZERO_INTERPRETERFRAME_ZERO_HPP
+#define CPU_ZERO_INTERPRETERFRAME_ZERO_HPP
 
 #include "interpreter/bytecodeInterpreter.hpp"
 #include "oops/method.hpp"
@@ -81,4 +81,4 @@
 };
 #endif // CC_INTERP
 
-#endif // CPU_ZERO_VM_INTERPRETERFRAME_ZERO_HPP
+#endif // CPU_ZERO_INTERPRETERFRAME_ZERO_HPP
--- a/src/hotspot/cpu/zero/interpreterRT_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/interpreterRT_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2008 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_INTERPRETERRT_ZERO_HPP
-#define CPU_ZERO_VM_INTERPRETERRT_ZERO_HPP
+#ifndef CPU_ZERO_INTERPRETERRT_ZERO_HPP
+#define CPU_ZERO_INTERPRETERRT_ZERO_HPP
 
 // This is included in the middle of class Interpreter.
 // Do not include files here.
@@ -133,4 +133,4 @@
   }
 };
 
-#endif // CPU_ZERO_VM_INTERPRETERRT_ZERO_HPP
+#endif // CPU_ZERO_INTERPRETERRT_ZERO_HPP
--- a/src/hotspot/cpu/zero/javaFrameAnchor_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/javaFrameAnchor_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2008, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_JAVAFRAMEANCHOR_ZERO_HPP
-#define CPU_ZERO_VM_JAVAFRAMEANCHOR_ZERO_HPP
+#ifndef CPU_ZERO_JAVAFRAMEANCHOR_ZERO_HPP
+#define CPU_ZERO_JAVAFRAMEANCHOR_ZERO_HPP
 
  private:
   ZeroFrame* volatile _last_Java_fp;
@@ -93,4 +93,4 @@
     return byte_offset_of(JavaFrameAnchor, _last_Java_fp);
   }
 
-#endif // CPU_ZERO_VM_JAVAFRAMEANCHOR_ZERO_HPP
+#endif // CPU_ZERO_JAVAFRAMEANCHOR_ZERO_HPP
--- a/src/hotspot/cpu/zero/jniTypes_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/jniTypes_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_JNITYPES_ZERO_HPP
-#define CPU_ZERO_VM_JNITYPES_ZERO_HPP
+#ifndef CPU_ZERO_JNITYPES_ZERO_HPP
+#define CPU_ZERO_JNITYPES_ZERO_HPP
 
 #include "jni.h"
 #include "memory/allocation.hpp"
@@ -114,4 +114,4 @@
 
 };
 
-#endif // CPU_ZERO_VM_JNITYPES_ZERO_HPP
+#endif // CPU_ZERO_JNITYPES_ZERO_HPP
--- a/src/hotspot/cpu/zero/macroAssembler_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/macroAssembler_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,9 +22,9 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_MACROASSEMBLER_ZERO_HPP
-#define CPU_ZERO_VM_MACROASSEMBLER_ZERO_HPP
+#ifndef CPU_ZERO_MACROASSEMBLER_ZERO_HPP
+#define CPU_ZERO_MACROASSEMBLER_ZERO_HPP
 
 // Needed for includes in shared files.
 
-#endif // CPU_ZERO_VM_MACROASSEMBLER_ZERO_HPP
+#endif // CPU_ZERO_MACROASSEMBLER_ZERO_HPP
--- a/src/hotspot/cpu/zero/macroAssembler_zero.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/macroAssembler_zero.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,9 +22,9 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_MACROASSEMBLER_ZERO_INLINE_HPP
-#define CPU_ZERO_VM_MACROASSEMBLER_ZERO_INLINE_HPP
+#ifndef CPU_ZERO_MACROASSEMBLER_ZERO_INLINE_HPP
+#define CPU_ZERO_MACROASSEMBLER_ZERO_INLINE_HPP
 
 // Needed for includes in shared files.
 
-#endif // CPU_ZERO_VM_MACROASSEMBLER_ZERO_INLINE_HPP
+#endif // CPU_ZERO_MACROASSEMBLER_ZERO_INLINE_HPP
--- a/src/hotspot/cpu/zero/nativeInst_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/nativeInst_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_NATIVEINST_ZERO_HPP
-#define CPU_ZERO_VM_NATIVEINST_ZERO_HPP
+#ifndef CPU_ZERO_NATIVEINST_ZERO_HPP
+#define CPU_ZERO_NATIVEINST_ZERO_HPP
 
 #include "asm/assembler.hpp"
 #include "runtime/icache.hpp"
@@ -210,4 +210,4 @@
   return NULL;
 }
 
-#endif // CPU_ZERO_VM_NATIVEINST_ZERO_HPP
+#endif // CPU_ZERO_NATIVEINST_ZERO_HPP
--- a/src/hotspot/cpu/zero/registerMap_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/registerMap_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_REGISTERMAP_ZERO_HPP
-#define CPU_ZERO_VM_REGISTERMAP_ZERO_HPP
+#ifndef CPU_ZERO_REGISTERMAP_ZERO_HPP
+#define CPU_ZERO_REGISTERMAP_ZERO_HPP
 
   // machine-dependent implemention for register maps
   friend class frame;
@@ -41,4 +41,4 @@
   void pd_initialize() {}
   void pd_initialize_from(const RegisterMap* map) {}
 
-#endif // CPU_ZERO_VM_REGISTERMAP_ZERO_HPP
+#endif // CPU_ZERO_REGISTERMAP_ZERO_HPP
--- a/src/hotspot/cpu/zero/register_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/register_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_REGISTER_ZERO_HPP
-#define CPU_ZERO_VM_REGISTER_ZERO_HPP
+#ifndef CPU_ZERO_REGISTER_ZERO_HPP
+#define CPU_ZERO_REGISTER_ZERO_HPP
 
 #include "asm/register.hpp"
 #include "vm_version_zero.hpp"
@@ -118,4 +118,4 @@
 #define noreg ((Register)(noreg_RegisterEnumValue))
 #endif
 
-#endif // CPU_ZERO_VM_REGISTER_ZERO_HPP
+#endif // CPU_ZERO_REGISTER_ZERO_HPP
--- a/src/hotspot/cpu/zero/relocInfo_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/relocInfo_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_RELOCINFO_ZERO_HPP
-#define CPU_ZERO_VM_RELOCINFO_ZERO_HPP
+#ifndef CPU_ZERO_RELOCINFO_ZERO_HPP
+#define CPU_ZERO_RELOCINFO_ZERO_HPP
 
   // machine-dependent parts of class relocInfo
  private:
@@ -38,4 +38,4 @@
 
   static bool mustIterateImmediateOopsInCode() { return true; }
 
-#endif // CPU_ZERO_VM_RELOCINFO_ZERO_HPP
+#endif // CPU_ZERO_RELOCINFO_ZERO_HPP
--- a/src/hotspot/cpu/zero/stack_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/stack_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2008, 2009, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_STACK_ZERO_HPP
-#define CPU_ZERO_VM_STACK_ZERO_HPP
+#ifndef CPU_ZERO_STACK_ZERO_HPP
+#define CPU_ZERO_STACK_ZERO_HPP
 
 #include "utilities/align.hpp"
 #include "utilities/sizes.hpp"
@@ -212,4 +212,4 @@
                         int       buflen) const;
 };
 
-#endif // CPU_ZERO_VM_STACK_ZERO_HPP
+#endif // CPU_ZERO_STACK_ZERO_HPP
--- a/src/hotspot/cpu/zero/stack_zero.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/stack_zero.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_STACK_ZERO_INLINE_HPP
-#define CPU_ZERO_VM_STACK_ZERO_INLINE_HPP
+#ifndef CPU_ZERO_STACK_ZERO_INLINE_HPP
+#define CPU_ZERO_STACK_ZERO_INLINE_HPP
 
 #include "runtime/thread.hpp"
 #include "stack_zero.hpp"
@@ -54,4 +54,4 @@
   return stack_free;
 }
 
-#endif // CPU_ZERO_VM_STACK_ZERO_INLINE_HPP
+#endif // CPU_ZERO_STACK_ZERO_INLINE_HPP
--- a/src/hotspot/cpu/zero/stubRoutines_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/stubRoutines_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_STUBROUTINES_ZERO_HPP
-#define CPU_ZERO_VM_STUBROUTINES_ZERO_HPP
+#ifndef CPU_ZERO_STUBROUTINES_ZERO_HPP
+#define CPU_ZERO_STUBROUTINES_ZERO_HPP
 
   // This file holds the platform specific parts of the StubRoutines
   // definition. See stubRoutines.hpp for a description on how to
@@ -48,4 +48,4 @@
     method_handles_adapters_code_size = 0
   };
 
-#endif // CPU_ZERO_VM_STUBROUTINES_ZERO_HPP
+#endif // CPU_ZERO_STUBROUTINES_ZERO_HPP
--- a/src/hotspot/cpu/zero/vmStructs_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/vmStructs_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_VMSTRUCTS_ZERO_HPP
-#define CPU_ZERO_VM_VMSTRUCTS_ZERO_HPP
+#ifndef CPU_ZERO_VMSTRUCTS_ZERO_HPP
+#define CPU_ZERO_VMSTRUCTS_ZERO_HPP
 
 // These are the CPU-specific fields, types and integer
 // constants required by the Serviceability Agent. This file is
@@ -38,4 +38,4 @@
 
 #define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
 
-#endif // CPU_ZERO_VM_VMSTRUCTS_ZERO_HPP
+#endif // CPU_ZERO_VMSTRUCTS_ZERO_HPP
--- a/src/hotspot/cpu/zero/vm_version_ext_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/vm_version_ext_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_VM_VERSION_EXT_ZERO_HPP
-#define CPU_ZERO_VM_VM_VERSION_EXT_ZERO_HPP
+#ifndef CPU_ZERO_VM_VERSION_EXT_ZERO_HPP
+#define CPU_ZERO_VM_VERSION_EXT_ZERO_HPP
 
 #include "utilities/macros.hpp"
 #include "vm_version_zero.hpp"
@@ -51,4 +51,4 @@
 
 };
 
-#endif // CPU_ZERO_VM_VM_VERSION_EXT_ZERO_HPP
+#endif // CPU_ZERO_VM_VERSION_EXT_ZERO_HPP
--- a/src/hotspot/cpu/zero/vm_version_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/vm_version_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_VM_VERSION_ZERO_HPP
-#define CPU_ZERO_VM_VM_VERSION_ZERO_HPP
+#ifndef CPU_ZERO_VM_VERSION_ZERO_HPP
+#define CPU_ZERO_VM_VERSION_ZERO_HPP
 
 #include "runtime/globals_extension.hpp"
 #include "runtime/vm_version.hpp"
@@ -34,4 +34,4 @@
   static void initialize();
 };
 
-#endif // CPU_ZERO_VM_VM_VERSION_ZERO_HPP
+#endif // CPU_ZERO_VM_VERSION_ZERO_HPP
--- a/src/hotspot/cpu/zero/vmreg_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/vmreg_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_VMREG_ZERO_HPP
-#define CPU_ZERO_VM_VMREG_ZERO_HPP
+#ifndef CPU_ZERO_VMREG_ZERO_HPP
+#define CPU_ZERO_VMREG_ZERO_HPP
 
   bool is_Register();
   Register as_Register();
@@ -31,4 +31,4 @@
   bool is_FloatRegister();
   FloatRegister as_FloatRegister();
 
-#endif // CPU_ZERO_VM_VMREG_ZERO_HPP
+#endif // CPU_ZERO_VMREG_ZERO_HPP
--- a/src/hotspot/cpu/zero/vmreg_zero.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/cpu/zero/vmreg_zero.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CPU_ZERO_VM_VMREG_ZERO_INLINE_HPP
-#define CPU_ZERO_VM_VMREG_ZERO_INLINE_HPP
+#ifndef CPU_ZERO_VMREG_ZERO_INLINE_HPP
+#define CPU_ZERO_VMREG_ZERO_INLINE_HPP
 
 inline VMReg RegisterImpl::as_VMReg() {
   return VMRegImpl::as_VMReg(encoding());
@@ -34,4 +34,4 @@
   return VMRegImpl::as_VMReg(encoding() + ConcreteRegisterImpl::max_gpr);
 }
 
-#endif // CPU_ZERO_VM_VMREG_ZERO_INLINE_HPP
+#endif // CPU_ZERO_VMREG_ZERO_INLINE_HPP
--- a/src/hotspot/os/aix/c1_globals_aix.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/aix/c1_globals_aix.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_AIX_VM_C1_GLOBALS_AIX_HPP
-#define OS_AIX_VM_C1_GLOBALS_AIX_HPP
+#ifndef OS_AIX_C1_GLOBALS_AIX_HPP
+#define OS_AIX_C1_GLOBALS_AIX_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -34,4 +34,4 @@
 // client compiler. (see c1_globals.hpp)
 //
 
-#endif // OS_AIX_VM_C1_GLOBALS_AIX_HPP
+#endif // OS_AIX_C1_GLOBALS_AIX_HPP
--- a/src/hotspot/os/aix/c2_globals_aix.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/aix/c2_globals_aix.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_AIX_VM_C2_GLOBALS_AIX_HPP
-#define OS_AIX_VM_C2_GLOBALS_AIX_HPP
+#ifndef OS_AIX_C2_GLOBALS_AIX_HPP
+#define OS_AIX_C2_GLOBALS_AIX_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -34,4 +34,4 @@
 // server compiler. (see c2_globals.hpp)
 //
 
-#endif // OS_AIX_VM_C2_GLOBALS_AIX_HPP
+#endif // OS_AIX_C2_GLOBALS_AIX_HPP
--- a/src/hotspot/os/aix/globals_aix.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/aix/globals_aix.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_AIX_VM_GLOBALS_AIX_HPP
-#define OS_AIX_VM_GLOBALS_AIX_HPP
+#ifndef OS_AIX_GLOBALS_AIX_HPP
+#define OS_AIX_GLOBALS_AIX_HPP
 
 //
 // Defines Aix specific flags. They are not available on other platforms.
@@ -94,4 +94,4 @@
 define_pd_global(bool, UseOSErrorReporting, false);
 define_pd_global(bool, UseThreadPriorities, true) ;
 
-#endif // OS_AIX_VM_GLOBALS_AIX_HPP
+#endif // OS_AIX_GLOBALS_AIX_HPP
--- a/src/hotspot/os/aix/libo4.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/aix/libo4.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -29,8 +29,8 @@
 // functionality (aka ILE layer) to close some functional gaps that exist in
 // the PASE layer.
 
-#ifndef OS_AIX_VM_LIBO4_HPP
-#define OS_AIX_VM_LIBO4_HPP
+#ifndef OS_AIX_LIBO4_HPP
+#define OS_AIX_LIBO4_HPP
 
 class libo4 {
 public:
@@ -87,4 +87,4 @@
   static bool removeEscapeMessageFromJoblogByContext(const void* context);
 };
 
-#endif // OS_AIX_VM_LIBO4_HPP
+#endif // OS_AIX_LIBO4_HPP
--- a/src/hotspot/os/aix/libodm_aix.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/aix/libodm_aix.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2015, 2015 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -25,8 +25,8 @@
 
 // Encapsulates the libodm library and provides more convenient interfaces.
 
-#ifndef OS_AIX_VM_LIBODM_AIX_HPP
-#define OS_AIX_VM_LIBODM_AIX_HPP
+#ifndef OS_AIX_LIBODM_AIX_HPP
+#define OS_AIX_LIBODM_AIX_HPP
 
 #include <odmi.h>
 
@@ -103,4 +103,4 @@
   static void determine_os_kernel_version(uint32_t* p_ver);
 };
 
-#endif // OS_AIX_VM_LIBODM_AIX_HPP
+#endif // OS_AIX_LIBODM_AIX_HPP
--- a/src/hotspot/os/aix/libperfstat_aix.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/aix/libperfstat_aix.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -29,8 +29,8 @@
 // AIX-specific library which only exists on AIX, not on PASE. If I want to
 // share binaries between AIX and PASE, I cannot directly link against libperfstat.so.
 
-#ifndef OS_AIX_VM_LIBPERFSTAT_AIX_HPP
-#define OS_AIX_VM_LIBPERFSTAT_AIX_HPP
+#ifndef OS_AIX_LIBPERFSTAT_AIX_HPP
+#define OS_AIX_LIBPERFSTAT_AIX_HPP
 
 #include <sys/types.h>
 #include <stdlib.h>
@@ -966,4 +966,4 @@
   static bool get_wparinfo(wparinfo_t* pwi);
 };
 
-#endif // OS_AIX_VM_LIBPERFSTAT_AIX_HPP
+#endif // OS_AIX_LIBPERFSTAT_AIX_HPP
--- a/src/hotspot/os/aix/loadlib_aix.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/aix/loadlib_aix.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -29,8 +29,8 @@
 // It is needed, among other things, to provide dladdr(3), which is
 // missing on AIX.
 
-#ifndef OS_AIX_VM_LOADLIB_AIX_HPP
-#define OS_AIX_VM_LOADLIB_AIX_HPP
+#ifndef OS_AIX_LOADLIB_AIX_HPP
+#define OS_AIX_LOADLIB_AIX_HPP
 
 #include <stddef.h>
 
@@ -101,4 +101,4 @@
 
 };
 
-#endif // OS_AIX_VM_LOADLIB_AIX_HPP
+#endif // OS_AIX_LOADLIB_AIX_HPP
--- a/src/hotspot/os/aix/misc_aix.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/aix/misc_aix.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef OS_AIX_VM_MISC_AIX_HPP
-#define OS_AIX_VM_MISC_AIX_HPP
+#ifndef OS_AIX_MISC_AIX_HPP
+#define OS_AIX_MISC_AIX_HPP
 
 // misc_aix.hpp, misc_aix.cpp: convenience functions needed for the OpenJDK AIX
 // port.
@@ -90,5 +90,4 @@
   };
 }
 
-#endif // OS_AIX_VM_MISC_AIX_HPP
-
+#endif // OS_AIX_MISC_AIX_HPP
--- a/src/hotspot/os/aix/osThread_aix.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/aix/osThread_aix.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_AIX_VM_OSTHREAD_AIX_HPP
-#define OS_AIX_VM_OSTHREAD_AIX_HPP
+#ifndef OS_AIX_OSTHREAD_AIX_HPP
+#define OS_AIX_OSTHREAD_AIX_HPP
 
  public:
   typedef pthread_t thread_id_t;
@@ -150,4 +150,4 @@
     jlong user;
   } _last_cpu_times;
 
-#endif // OS_AIX_VM_OSTHREAD_AIX_HPP
+#endif // OS_AIX_OSTHREAD_AIX_HPP
--- a/src/hotspot/os/aix/os_aix.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/aix/os_aix.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2013, 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_AIX_VM_OS_AIX_HPP
-#define OS_AIX_VM_OS_AIX_HPP
+#ifndef OS_AIX_OS_AIX_HPP
+#define OS_AIX_OS_AIX_HPP
 
 // Information about the protection of the page at address '0' on this os.
 static bool zero_page_read_protected() { return false; }
@@ -212,4 +212,4 @@
 
 };
 
-#endif // OS_AIX_VM_OS_AIX_HPP
+#endif // OS_AIX_OS_AIX_HPP
--- a/src/hotspot/os/aix/os_aix.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/aix/os_aix.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_AIX_VM_OS_AIX_INLINE_HPP
-#define OS_AIX_VM_OS_AIX_INLINE_HPP
+#ifndef OS_AIX_OS_AIX_INLINE_HPP
+#define OS_AIX_OS_AIX_INLINE_HPP
 
 #include "runtime/os.hpp"
 
@@ -151,4 +151,4 @@
   ::exit(num);
 }
 
-#endif // OS_AIX_VM_OS_AIX_INLINE_HPP
+#endif // OS_AIX_OS_AIX_INLINE_HPP
--- a/src/hotspot/os/aix/os_share_aix.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/aix/os_share_aix.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_AIX_VM_OS_SHARE_AIX_HPP
-#define OS_AIX_VM_OS_SHARE_AIX_HPP
+#ifndef OS_AIX_OS_SHARE_AIX_HPP
+#define OS_AIX_OS_SHARE_AIX_HPP
 
 // misc
 void handle_unexpected_exception(Thread* thread, int sig, siginfo_t* info, address pc, address adjusted_pc);
@@ -33,4 +33,4 @@
 
 #define PROCFILE_LENGTH 128
 
-#endif // OS_AIX_VM_OS_SHARE_AIX_HPP
+#endif // OS_AIX_OS_SHARE_AIX_HPP
--- a/src/hotspot/os/aix/porting_aix.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/aix/porting_aix.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_AIX_VM_PORTING_AIX_HPP
-#define OS_AIX_VM_PORTING_AIX_HPP
+#ifndef OS_AIX_PORTING_AIX_HPP
+#define OS_AIX_PORTING_AIX_HPP
 
 #include <stddef.h>
 
@@ -107,5 +107,4 @@
 
 };
 
-#endif // OS_AIX_VM_PORTING_AIX_HPP
-
+#endif // OS_AIX_PORTING_AIX_HPP
--- a/src/hotspot/os/aix/vmStructs_aix.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/aix/vmStructs_aix.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_AIX_VM_VMSTRUCTS_AIX_HPP
-#define OS_AIX_VM_VMSTRUCTS_AIX_HPP
+#ifndef OS_AIX_VMSTRUCTS_AIX_HPP
+#define OS_AIX_VMSTRUCTS_AIX_HPP
 
 // These are the OS-specific fields, types and integer
 // constants required by the Serviceability Agent. This file is
@@ -39,4 +39,4 @@
 
 #define VM_ADDRESSES_OS(declare_address, declare_preprocessor_address, declare_function)
 
-#endif // OS_AIX_VM_VMSTRUCTS_AIX_HPP
+#endif // OS_AIX_VMSTRUCTS_AIX_HPP
--- a/src/hotspot/os/bsd/c1_globals_bsd.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/bsd/c1_globals_bsd.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_BSD_VM_C1_GLOBALS_BSD_HPP
-#define OS_BSD_VM_C1_GLOBALS_BSD_HPP
+#ifndef OS_BSD_C1_GLOBALS_BSD_HPP
+#define OS_BSD_C1_GLOBALS_BSD_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -33,4 +33,4 @@
 // client compiler. (see c1_globals.hpp)
 //
 
-#endif // OS_BSD_VM_C1_GLOBALS_BSD_HPP
+#endif // OS_BSD_C1_GLOBALS_BSD_HPP
--- a/src/hotspot/os/bsd/c2_globals_bsd.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/bsd/c2_globals_bsd.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_BSD_VM_C2_GLOBALS_BSD_HPP
-#define OS_BSD_VM_C2_GLOBALS_BSD_HPP
+#ifndef OS_BSD_C2_GLOBALS_BSD_HPP
+#define OS_BSD_C2_GLOBALS_BSD_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -33,4 +33,4 @@
 // server compiler. (see c2_globals.hpp)
 //
 
-#endif // OS_BSD_VM_C2_GLOBALS_BSD_HPP
+#endif // OS_BSD_C2_GLOBALS_BSD_HPP
--- a/src/hotspot/os/bsd/decoder_machO.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/bsd/decoder_machO.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_BSD_VM_DECODER_MACHO_HPP
-#define OS_BSD_VM_DECODER_MACHO_HPP
+#ifndef OS_BSD_DECODER_MACHO_HPP
+#define OS_BSD_DECODER_MACHO_HPP
 
 #ifdef __APPLE__
 
@@ -51,4 +51,4 @@
 
 #endif
 
-#endif // OS_BSD_VM_DECODER_MACHO_HPP
+#endif // OS_BSD_DECODER_MACHO_HPP
--- a/src/hotspot/os/bsd/globals_bsd.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/bsd/globals_bsd.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_BSD_VM_GLOBALS_BSD_HPP
-#define OS_BSD_VM_GLOBALS_BSD_HPP
+#ifndef OS_BSD_GLOBALS_BSD_HPP
+#define OS_BSD_GLOBALS_BSD_HPP
 
 //
 // Defines Bsd specific flags. They are not available on other platforms.
@@ -56,4 +56,4 @@
 define_pd_global(bool, UseOSErrorReporting, false);
 define_pd_global(bool, UseThreadPriorities, true) ;
 
-#endif // OS_BSD_VM_GLOBALS_BSD_HPP
+#endif // OS_BSD_GLOBALS_BSD_HPP
--- a/src/hotspot/os/bsd/osThread_bsd.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/bsd/osThread_bsd.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_BSD_VM_OSTHREAD_BSD_HPP
-#define OS_BSD_VM_OSTHREAD_BSD_HPP
+#ifndef OS_BSD_OSTHREAD_BSD_HPP
+#define OS_BSD_OSTHREAD_BSD_HPP
 
  private:
   int _thread_type;
@@ -149,4 +149,4 @@
 // osThread_solaris.hpp 1.24 99/08/27 13:11:54
 // End
 
-#endif // OS_BSD_VM_OSTHREAD_BSD_HPP
+#endif // OS_BSD_OSTHREAD_BSD_HPP
--- a/src/hotspot/os/bsd/os_bsd.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/bsd/os_bsd.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_BSD_VM_OS_BSD_HPP
-#define OS_BSD_VM_OS_BSD_HPP
+#ifndef OS_BSD_OS_BSD_HPP
+#define OS_BSD_OS_BSD_HPP
 
 // Bsd_OS defines the interface to Bsd operating systems
 
@@ -159,4 +159,4 @@
   static int get_node_by_cpu(int cpu_id);
 };
 
-#endif // OS_BSD_VM_OS_BSD_HPP
+#endif // OS_BSD_OS_BSD_HPP
--- a/src/hotspot/os/bsd/os_bsd.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/bsd/os_bsd.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_BSD_VM_OS_BSD_INLINE_HPP
-#define OS_BSD_VM_OS_BSD_INLINE_HPP
+#ifndef OS_BSD_OS_BSD_INLINE_HPP
+#define OS_BSD_OS_BSD_INLINE_HPP
 
 #include "runtime/os.hpp"
 
@@ -156,4 +156,4 @@
   ::exit(num);
 }
 
-#endif // OS_BSD_VM_OS_BSD_INLINE_HPP
+#endif // OS_BSD_OS_BSD_INLINE_HPP
--- a/src/hotspot/os/bsd/os_share_bsd.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/bsd/os_share_bsd.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_BSD_VM_OS_SHARE_BSD_HPP
-#define OS_BSD_VM_OS_SHARE_BSD_HPP
+#ifndef OS_BSD_OS_SHARE_BSD_HPP
+#define OS_BSD_OS_SHARE_BSD_HPP
 
 // misc
 void handle_unexpected_exception(Thread* thread, int sig, siginfo_t* info, address pc, address adjusted_pc);
@@ -33,4 +33,4 @@
 
 #define PROCFILE_LENGTH 128
 
-#endif // OS_BSD_VM_OS_SHARE_BSD_HPP
+#endif // OS_BSD_OS_SHARE_BSD_HPP
--- a/src/hotspot/os/bsd/semaphore_bsd.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/bsd/semaphore_bsd.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_BSD_VM_SEMAPHORE_BSD_HPP
-#define OS_BSD_VM_SEMAPHORE_BSD_HPP
+#ifndef OS_BSD_SEMAPHORE_BSD_HPP
+#define OS_BSD_SEMAPHORE_BSD_HPP
 
 #ifndef __APPLE__
 // Use POSIX semaphores.
@@ -60,4 +60,4 @@
 
 #endif // __APPLE__
 
-#endif // OS_BSD_VM_SEMAPHORE_BSD_HPP
+#endif // OS_BSD_SEMAPHORE_BSD_HPP
--- a/src/hotspot/os/bsd/vmStructs_bsd.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/bsd/vmStructs_bsd.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_BSD_VM_VMSTRUCTS_BSD_HPP
-#define OS_BSD_VM_VMSTRUCTS_BSD_HPP
+#ifndef OS_BSD_VMSTRUCTS_BSD_HPP
+#define OS_BSD_VMSTRUCTS_BSD_HPP
 
 #include <dlfcn.h>
 
@@ -42,4 +42,4 @@
 #define VM_ADDRESSES_OS(declare_address, declare_preprocessor_address, declare_function) \
   declare_preprocessor_address("RTLD_DEFAULT", RTLD_DEFAULT)
 
-#endif // OS_BSD_VM_VMSTRUCTS_BSD_HPP
+#endif // OS_BSD_VMSTRUCTS_BSD_HPP
--- a/src/hotspot/os/linux/c1_globals_linux.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/linux/c1_globals_linux.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_LINUX_VM_C1_GLOBALS_LINUX_HPP
-#define OS_LINUX_VM_C1_GLOBALS_LINUX_HPP
+#ifndef OS_LINUX_C1_GLOBALS_LINUX_HPP
+#define OS_LINUX_C1_GLOBALS_LINUX_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -33,4 +33,4 @@
 // client compiler. (see c1_globals.hpp)
 //
 
-#endif // OS_LINUX_VM_C1_GLOBALS_LINUX_HPP
+#endif // OS_LINUX_C1_GLOBALS_LINUX_HPP
--- a/src/hotspot/os/linux/c2_globals_linux.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/linux/c2_globals_linux.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_LINUX_VM_C2_GLOBALS_LINUX_HPP
-#define OS_LINUX_VM_C2_GLOBALS_LINUX_HPP
+#ifndef OS_LINUX_C2_GLOBALS_LINUX_HPP
+#define OS_LINUX_C2_GLOBALS_LINUX_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -33,4 +33,4 @@
 // server compiler. (see c2_globals.hpp)
 //
 
-#endif // OS_LINUX_VM_C2_GLOBALS_LINUX_HPP
+#endif // OS_LINUX_C2_GLOBALS_LINUX_HPP
--- a/src/hotspot/os/linux/globals_linux.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/linux/globals_linux.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_LINUX_VM_GLOBALS_LINUX_HPP
-#define OS_LINUX_VM_GLOBALS_LINUX_HPP
+#ifndef OS_LINUX_GLOBALS_LINUX_HPP
+#define OS_LINUX_GLOBALS_LINUX_HPP
 
 //
 // Defines Linux specific flags. They are not available on other platforms.
@@ -84,4 +84,4 @@
 define_pd_global(bool, UseOSErrorReporting, false);
 define_pd_global(bool, UseThreadPriorities, true) ;
 
-#endif // OS_LINUX_VM_GLOBALS_LINUX_HPP
+#endif // OS_LINUX_GLOBALS_LINUX_HPP
--- a/src/hotspot/os/linux/osContainer_linux.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/linux/osContainer_linux.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_LINUX_VM_OSCONTAINER_LINUX_HPP
-#define OS_LINUX_VM_OSCONTAINER_LINUX_HPP
+#ifndef OS_LINUX_OSCONTAINER_LINUX_HPP
+#define OS_LINUX_OSCONTAINER_LINUX_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -65,4 +65,4 @@
   return _is_containerized;
 }
 
-#endif // OS_LINUX_VM_OSCONTAINER_LINUX_HPP
+#endif // OS_LINUX_OSCONTAINER_LINUX_HPP
--- a/src/hotspot/os/linux/osThread_linux.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/linux/osThread_linux.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_LINUX_VM_OSTHREAD_LINUX_HPP
-#define OS_LINUX_VM_OSTHREAD_LINUX_HPP
+#ifndef OS_LINUX_OSTHREAD_LINUX_HPP
+#define OS_LINUX_OSTHREAD_LINUX_HPP
  public:
   typedef pid_t thread_id_t;
 
@@ -132,4 +132,4 @@
 // osThread_solaris.hpp 1.24 99/08/27 13:11:54
 // End
 
-#endif // OS_LINUX_VM_OSTHREAD_LINUX_HPP
+#endif // OS_LINUX_OSTHREAD_LINUX_HPP
--- a/src/hotspot/os/linux/os_linux.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/linux/os_linux.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_LINUX_VM_OS_LINUX_HPP
-#define OS_LINUX_VM_OS_LINUX_HPP
+#ifndef OS_LINUX_OS_LINUX_HPP
+#define OS_LINUX_OS_LINUX_HPP
 
 // Linux_OS defines the interface to Linux operating systems
 
@@ -353,4 +353,4 @@
   }
 };
 
-#endif // OS_LINUX_VM_OS_LINUX_HPP
+#endif // OS_LINUX_OS_LINUX_HPP
--- a/src/hotspot/os/linux/os_linux.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/linux/os_linux.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_LINUX_VM_OS_LINUX_INLINE_HPP
-#define OS_LINUX_VM_OS_LINUX_INLINE_HPP
+#ifndef OS_LINUX_OS_LINUX_INLINE_HPP
+#define OS_LINUX_OS_LINUX_INLINE_HPP
 
 #include "runtime/os.hpp"
 
@@ -144,4 +144,4 @@
   ::exit(num);
 }
 
-#endif // OS_LINUX_VM_OS_LINUX_INLINE_HPP
+#endif // OS_LINUX_OS_LINUX_INLINE_HPP
--- a/src/hotspot/os/linux/os_share_linux.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/linux/os_share_linux.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_LINUX_VM_OS_SHARE_LINUX_HPP
-#define OS_LINUX_VM_OS_SHARE_LINUX_HPP
+#ifndef OS_LINUX_OS_SHARE_LINUX_HPP
+#define OS_LINUX_OS_SHARE_LINUX_HPP
 
 // misc
 void handle_unexpected_exception(Thread* thread, int sig, siginfo_t* info, address pc, address adjusted_pc);
@@ -33,4 +33,4 @@
 
 #define PROCFILE_LENGTH 128
 
-#endif // OS_LINUX_VM_OS_SHARE_LINUX_HPP
+#endif // OS_LINUX_OS_SHARE_LINUX_HPP
--- a/src/hotspot/os/linux/vmStructs_linux.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/linux/vmStructs_linux.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_LINUX_VM_VMSTRUCTS_LINUX_HPP
-#define OS_LINUX_VM_VMSTRUCTS_LINUX_HPP
+#ifndef OS_LINUX_VMSTRUCTS_LINUX_HPP
+#define OS_LINUX_VMSTRUCTS_LINUX_HPP
 
 #include <dlfcn.h>
 
@@ -42,4 +42,4 @@
 #define VM_ADDRESSES_OS(declare_address, declare_preprocessor_address, declare_function) \
   declare_preprocessor_address("RTLD_DEFAULT", RTLD_DEFAULT)
 
-#endif // OS_LINUX_VM_VMSTRUCTS_LINUX_HPP
+#endif // OS_LINUX_VMSTRUCTS_LINUX_HPP
--- a/src/hotspot/os/posix/os_posix.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/posix/os_posix.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,8 +24,8 @@
 
 #include "runtime/os.hpp"
 
-#ifndef OS_POSIX_VM_OS_POSIX_HPP
-#define OS_POSIX_VM_OS_POSIX_HPP
+#ifndef OS_POSIX_OS_POSIX_HPP
+#define OS_POSIX_OS_POSIX_HPP
 
 // File conventions
 static const char* file_separator() { return "/"; }
@@ -224,4 +224,4 @@
 
 #endif // !SOLARIS
 
-#endif // OS_POSIX_VM_OS_POSIX_HPP
+#endif // OS_POSIX_OS_POSIX_HPP
--- a/src/hotspot/os/posix/semaphore_posix.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/posix/semaphore_posix.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_POSIX_VM_SEMAPHORE_POSIX_HPP
-#define OS_POSIX_VM_SEMAPHORE_POSIX_HPP
+#ifndef OS_POSIX_SEMAPHORE_POSIX_HPP
+#define OS_POSIX_SEMAPHORE_POSIX_HPP
 
 #include "memory/allocation.hpp"
 
@@ -50,4 +50,4 @@
 
 typedef PosixSemaphore SemaphoreImpl;
 
-#endif // OS_POSIX_VM_SEMAPHORE_POSIX_HPP
+#endif // OS_POSIX_SEMAPHORE_POSIX_HPP
--- a/src/hotspot/os/solaris/c1_globals_solaris.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/solaris/c1_globals_solaris.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_SOLARIS_VM_C1_GLOBALS_SOLARIS_HPP
-#define OS_SOLARIS_VM_C1_GLOBALS_SOLARIS_HPP
+#ifndef OS_SOLARIS_C1_GLOBALS_SOLARIS_HPP
+#define OS_SOLARIS_C1_GLOBALS_SOLARIS_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -33,4 +33,4 @@
 // client compiler. (see c1_globals.hpp)
 //
 
-#endif // OS_SOLARIS_VM_C1_GLOBALS_SOLARIS_HPP
+#endif // OS_SOLARIS_C1_GLOBALS_SOLARIS_HPP
--- a/src/hotspot/os/solaris/c2_globals_solaris.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/solaris/c2_globals_solaris.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_SOLARIS_VM_C2_GLOBALS_SOLARIS_HPP
-#define OS_SOLARIS_VM_C2_GLOBALS_SOLARIS_HPP
+#ifndef OS_SOLARIS_C2_GLOBALS_SOLARIS_HPP
+#define OS_SOLARIS_C2_GLOBALS_SOLARIS_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -33,4 +33,4 @@
 // server compiler. (see c2_globals.hpp)
 //
 
-#endif // OS_SOLARIS_VM_C2_GLOBALS_SOLARIS_HPP
+#endif // OS_SOLARIS_C2_GLOBALS_SOLARIS_HPP
--- a/src/hotspot/os/solaris/globals_solaris.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/solaris/globals_solaris.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_SOLARIS_VM_GLOBALS_SOLARIS_HPP
-#define OS_SOLARIS_VM_GLOBALS_SOLARIS_HPP
+#ifndef OS_SOLARIS_GLOBALS_SOLARIS_HPP
+#define OS_SOLARIS_GLOBALS_SOLARIS_HPP
 
 //
 // Defines Solaris specific flags. They are not available on other platforms.
@@ -51,4 +51,4 @@
 define_pd_global(bool, UseOSErrorReporting, false);
 define_pd_global(bool, UseThreadPriorities, false);
 
-#endif // OS_SOLARIS_VM_GLOBALS_SOLARIS_HPP
+#endif // OS_SOLARIS_GLOBALS_SOLARIS_HPP
--- a/src/hotspot/os/solaris/osThread_solaris.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/solaris/osThread_solaris.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_SOLARIS_VM_OSTHREAD_SOLARIS_HPP
-#define OS_SOLARIS_VM_OSTHREAD_SOLARIS_HPP
+#ifndef OS_SOLARIS_OSTHREAD_SOLARIS_HPP
+#define OS_SOLARIS_OSTHREAD_SOLARIS_HPP
 
 // This is embedded via include into the class OSThread
  public:
@@ -85,4 +85,4 @@
   void pd_initialize();
   void pd_destroy();
 
-#endif // OS_SOLARIS_VM_OSTHREAD_SOLARIS_HPP
+#endif // OS_SOLARIS_OSTHREAD_SOLARIS_HPP
--- a/src/hotspot/os/solaris/os_share_solaris.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/solaris/os_share_solaris.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_SOLARIS_VM_OS_SHARE_SOLARIS_HPP
-#define OS_SOLARIS_VM_OS_SHARE_SOLARIS_HPP
+#ifndef OS_SOLARIS_OS_SHARE_SOLARIS_HPP
+#define OS_SOLARIS_OS_SHARE_SOLARIS_HPP
 
 // Defines the interfaces to Solaris operating systems that vary across platforms
 
@@ -39,4 +39,4 @@
 
 #define PROCFILE_LENGTH 128
 
-#endif // OS_SOLARIS_VM_OS_SHARE_SOLARIS_HPP
+#endif // OS_SOLARIS_OS_SHARE_SOLARIS_HPP
--- a/src/hotspot/os/solaris/os_solaris.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/solaris/os_solaris.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_SOLARIS_VM_OS_SOLARIS_HPP
-#define OS_SOLARIS_VM_OS_SOLARIS_HPP
+#ifndef OS_SOLARIS_OS_SOLARIS_HPP
+#define OS_SOLARIS_OS_SOLARIS_HPP
 
 // Solaris_OS defines the interface to Solaris operating systems
 
@@ -335,4 +335,4 @@
   }
 };
 
-#endif // OS_SOLARIS_VM_OS_SOLARIS_HPP
+#endif // OS_SOLARIS_OS_SOLARIS_HPP
--- a/src/hotspot/os/solaris/os_solaris.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/solaris/os_solaris.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_SOLARIS_VM_OS_SOLARIS_INLINE_HPP
-#define OS_SOLARIS_VM_OS_SOLARIS_INLINE_HPP
+#ifndef OS_SOLARIS_OS_SOLARIS_INLINE_HPP
+#define OS_SOLARIS_OS_SOLARIS_INLINE_HPP
 
 #include "runtime/os.hpp"
 
@@ -105,4 +105,4 @@
   ::exit(num);
 }
 
-#endif // OS_SOLARIS_VM_OS_SOLARIS_INLINE_HPP
+#endif // OS_SOLARIS_OS_SOLARIS_INLINE_HPP
--- a/src/hotspot/os/solaris/vmStructs_solaris.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/solaris/vmStructs_solaris.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_SOLARIS_VM_VMSTRUCTS_SOLARIS_HPP
-#define OS_SOLARIS_VM_VMSTRUCTS_SOLARIS_HPP
+#ifndef OS_SOLARIS_VMSTRUCTS_SOLARIS_HPP
+#define OS_SOLARIS_VMSTRUCTS_SOLARIS_HPP
 
 // These are the OS-specific fields, types and integer
 // constants required by the Serviceability Agent. This file is
@@ -41,4 +41,4 @@
 
 #define VM_ADDRESSES_OS(declare_address, declare_preprocessor_address, declare_function)
 
-#endif // OS_SOLARIS_VM_VMSTRUCTS_SOLARIS_HPP
+#endif // OS_SOLARIS_VMSTRUCTS_SOLARIS_HPP
--- a/src/hotspot/os/windows/c1_globals_windows.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/windows/c1_globals_windows.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_WINDOWS_VM_C1_GLOBALS_WINDOWS_HPP
-#define OS_WINDOWS_VM_C1_GLOBALS_WINDOWS_HPP
+#ifndef OS_WINDOWS_C1_GLOBALS_WINDOWS_HPP
+#define OS_WINDOWS_C1_GLOBALS_WINDOWS_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -33,4 +33,4 @@
 // client compiler. (see c1_globals.hpp)
 //
 
-#endif // OS_WINDOWS_VM_C1_GLOBALS_WINDOWS_HPP
+#endif // OS_WINDOWS_C1_GLOBALS_WINDOWS_HPP
--- a/src/hotspot/os/windows/c2_globals_windows.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/windows/c2_globals_windows.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_WINDOWS_VM_C2_GLOBALS_WINDOWS_HPP
-#define OS_WINDOWS_VM_C2_GLOBALS_WINDOWS_HPP
+#ifndef OS_WINDOWS_C2_GLOBALS_WINDOWS_HPP
+#define OS_WINDOWS_C2_GLOBALS_WINDOWS_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -33,4 +33,4 @@
 // server compiler. (see c2_globals.hpp)
 //
 
-#endif // OS_WINDOWS_VM_C2_GLOBALS_WINDOWS_HPP
+#endif // OS_WINDOWS_C2_GLOBALS_WINDOWS_HPP
--- a/src/hotspot/os/windows/globals_windows.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/windows/globals_windows.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_WINDOWS_VM_GLOBALS_WINDOWS_HPP
-#define OS_WINDOWS_VM_GLOBALS_WINDOWS_HPP
+#ifndef OS_WINDOWS_GLOBALS_WINDOWS_HPP
+#define OS_WINDOWS_GLOBALS_WINDOWS_HPP
 
 //
 // Defines Windows specific flags. They are not available on other platforms.
@@ -49,4 +49,4 @@
 define_pd_global(bool, UseOSErrorReporting, false);  // for now.
 define_pd_global(bool, UseThreadPriorities, true) ;
 
-#endif // OS_WINDOWS_VM_GLOBALS_WINDOWS_HPP
+#endif // OS_WINDOWS_GLOBALS_WINDOWS_HPP
--- a/src/hotspot/os/windows/iphlp_interface.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/windows/iphlp_interface.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_WINDOWS_VM_IPHLP_INTERFACE_HPP
-#define OS_WINDOWS_VM_IPHLP_INTERFACE_HPP
+#ifndef OS_WINDOWS_IPHLP_INTERFACE_HPP
+#define OS_WINDOWS_IPHLP_INTERFACE_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/macros.hpp"
@@ -48,4 +48,4 @@
   static bool       IphlpDetach(void);
 };
 
-#endif // OS_WINDOWS_VM_IPHLP_INTERFACE_HPP
+#endif // OS_WINDOWS_IPHLP_INTERFACE_HPP
--- a/src/hotspot/os/windows/osThread_windows.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/windows/osThread_windows.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_WINDOWS_VM_OSTHREAD_WINDOWS_HPP
-#define OS_WINDOWS_VM_OSTHREAD_WINDOWS_HPP
+#ifndef OS_WINDOWS_OSTHREAD_WINDOWS_HPP
+#define OS_WINDOWS_OSTHREAD_WINDOWS_HPP
 
   typedef void* HANDLE;
  public:
@@ -66,4 +66,4 @@
   void pd_initialize();
   void pd_destroy();
 
-#endif // OS_WINDOWS_VM_OSTHREAD_WINDOWS_HPP
+#endif // OS_WINDOWS_OSTHREAD_WINDOWS_HPP
--- a/src/hotspot/os/windows/os_share_windows.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/windows/os_share_windows.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,9 +22,9 @@
  *
  */
 
-#ifndef OS_WINDOWS_VM_OS_SHARE_WINDOWS_HPP
-#define OS_WINDOWS_VM_OS_SHARE_WINDOWS_HPP
+#ifndef OS_WINDOWS_OS_SHARE_WINDOWS_HPP
+#define OS_WINDOWS_OS_SHARE_WINDOWS_HPP
 
 // Defines the interfaces to Windows operating system that vary across platforms
 
-#endif // OS_WINDOWS_VM_OS_SHARE_WINDOWS_HPP
+#endif // OS_WINDOWS_OS_SHARE_WINDOWS_HPP
--- a/src/hotspot/os/windows/os_windows.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/windows/os_windows.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_WINDOWS_VM_OS_WINDOWS_HPP
-#define OS_WINDOWS_VM_OS_WINDOWS_HPP
+#ifndef OS_WINDOWS_OS_WINDOWS_HPP
+#define OS_WINDOWS_OS_WINDOWS_HPP
 // Win32_OS defines the interface to windows operating systems
 
 // strtok_s is the Windows thread-safe equivalent of POSIX strtok_r
@@ -184,4 +184,4 @@
 
 } ;
 
-#endif // OS_WINDOWS_VM_OS_WINDOWS_HPP
+#endif // OS_WINDOWS_OS_WINDOWS_HPP
--- a/src/hotspot/os/windows/os_windows.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/windows/os_windows.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_WINDOWS_VM_OS_WINDOWS_INLINE_HPP
-#define OS_WINDOWS_VM_OS_WINDOWS_INLINE_HPP
+#ifndef OS_WINDOWS_OS_WINDOWS_INLINE_HPP
+#define OS_WINDOWS_OS_WINDOWS_INLINE_HPP
 
 #include "runtime/os.hpp"
 #include "runtime/thread.hpp"
@@ -94,4 +94,4 @@
   win32::exit_process_or_thread(win32::EPT_PROCESS, num);
 }
 
-#endif // OS_WINDOWS_VM_OS_WINDOWS_INLINE_HPP
+#endif // OS_WINDOWS_OS_WINDOWS_INLINE_HPP
--- a/src/hotspot/os/windows/pdh_interface.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/windows/pdh_interface.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_WINDOWS_VM_PDH_INTERFACE_HPP
-#define OS_WINDOWS_VM_PDH_INTERFACE_HPP
+#ifndef OS_WINDOWS_PDH_INTERFACE_HPP
+#define OS_WINDOWS_PDH_INTERFACE_HPP
 
 #include "memory/allocation.hpp"
 #include <pdh.h>
@@ -61,4 +61,4 @@
   static bool       PdhDetach();
 };
 
-#endif // OS_WINDOWS_VM_PDH_INTERFACE_HPP
+#endif // OS_WINDOWS_PDH_INTERFACE_HPP
--- a/src/hotspot/os/windows/semaphore_windows.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/windows/semaphore_windows.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_WINDOWS_VM_SEMAPHORE_WINDOWS_HPP
-#define OS_WINDOWS_VM_SEMAPHORE_WINDOWS_HPP
+#ifndef OS_WINDOWS_SEMAPHORE_WINDOWS_HPP
+#define OS_WINDOWS_SEMAPHORE_WINDOWS_HPP
 
 #include "memory/allocation.hpp"
 
@@ -49,4 +49,4 @@
 
 typedef WindowsSemaphore SemaphoreImpl;
 
-#endif // OS_WINDOWS_VM_SEMAPHORE_WINDOWS_HPP
+#endif // OS_WINDOWS_SEMAPHORE_WINDOWS_HPP
--- a/src/hotspot/os/windows/symbolengine.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/windows/symbolengine.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2017, SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_WINDOWS_VM_SYMBOLENGINE_HPP
-#define OS_WINDOWS_VM_SYMBOLENGINE_HPP
+#ifndef OS_WINDOWS_SYMBOLENGINE_HPP
+#define OS_WINDOWS_SYMBOLENGINE_HPP
 
 class outputStream;
 
@@ -58,6 +58,4 @@
 
 };
 
-#endif // #ifndef OS_WINDOWS_VM_SYMBOLENGINE_HPP
-
-
+#endif // OS_WINDOWS_SYMBOLENGINE_HPP
--- a/src/hotspot/os/windows/vmStructs_windows.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/windows/vmStructs_windows.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_WINDOWS_VM_VMSTRUCTS_WINDOWS_HPP
-#define OS_WINDOWS_VM_VMSTRUCTS_WINDOWS_HPP
+#ifndef OS_WINDOWS_VMSTRUCTS_WINDOWS_HPP
+#define OS_WINDOWS_VMSTRUCTS_WINDOWS_HPP
 
 // These are the OS-specific fields, types and integer
 // constants required by the Serviceability Agent. This file is
@@ -39,4 +39,4 @@
 
 #define VM_ADDRESSES_OS(declare_address, declare_preprocessor_address, declare_function)
 
-#endif // OS_WINDOWS_VM_VMSTRUCTS_WINDOWS_HPP
+#endif // OS_WINDOWS_VMSTRUCTS_WINDOWS_HPP
--- a/src/hotspot/os/windows/windbghelp.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os/windows/windbghelp.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -72,4 +72,3 @@
 };
 
 #endif // OS_WINDOWS_WINDBGHELP_HPP
-
--- a/src/hotspot/os_cpu/aix_ppc/atomic_aix_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/aix_ppc/atomic_aix_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_AIX_OJDKPPC_VM_ATOMIC_AIX_PPC_HPP
-#define OS_CPU_AIX_OJDKPPC_VM_ATOMIC_AIX_PPC_HPP
+#ifndef OS_CPU_AIX_PPC_ATOMIC_AIX_PPC_HPP
+#define OS_CPU_AIX_PPC_ATOMIC_AIX_PPC_HPP
 
 #ifndef PPC64
 #error "Atomic currently only implemented for PPC64"
@@ -417,4 +417,4 @@
 #undef strasm_nobarrier
 #undef strasm_nobarrier_clobber_memory
 
-#endif // OS_CPU_AIX_OJDKPPC_VM_ATOMIC_AIX_PPC_HPP
+#endif // OS_CPU_AIX_PPC_ATOMIC_AIX_PPC_HPP
--- a/src/hotspot/os_cpu/aix_ppc/bytes_aix_ppc.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/aix_ppc/bytes_aix_ppc.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,11 +22,11 @@
  *
  */
 
-#ifndef OS_CPU_AIX_PPC_VM_BYTES_AIX_PPC_INLINE_HPP
-#define OS_CPU_AIX_PPC_VM_BYTES_AIX_PPC_INLINE_HPP
+#ifndef OS_CPU_AIX_PPC_BYTES_AIX_PPC_INLINE_HPP
+#define OS_CPU_AIX_PPC_BYTES_AIX_PPC_INLINE_HPP
 
 #if defined(VM_LITTLE_ENDIAN)
 // Aix is not little endian.
 #endif // VM_LITTLE_ENDIAN
 
-#endif // OS_CPU_AIX_PPC_VM_BYTES_AIX_PPC_INLINE_HPP
+#endif // OS_CPU_AIX_PPC_BYTES_AIX_PPC_INLINE_HPP
--- a/src/hotspot/os_cpu/aix_ppc/globals_aix_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/aix_ppc/globals_aix_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_AIX_OJDKPPC_VM_GLOBALS_AIX_PPC_HPP
-#define OS_CPU_AIX_OJDKPPC_VM_GLOBALS_AIX_PPC_HPP
+#ifndef OS_CPU_AIX_PPC_GLOBALS_AIX_PPC_HPP
+#define OS_CPU_AIX_PPC_GLOBALS_AIX_PPC_HPP
 
 // Sets the default values for platform dependent flags used by the runtime system.
 // (see globals.hpp)
@@ -41,4 +41,4 @@
 // Only used on 64 bit platforms
 define_pd_global(size_t, HeapBaseMinAddress,     2*G);
 
-#endif // OS_CPU_AIX_OJDKPPC_VM_GLOBALS_AIX_PPC_HPP
+#endif // OS_CPU_AIX_PPC_GLOBALS_AIX_PPC_HPP
--- a/src/hotspot/os_cpu/aix_ppc/orderAccess_aix_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/aix_ppc/orderAccess_aix_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2014 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_AIX_OJDKPPC_VM_ORDERACCESS_AIX_PPC_HPP
-#define OS_CPU_AIX_OJDKPPC_VM_ORDERACCESS_AIX_PPC_HPP
+#ifndef OS_CPU_AIX_PPC_ORDERACCESS_AIX_PPC_HPP
+#define OS_CPU_AIX_PPC_ORDERACCESS_AIX_PPC_HPP
 
 // Included in orderAccess.hpp header file.
 
@@ -90,4 +90,4 @@
 #undef inlasm_eieio
 #undef inlasm_isync
 
-#endif // OS_CPU_AIX_OJDKPPC_VM_ORDERACCESS_AIX_PPC_HPP
+#endif // OS_CPU_AIX_PPC_ORDERACCESS_AIX_PPC_HPP
--- a/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/aix_ppc/os_aix_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_AIX_PPC_VM_OS_AIX_PPC_HPP
-#define OS_CPU_AIX_PPC_VM_OS_AIX_PPC_HPP
+#ifndef OS_CPU_AIX_PPC_OS_AIX_PPC_HPP
+#define OS_CPU_AIX_PPC_OS_AIX_PPC_HPP
 
   static void setup_fpu() {}
 
@@ -36,4 +36,4 @@
 static bool platform_print_native_stack(outputStream* st, void* context,
                                         char *buf, int buf_size);
 
-#endif // OS_CPU_AIX_PPC_VM_OS_AIX_PPC_HPP
+#endif // OS_CPU_AIX_PPC_OS_AIX_PPC_HPP
--- a/src/hotspot/os_cpu/aix_ppc/prefetch_aix_ppc.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/aix_ppc/prefetch_aix_ppc.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_AIX_PPC_VM_PREFETCH_AIX_PPC_INLINE_HPP
-#define OS_CPU_AIX_PPC_VM_PREFETCH_AIX_PPC_INLINE_HPP
+#ifndef OS_CPU_AIX_PPC_PREFETCH_AIX_PPC_INLINE_HPP
+#define OS_CPU_AIX_PPC_PREFETCH_AIX_PPC_INLINE_HPP
 
 #include "runtime/prefetch.hpp"
 
@@ -55,4 +55,4 @@
 #endif
 }
 
-#endif // OS_CPU_AIX_PPC_VM_PREFETCH_AIX_PPC_INLINE_HPP
+#endif // OS_CPU_AIX_PPC_PREFETCH_AIX_PPC_INLINE_HPP
--- a/src/hotspot/os_cpu/aix_ppc/thread_aix_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/aix_ppc/thread_aix_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_AIX_PPC_VM_THREAD_AIX_PPC_HPP
-#define OS_CPU_AIX_PPC_VM_THREAD_AIX_PPC_HPP
+#ifndef OS_CPU_AIX_PPC_THREAD_AIX_PPC_HPP
+#define OS_CPU_AIX_PPC_THREAD_AIX_PPC_HPP
 
  private:
   void pd_initialize() {
@@ -51,4 +51,4 @@
   bool pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext,
                                       bool isInJava);
 
-#endif // OS_CPU_AIX_PPC_VM_THREAD_AIX_PPC_HPP
+#endif // OS_CPU_AIX_PPC_THREAD_AIX_PPC_HPP
--- a/src/hotspot/os_cpu/aix_ppc/vmStructs_aix_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/aix_ppc/vmStructs_aix_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_AIX_OJDKPPC_VM_VMSTRUCTS_AIX_PPC_HPP
-#define OS_CPU_AIX_OJDKPPC_VM_VMSTRUCTS_AIX_PPC_HPP
+#ifndef OS_CPU_AIX_PPC_VMSTRUCTS_AIX_PPC_HPP
+#define OS_CPU_AIX_PPC_VMSTRUCTS_AIX_PPC_HPP
 
 // These are the OS and CPU-specific fields, types and integer
 // constants required by the Serviceability Agent. This file is
@@ -50,4 +50,4 @@
 
 #define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
 
-#endif // OS_CPU_AIX_OJDKPPC_VM_VMSTRUCTS_AIX_PPC_HPP
+#endif // OS_CPU_AIX_PPC_VMSTRUCTS_AIX_PPC_HPP
--- a/src/hotspot/os_cpu/bsd_x86/atomic_bsd_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/bsd_x86/atomic_bsd_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_BSD_X86_VM_ATOMIC_BSD_X86_HPP
-#define OS_CPU_BSD_X86_VM_ATOMIC_BSD_X86_HPP
+#ifndef OS_CPU_BSD_X86_ATOMIC_BSD_X86_HPP
+#define OS_CPU_BSD_X86_ATOMIC_BSD_X86_HPP
 
 // Implementation of class atomic
 
@@ -169,4 +169,4 @@
 
 #endif // AMD64
 
-#endif // OS_CPU_BSD_X86_VM_ATOMIC_BSD_X86_HPP
+#endif // OS_CPU_BSD_X86_ATOMIC_BSD_X86_HPP
--- a/src/hotspot/os_cpu/bsd_x86/bytes_bsd_x86.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/bsd_x86/bytes_bsd_x86.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_BSD_X86_VM_BYTES_BSD_X86_INLINE_HPP
-#define OS_CPU_BSD_X86_VM_BYTES_BSD_X86_INLINE_HPP
+#ifndef OS_CPU_BSD_X86_BYTES_BSD_X86_INLINE_HPP
+#define OS_CPU_BSD_X86_BYTES_BSD_X86_INLINE_HPP
 
 #ifdef __APPLE__
 #include <libkern/OSByteOrder.h>
@@ -109,4 +109,4 @@
 }
 #endif // !AMD64
 
-#endif // OS_CPU_BSD_X86_VM_BYTES_BSD_X86_INLINE_HPP
+#endif // OS_CPU_BSD_X86_BYTES_BSD_X86_INLINE_HPP
--- a/src/hotspot/os_cpu/bsd_x86/copy_bsd_x86.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/bsd_x86/copy_bsd_x86.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_BSD_X86_VM_COPY_BSD_X86_INLINE_HPP
-#define OS_CPU_BSD_X86_VM_COPY_BSD_X86_INLINE_HPP
+#ifndef OS_CPU_BSD_X86_COPY_BSD_X86_INLINE_HPP
+#define OS_CPU_BSD_X86_COPY_BSD_X86_INLINE_HPP
 
 static void pd_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) {
 #ifdef AMD64
@@ -306,4 +306,4 @@
 #endif // AMD64
 }
 
-#endif // OS_CPU_BSD_X86_VM_COPY_BSD_X86_INLINE_HPP
+#endif // OS_CPU_BSD_X86_COPY_BSD_X86_INLINE_HPP
--- a/src/hotspot/os_cpu/bsd_x86/globals_bsd_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/bsd_x86/globals_bsd_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_BSD_X86_VM_GLOBALS_BSD_X86_HPP
-#define OS_CPU_BSD_X86_VM_GLOBALS_BSD_X86_HPP
+#ifndef OS_CPU_BSD_X86_GLOBALS_BSD_X86_HPP
+#define OS_CPU_BSD_X86_GLOBALS_BSD_X86_HPP
 
 //
 // Sets the default values for platform dependent flags used by the runtime system.
@@ -49,4 +49,4 @@
 // Used on 64 bit platforms for UseCompressedOops base address
 define_pd_global(size_t, HeapBaseMinAddress,     2*G);
 
-#endif // OS_CPU_BSD_X86_VM_GLOBALS_BSD_X86_HPP
+#endif // OS_CPU_BSD_X86_GLOBALS_BSD_X86_HPP
--- a/src/hotspot/os_cpu/bsd_x86/orderAccess_bsd_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/bsd_x86/orderAccess_bsd_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_BSD_X86_VM_ORDERACCESS_BSD_X86_HPP
-#define OS_CPU_BSD_X86_VM_ORDERACCESS_BSD_X86_HPP
+#ifndef OS_CPU_BSD_X86_ORDERACCESS_BSD_X86_HPP
+#define OS_CPU_BSD_X86_ORDERACCESS_BSD_X86_HPP
 
 // Included in orderAccess.hpp header file.
 
@@ -109,4 +109,4 @@
 };
 #endif // AMD64
 
-#endif // OS_CPU_BSD_X86_VM_ORDERACCESS_BSD_X86_HPP
+#endif // OS_CPU_BSD_X86_ORDERACCESS_BSD_X86_HPP
--- a/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_BSD_X86_VM_OS_BSD_X86_HPP
-#define OS_CPU_BSD_X86_VM_OS_BSD_X86_HPP
+#ifndef OS_CPU_BSD_X86_OS_BSD_X86_HPP
+#define OS_CPU_BSD_X86_OS_BSD_X86_HPP
 
   static void setup_fpu();
   static bool supports_sse();
@@ -36,4 +36,4 @@
   // Note: Currently only used in 64 bit Windows implementations
   static bool register_code_area(char *low, char *high) { return true; }
 
-#endif // OS_CPU_BSD_X86_VM_OS_BSD_X86_HPP
+#endif // OS_CPU_BSD_X86_OS_BSD_X86_HPP
--- a/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/bsd_x86/os_bsd_x86.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_BSD_X86_VM_OS_BSD_X86_INLINE_HPP
-#define OS_CPU_BSD_X86_VM_OS_BSD_X86_INLINE_HPP
+#ifndef OS_CPU_BSD_X86_OS_BSD_X86_INLINE_HPP
+#define OS_CPU_BSD_X86_OS_BSD_X86_INLINE_HPP
 
 #include "runtime/os.hpp"
 
@@ -43,4 +43,4 @@
 #endif // AMD64
 }
 
-#endif // OS_CPU_BSD_X86_VM_OS_BSD_X86_INLINE_HPP
+#endif // OS_CPU_BSD_X86_OS_BSD_X86_INLINE_HPP
--- a/src/hotspot/os_cpu/bsd_x86/prefetch_bsd_x86.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/bsd_x86/prefetch_bsd_x86.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_BSD_X86_VM_PREFETCH_BSD_X86_INLINE_HPP
-#define OS_CPU_BSD_X86_VM_PREFETCH_BSD_X86_INLINE_HPP
+#ifndef OS_CPU_BSD_X86_PREFETCH_BSD_X86_INLINE_HPP
+#define OS_CPU_BSD_X86_PREFETCH_BSD_X86_INLINE_HPP
 
 #include "runtime/prefetch.hpp"
 
@@ -44,4 +44,4 @@
 #endif // AMD64
 }
 
-#endif // OS_CPU_BSD_X86_VM_PREFETCH_BSD_X86_INLINE_HPP
+#endif // OS_CPU_BSD_X86_PREFETCH_BSD_X86_INLINE_HPP
--- a/src/hotspot/os_cpu/bsd_x86/thread_bsd_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/bsd_x86/thread_bsd_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_BSD_X86_VM_THREAD_BSD_X86_HPP
-#define OS_CPU_BSD_X86_VM_THREAD_BSD_X86_HPP
+#ifndef OS_CPU_BSD_X86_THREAD_BSD_X86_HPP
+#define OS_CPU_BSD_X86_THREAD_BSD_X86_HPP
 
  private:
   void pd_initialize() {
@@ -66,4 +66,4 @@
   static void enable_register_stack_guard() {}
   static void disable_register_stack_guard() {}
 
-#endif // OS_CPU_BSD_X86_VM_THREAD_BSD_X86_HPP
+#endif // OS_CPU_BSD_X86_THREAD_BSD_X86_HPP
--- a/src/hotspot/os_cpu/bsd_x86/vmStructs_bsd_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/bsd_x86/vmStructs_bsd_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_BSD_X86_VM_VMSTRUCTS_BSD_X86_HPP
-#define OS_CPU_BSD_X86_VM_VMSTRUCTS_BSD_X86_HPP
+#ifndef OS_CPU_BSD_X86_VMSTRUCTS_BSD_X86_HPP
+#define OS_CPU_BSD_X86_VMSTRUCTS_BSD_X86_HPP
 
 // These are the OS and CPU-specific fields, types and integer
 // constants required by the Serviceability Agent. This file is
@@ -50,4 +50,4 @@
 
 #define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
 
-#endif // OS_CPU_BSD_X86_VM_VMSTRUCTS_BSD_X86_HPP
+#endif // OS_CPU_BSD_X86_VMSTRUCTS_BSD_X86_HPP
--- a/src/hotspot/os_cpu/bsd_zero/atomic_bsd_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/bsd_zero/atomic_bsd_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2008, 2011, 2015, Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_BSD_ZERO_VM_ATOMIC_BSD_ZERO_HPP
-#define OS_CPU_BSD_ZERO_VM_ATOMIC_BSD_ZERO_HPP
+#ifndef OS_CPU_BSD_ZERO_ATOMIC_BSD_ZERO_HPP
+#define OS_CPU_BSD_ZERO_ATOMIC_BSD_ZERO_HPP
 
 #include "runtime/os.hpp"
 
@@ -282,4 +282,4 @@
   os::atomic_copy64(reinterpret_cast<const volatile int64_t*>(&store_value), reinterpret_cast<volatile int64_t*>(dest));
 }
 
-#endif // OS_CPU_BSD_ZERO_VM_ATOMIC_BSD_ZERO_HPP
+#endif // OS_CPU_BSD_ZERO_ATOMIC_BSD_ZERO_HPP
--- a/src/hotspot/os_cpu/bsd_zero/bytes_bsd_zero.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/bsd_zero/bytes_bsd_zero.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_BSD_ZERO_VM_BYTES_BSD_ZERO_INLINE_HPP
-#define OS_CPU_BSD_ZERO_VM_BYTES_BSD_ZERO_INLINE_HPP
+#ifndef OS_CPU_BSD_ZERO_BYTES_BSD_ZERO_INLINE_HPP
+#define OS_CPU_BSD_ZERO_BYTES_BSD_ZERO_INLINE_HPP
 
 // Efficient swapping of data bytes from Java byte
 // ordering to native byte ordering and vice versa.
@@ -64,4 +64,4 @@
   return bswap_64(x);
 }
 
-#endif // OS_CPU_BSD_ZERO_VM_BYTES_BSD_ZERO_INLINE_HPP
+#endif // OS_CPU_BSD_ZERO_BYTES_BSD_ZERO_INLINE_HPP
--- a/src/hotspot/os_cpu/bsd_zero/globals_bsd_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/bsd_zero/globals_bsd_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2008, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_BSD_ZERO_VM_GLOBALS_BSD_ZERO_HPP
-#define OS_CPU_BSD_ZERO_VM_GLOBALS_BSD_ZERO_HPP
+#ifndef OS_CPU_BSD_ZERO_GLOBALS_BSD_ZERO_HPP
+#define OS_CPU_BSD_ZERO_GLOBALS_BSD_ZERO_HPP
 
 //
 // Set the default values for platform dependent flags used by the
@@ -44,4 +44,4 @@
 // Used on 64 bit platforms for UseCompressedOops base address
 define_pd_global(size_t, HeapBaseMinAddress,     2*G);
 
-#endif // OS_CPU_BSD_ZERO_VM_GLOBALS_BSD_ZERO_HPP
+#endif // OS_CPU_BSD_ZERO_GLOBALS_BSD_ZERO_HPP
--- a/src/hotspot/os_cpu/bsd_zero/orderAccess_bsd_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/bsd_zero/orderAccess_bsd_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2008, 2009 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_BSD_ZERO_VM_ORDERACCESS_BSD_ZERO_HPP
-#define OS_CPU_BSD_ZERO_VM_ORDERACCESS_BSD_ZERO_HPP
+#ifndef OS_CPU_BSD_ZERO_ORDERACCESS_BSD_ZERO_HPP
+#define OS_CPU_BSD_ZERO_ORDERACCESS_BSD_ZERO_HPP
 
 // Included in orderAccess.hpp header file.
 
@@ -74,4 +74,4 @@
 inline void OrderAccess::release()    { LIGHT_MEM_BARRIER; }
 inline void OrderAccess::fence()      { FULL_MEM_BARRIER;  }
 
-#endif // OS_CPU_BSD_ZERO_VM_ORDERACCESS_BSD_ZERO_HPP
+#endif // OS_CPU_BSD_ZERO_ORDERACCESS_BSD_ZERO_HPP
--- a/src/hotspot/os_cpu/bsd_zero/os_bsd_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/bsd_zero/os_bsd_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2008, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_BSD_ZERO_VM_OS_BSD_ZERO_HPP
-#define OS_CPU_BSD_ZERO_VM_OS_BSD_ZERO_HPP
+#ifndef OS_CPU_BSD_ZERO_OS_BSD_ZERO_HPP
+#define OS_CPU_BSD_ZERO_OS_BSD_ZERO_HPP
 
   static void setup_fpu() {}
 
@@ -53,4 +53,4 @@
 #endif
   }
 
-#endif // OS_CPU_BSD_ZERO_VM_OS_BSD_ZERO_HPP
+#endif // OS_CPU_BSD_ZERO_OS_BSD_ZERO_HPP
--- a/src/hotspot/os_cpu/bsd_zero/prefetch_bsd_zero.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/bsd_zero/prefetch_bsd_zero.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2008 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_BSD_ZERO_VM_PREFETCH_BSD_ZERO_INLINE_HPP
-#define OS_CPU_BSD_ZERO_VM_PREFETCH_BSD_ZERO_INLINE_HPP
+#ifndef OS_CPU_BSD_ZERO_PREFETCH_BSD_ZERO_INLINE_HPP
+#define OS_CPU_BSD_ZERO_PREFETCH_BSD_ZERO_INLINE_HPP
 
 #include "runtime/prefetch.hpp"
 
@@ -34,4 +34,4 @@
 inline void Prefetch::write(void* loc, intx interval) {
 }
 
-#endif // OS_CPU_BSD_ZERO_VM_PREFETCH_BSD_ZERO_INLINE_HPP
+#endif // OS_CPU_BSD_ZERO_PREFETCH_BSD_ZERO_INLINE_HPP
--- a/src/hotspot/os_cpu/bsd_zero/thread_bsd_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/bsd_zero/thread_bsd_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_BSD_ZERO_VM_THREAD_BSD_ZERO_HPP
-#define OS_CPU_BSD_ZERO_VM_THREAD_BSD_ZERO_HPP
+#ifndef OS_CPU_BSD_ZERO_THREAD_BSD_ZERO_HPP
+#define OS_CPU_BSD_ZERO_THREAD_BSD_ZERO_HPP
 
  private:
   ZeroStack  _zero_stack;
@@ -116,4 +116,4 @@
   static void enable_register_stack_guard() {}
   static void disable_register_stack_guard() {}
 
-#endif // OS_CPU_BSD_ZERO_VM_THREAD_BSD_ZERO_HPP
+#endif // OS_CPU_BSD_ZERO_THREAD_BSD_ZERO_HPP
--- a/src/hotspot/os_cpu/bsd_zero/vmStructs_bsd_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/bsd_zero/vmStructs_bsd_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_BSD_ZERO_VM_VMSTRUCTS_BSD_ZERO_HPP
-#define OS_CPU_BSD_ZERO_VM_VMSTRUCTS_BSD_ZERO_HPP
+#ifndef OS_CPU_BSD_ZERO_VMSTRUCTS_BSD_ZERO_HPP
+#define OS_CPU_BSD_ZERO_VMSTRUCTS_BSD_ZERO_HPP
 
 // These are the OS and CPU-specific fields, types and integer
 // constants required by the Serviceability Agent. This file is
@@ -39,4 +39,4 @@
 
 #define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
 
-#endif // OS_CPU_BSD_ZERO_VM_VMSTRUCTS_BSD_ZERO_HPP
+#endif // OS_CPU_BSD_ZERO_VMSTRUCTS_BSD_ZERO_HPP
--- a/src/hotspot/os_cpu/linux_aarch64/atomic_linux_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_aarch64/atomic_linux_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_AARCH64_VM_ATOMIC_LINUX_AARCH64_HPP
-#define OS_CPU_LINUX_AARCH64_VM_ATOMIC_LINUX_AARCH64_HPP
+#ifndef OS_CPU_LINUX_AARCH64_ATOMIC_LINUX_AARCH64_HPP
+#define OS_CPU_LINUX_AARCH64_ATOMIC_LINUX_AARCH64_HPP
 
 #include "vm_version_aarch64.hpp"
 
@@ -72,4 +72,4 @@
   }
 }
 
-#endif // OS_CPU_LINUX_AARCH64_VM_ATOMIC_LINUX_AARCH64_HPP
+#endif // OS_CPU_LINUX_AARCH64_ATOMIC_LINUX_AARCH64_HPP
--- a/src/hotspot/os_cpu/linux_aarch64/bytes_linux_aarch64.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_aarch64/bytes_linux_aarch64.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_AARCH64_VM_BYTES_LINUX_AARCH64_INLINE_HPP
-#define OS_CPU_LINUX_AARCH64_VM_BYTES_LINUX_AARCH64_INLINE_HPP
+#ifndef OS_CPU_LINUX_AARCH64_BYTES_LINUX_AARCH64_INLINE_HPP
+#define OS_CPU_LINUX_AARCH64_BYTES_LINUX_AARCH64_INLINE_HPP
 
 #include <byteswap.h>
 
@@ -42,4 +42,4 @@
   return bswap_64(x);
 }
 
-#endif // OS_CPU_LINUX_AARCH64_VM_BYTES_LINUX_AARCH64_INLINE_HPP
+#endif // OS_CPU_LINUX_AARCH64_BYTES_LINUX_AARCH64_INLINE_HPP
--- a/src/hotspot/os_cpu/linux_aarch64/copy_linux_aarch64.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_aarch64/copy_linux_aarch64.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_AARCH64_VM_COPY_LINUX_AARCH64_INLINE_HPP
-#define OS_CPU_LINUX_AARCH64_VM_COPY_LINUX_AARCH64_INLINE_HPP
+#ifndef OS_CPU_LINUX_AARCH64_COPY_LINUX_AARCH64_INLINE_HPP
+#define OS_CPU_LINUX_AARCH64_COPY_LINUX_AARCH64_INLINE_HPP
 
 #define COPY_SMALL(from, to, count)                                     \
 {                                                                       \
@@ -185,4 +185,4 @@
   _Copy_arrayof_conjoint_jlongs(from, to, count);
 }
 
-#endif // OS_CPU_LINUX_AARCH64_VM_COPY_LINUX_AARCH64_INLINE_HPP
+#endif // OS_CPU_LINUX_AARCH64_COPY_LINUX_AARCH64_INLINE_HPP
--- a/src/hotspot/os_cpu/linux_aarch64/globals_linux_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_aarch64/globals_linux_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_AARCH64_VM_GLOBALS_LINUX_AARCH64_HPP
-#define OS_CPU_LINUX_AARCH64_VM_GLOBALS_LINUX_AARCH64_HPP
+#ifndef OS_CPU_LINUX_AARCH64_GLOBALS_LINUX_AARCH64_HPP
+#define OS_CPU_LINUX_AARCH64_GLOBALS_LINUX_AARCH64_HPP
 
 // Sets the default values for platform dependent flags used by the runtime system.
 // (see globals.hpp)
@@ -43,4 +43,4 @@
 class Thread;
 extern __thread Thread *aarch64_currentThread;
 
-#endif // OS_CPU_LINUX_AARCH64_VM_GLOBALS_LINUX_AARCH64_HPP
+#endif // OS_CPU_LINUX_AARCH64_GLOBALS_LINUX_AARCH64_HPP
--- a/src/hotspot/os_cpu/linux_aarch64/orderAccess_linux_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_aarch64/orderAccess_linux_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_AARCH64_VM_ORDERACCESS_LINUX_AARCH64_HPP
-#define OS_CPU_LINUX_AARCH64_VM_ORDERACCESS_LINUX_AARCH64_HPP
+#ifndef OS_CPU_LINUX_AARCH64_ORDERACCESS_LINUX_AARCH64_HPP
+#define OS_CPU_LINUX_AARCH64_ORDERACCESS_LINUX_AARCH64_HPP
 
 // Included in orderAccess.hpp header file.
 
@@ -70,4 +70,4 @@
   void operator()(T v, volatile T* p) const { release_store(p, v); fence(); }
 };
 
-#endif // OS_CPU_LINUX_AARCH64_VM_ORDERACCESS_LINUX_AARCH64_HPP
+#endif // OS_CPU_LINUX_AARCH64_ORDERACCESS_LINUX_AARCH64_HPP
--- a/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_AARCH64_VM_OS_LINUX_AARCH64_HPP
-#define OS_CPU_LINUX_AARCH64_VM_OS_LINUX_AARCH64_HPP
+#ifndef OS_CPU_LINUX_AARCH64_OS_LINUX_AARCH64_HPP
+#define OS_CPU_LINUX_AARCH64_OS_LINUX_AARCH64_HPP
 
   static void setup_fpu();
   static bool supports_sse();
@@ -42,4 +42,4 @@
     *(jlong *) dst = *(const jlong *) src;
   }
 
-#endif // OS_CPU_LINUX_AARCH64_VM_OS_LINUX_AARCH64_HPP
+#endif // OS_CPU_LINUX_AARCH64_OS_LINUX_AARCH64_HPP
--- a/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_AARCH64_VM_OS_LINUX_AARCH64_INLINE_HPP
-#define OS_CPU_LINUX_AARCH64_VM_OS_LINUX_AARCH64_INLINE_HPP
+#ifndef OS_CPU_LINUX_AARCH64_OS_LINUX_AARCH64_INLINE_HPP
+#define OS_CPU_LINUX_AARCH64_OS_LINUX_AARCH64_INLINE_HPP
 
 #include "runtime/os.hpp"
 
@@ -37,4 +37,4 @@
   return (jlong)res;
 }
 
-#endif // OS_CPU_LINUX_AARCH64_VM_OS_LINUX_AARCH64_INLINE_HPP
+#endif // OS_CPU_LINUX_AARCH64_OS_LINUX_AARCH64_INLINE_HPP
--- a/src/hotspot/os_cpu/linux_aarch64/prefetch_linux_aarch64.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_aarch64/prefetch_linux_aarch64.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_AARCH64_VM_PREFETCH_LINUX_AARCH64_INLINE_HPP
-#define OS_CPU_LINUX_AARCH64_VM_PREFETCH_LINUX_AARCH64_INLINE_HPP
+#ifndef OS_CPU_LINUX_AARCH64_PREFETCH_LINUX_AARCH64_INLINE_HPP
+#define OS_CPU_LINUX_AARCH64_PREFETCH_LINUX_AARCH64_INLINE_HPP
 
 #include "runtime/prefetch.hpp"
 
@@ -43,4 +43,4 @@
 #endif
 }
 
-#endif // OS_CPU_LINUX_AARCH64_VM_PREFETCH_LINUX_AARCH64_INLINE_HPP
+#endif // OS_CPU_LINUX_AARCH64_PREFETCH_LINUX_AARCH64_INLINE_HPP
--- a/src/hotspot/os_cpu/linux_aarch64/thread_linux_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_aarch64/thread_linux_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_AARCH64_VM_THREAD_LINUX_AARCH64_HPP
-#define OS_CPU_LINUX_AARCH64_VM_THREAD_LINUX_AARCH64_HPP
+#ifndef OS_CPU_LINUX_AARCH64_THREAD_LINUX_AARCH64_HPP
+#define OS_CPU_LINUX_AARCH64_THREAD_LINUX_AARCH64_HPP
 
  private:
 #ifdef ASSERT
@@ -77,4 +77,4 @@
   static void enable_register_stack_guard() {}
   static void disable_register_stack_guard() {}
 
-#endif // OS_CPU_LINUX_AARCH64_VM_THREAD_LINUX_AARCH64_HPP
+#endif // OS_CPU_LINUX_AARCH64_THREAD_LINUX_AARCH64_HPP
--- a/src/hotspot/os_cpu/linux_aarch64/vmStructs_linux_aarch64.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_aarch64/vmStructs_linux_aarch64.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_AARCH64_VM_VMSTRUCTS_LINUX_AARCH64_HPP
-#define OS_CPU_LINUX_AARCH64_VM_VMSTRUCTS_LINUX_AARCH64_HPP
+#ifndef OS_CPU_LINUX_AARCH64_VMSTRUCTS_LINUX_AARCH64_HPP
+#define OS_CPU_LINUX_AARCH64_VMSTRUCTS_LINUX_AARCH64_HPP
 
 // These are the OS and CPU-specific fields, types and integer
 // constants required by the Serviceability Agent. This file is
@@ -52,4 +52,4 @@
 
 #define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
 
-#endif // OS_CPU_LINUX_AARCH64_VM_VMSTRUCTS_LINUX_AARCH64_HPP
+#endif // OS_CPU_LINUX_AARCH64_VMSTRUCTS_LINUX_AARCH64_HPP
--- a/src/hotspot/os_cpu/linux_arm/atomic_linux_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_arm/atomic_linux_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_ARM_VM_ATOMIC_LINUX_ARM_HPP
-#define OS_CPU_LINUX_ARM_VM_ATOMIC_LINUX_ARM_HPP
+#ifndef OS_CPU_LINUX_ARM_ATOMIC_LINUX_ARM_HPP
+#define OS_CPU_LINUX_ARM_ATOMIC_LINUX_ARM_HPP
 
 #include "runtime/os.hpp"
 #include "vm_version_arm.hpp"
@@ -137,4 +137,4 @@
   return cmpxchg_using_helper<int64_t>(reorder_cmpxchg_long_func, exchange_value, dest, compare_value);
 }
 
-#endif // OS_CPU_LINUX_ARM_VM_ATOMIC_LINUX_ARM_HPP
+#endif // OS_CPU_LINUX_ARM_ATOMIC_LINUX_ARM_HPP
--- a/src/hotspot/os_cpu/linux_arm/bytes_linux_arm.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_arm/bytes_linux_arm.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_ARM_VM_BYTES_LINUX_ARM_INLINE_HPP
-#define OS_CPU_LINUX_ARM_VM_BYTES_LINUX_ARM_INLINE_HPP
+#ifndef OS_CPU_LINUX_ARM_BYTES_LINUX_ARM_INLINE_HPP
+#define OS_CPU_LINUX_ARM_BYTES_LINUX_ARM_INLINE_HPP
 
 #include <byteswap.h>
 
@@ -44,4 +44,4 @@
   return bswap_64(x);
 }
 
-#endif // OS_CPU_LINUX_ARM_VM_BYTES_LINUX_ARM_INLINE_HPP
+#endif // OS_CPU_LINUX_ARM_BYTES_LINUX_ARM_INLINE_HPP
--- a/src/hotspot/os_cpu/linux_arm/copy_linux_arm.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_arm/copy_linux_arm.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_ARM_VM_COPY_LINUX_ARM_INLINE_HPP
-#define OS_CPU_LINUX_ARM_VM_COPY_LINUX_ARM_INLINE_HPP
+#ifndef OS_CPU_LINUX_ARM_COPY_LINUX_ARM_INLINE_HPP
+#define OS_CPU_LINUX_ARM_COPY_LINUX_ARM_INLINE_HPP
 
 static void pd_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) {
   _Copy_conjoint_words(from, to, count * HeapWordSize);
@@ -92,4 +92,4 @@
   pd_conjoint_oops_atomic((const oop*)from, (oop*)to, count);
 }
 
-#endif // OS_CPU_LINUX_ARM_VM_COPY_LINUX_ARM_INLINE_HPP
+#endif // OS_CPU_LINUX_ARM_COPY_LINUX_ARM_INLINE_HPP
--- a/src/hotspot/os_cpu/linux_arm/globals_linux_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_arm/globals_linux_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_ARM_VM_GLOBALS_LINUX_ARM_HPP
-#define OS_CPU_LINUX_ARM_VM_GLOBALS_LINUX_ARM_HPP
+#ifndef OS_CPU_LINUX_ARM_GLOBALS_LINUX_ARM_HPP
+#define OS_CPU_LINUX_ARM_GLOBALS_LINUX_ARM_HPP
 
 //
 // Sets the default values for platform dependent flags used by the runtime system.
@@ -40,4 +40,4 @@
 // Used on 64 bit platforms for UseCompressedOops base address or CDS
 define_pd_global(size_t, HeapBaseMinAddress,     2*G);
 
-#endif // OS_CPU_LINUX_ARM_VM_GLOBALS_LINUX_ARM_HPP
+#endif // OS_CPU_LINUX_ARM_GLOBALS_LINUX_ARM_HPP
--- a/src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_arm/orderAccess_linux_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_ARM_VM_ORDERACCESS_LINUX_ARM_HPP
-#define OS_CPU_LINUX_ARM_VM_ORDERACCESS_LINUX_ARM_HPP
+#ifndef OS_CPU_LINUX_ARM_ORDERACCESS_LINUX_ARM_HPP
+#define OS_CPU_LINUX_ARM_ORDERACCESS_LINUX_ARM_HPP
 
 // Included in orderAccess.hpp header file.
 
@@ -102,4 +102,4 @@
 inline void OrderAccess::release()    { dmb_sy(); }
 inline void OrderAccess::fence()      { dmb_sy(); }
 
-#endif // OS_CPU_LINUX_ARM_VM_ORDERACCESS_LINUX_ARM_HPP
+#endif // OS_CPU_LINUX_ARM_ORDERACCESS_LINUX_ARM_HPP
--- a/src/hotspot/os_cpu/linux_arm/os_linux_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_arm/os_linux_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_ARM_VM_OS_LINUX_ARM_HPP
-#define OS_CPU_LINUX_ARM_VM_OS_LINUX_ARM_HPP
+#ifndef OS_CPU_LINUX_ARM_OS_LINUX_ARM_HPP
+#define OS_CPU_LINUX_ARM_OS_LINUX_ARM_HPP
 
 #ifndef __thumb__
   enum {
@@ -70,4 +70,4 @@
                                            int32_t exchange_value,
                                            volatile int32_t *dest);
 
-#endif // OS_CPU_LINUX_ARM_VM_OS_LINUX_ARM_HPP
+#endif // OS_CPU_LINUX_ARM_OS_LINUX_ARM_HPP
--- a/src/hotspot/os_cpu/linux_arm/prefetch_linux_arm.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_arm/prefetch_linux_arm.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_ARM_VM_PREFETCH_LINUX_ARM_INLINE_HPP
-#define OS_CPU_LINUX_ARM_VM_PREFETCH_LINUX_ARM_INLINE_HPP
+#ifndef OS_CPU_LINUX_ARM_PREFETCH_LINUX_ARM_INLINE_HPP
+#define OS_CPU_LINUX_ARM_PREFETCH_LINUX_ARM_INLINE_HPP
 
 #include "runtime/prefetch.hpp"
 
@@ -37,4 +37,4 @@
   // Not available on 32-bit ARM (prior to ARMv7 with MP extensions)
 }
 
-#endif // OS_CPU_LINUX_ARM_VM_PREFETCH_LINUX_ARM_INLINE_HPP
+#endif // OS_CPU_LINUX_ARM_PREFETCH_LINUX_ARM_INLINE_HPP
--- a/src/hotspot/os_cpu/linux_arm/thread_linux_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_arm/thread_linux_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_ARM_VM_THREAD_LINUX_ARM_HPP
-#define OS_CPU_LINUX_ARM_VM_THREAD_LINUX_ARM_HPP
+#ifndef OS_CPU_LINUX_ARM_THREAD_LINUX_ARM_HPP
+#define OS_CPU_LINUX_ARM_THREAD_LINUX_ARM_HPP
 
  private:
   // The following thread-local variables replicate corresponding global variables.
@@ -84,4 +84,4 @@
   static void enable_register_stack_guard() {}
   static void disable_register_stack_guard() {}
 
-#endif // OS_CPU_LINUX_ARM_VM_THREAD_LINUX_ARM_HPP
+#endif // OS_CPU_LINUX_ARM_THREAD_LINUX_ARM_HPP
--- a/src/hotspot/os_cpu/linux_arm/vmStructs_linux_arm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_arm/vmStructs_linux_arm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_ARM_VM_VMSTRUCTS_LINUX_ARM_HPP
-#define OS_CPU_LINUX_ARM_VM_VMSTRUCTS_LINUX_ARM_HPP
+#ifndef OS_CPU_LINUX_ARM_VMSTRUCTS_LINUX_ARM_HPP
+#define OS_CPU_LINUX_ARM_VMSTRUCTS_LINUX_ARM_HPP
 
 // These are the OS and CPU-specific fields, types and integer
 // constants required by the Serviceability Agent. This file is
@@ -50,4 +50,4 @@
 
 #define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
 
-#endif // OS_CPU_LINUX_ARM_VM_VMSTRUCTS_LINUX_ARM_HPP
+#endif // OS_CPU_LINUX_ARM_VMSTRUCTS_LINUX_ARM_HPP
--- a/src/hotspot/os_cpu/linux_ppc/atomic_linux_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_ppc/atomic_linux_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_PPC_VM_ATOMIC_LINUX_PPC_HPP
-#define OS_CPU_LINUX_PPC_VM_ATOMIC_LINUX_PPC_HPP
+#ifndef OS_CPU_LINUX_PPC_ATOMIC_LINUX_PPC_HPP
+#define OS_CPU_LINUX_PPC_ATOMIC_LINUX_PPC_HPP
 
 #ifndef PPC64
 #error "Atomic currently only implemented for PPC64"
@@ -415,4 +415,4 @@
 #undef strasm_nobarrier
 #undef strasm_nobarrier_clobber_memory
 
-#endif // OS_CPU_LINUX_PPC_VM_ATOMIC_LINUX_PPC_HPP
+#endif // OS_CPU_LINUX_PPC_ATOMIC_LINUX_PPC_HPP
--- a/src/hotspot/os_cpu/linux_ppc/bytes_linux_ppc.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_ppc/bytes_linux_ppc.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2014 Google Inc.  All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_PPC_VM_BYTES_LINUX_PPC_INLINE_HPP
-#define OS_CPU_LINUX_PPC_VM_BYTES_LINUX_PPC_INLINE_HPP
+#ifndef OS_CPU_LINUX_PPC_BYTES_LINUX_PPC_INLINE_HPP
+#define OS_CPU_LINUX_PPC_BYTES_LINUX_PPC_INLINE_HPP
 
 #if defined(VM_LITTLE_ENDIAN)
 #include <byteswap.h>
@@ -36,4 +36,4 @@
 inline u8 Bytes::swap_u8(u8 x) { return bswap_64(x); }
 #endif // VM_LITTLE_ENDIAN
 
-#endif // OS_CPU_LINUX_PPC_VM_BYTES_LINUX_PPC_INLINE_HPP
+#endif // OS_CPU_LINUX_PPC_BYTES_LINUX_PPC_INLINE_HPP
--- a/src/hotspot/os_cpu/linux_ppc/globals_linux_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_ppc/globals_linux_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_PPC_VM_GLOBALS_LINUX_PPC_HPP
-#define OS_CPU_LINUX_PPC_VM_GLOBALS_LINUX_PPC_HPP
+#ifndef OS_CPU_LINUX_PPC_GLOBALS_LINUX_PPC_HPP
+#define OS_CPU_LINUX_PPC_GLOBALS_LINUX_PPC_HPP
 
 // Sets the default values for platform dependent flags used by the runtime system.
 // (see globals.hpp)
@@ -41,4 +41,4 @@
 // Only used on 64 bit platforms
 define_pd_global(size_t, HeapBaseMinAddress,     2*G);
 
-#endif // OS_CPU_LINUX_PPC_VM_GLOBALS_LINUX_PPC_HPP
+#endif // OS_CPU_LINUX_PPC_GLOBALS_LINUX_PPC_HPP
--- a/src/hotspot/os_cpu/linux_ppc/orderAccess_linux_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_ppc/orderAccess_linux_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2014 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_PPC_VM_ORDERACCESS_LINUX_PPC_HPP
-#define OS_CPU_LINUX_PPC_VM_ORDERACCESS_LINUX_PPC_HPP
+#ifndef OS_CPU_LINUX_PPC_ORDERACCESS_LINUX_PPC_HPP
+#define OS_CPU_LINUX_PPC_ORDERACCESS_LINUX_PPC_HPP
 
 // Included in orderAccess.hpp header file.
 
@@ -94,4 +94,4 @@
 #undef inlasm_isync
 #undef inlasm_acquire_reg
 
-#endif // OS_CPU_LINUX_PPC_VM_ORDERACCESS_LINUX_PPC_HPP
+#endif // OS_CPU_LINUX_PPC_ORDERACCESS_LINUX_PPC_HPP
--- a/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_ppc/os_linux_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_PPC_VM_OS_LINUX_PPC_HPP
-#define OS_CPU_LINUX_PPC_VM_OS_LINUX_PPC_HPP
+#ifndef OS_CPU_LINUX_PPC_OS_LINUX_PPC_HPP
+#define OS_CPU_LINUX_PPC_OS_LINUX_PPC_HPP
 
   static void setup_fpu() {}
 
@@ -32,4 +32,4 @@
   // Note: Currently only used in 64 bit Windows implementations
   static bool register_code_area(char *low, char *high) { return true; }
 
-#endif // OS_CPU_LINUX_PPC_VM_OS_LINUX_PPC_HPP
+#endif // OS_CPU_LINUX_PPC_OS_LINUX_PPC_HPP
--- a/src/hotspot/os_cpu/linux_ppc/prefetch_linux_ppc.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_ppc/prefetch_linux_ppc.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_PPC_VM_PREFETCH_LINUX_PPC_INLINE_HPP
-#define OS_CPU_LINUX_PPC_VM_PREFETCH_LINUX_PPC_INLINE_HPP
+#ifndef OS_CPU_LINUX_PPC_PREFETCH_LINUX_PPC_INLINE_HPP
+#define OS_CPU_LINUX_PPC_PREFETCH_LINUX_PPC_INLINE_HPP
 
 #include "runtime/prefetch.hpp"
 
@@ -47,4 +47,4 @@
     );
 }
 
-#endif // OS_CPU_LINUX_PPC_VM_PREFETCH_LINUX_PPC_INLINE_HPP
+#endif // OS_CPU_LINUX_PPC_PREFETCH_LINUX_PPC_INLINE_HPP
--- a/src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_ppc/thread_linux_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_PPC_VM_THREAD_LINUX_PPC_HPP
-#define OS_CPU_LINUX_PPC_VM_THREAD_LINUX_PPC_HPP
+#ifndef OS_CPU_LINUX_PPC_THREAD_LINUX_PPC_HPP
+#define OS_CPU_LINUX_PPC_THREAD_LINUX_PPC_HPP
 
  private:
 
@@ -51,4 +51,4 @@
 
   bool pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext, bool isInJava);
 
-#endif // OS_CPU_LINUX_PPC_VM_THREAD_LINUX_PPC_HPP
+#endif // OS_CPU_LINUX_PPC_THREAD_LINUX_PPC_HPP
--- a/src/hotspot/os_cpu/linux_ppc/vmStructs_linux_ppc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_ppc/vmStructs_linux_ppc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_PPC_VM_VMSTRUCTS_LINUX_PPC_HPP
-#define OS_CPU_LINUX_PPC_VM_VMSTRUCTS_LINUX_PPC_HPP
+#ifndef OS_CPU_LINUX_PPC_VMSTRUCTS_LINUX_PPC_HPP
+#define OS_CPU_LINUX_PPC_VMSTRUCTS_LINUX_PPC_HPP
 
 // These are the OS and CPU-specific fields, types and integer
 // constants required by the Serviceability Agent. This file is
@@ -52,4 +52,4 @@
 
 #define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
 
-#endif // OS_CPU_LINUX_PPC_VM_VMSTRUCTS_LINUX_PPC_HPP
+#endif // OS_CPU_LINUX_PPC_VMSTRUCTS_LINUX_PPC_HPP
--- a/src/hotspot/os_cpu/linux_s390/atomic_linux_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_s390/atomic_linux_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016, 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_S390_VM_ATOMIC_LINUX_S390_INLINE_HPP
-#define OS_CPU_LINUX_S390_VM_ATOMIC_LINUX_S390_INLINE_HPP
+#ifndef OS_CPU_LINUX_S390_ATOMIC_LINUX_S390_HPP
+#define OS_CPU_LINUX_S390_ATOMIC_LINUX_S390_HPP
 
 #include "runtime/atomic.hpp"
 #include "runtime/os.hpp"
@@ -335,4 +335,4 @@
   return old;
 }
 
-#endif // OS_CPU_LINUX_S390_VM_ATOMIC_LINUX_S390_INLINE_HPP
+#endif // OS_CPU_LINUX_S390_ATOMIC_LINUX_S390_HPP
--- a/src/hotspot/os_cpu/linux_s390/bytes_linux_s390.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_s390/bytes_linux_s390.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_S390_VM_BYTES_LINUX_S390_INLINE_HPP
-#define OS_CPU_LINUX_S390_VM_BYTES_LINUX_S390_INLINE_HPP
+#ifndef OS_CPU_LINUX_S390_BYTES_LINUX_S390_INLINE_HPP
+#define OS_CPU_LINUX_S390_BYTES_LINUX_S390_INLINE_HPP
 
 // Efficient swapping of data bytes from Java byte
 // ordering to native byte ordering and vice versa.
@@ -43,4 +43,4 @@
   return bswap_64(x);
 }
 
-#endif // OS_CPU_LINUX_S390_VM_BYTES_LINUX_S390_INLINE_HPP
+#endif // OS_CPU_LINUX_S390_BYTES_LINUX_S390_INLINE_HPP
--- a/src/hotspot/os_cpu/linux_s390/globals_linux_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_s390/globals_linux_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -25,8 +25,8 @@
 
 // Sorted according to linux_x86.
 
-#ifndef OS_CPU_LINUX_S390_VM_GLOBALS_LINUX_S390_HPP
-#define OS_CPU_LINUX_S390_VM_GLOBALS_LINUX_S390_HPP
+#ifndef OS_CPU_LINUX_S390_GLOBALS_LINUX_S390_HPP
+#define OS_CPU_LINUX_S390_GLOBALS_LINUX_S390_HPP
 
 // Sets the default values for platform dependent flags used by the
 // runtime system (see globals.hpp).
@@ -50,5 +50,4 @@
 define_pd_global(size_t, HeapBaseMinAddress,      2*G);
 
 #endif // OS_CPU_LINUX_S390_VM_GLOBALS_LINUX_S390_HPP
-
-
+#endif // OS_CPU_LINUX_S390_GLOBALS_LINUX_S390_HPP
--- a/src/hotspot/os_cpu/linux_s390/orderAccess_linux_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_s390/orderAccess_linux_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_S390_VM_ORDERACCESS_LINUX_S390_HPP
-#define OS_CPU_LINUX_S390_VM_ORDERACCESS_LINUX_S390_HPP
+#ifndef OS_CPU_LINUX_S390_ORDERACCESS_LINUX_S390_HPP
+#define OS_CPU_LINUX_S390_ORDERACCESS_LINUX_S390_HPP
 
 // Included in orderAccess.hpp header file.
 
@@ -88,4 +88,4 @@
 #undef inlasm_zarch_acquire
 #undef inlasm_zarch_fence
 
-#endif // OS_CPU_LINUX_S390_VM_ORDERACCESS_LINUX_S390_HPP
+#endif // OS_CPU_LINUX_S390_ORDERACCESS_LINUX_S390_HPP
--- a/src/hotspot/os_cpu/linux_s390/os_linux_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_s390/os_linux_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,13 +23,12 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_S390_VM_OS_LINUX_S390_HPP
-#define OS_CPU_LINUX_S390_VM_OS_LINUX_S390_HPP
+#ifndef OS_CPU_LINUX_S390_OS_LINUX_S390_HPP
+#define OS_CPU_LINUX_S390_OS_LINUX_S390_HPP
 
   static void setup_fpu() {}
 
   // Used to register dynamic code cache area with the OS.
   static bool register_code_area(char *low, char *high) { return true; }
 
-#endif // OS_CPU_LINUX_S390_VM_OS_LINUX_S390_HPP
-
+#endif // OS_CPU_LINUX_S390_OS_LINUX_S390_HPP
--- a/src/hotspot/os_cpu/linux_s390/prefetch_linux_s390.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_s390/prefetch_linux_s390.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_S390_VM_PREFETCH_LINUX_S390_INLINE_HPP
-#define OS_CPU_LINUX_S390_VM_PREFETCH_LINUX_S390_INLINE_HPP
+#ifndef OS_CPU_LINUX_S390_PREFETCH_LINUX_S390_INLINE_HPP
+#define OS_CPU_LINUX_S390_PREFETCH_LINUX_S390_INLINE_HPP
 
 #include "runtime/prefetch.hpp"
 
@@ -36,4 +36,4 @@
   // No prefetch instructions on z/Architecture -> implement trivially.
 }
 
-#endif // OS_CPU_LINUX_S390_VM_PREFETCH_LINUX_S390_INLINE_HPP
+#endif // OS_CPU_LINUX_S390_PREFETCH_LINUX_S390_INLINE_HPP
--- a/src/hotspot/os_cpu/linux_s390/thread_linux_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_s390/thread_linux_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_S390_VM_THREAD_LINUX_S390_HPP
-#define OS_CPU_LINUX_S390_VM_THREAD_LINUX_S390_HPP
+#ifndef OS_CPU_LINUX_S390_THREAD_LINUX_S390_HPP
+#define OS_CPU_LINUX_S390_THREAD_LINUX_S390_HPP
 
  private:
 
@@ -50,4 +50,4 @@
 
   bool pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext, bool isInJava);
 
-#endif // OS_CPU_LINUX_S390_VM_THREAD_LINUX_S390_HPP
+#endif // OS_CPU_LINUX_S390_THREAD_LINUX_S390_HPP
--- a/src/hotspot/os_cpu/linux_s390/vmStructs_linux_s390.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_s390/vmStructs_linux_s390.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_S390_VM_VMSTRUCTS_LINUX_S390_HPP
-#define OS_CPU_LINUX_S390_VM_VMSTRUCTS_LINUX_S390_HPP
+#ifndef OS_CPU_LINUX_S390_VMSTRUCTS_LINUX_S390_HPP
+#define OS_CPU_LINUX_S390_VMSTRUCTS_LINUX_S390_HPP
 
 // These are the OS and CPU-specific fields, types and integer
 // constants required by the Serviceability Agent. This file is
@@ -52,5 +52,4 @@
 
 #define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
 
-#endif // OS_CPU_LINUX_S390_VM_VMSTRUCTS_LINUX_S390_HPP
-
+#endif // OS_CPU_LINUX_S390_VMSTRUCTS_LINUX_S390_HPP
--- a/src/hotspot/os_cpu/linux_sparc/atomic_linux_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_sparc/atomic_linux_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_SPARC_VM_ATOMIC_LINUX_SPARC_INLINE_HPP
-#define OS_CPU_LINUX_SPARC_VM_ATOMIC_LINUX_SPARC_INLINE_HPP
+#ifndef OS_CPU_LINUX_SPARC_ATOMIC_LINUX_SPARC_HPP
+#define OS_CPU_LINUX_SPARC_ATOMIC_LINUX_SPARC_HPP
 
 // Implementation of class atomic
 
@@ -154,4 +154,4 @@
   return rv;
 }
 
-#endif // OS_CPU_LINUX_SPARC_VM_ATOMIC_LINUX_SPARC_INLINE_HPP
+#endif // OS_CPU_LINUX_SPARC_ATOMIC_LINUX_SPARC_HPP
--- a/src/hotspot/os_cpu/linux_sparc/globals_linux_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_sparc/globals_linux_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_SPARC_VM_GLOBALS_LINUX_SPARC_HPP
-#define OS_CPU_LINUX_SPARC_VM_GLOBALS_LINUX_SPARC_HPP
+#ifndef OS_CPU_LINUX_SPARC_GLOBALS_LINUX_SPARC_HPP
+#define OS_CPU_LINUX_SPARC_GLOBALS_LINUX_SPARC_HPP
 
 //
 // Sets the default values for platform dependent flags used by the
@@ -35,4 +35,4 @@
 // Used on 64 bit platforms for UseCompressedOops base address
 define_pd_global(size_t, HeapBaseMinAddress,     CONST64(4)*G);
 
-#endif // OS_CPU_LINUX_SPARC_VM_GLOBALS_LINUX_SPARC_HPP
+#endif // OS_CPU_LINUX_SPARC_GLOBALS_LINUX_SPARC_HPP
--- a/src/hotspot/os_cpu/linux_sparc/orderAccess_linux_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_sparc/orderAccess_linux_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_SPARC_VM_ORDERACCESS_LINUX_SPARC_HPP
-#define OS_CPU_LINUX_SPARC_VM_ORDERACCESS_LINUX_SPARC_HPP
+#ifndef OS_CPU_LINUX_SPARC_ORDERACCESS_LINUX_SPARC_HPP
+#define OS_CPU_LINUX_SPARC_ORDERACCESS_LINUX_SPARC_HPP
 
 // Included in orderAccess.hpp header file.
 
@@ -48,4 +48,4 @@
   __asm__ volatile ("membar  #StoreLoad" : : : "memory");
 }
 
-#endif // OS_CPU_LINUX_SPARC_VM_ORDERACCESS_LINUX_SPARC_HPP
+#endif // OS_CPU_LINUX_SPARC_ORDERACCESS_LINUX_SPARC_HPP
--- a/src/hotspot/os_cpu/linux_sparc/os_linux_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_sparc/os_linux_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_SPARC_VM_OS_LINUX_SPARC_HPP
-#define OS_CPU_LINUX_SPARC_VM_OS_LINUX_SPARC_HPP
+#ifndef OS_CPU_LINUX_SPARC_OS_LINUX_SPARC_HPP
+#define OS_CPU_LINUX_SPARC_OS_LINUX_SPARC_HPP
 
   //
   // NOTE: we are back in class os here, not Linux
@@ -46,4 +46,4 @@
   // Note: Currently only used in 64 bit Windows implementations
   static bool register_code_area(char *low, char *high) { return true; }
 
-#endif // OS_CPU_LINUX_SPARC_VM_OS_LINUX_SPARC_HPP
+#endif // OS_CPU_LINUX_SPARC_OS_LINUX_SPARC_HPP
--- a/src/hotspot/os_cpu/linux_sparc/prefetch_linux_sparc.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_sparc/prefetch_linux_sparc.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_SPARC_VM_PREFETCH_LINUX_SPARC_INLINE_HPP
-#define OS_CPU_LINUX_SPARC_VM_PREFETCH_LINUX_SPARC_INLINE_HPP
+#ifndef OS_CPU_LINUX_SPARC_PREFETCH_LINUX_SPARC_INLINE_HPP
+#define OS_CPU_LINUX_SPARC_PREFETCH_LINUX_SPARC_INLINE_HPP
 
 #include "runtime/prefetch.hpp"
 
@@ -35,4 +35,4 @@
   __asm__ volatile("prefetch [%0+%1], 2" : : "r" (loc), "r" (interval) : "memory" );
 }
 
-#endif // OS_CPU_LINUX_SPARC_VM_PREFETCH_LINUX_SPARC_INLINE_HPP
+#endif // OS_CPU_LINUX_SPARC_PREFETCH_LINUX_SPARC_INLINE_HPP
--- a/src/hotspot/os_cpu/linux_sparc/thread_linux_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_sparc/thread_linux_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_SPARC_VM_THREAD_LINUX_SPARC_HPP
-#define OS_CPU_LINUX_SPARC_VM_THREAD_LINUX_SPARC_HPP
+#ifndef OS_CPU_LINUX_SPARC_THREAD_LINUX_SPARC_HPP
+#define OS_CPU_LINUX_SPARC_THREAD_LINUX_SPARC_HPP
 
 private:
 
@@ -95,4 +95,4 @@
   static void enable_register_stack_guard() {}
   static void disable_register_stack_guard() {}
 
-#endif // OS_CPU_LINUX_SPARC_VM_THREAD_LINUX_SPARC_HPP
+#endif // OS_CPU_LINUX_SPARC_THREAD_LINUX_SPARC_HPP
--- a/src/hotspot/os_cpu/linux_sparc/vmStructs_linux_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_sparc/vmStructs_linux_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_SPARC_VM_VMSTRUCTS_LINUX_SPARC_HPP
-#define OS_CPU_LINUX_SPARC_VM_VMSTRUCTS_LINUX_SPARC_HPP
+#ifndef OS_CPU_LINUX_SPARC_VMSTRUCTS_LINUX_SPARC_HPP
+#define OS_CPU_LINUX_SPARC_VMSTRUCTS_LINUX_SPARC_HPP
 
 // These are the OS and CPU-specific fields, types and integer
 // constants required by the Serviceability Agent. This file is
@@ -60,4 +60,4 @@
 
 #define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
 
-#endif // OS_CPU_LINUX_SPARC_VM_VMSTRUCTS_LINUX_SPARC_HPP
+#endif // OS_CPU_LINUX_SPARC_VMSTRUCTS_LINUX_SPARC_HPP
--- a/src/hotspot/os_cpu/linux_x86/atomic_linux_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_x86/atomic_linux_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_X86_VM_ATOMIC_LINUX_X86_HPP
-#define OS_CPU_LINUX_X86_VM_ATOMIC_LINUX_X86_HPP
+#ifndef OS_CPU_LINUX_X86_ATOMIC_LINUX_X86_HPP
+#define OS_CPU_LINUX_X86_ATOMIC_LINUX_X86_HPP
 
 // Implementation of class atomic
 
@@ -169,4 +169,4 @@
 
 #endif // AMD64
 
-#endif // OS_CPU_LINUX_X86_VM_ATOMIC_LINUX_X86_HPP
+#endif // OS_CPU_LINUX_X86_ATOMIC_LINUX_X86_HPP
--- a/src/hotspot/os_cpu/linux_x86/bytes_linux_x86.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_x86/bytes_linux_x86.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_X86_VM_BYTES_LINUX_X86_INLINE_HPP
-#define OS_CPU_LINUX_X86_VM_BYTES_LINUX_X86_INLINE_HPP
+#ifndef OS_CPU_LINUX_X86_BYTES_LINUX_X86_INLINE_HPP
+#define OS_CPU_LINUX_X86_BYTES_LINUX_X86_INLINE_HPP
 
 #include <byteswap.h>
 
@@ -87,4 +87,4 @@
 }
 #endif // !AMD64
 
-#endif // OS_CPU_LINUX_X86_VM_BYTES_LINUX_X86_INLINE_HPP
+#endif // OS_CPU_LINUX_X86_BYTES_LINUX_X86_INLINE_HPP
--- a/src/hotspot/os_cpu/linux_x86/copy_linux_x86.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_x86/copy_linux_x86.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_X86_VM_COPY_LINUX_X86_INLINE_HPP
-#define OS_CPU_LINUX_X86_VM_COPY_LINUX_X86_INLINE_HPP
+#ifndef OS_CPU_LINUX_X86_COPY_LINUX_X86_INLINE_HPP
+#define OS_CPU_LINUX_X86_COPY_LINUX_X86_INLINE_HPP
 
 static void pd_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) {
 #ifdef AMD64
@@ -306,4 +306,4 @@
 #endif // AMD64
 }
 
-#endif // OS_CPU_LINUX_X86_VM_COPY_LINUX_X86_INLINE_HPP
+#endif // OS_CPU_LINUX_X86_COPY_LINUX_X86_INLINE_HPP
--- a/src/hotspot/os_cpu/linux_x86/gc/z/zAddress_linux_x86.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_x86/gc/z/zAddress_linux_x86.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,11 +21,11 @@
  * questions.
  */
 
-#ifndef OS_CPU_LINUX_X86_ZADDRESS_LINUX_X86_INLINE_HPP
-#define OS_CPU_LINUX_X86_ZADDRESS_LINUX_X86_INLINE_HPP
+#ifndef OS_CPU_LINUX_X86_GC_Z_ZADDRESS_LINUX_X86_INLINE_HPP
+#define OS_CPU_LINUX_X86_GC_Z_ZADDRESS_LINUX_X86_INLINE_HPP
 
 inline uintptr_t ZAddress::address(uintptr_t value) {
   return value;
 }
 
-#endif // OS_CPU_LINUX_X86_ZADDRESS_LINUX_X86_INLINE_HPP
+#endif // OS_CPU_LINUX_X86_GC_Z_ZADDRESS_LINUX_X86_INLINE_HPP
--- a/src/hotspot/os_cpu/linux_x86/gc/z/zBackingFile_linux_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_x86/gc/z/zBackingFile_linux_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  */
 
-#ifndef OS_CPU_LINUX_X86_ZBACKINGFILE_LINUX_X86_HPP
-#define OS_CPU_LINUX_X86_ZBACKINGFILE_LINUX_X86_HPP
+#ifndef OS_CPU_LINUX_X86_GC_Z_ZBACKINGFILE_LINUX_X86_HPP
+#define OS_CPU_LINUX_X86_GC_Z_ZBACKINGFILE_LINUX_X86_HPP
 
 #include "memory/allocation.hpp"
 
@@ -60,4 +60,4 @@
   size_t try_expand(size_t offset, size_t length, size_t alignment) const;
 };
 
-#endif // OS_CPU_LINUX_X86_ZBACKINGFILE_LINUX_X86_HPP
+#endif // OS_CPU_LINUX_X86_GC_Z_ZBACKINGFILE_LINUX_X86_HPP
--- a/src/hotspot/os_cpu/linux_x86/gc/z/zBackingPath_linux_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_x86/gc/z/zBackingPath_linux_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  */
 
-#ifndef OS_CPU_LINUX_X86_ZBACKINGPATH_LINUX_X86_HPP
-#define OS_CPU_LINUX_X86_ZBACKINGPATH_LINUX_X86_HPP
+#ifndef OS_CPU_LINUX_X86_GC_Z_ZBACKINGPATH_LINUX_X86_HPP
+#define OS_CPU_LINUX_X86_GC_Z_ZBACKINGPATH_LINUX_X86_HPP
 
 #include "gc/z/zArray.hpp"
 #include "memory/allocation.hpp"
@@ -49,4 +49,4 @@
   const char* get() const;
 };
 
-#endif // OS_CPU_LINUX_X86_ZBACKINGPATH_LINUX_X86_HPP
+#endif // OS_CPU_LINUX_X86_GC_Z_ZBACKINGPATH_LINUX_X86_HPP
--- a/src/hotspot/os_cpu/linux_x86/gc/z/zGlobals_linux_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_x86/gc/z/zGlobals_linux_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  */
 
-#ifndef OS_CPU_LINUX_X86_ZGLOBALS_LINUX_X86_HPP
-#define OS_CPU_LINUX_X86_ZGLOBALS_LINUX_X86_HPP
+#ifndef OS_CPU_LINUX_X86_GC_Z_ZGLOBALS_LINUX_X86_HPP
+#define OS_CPU_LINUX_X86_GC_Z_ZGLOBALS_LINUX_X86_HPP
 
 //
 // Page Allocation Tiers
@@ -87,4 +87,4 @@
 
 const size_t    ZPlatformCacheLineSize         = 64;
 
-#endif // OS_CPU_LINUX_X86_ZGLOBALS_LINUX_X86_HPP
+#endif // OS_CPU_LINUX_X86_GC_Z_ZGLOBALS_LINUX_X86_HPP
--- a/src/hotspot/os_cpu/linux_x86/gc/z/zPhysicalMemoryBacking_linux_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_x86/gc/z/zPhysicalMemoryBacking_linux_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  */
 
-#ifndef OS_CPU_LINUX_X86_ZPHYSICALMEMORYBACKING_LINUX_X86_HPP
-#define OS_CPU_LINUX_X86_ZPHYSICALMEMORYBACKING_LINUX_X86_HPP
+#ifndef OS_CPU_LINUX_X86_GC_Z_ZPHYSICALMEMORYBACKING_LINUX_X86_HPP
+#define OS_CPU_LINUX_X86_GC_Z_ZPHYSICALMEMORYBACKING_LINUX_X86_HPP
 
 #include "gc/z/zBackingFile_linux_x86.hpp"
 #include "gc/z/zMemory.hpp"
@@ -62,4 +62,4 @@
   void flip(ZPhysicalMemory pmem, uintptr_t offset) const;
 };
 
-#endif // OS_CPU_LINUX_X86_ZPHYSICALMEMORYBACKING_LINUX_X86_HPP
+#endif // OS_CPU_LINUX_X86_GC_Z_ZPHYSICALMEMORYBACKING_LINUX_X86_HPP
--- a/src/hotspot/os_cpu/linux_x86/globals_linux_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_x86/globals_linux_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_X86_VM_GLOBALS_LINUX_X86_HPP
-#define OS_CPU_LINUX_X86_VM_GLOBALS_LINUX_X86_HPP
+#ifndef OS_CPU_LINUX_X86_GLOBALS_LINUX_X86_HPP
+#define OS_CPU_LINUX_X86_GLOBALS_LINUX_X86_HPP
 
 // Sets the default values for platform dependent flags used by the runtime system.
 // (see globals.hpp)
@@ -47,4 +47,4 @@
 // Used on 64 bit platforms for UseCompressedOops base address
 define_pd_global(size_t, HeapBaseMinAddress,     2*G);
 
-#endif // OS_CPU_LINUX_X86_VM_GLOBALS_LINUX_X86_HPP
+#endif // OS_CPU_LINUX_X86_GLOBALS_LINUX_X86_HPP
--- a/src/hotspot/os_cpu/linux_x86/orderAccess_linux_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_x86/orderAccess_linux_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_X86_VM_ORDERACCESS_LINUX_X86_HPP
-#define OS_CPU_LINUX_X86_VM_ORDERACCESS_LINUX_X86_HPP
+#ifndef OS_CPU_LINUX_X86_ORDERACCESS_LINUX_X86_HPP
+#define OS_CPU_LINUX_X86_ORDERACCESS_LINUX_X86_HPP
 
 // Included in orderAccess.hpp header file.
 
@@ -105,4 +105,4 @@
 };
 #endif // AMD64
 
-#endif // OS_CPU_LINUX_X86_VM_ORDERACCESS_LINUX_X86_HPP
+#endif // OS_CPU_LINUX_X86_ORDERACCESS_LINUX_X86_HPP
--- a/src/hotspot/os_cpu/linux_x86/os_linux_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_x86/os_linux_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_X86_VM_OS_LINUX_X86_HPP
-#define OS_CPU_LINUX_X86_VM_OS_LINUX_X86_HPP
+#ifndef OS_CPU_LINUX_X86_OS_LINUX_X86_HPP
+#define OS_CPU_LINUX_X86_OS_LINUX_X86_HPP
 
   static void setup_fpu();
   static bool supports_sse();
@@ -49,4 +49,4 @@
    */
   static void workaround_expand_exec_shield_cs_limit();
 
-#endif // OS_CPU_LINUX_X86_VM_OS_LINUX_X86_HPP
+#endif // OS_CPU_LINUX_X86_OS_LINUX_X86_HPP
--- a/src/hotspot/os_cpu/linux_x86/os_linux_x86.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_x86/os_linux_x86.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_X86_VM_OS_LINUX_X86_INLINE_HPP
-#define OS_CPU_LINUX_X86_VM_OS_LINUX_X86_INLINE_HPP
+#ifndef OS_CPU_LINUX_X86_OS_LINUX_X86_INLINE_HPP
+#define OS_CPU_LINUX_X86_OS_LINUX_X86_INLINE_HPP
 
 #include "runtime/os.hpp"
 
@@ -43,4 +43,4 @@
 #endif // AMD64
 }
 
-#endif // OS_CPU_LINUX_X86_VM_OS_LINUX_X86_INLINE_HPP
+#endif // OS_CPU_LINUX_X86_OS_LINUX_X86_INLINE_HPP
--- a/src/hotspot/os_cpu/linux_x86/prefetch_linux_x86.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_x86/prefetch_linux_x86.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_X86_VM_PREFETCH_LINUX_X86_INLINE_HPP
-#define OS_CPU_LINUX_X86_VM_PREFETCH_LINUX_X86_INLINE_HPP
+#ifndef OS_CPU_LINUX_X86_PREFETCH_LINUX_X86_INLINE_HPP
+#define OS_CPU_LINUX_X86_PREFETCH_LINUX_X86_INLINE_HPP
 
 #include "runtime/prefetch.hpp"
 
@@ -44,4 +44,4 @@
 #endif // AMD64
 }
 
-#endif // OS_CPU_LINUX_X86_VM_PREFETCH_LINUX_X86_INLINE_HPP
+#endif // OS_CPU_LINUX_X86_PREFETCH_LINUX_X86_INLINE_HPP
--- a/src/hotspot/os_cpu/linux_x86/thread_linux_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_x86/thread_linux_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_X86_VM_THREAD_LINUX_X86_HPP
-#define OS_CPU_LINUX_X86_VM_THREAD_LINUX_X86_HPP
+#ifndef OS_CPU_LINUX_X86_THREAD_LINUX_X86_HPP
+#define OS_CPU_LINUX_X86_THREAD_LINUX_X86_HPP
 
  private:
   void pd_initialize() {
@@ -64,4 +64,4 @@
   static void enable_register_stack_guard() {}
   static void disable_register_stack_guard() {}
 
-#endif // OS_CPU_LINUX_X86_VM_THREAD_LINUX_X86_HPP
+#endif // OS_CPU_LINUX_X86_THREAD_LINUX_X86_HPP
--- a/src/hotspot/os_cpu/linux_x86/vmStructs_linux_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_x86/vmStructs_linux_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_X86_VM_VMSTRUCTS_LINUX_X86_HPP
-#define OS_CPU_LINUX_X86_VM_VMSTRUCTS_LINUX_X86_HPP
+#ifndef OS_CPU_LINUX_X86_VMSTRUCTS_LINUX_X86_HPP
+#define OS_CPU_LINUX_X86_VMSTRUCTS_LINUX_X86_HPP
 
 // These are the OS and CPU-specific fields, types and integer
 // constants required by the Serviceability Agent. This file is
@@ -51,4 +51,4 @@
 
 #define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
 
-#endif // OS_CPU_LINUX_X86_VM_VMSTRUCTS_LINUX_X86_HPP
+#endif // OS_CPU_LINUX_X86_VMSTRUCTS_LINUX_X86_HPP
--- a/src/hotspot/os_cpu/linux_zero/atomic_linux_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_zero/atomic_linux_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2008, 2011, 2015, Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_ZERO_VM_ATOMIC_LINUX_ZERO_HPP
-#define OS_CPU_LINUX_ZERO_VM_ATOMIC_LINUX_ZERO_HPP
+#ifndef OS_CPU_LINUX_ZERO_ATOMIC_LINUX_ZERO_HPP
+#define OS_CPU_LINUX_ZERO_ATOMIC_LINUX_ZERO_HPP
 
 #include "runtime/os.hpp"
 
@@ -128,4 +128,4 @@
   os::atomic_copy64(reinterpret_cast<const volatile int64_t*>(&store_value), reinterpret_cast<volatile int64_t*>(dest));
 }
 
-#endif // OS_CPU_LINUX_ZERO_VM_ATOMIC_LINUX_ZERO_HPP
+#endif // OS_CPU_LINUX_ZERO_ATOMIC_LINUX_ZERO_HPP
--- a/src/hotspot/os_cpu/linux_zero/bytes_linux_zero.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_zero/bytes_linux_zero.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_ZERO_VM_BYTES_LINUX_ZERO_INLINE_HPP
-#define OS_CPU_LINUX_ZERO_VM_BYTES_LINUX_ZERO_INLINE_HPP
+#ifndef OS_CPU_LINUX_ZERO_BYTES_LINUX_ZERO_INLINE_HPP
+#define OS_CPU_LINUX_ZERO_BYTES_LINUX_ZERO_INLINE_HPP
 
 // Efficient swapping of data bytes from Java byte
 // ordering to native byte ordering and vice versa.
@@ -42,4 +42,4 @@
   return bswap_64(x);
 }
 
-#endif // OS_CPU_LINUX_ZERO_VM_BYTES_LINUX_ZERO_INLINE_HPP
+#endif // OS_CPU_LINUX_ZERO_BYTES_LINUX_ZERO_INLINE_HPP
--- a/src/hotspot/os_cpu/linux_zero/globals_linux_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_zero/globals_linux_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2008, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_ZERO_VM_GLOBALS_LINUX_ZERO_HPP
-#define OS_CPU_LINUX_ZERO_VM_GLOBALS_LINUX_ZERO_HPP
+#ifndef OS_CPU_LINUX_ZERO_GLOBALS_LINUX_ZERO_HPP
+#define OS_CPU_LINUX_ZERO_GLOBALS_LINUX_ZERO_HPP
 
 //
 // Set the default values for platform dependent flags used by the
@@ -44,4 +44,4 @@
 // Used on 64 bit platforms for UseCompressedOops base address
 define_pd_global(size_t, HeapBaseMinAddress,     2*G);
 
-#endif // OS_CPU_LINUX_ZERO_VM_GLOBALS_LINUX_ZERO_HPP
+#endif // OS_CPU_LINUX_ZERO_GLOBALS_LINUX_ZERO_HPP
--- a/src/hotspot/os_cpu/linux_zero/orderAccess_linux_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_zero/orderAccess_linux_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2008, 2009 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_ZERO_VM_ORDERACCESS_LINUX_ZERO_HPP
-#define OS_CPU_LINUX_ZERO_VM_ORDERACCESS_LINUX_ZERO_HPP
+#ifndef OS_CPU_LINUX_ZERO_ORDERACCESS_LINUX_ZERO_HPP
+#define OS_CPU_LINUX_ZERO_ORDERACCESS_LINUX_ZERO_HPP
 
 // Included in orderAccess.hpp header file.
 
@@ -83,4 +83,4 @@
 
 inline void OrderAccess::fence()      { FULL_MEM_BARRIER;  }
 
-#endif // OS_CPU_LINUX_ZERO_VM_ORDERACCESS_LINUX_ZERO_HPP
+#endif // OS_CPU_LINUX_ZERO_ORDERACCESS_LINUX_ZERO_HPP
--- a/src/hotspot/os_cpu/linux_zero/os_linux_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_zero/os_linux_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2008, 2010, 2018, Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_ZERO_VM_OS_LINUX_ZERO_HPP
-#define OS_CPU_LINUX_ZERO_VM_OS_LINUX_ZERO_HPP
+#ifndef OS_CPU_LINUX_ZERO_OS_LINUX_ZERO_HPP
+#define OS_CPU_LINUX_ZERO_OS_LINUX_ZERO_HPP
 
   static void setup_fpu() {}
 
@@ -69,4 +69,4 @@
 #endif
   }
 
-#endif // OS_CPU_LINUX_ZERO_VM_OS_LINUX_ZERO_HPP
+#endif // OS_CPU_LINUX_ZERO_OS_LINUX_ZERO_HPP
--- a/src/hotspot/os_cpu/linux_zero/prefetch_linux_zero.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_zero/prefetch_linux_zero.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2008 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_ZERO_VM_PREFETCH_LINUX_ZERO_INLINE_HPP
-#define OS_CPU_LINUX_ZERO_VM_PREFETCH_LINUX_ZERO_INLINE_HPP
+#ifndef OS_CPU_LINUX_ZERO_PREFETCH_LINUX_ZERO_INLINE_HPP
+#define OS_CPU_LINUX_ZERO_PREFETCH_LINUX_ZERO_INLINE_HPP
 
 #include "runtime/prefetch.hpp"
 
@@ -34,4 +34,4 @@
 inline void Prefetch::write(void* loc, intx interval) {
 }
 
-#endif // OS_CPU_LINUX_ZERO_VM_PREFETCH_LINUX_ZERO_INLINE_HPP
+#endif // OS_CPU_LINUX_ZERO_PREFETCH_LINUX_ZERO_INLINE_HPP
--- a/src/hotspot/os_cpu/linux_zero/thread_linux_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_zero/thread_linux_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_ZERO_VM_THREAD_LINUX_ZERO_HPP
-#define OS_CPU_LINUX_ZERO_VM_THREAD_LINUX_ZERO_HPP
+#ifndef OS_CPU_LINUX_ZERO_THREAD_LINUX_ZERO_HPP
+#define OS_CPU_LINUX_ZERO_THREAD_LINUX_ZERO_HPP
 
  private:
   ZeroStack  _zero_stack;
@@ -124,4 +124,4 @@
   static void enable_register_stack_guard() {}
   static void disable_register_stack_guard() {}
 
-#endif // OS_CPU_LINUX_ZERO_VM_THREAD_LINUX_ZERO_HPP
+#endif // OS_CPU_LINUX_ZERO_THREAD_LINUX_ZERO_HPP
--- a/src/hotspot/os_cpu/linux_zero/vmStructs_linux_zero.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/linux_zero/vmStructs_linux_zero.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OS_CPU_LINUX_ZERO_VM_VMSTRUCTS_LINUX_ZERO_HPP
-#define OS_CPU_LINUX_ZERO_VM_VMSTRUCTS_LINUX_ZERO_HPP
+#ifndef OS_CPU_LINUX_ZERO_VMSTRUCTS_LINUX_ZERO_HPP
+#define OS_CPU_LINUX_ZERO_VMSTRUCTS_LINUX_ZERO_HPP
 
 // These are the OS and CPU-specific fields, types and integer
 // constants required by the Serviceability Agent. This file is
@@ -38,4 +38,4 @@
 
 #define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
 
-#endif // OS_CPU_LINUX_ZERO_VM_VMSTRUCTS_LINUX_ZERO_HPP
+#endif // OS_CPU_LINUX_ZERO_VMSTRUCTS_LINUX_ZERO_HPP
--- a/src/hotspot/os_cpu/solaris_sparc/atomic_solaris_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/solaris_sparc/atomic_solaris_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_SOLARIS_SPARC_VM_ATOMIC_SOLARIS_SPARC_HPP
-#define OS_CPU_SOLARIS_SPARC_VM_ATOMIC_SOLARIS_SPARC_HPP
+#ifndef OS_CPU_SOLARIS_SPARC_ATOMIC_SOLARIS_SPARC_HPP
+#define OS_CPU_SOLARIS_SPARC_ATOMIC_SOLARIS_SPARC_HPP
 
 // Implementation of class atomic
 
@@ -107,4 +107,4 @@
   return rv;
 }
 
-#endif // OS_CPU_SOLARIS_SPARC_VM_ATOMIC_SOLARIS_SPARC_HPP
+#endif // OS_CPU_SOLARIS_SPARC_ATOMIC_SOLARIS_SPARC_HPP
--- a/src/hotspot/os_cpu/solaris_sparc/count_trailing_zeros_solaris_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/solaris_sparc/count_trailing_zeros_solaris_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_SOLARIS_SPARC_VM_COUNTTRAILINGZEROS_HPP
-#define OS_CPU_SOLARIS_SPARC_VM_COUNTTRAILINGZEROS_HPP
+#ifndef OS_CPU_SOLARIS_SPARC_COUNT_TRAILING_ZEROS_SOLARIS_SPARC_HPP
+#define OS_CPU_SOLARIS_SPARC_COUNT_TRAILING_ZEROS_SOLARIS_SPARC_HPP
 
 #include "utilities/globalDefinitions.hpp"
 
@@ -38,4 +38,4 @@
   return result;
 }
 
-#endif // include guard
+#endif // OS_CPU_SOLARIS_SPARC_COUNT_TRAILING_ZEROS_SOLARIS_SPARC_HPP
--- a/src/hotspot/os_cpu/solaris_sparc/globals_solaris_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/solaris_sparc/globals_solaris_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_SOLARIS_SPARC_VM_GLOBALS_SOLARIS_SPARC_HPP
-#define OS_CPU_SOLARIS_SPARC_VM_GLOBALS_SOLARIS_SPARC_HPP
+#ifndef OS_CPU_SOLARIS_SPARC_GLOBALS_SOLARIS_SPARC_HPP
+#define OS_CPU_SOLARIS_SPARC_GLOBALS_SOLARIS_SPARC_HPP
 
 //
 // Sets the default values for platform dependent flags used by the runtime system.
@@ -39,4 +39,4 @@
 
 
 
-#endif // OS_CPU_SOLARIS_SPARC_VM_GLOBALS_SOLARIS_SPARC_HPP
+#endif // OS_CPU_SOLARIS_SPARC_GLOBALS_SOLARIS_SPARC_HPP
--- a/src/hotspot/os_cpu/solaris_sparc/orderAccess_solaris_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/solaris_sparc/orderAccess_solaris_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_SOLARIS_SPARC_VM_ORDERACCESS_SOLARIS_SPARC_HPP
-#define OS_CPU_SOLARIS_SPARC_VM_ORDERACCESS_SOLARIS_SPARC_HPP
+#ifndef OS_CPU_SOLARIS_SPARC_ORDERACCESS_SOLARIS_SPARC_HPP
+#define OS_CPU_SOLARIS_SPARC_ORDERACCESS_SOLARIS_SPARC_HPP
 
 // Included in orderAccess.hpp header file.
 
@@ -51,4 +51,4 @@
   __asm__ volatile ("membar  #StoreLoad" : : : "memory");
 }
 
-#endif // OS_CPU_SOLARIS_SPARC_VM_ORDERACCESS_SOLARIS_SPARC_HPP
+#endif // OS_CPU_SOLARIS_SPARC_ORDERACCESS_SOLARIS_SPARC_HPP
--- a/src/hotspot/os_cpu/solaris_sparc/os_solaris_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/solaris_sparc/os_solaris_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_SOLARIS_SPARC_VM_OS_SOLARIS_SPARC_HPP
-#define OS_CPU_SOLARIS_SPARC_VM_OS_SOLARIS_SPARC_HPP
+#ifndef OS_CPU_SOLARIS_SPARC_OS_SOLARIS_SPARC_HPP
+#define OS_CPU_SOLARIS_SPARC_OS_SOLARIS_SPARC_HPP
 
   //
   // NOTE: we are back in class os here, not Solaris
@@ -46,4 +46,4 @@
   // Note: Currently only used in 64 bit Windows implementations
   static bool register_code_area(char *low, char *high) { return true; }
 
-#endif // OS_CPU_SOLARIS_SPARC_VM_OS_SOLARIS_SPARC_HPP
+#endif // OS_CPU_SOLARIS_SPARC_OS_SOLARIS_SPARC_HPP
--- a/src/hotspot/os_cpu/solaris_sparc/prefetch_solaris_sparc.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/solaris_sparc/prefetch_solaris_sparc.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_SOLARIS_SPARC_VM_PREFETCH_SOLARIS_SPARC_INLINE_HPP
-#define OS_CPU_SOLARIS_SPARC_VM_PREFETCH_SOLARIS_SPARC_INLINE_HPP
+#ifndef OS_CPU_SOLARIS_SPARC_PREFETCH_SOLARIS_SPARC_INLINE_HPP
+#define OS_CPU_SOLARIS_SPARC_PREFETCH_SOLARIS_SPARC_INLINE_HPP
 
 #include "runtime/prefetch.hpp"
 
@@ -40,4 +40,4 @@
   _Prefetch_write(loc, interval);
 }
 
-#endif // OS_CPU_SOLARIS_SPARC_VM_PREFETCH_SOLARIS_SPARC_INLINE_HPP
+#endif // OS_CPU_SOLARIS_SPARC_PREFETCH_SOLARIS_SPARC_INLINE_HPP
--- a/src/hotspot/os_cpu/solaris_sparc/thread_solaris_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/solaris_sparc/thread_solaris_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_SOLARIS_SPARC_VM_THREAD_SOLARIS_SPARC_HPP
-#define OS_CPU_SOLARIS_SPARC_VM_THREAD_SOLARIS_SPARC_HPP
+#ifndef OS_CPU_SOLARIS_SPARC_THREAD_SOLARIS_SPARC_HPP
+#define OS_CPU_SOLARIS_SPARC_THREAD_SOLARIS_SPARC_HPP
 private:
 
   void pd_initialize() {
@@ -94,4 +94,4 @@
   static void enable_register_stack_guard() {}
   static void disable_register_stack_guard() {}
 
-#endif // OS_CPU_SOLARIS_SPARC_VM_THREAD_SOLARIS_SPARC_HPP
+#endif // OS_CPU_SOLARIS_SPARC_THREAD_SOLARIS_SPARC_HPP
--- a/src/hotspot/os_cpu/solaris_sparc/vmStructs_solaris_sparc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/solaris_sparc/vmStructs_solaris_sparc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_SOLARIS_SPARC_VM_VMSTRUCTS_SOLARIS_SPARC_HPP
-#define OS_CPU_SOLARIS_SPARC_VM_VMSTRUCTS_SOLARIS_SPARC_HPP
+#ifndef OS_CPU_SOLARIS_SPARC_VMSTRUCTS_SOLARIS_SPARC_HPP
+#define OS_CPU_SOLARIS_SPARC_VMSTRUCTS_SOLARIS_SPARC_HPP
 
 // These are the OS and CPU-specific fields, types and integer
 // constants required by the Serviceability Agent. This file is
@@ -39,4 +39,4 @@
 
 #define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
 
-#endif // OS_CPU_SOLARIS_SPARC_VM_VMSTRUCTS_SOLARIS_SPARC_HPP
+#endif // OS_CPU_SOLARIS_SPARC_VMSTRUCTS_SOLARIS_SPARC_HPP
--- a/src/hotspot/os_cpu/solaris_x86/atomic_solaris_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/solaris_x86/atomic_solaris_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_SOLARIS_X86_VM_ATOMIC_SOLARIS_X86_HPP
-#define OS_CPU_SOLARIS_X86_VM_ATOMIC_SOLARIS_X86_HPP
+#ifndef OS_CPU_SOLARIS_X86_ATOMIC_SOLARIS_X86_HPP
+#define OS_CPU_SOLARIS_X86_ATOMIC_SOLARIS_X86_HPP
 
 // For Sun Studio - implementation is in solaris_x86_64.il.
 
@@ -141,4 +141,4 @@
                          PrimitiveConversions::cast<int64_t>(compare_value)));
 }
 
-#endif // OS_CPU_SOLARIS_X86_VM_ATOMIC_SOLARIS_X86_HPP
+#endif // OS_CPU_SOLARIS_X86_ATOMIC_SOLARIS_X86_HPP
--- a/src/hotspot/os_cpu/solaris_x86/bytes_solaris_x86.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/solaris_x86/bytes_solaris_x86.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_SOLARIS_X86_VM_BYTES_SOLARIS_X86_INLINE_HPP
-#define OS_CPU_SOLARIS_X86_VM_BYTES_SOLARIS_X86_INLINE_HPP
+#ifndef OS_CPU_SOLARIS_X86_BYTES_SOLARIS_X86_INLINE_HPP
+#define OS_CPU_SOLARIS_X86_BYTES_SOLARIS_X86_INLINE_HPP
 
 // For Sun Studio - implementation is in solaris_i486.il.
 // For gcc - implementation is just below.
@@ -61,4 +61,4 @@
 }
 #endif // !AMD64
 
-#endif // OS_CPU_SOLARIS_X86_VM_BYTES_SOLARIS_X86_INLINE_HPP
+#endif // OS_CPU_SOLARIS_X86_BYTES_SOLARIS_X86_INLINE_HPP
--- a/src/hotspot/os_cpu/solaris_x86/copy_solaris_x86.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/solaris_x86/copy_solaris_x86.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_SOLARIS_X86_VM_COPY_SOLARIS_X86_INLINE_HPP
-#define OS_CPU_SOLARIS_X86_VM_COPY_SOLARIS_X86_INLINE_HPP
+#ifndef OS_CPU_SOLARIS_X86_COPY_SOLARIS_X86_INLINE_HPP
+#define OS_CPU_SOLARIS_X86_COPY_SOLARIS_X86_INLINE_HPP
 
 static void pd_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) {
   (void)memmove(to, from, count * HeapWordSize);
@@ -140,4 +140,4 @@
 #endif // AMD64
 }
 
-#endif // OS_CPU_SOLARIS_X86_VM_COPY_SOLARIS_X86_INLINE_HPP
+#endif // OS_CPU_SOLARIS_X86_COPY_SOLARIS_X86_INLINE_HPP
--- a/src/hotspot/os_cpu/solaris_x86/count_trailing_zeros_solaris_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/solaris_x86/count_trailing_zeros_solaris_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_SOLARIS_X86_VM_COUNTTRAILINGZEROS_HPP
-#define OS_CPU_SOLARIS_X86_VM_COUNTTRAILINGZEROS_HPP
+#ifndef OS_CPU_SOLARIS_X86_COUNT_TRAILING_ZEROS_SOLARIS_X86_HPP
+#define OS_CPU_SOLARIS_X86_COUNT_TRAILING_ZEROS_SOLARIS_X86_HPP
 
 #include "utilities/globalDefinitions.hpp"
 
@@ -34,4 +34,4 @@
   return result;
 }
 
-#endif // include guard
+#endif // OS_CPU_SOLARIS_X86_COUNT_TRAILING_ZEROS_SOLARIS_X86_HPP
--- a/src/hotspot/os_cpu/solaris_x86/globals_solaris_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/solaris_x86/globals_solaris_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_SOLARIS_X86_VM_GLOBALS_SOLARIS_X86_HPP
-#define OS_CPU_SOLARIS_X86_VM_GLOBALS_SOLARIS_X86_HPP
+#ifndef OS_CPU_SOLARIS_X86_GLOBALS_SOLARIS_X86_HPP
+#define OS_CPU_SOLARIS_X86_GLOBALS_SOLARIS_X86_HPP
 
 // Sets the default values for platform dependent flags used by the runtime system.
 // (see globals.hpp)
@@ -47,4 +47,4 @@
 // Used on 64 bit platforms for UseCompressedOops base address
 define_pd_global(size_t, HeapBaseMinAddress,     2*G);
 
-#endif // OS_CPU_SOLARIS_X86_VM_GLOBALS_SOLARIS_X86_HPP
+#endif // OS_CPU_SOLARIS_X86_GLOBALS_SOLARIS_X86_HPP
--- a/src/hotspot/os_cpu/solaris_x86/orderAccess_solaris_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/solaris_x86/orderAccess_solaris_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_SOLARIS_X86_VM_ORDERACCESS_SOLARIS_X86_HPP
-#define OS_CPU_SOLARIS_X86_VM_ORDERACCESS_SOLARIS_X86_HPP
+#ifndef OS_CPU_SOLARIS_X86_ORDERACCESS_SOLARIS_X86_HPP
+#define OS_CPU_SOLARIS_X86_ORDERACCESS_SOLARIS_X86_HPP
 
 // Included in orderAccess.hpp header file.
 
@@ -54,4 +54,4 @@
   compiler_barrier();
 }
 
-#endif // OS_CPU_SOLARIS_X86_VM_ORDERACCESS_SOLARIS_X86_HPP
+#endif // OS_CPU_SOLARIS_X86_ORDERACCESS_SOLARIS_X86_HPP
--- a/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_SOLARIS_X86_VM_OS_SOLARIS_X86_HPP
-#define OS_CPU_SOLARIS_X86_VM_OS_SOLARIS_X86_HPP
+#ifndef OS_CPU_SOLARIS_X86_OS_SOLARIS_X86_HPP
+#define OS_CPU_SOLARIS_X86_OS_SOLARIS_X86_HPP
 
   //
   // NOTE: we are back in class os here, not Solaris
@@ -54,4 +54,4 @@
   // Note: Currently only used in 64 bit Windows implementations
   static bool register_code_area(char *low, char *high) { return true; }
 
-#endif // OS_CPU_SOLARIS_X86_VM_OS_SOLARIS_X86_HPP
+#endif // OS_CPU_SOLARIS_X86_OS_SOLARIS_X86_HPP
--- a/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/solaris_x86/os_solaris_x86.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_SOLARIS_X86_VM_OS_SOLARIS_X86_INLINE_HPP
-#define OS_CPU_SOLARIS_X86_VM_OS_SOLARIS_X86_INLINE_HPP
+#ifndef OS_CPU_SOLARIS_X86_OS_SOLARIS_X86_INLINE_HPP
+#define OS_CPU_SOLARIS_X86_OS_SOLARIS_X86_INLINE_HPP
 
 #include "runtime/os.hpp"
 
@@ -31,4 +31,4 @@
 
 inline jlong os::rdtsc() { return _raw_rdtsc(); }
 
-#endif // OS_CPU_SOLARIS_X86_VM_OS_SOLARIS_X86_INLINE_HPP
+#endif // OS_CPU_SOLARIS_X86_OS_SOLARIS_X86_INLINE_HPP
--- a/src/hotspot/os_cpu/solaris_x86/prefetch_solaris_x86.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/solaris_x86/prefetch_solaris_x86.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_SOLARIS_X86_VM_PREFETCH_SOLARIS_X86_INLINE_HPP
-#define OS_CPU_SOLARIS_X86_VM_PREFETCH_SOLARIS_X86_INLINE_HPP
+#ifndef OS_CPU_SOLARIS_X86_PREFETCH_SOLARIS_X86_INLINE_HPP
+#define OS_CPU_SOLARIS_X86_PREFETCH_SOLARIS_X86_INLINE_HPP
 
 #include "runtime/prefetch.hpp"
 
@@ -45,4 +45,4 @@
 #endif // AMD64
 }
 
-#endif // OS_CPU_SOLARIS_X86_VM_PREFETCH_SOLARIS_X86_INLINE_HPP
+#endif // OS_CPU_SOLARIS_X86_PREFETCH_SOLARIS_X86_INLINE_HPP
--- a/src/hotspot/os_cpu/solaris_x86/thread_solaris_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/solaris_x86/thread_solaris_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_SOLARIS_X86_VM_THREAD_SOLARIS_X86_HPP
-#define OS_CPU_SOLARIS_X86_VM_THREAD_SOLARIS_X86_HPP
+#ifndef OS_CPU_SOLARIS_X86_THREAD_SOLARIS_X86_HPP
+#define OS_CPU_SOLARIS_X86_THREAD_SOLARIS_X86_HPP
 
  private:
   void pd_initialize()                           { _anchor.clear(); }
@@ -59,4 +59,4 @@
   static void enable_register_stack_guard() {}
   static void disable_register_stack_guard() {}
 
-#endif // OS_CPU_SOLARIS_X86_VM_THREAD_SOLARIS_X86_HPP
+#endif // OS_CPU_SOLARIS_X86_THREAD_SOLARIS_X86_HPP
--- a/src/hotspot/os_cpu/solaris_x86/vmStructs_solaris_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/solaris_x86/vmStructs_solaris_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_SOLARIS_X86_VM_VMSTRUCTS_SOLARIS_X86_HPP
-#define OS_CPU_SOLARIS_X86_VM_VMSTRUCTS_SOLARIS_X86_HPP
+#ifndef OS_CPU_SOLARIS_X86_VMSTRUCTS_SOLARIS_X86_HPP
+#define OS_CPU_SOLARIS_X86_VMSTRUCTS_SOLARIS_X86_HPP
 
 // These are the OS and CPU-specific fields, types and integer
 // constants required by the Serviceability Agent. This file is
@@ -37,4 +37,4 @@
 
 #define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
 
-#endif // OS_CPU_SOLARIS_X86_VM_VMSTRUCTS_SOLARIS_X86_HPP
+#endif // OS_CPU_SOLARIS_X86_VMSTRUCTS_SOLARIS_X86_HPP
--- a/src/hotspot/os_cpu/windows_x86/atomic_windows_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/windows_x86/atomic_windows_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_WINDOWS_X86_VM_ATOMIC_WINDOWS_X86_HPP
-#define OS_CPU_WINDOWS_X86_VM_ATOMIC_WINDOWS_X86_HPP
+#ifndef OS_CPU_WINDOWS_X86_ATOMIC_WINDOWS_X86_HPP
+#define OS_CPU_WINDOWS_X86_ATOMIC_WINDOWS_X86_HPP
 
 #include "runtime/os.hpp"
 
@@ -218,4 +218,4 @@
 
 #pragma warning(default: 4035) // Enables warnings reporting missing return statement
 
-#endif // OS_CPU_WINDOWS_X86_VM_ATOMIC_WINDOWS_X86_HPP
+#endif // OS_CPU_WINDOWS_X86_ATOMIC_WINDOWS_X86_HPP
--- a/src/hotspot/os_cpu/windows_x86/bytes_windows_x86.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/windows_x86/bytes_windows_x86.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_WINDOWS_X86_VM_BYTES_WINDOWS_X86_INLINE_HPP
-#define OS_CPU_WINDOWS_X86_VM_BYTES_WINDOWS_X86_INLINE_HPP
+#ifndef OS_CPU_WINDOWS_X86_BYTES_WINDOWS_X86_INLINE_HPP
+#define OS_CPU_WINDOWS_X86_BYTES_WINDOWS_X86_INLINE_HPP
 
 #pragma warning(disable: 4035) // Disable warning 4035: no return value
 
@@ -84,4 +84,4 @@
 
 #pragma warning(default: 4035) // Enable warning 4035: no return value
 
-#endif // OS_CPU_WINDOWS_X86_VM_BYTES_WINDOWS_X86_INLINE_HPP
+#endif // OS_CPU_WINDOWS_X86_BYTES_WINDOWS_X86_INLINE_HPP
--- a/src/hotspot/os_cpu/windows_x86/copy_windows_x86.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/windows_x86/copy_windows_x86.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_WINDOWS_X86_VM_COPY_WINDOWS_X86_INLINE_HPP
-#define OS_CPU_WINDOWS_X86_VM_COPY_WINDOWS_X86_INLINE_HPP
+#ifndef OS_CPU_WINDOWS_X86_COPY_WINDOWS_X86_INLINE_HPP
+#define OS_CPU_WINDOWS_X86_COPY_WINDOWS_X86_INLINE_HPP
 
 static void pd_conjoint_words(const HeapWord* from, HeapWord* to, size_t count) {
   (void)memmove(to, from, count * HeapWordSize);
@@ -190,4 +190,4 @@
   pd_conjoint_oops_atomic((const oop*)from, (oop*)to, count);
 }
 
-#endif // OS_CPU_WINDOWS_X86_VM_COPY_WINDOWS_X86_INLINE_HPP
+#endif // OS_CPU_WINDOWS_X86_COPY_WINDOWS_X86_INLINE_HPP
--- a/src/hotspot/os_cpu/windows_x86/globals_windows_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/windows_x86/globals_windows_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_WINDOWS_X86_VM_GLOBALS_WINDOWS_X86_HPP
-#define OS_CPU_WINDOWS_X86_VM_GLOBALS_WINDOWS_X86_HPP
+#ifndef OS_CPU_WINDOWS_X86_GLOBALS_WINDOWS_X86_HPP
+#define OS_CPU_WINDOWS_X86_GLOBALS_WINDOWS_X86_HPP
 
 // Sets the default values for platform dependent flags used by the runtime system.
 // (see globals.hpp)
@@ -48,4 +48,4 @@
 // Used on 64 bit platforms for UseCompressedOops base address
 define_pd_global(size_t, HeapBaseMinAddress,     2*G);
 
-#endif // OS_CPU_WINDOWS_X86_VM_GLOBALS_WINDOWS_X86_HPP
+#endif // OS_CPU_WINDOWS_X86_GLOBALS_WINDOWS_X86_HPP
--- a/src/hotspot/os_cpu/windows_x86/orderAccess_windows_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/windows_x86/orderAccess_windows_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_WINDOWS_X86_VM_ORDERACCESS_WINDOWS_X86_HPP
-#define OS_CPU_WINDOWS_X86_VM_ORDERACCESS_WINDOWS_X86_HPP
+#ifndef OS_CPU_WINDOWS_X86_ORDERACCESS_WINDOWS_X86_HPP
+#define OS_CPU_WINDOWS_X86_ORDERACCESS_WINDOWS_X86_HPP
 
 // Included in orderAccess.hpp header file.
 
@@ -110,4 +110,4 @@
 };
 #endif // AMD64
 
-#endif // OS_CPU_WINDOWS_X86_VM_ORDERACCESS_WINDOWS_X86_HPP
+#endif // OS_CPU_WINDOWS_X86_ORDERACCESS_WINDOWS_X86_HPP
--- a/src/hotspot/os_cpu/windows_x86/os_windows_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/windows_x86/os_windows_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_WINDOWS_X86_VM_OS_WINDOWS_X86_HPP
-#define OS_CPU_WINDOWS_X86_VM_OS_WINDOWS_X86_HPP
+#ifndef OS_CPU_WINDOWS_X86_OS_WINDOWS_X86_HPP
+#define OS_CPU_WINDOWS_X86_OS_WINDOWS_X86_HPP
 
   //
   // NOTE: we are back in class os here, not win32
@@ -70,4 +70,4 @@
                                         char *buf, int buf_size);
 #endif
 
-#endif // OS_CPU_WINDOWS_X86_VM_OS_WINDOWS_X86_HPP
+#endif // OS_CPU_WINDOWS_X86_OS_WINDOWS_X86_HPP
--- a/src/hotspot/os_cpu/windows_x86/os_windows_x86.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/windows_x86/os_windows_x86.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_WINDOWS_X86_VM_OS_WINDOWS_X86_INLINE_HPP
-#define OS_CPU_WINDOWS_X86_VM_OS_WINDOWS_X86_INLINE_HPP
+#ifndef OS_CPU_WINDOWS_X86_OS_WINDOWS_X86_INLINE_HPP
+#define OS_CPU_WINDOWS_X86_OS_WINDOWS_X86_INLINE_HPP
 
 #include "runtime/os.hpp"
 
@@ -35,4 +35,4 @@
   return (jlong)res;
 }
 
-#endif // OS_CPU_WINDOWS_X86_VM_OS_WINDOWS_X86_INLINE_HPP
+#endif // OS_CPU_WINDOWS_X86_OS_WINDOWS_X86_INLINE_HPP
--- a/src/hotspot/os_cpu/windows_x86/prefetch_windows_x86.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/windows_x86/prefetch_windows_x86.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,12 @@
  *
  */
 
-#ifndef OS_CPU_WINDOWS_X86_VM_PREFETCH_WINDOWS_X86_INLINE_HPP
-#define OS_CPU_WINDOWS_X86_VM_PREFETCH_WINDOWS_X86_INLINE_HPP
+#ifndef OS_CPU_WINDOWS_X86_PREFETCH_WINDOWS_X86_INLINE_HPP
+#define OS_CPU_WINDOWS_X86_PREFETCH_WINDOWS_X86_INLINE_HPP
 
 #include "runtime/prefetch.hpp"
 
 inline void Prefetch::read (void *loc, intx interval) {}
 inline void Prefetch::write(void *loc, intx interval) {}
 
-#endif // OS_CPU_WINDOWS_X86_VM_PREFETCH_WINDOWS_X86_INLINE_HPP
+#endif // OS_CPU_WINDOWS_X86_PREFETCH_WINDOWS_X86_INLINE_HPP
--- a/src/hotspot/os_cpu/windows_x86/thread_windows_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/windows_x86/thread_windows_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_WINDOWS_X86_VM_THREAD_WINDOWS_X86_HPP
-#define OS_CPU_WINDOWS_X86_VM_THREAD_WINDOWS_X86_HPP
+#ifndef OS_CPU_WINDOWS_X86_THREAD_WINDOWS_X86_HPP
+#define OS_CPU_WINDOWS_X86_THREAD_WINDOWS_X86_HPP
 
  private:
   // On windows, in the stubGenerator, there's nowhere to save callee saved regs
@@ -71,4 +71,4 @@
   static void enable_register_stack_guard() {}
   static void disable_register_stack_guard() {}
 
-#endif // OS_CPU_WINDOWS_X86_VM_THREAD_WINDOWS_X86_HPP
+#endif // OS_CPU_WINDOWS_X86_THREAD_WINDOWS_X86_HPP
--- a/src/hotspot/os_cpu/windows_x86/unwind_windows_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/windows_x86/unwind_windows_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_WINDOWS_X86_VM_UNWIND_WINDOWS_X86_HPP
-#define OS_CPU_WINDOWS_X86_VM_UNWIND_WINDOWS_X86_HPP
+#ifndef OS_CPU_WINDOWS_X86_UNWIND_WINDOWS_X86_HPP
+#define OS_CPU_WINDOWS_X86_UNWIND_WINDOWS_X86_HPP
 
 
 #ifdef AMD64
@@ -95,4 +95,4 @@
 
 #endif // AMD64
 
-#endif // OS_CPU_WINDOWS_X86_VM_UNWIND_WINDOWS_X86_HPP
+#endif // OS_CPU_WINDOWS_X86_UNWIND_WINDOWS_X86_HPP
--- a/src/hotspot/os_cpu/windows_x86/vmStructs_windows_x86.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/os_cpu/windows_x86/vmStructs_windows_x86.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef OS_CPU_WINDOWS_X86_VM_VMSTRUCTS_WINDOWS_X86_HPP
-#define OS_CPU_WINDOWS_X86_VM_VMSTRUCTS_WINDOWS_X86_HPP
+#ifndef OS_CPU_WINDOWS_X86_VMSTRUCTS_WINDOWS_X86_HPP
+#define OS_CPU_WINDOWS_X86_VMSTRUCTS_WINDOWS_X86_HPP
 
 // These are the OS and CPU-specific fields, types and integer
 // constants required by the Serviceability Agent. This file is
@@ -46,4 +46,4 @@
 
 #define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant)
 
-#endif // OS_CPU_WINDOWS_X86_VM_VMSTRUCTS_WINDOWS_X86_HPP
+#endif // OS_CPU_WINDOWS_X86_VMSTRUCTS_WINDOWS_X86_HPP
--- a/src/hotspot/share/adlc/adlc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/adlc/adlc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_ADLC_ADLC_HPP
-#define SHARE_VM_ADLC_ADLC_HPP
+#ifndef SHARE_ADLC_ADLC_HPP
+#define SHARE_ADLC_ADLC_HPP
 
 //
 // Standard include file for ADLC parser
@@ -108,4 +108,4 @@
 // it everywhere it needs to be available.
 extern ArchDesc* globalAD;
 
-#endif // SHARE_VM_ADLC_ADLC_HPP
+#endif // SHARE_ADLC_ADLC_HPP
--- a/src/hotspot/share/adlc/adlparse.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/adlc/adlparse.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_ADLC_ADLPARSE_HPP
-#define SHARE_VM_ADLC_ADLPARSE_HPP
+#ifndef SHARE_ADLC_ADLPARSE_HPP
+#define SHARE_ADLC_ADLPARSE_HPP
 
 // ADLPARSE.HPP - Definitions for Architecture Description Language Parser
 // Authors: Chris Vick and Mike Paleczny
@@ -289,4 +289,4 @@
   static void trim(char* &token);  // trim leading & trailing spaces
 };
 
-#endif // SHARE_VM_ADLC_ADLPARSE_HPP
+#endif // SHARE_ADLC_ADLPARSE_HPP
--- a/src/hotspot/share/adlc/archDesc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/adlc/archDesc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_ADLC_ARCHDESC_HPP
-#define SHARE_VM_ADLC_ARCHDESC_HPP
+#ifndef SHARE_ADLC_ARCHDESC_HPP
+#define SHARE_ADLC_ARCHDESC_HPP
 
 // Definitions for Error Flags
 #define  WARN   0
@@ -410,4 +410,4 @@
   virtual void record_position(OutputMap::position place, int index) {}
 };
 
-#endif // SHARE_VM_ADLC_ARCHDESC_HPP
+#endif // SHARE_ADLC_ARCHDESC_HPP
--- a/src/hotspot/share/adlc/arena.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/adlc/arena.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_ADLC_ARENA_HPP
-#define SHARE_VM_ADLC_ARENA_HPP
+#ifndef SHARE_ADLC_ARENA_HPP
+#define SHARE_ADLC_ARENA_HPP
 
 void* AllocateHeap(size_t size);
 
@@ -151,4 +151,4 @@
   void   set_size_in_bytes(size_t size)  { _size_in_bytes = size;   }
 };
 
-#endif // SHARE_VM_ADLC_ARENA_HPP
+#endif // SHARE_ADLC_ARENA_HPP
--- a/src/hotspot/share/adlc/dict2.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/adlc/dict2.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_ADLC_DICT2_HPP
-#define SHARE_VM_ADLC_DICT2_HPP
+#ifndef SHARE_ADLC_DICT2_HPP
+#define SHARE_ADLC_DICT2_HPP
 
 // Dictionaries - An Abstract Data Type
 
@@ -118,4 +118,4 @@
   int test(void) { return _i<_d->_size;} // Test for end of iteration
 };
 
-#endif // SHARE_VM_ADLC_DICT2_HPP
+#endif // SHARE_ADLC_DICT2_HPP
--- a/src/hotspot/share/adlc/filebuff.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/adlc/filebuff.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_ADLC_FILEBUFF_HPP
-#define SHARE_VM_ADLC_FILEBUFF_HPP
+#ifndef SHARE_ADLC_FILEBUFF_HPP
+#define SHARE_ADLC_FILEBUFF_HPP
 
 // FILEBUFF.HPP - Definitions for parser file buffering routines
 
@@ -78,4 +78,4 @@
   // when the pointer is valid (i.e. just obtained from getline()).
   long getoff(const char* s) { return _bufoff + (long)(s - _buf); }
 };
-#endif // SHARE_VM_ADLC_FILEBUFF_HPP
+#endif // SHARE_ADLC_FILEBUFF_HPP
--- a/src/hotspot/share/adlc/forms.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/adlc/forms.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_ADLC_FORMS_HPP
-#define SHARE_VM_ADLC_FORMS_HPP
+#ifndef SHARE_ADLC_FORMS_HPP
+#define SHARE_ADLC_FORMS_HPP
 
 // FORMS.HPP - ADL Parser Generic and Utility Forms Classes
 
@@ -596,4 +596,4 @@
   void dump();
 };
 
-#endif // SHARE_VM_ADLC_FORMS_HPP
+#endif // SHARE_ADLC_FORMS_HPP
--- a/src/hotspot/share/adlc/formsopt.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/adlc/formsopt.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_ADLC_FORMSOPT_HPP
-#define SHARE_VM_ADLC_FORMSOPT_HPP
+#ifndef SHARE_ADLC_FORMSOPT_HPP
+#define SHARE_ADLC_FORMSOPT_HPP
 
 // FORMSOPT.HPP - ADL Parser Target Specific Optimization Forms Classes
 
@@ -674,4 +674,4 @@
   void output(FILE *fp);
 };
 
-#endif // SHARE_VM_ADLC_FORMSOPT_HPP
+#endif // SHARE_ADLC_FORMSOPT_HPP
--- a/src/hotspot/share/adlc/formssel.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/adlc/formssel.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_ADLC_FORMSSEL_HPP
-#define SHARE_VM_ADLC_FORMSSEL_HPP
+#ifndef SHARE_ADLC_FORMSSEL_HPP
+#define SHARE_ADLC_FORMSSEL_HPP
 
 // FORMSSEL.HPP - ADL Parser Instruction Selection Forms Classes
 
@@ -1093,4 +1093,4 @@
   void output(FILE *fp);
 };
 
-#endif // SHARE_VM_ADLC_FORMSSEL_HPP
+#endif // SHARE_ADLC_FORMSSEL_HPP
--- a/src/hotspot/share/aot/aotCodeHeap.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/aot/aotCodeHeap.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  */
 
-#ifndef SHARE_VM_AOT_AOTCODEHEAP_HPP
-#define SHARE_VM_AOT_AOTCODEHEAP_HPP
+#ifndef SHARE_AOT_AOTCODEHEAP_HPP
+#define SHARE_AOT_AOTCODEHEAP_HPP
 
 #include "aot/aotCompiledMethod.hpp"
 #include "classfile/symbolTable.hpp"
@@ -311,4 +311,4 @@
 
 };
 
-#endif // SHARE_VM_AOT_AOTCODEHEAP_HPP
+#endif // SHARE_AOT_AOTCODEHEAP_HPP
--- a/src/hotspot/share/aot/aotCompiledMethod.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/aot/aotCompiledMethod.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  */
 
-#ifndef SHARE_VM_AOT_AOTCOMPILEDMETHOD_HPP
-#define SHARE_VM_AOT_AOTCOMPILEDMETHOD_HPP
+#ifndef SHARE_AOT_AOTCOMPILEDMETHOD_HPP
+#define SHARE_AOT_AOTCOMPILEDMETHOD_HPP
 
 #include "code/codeCache.hpp"
 #include "code/compiledIC.hpp"
@@ -314,4 +314,4 @@
   }
 };
 
-#endif //SHARE_VM_AOT_AOTCOMPILEDMETHOD_HPP
+#endif // SHARE_AOT_AOTCOMPILEDMETHOD_HPP
--- a/src/hotspot/share/aot/aotLoader.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/aot/aotLoader.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  */
 
-#ifndef SHARE_VM_AOT_AOTLOADER_HPP
-#define SHARE_VM_AOT_AOTLOADER_HPP
+#ifndef SHARE_AOT_AOTLOADER_HPP
+#define SHARE_AOT_AOTLOADER_HPP
 
 #include "runtime/globals_extension.hpp"
 #include "runtime/handles.hpp"
@@ -69,4 +69,4 @@
   static bool reconcile_dynamic_invoke(InstanceKlass* holder, int index, Method* adapter_method, Klass *appendix_klass) NOT_AOT({ return true; });
 };
 
-#endif // SHARE_VM_AOT_AOTLOADER_HPP
+#endif // SHARE_AOT_AOTLOADER_HPP
--- a/src/hotspot/share/aot/aotLoader.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/aot/aotLoader.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  */
 
-#ifndef SHARE_VM_AOT_AOTLOADER_INLLINE_HPP
-#define SHARE_VM_AOT_AOTLOADER_INLLINE_HPP
+#ifndef SHARE_AOT_AOTLOADER_INLINE_HPP
+#define SHARE_AOT_AOTLOADER_INLINE_HPP
 
 #include "aot/aotLoader.hpp"
 #include "utilities/growableArray.hpp"
@@ -36,4 +36,4 @@
 void AOTLoader::add_library(AOTLib *lib) { libraries()->append(lib); }
 #endif
 
-#endif // SHARE_VM_AOT_AOTLOADER_INLLINE_HPP
+#endif // SHARE_AOT_AOTLOADER_INLINE_HPP
--- a/src/hotspot/share/aot/compiledIC_aot.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/aot/compiledIC_aot.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  */
 
-#ifndef SHARE_VM_AOT_COMPILEDIC_AOT_HPP
-#define SHARE_VM_AOT_COMPILEDIC_AOT_HPP
+#ifndef SHARE_AOT_COMPILEDIC_AOT_HPP
+#define SHARE_AOT_COMPILEDIC_AOT_HPP
 
 #include "code/compiledIC.hpp"
 #include "code/nativeInst.hpp"
@@ -80,4 +80,4 @@
   virtual const char* name() const { return "CompiledPltStaticCall"; }
 };
 
-#endif // SHARE_VM_AOT_COMPILEDIC_AOT_HPP
+#endif // SHARE_AOT_COMPILEDIC_AOT_HPP
--- a/src/hotspot/share/asm/assembler.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/asm/assembler.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_ASM_ASSEMBLER_HPP
-#define SHARE_VM_ASM_ASSEMBLER_HPP
+#ifndef SHARE_ASM_ASSEMBLER_HPP
+#define SHARE_ASM_ASSEMBLER_HPP
 
 #include "asm/codeBuffer.hpp"
 #include "asm/register.hpp"
@@ -458,4 +458,4 @@
 
 #include CPU_HEADER(assembler)
 
-#endif // SHARE_VM_ASM_ASSEMBLER_HPP
+#endif // SHARE_ASM_ASSEMBLER_HPP
--- a/src/hotspot/share/asm/assembler.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/asm/assembler.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,11 +22,11 @@
  *
  */
 
-#ifndef SHARE_VM_ASM_ASSEMBLER_INLINE_HPP
-#define SHARE_VM_ASM_ASSEMBLER_INLINE_HPP
+#ifndef SHARE_ASM_ASSEMBLER_INLINE_HPP
+#define SHARE_ASM_ASSEMBLER_INLINE_HPP
 
 #include "asm/assembler.hpp"
 
 #include CPU_HEADER_INLINE(assembler)
 
-#endif // SHARE_VM_ASM_ASSEMBLER_INLINE_HPP
+#endif // SHARE_ASM_ASSEMBLER_INLINE_HPP
--- a/src/hotspot/share/asm/codeBuffer.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/asm/codeBuffer.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_ASM_CODEBUFFER_HPP
-#define SHARE_VM_ASM_CODEBUFFER_HPP
+#ifndef SHARE_ASM_CODEBUFFER_HPP
+#define SHARE_ASM_CODEBUFFER_HPP
 
 #include "code/oopRecorder.hpp"
 #include "code/relocInfo.hpp"
@@ -670,4 +670,4 @@
   return false;
 }
 
-#endif // SHARE_VM_ASM_CODEBUFFER_HPP
+#endif // SHARE_ASM_CODEBUFFER_HPP
--- a/src/hotspot/share/asm/macroAssembler.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/asm/macroAssembler.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,12 @@
  *
  */
 
-#ifndef SHARE_VM_ASM_MACROASSEMBLER_HPP
-#define SHARE_VM_ASM_MACROASSEMBLER_HPP
+#ifndef SHARE_ASM_MACROASSEMBLER_HPP
+#define SHARE_ASM_MACROASSEMBLER_HPP
 
 #include "asm/assembler.hpp"
 #include "utilities/macros.hpp"
 
 #include CPU_HEADER(macroAssembler)
 
-#endif // SHARE_VM_ASM_MACROASSEMBLER_HPP
+#endif // SHARE_ASM_MACROASSEMBLER_HPP
--- a/src/hotspot/share/asm/macroAssembler.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/asm/macroAssembler.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,10 +22,10 @@
  *
  */
 
-#ifndef SHARE_VM_ASM_MACROASSEMBLER_INLINE_HPP
-#define SHARE_VM_ASM_MACROASSEMBLER_INLINE_HPP
+#ifndef SHARE_ASM_MACROASSEMBLER_INLINE_HPP
+#define SHARE_ASM_MACROASSEMBLER_INLINE_HPP
 
 #include "asm/macroAssembler.hpp"
 #include CPU_HEADER_INLINE(macroAssembler)
 
-#endif // SHARE_VM_ASM_MACROASSEMBLER_INLINE_HPP
+#endif // SHARE_ASM_MACROASSEMBLER_INLINE_HPP
--- a/src/hotspot/share/asm/register.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/asm/register.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_ASM_REGISTER_HPP
-#define SHARE_VM_ASM_REGISTER_HPP
+#ifndef SHARE_ASM_REGISTER_HPP
+#define SHARE_ASM_REGISTER_HPP
 
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -358,4 +358,4 @@
   );
 }
 
-#endif // SHARE_VM_ASM_REGISTER_HPP
+#endif // SHARE_ASM_REGISTER_HPP
--- a/src/hotspot/share/c1/c1_CFGPrinter.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/c1/c1_CFGPrinter.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_C1_C1_CFGPRINTER_HPP
-#define SHARE_VM_C1_C1_CFGPRINTER_HPP
+#ifndef SHARE_C1_C1_CFGPRINTER_HPP
+#define SHARE_C1_C1_CFGPRINTER_HPP
 
 #include "c1/c1_Compilation.hpp"
 #include "c1/c1_Instruction.hpp"
@@ -88,4 +88,4 @@
 
 #endif
 
-#endif // SHARE_VM_C1_C1_CFGPRINTER_HPP
+#endif // SHARE_C1_C1_CFGPRINTER_HPP
--- a/src/hotspot/share/c1/c1_Canonicalizer.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/c1/c1_Canonicalizer.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_C1_C1_CANONICALIZER_HPP
-#define SHARE_VM_C1_C1_CANONICALIZER_HPP
+#ifndef SHARE_C1_C1_CANONICALIZER_HPP
+#define SHARE_C1_C1_CANONICALIZER_HPP
 
 #include "c1/c1_Instruction.hpp"
 
@@ -116,4 +116,4 @@
 #endif
 };
 
-#endif // SHARE_VM_C1_C1_CANONICALIZER_HPP
+#endif // SHARE_C1_C1_CANONICALIZER_HPP
--- a/src/hotspot/share/c1/c1_CodeStubs.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/c1/c1_CodeStubs.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_C1_C1_CODESTUBS_HPP
-#define SHARE_VM_C1_C1_CODESTUBS_HPP
+#ifndef SHARE_C1_C1_CODESTUBS_HPP
+#define SHARE_C1_C1_CODESTUBS_HPP
 
 #include "c1/c1_FrameMap.hpp"
 #include "c1/c1_IR.hpp"
@@ -536,4 +536,4 @@
 #endif // PRODUCT
 };
 
-#endif // SHARE_VM_C1_C1_CODESTUBS_HPP
+#endif // SHARE_C1_C1_CODESTUBS_HPP
--- a/src/hotspot/share/c1/c1_Compilation.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/c1/c1_Compilation.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_C1_C1_COMPILATION_HPP
-#define SHARE_VM_C1_C1_COMPILATION_HPP
+#ifndef SHARE_C1_C1_COMPILATION_HPP
+#define SHARE_C1_C1_COMPILATION_HPP
 
 #include "ci/ciEnv.hpp"
 #include "ci/ciMethodData.hpp"
@@ -347,4 +347,4 @@
   XHandlers* exception_handlers()                { return _exception_handlers; }
 };
 
-#endif // SHARE_VM_C1_C1_COMPILATION_HPP
+#endif // SHARE_C1_C1_COMPILATION_HPP
--- a/src/hotspot/share/c1/c1_Compiler.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/c1/c1_Compiler.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_C1_C1_COMPILER_HPP
-#define SHARE_VM_C1_C1_COMPILER_HPP
+#ifndef SHARE_C1_C1_COMPILER_HPP
+#define SHARE_C1_C1_COMPILER_HPP
 
 #include "compiler/abstractCompiler.hpp"
 #include "compiler/compilerDirectives.hpp"
@@ -63,4 +63,4 @@
   static int code_buffer_size();
 };
 
-#endif // SHARE_VM_C1_C1_COMPILER_HPP
+#endif // SHARE_C1_C1_COMPILER_HPP
--- a/src/hotspot/share/c1/c1_Decorators.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/c1/c1_Decorators.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_C1_C1_DECORATORS_HPP
-#define SHARE_VM_C1_C1_DECORATORS_HPP
+#ifndef SHARE_C1_C1_DECORATORS_HPP
+#define SHARE_C1_C1_DECORATORS_HPP
 
 #include "oops/accessDecorators.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -35,4 +35,4 @@
 // needs to be masked.
 const DecoratorSet C1_MASK_BOOLEAN   = DECORATOR_LAST << 2;
 
-#endif // SHARE_VM_C1_C1_DECORATORS_HPP
+#endif // SHARE_C1_C1_DECORATORS_HPP
--- a/src/hotspot/share/c1/c1_Defs.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/c1/c1_Defs.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_C1_C1_DEFS_HPP
-#define SHARE_VM_C1_C1_DEFS_HPP
+#ifndef SHARE_C1_C1_DEFS_HPP
+#define SHARE_C1_C1_DEFS_HPP
 
 #include "asm/register.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -56,4 +56,4 @@
   float_saved_as_double = pd_float_saved_as_double
 };
 
-#endif // SHARE_VM_C1_C1_DEFS_HPP
+#endif // SHARE_C1_C1_DEFS_HPP
--- a/src/hotspot/share/c1/c1_FpuStackSim.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/c1/c1_FpuStackSim.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_C1_C1_FPUSTACKSIM_HPP
-#define SHARE_VM_C1_C1_FPUSTACKSIM_HPP
+#ifndef SHARE_C1_C1_FPUSTACKSIM_HPP
+#define SHARE_C1_C1_FPUSTACKSIM_HPP
 
 #include "c1/c1_FrameMap.hpp"
 #include "utilities/macros.hpp"
@@ -34,4 +34,4 @@
 
 #include CPU_HEADER(c1_FpuStackSim)
 
-#endif // SHARE_VM_C1_C1_FPUSTACKSIM_HPP
+#endif // SHARE_C1_C1_FPUSTACKSIM_HPP
--- a/src/hotspot/share/c1/c1_FrameMap.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/c1/c1_FrameMap.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_C1_C1_FRAMEMAP_HPP
-#define SHARE_VM_C1_C1_FRAMEMAP_HPP
+#ifndef SHARE_C1_C1_FRAMEMAP_HPP
+#define SHARE_C1_C1_FRAMEMAP_HPP
 
 #include "asm/macroAssembler.hpp"
 #include "c1/c1_Defs.hpp"
@@ -280,4 +280,4 @@
 #endif // PRODUCT
 };
 
-#endif // SHARE_VM_C1_C1_FRAMEMAP_HPP
+#endif // SHARE_C1_C1_FRAMEMAP_HPP
--- a/src/hotspot/share/c1/c1_GraphBuilder.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/c1/c1_GraphBuilder.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_C1_C1_GRAPHBUILDER_HPP
-#define SHARE_VM_C1_C1_GRAPHBUILDER_HPP
+#ifndef SHARE_C1_C1_GRAPHBUILDER_HPP
+#define SHARE_C1_C1_GRAPHBUILDER_HPP
 
 #include "c1/c1_IR.hpp"
 #include "c1/c1_Instruction.hpp"
@@ -424,4 +424,4 @@
   BlockBegin* start() const                      { return _start; }
 };
 
-#endif // SHARE_VM_C1_C1_GRAPHBUILDER_HPP
+#endif // SHARE_C1_C1_GRAPHBUILDER_HPP
--- a/src/hotspot/share/c1/c1_IR.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/c1/c1_IR.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_C1_C1_IR_HPP
-#define SHARE_VM_C1_C1_IR_HPP
+#ifndef SHARE_C1_C1_IR_HPP
+#define SHARE_C1_C1_IR_HPP
 
 #include "c1/c1_Instruction.hpp"
 #include "ci/ciExceptionHandler.hpp"
@@ -356,4 +356,4 @@
   virtual void block_do(BlockBegin* block);
 };
 
-#endif // SHARE_VM_C1_C1_IR_HPP
+#endif // SHARE_C1_C1_IR_HPP
--- a/src/hotspot/share/c1/c1_Instruction.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/c1/c1_Instruction.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_C1_C1_INSTRUCTION_HPP
-#define SHARE_VM_C1_C1_INSTRUCTION_HPP
+#ifndef SHARE_C1_C1_INSTRUCTION_HPP
+#define SHARE_C1_C1_INSTRUCTION_HPP
 
 #include "c1/c1_Compilation.hpp"
 #include "c1/c1_LIR.hpp"
@@ -2632,4 +2632,4 @@
 
 #undef ASSERT_VALUES
 
-#endif // SHARE_VM_C1_C1_INSTRUCTION_HPP
+#endif // SHARE_C1_C1_INSTRUCTION_HPP
--- a/src/hotspot/share/c1/c1_InstructionPrinter.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/c1/c1_InstructionPrinter.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_C1_C1_INSTRUCTIONPRINTER_HPP
-#define SHARE_VM_C1_C1_INSTRUCTIONPRINTER_HPP
+#ifndef SHARE_C1_C1_INSTRUCTIONPRINTER_HPP
+#define SHARE_C1_C1_INSTRUCTIONPRINTER_HPP
 
 #include "c1/c1_IR.hpp"
 #include "c1/c1_Instruction.hpp"
@@ -141,4 +141,4 @@
 };
 #endif // PRODUCT
 
-#endif // SHARE_VM_C1_C1_INSTRUCTIONPRINTER_HPP
+#endif // SHARE_C1_C1_INSTRUCTIONPRINTER_HPP
--- a/src/hotspot/share/c1/c1_LIR.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/c1/c1_LIR.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_C1_C1_LIR_HPP
-#define SHARE_VM_C1_C1_LIR_HPP
+#ifndef SHARE_C1_C1_LIR_HPP
+#define SHARE_C1_C1_LIR_HPP
 
 #include "c1/c1_Defs.hpp"
 #include "c1/c1_ValueType.hpp"
@@ -2469,4 +2469,4 @@
 
 inline LIR_Opr LIR_OprDesc::illegalOpr()   { return LIR_OprFact::illegalOpr; };
 
-#endif // SHARE_VM_C1_C1_LIR_HPP
+#endif // SHARE_C1_C1_LIR_HPP
--- a/src/hotspot/share/c1/c1_LIRAssembler.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/c1/c1_LIRAssembler.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_C1_C1_LIRASSEMBLER_HPP
-#define SHARE_VM_C1_C1_LIRASSEMBLER_HPP
+#ifndef SHARE_C1_C1_LIRASSEMBLER_HPP
+#define SHARE_C1_C1_LIRASSEMBLER_HPP
 
 #include "c1/c1_CodeStubs.hpp"
 #include "ci/ciMethodData.hpp"
@@ -279,4 +279,4 @@
   }
 };
 
-#endif // SHARE_VM_C1_C1_LIRASSEMBLER_HPP
+#endif // SHARE_C1_C1_LIRASSEMBLER_HPP
--- a/src/hotspot/share/c1/c1_LIRGenerator.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/c1/c1_LIRGenerator.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_C1_C1_LIRGENERATOR_HPP
-#define SHARE_VM_C1_C1_LIRGENERATOR_HPP
+#ifndef SHARE_C1_C1_LIRGENERATOR_HPP
+#define SHARE_C1_C1_LIRGENERATOR_HPP
 
 #include "c1/c1_Decorators.hpp"
 #include "c1/c1_Instruction.hpp"
@@ -686,4 +686,4 @@
   jint      get_address_constant() const;
 };
 
-#endif // SHARE_VM_C1_C1_LIRGENERATOR_HPP
+#endif // SHARE_C1_C1_LIRGENERATOR_HPP
--- a/src/hotspot/share/c1/c1_LinearScan.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/c1/c1_LinearScan.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_C1_C1_LINEARSCAN_HPP
-#define SHARE_VM_C1_C1_LINEARSCAN_HPP
+#ifndef SHARE_C1_C1_LINEARSCAN_HPP
+#define SHARE_C1_C1_LINEARSCAN_HPP
 
 #include "c1/c1_FpuStackSim.hpp"
 #include "c1/c1_FrameMap.hpp"
@@ -964,4 +964,4 @@
 // Pick up platform-dependent implementation details
 #include CPU_HEADER(c1_LinearScan)
 
-#endif // SHARE_VM_C1_C1_LINEARSCAN_HPP
+#endif // SHARE_C1_C1_LINEARSCAN_HPP
--- a/src/hotspot/share/c1/c1_MacroAssembler.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/c1/c1_MacroAssembler.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_C1_C1_MACROASSEMBLER_HPP
-#define SHARE_VM_C1_C1_MACROASSEMBLER_HPP
+#ifndef SHARE_C1_C1_MACROASSEMBLER_HPP
+#define SHARE_C1_C1_MACROASSEMBLER_HPP
 
 #include "asm/macroAssembler.hpp"
 #include "utilities/macros.hpp"
@@ -93,4 +93,4 @@
   void epilogue();
 };
 
-#endif // SHARE_VM_C1_C1_MACROASSEMBLER_HPP
+#endif // SHARE_C1_C1_MACROASSEMBLER_HPP
--- a/src/hotspot/share/c1/c1_Optimizer.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/c1/c1_Optimizer.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_C1_C1_OPTIMIZER_HPP
-#define SHARE_VM_C1_C1_OPTIMIZER_HPP
+#ifndef SHARE_C1_C1_OPTIMIZER_HPP
+#define SHARE_C1_C1_OPTIMIZER_HPP
 
 #include "c1/c1_IR.hpp"
 #include "c1/c1_Instruction.hpp"
@@ -42,4 +42,4 @@
   void eliminate_null_checks();
 };
 
-#endif // SHARE_VM_C1_C1_OPTIMIZER_HPP
+#endif // SHARE_C1_C1_OPTIMIZER_HPP
--- a/src/hotspot/share/c1/c1_RangeCheckElimination.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/c1/c1_RangeCheckElimination.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_C1_C1_RANGECHECKELIMINATION_HPP
-#define SHARE_VM_C1_C1_RANGECHECKELIMINATION_HPP
+#ifndef SHARE_C1_C1_RANGECHECKELIMINATION_HPP
+#define SHARE_C1_C1_RANGECHECKELIMINATION_HPP
 
 #include "c1/c1_Instruction.hpp"
 
@@ -240,4 +240,4 @@
   static void print_statistics();
 };
 
-#endif // SHARE_VM_C1_C1_RANGECHECKELIMINATION_HPP
+#endif // SHARE_C1_C1_RANGECHECKELIMINATION_HPP
--- a/src/hotspot/share/c1/c1_Runtime1.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/c1/c1_Runtime1.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_C1_C1_RUNTIME1_HPP
-#define SHARE_VM_C1_C1_RUNTIME1_HPP
+#ifndef SHARE_C1_C1_RUNTIME1_HPP
+#define SHARE_C1_C1_RUNTIME1_HPP
 
 #include "c1/c1_FrameMap.hpp"
 #include "code/stubs.hpp"
@@ -199,4 +199,4 @@
   static void print_statistics()                 PRODUCT_RETURN;
 };
 
-#endif // SHARE_VM_C1_C1_RUNTIME1_HPP
+#endif // SHARE_C1_C1_RUNTIME1_HPP
--- a/src/hotspot/share/c1/c1_ValueMap.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/c1/c1_ValueMap.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_C1_C1_VALUEMAP_HPP
-#define SHARE_VM_C1_C1_VALUEMAP_HPP
+#ifndef SHARE_C1_C1_VALUEMAP_HPP
+#define SHARE_C1_C1_VALUEMAP_HPP
 
 #include "c1/c1_Instruction.hpp"
 #include "c1/c1_ValueSet.hpp"
@@ -257,4 +257,4 @@
   void          substitute(Instruction* instr);  // substitute instruction if it is contained in current value map
 };
 
-#endif // SHARE_VM_C1_C1_VALUEMAP_HPP
+#endif // SHARE_C1_C1_VALUEMAP_HPP
--- a/src/hotspot/share/c1/c1_ValueSet.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/c1/c1_ValueSet.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_C1_C1_VALUESET_HPP
-#define SHARE_VM_C1_C1_VALUESET_HPP
+#ifndef SHARE_C1_C1_VALUESET_HPP
+#define SHARE_C1_C1_VALUESET_HPP
 
 #include "c1/c1_Instruction.hpp"
 #include "memory/allocation.hpp"
@@ -52,4 +52,4 @@
   bool equals  (ValueSet* other);
 };
 
-#endif // SHARE_VM_C1_C1_VALUESET_HPP
+#endif // SHARE_C1_C1_VALUESET_HPP
--- a/src/hotspot/share/c1/c1_ValueSet.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/c1/c1_ValueSet.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_C1_C1_VALUESET_INLINE_HPP
-#define SHARE_VM_C1_C1_VALUESET_INLINE_HPP
+#ifndef SHARE_C1_C1_VALUESET_INLINE_HPP
+#define SHARE_C1_C1_VALUESET_INLINE_HPP
 
 #include "c1/c1_Instruction.hpp"
 #include "c1/c1_ValueSet.hpp"
@@ -70,4 +70,4 @@
   return _map.is_same(other->_map);
 }
 
-#endif // SHARE_VM_C1_C1_VALUESET_INLINE_HPP
+#endif // SHARE_C1_C1_VALUESET_INLINE_HPP
--- a/src/hotspot/share/c1/c1_ValueStack.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/c1/c1_ValueStack.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_C1_C1_VALUESTACK_HPP
-#define SHARE_VM_C1_C1_VALUESTACK_HPP
+#ifndef SHARE_C1_C1_VALUESTACK_HPP
+#define SHARE_C1_C1_VALUESTACK_HPP
 
 #include "c1/c1_Instruction.hpp"
 
@@ -331,4 +331,4 @@
   }                                                                                            \
 }
 
-#endif // SHARE_VM_C1_C1_VALUESTACK_HPP
+#endif // SHARE_C1_C1_VALUESTACK_HPP
--- a/src/hotspot/share/c1/c1_ValueType.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/c1/c1_ValueType.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_C1_C1_VALUETYPE_HPP
-#define SHARE_VM_C1_C1_VALUETYPE_HPP
+#ifndef SHARE_C1_C1_VALUETYPE_HPP
+#define SHARE_C1_C1_VALUETYPE_HPP
 
 #include "c1/c1_Compilation.hpp"
 #include "ci/ciConstant.hpp"
@@ -515,4 +515,4 @@
 
 inline ValueType* as_ValueType(ciType* type) { return as_ValueType(type->basic_type()); }
 
-#endif // SHARE_VM_C1_C1_VALUETYPE_HPP
+#endif // SHARE_C1_C1_VALUETYPE_HPP
--- a/src/hotspot/share/c1/c1_globals.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/c1/c1_globals.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_C1_C1_GLOBALS_HPP
-#define SHARE_VM_C1_C1_GLOBALS_HPP
+#ifndef SHARE_C1_C1_GLOBALS_HPP
+#define SHARE_C1_C1_GLOBALS_HPP
 
 #include "runtime/globals.hpp"
 #include "utilities/macros.hpp"
@@ -337,4 +337,4 @@
          IGNORE_CONSTRAINT, \
          IGNORE_WRITEABLE)
 
-#endif // SHARE_VM_C1_C1_GLOBALS_HPP
+#endif // SHARE_C1_C1_GLOBALS_HPP
--- a/src/hotspot/share/ci/bcEscapeAnalyzer.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/bcEscapeAnalyzer.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_BCESCAPEANALYZER_HPP
-#define SHARE_VM_CI_BCESCAPEANALYZER_HPP
+#ifndef SHARE_CI_BCESCAPEANALYZER_HPP
+#define SHARE_CI_BCESCAPEANALYZER_HPP
 
 #ifdef COMPILER2
 #include "ci/ciObject.hpp"
@@ -162,4 +162,4 @@
 #endif
 };
 
-#endif // SHARE_VM_CI_BCESCAPEANALYZER_HPP
+#endif // SHARE_CI_BCESCAPEANALYZER_HPP
--- a/src/hotspot/share/ci/ciArray.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciArray.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CIARRAY_HPP
-#define SHARE_VM_CI_CIARRAY_HPP
+#ifndef SHARE_CI_CIARRAY_HPP
+#define SHARE_CI_CIARRAY_HPP
 
 #include "ci/ciArrayKlass.hpp"
 #include "ci/ciConstant.hpp"
@@ -76,4 +76,4 @@
   bool is_java_object()  { return true; }
 };
 
-#endif // SHARE_VM_CI_CIARRAY_HPP
+#endif // SHARE_CI_CIARRAY_HPP
--- a/src/hotspot/share/ci/ciArrayKlass.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciArrayKlass.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CIARRAYKLASS_HPP
-#define SHARE_VM_CI_CIARRAYKLASS_HPP
+#ifndef SHARE_CI_CIARRAYKLASS_HPP
+#define SHARE_CI_CIARRAYKLASS_HPP
 
 #include "ci/ciKlass.hpp"
 
@@ -59,4 +59,4 @@
   static ciArrayKlass* make(ciType* element_type);
 };
 
-#endif // SHARE_VM_CI_CIARRAYKLASS_HPP
+#endif // SHARE_CI_CIARRAYKLASS_HPP
--- a/src/hotspot/share/ci/ciBaseObject.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciBaseObject.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CIBASEOBJECT_HPP
-#define SHARE_VM_CI_CIBASEOBJECT_HPP
+#ifndef SHARE_CI_CIBASEOBJECT_HPP
+#define SHARE_CI_CIBASEOBJECT_HPP
 
 #include "ci/ciClassList.hpp"
 #include "memory/allocation.hpp"
@@ -87,4 +87,4 @@
     return (ciMetadata*)this;
   }
 };
-#endif // SHARE_VM_CI_CIBASEOBJECT_HPP
+#endif // SHARE_CI_CIBASEOBJECT_HPP
--- a/src/hotspot/share/ci/ciCallProfile.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciCallProfile.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CICALLPROFILE_HPP
-#define SHARE_VM_CI_CICALLPROFILE_HPP
+#ifndef SHARE_CI_CICALLPROFILE_HPP
+#define SHARE_CI_CICALLPROFILE_HPP
 
 #include "ci/ciClassList.hpp"
 #include "memory/allocation.hpp"
@@ -92,4 +92,4 @@
   }
 };
 
-#endif // SHARE_VM_CI_CICALLPROFILE_HPP
+#endif // SHARE_CI_CICALLPROFILE_HPP
--- a/src/hotspot/share/ci/ciCallSite.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciCallSite.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CICALLSITE_HPP
-#define SHARE_VM_CI_CICALLSITE_HPP
+#ifndef SHARE_CI_CICALLSITE_HPP
+#define SHARE_CI_CICALLSITE_HPP
 
 #include "ci/ciInstance.hpp"
 
@@ -47,4 +47,4 @@
   void print();
 };
 
-#endif // SHARE_VM_CI_CICALLSITE_HPP
+#endif // SHARE_CI_CICALLSITE_HPP
--- a/src/hotspot/share/ci/ciClassList.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciClassList.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CICLASSLIST_HPP
-#define SHARE_VM_CI_CICLASSLIST_HPP
+#ifndef SHARE_CI_CICLASSLIST_HPP
+#define SHARE_CI_CICLASSLIST_HPP
 
 class ciEnv;
 class ciObjectFactory;
@@ -118,4 +118,4 @@
 friend class ciObjArrayKlass;          \
 friend class ciTypeArrayKlass;         \
 
-#endif // SHARE_VM_CI_CICLASSLIST_HPP
+#endif // SHARE_CI_CICLASSLIST_HPP
--- a/src/hotspot/share/ci/ciConstant.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciConstant.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CICONSTANT_HPP
-#define SHARE_VM_CI_CICONSTANT_HPP
+#ifndef SHARE_CI_CICONSTANT_HPP
+#define SHARE_CI_CICONSTANT_HPP
 
 #include "ci/ciClassList.hpp"
 #include "ci/ciNullObject.hpp"
@@ -131,4 +131,4 @@
   void print();
 };
 
-#endif // SHARE_VM_CI_CICONSTANT_HPP
+#endif // SHARE_CI_CICONSTANT_HPP
--- a/src/hotspot/share/ci/ciConstantPoolCache.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciConstantPoolCache.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CICONSTANTPOOLCACHE_HPP
-#define SHARE_VM_CI_CICONSTANTPOOLCACHE_HPP
+#ifndef SHARE_CI_CICONSTANTPOOLCACHE_HPP
+#define SHARE_CI_CICONSTANTPOOLCACHE_HPP
 
 #include "memory/resourceArea.hpp"
 #include "utilities/growableArray.hpp"
@@ -52,4 +52,4 @@
   void print();
 };
 
-#endif // SHARE_VM_CI_CICONSTANTPOOLCACHE_HPP
+#endif // SHARE_CI_CICONSTANTPOOLCACHE_HPP
--- a/src/hotspot/share/ci/ciEnv.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciEnv.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CIENV_HPP
-#define SHARE_VM_CI_CIENV_HPP
+#ifndef SHARE_CI_CIENV_HPP
+#define SHARE_CI_CIENV_HPP
 
 #include "ci/ciClassList.hpp"
 #include "ci/ciObjectFactory.hpp"
@@ -466,4 +466,4 @@
   void dump_compile_data(outputStream* out);
 };
 
-#endif // SHARE_VM_CI_CIENV_HPP
+#endif // SHARE_CI_CIENV_HPP
--- a/src/hotspot/share/ci/ciExceptionHandler.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciExceptionHandler.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CIEXCEPTIONHANDLER_HPP
-#define SHARE_VM_CI_CIEXCEPTIONHANDLER_HPP
+#ifndef SHARE_CI_CIEXCEPTIONHANDLER_HPP
+#define SHARE_CI_CIEXCEPTIONHANDLER_HPP
 
 #include "ci/ciClassList.hpp"
 #include "ci/ciInstanceKlass.hpp"
@@ -80,4 +80,4 @@
   void      print();
 };
 
-#endif // SHARE_VM_CI_CIEXCEPTIONHANDLER_HPP
+#endif // SHARE_CI_CIEXCEPTIONHANDLER_HPP
--- a/src/hotspot/share/ci/ciField.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciField.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CIFIELD_HPP
-#define SHARE_VM_CI_CIFIELD_HPP
+#ifndef SHARE_CI_CIFIELD_HPP
+#define SHARE_CI_CIFIELD_HPP
 
 #include "ci/ciClassList.hpp"
 #include "ci/ciConstant.hpp"
@@ -201,4 +201,4 @@
   void print_name_on(outputStream* st);
 };
 
-#endif // SHARE_VM_CI_CIFIELD_HPP
+#endif // SHARE_CI_CIFIELD_HPP
--- a/src/hotspot/share/ci/ciFlags.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciFlags.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CIFLAGS_HPP
-#define SHARE_VM_CI_CIFLAGS_HPP
+#ifndef SHARE_CI_CIFLAGS_HPP
+#define SHARE_CI_CIFLAGS_HPP
 
 #include "jvm.h"
 #include "ci/ciClassList.hpp"
@@ -74,4 +74,4 @@
   void print(outputStream* st = tty);
 };
 
-#endif // SHARE_VM_CI_CIFLAGS_HPP
+#endif // SHARE_CI_CIFLAGS_HPP
--- a/src/hotspot/share/ci/ciInstance.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciInstance.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CIINSTANCE_HPP
-#define SHARE_VM_CI_CIINSTANCE_HPP
+#ifndef SHARE_CI_CIINSTANCE_HPP
+#define SHARE_CI_CIINSTANCE_HPP
 
 #include "ci/ciObject.hpp"
 #include "oops/instanceOop.hpp"
@@ -72,4 +72,4 @@
   ciKlass* java_lang_Class_klass();
 };
 
-#endif // SHARE_VM_CI_CIINSTANCE_HPP
+#endif // SHARE_CI_CIINSTANCE_HPP
--- a/src/hotspot/share/ci/ciInstanceKlass.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciInstanceKlass.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CIINSTANCEKLASS_HPP
-#define SHARE_VM_CI_CIINSTANCEKLASS_HPP
+#ifndef SHARE_CI_CIINSTANCEKLASS_HPP
+#define SHARE_CI_CIINSTANCEKLASS_HPP
 
 #include "ci/ciConstantPoolCache.hpp"
 #include "ci/ciFlags.hpp"
@@ -281,4 +281,4 @@
 #endif
 };
 
-#endif // SHARE_VM_CI_CIINSTANCEKLASS_HPP
+#endif // SHARE_CI_CIINSTANCEKLASS_HPP
--- a/src/hotspot/share/ci/ciKlass.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciKlass.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CIKLASS_HPP
-#define SHARE_VM_CI_CIKLASS_HPP
+#ifndef SHARE_CI_CIKLASS_HPP
+#define SHARE_CI_CIKLASS_HPP
 
 #include "ci/ciType.hpp"
 #include "oops/klass.hpp"
@@ -131,4 +131,4 @@
   const char* external_name() const;
 };
 
-#endif // SHARE_VM_CI_CIKLASS_HPP
+#endif // SHARE_CI_CIKLASS_HPP
--- a/src/hotspot/share/ci/ciMemberName.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciMemberName.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CIMEMBERNAME_HPP
-#define SHARE_VM_CI_CIMEMBERNAME_HPP
+#ifndef SHARE_CI_CIMEMBERNAME_HPP
+#define SHARE_CI_CIMEMBERNAME_HPP
 
 #include "ci/ciCallProfile.hpp"
 #include "ci/ciInstance.hpp"
@@ -41,4 +41,4 @@
   ciMethod* get_vmtarget() const;
 };
 
-#endif // SHARE_VM_CI_CIMEMBERNAME_HPP
+#endif // SHARE_CI_CIMEMBERNAME_HPP
--- a/src/hotspot/share/ci/ciMetadata.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciMetadata.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CIMETADATA_HPP
-#define SHARE_VM_CI_CIMETADATA_HPP
+#ifndef SHARE_CI_CIMETADATA_HPP
+#define SHARE_CI_CIMETADATA_HPP
 
 #include "ci/ciBaseObject.hpp"
 #include "ci/ciClassList.hpp"
@@ -117,4 +117,4 @@
   void print_metadata(outputStream* st = tty);
 
 };
-#endif // SHARE_VM_CI_CIMETADATA_HPP
+#endif // SHARE_CI_CIMETADATA_HPP
--- a/src/hotspot/share/ci/ciMethod.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciMethod.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CIMETHOD_HPP
-#define SHARE_VM_CI_CIMETHOD_HPP
+#ifndef SHARE_CI_CIMETHOD_HPP
+#define SHARE_CI_CIMETHOD_HPP
 
 #include "ci/ciFlags.hpp"
 #include "ci/ciInstanceKlass.hpp"
@@ -363,4 +363,4 @@
   static bool is_consistent_info(ciMethod* declared_method, ciMethod* resolved_method);
 };
 
-#endif // SHARE_VM_CI_CIMETHOD_HPP
+#endif // SHARE_CI_CIMETHOD_HPP
--- a/src/hotspot/share/ci/ciMethodBlocks.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciMethodBlocks.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CIMETHODBLOCKS_HPP
-#define SHARE_VM_CI_CIMETHODBLOCKS_HPP
+#ifndef SHARE_CI_CIMETHODBLOCKS_HPP
+#define SHARE_CI_CIMETHODBLOCKS_HPP
 
 #include "ci/ciMethod.hpp"
 #include "memory/resourceArea.hpp"
@@ -129,4 +129,4 @@
 #endif
 };
 
-#endif // SHARE_VM_CI_CIMETHODBLOCKS_HPP
+#endif // SHARE_CI_CIMETHODBLOCKS_HPP
--- a/src/hotspot/share/ci/ciMethodData.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciMethodData.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CIMETHODDATA_HPP
-#define SHARE_VM_CI_CIMETHODDATA_HPP
+#ifndef SHARE_CI_CIMETHODDATA_HPP
+#define SHARE_CI_CIMETHODDATA_HPP
 
 #include "ci/ciClassList.hpp"
 #include "ci/ciKlass.hpp"
@@ -602,4 +602,4 @@
   void dump_replay_data(outputStream* out);
 };
 
-#endif // SHARE_VM_CI_CIMETHODDATA_HPP
+#endif // SHARE_CI_CIMETHODDATA_HPP
--- a/src/hotspot/share/ci/ciMethodHandle.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciMethodHandle.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CIMETHODHANDLE_HPP
-#define SHARE_VM_CI_CIMETHODHANDLE_HPP
+#ifndef SHARE_CI_CIMETHODHANDLE_HPP
+#define SHARE_CI_CIMETHODHANDLE_HPP
 
 #include "ci/ciClassList.hpp"
 #include "ci/ciInstance.hpp"
@@ -41,4 +41,4 @@
   ciMethod* get_vmtarget() const;
 };
 
-#endif // SHARE_VM_CI_CIMETHODHANDLE_HPP
+#endif // SHARE_CI_CIMETHODHANDLE_HPP
--- a/src/hotspot/share/ci/ciMethodType.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciMethodType.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CIMETHODTYPE_HPP
-#define SHARE_VM_CI_CIMETHODTYPE_HPP
+#ifndef SHARE_CI_CIMETHODTYPE_HPP
+#define SHARE_CI_CIMETHODTYPE_HPP
 
 #include "ci/ciInstance.hpp"
 
@@ -48,4 +48,4 @@
   ciType* ptype_at(int index) const;
 };
 
-#endif // SHARE_VM_CI_CIMETHODTYPE_HPP
+#endif // SHARE_CI_CIMETHODTYPE_HPP
--- a/src/hotspot/share/ci/ciNullObject.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciNullObject.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CINULLOBJECT_HPP
-#define SHARE_VM_CI_CINULLOBJECT_HPP
+#ifndef SHARE_CI_CINULLOBJECT_HPP
+#define SHARE_CI_CINULLOBJECT_HPP
 
 #include "ci/ciClassList.hpp"
 #include "ci/ciObject.hpp"
@@ -54,4 +54,4 @@
   static ciNullObject* make();
 };
 
-#endif // SHARE_VM_CI_CINULLOBJECT_HPP
+#endif // SHARE_CI_CINULLOBJECT_HPP
--- a/src/hotspot/share/ci/ciObjArray.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciObjArray.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CIOBJARRAY_HPP
-#define SHARE_VM_CI_CIOBJARRAY_HPP
+#ifndef SHARE_CI_CIOBJARRAY_HPP
+#define SHARE_CI_CIOBJARRAY_HPP
 
 #include "ci/ciArray.hpp"
 #include "ci/ciClassList.hpp"
@@ -54,4 +54,4 @@
   ciObject* obj_at(int index);
 };
 
-#endif // SHARE_VM_CI_CIOBJARRAY_HPP
+#endif // SHARE_CI_CIOBJARRAY_HPP
--- a/src/hotspot/share/ci/ciObjArrayKlass.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciObjArrayKlass.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CIOBJARRAYKLASS_HPP
-#define SHARE_VM_CI_CIOBJARRAYKLASS_HPP
+#ifndef SHARE_CI_CIOBJARRAYKLASS_HPP
+#define SHARE_CI_CIOBJARRAYKLASS_HPP
 
 #include "ci/ciArrayKlass.hpp"
 
@@ -77,4 +77,4 @@
   virtual ciKlass* exact_klass();
 };
 
-#endif // SHARE_VM_CI_CIOBJARRAYKLASS_HPP
+#endif // SHARE_CI_CIOBJARRAYKLASS_HPP
--- a/src/hotspot/share/ci/ciObject.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciObject.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CIOBJECT_HPP
-#define SHARE_VM_CI_CIOBJECT_HPP
+#ifndef SHARE_CI_CIOBJECT_HPP
+#define SHARE_CI_CIOBJECT_HPP
 
 #include "ci/ciBaseObject.hpp"
 #include "ci/ciClassList.hpp"
@@ -185,4 +185,4 @@
   void print_oop(outputStream* st = tty);
 };
 
-#endif // SHARE_VM_CI_CIOBJECT_HPP
+#endif // SHARE_CI_CIOBJECT_HPP
--- a/src/hotspot/share/ci/ciObjectFactory.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciObjectFactory.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CIOBJECTFACTORY_HPP
-#define SHARE_VM_CI_CIOBJECTFACTORY_HPP
+#ifndef SHARE_CI_CIOBJECTFACTORY_HPP
+#define SHARE_CI_CIOBJECTFACTORY_HPP
 
 #include "ci/ciClassList.hpp"
 #include "ci/ciObject.hpp"
@@ -145,4 +145,4 @@
   void print();
 };
 
-#endif // SHARE_VM_CI_CIOBJECTFACTORY_HPP
+#endif // SHARE_CI_CIOBJECTFACTORY_HPP
--- a/src/hotspot/share/ci/ciReplay.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciReplay.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CIREPLAY_HPP
-#define SHARE_VM_CI_CIREPLAY_HPP
+#ifndef SHARE_CI_CIREPLAY_HPP
+#define SHARE_CI_CIREPLAY_HPP
 
 #include "ci/ciMethod.hpp"
 
@@ -125,4 +125,4 @@
 #endif
 };
 
-#endif // SHARE_VM_CI_CIREPLAY_HPP
+#endif // SHARE_CI_CIREPLAY_HPP
--- a/src/hotspot/share/ci/ciSignature.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciSignature.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CISIGNATURE_HPP
-#define SHARE_VM_CI_CISIGNATURE_HPP
+#ifndef SHARE_CI_CISIGNATURE_HPP
+#define SHARE_CI_CISIGNATURE_HPP
 
 #include "ci/ciClassList.hpp"
 #include "ci/ciSymbol.hpp"
@@ -72,4 +72,4 @@
   void print();
 };
 
-#endif // SHARE_VM_CI_CISIGNATURE_HPP
+#endif // SHARE_CI_CISIGNATURE_HPP
--- a/src/hotspot/share/ci/ciStreams.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciStreams.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CISTREAMS_HPP
-#define SHARE_VM_CI_CISTREAMS_HPP
+#ifndef SHARE_CI_CISTREAMS_HPP
+#define SHARE_CI_CISTREAMS_HPP
 
 #include "ci/ciClassList.hpp"
 #include "ci/ciExceptionHandler.hpp"
@@ -438,4 +438,4 @@
 Bytecode_lookupswitch::Bytecode_lookupswitch(const ciBytecodeStream* stream): Bytecode(stream) { verify(); }
 Bytecode_tableswitch::Bytecode_tableswitch(const ciBytecodeStream* stream): Bytecode(stream) { verify(); }
 
-#endif // SHARE_VM_CI_CISTREAMS_HPP
+#endif // SHARE_CI_CISTREAMS_HPP
--- a/src/hotspot/share/ci/ciSymbol.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciSymbol.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CISYMBOL_HPP
-#define SHARE_VM_CI_CISYMBOL_HPP
+#ifndef SHARE_CI_CISYMBOL_HPP
+#define SHARE_CI_CISYMBOL_HPP
 
 #include "ci/ciBaseObject.hpp"
 #include "ci/ciObject.hpp"
@@ -114,4 +114,4 @@
   bool is_signature_polymorphic_name() const;
 };
 
-#endif // SHARE_VM_CI_CISYMBOL_HPP
+#endif // SHARE_CI_CISYMBOL_HPP
--- a/src/hotspot/share/ci/ciType.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciType.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CITYPE_HPP
-#define SHARE_VM_CI_CITYPE_HPP
+#ifndef SHARE_CI_CITYPE_HPP
+#define SHARE_CI_CITYPE_HPP
 
 #include "ci/ciMetadata.hpp"
 
@@ -112,4 +112,4 @@
   static ciReturnAddress* make(int bci);
 };
 
-#endif // SHARE_VM_CI_CITYPE_HPP
+#endif // SHARE_CI_CITYPE_HPP
--- a/src/hotspot/share/ci/ciTypeArray.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciTypeArray.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CITYPEARRAY_HPP
-#define SHARE_VM_CI_CITYPEARRAY_HPP
+#ifndef SHARE_CI_CITYPEARRAY_HPP
+#define SHARE_CI_CITYPEARRAY_HPP
 
 #include "ci/ciArray.hpp"
 #include "ci/ciClassList.hpp"
@@ -61,4 +61,4 @@
 
 };
 
-#endif // SHARE_VM_CI_CITYPEARRAY_HPP
+#endif // SHARE_CI_CITYPEARRAY_HPP
--- a/src/hotspot/share/ci/ciTypeArrayKlass.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciTypeArrayKlass.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CITYPEARRAYKLASS_HPP
-#define SHARE_VM_CI_CITYPEARRAYKLASS_HPP
+#ifndef SHARE_CI_CITYPEARRAYKLASS_HPP
+#define SHARE_CI_CITYPEARRAYKLASS_HPP
 
 #include "ci/ciArrayKlass.hpp"
 
@@ -63,4 +63,4 @@
   }
 };
 
-#endif // SHARE_VM_CI_CITYPEARRAYKLASS_HPP
+#endif // SHARE_CI_CITYPEARRAYKLASS_HPP
--- a/src/hotspot/share/ci/ciTypeFlow.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciTypeFlow.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CITYPEFLOW_HPP
-#define SHARE_VM_CI_CITYPEFLOW_HPP
+#ifndef SHARE_CI_CITYPEFLOW_HPP
+#define SHARE_CI_CITYPEFLOW_HPP
 
 #ifdef COMPILER2
 #include "ci/ciEnv.hpp"
@@ -950,4 +950,4 @@
   void rpo_print_on(outputStream* st) const PRODUCT_RETURN;
 };
 
-#endif // SHARE_VM_CI_CITYPEFLOW_HPP
+#endif // SHARE_CI_CITYPEFLOW_HPP
--- a/src/hotspot/share/ci/ciUtilities.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciUtilities.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CIUTILITIES_HPP
-#define SHARE_VM_CI_CIUTILITIES_HPP
+#ifndef SHARE_CI_CIUTILITIES_HPP
+#define SHARE_CI_CIUTILITIES_HPP
 
 #include "ci/ciEnv.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -56,4 +56,4 @@
   return reinterpret_cast<T>(ci_card_table_address());
 }
 
-#endif // SHARE_VM_CI_CIUTILITIES_HPP
+#endif // SHARE_CI_CIUTILITIES_HPP
--- a/src/hotspot/share/ci/ciUtilities.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/ciUtilities.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_CIUTILITIES_INLINE_HPP
-#define SHARE_VM_CI_CIUTILITIES_INLINE_HPP
+#ifndef SHARE_CI_CIUTILITIES_INLINE_HPP
+#define SHARE_CI_CIUTILITIES_INLINE_HPP
 
 #include "ci/ciUtilities.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
@@ -89,5 +89,4 @@
   }                                              \
 (void)(0
 
-#endif // SHARE_VM_CI_CIUTILITIES_INLINE_HPP
-
+#endif // SHARE_CI_CIUTILITIES_INLINE_HPP
--- a/src/hotspot/share/ci/compilerInterface.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/ci/compilerInterface.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CI_COMPILERINTERFACE_HPP
-#define SHARE_VM_CI_COMPILERINTERFACE_HPP
+#ifndef SHARE_CI_COMPILERINTERFACE_HPP
+#define SHARE_CI_COMPILERINTERFACE_HPP
 
 #include "ci/ciArray.hpp"
 #include "ci/ciArrayKlass.hpp"
@@ -50,4 +50,4 @@
 // This is a dummy file used for including the complete
 // compiler interface.
 
-#endif // SHARE_VM_CI_COMPILERINTERFACE_HPP
+#endif // SHARE_CI_COMPILERINTERFACE_HPP
--- a/src/hotspot/share/classfile/altHashing.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/altHashing.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_ALTHASHING_HPP
-#define SHARE_VM_CLASSFILE_ALTHASHING_HPP
+#ifndef SHARE_CLASSFILE_ALTHASHING_HPP
+#define SHARE_CLASSFILE_ALTHASHING_HPP
 
 #include "jni.h"
 #include "classfile/symbolTable.hpp"
@@ -51,4 +51,4 @@
   static juint murmur3_32(juint seed, const jbyte* data, int len);
   static juint murmur3_32(juint seed, const jchar* data, int len);
 };
-#endif // SHARE_VM_CLASSFILE_ALTHASHING_HPP
+#endif // SHARE_CLASSFILE_ALTHASHING_HPP
--- a/src/hotspot/share/classfile/bytecodeAssembler.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/bytecodeAssembler.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_BYTECODEASSEMBLER_HPP
-#define SHARE_VM_CLASSFILE_BYTECODEASSEMBLER_HPP
+#ifndef SHARE_CLASSFILE_BYTECODEASSEMBLER_HPP
+#define SHARE_CLASSFILE_BYTECODEASSEMBLER_HPP
 
 #include "memory/allocation.hpp"
 #include "oops/method.hpp"
@@ -211,4 +211,4 @@
   void _return(BasicType bt);
 };
 
-#endif // SHARE_VM_CLASSFILE_BYTECODEASSEMBLER_HPP
+#endif // SHARE_CLASSFILE_BYTECODEASSEMBLER_HPP
--- a/src/hotspot/share/classfile/classFileParser.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/classFileParser.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_CLASSFILEPARSER_HPP
-#define SHARE_VM_CLASSFILE_CLASSFILEPARSER_HPP
+#ifndef SHARE_CLASSFILE_CLASSFILEPARSER_HPP
+#define SHARE_CLASSFILE_CLASSFILEPARSER_HPP
 
 #include "memory/referenceType.hpp"
 #include "oops/annotations.hpp"
@@ -546,4 +546,4 @@
 
 };
 
-#endif // SHARE_VM_CLASSFILE_CLASSFILEPARSER_HPP
+#endif // SHARE_CLASSFILE_CLASSFILEPARSER_HPP
--- a/src/hotspot/share/classfile/classFileStream.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/classFileStream.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_CLASSFILESTREAM_HPP
-#define SHARE_VM_CLASSFILE_CLASSFILESTREAM_HPP
+#ifndef SHARE_CLASSFILE_CLASSFILESTREAM_HPP
+#define SHARE_CLASSFILE_CLASSFILESTREAM_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/bytes.hpp"
@@ -143,4 +143,4 @@
   uint64_t compute_fingerprint() const;
 };
 
-#endif // SHARE_VM_CLASSFILE_CLASSFILESTREAM_HPP
+#endif // SHARE_CLASSFILE_CLASSFILESTREAM_HPP
--- a/src/hotspot/share/classfile/classListParser.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/classListParser.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_MEMORY_CLASSLISTPARSER_HPP
-#define SHARE_VM_MEMORY_CLASSLISTPARSER_HPP
+#ifndef SHARE_CLASSFILE_CLASSLISTPARSER_HPP
+#define SHARE_CLASSFILE_CLASSLISTPARSER_HPP
 
 #include "utilities/exceptions.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -127,4 +127,4 @@
   InstanceKlass* lookup_super_for_current_class(Symbol* super_name);
   InstanceKlass* lookup_interface_for_current_class(Symbol* interface_name);
 };
-#endif
+#endif // SHARE_CLASSFILE_CLASSLISTPARSER_HPP
--- a/src/hotspot/share/classfile/classLoader.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/classLoader.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_CLASSLOADER_HPP
-#define SHARE_VM_CLASSFILE_CLASSLOADER_HPP
+#ifndef SHARE_CLASSFILE_CLASSLOADER_HPP
+#define SHARE_CLASSFILE_CLASSLOADER_HPP
 
 #include "jimage.hpp"
 #include "runtime/handles.hpp"
@@ -506,4 +506,4 @@
   void initialize();
 };
 
-#endif // SHARE_VM_CLASSFILE_CLASSLOADER_HPP
+#endif // SHARE_CLASSFILE_CLASSLOADER_HPP
--- a/src/hotspot/share/classfile/classLoader.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/classLoader.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_CLASSLOADER_INLINE_HPP
-#define SHARE_VM_CLASSFILE_CLASSLOADER_INLINE_HPP
+#ifndef SHARE_CLASSFILE_CLASSLOADER_INLINE_HPP
+#define SHARE_CLASSFILE_CLASSLOADER_INLINE_HPP
 
 #include "classfile/classLoader.hpp"
 #include "runtime/orderAccess.hpp"
@@ -96,4 +96,4 @@
 
 #endif // INCLUDE_CDS
 
-#endif // SHARE_VM_CLASSFILE_CLASSLOADER_INLINE_HPP
+#endif // SHARE_CLASSFILE_CLASSLOADER_INLINE_HPP
--- a/src/hotspot/share/classfile/classLoaderData.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/classLoaderData.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_CLASSLOADERDATA_HPP
-#define SHARE_VM_CLASSFILE_CLASSLOADERDATA_HPP
+#ifndef SHARE_CLASSFILE_CLASSLOADERDATA_HPP
+#define SHARE_CLASSFILE_CLASSLOADERDATA_HPP
 
 #include "memory/allocation.hpp"
 #include "memory/memRegion.hpp"
@@ -327,4 +327,4 @@
   JFR_ONLY(DEFINE_TRACE_ID_METHODS;)
 };
 
-#endif // SHARE_VM_CLASSFILE_CLASSLOADERDATA_HPP
+#endif // SHARE_CLASSFILE_CLASSLOADERDATA_HPP
--- a/src/hotspot/share/classfile/classLoaderData.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/classLoaderData.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_CLASSLOADERDATA_INLINE_HPP
-#define SHARE_VM_CLASSFILE_CLASSLOADERDATA_INLINE_HPP
+#ifndef SHARE_CLASSFILE_CLASSLOADERDATA_INLINE_HPP
+#define SHARE_CLASSFILE_CLASSLOADERDATA_INLINE_HPP
 
 #include "classfile/classLoaderData.hpp"
 #include "classfile/javaClasses.hpp"
@@ -55,4 +55,4 @@
   return loader_data;
 }
 
-#endif // SHARE_VM_CLASSFILE_CLASSLOADERDATA_INLINE_HPP
+#endif // SHARE_CLASSFILE_CLASSLOADERDATA_INLINE_HPP
--- a/src/hotspot/share/classfile/classLoaderDataGraph.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/classLoaderDataGraph.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_CLASSLOADERDATAGRAPH_HPP
-#define SHARE_VM_CLASSFILE_CLASSLOADERDATAGRAPH_HPP
+#ifndef SHARE_CLASSFILE_CLASSLOADERDATAGRAPH_HPP
+#define SHARE_CLASSFILE_CLASSLOADERDATAGRAPH_HPP
 
 #include "classfile/classLoaderData.hpp"
 #include "memory/allocation.hpp"
@@ -185,4 +185,4 @@
   bool repeat() { return _data != NULL; }
   ClassLoaderMetaspace* get_next();
 };
-#endif // SHARE_VM_CLASSFILE_CLASSLOADERDATAGRAPH_HPP
+#endif // SHARE_CLASSFILE_CLASSLOADERDATAGRAPH_HPP
--- a/src/hotspot/share/classfile/classLoaderDataGraph.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/classLoaderDataGraph.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_CLASSLOADERDATAGRAPH_INLINE_HPP
-#define SHARE_VM_CLASSFILE_CLASSLOADERDATAGRAPH_INLINE_HPP
+#ifndef SHARE_CLASSFILE_CLASSLOADERDATAGRAPH_INLINE_HPP
+#define SHARE_CLASSFILE_CLASSLOADERDATAGRAPH_INLINE_HPP
 
 #include "classfile/classLoaderDataGraph.hpp"
 #include "classfile/javaClasses.hpp"
@@ -79,4 +79,4 @@
   return do_cleaning;
 }
 
-#endif // SHARE_VM_CLASSFILE_CLASSLOADERDATAGRAPH_INLINE_HPP
+#endif // SHARE_CLASSFILE_CLASSLOADERDATAGRAPH_INLINE_HPP
--- a/src/hotspot/share/classfile/classLoaderExt.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/classLoaderExt.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_CLASSLOADEREXT_HPP
-#define SHARE_VM_CLASSFILE_CLASSLOADEREXT_HPP
+#ifndef SHARE_CLASSFILE_CLASSLOADEREXT_HPP
+#define SHARE_CLASSFILE_CLASSLOADEREXT_HPP
 
 #include "classfile/classLoader.hpp"
 #include "classfile/moduleEntry.hpp"
@@ -124,4 +124,4 @@
 #endif
 };
 
-#endif // SHARE_VM_CLASSFILE_CLASSLOADEREXT_HPP
+#endif // SHARE_CLASSFILE_CLASSLOADEREXT_HPP
--- a/src/hotspot/share/classfile/classLoaderHierarchyDCmd.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/classLoaderHierarchyDCmd.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef HOTSPOT_SHARE_CLASSFILE_CLASSLOADERHIERARCHYDCMD_HPP_
-#define HOTSPOT_SHARE_CLASSFILE_CLASSLOADERHIERARCHYDCMD_HPP_
+#ifndef SHARE_CLASSFILE_CLASSLOADERHIERARCHYDCMD_HPP
+#define SHARE_CLASSFILE_CLASSLOADERHIERARCHYDCMD_HPP
 
 #include "services/diagnosticCommand.hpp"
 
@@ -56,4 +56,4 @@
 
 };
 
-#endif /* HOTSPOT_SHARE_CLASSFILE_CLASSLOADERHIERARCHYDCMD_HPP_ */
+#endif // SHARE_CLASSFILE_CLASSLOADERHIERARCHYDCMD_HPP
--- a/src/hotspot/share/classfile/classLoaderStats.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/classLoaderStats.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_CLASSLOADERSTATS_HPP
-#define SHARE_VM_CLASSFILE_CLASSLOADERSTATS_HPP
+#ifndef SHARE_CLASSFILE_CLASSLOADERSTATS_HPP
+#define SHARE_CLASSFILE_CLASSLOADERSTATS_HPP
 
 
 #include "classfile/classLoaderData.hpp"
@@ -150,4 +150,4 @@
   void doit();
 };
 
-#endif // SHARE_VM_CLASSFILE_CLASSLOADERSTATS_HPP
+#endif // SHARE_CLASSFILE_CLASSLOADERSTATS_HPP
--- a/src/hotspot/share/classfile/compactHashtable.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/compactHashtable.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_COMPACTHASHTABLE_HPP
-#define SHARE_VM_CLASSFILE_COMPACTHASHTABLE_HPP
+#ifndef SHARE_CLASSFILE_COMPACTHASHTABLE_HPP
+#define SHARE_CLASSFILE_COMPACTHASHTABLE_HPP
 
 #include "oops/array.hpp"
 #include "oops/symbol.hpp"
@@ -428,4 +428,4 @@
   static void put_utf8(outputStream* st, const char* utf8_string, int utf8_length);
 };
 
-#endif // SHARE_VM_CLASSFILE_COMPACTHASHTABLE_HPP
+#endif // SHARE_CLASSFILE_COMPACTHASHTABLE_HPP
--- a/src/hotspot/share/classfile/defaultMethods.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/defaultMethods.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_DEFAULTMETHODS_HPP
-#define SHARE_VM_CLASSFILE_DEFAULTMETHODS_HPP
+#ifndef SHARE_CLASSFILE_DEFAULTMETHODS_HPP
+#define SHARE_CLASSFILE_DEFAULTMETHODS_HPP
 
 #include "runtime/handles.hpp"
 #include "utilities/growableArray.hpp"
@@ -45,4 +45,4 @@
   static void generate_default_methods(
       InstanceKlass* klass, const GrowableArray<Method*>* mirandas, TRAPS);
 };
-#endif // SHARE_VM_CLASSFILE_DEFAULTMETHODS_HPP
+#endif // SHARE_CLASSFILE_DEFAULTMETHODS_HPP
--- a/src/hotspot/share/classfile/dictionary.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/dictionary.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_DICTIONARY_HPP
-#define SHARE_VM_CLASSFILE_DICTIONARY_HPP
+#ifndef SHARE_CLASSFILE_DICTIONARY_HPP
+#define SHARE_CLASSFILE_DICTIONARY_HPP
 
 #include "classfile/protectionDomainCache.hpp"
 #include "classfile/systemDictionary.hpp"
@@ -307,4 +307,4 @@
     return (SymbolPropertyEntry*) Hashtable<Symbol*, mtSymbol>::bucket(i);
   }
 };
-#endif // SHARE_VM_CLASSFILE_DICTIONARY_HPP
+#endif // SHARE_CLASSFILE_DICTIONARY_HPP
--- a/src/hotspot/share/classfile/dictionary.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/dictionary.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_DICTIONARY_INLINE_HPP
-#define SHARE_VM_CLASSFILE_DICTIONARY_INLINE_HPP
+#ifndef SHARE_CLASSFILE_DICTIONARY_INLINE_HPP
+#define SHARE_CLASSFILE_DICTIONARY_INLINE_HPP
 
 #include "classfile/dictionary.hpp"
 #include "runtime/orderAccess.hpp"
@@ -36,4 +36,4 @@
   OrderAccess::release_store(&_pd_set, new_head);
 }
 
-#endif // SHARE_VM_CLASSFILE_DICTIONARY_INLINE_HPP
+#endif // SHARE_CLASSFILE_DICTIONARY_INLINE_HPP
--- a/src/hotspot/share/classfile/javaAssertions.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/javaAssertions.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_JAVAASSERTIONS_HPP
-#define SHARE_VM_CLASSFILE_JAVAASSERTIONS_HPP
+#ifndef SHARE_CLASSFILE_JAVAASSERTIONS_HPP
+#define SHARE_CLASSFILE_JAVAASSERTIONS_HPP
 
 #include "oops/objArrayOop.hpp"
 #include "oops/typeArrayOop.hpp"
@@ -104,4 +104,4 @@
   _sysDefault = enabled;
 }
 
-#endif // SHARE_VM_CLASSFILE_JAVAASSERTIONS_HPP
+#endif // SHARE_CLASSFILE_JAVAASSERTIONS_HPP
--- a/src/hotspot/share/classfile/javaClasses.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/javaClasses.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_JAVACLASSES_HPP
-#define SHARE_VM_CLASSFILE_JAVACLASSES_HPP
+#ifndef SHARE_CLASSFILE_JAVACLASSES_HPP
+#define SHARE_CLASSFILE_JAVACLASSES_HPP
 
 #include "classfile/systemDictionary.hpp"
 #include "jvmtifiles/jvmti.h"
@@ -1541,4 +1541,4 @@
 
 #undef DECLARE_INJECTED_FIELD_ENUM
 
-#endif // SHARE_VM_CLASSFILE_JAVACLASSES_HPP
+#endif // SHARE_CLASSFILE_JAVACLASSES_HPP
--- a/src/hotspot/share/classfile/javaClasses.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/javaClasses.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_JAVACLASSES_INLINE_HPP
-#define SHARE_VM_CLASSFILE_JAVACLASSES_INLINE_HPP
+#ifndef SHARE_CLASSFILE_JAVACLASSES_INLINE_HPP
+#define SHARE_CLASSFILE_JAVACLASSES_INLINE_HPP
 
 #include "classfile/javaClasses.hpp"
 #include "oops/access.inline.hpp"
@@ -258,4 +258,4 @@
   }
 }
 
-#endif // SHARE_VM_CLASSFILE_JAVACLASSES_INLINE_HPP
+#endif // SHARE_CLASSFILE_JAVACLASSES_INLINE_HPP
--- a/src/hotspot/share/classfile/klassFactory.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/klassFactory.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
 *
 */
 
-#ifndef SHARE_VM_CLASSFILE_KLASSFACTORY_HPP
-#define SHARE_VM_CLASSFILE_KLASSFACTORY_HPP
+#ifndef SHARE_CLASSFILE_KLASSFACTORY_HPP
+#define SHARE_CLASSFILE_KLASSFACTORY_HPP
 
 #include "memory/allocation.hpp"
 #include "runtime/handles.hpp"
@@ -83,4 +83,4 @@
                                           Handle protection_domain, TRAPS);
 };
 
-#endif // SHARE_VM_CLASSFILE_KLASSFACTORY_HPP
+#endif // SHARE_CLASSFILE_KLASSFACTORY_HPP
--- a/src/hotspot/share/classfile/loaderConstraints.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/loaderConstraints.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_LOADERCONSTRAINTS_HPP
-#define SHARE_VM_CLASSFILE_LOADERCONSTRAINTS_HPP
+#ifndef SHARE_CLASSFILE_LOADERCONSTRAINTS_HPP
+#define SHARE_CLASSFILE_LOADERCONSTRAINTS_HPP
 
 #include "classfile/placeholders.hpp"
 #include "utilities/hashtable.hpp"
@@ -130,4 +130,4 @@
   void set_loader(int i, oop p);
 };
 
-#endif // SHARE_VM_CLASSFILE_LOADERCONSTRAINTS_HPP
+#endif // SHARE_CLASSFILE_LOADERCONSTRAINTS_HPP
--- a/src/hotspot/share/classfile/metadataOnStackMark.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/metadataOnStackMark.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_METADATAONSTACKMARK_HPP
-#define SHARE_VM_CLASSFILE_METADATAONSTACKMARK_HPP
+#ifndef SHARE_CLASSFILE_METADATAONSTACKMARK_HPP
+#define SHARE_CLASSFILE_METADATAONSTACKMARK_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/chunkedList.hpp"
@@ -55,4 +55,4 @@
   static void retire_current_buffer();
 };
 
-#endif // SHARE_VM_CLASSFILE_METADATAONSTACKMARK_HPP
+#endif // SHARE_CLASSFILE_METADATAONSTACKMARK_HPP
--- a/src/hotspot/share/classfile/moduleEntry.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/moduleEntry.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_MODULEENTRY_HPP
-#define SHARE_VM_CLASSFILE_MODULEENTRY_HPP
+#ifndef SHARE_CLASSFILE_MODULEENTRY_HPP
+#define SHARE_CLASSFILE_MODULEENTRY_HPP
 
 #include "jni.h"
 #include "classfile/classLoaderData.hpp"
@@ -264,4 +264,4 @@
   void verify();
 };
 
-#endif // SHARE_VM_CLASSFILE_MODULEENTRY_HPP
+#endif // SHARE_CLASSFILE_MODULEENTRY_HPP
--- a/src/hotspot/share/classfile/modules.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/modules.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
 *
 */
 
-#ifndef SHARE_VM_CLASSFILE_MODULES_HPP
-#define SHARE_VM_CLASSFILE_MODULES_HPP
+#ifndef SHARE_CLASSFILE_MODULES_HPP
+#define SHARE_CLASSFILE_MODULES_HPP
 
 #include "memory/allocation.hpp"
 #include "runtime/handles.hpp"
@@ -126,4 +126,4 @@
   static ModuleEntryTable* get_module_entry_table(Handle h_loader);
 };
 
-#endif // SHARE_VM_CLASSFILE_MODULES_HPP
+#endif // SHARE_CLASSFILE_MODULES_HPP
--- a/src/hotspot/share/classfile/packageEntry.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/packageEntry.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_PACKAGEENTRY_HPP
-#define SHARE_VM_CLASSFILE_PACKAGEENTRY_HPP
+#ifndef SHARE_CLASSFILE_PACKAGEENTRY_HPP
+#define SHARE_CLASSFILE_PACKAGEENTRY_HPP
 
 #include "classfile/moduleEntry.hpp"
 #include "oops/symbol.hpp"
@@ -265,4 +265,4 @@
   void verify();
 };
 
-#endif // SHARE_VM_CLASSFILE_PACKAGEENTRY_HPP
+#endif // SHARE_CLASSFILE_PACKAGEENTRY_HPP
--- a/src/hotspot/share/classfile/placeholders.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/placeholders.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_PLACEHOLDERS_HPP
-#define SHARE_VM_CLASSFILE_PLACEHOLDERS_HPP
+#ifndef SHARE_CLASSFILE_PLACEHOLDERS_HPP
+#define SHARE_CLASSFILE_PLACEHOLDERS_HPP
 
 #include "runtime/thread.hpp"
 #include "utilities/hashtable.hpp"
@@ -321,4 +321,4 @@
   void verify() const;
 };
 
-#endif // SHARE_VM_CLASSFILE_PLACEHOLDERS_HPP
+#endif // SHARE_CLASSFILE_PLACEHOLDERS_HPP
--- a/src/hotspot/share/classfile/protectionDomainCache.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/protectionDomainCache.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_PROTECTIONDOMAINCACHE_HPP
-#define SHARE_VM_CLASSFILE_PROTECTIONDOMAINCACHE_HPP
+#ifndef SHARE_CLASSFILE_PROTECTIONDOMAINCACHE_HPP
+#define SHARE_CLASSFILE_PROTECTIONDOMAINCACHE_HPP
 
 #include "oops/oop.hpp"
 #include "oops/weakHandle.hpp"
@@ -120,4 +120,4 @@
   oop object();
   oop object_no_keepalive();
 };
-#endif // SHARE_VM_CLASSFILE_PROTECTIONDOMAINCACHE_HPP
+#endif // SHARE_CLASSFILE_PROTECTIONDOMAINCACHE_HPP
--- a/src/hotspot/share/classfile/resolutionErrors.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/resolutionErrors.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_RESOLUTIONERRORS_HPP
-#define SHARE_VM_CLASSFILE_RESOLUTIONERRORS_HPP
+#ifndef SHARE_CLASSFILE_RESOLUTIONERRORS_HPP
+#define SHARE_CLASSFILE_RESOLUTIONERRORS_HPP
 
 #include "oops/constantPool.hpp"
 #include "utilities/hashtable.hpp"
@@ -117,4 +117,4 @@
   }
 };
 
-#endif // SHARE_VM_CLASSFILE_RESOLUTIONERRORS_HPP
+#endif // SHARE_CLASSFILE_RESOLUTIONERRORS_HPP
--- a/src/hotspot/share/classfile/sharedPathsMiscInfo.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/sharedPathsMiscInfo.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_SHAREDPATHSMISCINFO_HPP
-#define SHARE_VM_CLASSFILE_SHAREDPATHSMISCINFO_HPP
+#ifndef SHARE_CLASSFILE_SHAREDPATHSMISCINFO_HPP
+#define SHARE_CLASSFILE_SHAREDPATHSMISCINFO_HPP
 
 #include "classfile/classLoader.hpp"
 #include "runtime/os.hpp"
@@ -165,4 +165,4 @@
   bool check();
 };
 
-#endif // SHARE_VM_CLASSFILE_SHAREDPATHSMISCINFO_HPP
+#endif // SHARE_CLASSFILE_SHAREDPATHSMISCINFO_HPP
--- a/src/hotspot/share/classfile/stackMapFrame.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/stackMapFrame.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_STACKMAPFRAME_HPP
-#define SHARE_VM_CLASSFILE_STACKMAPFRAME_HPP
+#ifndef SHARE_CLASSFILE_STACKMAPFRAME_HPP
+#define SHARE_CLASSFILE_STACKMAPFRAME_HPP
 
 #include "classfile/verificationType.hpp"
 #include "classfile/verifier.hpp"
@@ -295,4 +295,4 @@
   void print_on(outputStream* str) const;
 };
 
-#endif // SHARE_VM_CLASSFILE_STACKMAPFRAME_HPP
+#endif // SHARE_CLASSFILE_STACKMAPFRAME_HPP
--- a/src/hotspot/share/classfile/stackMapTable.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/stackMapTable.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_STACKMAPTABLE_HPP
-#define SHARE_VM_CLASSFILE_STACKMAPTABLE_HPP
+#ifndef SHARE_CLASSFILE_STACKMAPTABLE_HPP
+#define SHARE_CLASSFILE_STACKMAPTABLE_HPP
 
 #include "classfile/stackMapFrame.hpp"
 #include "classfile/verifier.hpp"
@@ -155,4 +155,4 @@
   }
 };
 
-#endif // SHARE_VM_CLASSFILE_STACKMAPTABLE_HPP
+#endif // SHARE_CLASSFILE_STACKMAPTABLE_HPP
--- a/src/hotspot/share/classfile/stackMapTableFormat.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/stackMapTableFormat.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_STACKMAPTABLEFORMAT_HPP
-#define SHARE_VM_CLASSFILE_STACKMAPTABLEFORMAT_HPP
+#ifndef SHARE_CLASSFILE_STACKMAPTABLEFORMAT_HPP
+#define SHARE_CLASSFILE_STACKMAPTABLEFORMAT_HPP
 
 #include "classfile/verificationType.hpp"
 
@@ -963,4 +963,4 @@
 
 #undef FOR_EACH_STACKMAP_FRAME_TYPE
 
-#endif // SHARE_VM_CLASSFILE_STACKMAPTABLEFORMAT_HPP
+#endif // SHARE_CLASSFILE_STACKMAPTABLEFORMAT_HPP
--- a/src/hotspot/share/classfile/stringTable.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/stringTable.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_STRINGTABLE_HPP
-#define SHARE_VM_CLASSFILE_STRINGTABLE_HPP
+#ifndef SHARE_CLASSFILE_STRINGTABLE_HPP
+#define SHARE_CLASSFILE_STRINGTABLE_HPP
 
 #include "gc/shared/oopStorage.hpp"
 #include "gc/shared/oopStorageParState.hpp"
@@ -177,4 +177,4 @@
   static void verify();
 };
 
-#endif // SHARE_VM_CLASSFILE_STRINGTABLE_HPP
+#endif // SHARE_CLASSFILE_STRINGTABLE_HPP
--- a/src/hotspot/share/classfile/symbolTable.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/symbolTable.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_SYMBOLTABLE_HPP
-#define SHARE_VM_CLASSFILE_SYMBOLTABLE_HPP
+#ifndef SHARE_CLASSFILE_SYMBOLTABLE_HPP
+#define SHARE_CLASSFILE_SYMBOLTABLE_HPP
 
 #include "memory/allocation.hpp"
 #include "memory/padded.hpp"
@@ -259,4 +259,4 @@
   static void print_histogram() PRODUCT_RETURN;
 };
 
-#endif // SHARE_VM_CLASSFILE_SYMBOLTABLE_HPP
+#endif // SHARE_CLASSFILE_SYMBOLTABLE_HPP
--- a/src/hotspot/share/classfile/systemDictionary.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/systemDictionary.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_SYSTEMDICTIONARY_HPP
-#define SHARE_VM_CLASSFILE_SYSTEMDICTIONARY_HPP
+#ifndef SHARE_CLASSFILE_SYSTEMDICTIONARY_HPP
+#define SHARE_CLASSFILE_SYSTEMDICTIONARY_HPP
 
 #include "classfile/classLoader.hpp"
 #include "jvmci/systemDictionary_jvmci.hpp"
@@ -703,4 +703,4 @@
   static bool _has_checkPackageAccess;
 };
 
-#endif // SHARE_VM_CLASSFILE_SYSTEMDICTIONARY_HPP
+#endif // SHARE_CLASSFILE_SYSTEMDICTIONARY_HPP
--- a/src/hotspot/share/classfile/systemDictionaryShared.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/systemDictionaryShared.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_SYSTEMDICTIONARYSHARED_HPP
-#define SHARE_VM_CLASSFILE_SYSTEMDICTIONARYSHARED_HPP
+#ifndef SHARE_CLASSFILE_SYSTEMDICTIONARYSHARED_HPP
+#define SHARE_CLASSFILE_SYSTEMDICTIONARYSHARED_HPP
 
 #include "oops/klass.hpp"
 #include "classfile/dictionary.hpp"
@@ -300,4 +300,4 @@
   DEBUG_ONLY(static bool checked_excluded_classes() {return _checked_excluded_classes;})
 };
 
-#endif // SHARE_VM_CLASSFILE_SYSTEMDICTIONARYSHARED_HPP
+#endif // SHARE_CLASSFILE_SYSTEMDICTIONARYSHARED_HPP
--- a/src/hotspot/share/classfile/verificationType.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/verificationType.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_VERIFICATIONTYPE_HPP
-#define SHARE_VM_CLASSFILE_VERIFICATIONTYPE_HPP
+#ifndef SHARE_CLASSFILE_VERIFICATIONTYPE_HPP
+#define SHARE_CLASSFILE_VERIFICATIONTYPE_HPP
 
 #include "classfile/systemDictionary.hpp"
 #include "oops/instanceKlass.hpp"
@@ -341,4 +341,4 @@
                                               TRAPS);
 };
 
-#endif // SHARE_VM_CLASSFILE_VERIFICATIONTYPE_HPP
+#endif // SHARE_CLASSFILE_VERIFICATIONTYPE_HPP
--- a/src/hotspot/share/classfile/verifier.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/verifier.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_VERIFIER_HPP
-#define SHARE_VM_CLASSFILE_VERIFIER_HPP
+#ifndef SHARE_CLASSFILE_VERIFIER_HPP
+#define SHARE_CLASSFILE_VERIFIER_HPP
 
 #include "classfile/verificationType.hpp"
 #include "oops/klass.hpp"
@@ -463,4 +463,4 @@
   }
 }
 
-#endif // SHARE_VM_CLASSFILE_VERIFIER_HPP
+#endif // SHARE_CLASSFILE_VERIFIER_HPP
--- a/src/hotspot/share/classfile/vmSymbols.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/classfile/vmSymbols.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CLASSFILE_VMSYMBOLS_HPP
-#define SHARE_VM_CLASSFILE_VMSYMBOLS_HPP
+#ifndef SHARE_CLASSFILE_VMSYMBOLS_HPP
+#define SHARE_CLASSFILE_VMSYMBOLS_HPP
 
 #include "classfile/moduleEntry.hpp"
 #include "jfr/support/jfrIntrinsics.hpp"
@@ -1656,4 +1656,4 @@
   static bool is_intrinsic_available(vmIntrinsics::ID id);
 };
 
-#endif // SHARE_VM_CLASSFILE_VMSYMBOLS_HPP
+#endif // SHARE_CLASSFILE_VMSYMBOLS_HPP
--- a/src/hotspot/share/code/codeBlob.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/code/codeBlob.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CODE_CODEBLOB_HPP
-#define SHARE_VM_CODE_CODEBLOB_HPP
+#ifndef SHARE_CODE_CODEBLOB_HPP
+#define SHARE_CODE_CODEBLOB_HPP
 
 #include "asm/codeBuffer.hpp"
 #include "compiler/compilerDefinitions.hpp"
@@ -732,4 +732,4 @@
   bool is_safepoint_stub() const                 { return true; }
 };
 
-#endif // SHARE_VM_CODE_CODEBLOB_HPP
+#endif // SHARE_CODE_CODEBLOB_HPP
--- a/src/hotspot/share/code/codeCache.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/code/codeCache.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CODE_CODECACHE_HPP
-#define SHARE_VM_CODE_CODECACHE_HPP
+#ifndef SHARE_CODE_CODECACHE_HPP
+#define SHARE_CODE_CODECACHE_HPP
 
 #include "code/codeBlob.hpp"
 #include "code/nmethod.hpp"
@@ -430,4 +430,4 @@
 typedef CodeBlobIterator<CompiledMethod, CompiledMethodFilter> CompiledMethodIterator;
 typedef CodeBlobIterator<nmethod, NMethodFilter> NMethodIterator;
 
-#endif // SHARE_VM_CODE_CODECACHE_HPP
+#endif // SHARE_CODE_CODECACHE_HPP
--- a/src/hotspot/share/code/compiledIC.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/code/compiledIC.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CODE_COMPILEDIC_HPP
-#define SHARE_VM_CODE_COMPILEDIC_HPP
+#ifndef SHARE_CODE_COMPILEDIC_HPP
+#define SHARE_CODE_COMPILEDIC_HPP
 
 #include "code/nativeInst.hpp"
 #include "interpreter/linkResolver.hpp"
@@ -454,4 +454,4 @@
   virtual const char* name() const { return "CompiledDirectStaticCall"; }
 };
 
-#endif // SHARE_VM_CODE_COMPILEDIC_HPP
+#endif // SHARE_CODE_COMPILEDIC_HPP
--- a/src/hotspot/share/code/compiledMethod.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/code/compiledMethod.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CODE_COMPILEDMETHOD_HPP
-#define SHARE_VM_CODE_COMPILEDMETHOD_HPP
+#ifndef SHARE_CODE_COMPILEDMETHOD_HPP
+#define SHARE_CODE_COMPILEDMETHOD_HPP
 
 #include "code/codeBlob.hpp"
 #include "code/pcDesc.hpp"
@@ -414,4 +414,4 @@
   nmethod* _scavenge_root_link; // from CodeCache::scavenge_root_nmethods
 };
 
-#endif //SHARE_VM_CODE_COMPILEDMETHOD_HPP
+#endif // SHARE_CODE_COMPILEDMETHOD_HPP
--- a/src/hotspot/share/code/compiledMethod.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/code/compiledMethod.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CODE_COMPILEDMETHOD_INLINE_HPP
-#define SHARE_VM_CODE_COMPILEDMETHOD_INLINE_HPP
+#ifndef SHARE_CODE_COMPILEDMETHOD_INLINE_HPP
+#define SHARE_CODE_COMPILEDMETHOD_INLINE_HPP
 
 #include "code/compiledMethod.hpp"
 #include "code/nativeInst.hpp"
@@ -77,4 +77,4 @@
 inline void ExceptionCache::increment_count() { OrderAccess::release_store(&_count, _count + 1); }
 
 
-#endif //SHARE_VM_CODE_COMPILEDMETHOD_INLINE_HPP
+#endif // SHARE_CODE_COMPILEDMETHOD_INLINE_HPP
--- a/src/hotspot/share/code/compressedStream.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/code/compressedStream.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CODE_COMPRESSEDSTREAM_HPP
-#define SHARE_VM_CODE_COMPRESSEDSTREAM_HPP
+#ifndef SHARE_CODE_COMPRESSEDSTREAM_HPP
+#define SHARE_CODE_COMPRESSEDSTREAM_HPP
 
 #include "memory/allocation.hpp"
 
@@ -157,4 +157,4 @@
   void write_long(jlong value);        // write_signed_int(<low,high>)
 };
 
-#endif // SHARE_VM_CODE_COMPRESSEDSTREAM_HPP
+#endif // SHARE_CODE_COMPRESSEDSTREAM_HPP
--- a/src/hotspot/share/code/debugInfo.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/code/debugInfo.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CODE_DEBUGINFO_HPP
-#define SHARE_VM_CODE_DEBUGINFO_HPP
+#ifndef SHARE_CODE_DEBUGINFO_HPP
+#define SHARE_CODE_DEBUGINFO_HPP
 
 #include "code/compressedStream.hpp"
 #include "code/location.hpp"
@@ -301,4 +301,4 @@
   void write_metadata(Metadata* m);
 };
 
-#endif // SHARE_VM_CODE_DEBUGINFO_HPP
+#endif // SHARE_CODE_DEBUGINFO_HPP
--- a/src/hotspot/share/code/debugInfoRec.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/code/debugInfoRec.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CODE_DEBUGINFOREC_HPP
-#define SHARE_VM_CODE_DEBUGINFOREC_HPP
+#ifndef SHARE_CODE_DEBUGINFOREC_HPP
+#define SHARE_CODE_DEBUGINFOREC_HPP
 
 #include "ci/ciClassList.hpp"
 #include "ci/ciInstanceKlass.hpp"
@@ -208,4 +208,4 @@
   enum { serialized_null = 0 };
 };
 
-#endif // SHARE_VM_CODE_DEBUGINFOREC_HPP
+#endif // SHARE_CODE_DEBUGINFOREC_HPP
--- a/src/hotspot/share/code/dependencies.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/code/dependencies.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CODE_DEPENDENCIES_HPP
-#define SHARE_VM_CODE_DEPENDENCIES_HPP
+#ifndef SHARE_CODE_DEPENDENCIES_HPP
+#define SHARE_CODE_DEPENDENCIES_HPP
 
 #include "ci/ciCallSite.hpp"
 #include "ci/ciKlass.hpp"
@@ -799,4 +799,4 @@
   oop method_handle() const { return _method_handle(); }
 };
 
-#endif // SHARE_VM_CODE_DEPENDENCIES_HPP
+#endif // SHARE_CODE_DEPENDENCIES_HPP
--- a/src/hotspot/share/code/dependencyContext.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/code/dependencyContext.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CODE_DEPENDENCYCONTEXT_HPP
-#define SHARE_VM_CODE_DEPENDENCYCONTEXT_HPP
+#ifndef SHARE_CODE_DEPENDENCYCONTEXT_HPP
+#define SHARE_CODE_DEPENDENCYCONTEXT_HPP
 
 #include "memory/allocation.hpp"
 #include "oops/oop.hpp"
@@ -132,4 +132,4 @@
   bool is_dependent_nmethod(nmethod* nm);
 #endif //PRODUCT
 };
-#endif // SHARE_VM_CODE_DEPENDENCYCONTEXT_HPP
+#endif // SHARE_CODE_DEPENDENCYCONTEXT_HPP
--- a/src/hotspot/share/code/exceptionHandlerTable.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/code/exceptionHandlerTable.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CODE_EXCEPTIONHANDLERTABLE_HPP
-#define SHARE_VM_CODE_EXCEPTIONHANDLERTABLE_HPP
+#ifndef SHARE_CODE_EXCEPTIONHANDLERTABLE_HPP
+#define SHARE_CODE_EXCEPTIONHANDLERTABLE_HPP
 
 #include "memory/allocation.hpp"
 #include "oops/method.hpp"
@@ -163,4 +163,4 @@
   void verify(nmethod *nm) const;
 };
 
-#endif // SHARE_VM_CODE_EXCEPTIONHANDLERTABLE_HPP
+#endif // SHARE_CODE_EXCEPTIONHANDLERTABLE_HPP
--- a/src/hotspot/share/code/icBuffer.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/code/icBuffer.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CODE_ICBUFFER_HPP
-#define SHARE_VM_CODE_ICBUFFER_HPP
+#ifndef SHARE_CODE_ICBUFFER_HPP
+#define SHARE_CODE_ICBUFFER_HPP
 
 #include "asm/codeBuffer.hpp"
 #include "code/stubs.hpp"
@@ -178,4 +178,4 @@
   static void*   cached_value_for(CompiledIC *ic);
 };
 
-#endif // SHARE_VM_CODE_ICBUFFER_HPP
+#endif // SHARE_CODE_ICBUFFER_HPP
--- a/src/hotspot/share/code/location.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/code/location.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CODE_LOCATION_HPP
-#define SHARE_VM_CODE_LOCATION_HPP
+#ifndef SHARE_CODE_LOCATION_HPP
+#define SHARE_CODE_LOCATION_HPP
 
 #include "asm/assembler.hpp"
 #include "code/vmreg.hpp"
@@ -123,4 +123,4 @@
   static bool legal_offset_in_bytes(int offset_in_bytes);
 };
 
-#endif // SHARE_VM_CODE_LOCATION_HPP
+#endif // SHARE_CODE_LOCATION_HPP
--- a/src/hotspot/share/code/nativeInst.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/code/nativeInst.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,11 +22,11 @@
  *
  */
 
-#ifndef SHARE_VM_CODE_NATIVEINST_HPP
-#define SHARE_VM_CODE_NATIVEINST_HPP
+#ifndef SHARE_CODE_NATIVEINST_HPP
+#define SHARE_CODE_NATIVEINST_HPP
 
 #include "utilities/macros.hpp"
 
 #include CPU_HEADER(nativeInst)
 
-#endif // SHARE_VM_CODE_NATIVEINST_HPP
+#endif // SHARE_CODE_NATIVEINST_HPP
--- a/src/hotspot/share/code/nmethod.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/code/nmethod.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CODE_NMETHOD_HPP
-#define SHARE_VM_CODE_NMETHOD_HPP
+#ifndef SHARE_CODE_NMETHOD_HPP
+#define SHARE_CODE_NMETHOD_HPP
 
 #include "code/compiledMethod.hpp"
 
@@ -668,4 +668,4 @@
   }
 };
 
-#endif // SHARE_VM_CODE_NMETHOD_HPP
+#endif // SHARE_CODE_NMETHOD_HPP
--- a/src/hotspot/share/code/oopRecorder.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/code/oopRecorder.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CODE_OOPRECORDER_HPP
-#define SHARE_VM_CODE_OOPRECORDER_HPP
+#ifndef SHARE_CODE_OOPRECORDER_HPP
+#define SHARE_CODE_OOPRECORDER_HPP
 
 #include "memory/universe.hpp"
 #include "runtime/handles.hpp"
@@ -257,4 +257,4 @@
 };
 
 
-#endif // SHARE_VM_CODE_OOPRECORDER_HPP
+#endif // SHARE_CODE_OOPRECORDER_HPP
--- a/src/hotspot/share/code/pcDesc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/code/pcDesc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CODE_PCDESC_HPP
-#define SHARE_VM_CODE_PCDESC_HPP
+#ifndef SHARE_CODE_PCDESC_HPP
+#define SHARE_CODE_PCDESC_HPP
 
 
 // PcDescs map a physical PC (given as offset from start of nmethod) to
@@ -96,4 +96,4 @@
   bool verify(CompiledMethod* code);
 };
 
-#endif // SHARE_VM_CODE_PCDESC_HPP
+#endif // SHARE_CODE_PCDESC_HPP
--- a/src/hotspot/share/code/relocInfo.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/code/relocInfo.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CODE_RELOCINFO_HPP
-#define SHARE_VM_CODE_RELOCINFO_HPP
+#ifndef SHARE_CODE_RELOCINFO_HPP
+#define SHARE_CODE_RELOCINFO_HPP
 
 #include "runtime/os.hpp"
 #include "utilities/macros.hpp"
@@ -1392,4 +1392,4 @@
   initialize(nm, begin, limit);
 }
 
-#endif // SHARE_VM_CODE_RELOCINFO_HPP
+#endif // SHARE_CODE_RELOCINFO_HPP
--- a/src/hotspot/share/code/relocInfo_ext.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/code/relocInfo_ext.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CODE_RELOCINFO_EXT_HPP
-#define SHARE_VM_CODE_RELOCINFO_EXT_HPP
+#ifndef SHARE_CODE_RELOCINFO_EXT_HPP
+#define SHARE_CODE_RELOCINFO_EXT_HPP
 
 // symbolic_Relocation allows to anotate some addresses in the generated code.
 //
@@ -58,4 +58,4 @@
   static address symbolic_value(symbolic_reference t);
 };
 
-#endif // SHARE_VM_CODE_RELOCINFO_EXT_HPP
+#endif // SHARE_CODE_RELOCINFO_EXT_HPP
--- a/src/hotspot/share/code/scopeDesc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/code/scopeDesc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CODE_SCOPEDESC_HPP
-#define SHARE_VM_CODE_SCOPEDESC_HPP
+#ifndef SHARE_CODE_SCOPEDESC_HPP
+#define SHARE_CODE_SCOPEDESC_HPP
 
 #include "code/debugInfo.hpp"
 #include "code/pcDesc.hpp"
@@ -141,4 +141,4 @@
 #endif
 };
 
-#endif // SHARE_VM_CODE_SCOPEDESC_HPP
+#endif // SHARE_CODE_SCOPEDESC_HPP
--- a/src/hotspot/share/code/stubs.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/code/stubs.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CODE_STUBS_HPP
-#define SHARE_VM_CODE_STUBS_HPP
+#ifndef SHARE_CODE_STUBS_HPP
+#define SHARE_CODE_STUBS_HPP
 
 #include "asm/codeBuffer.hpp"
 #include "memory/allocation.hpp"
@@ -215,4 +215,4 @@
 
 };
 
-#endif // SHARE_VM_CODE_STUBS_HPP
+#endif // SHARE_CODE_STUBS_HPP
--- a/src/hotspot/share/code/vmreg.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/code/vmreg.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CODE_VMREG_HPP
-#define SHARE_VM_CODE_VMREG_HPP
+#ifndef SHARE_CODE_VMREG_HPP
+#define SHARE_CODE_VMREG_HPP
 
 #include "asm/register.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -197,4 +197,4 @@
   VMRegPair() { _second = VMRegImpl::Bad(); _first = VMRegImpl::Bad(); }
 };
 
-#endif // SHARE_VM_CODE_VMREG_HPP
+#endif // SHARE_CODE_VMREG_HPP
--- a/src/hotspot/share/code/vmreg.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/code/vmreg.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,11 +22,11 @@
  *
  */
 
-#ifndef SHARE_VM_CODE_VMREG_INLINE_HPP
-#define SHARE_VM_CODE_VMREG_INLINE_HPP
+#ifndef SHARE_CODE_VMREG_INLINE_HPP
+#define SHARE_CODE_VMREG_INLINE_HPP
 
 #include "asm/register.hpp"
 #include "code/vmreg.hpp"
 #include CPU_HEADER_INLINE(vmreg)
 
-#endif // SHARE_VM_CODE_VMREG_INLINE_HPP
+#endif // SHARE_CODE_VMREG_INLINE_HPP
--- a/src/hotspot/share/code/vtableStubs.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/code/vtableStubs.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_CODE_VTABLESTUBS_HPP
-#define SHARE_VM_CODE_VTABLESTUBS_HPP
+#ifndef SHARE_CODE_VTABLESTUBS_HPP
+#define SHARE_CODE_VTABLESTUBS_HPP
 
 #include "asm/macroAssembler.hpp"
 #include "code/vmreg.hpp"
@@ -181,4 +181,4 @@
 
 };
 
-#endif // SHARE_VM_CODE_VTABLESTUBS_HPP
+#endif // SHARE_CODE_VTABLESTUBS_HPP
--- a/src/hotspot/share/compiler/abstractCompiler.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/compiler/abstractCompiler.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_COMPILER_ABSTRACTCOMPILER_HPP
-#define SHARE_VM_COMPILER_ABSTRACTCOMPILER_HPP
+#ifndef SHARE_COMPILER_ABSTRACTCOMPILER_HPP
+#define SHARE_COMPILER_ABSTRACTCOMPILER_HPP
 
 #include "ci/compilerInterface.hpp"
 #include "compiler/compilerDefinitions.hpp"
@@ -184,4 +184,4 @@
 #endif
 };
 
-#endif // SHARE_VM_COMPILER_ABSTRACTCOMPILER_HPP
+#endif // SHARE_COMPILER_ABSTRACTCOMPILER_HPP
--- a/src/hotspot/share/compiler/compileBroker.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/compiler/compileBroker.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_COMPILER_COMPILEBROKER_HPP
-#define SHARE_VM_COMPILER_COMPILEBROKER_HPP
+#ifndef SHARE_COMPILER_COMPILEBROKER_HPP
+#define SHARE_COMPILER_COMPILEBROKER_HPP
 
 #include "ci/compilerInterface.hpp"
 #include "compiler/abstractCompiler.hpp"
@@ -426,4 +426,4 @@
   static void print_heapinfo(outputStream *out, const char* function, const char* granularity );
 };
 
-#endif // SHARE_VM_COMPILER_COMPILEBROKER_HPP
+#endif // SHARE_COMPILER_COMPILEBROKER_HPP
--- a/src/hotspot/share/compiler/compileLog.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/compiler/compileLog.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_COMPILER_COMPILELOG_HPP
-#define SHARE_VM_COMPILER_COMPILELOG_HPP
+#ifndef SHARE_COMPILER_COMPILELOG_HPP
+#define SHARE_COMPILER_COMPILELOG_HPP
 
 #include "utilities/xmlstream.hpp"
 
@@ -97,4 +97,4 @@
   static void finish_log_on_error(outputStream* out, char *buf, int buflen);
 };
 
-#endif // SHARE_VM_COMPILER_COMPILELOG_HPP
+#endif // SHARE_COMPILER_COMPILELOG_HPP
--- a/src/hotspot/share/compiler/compileTask.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/compiler/compileTask.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_COMPILER_COMPILETASK_HPP
-#define SHARE_VM_COMPILER_COMPILETASK_HPP
+#ifndef SHARE_COMPILER_COMPILETASK_HPP
+#define SHARE_COMPILER_COMPILETASK_HPP
 
 #include "ci/ciMethod.hpp"
 #include "code/nmethod.hpp"
@@ -212,4 +212,4 @@
   static void print_inlining_ul(ciMethod* method, int inline_level, int bci, const char* msg = NULL);
 };
 
-#endif // SHARE_VM_COMPILER_COMPILETASK_HPP
+#endif // SHARE_COMPILER_COMPILETASK_HPP
--- a/src/hotspot/share/compiler/compilerDefinitions.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/compiler/compilerDefinitions.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_COMPILER_COMPILERDEFINITIONS_HPP
-#define SHARE_VM_COMPILER_COMPILERDEFINITIONS_HPP
+#ifndef SHARE_COMPILER_COMPILERDEFINITIONS_HPP
+#define SHARE_COMPILER_COMPILERDEFINITIONS_HPP
 
 #include "memory/allocation.hpp"
 
@@ -132,4 +132,4 @@
   static void set_tiered_flags();
 };
 
-#endif // SHARE_VM_COMPILER_COMPILERDEFINITIONS_HPP
+#endif // SHARE_COMPILER_COMPILERDEFINITIONS_HPP
--- a/src/hotspot/share/compiler/compilerDirectives.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/compiler/compilerDirectives.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_COMPILER_COMPILERDIRECTIVES_HPP
-#define SHARE_VM_COMPILER_COMPILERDIRECTIVES_HPP
+#ifndef SHARE_COMPILER_COMPILERDIRECTIVES_HPP
+#define SHARE_COMPILER_COMPILERDIRECTIVES_HPP
 
 #include "ci/ciMetadata.hpp"
 #include "ci/ciMethod.hpp"
@@ -186,4 +186,4 @@
   DirectiveSet* _c2_store;
 };
 
-#endif // SHARE_VM_COMPILER_COMPILERDIRECTIVES_HPP
+#endif // SHARE_COMPILER_COMPILERDIRECTIVES_HPP
--- a/src/hotspot/share/compiler/compilerOracle.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/compiler/compilerOracle.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_COMPILER_COMPILERORACLE_HPP
-#define SHARE_VM_COMPILER_COMPILERORACLE_HPP
+#ifndef SHARE_COMPILER_COMPILERORACLE_HPP
+#define SHARE_COMPILER_COMPILERORACLE_HPP
 
 #include "memory/allocation.hpp"
 #include "oops/oopsHierarchy.hpp"
@@ -91,4 +91,4 @@
   static bool should_print_methods();
 };
 
-#endif // SHARE_VM_COMPILER_COMPILERORACLE_HPP
+#endif // SHARE_COMPILER_COMPILERORACLE_HPP
--- a/src/hotspot/share/compiler/directivesParser.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/compiler/directivesParser.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_COMPILER_DIRECTIVESPARSER_HPP
-#define SHARE_VM_COMPILER_DIRECTIVESPARSER_HPP
+#ifndef SHARE_COMPILER_DIRECTIVESPARSER_HPP
+#define SHARE_COMPILER_DIRECTIVESPARSER_HPP
 
 #include "utilities/json.hpp"
 #include "compiler/compilerDirectives.hpp"
@@ -139,4 +139,4 @@
   static uint mask(keytype kt);
 };
 
-#endif // SHARE_VM_COMPILER_DIRECTIVESPARSER_HPP
+#endif // SHARE_COMPILER_DIRECTIVESPARSER_HPP
--- a/src/hotspot/share/compiler/disassembler.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/compiler/disassembler.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_COMPILER_DISASSEMBLER_HPP
-#define SHARE_VM_COMPILER_DISASSEMBLER_HPP
+#ifndef SHARE_COMPILER_DISASSEMBLER_HPP
+#define SHARE_COMPILER_DISASSEMBLER_HPP
 
 #include "asm/codeBuffer.hpp"
 #include "runtime/globals.hpp"
@@ -90,4 +90,4 @@
   }
 };
 
-#endif // SHARE_VM_COMPILER_DISASSEMBLER_HPP
+#endif // SHARE_COMPILER_DISASSEMBLER_HPP
--- a/src/hotspot/share/compiler/methodLiveness.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/compiler/methodLiveness.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_COMPILER_METHODLIVENESS_HPP
-#define SHARE_VM_COMPILER_METHODLIVENESS_HPP
+#ifndef SHARE_COMPILER_METHODLIVENESS_HPP
+#define SHARE_COMPILER_METHODLIVENESS_HPP
 
 #include "utilities/bitMap.hpp"
 #include "utilities/growableArray.hpp"
@@ -274,4 +274,4 @@
   static void print_times() PRODUCT_RETURN;
 };
 
-#endif // SHARE_VM_COMPILER_METHODLIVENESS_HPP
+#endif // SHARE_COMPILER_METHODLIVENESS_HPP
--- a/src/hotspot/share/compiler/methodMatcher.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/compiler/methodMatcher.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_COMPILER_METHODMATCHER_HPP
-#define SHARE_VM_COMPILER_METHODMATCHER_HPP
+#ifndef SHARE_COMPILER_METHODMATCHER_HPP
+#define SHARE_COMPILER_METHODMATCHER_HPP
 
 #include "memory/allocation.hpp"
 #include "runtime/handles.hpp"
@@ -123,5 +123,4 @@
   InlineMatcher* clone();
 };
 
-#endif // SHARE_VM_COMPILER_METHODMATCHER_HPP
-
+#endif // SHARE_COMPILER_METHODMATCHER_HPP
--- a/src/hotspot/share/compiler/oopMap.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/compiler/oopMap.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_COMPILER_OOPMAP_HPP
-#define SHARE_VM_COMPILER_OOPMAP_HPP
+#ifndef SHARE_COMPILER_OOPMAP_HPP
+#define SHARE_COMPILER_OOPMAP_HPP
 
 #include "code/compressedStream.hpp"
 #include "code/vmreg.hpp"
@@ -467,4 +467,4 @@
 };
 #endif // COMPILER2_OR_JVMCI
 
-#endif // SHARE_VM_COMPILER_OOPMAP_HPP
+#endif // SHARE_COMPILER_OOPMAP_HPP
--- a/src/hotspot/share/gc/cms/adaptiveFreeList.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/cms/adaptiveFreeList.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_CMS_ADAPTIVEFREELIST_HPP
-#define SHARE_VM_GC_CMS_ADAPTIVEFREELIST_HPP
+#ifndef SHARE_GC_CMS_ADAPTIVEFREELIST_HPP
+#define SHARE_GC_CMS_ADAPTIVEFREELIST_HPP
 
 #include "gc/cms/allocationStats.hpp"
 #include "memory/freeList.hpp"
@@ -226,4 +226,4 @@
 #endif  // NOT PRODUCT
 };
 
-#endif // SHARE_VM_GC_CMS_ADAPTIVEFREELIST_HPP
+#endif // SHARE_GC_CMS_ADAPTIVEFREELIST_HPP
--- a/src/hotspot/share/gc/cms/allocationStats.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/cms/allocationStats.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_CMS_ALLOCATIONSTATS_HPP
-#define SHARE_VM_GC_CMS_ALLOCATIONSTATS_HPP
+#ifndef SHARE_GC_CMS_ALLOCATIONSTATS_HPP
+#define SHARE_GC_CMS_ALLOCATIONSTATS_HPP
 
 #include "gc/shared/gcUtil.hpp"
 #include "logging/log.hpp"
@@ -150,4 +150,4 @@
   )
 };
 
-#endif // SHARE_VM_GC_CMS_ALLOCATIONSTATS_HPP
+#endif // SHARE_GC_CMS_ALLOCATIONSTATS_HPP
--- a/src/hotspot/share/gc/cms/cmsCollectorPolicy.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/cms/cmsCollectorPolicy.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_CMS_CMSCOLLECTORPOLICY_HPP
-#define SHARE_VM_GC_CMS_CMSCOLLECTORPOLICY_HPP
+#ifndef SHARE_GC_CMS_CMSCOLLECTORPOLICY_HPP
+#define SHARE_GC_CMS_CMSCOLLECTORPOLICY_HPP
 
 #include "gc/shared/collectorPolicy.hpp"
 
@@ -35,4 +35,4 @@
   ConcurrentMarkSweepPolicy() {}
 };
 
-#endif // SHARE_VM_GC_CMS_CMSCOLLECTORPOLICY_HPP
+#endif // SHARE_GC_CMS_CMSCOLLECTORPOLICY_HPP
--- a/src/hotspot/share/gc/cms/cmsHeap.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/cms/cmsHeap.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_CMS_CMSHEAP_HPP
-#define SHARE_VM_GC_CMS_CMSHEAP_HPP
+#ifndef SHARE_GC_CMS_CMSHEAP_HPP
+#define SHARE_GC_CMS_CMSHEAP_HPP
 
 #include "gc/cms/concurrentMarkSweepGeneration.hpp"
 #include "gc/cms/parNewGeneration.hpp"
@@ -139,4 +139,4 @@
   void collect_mostly_concurrent(GCCause::Cause cause);
 };
 
-#endif // SHARE_VM_GC_CMS_CMSHEAP_HPP
+#endif // SHARE_GC_CMS_CMSHEAP_HPP
--- a/src/hotspot/share/gc/cms/cmsLockVerifier.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/cms/cmsLockVerifier.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_CMS_CMSLOCKVERIFIER_HPP
-#define SHARE_VM_GC_CMS_CMSLOCKVERIFIER_HPP
+#ifndef SHARE_GC_CMS_CMSLOCKVERIFIER_HPP
+#define SHARE_GC_CMS_CMSLOCKVERIFIER_HPP
 
 #include "runtime/mutex.hpp"
 
@@ -44,4 +44,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_CMS_CMSLOCKVERIFIER_HPP
+#endif // SHARE_GC_CMS_CMSLOCKVERIFIER_HPP
--- a/src/hotspot/share/gc/cms/cmsOopClosures.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/cms/cmsOopClosures.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_CMS_CMSOOPCLOSURES_HPP
-#define SHARE_VM_GC_CMS_CMSOOPCLOSURES_HPP
+#ifndef SHARE_GC_CMS_CMSOOPCLOSURES_HPP
+#define SHARE_GC_CMS_CMSOOPCLOSURES_HPP
 
 #include "gc/shared/genOopClosures.hpp"
 #include "gc/shared/taskqueue.hpp"
@@ -330,4 +330,4 @@
   virtual void do_oop(narrowOop* p);
 };
 
-#endif // SHARE_VM_GC_CMS_CMSOOPCLOSURES_HPP
+#endif // SHARE_GC_CMS_CMSOOPCLOSURES_HPP
--- a/src/hotspot/share/gc/cms/cmsOopClosures.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/cms/cmsOopClosures.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_CMS_CMSOOPCLOSURES_INLINE_HPP
-#define SHARE_VM_GC_CMS_CMSOOPCLOSURES_INLINE_HPP
+#ifndef SHARE_GC_CMS_CMSOOPCLOSURES_INLINE_HPP
+#define SHARE_GC_CMS_CMSOOPCLOSURES_INLINE_HPP
 
 #include "gc/cms/cmsOopClosures.hpp"
 #include "gc/cms/concurrentMarkSweepGeneration.hpp"
@@ -85,4 +85,4 @@
 DO_OOP_WORK_IMPL(CMSInnerParMarkAndPushClosure)
 DO_OOP_WORK_IMPL(CMSParKeepAliveClosure)
 
-#endif // SHARE_VM_GC_CMS_CMSOOPCLOSURES_INLINE_HPP
+#endif // SHARE_GC_CMS_CMSOOPCLOSURES_INLINE_HPP
--- a/src/hotspot/share/gc/cms/cmsVMOperations.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/cms/cmsVMOperations.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_CMS_CMSVMOPERATIONS_HPP
-#define SHARE_VM_GC_CMS_CMSVMOPERATIONS_HPP
+#ifndef SHARE_GC_CMS_CMSVMOPERATIONS_HPP
+#define SHARE_GC_CMS_CMSVMOPERATIONS_HPP
 
 #include "gc/cms/concurrentMarkSweepGeneration.hpp"
 #include "gc/shared/gcCause.hpp"
@@ -143,4 +143,4 @@
   virtual bool evaluate_at_safepoint() const;
 };
 
-#endif // SHARE_VM_GC_CMS_CMSVMOPERATIONS_HPP
+#endif // SHARE_GC_CMS_CMSVMOPERATIONS_HPP
--- a/src/hotspot/share/gc/cms/compactibleFreeListSpace.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/cms/compactibleFreeListSpace.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_CMS_COMPACTIBLEFREELISTSPACE_HPP
-#define SHARE_VM_GC_CMS_COMPACTIBLEFREELISTSPACE_HPP
+#ifndef SHARE_GC_CMS_COMPACTIBLEFREELISTSPACE_HPP
+#define SHARE_GC_CMS_COMPACTIBLEFREELISTSPACE_HPP
 
 #include "gc/cms/adaptiveFreeList.hpp"
 #include "gc/cms/promotionInfo.hpp"
@@ -741,4 +741,4 @@
   return CompactibleFreeListSpace::adjustObjectSize(sz);
 }
 
-#endif // SHARE_VM_GC_CMS_COMPACTIBLEFREELISTSPACE_HPP
+#endif // SHARE_GC_CMS_COMPACTIBLEFREELISTSPACE_HPP
--- a/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPGENERATION_HPP
-#define SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPGENERATION_HPP
+#ifndef SHARE_GC_CMS_CONCURRENTMARKSWEEPGENERATION_HPP
+#define SHARE_GC_CMS_CONCURRENTMARKSWEEPGENERATION_HPP
 
 #include "gc/cms/cmsOopClosures.hpp"
 #include "gc/cms/gSpaceCounters.hpp"
@@ -1793,4 +1793,4 @@
 };
 
 
-#endif // SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPGENERATION_HPP
+#endif // SHARE_GC_CMS_CONCURRENTMARKSWEEPGENERATION_HPP
--- a/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/cms/concurrentMarkSweepGeneration.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPGENERATION_INLINE_HPP
-#define SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPGENERATION_INLINE_HPP
+#ifndef SHARE_GC_CMS_CONCURRENTMARKSWEEPGENERATION_INLINE_HPP
+#define SHARE_GC_CMS_CONCURRENTMARKSWEEPGENERATION_INLINE_HPP
 
 #include "gc/cms/cmsHeap.hpp"
 #include "gc/cms/cmsLockVerifier.hpp"
@@ -469,4 +469,4 @@
   _t->par_mark_range(mr2);
 }
 
-#endif // SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPGENERATION_INLINE_HPP
+#endif // SHARE_GC_CMS_CONCURRENTMARKSWEEPGENERATION_INLINE_HPP
--- a/src/hotspot/share/gc/cms/concurrentMarkSweepThread.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/cms/concurrentMarkSweepThread.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPTHREAD_HPP
-#define SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPTHREAD_HPP
+#ifndef SHARE_GC_CMS_CONCURRENTMARKSWEEPTHREAD_HPP
+#define SHARE_GC_CMS_CONCURRENTMARKSWEEPTHREAD_HPP
 
 #include "gc/cms/concurrentMarkSweepGeneration.hpp"
 #include "gc/shared/concurrentGCThread.hpp"
@@ -166,4 +166,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_CMS_CONCURRENTMARKSWEEPTHREAD_HPP
+#endif // SHARE_GC_CMS_CONCURRENTMARKSWEEPTHREAD_HPP
--- a/src/hotspot/share/gc/cms/freeChunk.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/cms/freeChunk.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_CMS_FREECHUNK_HPP
-#define SHARE_VM_GC_CMS_FREECHUNK_HPP
+#ifndef SHARE_GC_CMS_FREECHUNK_HPP
+#define SHARE_GC_CMS_FREECHUNK_HPP
 
 #include "memory/memRegion.hpp"
 #include "oops/markOop.hpp"
@@ -147,4 +147,4 @@
 extern size_t MinChunkSize;
 
 
-#endif // SHARE_VM_GC_CMS_FREECHUNK_HPP
+#endif // SHARE_GC_CMS_FREECHUNK_HPP
--- a/src/hotspot/share/gc/cms/gSpaceCounters.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/cms/gSpaceCounters.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_CMS_GSPACECOUNTERS_HPP
-#define SHARE_VM_GC_CMS_GSPACECOUNTERS_HPP
+#ifndef SHARE_GC_CMS_GSPACECOUNTERS_HPP
+#define SHARE_GC_CMS_GSPACECOUNTERS_HPP
 
 #include "gc/shared/generation.hpp"
 #include "gc/shared/generationCounters.hpp"
@@ -107,4 +107,4 @@
     }
 };
 
-#endif // SHARE_VM_GC_CMS_GSPACECOUNTERS_HPP
+#endif // SHARE_GC_CMS_GSPACECOUNTERS_HPP
--- a/src/hotspot/share/gc/cms/jvmFlagConstraintsCMS.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/cms/jvmFlagConstraintsCMS.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_GC_CMS_COMMANDLINEFLAGCONSTRAINTSCMS_HPP
-#define SHARE_GC_CMS_COMMANDLINEFLAGCONSTRAINTSCMS_HPP
+#ifndef SHARE_GC_CMS_JVMFLAGCONSTRAINTSCMS_HPP
+#define SHARE_GC_CMS_JVMFLAGCONSTRAINTSCMS_HPP
 
 #include "runtime/globals.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -45,4 +45,4 @@
 JVMFlag::Error ParallelGCThreadsConstraintFuncCMS(uint value, bool verbose);
 JVMFlag::Error OldPLABSizeConstraintFuncCMS(size_t value, bool verbose);
 
-#endif // SHARE_GC_CMS_COMMANDLINEFLAGCONSTRAINTSCMS_HPP
+#endif // SHARE_GC_CMS_JVMFLAGCONSTRAINTSCMS_HPP
--- a/src/hotspot/share/gc/cms/parNewGeneration.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/cms/parNewGeneration.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_CMS_PARNEWGENERATION_HPP
-#define SHARE_VM_GC_CMS_PARNEWGENERATION_HPP
+#ifndef SHARE_GC_CMS_PARNEWGENERATION_HPP
+#define SHARE_GC_CMS_PARNEWGENERATION_HPP
 
 #include "gc/cms/parOopClosures.hpp"
 #include "gc/serial/defNewGeneration.hpp"
@@ -415,4 +415,4 @@
   static oop real_forwardee(oop obj);
 };
 
-#endif // SHARE_VM_GC_CMS_PARNEWGENERATION_HPP
+#endif // SHARE_GC_CMS_PARNEWGENERATION_HPP
--- a/src/hotspot/share/gc/cms/parNewGeneration.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/cms/parNewGeneration.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_CMS_PARNEWGENERATION_INLINE_HPP
-#define SHARE_VM_GC_CMS_PARNEWGENERATION_INLINE_HPP
+#ifndef SHARE_GC_CMS_PARNEWGENERATION_INLINE_HPP
+#define SHARE_GC_CMS_PARNEWGENERATION_INLINE_HPP
 
 #include "gc/cms/parNewGeneration.hpp"
 #include "gc/shared/plab.inline.hpp"
@@ -34,4 +34,4 @@
   if (obj != NULL) return obj;
   else return alloc_in_to_space_slow(word_sz);
 }
-#endif // SHARE_VM_GC_CMS_PARNEWGENERATION_INLINE_HPP
+#endif // SHARE_GC_CMS_PARNEWGENERATION_INLINE_HPP
--- a/src/hotspot/share/gc/cms/parOopClosures.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/cms/parOopClosures.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_CMS_PAROOPCLOSURES_HPP
-#define SHARE_VM_GC_CMS_PAROOPCLOSURES_HPP
+#ifndef SHARE_GC_CMS_PAROOPCLOSURES_HPP
+#define SHARE_GC_CMS_PAROOPCLOSURES_HPP
 
 #include "gc/shared/genOopClosures.hpp"
 #include "gc/shared/taskqueue.hpp"
@@ -143,4 +143,4 @@
   virtual void do_void();
 };
 
-#endif // SHARE_VM_GC_CMS_PAROOPCLOSURES_HPP
+#endif // SHARE_GC_CMS_PAROOPCLOSURES_HPP
--- a/src/hotspot/share/gc/cms/parOopClosures.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/cms/parOopClosures.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_CMS_PAROOPCLOSURES_INLINE_HPP
-#define SHARE_VM_GC_CMS_PAROOPCLOSURES_INLINE_HPP
+#ifndef SHARE_GC_CMS_PAROOPCLOSURES_INLINE_HPP
+#define SHARE_GC_CMS_PAROOPCLOSURES_INLINE_HPP
 
 #include "gc/cms/cmsHeap.hpp"
 #include "gc/cms/parNewGeneration.hpp"
@@ -143,4 +143,4 @@
 inline void ParScanWithoutBarrierClosure::do_oop(oop* p)       { ParScanClosure::do_oop_work(p, false, false); }
 inline void ParScanWithoutBarrierClosure::do_oop(narrowOop* p) { ParScanClosure::do_oop_work(p, false, false); }
 
-#endif // SHARE_VM_GC_CMS_PAROOPCLOSURES_INLINE_HPP
+#endif // SHARE_GC_CMS_PAROOPCLOSURES_INLINE_HPP
--- a/src/hotspot/share/gc/cms/promotionInfo.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/cms/promotionInfo.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_CMS_PROMOTIONINFO_HPP
-#define SHARE_VM_GC_CMS_PROMOTIONINFO_HPP
+#ifndef SHARE_GC_CMS_PROMOTIONINFO_HPP
+#define SHARE_GC_CMS_PROMOTIONINFO_HPP
 
 #include "gc/cms/freeChunk.hpp"
 
@@ -185,4 +185,4 @@
 };
 
 
-#endif // SHARE_VM_GC_CMS_PROMOTIONINFO_HPP
+#endif // SHARE_GC_CMS_PROMOTIONINFO_HPP
--- a/src/hotspot/share/gc/cms/promotionInfo.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/cms/promotionInfo.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -74,4 +74,4 @@
   assert(_firstIndex == _nextIndex, "empty buffer");
 }
 
-#endif //  SHARE_GC_CMS_PROMOTIONINFO_INLINE_HPP
+#endif // SHARE_GC_CMS_PROMOTIONINFO_INLINE_HPP
--- a/src/hotspot/share/gc/cms/vmStructs_cms.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/cms/vmStructs_cms.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_CMS_VMSTRUCTS_CMS_HPP
-#define SHARE_VM_GC_CMS_VMSTRUCTS_CMS_HPP
+#ifndef SHARE_GC_CMS_VMSTRUCTS_CMS_HPP
+#define SHARE_GC_CMS_VMSTRUCTS_CMS_HPP
 
 #include "gc/cms/cmsHeap.hpp"
 #include "gc/cms/compactibleFreeListSpace.hpp"
@@ -88,4 +88,4 @@
   declare_constant(Generation::ConcurrentMarkSweep)                       \
   declare_constant(Generation::ParNew)
 
-#endif // SHARE_VM_GC_CMS_VMSTRUCTS_CMS_HPP
+#endif // SHARE_GC_CMS_VMSTRUCTS_CMS_HPP
--- a/src/hotspot/share/gc/cms/yieldingWorkgroup.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/cms/yieldingWorkgroup.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_CMS_YIELDINGWORKGROUP_HPP
-#define SHARE_VM_GC_CMS_YIELDINGWORKGROUP_HPP
+#ifndef SHARE_GC_CMS_YIELDINGWORKGROUP_HPP
+#define SHARE_GC_CMS_YIELDINGWORKGROUP_HPP
 
 #include "gc/shared/workgroup.hpp"
 #include "utilities/macros.hpp"
@@ -269,4 +269,4 @@
   void internal_note_finish();
 };
 
-#endif // SHARE_VM_GC_CMS_YIELDINGWORKGROUP_HPP
+#endif // SHARE_GC_CMS_YIELDINGWORKGROUP_HPP
--- a/src/hotspot/share/gc/epsilon/epsilonBarrierSet.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/epsilon/epsilonBarrierSet.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_EPSILON_BARRIERSET_HPP
-#define SHARE_VM_GC_EPSILON_BARRIERSET_HPP
+#ifndef SHARE_GC_EPSILON_EPSILONBARRIERSET_HPP
+#define SHARE_GC_EPSILON_EPSILONBARRIERSET_HPP
 
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "gc/shared/barrierSet.hpp"
@@ -54,4 +54,4 @@
   typedef ::EpsilonBarrierSet type;
 };
 
-#endif // SHARE_VM_GC_EPSILON_BARRIERSET_HPP
+#endif // SHARE_GC_EPSILON_EPSILONBARRIERSET_HPP
--- a/src/hotspot/share/gc/epsilon/epsilonCollectorPolicy.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/epsilon/epsilonCollectorPolicy.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_EPSILON_COLLECTORPOLICY_HPP
-#define SHARE_VM_GC_EPSILON_COLLECTORPOLICY_HPP
+#ifndef SHARE_GC_EPSILON_EPSILONCOLLECTORPOLICY_HPP
+#define SHARE_GC_EPSILON_EPSILONCOLLECTORPOLICY_HPP
 
 #include "gc/shared/collectorPolicy.hpp"
 
@@ -39,4 +39,4 @@
   EpsilonCollectorPolicy() : CollectorPolicy() {};
 };
 
-#endif // SHARE_VM_GC_EPSILON_COLLECTORPOLICY_HPP
+#endif // SHARE_GC_EPSILON_EPSILONCOLLECTORPOLICY_HPP
--- a/src/hotspot/share/gc/epsilon/epsilonHeap.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/epsilon/epsilonHeap.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_EPSILON_COLLECTEDHEAP_HPP
-#define SHARE_VM_GC_EPSILON_COLLECTEDHEAP_HPP
+#ifndef SHARE_GC_EPSILON_EPSILONHEAP_HPP
+#define SHARE_GC_EPSILON_EPSILONHEAP_HPP
 
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/softRefPolicy.hpp"
@@ -149,4 +149,4 @@
 
 };
 
-#endif // SHARE_VM_GC_EPSILON_COLLECTEDHEAP_HPP
+#endif // SHARE_GC_EPSILON_EPSILONHEAP_HPP
--- a/src/hotspot/share/gc/epsilon/epsilonMemoryPool.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/epsilon/epsilonMemoryPool.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_EPSILON_EPSILONMEMORYPOOL_HPP
-#define SHARE_VM_GC_EPSILON_EPSILONMEMORYPOOL_HPP
+#ifndef SHARE_GC_EPSILON_EPSILONMEMORYPOOL_HPP
+#define SHARE_GC_EPSILON_EPSILONMEMORYPOOL_HPP
 
 #include "gc/epsilon/epsilonHeap.hpp"
 #include "services/memoryPool.hpp"
@@ -41,4 +41,4 @@
   MemoryUsage get_memory_usage();
 };
 
-#endif // SHARE_VM_GC_EPSILON_EPSILONMEMORYPOOL_HPP
+#endif // SHARE_GC_EPSILON_EPSILONMEMORYPOOL_HPP
--- a/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_EPSILON_EPSILONMONITORINGSUPPORT_HPP
-#define SHARE_VM_GC_EPSILON_EPSILONMONITORINGSUPPORT_HPP
+#ifndef SHARE_GC_EPSILON_EPSILONMONITORINGSUPPORT_HPP
+#define SHARE_GC_EPSILON_EPSILONMONITORINGSUPPORT_HPP
 
 #include "memory/allocation.hpp"
 
@@ -40,5 +40,4 @@
   void update_counters();
 };
 
-#endif // SHARE_VM_GC_EPSILON_EPSILONMONITORINGSUPPORT_HPP
-
+#endif // SHARE_GC_EPSILON_EPSILONMONITORINGSUPPORT_HPP
--- a/src/hotspot/share/gc/epsilon/epsilonThreadLocalData.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/epsilon/epsilonThreadLocalData.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_EPSILON_EPSILONTHREADLOCALDATA_HPP
-#define SHARE_VM_GC_EPSILON_EPSILONTHREADLOCALDATA_HPP
+#ifndef SHARE_GC_EPSILON_EPSILONTHREADLOCALDATA_HPP
+#define SHARE_GC_EPSILON_EPSILONTHREADLOCALDATA_HPP
 
 #include "runtime/thread.hpp"
 #include "utilities/debug.hpp"
@@ -67,4 +67,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_EPSILON_EPSILONTHREADLOCALDATA_HPP
+#endif // SHARE_GC_EPSILON_EPSILONTHREADLOCALDATA_HPP
--- a/src/hotspot/share/gc/epsilon/epsilon_globals.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/epsilon/epsilon_globals.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_EPSILON_GLOBALS_HPP
-#define SHARE_VM_GC_EPSILON_GLOBALS_HPP
+#ifndef SHARE_GC_EPSILON_EPSILON_GLOBALS_HPP
+#define SHARE_GC_EPSILON_EPSILON_GLOBALS_HPP
 
 #include "runtime/globals.hpp"
 //
@@ -93,4 +93,4 @@
           "at the potential expense of memory waste.")                      \
           range(1, max_intx)
 
-#endif // SHARE_VM_GC_EPSILON_GLOBALS_HPP
+#endif // SHARE_GC_EPSILON_EPSILON_GLOBALS_HPP
--- a/src/hotspot/share/gc/epsilon/vmStructs_epsilon.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/epsilon/vmStructs_epsilon.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_GC_EPSILON_VMSTRUCTS_HPP
-#define SHARE_GC_EPSILON_VMSTRUCTS_HPP
+#ifndef SHARE_GC_EPSILON_VMSTRUCTS_EPSILON_HPP
+#define SHARE_GC_EPSILON_VMSTRUCTS_EPSILON_HPP
 
 #include "gc/epsilon/epsilonHeap.hpp"
 #include "gc/shared/space.hpp"
@@ -43,4 +43,4 @@
 #define VM_INT_CONSTANTS_EPSILONGC(declare_constant,                \
                                   declare_constant_with_value)
 
-#endif // SHARE_GC_EPSILON_VMSTRUCTS_HPP
+#endif // SHARE_GC_EPSILON_VMSTRUCTS_EPSILON_HPP
--- a/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/c2/g1BarrierSetC2.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_GC_SHARED_C2_G1BARRIERSETC2_HPP
-#define SHARE_GC_SHARED_C2_G1BARRIERSETC2_HPP
+#ifndef SHARE_GC_G1_C2_G1BARRIERSETC2_HPP
+#define SHARE_GC_G1_C2_G1BARRIERSETC2_HPP
 
 #include "gc/shared/c2/cardTableBarrierSetC2.hpp"
 
@@ -96,4 +96,4 @@
   virtual bool escape_add_to_con_graph(ConnectionGraph* conn_graph, PhaseGVN* gvn, Unique_Node_List* delayed_worklist, Node* n, uint opcode) const;
 };
 
-#endif // SHARE_GC_SHARED_C2_G1BARRIERSETC2_HPP
+#endif // SHARE_GC_G1_C2_G1BARRIERSETC2_HPP
--- a/src/hotspot/share/gc/g1/collectionSetChooser.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/collectionSetChooser.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_COLLECTIONSETCHOOSER_HPP
-#define SHARE_VM_GC_G1_COLLECTIONSETCHOOSER_HPP
+#ifndef SHARE_GC_G1_COLLECTIONSETCHOOSER_HPP
+#define SHARE_GC_G1_COLLECTIONSETCHOOSER_HPP
 
 #include "gc/g1/heapRegion.hpp"
 #include "utilities/growableArray.hpp"
@@ -199,5 +199,4 @@
   bool should_add(HeapRegion* hr) { return _chooser->should_add(hr); }
 };
 
-#endif // SHARE_VM_GC_G1_COLLECTIONSETCHOOSER_HPP
-
+#endif // SHARE_GC_G1_COLLECTIONSETCHOOSER_HPP
--- a/src/hotspot/share/gc/g1/dirtyCardQueue.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/dirtyCardQueue.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_DIRTYCARDQUEUE_HPP
-#define SHARE_VM_GC_G1_DIRTYCARDQUEUE_HPP
+#ifndef SHARE_GC_G1_DIRTYCARDQUEUE_HPP
+#define SHARE_GC_G1_DIRTYCARDQUEUE_HPP
 
 #include "gc/shared/ptrQueue.hpp"
 #include "memory/allocation.hpp"
@@ -164,4 +164,4 @@
 
 };
 
-#endif // SHARE_VM_GC_G1_DIRTYCARDQUEUE_HPP
+#endif // SHARE_GC_G1_DIRTYCARDQUEUE_HPP
--- a/src/hotspot/share/gc/g1/evacuationInfo.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/evacuationInfo.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_EVACUATIONINFO_HPP
-#define SHARE_VM_GC_G1_EVACUATIONINFO_HPP
+#ifndef SHARE_GC_G1_EVACUATIONINFO_HPP
+#define SHARE_GC_G1_EVACUATIONINFO_HPP
 
 #include "memory/allocation.hpp"
 
@@ -78,4 +78,4 @@
   uint   regions_freed()             { return _regions_freed; }
 };
 
-#endif // SHARE_VM_GC_G1_EVACUATIONINFO_HPP
+#endif // SHARE_GC_G1_EVACUATIONINFO_HPP
--- a/src/hotspot/share/gc/g1/g1AllocRegion.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1AllocRegion.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1ALLOCREGION_HPP
-#define SHARE_VM_GC_G1_G1ALLOCREGION_HPP
+#ifndef SHARE_GC_G1_G1ALLOCREGION_HPP
+#define SHARE_GC_G1_G1ALLOCREGION_HPP
 
 #include "gc/g1/heapRegion.hpp"
 #include "gc/g1/g1EvacStats.hpp"
@@ -281,4 +281,4 @@
   virtual HeapRegion* release();
 };
 
-#endif // SHARE_VM_GC_G1_G1ALLOCREGION_HPP
+#endif // SHARE_GC_G1_G1ALLOCREGION_HPP
--- a/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1AllocRegion.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1ALLOCREGION_INLINE_HPP
-#define SHARE_VM_GC_G1_G1ALLOCREGION_INLINE_HPP
+#ifndef SHARE_GC_G1_G1ALLOCREGION_INLINE_HPP
+#define SHARE_GC_G1_G1ALLOCREGION_INLINE_HPP
 
 #include "gc/g1/g1AllocRegion.hpp"
 #include "gc/g1/heapRegion.inline.hpp"
@@ -143,4 +143,4 @@
   return NULL;
 }
 
-#endif // SHARE_VM_GC_G1_G1ALLOCREGION_INLINE_HPP
+#endif // SHARE_GC_G1_G1ALLOCREGION_INLINE_HPP
--- a/src/hotspot/share/gc/g1/g1Allocator.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1Allocator.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1ALLOCATOR_HPP
-#define SHARE_VM_GC_G1_G1ALLOCATOR_HPP
+#ifndef SHARE_GC_G1_G1ALLOCATOR_HPP
+#define SHARE_GC_G1_G1ALLOCATOR_HPP
 
 #include "gc/g1/g1AllocRegion.hpp"
 #include "gc/g1/g1InCSetState.hpp"
@@ -288,4 +288,4 @@
   static inline bool archive_check_enabled();
 };
 
-#endif // SHARE_VM_GC_G1_G1ALLOCATOR_HPP
+#endif // SHARE_GC_G1_G1ALLOCATOR_HPP
--- a/src/hotspot/share/gc/g1/g1Allocator.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1Allocator.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1ALLOCATOR_INLINE_HPP
-#define SHARE_VM_GC_G1_G1ALLOCATOR_INLINE_HPP
+#ifndef SHARE_GC_G1_G1ALLOCATOR_INLINE_HPP
+#define SHARE_GC_G1_G1ALLOCATOR_INLINE_HPP
 
 #include "gc/g1/g1Allocator.hpp"
 #include "gc/g1/g1AllocRegion.inline.hpp"
@@ -164,4 +164,4 @@
                                       in_open_archive_range(object)));
 }
 
-#endif // SHARE_VM_GC_G1_G1ALLOCATOR_HPP
+#endif // SHARE_GC_G1_G1ALLOCATOR_INLINE_HPP
--- a/src/hotspot/share/gc/g1/g1Analytics.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1Analytics.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1MEASUREMENTS_HPP
-#define SHARE_VM_GC_G1_G1MEASUREMENTS_HPP
+#ifndef SHARE_GC_G1_G1ANALYTICS_HPP
+#define SHARE_GC_G1_G1ANALYTICS_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -158,4 +158,4 @@
   double last_known_gc_end_time_sec() const;
 };
 
-#endif // SHARE_VM_GC_G1_G1MEASUREMENTS_HPP
+#endif // SHARE_GC_G1_G1ANALYTICS_HPP
--- a/src/hotspot/share/gc/g1/g1BarrierSet.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1BARRIERSET_HPP
-#define SHARE_VM_GC_G1_G1BARRIERSET_HPP
+#ifndef SHARE_GC_G1_G1BARRIERSET_HPP
+#define SHARE_GC_G1_G1BARRIERSET_HPP
 
 #include "gc/g1/dirtyCardQueue.hpp"
 #include "gc/g1/g1SATBMarkQueueSet.hpp"
@@ -126,4 +126,4 @@
   typedef ::G1BarrierSet type;
 };
 
-#endif // SHARE_VM_GC_G1_G1BARRIERSET_HPP
+#endif // SHARE_GC_G1_G1BARRIERSET_HPP
--- a/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1BarrierSet.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1BARRIERSET_INLINE_HPP
-#define SHARE_VM_GC_G1_G1BARRIERSET_INLINE_HPP
+#ifndef SHARE_GC_G1_G1BARRIERSET_INLINE_HPP
+#define SHARE_GC_G1_G1BARRIERSET_INLINE_HPP
 
 #include "gc/g1/g1BarrierSet.hpp"
 #include "gc/g1/g1CardTable.hpp"
@@ -105,4 +105,4 @@
   Raw::oop_store(addr, new_value);
 }
 
-#endif // SHARE_VM_GC_G1_G1BARRIERSET_INLINE_HPP
+#endif // SHARE_GC_G1_G1BARRIERSET_INLINE_HPP
--- a/src/hotspot/share/gc/g1/g1BiasedArray.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1BiasedArray.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1BIASEDARRAY_HPP
-#define SHARE_VM_GC_G1_G1BIASEDARRAY_HPP
+#ifndef SHARE_GC_G1_G1BIASEDARRAY_HPP
+#define SHARE_GC_G1_G1BIASEDARRAY_HPP
 
 #include "memory/memRegion.hpp"
 #include "utilities/debug.hpp"
@@ -194,4 +194,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_G1_G1BIASEDARRAY_HPP
+#endif // SHARE_GC_G1_G1BIASEDARRAY_HPP
--- a/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1BlockOffsetTable.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1BLOCKOFFSETTABLE_HPP
-#define SHARE_VM_GC_G1_G1BLOCKOFFSETTABLE_HPP
+#ifndef SHARE_GC_G1_G1BLOCKOFFSETTABLE_HPP
+#define SHARE_GC_G1_G1BLOCKOFFSETTABLE_HPP
 
 #include "gc/g1/g1RegionToSpaceMapper.hpp"
 #include "gc/shared/blockOffsetTable.hpp"
@@ -232,4 +232,4 @@
   void print_on(outputStream* out) PRODUCT_RETURN;
 };
 
-#endif // SHARE_VM_GC_G1_G1BLOCKOFFSETTABLE_HPP
+#endif // SHARE_GC_G1_G1BLOCKOFFSETTABLE_HPP
--- a/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1BlockOffsetTable.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1BLOCKOFFSETTABLE_INLINE_HPP
-#define SHARE_VM_GC_G1_G1BLOCKOFFSETTABLE_INLINE_HPP
+#ifndef SHARE_GC_G1_G1BLOCKOFFSETTABLE_INLINE_HPP
+#define SHARE_GC_G1_G1BLOCKOFFSETTABLE_INLINE_HPP
 
 #include "gc/g1/g1BlockOffsetTable.hpp"
 #include "gc/g1/heapRegion.hpp"
@@ -165,4 +165,4 @@
   return q;
 }
 
-#endif // SHARE_VM_GC_G1_G1BLOCKOFFSETTABLE_INLINE_HPP
+#endif // SHARE_GC_G1_G1BLOCKOFFSETTABLE_INLINE_HPP
--- a/src/hotspot/share/gc/g1/g1CardCounts.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1CardCounts.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1CARDCOUNTS_HPP
-#define SHARE_VM_GC_G1_G1CARDCOUNTS_HPP
+#ifndef SHARE_GC_G1_G1CARDCOUNTS_HPP
+#define SHARE_GC_G1_G1CARDCOUNTS_HPP
 
 #include "gc/g1/g1CardTable.hpp"
 #include "gc/g1/g1RegionToSpaceMapper.hpp"
@@ -128,4 +128,4 @@
   void clear_all();
 };
 
-#endif // SHARE_VM_GC_G1_G1CARDCOUNTS_HPP
+#endif // SHARE_GC_G1_G1CARDCOUNTS_HPP
--- a/src/hotspot/share/gc/g1/g1CardTable.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1CardTable.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1CARDTABLE_HPP
-#define SHARE_VM_GC_G1_G1CARDTABLE_HPP
+#ifndef SHARE_GC_G1_G1CARDTABLE_HPP
+#define SHARE_GC_G1_G1CARDTABLE_HPP
 
 #include "gc/g1/g1RegionToSpaceMapper.hpp"
 #include "gc/shared/cardTable.hpp"
@@ -110,4 +110,4 @@
   virtual bool is_in_young(oop obj) const;
 };
 
-#endif // SHARE_VM_GC_G1_G1CARDTABLE_HPP
+#endif // SHARE_GC_G1_G1CARDTABLE_HPP
--- a/src/hotspot/share/gc/g1/g1CardTable.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1CardTable.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1CARDTABLE_INLINE_HPP
-#define SHARE_VM_GC_G1_G1CARDTABLE_INLINE_HPP
+#ifndef SHARE_GC_G1_G1CARDTABLE_INLINE_HPP
+#define SHARE_GC_G1_G1CARDTABLE_INLINE_HPP
 
 #include "gc/g1/g1CardTable.hpp"
 
@@ -37,4 +37,4 @@
   _byte_map[card_index] = val;
 }
 
-#endif // SHARE_VM_GC_G1_G1CARDTABLE_INLINE_HPP
+#endif // SHARE_GC_G1_G1CARDTABLE_INLINE_HPP
--- a/src/hotspot/share/gc/g1/g1CodeBlobClosure.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1CodeBlobClosure.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1CODEBLOBCLOSURE_HPP
-#define SHARE_VM_GC_G1_G1CODEBLOBCLOSURE_HPP
+#ifndef SHARE_GC_G1_G1CODEBLOBCLOSURE_HPP
+#define SHARE_GC_G1_G1CODEBLOBCLOSURE_HPP
 
 #include "gc/g1/g1CollectedHeap.hpp"
 #include "memory/iterator.hpp"
@@ -57,5 +57,4 @@
   void do_code_blob(CodeBlob* cb);
 };
 
-#endif // SHARE_VM_GC_G1_G1CODEBLOBCLOSURE_HPP
-
+#endif // SHARE_GC_G1_G1CODEBLOBCLOSURE_HPP
--- a/src/hotspot/share/gc/g1/g1CodeCacheRemSet.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1CodeCacheRemSet.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1CODECACHEREMSET_HPP
-#define SHARE_VM_GC_G1_G1CODECACHEREMSET_HPP
+#ifndef SHARE_GC_G1_G1CODECACHEREMSET_HPP
+#define SHARE_GC_G1_G1CODECACHEREMSET_HPP
 
 class CodeBlobClosure;
 class G1CodeRootSetTable;
@@ -84,4 +84,4 @@
 
 };
 
-#endif // SHARE_VM_GC_G1_G1CODECACHEREMSET_HPP
+#endif // SHARE_GC_G1_G1CODECACHEREMSET_HPP
--- a/src/hotspot/share/gc/g1/g1CodeRootSetTable.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1CodeRootSetTable.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  */
 
-#ifndef SHARE_VM_GC_G1_G1CODEROOTSETTABLE_HPP
-#define SHARE_VM_GC_G1_G1CODEROOTSETTABLE_HPP
+#ifndef SHARE_GC_G1_G1CODEROOTSETTABLE_HPP
+#define SHARE_GC_G1_G1CODEROOTSETTABLE_HPP
 
 #include "utilities/hashtable.hpp"
 
@@ -73,4 +73,4 @@
   size_t mem_size();
 };
 
-#endif /* SHARE_VM_GC_G1_G1CODEROOTSETTABLE_HPP */
+#endif // SHARE_GC_G1_G1CODEROOTSETTABLE_HPP
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1COLLECTEDHEAP_HPP
-#define SHARE_VM_GC_G1_G1COLLECTEDHEAP_HPP
+#ifndef SHARE_GC_G1_G1COLLECTEDHEAP_HPP
+#define SHARE_GC_G1_G1COLLECTEDHEAP_HPP
 
 #include "gc/g1/evacuationInfo.hpp"
 #include "gc/g1/g1BarrierSet.hpp"
@@ -1452,4 +1452,4 @@
   inline bool offer_termination();
 };
 
-#endif // SHARE_VM_GC_G1_G1COLLECTEDHEAP_HPP
+#endif // SHARE_GC_G1_G1COLLECTEDHEAP_HPP
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1COLLECTEDHEAP_INLINE_HPP
-#define SHARE_VM_GC_G1_G1COLLECTEDHEAP_INLINE_HPP
+#ifndef SHARE_GC_G1_G1COLLECTEDHEAP_INLINE_HPP
+#define SHARE_GC_G1_G1COLLECTEDHEAP_INLINE_HPP
 
 #include "gc/g1/g1BarrierSet.hpp"
 #include "gc/g1/g1CollectedHeap.hpp"
@@ -293,4 +293,4 @@
   }
 }
 
-#endif // SHARE_VM_GC_G1_G1COLLECTEDHEAP_INLINE_HPP
+#endif // SHARE_GC_G1_G1COLLECTEDHEAP_INLINE_HPP
--- a/src/hotspot/share/gc/g1/g1CollectionSet.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1CollectionSet.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1COLLECTIONSET_HPP
-#define SHARE_VM_GC_G1_G1COLLECTIONSET_HPP
+#ifndef SHARE_GC_G1_G1COLLECTIONSET_HPP
+#define SHARE_GC_G1_G1COLLECTIONSET_HPP
 
 #include "gc/g1/collectionSetChooser.hpp"
 #include "utilities/debug.hpp"
@@ -275,5 +275,4 @@
   bool evacuation_failed();
 };
 
-#endif // SHARE_VM_GC_G1_G1COLLECTIONSET_HPP
-
+#endif // SHARE_GC_G1_G1COLLECTIONSET_HPP
--- a/src/hotspot/share/gc/g1/g1CollectorPolicy.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1CollectorPolicy.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1COLLECTORPOLICY_HPP
-#define SHARE_VM_GC_G1_G1COLLECTORPOLICY_HPP
+#ifndef SHARE_GC_G1_G1COLLECTORPOLICY_HPP
+#define SHARE_GC_G1_G1COLLECTORPOLICY_HPP
 
 #include "gc/shared/collectorPolicy.hpp"
 
@@ -41,4 +41,4 @@
   virtual size_t heap_reserved_size_bytes() const;
   virtual bool is_hetero_heap() const;
 };
-#endif // SHARE_VM_GC_G1_G1COLLECTORPOLICY_HPP
+#endif // SHARE_GC_G1_G1COLLECTORPOLICY_HPP
--- a/src/hotspot/share/gc/g1/g1CollectorState.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1CollectorState.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1COLLECTORSTATE_HPP
-#define SHARE_VM_GC_G1_G1COLLECTORSTATE_HPP
+#ifndef SHARE_GC_G1_G1COLLECTORSTATE_HPP
+#define SHARE_GC_G1_G1COLLECTORSTATE_HPP
 
 #include "gc/g1/g1YCTypes.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -123,4 +123,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_G1_G1COLLECTORSTATE_HPP
+#endif // SHARE_GC_G1_G1COLLECTORSTATE_HPP
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1CONCURRENTMARK_HPP
-#define SHARE_VM_GC_G1_G1CONCURRENTMARK_HPP
+#ifndef SHARE_GC_G1_G1CONCURRENTMARK_HPP
+#define SHARE_GC_G1_G1CONCURRENTMARK_HPP
 
 #include "gc/g1/g1ConcurrentMarkBitMap.hpp"
 #include "gc/g1/g1ConcurrentMarkObjArrayProcessor.hpp"
@@ -869,4 +869,4 @@
   ~G1PrintRegionLivenessInfoClosure();
 };
 
-#endif // SHARE_VM_GC_G1_G1CONCURRENTMARK_HPP
+#endif // SHARE_GC_G1_G1CONCURRENTMARK_HPP
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1CONCURRENTMARK_INLINE_HPP
-#define SHARE_VM_GC_G1_G1CONCURRENTMARK_INLINE_HPP
+#ifndef SHARE_GC_G1_G1CONCURRENTMARK_INLINE_HPP
+#define SHARE_GC_G1_G1CONCURRENTMARK_INLINE_HPP
 
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1ConcurrentMark.hpp"
@@ -287,4 +287,4 @@
   }
 }
 
-#endif // SHARE_VM_GC_G1_G1CONCURRENTMARK_INLINE_HPP
+#endif // SHARE_GC_G1_G1CONCURRENTMARK_INLINE_HPP
--- a/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1CONCURRENTMARKBITMAP_HPP
-#define SHARE_VM_GC_G1_G1CONCURRENTMARKBITMAP_HPP
+#ifndef SHARE_GC_G1_G1CONCURRENTMARKBITMAP_HPP
+#define SHARE_GC_G1_G1CONCURRENTMARKBITMAP_HPP
 
 #include "gc/g1/g1RegionToSpaceMapper.hpp"
 #include "gc/shared/markBitMap.hpp"
@@ -81,4 +81,4 @@
   void clear_region(HeapRegion* hr);
 };
 
-#endif // SHARE_VM_GC_G1_G1CONCURRENTMARKBITMAP_HPP
+#endif // SHARE_GC_G1_G1CONCURRENTMARKBITMAP_HPP
--- a/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkBitMap.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1CONCURRENTMARKBITMAP_INLINE_HPP
-#define SHARE_VM_GC_G1_G1CONCURRENTMARKBITMAP_INLINE_HPP
+#ifndef SHARE_GC_G1_G1CONCURRENTMARKBITMAP_INLINE_HPP
+#define SHARE_GC_G1_G1CONCURRENTMARKBITMAP_INLINE_HPP
 
 #include "gc/g1/g1ConcurrentMarkBitMap.hpp"
 #include "gc/shared/markBitMap.inline.hpp"
@@ -51,4 +51,4 @@
   return true;
 }
 
-#endif // SHARE_VM_GC_G1_G1CONCURRENTMARKBITMAP_INLINE_HPP
+#endif // SHARE_GC_G1_G1CONCURRENTMARKBITMAP_INLINE_HPP
--- a/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_HPP
-#define SHARE_VM_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_HPP
+#ifndef SHARE_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_HPP
+#define SHARE_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_HPP
 
 #include "oops/oopsHierarchy.hpp"
 
@@ -56,4 +56,4 @@
   size_t process_obj(oop obj);
 };
 
-#endif /* SHARE_VM_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_HPP */
+#endif // SHARE_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_HPP
--- a/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkObjArrayProcessor.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_INLINE_HPP
-#define SHARE_VM_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_INLINE_HPP
+#ifndef SHARE_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_INLINE_HPP
+#define SHARE_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_INLINE_HPP
 
 #include "oops/oop.inline.hpp"
 #include "oops/oopsHierarchy.hpp"
@@ -33,4 +33,4 @@
   return obj->is_objArray() && ((size_t)((objArrayOop)obj)->size()) >= 2 * ObjArrayMarkingStride;
 }
 
-#endif /* SHARE_VM_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_INLINE_HPP */
+#endif // SHARE_GC_G1_G1CONCURRENTMARKOBJARRAYPROCESSOR_INLINE_HPP
--- a/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1CONCURRENTMARKTHREAD_HPP
-#define SHARE_VM_GC_G1_G1CONCURRENTMARKTHREAD_HPP
+#ifndef SHARE_GC_G1_G1CONCURRENTMARKTHREAD_HPP
+#define SHARE_GC_G1_G1CONCURRENTMARKTHREAD_HPP
 
 #include "gc/shared/concurrentGCPhaseManager.hpp"
 #include "gc/shared/concurrentGCThread.hpp"
@@ -98,4 +98,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_G1_G1CONCURRENTMARKTHREAD_HPP
+#endif // SHARE_GC_G1_G1CONCURRENTMARKTHREAD_HPP
--- a/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMarkThread.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1CONCURRENTMARKTHREAD_INLINE_HPP
-#define SHARE_VM_GC_G1_G1CONCURRENTMARKTHREAD_INLINE_HPP
+#ifndef SHARE_GC_G1_G1CONCURRENTMARKTHREAD_INLINE_HPP
+#define SHARE_GC_G1_G1CONCURRENTMARKTHREAD_INLINE_HPP
 
 #include "gc/g1/g1ConcurrentMark.hpp"
 #include "gc/g1/g1ConcurrentMarkThread.hpp"
@@ -38,4 +38,4 @@
   return _vtime_mark_accum + _cm->all_task_accum_vtime();
 }
 
-#endif // SHARE_VM_GC_G1_G1CONCURRENTMARKTHREAD_INLINE_HPP
+#endif // SHARE_GC_G1_G1CONCURRENTMARKTHREAD_INLINE_HPP
--- a/src/hotspot/share/gc/g1/g1ConcurrentRefine.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1ConcurrentRefine.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1CONCURRENTREFINE_HPP
-#define SHARE_VM_GC_G1_G1CONCURRENTREFINE_HPP
+#ifndef SHARE_GC_G1_G1CONCURRENTREFINE_HPP
+#define SHARE_GC_G1_G1CONCURRENTREFINE_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -136,4 +136,4 @@
   size_t red_zone() const        { return _red_zone;    }
 };
 
-#endif // SHARE_VM_GC_G1_G1CONCURRENTREFINE_HPP
+#endif // SHARE_GC_G1_G1CONCURRENTREFINE_HPP
--- a/src/hotspot/share/gc/g1/g1ConcurrentRefineThread.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1ConcurrentRefineThread.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1CONCURRENTREFINETHREAD_HPP
-#define SHARE_VM_GC_G1_G1CONCURRENTREFINETHREAD_HPP
+#ifndef SHARE_GC_G1_G1CONCURRENTREFINETHREAD_HPP
+#define SHARE_GC_G1_G1CONCURRENTREFINETHREAD_HPP
 
 #include "gc/g1/dirtyCardQueue.hpp"
 #include "gc/shared/concurrentGCThread.hpp"
@@ -67,4 +67,4 @@
   double vtime_accum() { return _vtime_accum; }
 };
 
-#endif // SHARE_VM_GC_G1_G1CONCURRENTREFINETHREAD_HPP
+#endif // SHARE_GC_G1_G1CONCURRENTREFINETHREAD_HPP
--- a/src/hotspot/share/gc/g1/g1EdenRegions.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1EdenRegions.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1EDENREGIONS_HPP
-#define SHARE_VM_GC_G1_G1EDENREGIONS_HPP
+#ifndef SHARE_GC_G1_G1EDENREGIONS_HPP
+#define SHARE_GC_G1_G1EDENREGIONS_HPP
 
 #include "gc/g1/heapRegion.hpp"
 #include "runtime/globals.hpp"
@@ -46,4 +46,4 @@
   uint length() const { return _length; }
 };
 
-#endif // SHARE_VM_GC_G1_G1EDENREGIONS_HPP
+#endif // SHARE_GC_G1_G1EDENREGIONS_HPP
--- a/src/hotspot/share/gc/g1/g1EvacFailure.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1EvacFailure.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1EVACFAILURE_HPP
-#define SHARE_VM_GC_G1_G1EVACFAILURE_HPP
+#ifndef SHARE_GC_G1_G1EVACFAILURE_HPP
+#define SHARE_GC_G1_G1EVACFAILURE_HPP
 
 #include "gc/g1/g1OopClosures.hpp"
 #include "gc/g1/heapRegionManager.hpp"
@@ -45,4 +45,4 @@
   void work(uint worker_id);
 };
 
-#endif // SHARE_VM_GC_G1_G1EVACFAILURE_HPP
+#endif // SHARE_GC_G1_G1EVACFAILURE_HPP
--- a/src/hotspot/share/gc/g1/g1EvacStats.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1EvacStats.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1EVACSTATS_HPP
-#define SHARE_VM_GC_G1_G1EVACSTATS_HPP
+#ifndef SHARE_GC_G1_G1EVACSTATS_HPP
+#define SHARE_GC_G1_G1EVACSTATS_HPP
 
 #include "gc/shared/plab.hpp"
 
@@ -74,4 +74,4 @@
   inline void add_failure_used_and_waste(size_t used, size_t waste);
 };
 
-#endif // SHARE_VM_GC_G1_G1EVACSTATS_HPP
+#endif // SHARE_GC_G1_G1EVACSTATS_HPP
--- a/src/hotspot/share/gc/g1/g1EvacStats.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1EvacStats.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1EVACSTATS_INLINE_HPP
-#define SHARE_VM_GC_G1_G1EVACSTATS_INLINE_HPP
+#ifndef SHARE_GC_G1_G1EVACSTATS_INLINE_HPP
+#define SHARE_GC_G1_G1EVACSTATS_INLINE_HPP
 
 #include "gc/g1/g1EvacStats.hpp"
 #include "runtime/atomic.hpp"
@@ -42,4 +42,4 @@
   Atomic::add(waste, &_failure_waste);
 }
 
-#endif // SHARE_VM_GC_G1_G1EVACSTATS_INLINE_HPP
+#endif // SHARE_GC_G1_G1EVACSTATS_INLINE_HPP
--- a/src/hotspot/share/gc/g1/g1FromCardCache.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1FromCardCache.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1FROMCARDCACHE_HPP
-#define SHARE_VM_GC_G1_G1FROMCARDCACHE_HPP
+#ifndef SHARE_GC_G1_G1FROMCARDCACHE_HPP
+#define SHARE_GC_G1_G1FROMCARDCACHE_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/ostream.hpp"
@@ -90,4 +90,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_G1_G1FROMCARDCACHE_HPP
+#endif // SHARE_GC_G1_G1FROMCARDCACHE_HPP
--- a/src/hotspot/share/gc/g1/g1FullGCMarker.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1FullGCMarker.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1MARKSTACK_INLINE_HPP
-#define SHARE_VM_GC_G1_G1MARKSTACK_INLINE_HPP
+#ifndef SHARE_GC_G1_G1FULLGCMARKER_INLINE_HPP
+#define SHARE_GC_G1_G1FULLGCMARKER_INLINE_HPP
 
 #include "gc/g1/g1Allocator.inline.hpp"
 #include "gc/g1/g1ConcurrentMarkBitMap.inline.hpp"
@@ -173,4 +173,4 @@
   _cld_closure.do_cld(cld);
 }
 
-#endif
+#endif // SHARE_GC_G1_G1FULLGCMARKER_INLINE_HPP
--- a/src/hotspot/share/gc/g1/g1FullGCOopClosures.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1FullGCOopClosures.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1FULLGCOOPCLOSURES_INLINE_HPP
-#define SHARE_VM_GC_G1_G1FULLGCOOPCLOSURES_INLINE_HPP
+#ifndef SHARE_GC_G1_G1FULLGCOOPCLOSURES_INLINE_HPP
+#define SHARE_GC_G1_G1FULLGCOOPCLOSURES_INLINE_HPP
 
 #include "gc/g1/g1Allocator.inline.hpp"
 #include "gc/g1/g1ConcurrentMarkBitMap.inline.hpp"
@@ -101,4 +101,4 @@
   _marker->mark_and_push(p);
 }
 
-#endif
+#endif // SHARE_GC_G1_G1FULLGCOOPCLOSURES_INLINE_HPP
--- a/src/hotspot/share/gc/g1/g1FullGCScope.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1FullGCScope.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1FULLGCSCOPE_HPP
-#define SHARE_VM_GC_G1_G1FULLGCSCOPE_HPP
+#ifndef SHARE_GC_G1_G1FULLGCSCOPE_HPP
+#define SHARE_GC_G1_G1FULLGCSCOPE_HPP
 
 #include "gc/g1/g1CollectedHeap.hpp"
 #include "gc/g1/g1HeapTransition.hpp"
@@ -65,4 +65,4 @@
   G1HeapTransition* heap_transition();
 };
 
-#endif //SHARE_VM_GC_G1_G1FULLGCSCOPE_HPP
+#endif // SHARE_GC_G1_G1FULLGCSCOPE_HPP
--- a/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1GCPhaseTimes.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1GCPHASETIMES_HPP
-#define SHARE_VM_GC_G1_G1GCPHASETIMES_HPP
+#ifndef SHARE_GC_G1_G1GCPHASETIMES_HPP
+#define SHARE_GC_G1_G1GCPHASETIMES_HPP
 
 #include "gc/shared/referenceProcessorPhaseTimes.hpp"
 #include "gc/shared/weakProcessorPhaseTimes.hpp"
@@ -425,4 +425,4 @@
   virtual ~G1EvacPhaseTimesTracker();
 };
 
-#endif // SHARE_VM_GC_G1_G1GCPHASETIMES_HPP
+#endif // SHARE_GC_G1_G1GCPHASETIMES_HPP
--- a/src/hotspot/share/gc/g1/g1HRPrinter.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1HRPrinter.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1HRPRINTER_HPP
-#define SHARE_VM_GC_G1_G1HRPRINTER_HPP
+#ifndef SHARE_GC_G1_G1HRPRINTER_HPP
+#define SHARE_GC_G1_G1HRPRINTER_HPP
 
 #include "gc/g1/heapRegion.hpp"
 #include "logging/log.hpp"
@@ -105,4 +105,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_G1_G1HRPRINTER_HPP
+#endif // SHARE_GC_G1_G1HRPRINTER_HPP
--- a/src/hotspot/share/gc/g1/g1HeapRegionEventSender.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1HeapRegionEventSender.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1HEAPREGIONEVENTSENDER_HPP
-#define SHARE_VM_GC_G1_G1HEAPREGIONEVENTSENDER_HPP
+#ifndef SHARE_GC_G1_G1HEAPREGIONEVENTSENDER_HPP
+#define SHARE_GC_G1_G1HEAPREGIONEVENTSENDER_HPP
 
 #include "memory/allocation.hpp"
 
@@ -32,4 +32,4 @@
   static void send_events();
 };
 
-#endif // SHARE_VM_GC_G1_G1HEAPREGIONEVENTSENDER_HPP
+#endif // SHARE_GC_G1_G1HEAPREGIONEVENTSENDER_HPP
--- a/src/hotspot/share/gc/g1/g1HeapRegionTraceType.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1HeapRegionTraceType.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1HEAPREGIONTRACETYPE_HPP
-#define SHARE_VM_GC_G1_G1HEAPREGIONTRACETYPE_HPP
+#ifndef SHARE_GC_G1_G1HEAPREGIONTRACETYPE_HPP
+#define SHARE_GC_G1_G1HEAPREGIONTRACETYPE_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/debug.hpp"
@@ -57,4 +57,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_G1_G1HEAPREGIONTRACETYPE_HPP
+#endif // SHARE_GC_G1_G1HEAPREGIONTRACETYPE_HPP
--- a/src/hotspot/share/gc/g1/g1HeapSizingPolicy.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1HeapSizingPolicy.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1HEAPSIZINGPOLICY_HPP
-#define SHARE_VM_GC_G1_G1HEAPSIZINGPOLICY_HPP
+#ifndef SHARE_GC_G1_G1HEAPSIZINGPOLICY_HPP
+#define SHARE_GC_G1_G1HEAPSIZINGPOLICY_HPP
 
 #include "memory/allocation.hpp"
 
@@ -60,4 +60,4 @@
   static G1HeapSizingPolicy* create(const G1CollectedHeap* g1h, const G1Analytics* analytics);
 };
 
-#endif // SRC_SHARE_VM_GC_G1_G1HEAPSIZINGPOLICY_HPP
+#endif // SHARE_GC_G1_G1HEAPSIZINGPOLICY_HPP
--- a/src/hotspot/share/gc/g1/g1HeapTransition.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1HeapTransition.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1HEAPTRANSITION_HPP
-#define SHARE_VM_GC_G1_G1HEAPTRANSITION_HPP
+#ifndef SHARE_GC_G1_G1HEAPTRANSITION_HPP
+#define SHARE_GC_G1_G1HEAPTRANSITION_HPP
 
 #include "gc/shared/plab.hpp"
 
@@ -50,4 +50,4 @@
   void print();
 };
 
-#endif // SHARE_VM_GC_G1_G1HEAPTRANSITION_HPP
+#endif // SHARE_GC_G1_G1HEAPTRANSITION_HPP
--- a/src/hotspot/share/gc/g1/g1HeapVerifier.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1HeapVerifier.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1HEAPVERIFIER_HPP
-#define SHARE_VM_GC_G1_G1HEAPVERIFIER_HPP
+#ifndef SHARE_GC_G1_G1HEAPVERIFIER_HPP
+#define SHARE_GC_G1_G1HEAPVERIFIER_HPP
 
 #include "gc/g1/heapRegionSet.hpp"
 #include "memory/allocation.hpp"
@@ -119,4 +119,4 @@
   static void verify_archive_regions();
 };
 
-#endif // SHARE_VM_GC_G1_G1HEAPVERIFIER_HPP
+#endif // SHARE_GC_G1_G1HEAPVERIFIER_HPP
--- a/src/hotspot/share/gc/g1/g1HeterogeneousCollectorPolicy.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1HeterogeneousCollectorPolicy.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1HETEROGENEOUSCOLLECTORPOLICY_HPP
-#define SHARE_VM_GC_G1_G1HETEROGENEOUSCOLLECTORPOLICY_HPP
+#ifndef SHARE_GC_G1_G1HETEROGENEOUSCOLLECTORPOLICY_HPP
+#define SHARE_GC_G1_G1HETEROGENEOUSCOLLECTORPOLICY_HPP
 
 #include "gc/g1/g1CollectorPolicy.hpp"
 #include "gc/g1/g1HeterogeneousHeapYoungGenSizer.hpp"
@@ -45,4 +45,4 @@
   static size_t reasonable_max_memory_for_young();
 };
 
-#endif // SHARE_VM_GC_G1_G1HETEROGENEOUSCOLLECTORPOLICY_HPP
+#endif // SHARE_GC_G1_G1HETEROGENEOUSCOLLECTORPOLICY_HPP
--- a/src/hotspot/share/gc/g1/g1HeterogeneousHeapPolicy.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1HeterogeneousHeapPolicy.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1HETEROGENEOUSHEAPPOLICY_HPP
-#define SHARE_VM_GC_G1_G1HETEROGENEOUSHEAPPOLICY_HPP
+#ifndef SHARE_GC_G1_G1HETEROGENEOUSHEAPPOLICY_HPP
+#define SHARE_GC_G1_G1HETEROGENEOUSHEAPPOLICY_HPP
 
 #include "gc/g1/g1CollectorPolicy.hpp"
 #include "gc/g1/g1Policy.hpp"
@@ -45,4 +45,4 @@
 
   virtual bool force_upgrade_to_full();
 };
-#endif // SHARE_VM_GC_G1_G1HETEROGENEOUSHEAPPOLICY_HPP
+#endif // SHARE_GC_G1_G1HETEROGENEOUSHEAPPOLICY_HPP
--- a/src/hotspot/share/gc/g1/g1HeterogeneousHeapYoungGenSizer.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1HeterogeneousHeapYoungGenSizer.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1HETEROGENEOUSHEAPYOUNGGENSIZER_HPP
-#define SHARE_VM_GC_G1_G1HETEROGENEOUSHEAPYOUNGGENSIZER_HPP
+#ifndef SHARE_GC_G1_G1HETEROGENEOUSHEAPYOUNGGENSIZER_HPP
+#define SHARE_GC_G1_G1HETEROGENEOUSHEAPYOUNGGENSIZER_HPP
 
 #include "gc/g1/g1YoungGenSizer.hpp"
 
@@ -48,4 +48,4 @@
   virtual void heap_size_changed(uint new_number_of_heap_regions);
 };
 
-#endif // SHARE_VM_GC_G1_G1HETEROGENEOUSHEAPYOUNGGENSIZER_HPP
+#endif // SHARE_GC_G1_G1HETEROGENEOUSHEAPYOUNGGENSIZER_HPP
--- a/src/hotspot/share/gc/g1/g1HotCardCache.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1HotCardCache.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1HOTCARDCACHE_HPP
-#define SHARE_VM_GC_G1_G1HOTCARDCACHE_HPP
+#ifndef SHARE_GC_G1_G1HOTCARDCACHE_HPP
+#define SHARE_GC_G1_G1HOTCARDCACHE_HPP
 
 #include "gc/g1/g1CardCounts.hpp"
 #include "gc/g1/g1_globals.hpp"
@@ -141,4 +141,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_G1_G1HOTCARDCACHE_HPP
+#endif // SHARE_GC_G1_G1HOTCARDCACHE_HPP
--- a/src/hotspot/share/gc/g1/g1IHOPControl.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1IHOPControl.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1IHOPCONTROL_HPP
-#define SHARE_VM_GC_G1_G1IHOPCONTROL_HPP
+#ifndef SHARE_GC_G1_G1IHOPCONTROL_HPP
+#define SHARE_GC_G1_G1IHOPCONTROL_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/numberSeq.hpp"
@@ -146,4 +146,4 @@
   virtual void send_trace_event(G1NewTracer* tracer);
 };
 
-#endif // SHARE_VM_GC_G1_G1IHOPCONTROL_HPP
+#endif // SHARE_GC_G1_G1IHOPCONTROL_HPP
--- a/src/hotspot/share/gc/g1/g1InCSetState.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1InCSetState.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1INCSETSTATE_HPP
-#define SHARE_VM_GC_G1_G1INCSETSTATE_HPP
+#ifndef SHARE_GC_G1_G1INCSETSTATE_HPP
+#define SHARE_GC_G1_G1INCSETSTATE_HPP
 
 #include "gc/g1/g1BiasedArray.hpp"
 #include "gc/g1/heapRegion.hpp"
@@ -139,4 +139,4 @@
   void clear(const HeapRegion* hr) { return set_by_index(hr->hrm_index(), InCSetState::NotInCSet); }
 };
 
-#endif // SHARE_VM_GC_G1_G1INCSETSTATE_HPP
+#endif // SHARE_GC_G1_G1INCSETSTATE_HPP
--- a/src/hotspot/share/gc/g1/g1InitialMarkToMixedTimeTracker.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1InitialMarkToMixedTimeTracker.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1INITIALMARKTOMIXEDTIMETRACKER_HPP
-#define SHARE_VM_GC_G1_G1INITIALMARKTOMIXEDTIMETRACKER_HPP
+#ifndef SHARE_GC_G1_G1INITIALMARKTOMIXEDTIMETRACKER_HPP
+#define SHARE_GC_G1_G1INITIALMARKTOMIXEDTIMETRACKER_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/debug.hpp"
@@ -84,4 +84,4 @@
   bool has_result() const { return _mixed_start_time > 0.0 && _initial_mark_end_time > 0.0; }
 };
 
-#endif // SHARE_VM_GC_G1_G1INITIALMARKTOMIXEDTIMETRACKER_HPP
+#endif // SHARE_GC_G1_G1INITIALMARKTOMIXEDTIMETRACKER_HPP
--- a/src/hotspot/share/gc/g1/g1MMUTracker.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1MMUTracker.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1MMUTRACKER_HPP
-#define SHARE_VM_GC_G1_G1MMUTRACKER_HPP
+#ifndef SHARE_GC_G1_G1MMUTRACKER_HPP
+#define SHARE_GC_G1_G1MMUTRACKER_HPP
 
 #include "gc/shared/gcId.hpp"
 #include "memory/allocation.hpp"
@@ -142,4 +142,4 @@
   virtual double when_sec(double current_time, double pause_time);
 };
 
-#endif // SHARE_VM_GC_G1_G1MMUTRACKER_HPP
+#endif // SHARE_GC_G1_G1MMUTRACKER_HPP
--- a/src/hotspot/share/gc/g1/g1MemoryPool.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1MemoryPool.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1MEMORYPOOL_HPP
-#define SHARE_VM_GC_G1_G1MEMORYPOOL_HPP
+#ifndef SHARE_GC_G1_G1MEMORYPOOL_HPP
+#define SHARE_GC_G1_G1MEMORYPOOL_HPP
 
 #include "gc/g1/g1MonitoringSupport.hpp"
 #include "services/memoryPool.hpp"
@@ -93,4 +93,4 @@
   MemoryUsage get_memory_usage();
 };
 
-#endif // SHARE_VM_GC_G1_G1MEMORYPOOL_HPP
+#endif // SHARE_GC_G1_G1MEMORYPOOL_HPP
--- a/src/hotspot/share/gc/g1/g1MonitoringSupport.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1MonitoringSupport.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1MONITORINGSUPPORT_HPP
-#define SHARE_VM_GC_G1_G1MONITORINGSUPPORT_HPP
+#ifndef SHARE_GC_G1_G1MONITORINGSUPPORT_HPP
+#define SHARE_GC_G1_G1MONITORINGSUPPORT_HPP
 
 #include "gc/shared/collectorCounters.hpp"
 #include "gc/shared/generationCounters.hpp"
@@ -259,4 +259,4 @@
   G1MonitoringScope(G1MonitoringSupport* g1mm, bool full_gc, bool all_memory_pools_affected);
 };
 
-#endif // SHARE_VM_GC_G1_G1MONITORINGSUPPORT_HPP
+#endif // SHARE_GC_G1_G1MONITORINGSUPPORT_HPP
--- a/src/hotspot/share/gc/g1/g1OopClosures.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1OopClosures.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1OOPCLOSURES_HPP
-#define SHARE_VM_GC_G1_G1OOPCLOSURES_HPP
+#ifndef SHARE_GC_G1_G1OOPCLOSURES_HPP
+#define SHARE_GC_G1_G1OOPCLOSURES_HPP
 
 #include "gc/g1/g1InCSetState.hpp"
 #include "memory/iterator.hpp"
@@ -251,4 +251,4 @@
   virtual ReferenceIterationMode reference_iteration_mode() { return DO_FIELDS; }
 };
 
-#endif // SHARE_VM_GC_G1_G1OOPCLOSURES_HPP
+#endif // SHARE_GC_G1_G1OOPCLOSURES_HPP
--- a/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1OopClosures.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1OOPCLOSURES_INLINE_HPP
-#define SHARE_VM_GC_G1_G1OOPCLOSURES_INLINE_HPP
+#ifndef SHARE_GC_G1_G1OOPCLOSURES_INLINE_HPP
+#define SHARE_GC_G1_G1OOPCLOSURES_INLINE_HPP
 
 #include "gc/g1/g1CollectedHeap.hpp"
 #include "gc/g1/g1ConcurrentMark.inline.hpp"
@@ -279,4 +279,4 @@
   rem_set->add_reference(p, _worker_id);
 }
 
-#endif // SHARE_VM_GC_G1_G1OOPCLOSURES_INLINE_HPP
+#endif // SHARE_GC_G1_G1OOPCLOSURES_INLINE_HPP
--- a/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1PAGEBASEDVIRTUALSPACE_HPP
-#define SHARE_VM_GC_G1_G1PAGEBASEDVIRTUALSPACE_HPP
+#ifndef SHARE_GC_G1_G1PAGEBASEDVIRTUALSPACE_HPP
+#define SHARE_GC_G1_G1PAGEBASEDVIRTUALSPACE_HPP
 
 #include "memory/memRegion.hpp"
 #include "memory/virtualspace.hpp"
@@ -152,4 +152,4 @@
   void print();
 };
 
-#endif // SHARE_VM_GC_G1_G1PAGEBASEDVIRTUALSPACE_HPP
+#endif // SHARE_GC_G1_G1PAGEBASEDVIRTUALSPACE_HPP
--- a/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1ParScanThreadState.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1PARSCANTHREADSTATE_HPP
-#define SHARE_VM_GC_G1_G1PARSCANTHREADSTATE_HPP
+#ifndef SHARE_GC_G1_G1PARSCANTHREADSTATE_HPP
+#define SHARE_GC_G1_G1PARSCANTHREADSTATE_HPP
 
 #include "gc/g1/dirtyCardQueue.hpp"
 #include "gc/g1/g1CardTable.hpp"
@@ -249,4 +249,4 @@
   G1ParScanThreadState* new_par_scan_state(uint worker_id, size_t young_cset_length);
 };
 
-#endif // SHARE_VM_GC_G1_G1PARSCANTHREADSTATE_HPP
+#endif // SHARE_GC_G1_G1PARSCANTHREADSTATE_HPP
--- a/src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1ParScanThreadState.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1PARSCANTHREADSTATE_INLINE_HPP
-#define SHARE_VM_GC_G1_G1PARSCANTHREADSTATE_INLINE_HPP
+#ifndef SHARE_GC_G1_G1PARSCANTHREADSTATE_INLINE_HPP
+#define SHARE_GC_G1_G1PARSCANTHREADSTATE_INLINE_HPP
 
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1OopStarChunkedList.inline.hpp"
@@ -223,4 +223,4 @@
   return &_oops_into_optional_regions[hr->index_in_opt_cset()];
 }
 
-#endif // SHARE_VM_GC_G1_G1PARSCANTHREADSTATE_INLINE_HPP
+#endif // SHARE_GC_G1_G1PARSCANTHREADSTATE_INLINE_HPP
--- a/src/hotspot/share/gc/g1/g1Policy.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1Policy.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1POLICY_HPP
-#define SHARE_VM_GC_G1_G1POLICY_HPP
+#ifndef SHARE_GC_G1_G1POLICY_HPP
+#define SHARE_GC_G1_G1POLICY_HPP
 
 #include "gc/g1/g1CollectorPolicy.hpp"
 #include "gc/g1/g1CollectorState.hpp"
@@ -441,4 +441,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_G1_G1POLICY_HPP
+#endif // SHARE_GC_G1_G1POLICY_HPP
--- a/src/hotspot/share/gc/g1/g1Predictions.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1Predictions.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1PREDICTIONS_HPP
-#define SHARE_VM_GC_G1_G1PREDICTIONS_HPP
+#ifndef SHARE_GC_G1_G1PREDICTIONS_HPP
+#define SHARE_GC_G1_G1PREDICTIONS_HPP
 
 #include "utilities/numberSeq.hpp"
 
@@ -59,4 +59,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_G1_G1PREDICTIONS_HPP
+#endif // SHARE_GC_G1_G1PREDICTIONS_HPP
--- a/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1REGIONMARKSTATSCACHE_HPP
-#define SHARE_VM_GC_G1_G1REGIONMARKSTATSCACHE_HPP
+#ifndef SHARE_GC_G1_G1REGIONMARKSTATSCACHE_HPP
+#define SHARE_GC_G1_G1REGIONMARKSTATSCACHE_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/debug.hpp"
@@ -127,4 +127,4 @@
   size_t misses() const { return _cache_misses; }
 };
 
-#endif // SHARE_VM_GC_G1_G1REGIONMARKSTATSCACHE_HPP
+#endif // SHARE_GC_G1_G1REGIONMARKSTATSCACHE_HPP
--- a/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1RegionMarkStatsCache.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1REGIONMARKSTATSCACHE_INLINE_HPP
-#define SHARE_VM_GC_G1_G1REGIONMARKSTATSCACHE_INLINE_HPP
+#ifndef SHARE_GC_G1_G1REGIONMARKSTATSCACHE_INLINE_HPP
+#define SHARE_GC_G1_G1REGIONMARKSTATSCACHE_INLINE_HPP
 
 #include "gc/g1/g1RegionMarkStatsCache.hpp"
 #include "runtime/atomic.hpp"
@@ -51,4 +51,4 @@
   cur->clear();
 }
 
-#endif // SHARE_VM_GC_G1_G1REGIONMARKSTATSCACHE_INLINE_HPP
+#endif // SHARE_GC_G1_G1REGIONMARKSTATSCACHE_INLINE_HPP
--- a/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1RegionToSpaceMapper.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1REGIONTOSPACEMAPPER_HPP
-#define SHARE_VM_GC_G1_G1REGIONTOSPACEMAPPER_HPP
+#ifndef SHARE_GC_G1_G1REGIONTOSPACEMAPPER_HPP
+#define SHARE_GC_G1_G1REGIONTOSPACEMAPPER_HPP
 
 #include "gc/g1/g1PageBasedVirtualSpace.hpp"
 #include "memory/allocation.hpp"
@@ -121,4 +121,4 @@
   virtual void commit_regions(uint start_idx, size_t num_regions = 1, WorkGang* pretouch_workers = NULL);
   virtual void uncommit_regions(uint start_idx, size_t num_regions = 1);
 };
-#endif // SHARE_VM_GC_G1_G1REGIONTOSPACEMAPPER_HPP
+#endif // SHARE_GC_G1_G1REGIONTOSPACEMAPPER_HPP
--- a/src/hotspot/share/gc/g1/g1RemSet.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1RemSet.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1REMSET_HPP
-#define SHARE_VM_GC_G1_G1REMSET_HPP
+#ifndef SHARE_GC_G1_G1REMSET_HPP
+#define SHARE_GC_G1_G1REMSET_HPP
 
 #include "gc/g1/dirtyCardQueue.hpp"
 #include "gc/g1/g1CardTable.hpp"
@@ -178,4 +178,4 @@
   size_t cards_skipped() const { return _cards_skipped; }
 };
 
-#endif // SHARE_VM_GC_G1_G1REMSET_HPP
+#endif // SHARE_GC_G1_G1REMSET_HPP
--- a/src/hotspot/share/gc/g1/g1RemSetSummary.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1RemSetSummary.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1REMSETSUMMARY_HPP
-#define SHARE_VM_GC_G1_G1REMSETSUMMARY_HPP
+#ifndef SHARE_GC_G1_G1REMSETSUMMARY_HPP
+#define SHARE_GC_G1_G1REMSETSUMMARY_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/ostream.hpp"
@@ -97,4 +97,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_G1_G1REMSETSUMMARY_HPP
+#endif // SHARE_GC_G1_G1REMSETSUMMARY_HPP
--- a/src/hotspot/share/gc/g1/g1RemSetTrackingPolicy.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1RemSetTrackingPolicy.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1REMSETTRACKINGPOLICY_HPP
-#define SHARE_VM_GC_G1_G1REMSETTRACKINGPOLICY_HPP
+#ifndef SHARE_GC_G1_G1REMSETTRACKINGPOLICY_HPP
+#define SHARE_GC_G1_G1REMSETTRACKINGPOLICY_HPP
 
 #include "gc/g1/heapRegion.hpp"
 #include "gc/g1/heapRegionType.hpp"
@@ -54,5 +54,4 @@
   void update_at_free(HeapRegion* r);
 };
 
-#endif /* SHARE_VM_GC_G1_G1REMSETTRACKINGPOLICY_HPP */
-
+#endif // SHARE_GC_G1_G1REMSETTRACKINGPOLICY_HPP
--- a/src/hotspot/share/gc/g1/g1RootClosures.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1RootClosures.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1ROOTCLOSURESET_HPP
-#define SHARE_VM_GC_G1_G1ROOTCLOSURESET_HPP
+#ifndef SHARE_GC_G1_G1ROOTCLOSURES_HPP
+#define SHARE_GC_G1_G1ROOTCLOSURES_HPP
 
 #include "memory/allocation.hpp"
 #include "memory/iterator.hpp"
@@ -65,4 +65,4 @@
   static G1EvacuationRootClosures* create_root_closures(G1ParScanThreadState* pss, G1CollectedHeap* g1h);
 };
 
-#endif // SHARE_VM_GC_G1_G1ROOTCLOSURESET_HPP
+#endif // SHARE_GC_G1_G1ROOTCLOSURES_HPP
--- a/src/hotspot/share/gc/g1/g1RootProcessor.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1RootProcessor.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1ROOTPROCESSOR_HPP
-#define SHARE_VM_GC_G1_G1ROOTPROCESSOR_HPP
+#ifndef SHARE_GC_G1_G1ROOTPROCESSOR_HPP
+#define SHARE_GC_G1_G1ROOTPROCESSOR_HPP
 
 #include "gc/shared/oopStorageParState.hpp"
 #include "gc/shared/strongRootsScope.hpp"
@@ -125,4 +125,4 @@
   uint n_workers() const;
 };
 
-#endif // SHARE_VM_GC_G1_G1ROOTPROCESSOR_HPP
+#endif // SHARE_GC_G1_G1ROOTPROCESSOR_HPP
--- a/src/hotspot/share/gc/g1/g1SATBMarkQueueSet.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1SATBMarkQueueSet.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1SATBMARKQUEUE_HPP
-#define SHARE_VM_GC_G1_G1SATBMARKQUEUE_HPP
+#ifndef SHARE_GC_G1_G1SATBMARKQUEUESET_HPP
+#define SHARE_GC_G1_G1SATBMARKQUEUESET_HPP
 
 #include "gc/shared/satbMarkQueue.hpp"
 
@@ -49,4 +49,4 @@
   virtual void filter(SATBMarkQueue* queue);
 };
 
-#endif // SHARE_VM_GC_G1_G1SATBMARKQUEUE_HPP
+#endif // SHARE_GC_G1_G1SATBMARKQUEUESET_HPP
--- a/src/hotspot/share/gc/g1/g1StringDedup.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1StringDedup.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1STRINGDEDUP_HPP
-#define SHARE_VM_GC_G1_G1STRINGDEDUP_HPP
+#ifndef SHARE_GC_G1_G1STRINGDEDUP_HPP
+#define SHARE_GC_G1_G1STRINGDEDUP_HPP
 
 //
 // G1 string deduplication candidate selection
@@ -109,4 +109,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_G1_G1STRINGDEDUP_HPP
+#endif // SHARE_GC_G1_G1STRINGDEDUP_HPP
--- a/src/hotspot/share/gc/g1/g1StringDedupQueue.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1StringDedupQueue.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1STRINGDEDUPQUEUE_HPP
-#define SHARE_VM_GC_G1_G1STRINGDEDUPQUEUE_HPP
+#ifndef SHARE_GC_G1_G1STRINGDEDUPQUEUE_HPP
+#define SHARE_GC_G1_G1STRINGDEDUPQUEUE_HPP
 
 #include "gc/shared/stringdedup/stringDedupQueue.hpp"
 #include "memory/allocation.hpp"
@@ -84,4 +84,4 @@
   void verify_impl();
 };
 
-#endif // SHARE_VM_GC_G1_G1STRINGDEDUPQUEUE_HPP
+#endif // SHARE_GC_G1_G1STRINGDEDUPQUEUE_HPP
--- a/src/hotspot/share/gc/g1/g1StringDedupStat.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1StringDedupStat.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1STRINGDEDUPSTAT_HPP
-#define SHARE_VM_GC_G1_G1STRINGDEDUPSTAT_HPP
+#ifndef SHARE_GC_G1_G1STRINGDEDUPSTAT_HPP
+#define SHARE_GC_G1_G1STRINGDEDUPSTAT_HPP
 
 #include "gc/shared/stringdedup/stringDedupStat.hpp"
 
@@ -49,4 +49,4 @@
   void reset();
 };
 
-#endif // SHARE_VM_GC_G1_G1STRINGDEDUPSTAT_HPP
+#endif // SHARE_GC_G1_G1STRINGDEDUPSTAT_HPP
--- a/src/hotspot/share/gc/g1/g1SurvivorRegions.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1SurvivorRegions.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1SURVIVORREGIONS_HPP
-#define SHARE_VM_GC_G1_G1SURVIVORREGIONS_HPP
+#ifndef SHARE_GC_G1_G1SURVIVORREGIONS_HPP
+#define SHARE_GC_G1_G1SURVIVORREGIONS_HPP
 
 #include "runtime/globals.hpp"
 
@@ -51,4 +51,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_G1_G1SURVIVORREGIONS_HPP
+#endif // SHARE_GC_G1_G1SURVIVORREGIONS_HPP
--- a/src/hotspot/share/gc/g1/g1VMOperations.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1VMOperations.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1VMOPERATIONS_HPP
-#define SHARE_VM_GC_G1_G1VMOPERATIONS_HPP
+#ifndef SHARE_GC_G1_G1VMOPERATIONS_HPP
+#define SHARE_GC_G1_G1VMOPERATIONS_HPP
 
 #include "gc/shared/gcId.hpp"
 #include "gc/shared/gcVMOperations.hpp"
@@ -81,4 +81,4 @@
   virtual void doit_epilogue();
 };
 
-#endif // SHARE_VM_GC_G1_G1VMOPERATIONS_HPP
+#endif // SHARE_GC_G1_G1VMOPERATIONS_HPP
--- a/src/hotspot/share/gc/g1/g1YCTypes.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1YCTypes.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1YCTYPES_HPP
-#define SHARE_VM_GC_G1_G1YCTYPES_HPP
+#ifndef SHARE_GC_G1_G1YCTYPES_HPP
+#define SHARE_GC_G1_G1YCTYPES_HPP
 
 #include "utilities/debug.hpp"
 
@@ -48,4 +48,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_G1_G1YCTYPES_HPP
+#endif // SHARE_GC_G1_G1YCTYPES_HPP
--- a/src/hotspot/share/gc/g1/g1YoungGenSizer.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1YoungGenSizer.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1YOUNGGENSIZER_HPP
-#define SHARE_VM_GC_G1_G1YOUNGGENSIZER_HPP
+#ifndef SHARE_GC_G1_G1YOUNGGENSIZER_HPP
+#define SHARE_GC_G1_G1YOUNGGENSIZER_HPP
 
 #include "gc/g1/g1CollectorPolicy.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -111,4 +111,4 @@
   static G1YoungGenSizer* create_gen_sizer(G1CollectorPolicy* policy);
 };
 
-#endif // SHARE_VM_GC_G1_G1YOUNGGENSIZER_HPP
+#endif // SHARE_GC_G1_G1YOUNGGENSIZER_HPP
--- a/src/hotspot/share/gc/g1/g1YoungRemSetSamplingThread.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1YoungRemSetSamplingThread.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1YOUNGREMSETSAMPLINGTHREAD_HPP
-#define SHARE_VM_GC_G1_G1YOUNGREMSETSAMPLINGTHREAD_HPP
+#ifndef SHARE_GC_G1_G1YOUNGREMSETSAMPLINGTHREAD_HPP
+#define SHARE_GC_G1_G1YOUNGREMSETSAMPLINGTHREAD_HPP
 
 #include "gc/shared/concurrentGCThread.hpp"
 
@@ -63,4 +63,4 @@
   double vtime_accum() { return _vtime_accum; }
 };
 
-#endif // SHARE_VM_GC_G1_G1YOUNGREMSETSAMPLINGTHREAD_HPP
+#endif // SHARE_GC_G1_G1YOUNGREMSETSAMPLINGTHREAD_HPP
--- a/src/hotspot/share/gc/g1/g1_globals.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/g1_globals.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_G1_GLOBALS_HPP
-#define SHARE_VM_GC_G1_G1_GLOBALS_HPP
+#ifndef SHARE_GC_G1_G1_GLOBALS_HPP
+#define SHARE_GC_G1_G1_GLOBALS_HPP
 
 #include <float.h> // for DBL_MAX
 //
@@ -328,4 +328,4 @@
                range(0, 100)                                                \
 
 
-#endif // SHARE_VM_GC_G1_G1_GLOBALS_HPP
+#endif // SHARE_GC_G1_G1_GLOBALS_HPP
--- a/src/hotspot/share/gc/g1/heapRegion.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/heapRegion.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_HEAPREGION_HPP
-#define SHARE_VM_GC_G1_HEAPREGION_HPP
+#ifndef SHARE_GC_G1_HEAPREGION_HPP
+#define SHARE_GC_G1_HEAPREGION_HPP
 
 #include "gc/g1/g1BlockOffsetTable.hpp"
 #include "gc/g1/g1HeapRegionTraceType.hpp"
@@ -721,4 +721,4 @@
   bool is_complete() { return _is_complete; }
 };
 
-#endif // SHARE_VM_GC_G1_HEAPREGION_HPP
+#endif // SHARE_GC_G1_HEAPREGION_HPP
--- a/src/hotspot/share/gc/g1/heapRegion.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/heapRegion.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_HEAPREGION_INLINE_HPP
-#define SHARE_VM_GC_G1_HEAPREGION_INLINE_HPP
+#ifndef SHARE_GC_G1_HEAPREGION_INLINE_HPP
+#define SHARE_GC_G1_HEAPREGION_INLINE_HPP
 
 #include "gc/g1/g1BlockOffsetTable.inline.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
@@ -362,4 +362,4 @@
   return true;
 }
 
-#endif // SHARE_VM_GC_G1_HEAPREGION_INLINE_HPP
+#endif // SHARE_GC_G1_HEAPREGION_INLINE_HPP
--- a/src/hotspot/share/gc/g1/heapRegionBounds.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/heapRegionBounds.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_HEAPREGIONBOUNDS_HPP
-#define SHARE_VM_GC_G1_HEAPREGIONBOUNDS_HPP
+#ifndef SHARE_GC_G1_HEAPREGIONBOUNDS_HPP
+#define SHARE_GC_G1_HEAPREGIONBOUNDS_HPP
 
 #include "memory/allocation.hpp"
 
@@ -51,4 +51,4 @@
   static inline size_t target_number();
 };
 
-#endif // SHARE_VM_GC_G1_HEAPREGIONBOUNDS_HPP
+#endif // SHARE_GC_G1_HEAPREGIONBOUNDS_HPP
--- a/src/hotspot/share/gc/g1/heapRegionBounds.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/heapRegionBounds.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_HEAPREGIONBOUNDS_INLINE_HPP
-#define SHARE_VM_GC_G1_HEAPREGIONBOUNDS_INLINE_HPP
+#ifndef SHARE_GC_G1_HEAPREGIONBOUNDS_INLINE_HPP
+#define SHARE_GC_G1_HEAPREGIONBOUNDS_INLINE_HPP
 
 #include "gc/g1/heapRegionBounds.hpp"
 
@@ -39,4 +39,4 @@
   return TARGET_REGION_NUMBER;
 }
 
-#endif // SHARE_VM_GC_G1_HEAPREGIONBOUNDS_INLINE_HPP
+#endif // SHARE_GC_G1_HEAPREGIONBOUNDS_INLINE_HPP
--- a/src/hotspot/share/gc/g1/heapRegionManager.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/heapRegionManager.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_HEAPREGIONMANAGER_HPP
-#define SHARE_VM_GC_G1_HEAPREGIONMANAGER_HPP
+#ifndef SHARE_GC_G1_HEAPREGIONMANAGER_HPP
+#define SHARE_GC_G1_HEAPREGIONMANAGER_HPP
 
 #include "gc/g1/g1BiasedArray.hpp"
 #include "gc/g1/g1CollectorPolicy.hpp"
@@ -295,4 +295,4 @@
   // Claim the given region, returns true if successfully claimed.
   bool claim_region(uint region_index);
 };
-#endif // SHARE_VM_GC_G1_HEAPREGIONMANAGER_HPP
+#endif // SHARE_GC_G1_HEAPREGIONMANAGER_HPP
--- a/src/hotspot/share/gc/g1/heapRegionManager.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/heapRegionManager.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_HEAPREGIONMANAGER_INLINE_HPP
-#define SHARE_VM_GC_G1_HEAPREGIONMANAGER_INLINE_HPP
+#ifndef SHARE_GC_G1_HEAPREGIONMANAGER_INLINE_HPP
+#define SHARE_GC_G1_HEAPREGIONMANAGER_INLINE_HPP
 
 #include "gc/g1/heapRegion.hpp"
 #include "gc/g1/heapRegionManager.hpp"
@@ -77,4 +77,4 @@
   _free_list.remove_starting_at(at(first), num_regions);
 }
 
-#endif // SHARE_VM_GC_G1_HEAPREGIONMANAGER_INLINE_HPP
+#endif // SHARE_GC_G1_HEAPREGIONMANAGER_INLINE_HPP
--- a/src/hotspot/share/gc/g1/heapRegionRemSet.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/heapRegionRemSet.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_HEAPREGIONREMSET_HPP
-#define SHARE_VM_GC_G1_HEAPREGIONREMSET_HPP
+#ifndef SHARE_GC_G1_HEAPREGIONREMSET_HPP
+#define SHARE_GC_G1_HEAPREGIONREMSET_HPP
 
 #include "gc/g1/g1CodeCacheRemSet.hpp"
 #include "gc/g1/g1FromCardCache.hpp"
@@ -404,4 +404,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_G1_HEAPREGIONREMSET_HPP
+#endif // SHARE_GC_G1_HEAPREGIONREMSET_HPP
--- a/src/hotspot/share/gc/g1/heapRegionSet.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/heapRegionSet.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_HEAPREGIONSET_HPP
-#define SHARE_VM_GC_G1_HEAPREGIONSET_HPP
+#ifndef SHARE_GC_G1_HEAPREGIONSET_HPP
+#define SHARE_GC_G1_HEAPREGIONSET_HPP
 
 #include "gc/g1/heapRegion.hpp"
 #include "utilities/macros.hpp"
@@ -230,4 +230,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_G1_HEAPREGIONSET_HPP
+#endif // SHARE_GC_G1_HEAPREGIONSET_HPP
--- a/src/hotspot/share/gc/g1/heapRegionSet.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/heapRegionSet.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_HEAPREGIONSET_INLINE_HPP
-#define SHARE_VM_GC_G1_HEAPREGIONSET_INLINE_HPP
+#ifndef SHARE_GC_G1_HEAPREGIONSET_INLINE_HPP
+#define SHARE_GC_G1_HEAPREGIONSET_INLINE_HPP
 
 #include "gc/g1/heapRegionSet.hpp"
 
@@ -147,5 +147,4 @@
   return hr;
 }
 
-#endif // SHARE_VM_GC_G1_HEAPREGIONSET_INLINE_HPP
-
+#endif // SHARE_GC_G1_HEAPREGIONSET_INLINE_HPP
--- a/src/hotspot/share/gc/g1/heapRegionTracer.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/heapRegionTracer.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_HEAPREGIONTRACER_HPP
-#define SHARE_VM_GC_G1_HEAPREGIONTRACER_HPP
+#ifndef SHARE_GC_G1_HEAPREGIONTRACER_HPP
+#define SHARE_GC_G1_HEAPREGIONTRACER_HPP
 
 #include "gc/g1/g1HeapRegionTraceType.hpp"
 #include "memory/allocation.hpp"
@@ -37,4 +37,4 @@
                                         size_t used);
 };
 
-#endif // SHARE_VM_GC_G1_HEAPREGIONTRACER_HPP
+#endif // SHARE_GC_G1_HEAPREGIONTRACER_HPP
--- a/src/hotspot/share/gc/g1/heapRegionType.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/heapRegionType.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_HEAPREGIONTYPE_HPP
-#define SHARE_VM_GC_G1_HEAPREGIONTYPE_HPP
+#ifndef SHARE_GC_G1_HEAPREGIONTYPE_HPP
+#define SHARE_GC_G1_HEAPREGIONTYPE_HPP
 
 #include "gc/g1/g1HeapRegionTraceType.hpp"
 
@@ -196,4 +196,4 @@
   static const HeapRegionType Humongous;
 };
 
-#endif // SHARE_VM_GC_G1_HEAPREGIONTYPE_HPP
+#endif // SHARE_GC_G1_HEAPREGIONTYPE_HPP
--- a/src/hotspot/share/gc/g1/heterogeneousHeapRegionManager.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/heterogeneousHeapRegionManager.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_HETEROGENEOUSHEAPREGIONMANAGER_HPP
-#define SHARE_VM_GC_G1_HETEROGENEOUSHEAPREGIONMANAGER_HPP
+#ifndef SHARE_GC_G1_HETEROGENEOUSHEAPREGIONMANAGER_HPP
+#define SHARE_GC_G1_HETEROGENEOUSHEAPREGIONMANAGER_HPP
 
 #include "gc/g1/heapRegionManager.hpp"
 
@@ -147,4 +147,4 @@
   void verify();
 };
 
-#endif // SHARE_VM_GC_G1_HETEROGENEOUSHEAPREGIONMANAGER_HPP
+#endif // SHARE_GC_G1_HETEROGENEOUSHEAPREGIONMANAGER_HPP
--- a/src/hotspot/share/gc/g1/jvmFlagConstraintsG1.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/jvmFlagConstraintsG1.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_GC_G1_COMMANDLINEFLAGCONSTRAINTSG1_HPP
-#define SHARE_GC_G1_COMMANDLINEFLAGCONSTRAINTSG1_HPP
+#ifndef SHARE_GC_G1_JVMFLAGCONSTRAINTSG1_HPP
+#define SHARE_GC_G1_JVMFLAGCONSTRAINTSG1_HPP
 
 #include "runtime/globals.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -43,4 +43,4 @@
 
 size_t MaxSizeForHeapAlignmentG1();
 
-#endif // SHARE_GC_SHARED_COMMANDLINEFLAGCONSTRAINTSG1_HPP
+#endif // SHARE_GC_G1_JVMFLAGCONSTRAINTSG1_HPP
--- a/src/hotspot/share/gc/g1/sparsePRT.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/sparsePRT.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_SPARSEPRT_HPP
-#define SHARE_VM_GC_G1_SPARSEPRT_HPP
+#ifndef SHARE_GC_G1_SPARSEPRT_HPP
+#define SHARE_GC_G1_SPARSEPRT_HPP
 
 #include "gc/g1/g1CollectedHeap.hpp"
 #include "gc/g1/heapRegion.hpp"
@@ -264,4 +264,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_G1_SPARSEPRT_HPP
+#endif // SHARE_GC_G1_SPARSEPRT_HPP
--- a/src/hotspot/share/gc/g1/survRateGroup.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/survRateGroup.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_SURVRATEGROUP_HPP
-#define SHARE_VM_GC_G1_SURVRATEGROUP_HPP
+#ifndef SHARE_GC_G1_SURVRATEGROUP_HPP
+#define SHARE_GC_G1_SURVRATEGROUP_HPP
 
 #include "utilities/numberSeq.hpp"
 
@@ -88,4 +88,4 @@
 
 };
 
-#endif // SHARE_VM_GC_G1_SURVRATEGROUP_HPP
+#endif // SHARE_GC_G1_SURVRATEGROUP_HPP
--- a/src/hotspot/share/gc/g1/vmStructs_g1.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/g1/vmStructs_g1.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_G1_VMSTRUCTS_G1_HPP
-#define SHARE_VM_GC_G1_VMSTRUCTS_G1_HPP
+#ifndef SHARE_GC_G1_VMSTRUCTS_G1_HPP
+#define SHARE_GC_G1_VMSTRUCTS_G1_HPP
 
 #include "gc/g1/g1CollectedHeap.hpp"
 #include "gc/g1/heapRegion.hpp"
@@ -110,4 +110,4 @@
                                                                               \
   declare_integer_type(HeapRegionType::Tag volatile)
 
-#endif // SHARE_VM_GC_G1_VMSTRUCTS_G1_HPP
+#endif // SHARE_GC_G1_VMSTRUCTS_G1_HPP
--- a/src/hotspot/share/gc/parallel/adjoiningGenerations.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/adjoiningGenerations.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_ADJOININGGENERATIONS_HPP
-#define SHARE_VM_GC_PARALLEL_ADJOININGGENERATIONS_HPP
+#ifndef SHARE_GC_PARALLEL_ADJOININGGENERATIONS_HPP
+#define SHARE_GC_PARALLEL_ADJOININGGENERATIONS_HPP
 
 #include "gc/parallel/adjoiningVirtualSpaces.hpp"
 #include "gc/parallel/asPSOldGen.hpp"
@@ -81,4 +81,4 @@
   // Return new AdjoiningGenerations instance based on collector policy (specifically - whether heap is heterogeneous).
   static AdjoiningGenerations* create_adjoining_generations(ReservedSpace rs, GenerationSizer* policy, size_t alignment);
 };
-#endif // SHARE_VM_GC_PARALLEL_ADJOININGGENERATIONS_HPP
+#endif // SHARE_GC_PARALLEL_ADJOININGGENERATIONS_HPP
--- a/src/hotspot/share/gc/parallel/adjoiningGenerationsForHeteroHeap.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/adjoiningGenerationsForHeteroHeap.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_ADJOININGGENERATIONSFORHETEROHEAP_HPP
-#define SHARE_VM_GC_PARALLEL_ADJOININGGENERATIONSFORHETEROHEAP_HPP
+#ifndef SHARE_GC_PARALLEL_ADJOININGGENERATIONSFORHETEROHEAP_HPP
+#define SHARE_GC_PARALLEL_ADJOININGGENERATIONSFORHETEROHEAP_HPP
 
 #include "gc/parallel/adjoiningGenerations.hpp"
 
@@ -81,5 +81,4 @@
   // Return the total byte size of the reserved space
   size_t reserved_byte_size();
 };
-#endif // SHARE_VM_GC_PARALLEL_ADJOININGGENERATIONSFORHETEROHEAP_HPP
-
+#endif // SHARE_GC_PARALLEL_ADJOININGGENERATIONSFORHETEROHEAP_HPP
--- a/src/hotspot/share/gc/parallel/adjoiningVirtualSpaces.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/adjoiningVirtualSpaces.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_ADJOININGVIRTUALSPACES_HPP
-#define SHARE_VM_GC_PARALLEL_ADJOININGVIRTUALSPACES_HPP
+#ifndef SHARE_GC_PARALLEL_ADJOININGVIRTUALSPACES_HPP
+#define SHARE_GC_PARALLEL_ADJOININGVIRTUALSPACES_HPP
 
 #include "gc/parallel/psVirtualspace.hpp"
 
@@ -112,4 +112,4 @@
                   size_t init_low_byte_size,
                   size_t init_high_byte_size);
 };
-#endif // SHARE_VM_GC_PARALLEL_ADJOININGVIRTUALSPACES_HPP
+#endif // SHARE_GC_PARALLEL_ADJOININGVIRTUALSPACES_HPP
--- a/src/hotspot/share/gc/parallel/asPSOldGen.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/asPSOldGen.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_ASPSOLDGEN_HPP
-#define SHARE_VM_GC_PARALLEL_ASPSOLDGEN_HPP
+#ifndef SHARE_GC_PARALLEL_ASPSOLDGEN_HPP
+#define SHARE_GC_PARALLEL_ASPSOLDGEN_HPP
 
 #include "gc/parallel/mutableSpace.hpp"
 #include "gc/parallel/objectStartArray.hpp"
@@ -68,4 +68,4 @@
   virtual const char* short_name() const { return "ASPSOldGen"; }
 };
 
-#endif // SHARE_VM_GC_PARALLEL_ASPSOLDGEN_HPP
+#endif // SHARE_GC_PARALLEL_ASPSOLDGEN_HPP
--- a/src/hotspot/share/gc/parallel/asPSYoungGen.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/asPSYoungGen.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_ASPSYOUNGGEN_HPP
-#define SHARE_VM_GC_PARALLEL_ASPSYOUNGGEN_HPP
+#ifndef SHARE_GC_PARALLEL_ASPSYOUNGGEN_HPP
+#define SHARE_GC_PARALLEL_ASPSYOUNGGEN_HPP
 
 #include "gc/parallel/mutableSpace.hpp"
 #include "gc/parallel/objectStartArray.hpp"
@@ -74,4 +74,4 @@
   virtual const char* short_name() const { return "ASPSYoungGen"; }
 };
 
-#endif // SHARE_VM_GC_PARALLEL_ASPSYOUNGGEN_HPP
+#endif // SHARE_GC_PARALLEL_ASPSYOUNGGEN_HPP
--- a/src/hotspot/share/gc/parallel/gcAdaptivePolicyCounters.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/gcAdaptivePolicyCounters.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_GCADAPTIVEPOLICYCOUNTERS_HPP
-#define SHARE_VM_GC_PARALLEL_GCADAPTIVEPOLICYCOUNTERS_HPP
+#ifndef SHARE_GC_PARALLEL_GCADAPTIVEPOLICYCOUNTERS_HPP
+#define SHARE_GC_PARALLEL_GCADAPTIVEPOLICYCOUNTERS_HPP
 
 #include "gc/shared/adaptiveSizePolicy.hpp"
 #include "gc/shared/gcPolicyCounters.hpp"
@@ -230,4 +230,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_PARALLEL_GCADAPTIVEPOLICYCOUNTERS_HPP
+#endif // SHARE_GC_PARALLEL_GCADAPTIVEPOLICYCOUNTERS_HPP
--- a/src/hotspot/share/gc/parallel/gcTaskManager.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/gcTaskManager.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_GCTASKMANAGER_HPP
-#define SHARE_VM_GC_PARALLEL_GCTASKMANAGER_HPP
+#ifndef SHARE_GC_PARALLEL_GCTASKMANAGER_HPP
+#define SHARE_GC_PARALLEL_GCTASKMANAGER_HPP
 
 #include "runtime/mutex.hpp"
 #include "utilities/growableArray.hpp"
@@ -665,4 +665,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_PARALLEL_GCTASKMANAGER_HPP
+#endif // SHARE_GC_PARALLEL_GCTASKMANAGER_HPP
--- a/src/hotspot/share/gc/parallel/gcTaskThread.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/gcTaskThread.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_GCTASKTHREAD_HPP
-#define SHARE_VM_GC_PARALLEL_GCTASKTHREAD_HPP
+#ifndef SHARE_GC_PARALLEL_GCTASKTHREAD_HPP
+#define SHARE_GC_PARALLEL_GCTASKTHREAD_HPP
 
 #include "runtime/thread.hpp"
 
@@ -105,4 +105,4 @@
   void set_name(const char* name) { _name = name; }
 };
 
-#endif // SHARE_VM_GC_PARALLEL_GCTASKTHREAD_HPP
+#endif // SHARE_GC_PARALLEL_GCTASKTHREAD_HPP
--- a/src/hotspot/share/gc/parallel/generationSizer.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/generationSizer.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_GENERATIONSIZER_HPP
-#define SHARE_VM_GC_PARALLEL_GENERATIONSIZER_HPP
+#ifndef SHARE_GC_PARALLEL_GENERATIONSIZER_HPP
+#define SHARE_GC_PARALLEL_GENERATIONSIZER_HPP
 
 #include "gc/shared/collectorPolicy.hpp"
 
@@ -45,4 +45,4 @@
   virtual size_t heap_reserved_size_bytes() const;
   virtual bool is_hetero_heap() const;
 };
-#endif // SHARE_VM_GC_PARALLEL_GENERATIONSIZER_HPP
+#endif // SHARE_GC_PARALLEL_GENERATIONSIZER_HPP
--- a/src/hotspot/share/gc/parallel/heterogeneousGenerationSizer.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/heterogeneousGenerationSizer.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_HETEROGENEOUSGENERATIONSIZER_HPP
-#define SHARE_VM_GC_PARALLEL_HETEROGENEOUSGENERATIONSIZER_HPP
+#ifndef SHARE_GC_PARALLEL_HETEROGENEOUSGENERATIONSIZER_HPP
+#define SHARE_GC_PARALLEL_HETEROGENEOUSGENERATIONSIZER_HPP
 
 #include "gc/parallel/generationSizer.hpp"
 
@@ -43,4 +43,4 @@
   virtual size_t heap_reserved_size_bytes() const;
   virtual bool is_hetero_heap() const;
 };
-#endif // SHARE_VM_GC_PARALLEL_HETEROGENEOUSGENERATIONSIZER_HPP
+#endif // SHARE_GC_PARALLEL_HETEROGENEOUSGENERATIONSIZER_HPP
--- a/src/hotspot/share/gc/parallel/immutableSpace.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/immutableSpace.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_IMMUTABLESPACE_HPP
-#define SHARE_VM_GC_PARALLEL_IMMUTABLESPACE_HPP
+#ifndef SHARE_GC_PARALLEL_IMMUTABLESPACE_HPP
+#define SHARE_GC_PARALLEL_IMMUTABLESPACE_HPP
 
 #include "memory/iterator.hpp"
 
@@ -68,4 +68,4 @@
   virtual void verify();
 };
 
-#endif // SHARE_VM_GC_PARALLEL_IMMUTABLESPACE_HPP
+#endif // SHARE_GC_PARALLEL_IMMUTABLESPACE_HPP
--- a/src/hotspot/share/gc/parallel/jvmFlagConstraintsParallel.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/jvmFlagConstraintsParallel.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_GC_PARALLEL_COMMANDLINEFLAGCONSTRAINTSPARALLEL_HPP
-#define SHARE_GC_PARALLEL_COMMANDLINEFLAGCONSTRAINTSPARALLEL_HPP
+#ifndef SHARE_GC_PARALLEL_JVMFLAGCONSTRAINTSPARALLEL_HPP
+#define SHARE_GC_PARALLEL_JVMFLAGCONSTRAINTSPARALLEL_HPP
 
 #include "runtime/globals.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -33,4 +33,4 @@
 JVMFlag::Error InitialTenuringThresholdConstraintFuncParallel(uintx value, bool verbose);
 JVMFlag::Error MaxTenuringThresholdConstraintFuncParallel(uintx value, bool verbose);
 
-#endif // SHARE_GC_PARALLEL_COMMANDLINEFLAGCONSTRAINTSPARALLEL_HPP
+#endif // SHARE_GC_PARALLEL_JVMFLAGCONSTRAINTSPARALLEL_HPP
--- a/src/hotspot/share/gc/parallel/mutableNUMASpace.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/mutableNUMASpace.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_MUTABLENUMASPACE_HPP
-#define SHARE_VM_GC_PARALLEL_MUTABLENUMASPACE_HPP
+#ifndef SHARE_GC_PARALLEL_MUTABLENUMASPACE_HPP
+#define SHARE_GC_PARALLEL_MUTABLENUMASPACE_HPP
 
 #include "gc/parallel/mutableSpace.hpp"
 #include "gc/shared/gcUtil.hpp"
@@ -232,4 +232,4 @@
   virtual void set_top(HeapWord* value);
 };
 
-#endif // SHARE_VM_GC_PARALLEL_MUTABLENUMASPACE_HPP
+#endif // SHARE_GC_PARALLEL_MUTABLENUMASPACE_HPP
--- a/src/hotspot/share/gc/parallel/mutableSpace.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/mutableSpace.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_MUTABLESPACE_HPP
-#define SHARE_VM_GC_PARALLEL_MUTABLESPACE_HPP
+#ifndef SHARE_GC_PARALLEL_MUTABLESPACE_HPP
+#define SHARE_GC_PARALLEL_MUTABLESPACE_HPP
 
 #include "gc/parallel/immutableSpace.hpp"
 #include "memory/memRegion.hpp"
@@ -145,4 +145,4 @@
   virtual void verify();
 };
 
-#endif // SHARE_VM_GC_PARALLEL_MUTABLESPACE_HPP
+#endif // SHARE_GC_PARALLEL_MUTABLESPACE_HPP
--- a/src/hotspot/share/gc/parallel/objectStartArray.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/objectStartArray.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_OBJECTSTARTARRAY_HPP
-#define SHARE_VM_GC_PARALLEL_OBJECTSTARTARRAY_HPP
+#ifndef SHARE_GC_PARALLEL_OBJECTSTARTARRAY_HPP
+#define SHARE_GC_PARALLEL_OBJECTSTARTARRAY_HPP
 
 #include "gc/parallel/psVirtualspace.hpp"
 #include "memory/allocation.hpp"
@@ -156,4 +156,4 @@
   bool object_starts_in_range(HeapWord* start_addr, HeapWord* end_addr) const;
 };
 
-#endif // SHARE_VM_GC_PARALLEL_OBJECTSTARTARRAY_HPP
+#endif // SHARE_GC_PARALLEL_OBJECTSTARTARRAY_HPP
--- a/src/hotspot/share/gc/parallel/objectStartArray.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/objectStartArray.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_OBJECTSTARTARRAY_INLINE_HPP
-#define SHARE_VM_GC_PARALLEL_OBJECTSTARTARRAY_INLINE_HPP
+#ifndef SHARE_GC_PARALLEL_OBJECTSTARTARRAY_INLINE_HPP
+#define SHARE_GC_PARALLEL_OBJECTSTARTARRAY_INLINE_HPP
 
 #include "gc/parallel/objectStartArray.hpp"
 
@@ -50,4 +50,4 @@
 }
 
 
-#endif // SHARE_VM_GC_PARALLEL_OBJECTSTARTARRAY_INLINE_HPP
+#endif // SHARE_GC_PARALLEL_OBJECTSTARTARRAY_INLINE_HPP
--- a/src/hotspot/share/gc/parallel/parMarkBitMap.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/parMarkBitMap.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_PARMARKBITMAP_HPP
-#define SHARE_VM_GC_PARALLEL_PARMARKBITMAP_HPP
+#ifndef SHARE_GC_PARALLEL_PARMARKBITMAP_HPP
+#define SHARE_GC_PARALLEL_PARMARKBITMAP_HPP
 
 #include "memory/memRegion.hpp"
 #include "oops/oop.hpp"
@@ -188,4 +188,4 @@
   size_t          _reserved_byte_size;
 };
 
-#endif // SHARE_VM_GC_PARALLEL_PARMARKBITMAP_HPP
+#endif // SHARE_GC_PARALLEL_PARMARKBITMAP_HPP
--- a/src/hotspot/share/gc/parallel/parMarkBitMap.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/parMarkBitMap.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_PARMARKBITMAP_INLINE_HPP
-#define SHARE_VM_GC_PARALLEL_PARMARKBITMAP_INLINE_HPP
+#ifndef SHARE_GC_PARALLEL_PARMARKBITMAP_INLINE_HPP
+#define SHARE_GC_PARALLEL_PARMARKBITMAP_INLINE_HPP
 
 #include "gc/parallel/parMarkBitMap.hpp"
 #include "utilities/bitMap.inline.hpp"
@@ -195,4 +195,4 @@
 }
 #endif  // #ifdef ASSERT
 
-#endif /* SHARE_VM_GC_PARALLEL_PARMARKBITMAP_INLINE_HPP */
+#endif // SHARE_GC_PARALLEL_PARMARKBITMAP_INLINE_HPP
--- a/src/hotspot/share/gc/parallel/parallelArguments.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/parallelArguments.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -36,4 +36,4 @@
   virtual CollectedHeap* create_heap();
 };
 
-#endif // SHARE_GC_CMS_PARALLELARGUMENTS_HPP
+#endif // SHARE_GC_PARALLEL_PARALLELARGUMENTS_HPP
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_PARALLELSCAVENGEHEAP_HPP
-#define SHARE_VM_GC_PARALLEL_PARALLELSCAVENGEHEAP_HPP
+#ifndef SHARE_GC_PARALLEL_PARALLELSCAVENGEHEAP_HPP
+#define SHARE_GC_PARALLEL_PARALLELSCAVENGEHEAP_HPP
 
 #include "gc/parallel/generationSizer.hpp"
 #include "gc/parallel/objectStartArray.hpp"
@@ -311,4 +311,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_PARALLEL_PARALLELSCAVENGEHEAP_HPP
+#endif // SHARE_GC_PARALLEL_PARALLELSCAVENGEHEAP_HPP
--- a/src/hotspot/share/gc/parallel/parallelScavengeHeap.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/parallelScavengeHeap.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_PARALLELSCAVENGEHEAP_INLINE_HPP
-#define SHARE_VM_GC_PARALLEL_PARALLELSCAVENGEHEAP_INLINE_HPP
+#ifndef SHARE_GC_PARALLEL_PARALLELSCAVENGEHEAP_INLINE_HPP
+#define SHARE_GC_PARALLEL_PARALLELSCAVENGEHEAP_INLINE_HPP
 
 #include "gc/parallel/parallelScavengeHeap.hpp"
 #include "gc/parallel/psMarkSweepProxy.hpp"
@@ -51,4 +51,4 @@
          "incorrect test - result=%d, p=" PTR_FORMAT, result, p2i((void*)p));
   return result;
 }
-#endif // SHARE_VM_GC_PARALLEL_PARALLELSCAVENGEHEAP_INLINE_HPP
+#endif // SHARE_GC_PARALLEL_PARALLELSCAVENGEHEAP_INLINE_HPP
--- a/src/hotspot/share/gc/parallel/pcTasks.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/pcTasks.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_PCTASKS_HPP
-#define SHARE_VM_GC_PARALLEL_PCTASKS_HPP
+#ifndef SHARE_GC_PARALLEL_PCTASKS_HPP
+#define SHARE_GC_PARALLEL_PCTASKS_HPP
 
 #include "gc/parallel/gcTaskManager.hpp"
 #include "gc/parallel/psParallelCompact.hpp"
@@ -205,4 +205,4 @@
 
   virtual void do_it(GCTaskManager* manager, uint which);
 };
-#endif // SHARE_VM_GC_PARALLEL_PCTASKS_HPP
+#endif // SHARE_GC_PARALLEL_PCTASKS_HPP
--- a/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/psAdaptiveSizePolicy.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_PSADAPTIVESIZEPOLICY_HPP
-#define SHARE_VM_GC_PARALLEL_PSADAPTIVESIZEPOLICY_HPP
+#ifndef SHARE_GC_PARALLEL_PSADAPTIVESIZEPOLICY_HPP
+#define SHARE_GC_PARALLEL_PSADAPTIVESIZEPOLICY_HPP
 
 #include "gc/shared/adaptiveSizePolicy.hpp"
 #include "gc/shared/gcCause.hpp"
@@ -402,4 +402,4 @@
   void decay_supplemental_growth(bool is_full_gc);
 };
 
-#endif // SHARE_VM_GC_PARALLEL_PSADAPTIVESIZEPOLICY_HPP
+#endif // SHARE_GC_PARALLEL_PSADAPTIVESIZEPOLICY_HPP
--- a/src/hotspot/share/gc/parallel/psCardTable.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/psCardTable.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_PSCARDTABLE_HPP
-#define SHARE_VM_GC_PARALLEL_PSCARDTABLE_HPP
+#ifndef SHARE_GC_PARALLEL_PSCARDTABLE_HPP
+#define SHARE_GC_PARALLEL_PSCARDTABLE_HPP
 
 #include "gc/shared/cardTable.hpp"
 #include "oops/oop.hpp"
@@ -109,4 +109,4 @@
   void verify_all_young_refs_precise();
 };
 
-#endif // SHARE_VM_GC_PARALLEL_PSCARDTABLE
+#endif // SHARE_GC_PARALLEL_PSCARDTABLE_HPP
--- a/src/hotspot/share/gc/parallel/psClosure.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/psClosure.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_PSCLOSURE_INLINE_HPP
-#define SHARE_VM_GC_PARALLEL_PSCLOSURE_INLINE_HPP
+#ifndef SHARE_GC_PARALLEL_PSCLOSURE_INLINE_HPP
+#define SHARE_GC_PARALLEL_PSCLOSURE_INLINE_HPP
 
 #include "gc/parallel/psPromotionManager.inline.hpp"
 #include "gc/parallel/psScavenge.inline.hpp"
@@ -118,4 +118,4 @@
   }
 };
 
-#endif
+#endif // SHARE_GC_PARALLEL_PSCLOSURE_INLINE_HPP
--- a/src/hotspot/share/gc/parallel/psCompactionManager.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/psCompactionManager.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_PSCOMPACTIONMANAGER_HPP
-#define SHARE_VM_GC_PARALLEL_PSCOMPACTIONMANAGER_HPP
+#ifndef SHARE_GC_PARALLEL_PSCOMPACTIONMANAGER_HPP
+#define SHARE_GC_PARALLEL_PSCOMPACTIONMANAGER_HPP
 
 #include "gc/shared/taskqueue.hpp"
 #include "memory/allocation.hpp"
@@ -194,4 +194,4 @@
   return _marking_stack.is_empty() && _objarray_stack.is_empty();
 }
 
-#endif // SHARE_VM_GC_PARALLEL_PSCOMPACTIONMANAGER_HPP
+#endif // SHARE_GC_PARALLEL_PSCOMPACTIONMANAGER_HPP
--- a/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/psCompactionManager.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_PSCOMPACTIONMANAGER_INLINE_HPP
-#define SHARE_VM_GC_PARALLEL_PSCOMPACTIONMANAGER_INLINE_HPP
+#ifndef SHARE_GC_PARALLEL_PSCOMPACTIONMANAGER_INLINE_HPP
+#define SHARE_GC_PARALLEL_PSCOMPACTIONMANAGER_INLINE_HPP
 
 #include "classfile/javaClasses.inline.hpp"
 #include "gc/parallel/parMarkBitMap.hpp"
@@ -177,4 +177,4 @@
   }
 }
 
-#endif // SHARE_VM_GC_PARALLEL_PSCOMPACTIONMANAGER_INLINE_HPP
+#endif // SHARE_GC_PARALLEL_PSCOMPACTIONMANAGER_INLINE_HPP
--- a/src/hotspot/share/gc/parallel/psFileBackedVirtualspace.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/psFileBackedVirtualspace.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_PSFILEBACKEDVIRTUALSPACE_HPP
-#define SHARE_VM_GC_PARALLEL_PSFILEBACKEDVIRTUALSPACE_HPP
+#ifndef SHARE_GC_PARALLEL_PSFILEBACKEDVIRTUALSPACE_HPP
+#define SHARE_GC_PARALLEL_PSFILEBACKEDVIRTUALSPACE_HPP
 
 #include "gc/parallel/psVirtualspace.hpp"
 
@@ -42,5 +42,4 @@
   size_t expand_into(PSVirtualSpace* space, size_t bytes);
   void   release();
 };
-#endif // SHARE_VM_GC_PARALLEL_PSFILEBACKEDVIRTUALSPACE_HPP
-
+#endif // SHARE_GC_PARALLEL_PSFILEBACKEDVIRTUALSPACE_HPP
--- a/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/psGCAdaptivePolicyCounters.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_PSGCADAPTIVEPOLICYCOUNTERS_HPP
-#define SHARE_VM_GC_PARALLEL_PSGCADAPTIVEPOLICYCOUNTERS_HPP
+#ifndef SHARE_GC_PARALLEL_PSGCADAPTIVEPOLICYCOUNTERS_HPP
+#define SHARE_GC_PARALLEL_PSGCADAPTIVEPOLICYCOUNTERS_HPP
 
 #include "gc/parallel/gcAdaptivePolicyCounters.hpp"
 #include "gc/parallel/psAdaptiveSizePolicy.hpp"
@@ -208,4 +208,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_PARALLEL_PSGCADAPTIVEPOLICYCOUNTERS_HPP
+#endif // SHARE_GC_PARALLEL_PSGCADAPTIVEPOLICYCOUNTERS_HPP
--- a/src/hotspot/share/gc/parallel/psGenerationCounters.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/psGenerationCounters.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,6 +1,5 @@
-
 /*
- * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_PSGENERATIONCOUNTERS_HPP
-#define SHARE_VM_GC_PARALLEL_PSGENERATIONCOUNTERS_HPP
+#ifndef SHARE_GC_PARALLEL_PSGENERATIONCOUNTERS_HPP
+#define SHARE_GC_PARALLEL_PSGENERATIONCOUNTERS_HPP
 
 #include "gc/parallel/psVirtualspace.hpp"
 #include "gc/shared/generationCounters.hpp"
@@ -49,4 +48,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_PARALLEL_PSGENERATIONCOUNTERS_HPP
+#endif // SHARE_GC_PARALLEL_PSGENERATIONCOUNTERS_HPP
--- a/src/hotspot/share/gc/parallel/psMarkSweep.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/psMarkSweep.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_PSMARKSWEEP_HPP
-#define SHARE_VM_GC_PARALLEL_PSMARKSWEEP_HPP
+#ifndef SHARE_GC_PARALLEL_PSMARKSWEEP_HPP
+#define SHARE_GC_PARALLEL_PSMARKSWEEP_HPP
 
 #include "gc/serial/markSweep.hpp"
 #include "gc/shared/collectorCounters.hpp"
@@ -86,4 +86,4 @@
   static jlong millis_since_last_gc();
 };
 
-#endif // SHARE_VM_GC_PARALLEL_PSMARKSWEEP_HPP
+#endif // SHARE_GC_PARALLEL_PSMARKSWEEP_HPP
--- a/src/hotspot/share/gc/parallel/psMarkSweepDecorator.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/psMarkSweepDecorator.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_PSMARKSWEEPDECORATOR_HPP
-#define SHARE_VM_GC_PARALLEL_PSMARKSWEEPDECORATOR_HPP
+#ifndef SHARE_GC_PARALLEL_PSMARKSWEEPDECORATOR_HPP
+#define SHARE_GC_PARALLEL_PSMARKSWEEPDECORATOR_HPP
 
 #include "gc/parallel/mutableSpace.hpp"
 
@@ -78,4 +78,4 @@
   void compact(bool mangle_free_space);
 };
 
-#endif // SHARE_VM_GC_PARALLEL_PSMARKSWEEPDECORATOR_HPP
+#endif // SHARE_GC_PARALLEL_PSMARKSWEEPDECORATOR_HPP
--- a/src/hotspot/share/gc/parallel/psMemoryPool.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/psMemoryPool.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_SERVICES_PSMEMORYPOOL_HPP
-#define SHARE_VM_SERVICES_PSMEMORYPOOL_HPP
+#ifndef SHARE_GC_PARALLEL_PSMEMORYPOOL_HPP
+#define SHARE_GC_PARALLEL_PSMEMORYPOOL_HPP
 
 #include "gc/parallel/mutableSpace.hpp"
 #include "gc/parallel/psOldGen.hpp"
@@ -86,4 +86,4 @@
   }
 };
 
-#endif // SHARE_VM_SERVICES_PSMEMORYPOOL_HPP
+#endif // SHARE_GC_PARALLEL_PSMEMORYPOOL_HPP
--- a/src/hotspot/share/gc/parallel/psOldGen.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/psOldGen.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_PSOLDGEN_HPP
-#define SHARE_VM_GC_PARALLEL_PSOLDGEN_HPP
+#ifndef SHARE_GC_PARALLEL_PSOLDGEN_HPP
+#define SHARE_GC_PARALLEL_PSOLDGEN_HPP
 
 #include "gc/parallel/mutableSpace.hpp"
 #include "gc/parallel/objectStartArray.hpp"
@@ -223,4 +223,4 @@
   void record_spaces_top() PRODUCT_RETURN;
 };
 
-#endif // SHARE_VM_GC_PARALLEL_PSOLDGEN_HPP
+#endif // SHARE_GC_PARALLEL_PSOLDGEN_HPP
--- a/src/hotspot/share/gc/parallel/psParallelCompact.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_PSPARALLELCOMPACT_HPP
-#define SHARE_VM_GC_PARALLEL_PSPARALLELCOMPACT_HPP
+#ifndef SHARE_GC_PARALLEL_PSPARALLELCOMPACT_HPP
+#define SHARE_GC_PARALLEL_PSPARALLELCOMPACT_HPP
 
 #include "gc/parallel/mutableSpace.hpp"
 #include "gc/parallel/objectStartArray.hpp"
@@ -1301,4 +1301,4 @@
   ObjectStartArray* const _start_array;
 };
 
-#endif // SHARE_VM_GC_PARALLEL_PSPARALLELCOMPACT_HPP
+#endif // SHARE_GC_PARALLEL_PSPARALLELCOMPACT_HPP
--- a/src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_PSPARALLELCOMPACT_INLINE_HPP
-#define SHARE_VM_GC_PARALLEL_PSPARALLELCOMPACT_INLINE_HPP
+#ifndef SHARE_GC_PARALLEL_PSPARALLELCOMPACT_INLINE_HPP
+#define SHARE_GC_PARALLEL_PSPARALLELCOMPACT_INLINE_HPP
 
 #include "gc/parallel/parallelScavengeHeap.hpp"
 #include "gc/parallel/parMarkBitMap.inline.hpp"
@@ -141,4 +141,4 @@
   ParCompactionManager* _cm;
 };
 
-#endif // SHARE_VM_GC_PARALLEL_PSPARALLELCOMPACT_INLINE_HPP
+#endif // SHARE_GC_PARALLEL_PSPARALLELCOMPACT_INLINE_HPP
--- a/src/hotspot/share/gc/parallel/psPromotionLAB.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/psPromotionLAB.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_PSPROMOTIONLAB_HPP
-#define SHARE_VM_GC_PARALLEL_PSPROMOTIONLAB_HPP
+#ifndef SHARE_GC_PARALLEL_PSPROMOTIONLAB_HPP
+#define SHARE_GC_PARALLEL_PSPROMOTIONLAB_HPP
 
 #include "gc/parallel/objectStartArray.hpp"
 #include "gc/shared/collectedHeap.hpp"
@@ -134,4 +134,4 @@
   debug_only(virtual bool lab_is_valid(MemRegion lab));
 };
 
-#endif // SHARE_VM_GC_PARALLEL_PSPROMOTIONLAB_HPP
+#endif // SHARE_GC_PARALLEL_PSPROMOTIONLAB_HPP
--- a/src/hotspot/share/gc/parallel/psPromotionLAB.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/psPromotionLAB.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_PSPROMOTIONLAB_INLINE_HPP
-#define SHARE_VM_GC_PARALLEL_PSPROMOTIONLAB_INLINE_HPP
+#ifndef SHARE_GC_PARALLEL_PSPROMOTIONLAB_INLINE_HPP
+#define SHARE_GC_PARALLEL_PSPROMOTIONLAB_INLINE_HPP
 
 #include "gc/parallel/psPromotionLAB.hpp"
 #include "gc/shared/collectedHeap.inline.hpp"
@@ -50,4 +50,4 @@
   }
 }
 
-#endif // SHARE_VM_GC_PARALLEL_PSPROMOTIONLAB_INLINE_HPP
+#endif // SHARE_GC_PARALLEL_PSPROMOTIONLAB_INLINE_HPP
--- a/src/hotspot/share/gc/parallel/psPromotionManager.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/psPromotionManager.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_PSPROMOTIONMANAGER_HPP
-#define SHARE_VM_GC_PARALLEL_PSPROMOTIONMANAGER_HPP
+#ifndef SHARE_GC_PARALLEL_PSPROMOTIONMANAGER_HPP
+#define SHARE_GC_PARALLEL_PSPROMOTIONMANAGER_HPP
 
 #include "gc/parallel/psPromotionLAB.hpp"
 #include "gc/shared/copyFailedInfo.hpp"
@@ -212,4 +212,4 @@
   void push_contents(oop obj);
 };
 
-#endif // SHARE_VM_GC_PARALLEL_PSPROMOTIONMANAGER_HPP
+#endif // SHARE_GC_PARALLEL_PSPROMOTIONMANAGER_HPP
--- a/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/psPromotionManager.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_PSPROMOTIONMANAGER_INLINE_HPP
-#define SHARE_VM_GC_PARALLEL_PSPROMOTIONMANAGER_INLINE_HPP
+#ifndef SHARE_GC_PARALLEL_PSPROMOTIONMANAGER_INLINE_HPP
+#define SHARE_GC_PARALLEL_PSPROMOTIONMANAGER_INLINE_HPP
 
 #include "gc/parallel/parallelScavengeHeap.hpp"
 #include "gc/parallel/parMarkBitMap.inline.hpp"
@@ -375,4 +375,4 @@
 }
 #endif // TASKQUEUE_STATS
 
-#endif // SHARE_VM_GC_PARALLEL_PSPROMOTIONMANAGER_INLINE_HPP
+#endif // SHARE_GC_PARALLEL_PSPROMOTIONMANAGER_INLINE_HPP
--- a/src/hotspot/share/gc/parallel/psScavenge.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/psScavenge.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_PSSCAVENGE_HPP
-#define SHARE_VM_GC_PARALLEL_PSSCAVENGE_HPP
+#ifndef SHARE_GC_PARALLEL_PSSCAVENGE_HPP
+#define SHARE_GC_PARALLEL_PSSCAVENGE_HPP
 
 #include "gc/parallel/psCardTable.hpp"
 #include "gc/parallel/psVirtualspace.hpp"
@@ -157,4 +157,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_PARALLEL_PSSCAVENGE_HPP
+#endif // SHARE_GC_PARALLEL_PSSCAVENGE_HPP
--- a/src/hotspot/share/gc/parallel/psScavenge.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/psScavenge.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_PSSCAVENGE_INLINE_HPP
-#define SHARE_VM_GC_PARALLEL_PSSCAVENGE_INLINE_HPP
+#ifndef SHARE_GC_PARALLEL_PSSCAVENGE_INLINE_HPP
+#define SHARE_GC_PARALLEL_PSSCAVENGE_INLINE_HPP
 
 #include "gc/parallel/parallelScavengeHeap.hpp"
 #include "gc/parallel/psScavenge.hpp"
@@ -64,4 +64,4 @@
   return should_scavenge(p);
 }
 
-#endif // SHARE_VM_GC_PARALLEL_PSSCAVENGE_INLINE_HPP
+#endif // SHARE_GC_PARALLEL_PSSCAVENGE_INLINE_HPP
--- a/src/hotspot/share/gc/parallel/psTasks.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/psTasks.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_PSTASKS_HPP
-#define SHARE_VM_GC_PARALLEL_PSTASKS_HPP
+#ifndef SHARE_GC_PARALLEL_PSTASKS_HPP
+#define SHARE_GC_PARALLEL_PSTASKS_HPP
 
 #include "utilities/growableArray.hpp"
 
@@ -177,4 +177,4 @@
   virtual void do_it(GCTaskManager* manager, uint which);
 };
 
-#endif // SHARE_VM_GC_PARALLEL_PSTASKS_HPP
+#endif // SHARE_GC_PARALLEL_PSTASKS_HPP
--- a/src/hotspot/share/gc/parallel/psVMOperations.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/psVMOperations.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_PSVMOPERATIONS_HPP
-#define SHARE_VM_GC_PARALLEL_PSVMOPERATIONS_HPP
+#ifndef SHARE_GC_PARALLEL_PSVMOPERATIONS_HPP
+#define SHARE_GC_PARALLEL_PSVMOPERATIONS_HPP
 
 #include "gc/parallel/parallelScavengeHeap.hpp"
 #include "gc/shared/gcCause.hpp"
@@ -46,4 +46,4 @@
   virtual void doit();
 };
 
-#endif // SHARE_VM_GC_PARALLEL_PSVMOPERATIONS_HPP
+#endif // SHARE_GC_PARALLEL_PSVMOPERATIONS_HPP
--- a/src/hotspot/share/gc/parallel/psVirtualspace.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/psVirtualspace.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_PSVIRTUALSPACE_HPP
-#define SHARE_VM_GC_PARALLEL_PSVIRTUALSPACE_HPP
+#ifndef SHARE_GC_PARALLEL_PSVIRTUALSPACE_HPP
+#define SHARE_GC_PARALLEL_PSVIRTUALSPACE_HPP
 
 #include "memory/allocation.hpp"
 #include "memory/virtualspace.hpp"
@@ -179,4 +179,4 @@
   _committed_high_addr = high_addr;
 }
 
-#endif // SHARE_VM_GC_PARALLEL_PSVIRTUALSPACE_HPP
+#endif // SHARE_GC_PARALLEL_PSVIRTUALSPACE_HPP
--- a/src/hotspot/share/gc/parallel/psYoungGen.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/psYoungGen.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_PSYOUNGGEN_HPP
-#define SHARE_VM_GC_PARALLEL_PSYOUNGGEN_HPP
+#ifndef SHARE_GC_PARALLEL_PSYOUNGGEN_HPP
+#define SHARE_GC_PARALLEL_PSYOUNGGEN_HPP
 
 #include "gc/parallel/mutableSpace.hpp"
 #include "gc/parallel/objectStartArray.hpp"
@@ -197,4 +197,4 @@
   void record_spaces_top() PRODUCT_RETURN;
 };
 
-#endif // SHARE_VM_GC_PARALLEL_PSYOUNGGEN_HPP
+#endif // SHARE_GC_PARALLEL_PSYOUNGGEN_HPP
--- a/src/hotspot/share/gc/parallel/spaceCounters.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/spaceCounters.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_SPACECOUNTERS_HPP
-#define SHARE_VM_GC_PARALLEL_SPACECOUNTERS_HPP
+#ifndef SHARE_GC_PARALLEL_SPACECOUNTERS_HPP
+#define SHARE_GC_PARALLEL_SPACECOUNTERS_HPP
 
 #include "gc/parallel/immutableSpace.hpp"
 #include "gc/parallel/mutableSpace.hpp"
@@ -83,4 +83,4 @@
     }
 };
 
-#endif // SHARE_VM_GC_PARALLEL_SPACECOUNTERS_HPP
+#endif // SHARE_GC_PARALLEL_SPACECOUNTERS_HPP
--- a/src/hotspot/share/gc/parallel/vmStructs_parallelgc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/parallel/vmStructs_parallelgc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_PARALLEL_VMSTRUCTS_PARALLELGC_HPP
-#define SHARE_VM_GC_PARALLEL_VMSTRUCTS_PARALLELGC_HPP
+#ifndef SHARE_GC_PARALLEL_VMSTRUCTS_PARALLELGC_HPP
+#define SHARE_GC_PARALLEL_VMSTRUCTS_PARALLELGC_HPP
 
 #include "gc/parallel/asPSOldGen.hpp"
 #include "gc/parallel/asPSYoungGen.hpp"
@@ -108,4 +108,4 @@
 #define VM_INT_CONSTANTS_PARALLELGC(declare_constant,                     \
                                     declare_constant_with_value)
 
-#endif // SHARE_VM_GC_PARALLEL_VMSTRUCTS_PARALLELGC_HPP
+#endif // SHARE_GC_PARALLEL_VMSTRUCTS_PARALLELGC_HPP
--- a/src/hotspot/share/gc/serial/cSpaceCounters.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/serial/cSpaceCounters.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SERIAL_CSPACECOUNTERS_HPP
-#define SHARE_VM_GC_SERIAL_CSPACECOUNTERS_HPP
+#ifndef SHARE_GC_SERIAL_CSPACECOUNTERS_HPP
+#define SHARE_GC_SERIAL_CSPACECOUNTERS_HPP
 
 #include "gc/shared/generationCounters.hpp"
 #include "gc/shared/space.hpp"
@@ -71,4 +71,4 @@
     jlong take_sample();
 };
 
-#endif // SHARE_VM_GC_SERIAL_CSPACECOUNTERS_HPP
+#endif // SHARE_GC_SERIAL_CSPACECOUNTERS_HPP
--- a/src/hotspot/share/gc/serial/defNewGeneration.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/serial/defNewGeneration.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SERIAL_DEFNEWGENERATION_HPP
-#define SHARE_VM_GC_SERIAL_DEFNEWGENERATION_HPP
+#ifndef SHARE_GC_SERIAL_DEFNEWGENERATION_HPP
+#define SHARE_GC_SERIAL_DEFNEWGENERATION_HPP
 
 #include "gc/serial/cSpaceCounters.hpp"
 #include "gc/shared/ageTable.hpp"
@@ -346,4 +346,4 @@
   void swap_spaces();
 };
 
-#endif // SHARE_VM_GC_SERIAL_DEFNEWGENERATION_HPP
+#endif // SHARE_GC_SERIAL_DEFNEWGENERATION_HPP
--- a/src/hotspot/share/gc/serial/defNewGeneration.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/serial/defNewGeneration.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SERIAL_DEFNEWGENERATION_INLINE_HPP
-#define SHARE_VM_GC_SERIAL_DEFNEWGENERATION_INLINE_HPP
+#ifndef SHARE_GC_SERIAL_DEFNEWGENERATION_INLINE_HPP
+#define SHARE_GC_SERIAL_DEFNEWGENERATION_INLINE_HPP
 
 #include "gc/serial/defNewGeneration.hpp"
 #include "gc/shared/cardTableRS.hpp"
@@ -98,4 +98,4 @@
   save_marks();
 }
 
-#endif // SHARE_VM_GC_SERIAL_DEFNEWGENERATION_INLINE_HPP
+#endif // SHARE_GC_SERIAL_DEFNEWGENERATION_INLINE_HPP
--- a/src/hotspot/share/gc/serial/genMarkSweep.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/serial/genMarkSweep.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SERIAL_GENMARKSWEEP_HPP
-#define SHARE_VM_GC_SERIAL_GENMARKSWEEP_HPP
+#ifndef SHARE_GC_SERIAL_GENMARKSWEEP_HPP
+#define SHARE_GC_SERIAL_GENMARKSWEEP_HPP
 
 #include "gc/serial/markSweep.hpp"
 
@@ -48,4 +48,4 @@
   static void deallocate_stacks();
 };
 
-#endif // SHARE_VM_GC_SERIAL_GENMARKSWEEP_HPP
+#endif // SHARE_GC_SERIAL_GENMARKSWEEP_HPP
--- a/src/hotspot/share/gc/serial/markSweep.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/serial/markSweep.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SERIAL_MARKSWEEP_HPP
-#define SHARE_VM_GC_SERIAL_MARKSWEEP_HPP
+#ifndef SHARE_GC_SERIAL_MARKSWEEP_HPP
+#define SHARE_GC_SERIAL_MARKSWEEP_HPP
 
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/genOopClosures.hpp"
@@ -211,4 +211,4 @@
   void restore();
 };
 
-#endif // SHARE_VM_GC_SERIAL_MARKSWEEP_HPP
+#endif // SHARE_GC_SERIAL_MARKSWEEP_HPP
--- a/src/hotspot/share/gc/serial/markSweep.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/serial/markSweep.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SERIAL_MARKSWEEP_INLINE_HPP
-#define SHARE_VM_GC_SERIAL_MARKSWEEP_INLINE_HPP
+#ifndef SHARE_GC_SERIAL_MARKSWEEP_INLINE_HPP
+#define SHARE_GC_SERIAL_MARKSWEEP_INLINE_HPP
 
 #include "classfile/classLoaderData.inline.hpp"
 #include "gc/serial/markSweep.hpp"
@@ -104,4 +104,4 @@
   return obj->oop_iterate_size(&MarkSweep::adjust_pointer_closure);
 }
 
-#endif // SHARE_VM_GC_SERIAL_MARKSWEEP_INLINE_HPP
+#endif // SHARE_GC_SERIAL_MARKSWEEP_INLINE_HPP
--- a/src/hotspot/share/gc/serial/serialHeap.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/serial/serialHeap.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SERIAL_SERIALHEAP_HPP
-#define SHARE_VM_GC_SERIAL_SERIALHEAP_HPP
+#ifndef SHARE_GC_SERIAL_SERIALHEAP_HPP
+#define SHARE_GC_SERIAL_SERIALHEAP_HPP
 
 #include "gc/serial/defNewGeneration.hpp"
 #include "gc/serial/tenuredGeneration.hpp"
@@ -83,4 +83,4 @@
                                     OopClosureType2* older);
 };
 
-#endif // SHARE_VM_GC_CMS_CMSHEAP_HPP
+#endif // SHARE_GC_SERIAL_SERIALHEAP_HPP
--- a/src/hotspot/share/gc/serial/tenuredGeneration.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SERIAL_TENUREDGENERATION_HPP
-#define SHARE_VM_GC_SERIAL_TENUREDGENERATION_HPP
+#ifndef SHARE_GC_SERIAL_TENUREDGENERATION_HPP
+#define SHARE_GC_SERIAL_TENUREDGENERATION_HPP
 
 #include "gc/serial/cSpaceCounters.hpp"
 #include "gc/shared/cardGeneration.hpp"
@@ -121,4 +121,4 @@
   virtual void print_on(outputStream* st) const;
 };
 
-#endif // SHARE_VM_GC_SERIAL_TENUREDGENERATION_HPP
+#endif // SHARE_GC_SERIAL_TENUREDGENERATION_HPP
--- a/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/serial/tenuredGeneration.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SERIAL_TENUREDGENERATION_INLINE_HPP
-#define SHARE_VM_GC_SERIAL_TENUREDGENERATION_INLINE_HPP
+#ifndef SHARE_GC_SERIAL_TENUREDGENERATION_INLINE_HPP
+#define SHARE_GC_SERIAL_TENUREDGENERATION_INLINE_HPP
 
 #include "gc/serial/tenuredGeneration.hpp"
 #include "gc/shared/space.inline.hpp"
@@ -61,4 +61,4 @@
   save_marks();
 }
 
-#endif // SHARE_VM_GC_SERIAL_TENUREDGENERATION_INLINE_HPP
+#endif // SHARE_GC_SERIAL_TENUREDGENERATION_INLINE_HPP
--- a/src/hotspot/share/gc/serial/vmStructs_serial.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/serial/vmStructs_serial.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_GC_SERIAL_VMSTRUCTS_HPP
-#define SHARE_GC_SERIAL_VMSTRUCTS_HPP
+#ifndef SHARE_GC_SERIAL_VMSTRUCTS_SERIAL_HPP
+#define SHARE_GC_SERIAL_VMSTRUCTS_SERIAL_HPP
 
 #include "gc/serial/serialHeap.hpp"
 #include "gc/serial/tenuredGeneration.hpp"
--- a/src/hotspot/share/gc/shared/accessBarrierSupport.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/accessBarrierSupport.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_ACCESSBARRIERSUPPORT_HPP
-#define SHARE_VM_GC_SHARED_ACCESSBARRIERSUPPORT_HPP
+#ifndef SHARE_GC_SHARED_ACCESSBARRIERSUPPORT_HPP
+#define SHARE_GC_SHARED_ACCESSBARRIERSUPPORT_HPP
 
 #include "memory/allocation.hpp"
 #include "oops/access.hpp"
@@ -41,4 +41,4 @@
   static DecoratorSet resolve_possibly_unknown_oop_ref_strength(oop base, ptrdiff_t offset);
 };
 
-#endif // SHARE_VM_GC_SHARED_ACCESSBARRIERSUPPORT_HPP
+#endif // SHARE_GC_SHARED_ACCESSBARRIERSUPPORT_HPP
--- a/src/hotspot/share/gc/shared/accessBarrierSupport.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/accessBarrierSupport.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_ACCESSBARRIERSUPPORT_INLINE_HPP
-#define SHARE_VM_GC_SHARED_ACCESSBARRIERSUPPORT_INLINE_HPP
+#ifndef SHARE_GC_SHARED_ACCESSBARRIERSUPPORT_INLINE_HPP
+#define SHARE_GC_SHARED_ACCESSBARRIERSUPPORT_INLINE_HPP
 
 #include "gc/shared/accessBarrierSupport.hpp"
 
@@ -36,4 +36,4 @@
   }
 }
 
-#endif // SHARE_VM_GC_SHARED_ACCESSBARRIERSUPPORT_INLINE_HPP
+#endif // SHARE_GC_SHARED_ACCESSBARRIERSUPPORT_INLINE_HPP
--- a/src/hotspot/share/gc/shared/adaptiveSizePolicy.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/adaptiveSizePolicy.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_ADAPTIVESIZEPOLICY_HPP
-#define SHARE_VM_GC_SHARED_ADAPTIVESIZEPOLICY_HPP
+#ifndef SHARE_GC_SHARED_ADAPTIVESIZEPOLICY_HPP
+#define SHARE_GC_SHARED_ADAPTIVESIZEPOLICY_HPP
 
 #include "gc/shared/gcCause.hpp"
 #include "gc/shared/gcUtil.hpp"
@@ -473,4 +473,4 @@
   void print_tenuring_threshold(uint new_tenuring_threshold) const;
 };
 
-#endif // SHARE_VM_GC_SHARED_ADAPTIVESIZEPOLICY_HPP
+#endif // SHARE_GC_SHARED_ADAPTIVESIZEPOLICY_HPP
--- a/src/hotspot/share/gc/shared/ageTable.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/ageTable.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,14 +22,14 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_AGETABLE_HPP
-#define SHARE_VM_GC_SHARED_AGETABLE_HPP
+#ifndef SHARE_GC_SHARED_AGETABLE_HPP
+#define SHARE_GC_SHARED_AGETABLE_HPP
 
 #include "oops/markOop.hpp"
 #include "oops/oop.hpp"
 #include "runtime/perfData.hpp"
 
-/* Copyright (c) 1992, 2018, Oracle and/or its affiliates, and Stanford University.
+/* Copyright (c) 1992, 2019, Oracle and/or its affiliates, and Stanford University.
    See the LICENSE file for license information. */
 
 // Age table for adaptive feedback-mediated tenuring (scavenging)
@@ -74,4 +74,4 @@
   PerfVariable* _perf_sizes[table_size];
 };
 
-#endif // SHARE_VM_GC_SHARED_AGETABLE_HPP
+#endif // SHARE_GC_SHARED_AGETABLE_HPP
--- a/src/hotspot/share/gc/shared/ageTable.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/ageTable.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_AGETABLE_INLINE_HPP
-#define SHARE_VM_GC_SHARED_AGETABLE_INLINE_HPP
+#ifndef SHARE_GC_SHARED_AGETABLE_INLINE_HPP
+#define SHARE_GC_SHARED_AGETABLE_INLINE_HPP
 
 #include "gc/shared/ageTable.hpp"
 #include "oops/oop.inline.hpp"
@@ -33,4 +33,4 @@
   add(p->age(), oop_size);
 }
 
-#endif // SHARE_VM_GC_SHARED_AGETABLE_INLINE_HPP
+#endif // SHARE_GC_SHARED_AGETABLE_INLINE_HPP
--- a/src/hotspot/share/gc/shared/ageTableTracer.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/ageTableTracer.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_AGETABLETRACER_HPP
-#define SHARE_VM_GC_SHARED_AGETABLETRACER_HPP
+#ifndef SHARE_GC_SHARED_AGETABLETRACER_HPP
+#define SHARE_GC_SHARED_AGETABLETRACER_HPP
 
 #include "memory/allocation.hpp"
 
@@ -33,4 +33,4 @@
     static bool is_tenuring_distribution_event_enabled();
 };
 
-#endif // SHARE_VM_GC_SHARED_AGETABLETRACER_HPP
+#endif // SHARE_GC_SHARED_AGETABLETRACER_HPP
--- a/src/hotspot/share/gc/shared/allocTracer.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/allocTracer.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_ALLOCTRACER_HPP
-#define SHARE_VM_GC_SHARED_ALLOCTRACER_HPP
+#ifndef SHARE_GC_SHARED_ALLOCTRACER_HPP
+#define SHARE_GC_SHARED_ALLOCTRACER_HPP
 
 #include "memory/allocation.hpp"
 #include "runtime/handles.hpp"
@@ -35,4 +35,4 @@
     static void send_allocation_requiring_gc_event(size_t size, uint gcId);
 };
 
-#endif // SHARE_VM_GC_SHARED_ALLOCTRACER_HPP
+#endif // SHARE_GC_SHARED_ALLOCTRACER_HPP
--- a/src/hotspot/share/gc/shared/barrierSet.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/barrierSet.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_BARRIERSET_HPP
-#define SHARE_VM_GC_SHARED_BARRIERSET_HPP
+#ifndef SHARE_GC_SHARED_BARRIERSET_HPP
+#define SHARE_GC_SHARED_BARRIERSET_HPP
 
 #include "gc/shared/barrierSetConfig.hpp"
 #include "memory/memRegion.hpp"
@@ -321,4 +321,4 @@
   return static_cast<T*>(bs);
 }
 
-#endif // SHARE_VM_GC_SHARED_BARRIERSET_HPP
+#endif // SHARE_GC_SHARED_BARRIERSET_HPP
--- a/src/hotspot/share/gc/shared/barrierSet.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/barrierSet.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  * questions.
  */
 
-#ifndef SHARE_VM_GC_SHARED_BARRIERSET_INLINE_HPP
-#define SHARE_VM_GC_SHARED_BARRIERSET_INLINE_HPP
+#ifndef SHARE_GC_SHARED_BARRIERSET_INLINE_HPP
+#define SHARE_GC_SHARED_BARRIERSET_INLINE_HPP
 
 #include "gc/shared/barrierSet.hpp"
 #include "oops/accessDecorators.hpp"
@@ -57,4 +57,4 @@
   return true;
 }
 
-#endif // SHARE_VM_GC_SHARED_BARRIERSET_INLINE_HPP
+#endif // SHARE_GC_SHARED_BARRIERSET_INLINE_HPP
--- a/src/hotspot/share/gc/shared/barrierSetConfig.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/barrierSetConfig.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_BARRIERSETCONFIG_HPP
-#define SHARE_VM_GC_SHARED_BARRIERSETCONFIG_HPP
+#ifndef SHARE_GC_SHARED_BARRIERSETCONFIG_HPP
+#define SHARE_GC_SHARED_BARRIERSETCONFIG_HPP
 
 #include "utilities/macros.hpp"
 
@@ -59,4 +59,4 @@
 
 #define BT_BUILDTIME_DECORATORS (ACCESS_PRIMITIVE_SUPPORT | ACCESS_TO_SPACE_INVARIANT_SUPPORT)
 
-#endif // SHARE_VM_GC_SHARED_BARRIERSETCONFIG_HPP
+#endif // SHARE_GC_SHARED_BARRIERSETCONFIG_HPP
--- a/src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/barrierSetConfig.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_BARRIERSETCONFIG_INLINE_HPP
-#define SHARE_VM_GC_SHARED_BARRIERSETCONFIG_INLINE_HPP
+#ifndef SHARE_GC_SHARED_BARRIERSETCONFIG_INLINE_HPP
+#define SHARE_GC_SHARED_BARRIERSETCONFIG_INLINE_HPP
 
 #include "gc/shared/barrierSetConfig.hpp"
 
@@ -43,4 +43,4 @@
 #include "gc/z/zBarrierSet.inline.hpp"
 #endif
 
-#endif // SHARE_VM_GC_SHARED_BARRIERSETCONFIG_INLINE_HPP
+#endif // SHARE_GC_SHARED_BARRIERSETCONFIG_INLINE_HPP
--- a/src/hotspot/share/gc/shared/barrierSetNMethod.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/barrierSetNMethod.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_CODE_NMETHOD_BARRIER_HPP
-#define SHARE_CODE_NMETHOD_BARRIER_HPP
+#ifndef SHARE_GC_SHARED_BARRIERSETNMETHOD_HPP
+#define SHARE_GC_SHARED_BARRIERSETNMETHOD_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -49,4 +49,4 @@
 };
 
 
-#endif // SHARE_CODE_NMETHOD_BARRIER_HPP
+#endif // SHARE_GC_SHARED_BARRIERSETNMETHOD_HPP
--- a/src/hotspot/share/gc/shared/blockOffsetTable.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/blockOffsetTable.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_BLOCKOFFSETTABLE_HPP
-#define SHARE_VM_GC_SHARED_BLOCKOFFSETTABLE_HPP
+#ifndef SHARE_GC_SHARED_BLOCKOFFSETTABLE_HPP
+#define SHARE_GC_SHARED_BLOCKOFFSETTABLE_HPP
 
 #include "gc/shared/memset_with_concurrent_readers.hpp"
 #include "memory/allocation.hpp"
@@ -545,4 +545,4 @@
   virtual size_t last_active_index() const;
 };
 
-#endif // SHARE_VM_GC_SHARED_BLOCKOFFSETTABLE_HPP
+#endif // SHARE_GC_SHARED_BLOCKOFFSETTABLE_HPP
--- a/src/hotspot/share/gc/shared/blockOffsetTable.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/blockOffsetTable.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_BLOCKOFFSETTABLE_INLINE_HPP
-#define SHARE_VM_GC_SHARED_BLOCKOFFSETTABLE_INLINE_HPP
+#ifndef SHARE_GC_SHARED_BLOCKOFFSETTABLE_INLINE_HPP
+#define SHARE_GC_SHARED_BLOCKOFFSETTABLE_INLINE_HPP
 
 #include "gc/shared/blockOffsetTable.hpp"
 #include "gc/shared/space.hpp"
@@ -96,4 +96,4 @@
   }
 }
 
-#endif // SHARE_VM_GC_SHARED_BLOCKOFFSETTABLE_INLINE_HPP
+#endif // SHARE_GC_SHARED_BLOCKOFFSETTABLE_INLINE_HPP
--- a/src/hotspot/share/gc/shared/cardGeneration.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/cardGeneration.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_CARDGENERATION_HPP
-#define SHARE_VM_GC_SHARED_CARDGENERATION_HPP
+#ifndef SHARE_GC_SHARED_CARDGENERATION_HPP
+#define SHARE_GC_SHARED_CARDGENERATION_HPP
 
 // Class CardGeneration is a generation that is covered by a card table,
 // and uses a card-size block-offset array to implement block_start.
@@ -96,4 +96,4 @@
   CompactibleSpace* first_compaction_space() const;
 };
 
-#endif // SHARE_VM_GC_SHARED_CARDGENERATION_HPP
+#endif // SHARE_GC_SHARED_CARDGENERATION_HPP
--- a/src/hotspot/share/gc/shared/cardGeneration.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/cardGeneration.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_CARDGENERATION_INLINE_HPP
-#define SHARE_VM_GC_SHARED_CARDGENERATION_INLINE_HPP
+#ifndef SHARE_GC_SHARED_CARDGENERATION_INLINE_HPP
+#define SHARE_GC_SHARED_CARDGENERATION_INLINE_HPP
 
 #include "gc/shared/cardGeneration.hpp"
 #include "gc/shared/space.hpp"
@@ -52,4 +52,4 @@
   return space();
 }
 
-#endif // SHARE_VM_GC_SHARED_CARDGENERATION_INLINE_HPP
+#endif // SHARE_GC_SHARED_CARDGENERATION_INLINE_HPP
--- a/src/hotspot/share/gc/shared/cardTable.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/cardTable.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_CARDTABLE_HPP
-#define SHARE_VM_GC_SHARED_CARDTABLE_HPP
+#ifndef SHARE_GC_SHARED_CARDTABLE_HPP
+#define SHARE_GC_SHARED_CARDTABLE_HPP
 
 #include "memory/allocation.hpp"
 #include "memory/memRegion.hpp"
@@ -263,4 +263,4 @@
   void verify_dirty_region(MemRegion mr) PRODUCT_RETURN;
 };
 
-#endif // SHARE_VM_GC_SHARED_CARDTABLE_HPP
+#endif // SHARE_GC_SHARED_CARDTABLE_HPP
--- a/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/cardTableBarrierSet.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_CARDTABLEBARRIERSET_HPP
-#define SHARE_VM_GC_SHARED_CARDTABLEBARRIERSET_HPP
+#ifndef SHARE_GC_SHARED_CARDTABLEBARRIERSET_HPP
+#define SHARE_GC_SHARED_CARDTABLEBARRIERSET_HPP
 
 #include "gc/shared/modRefBarrierSet.hpp"
 #include "utilities/align.hpp"
@@ -122,4 +122,4 @@
   typedef ::CardTableBarrierSet type;
 };
 
-#endif // SHARE_VM_GC_SHARED_CARDTABLEBARRIERSET_HPP
+#endif // SHARE_GC_SHARED_CARDTABLEBARRIERSET_HPP
--- a/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/cardTableBarrierSet.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_CARDTABLEBARRIERSET_INLINE_HPP
-#define SHARE_VM_GC_SHARED_CARDTABLEBARRIERSET_INLINE_HPP
+#ifndef SHARE_GC_SHARED_CARDTABLEBARRIERSET_INLINE_HPP
+#define SHARE_GC_SHARED_CARDTABLEBARRIERSET_INLINE_HPP
 
 #include "gc/shared/cardTableBarrierSet.hpp"
 #include "gc/shared/cardTable.hpp"
@@ -40,4 +40,4 @@
   }
 }
 
-#endif // SHARE_VM_GC_SHARED_CARDTABLEBARRIERSET_INLINE_HPP
+#endif // SHARE_GC_SHARED_CARDTABLEBARRIERSET_INLINE_HPP
--- a/src/hotspot/share/gc/shared/cardTableRS.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/cardTableRS.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_CARDTABLERS_HPP
-#define SHARE_VM_GC_SHARED_CARDTABLERS_HPP
+#ifndef SHARE_GC_SHARED_CARDTABLERS_HPP
+#define SHARE_GC_SHARED_CARDTABLERS_HPP
 
 #include "gc/shared/cardTable.hpp"
 #include "memory/memRegion.hpp"
@@ -214,4 +214,4 @@
   void do_MemRegion(MemRegion mr);
 };
 
-#endif // SHARE_VM_GC_SHARED_CARDTABLERS_HPP
+#endif // SHARE_GC_SHARED_CARDTABLERS_HPP
--- a/src/hotspot/share/gc/shared/collectedHeap.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/collectedHeap.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_COLLECTEDHEAP_HPP
-#define SHARE_VM_GC_SHARED_COLLECTEDHEAP_HPP
+#ifndef SHARE_GC_SHARED_COLLECTEDHEAP_HPP
+#define SHARE_GC_SHARED_COLLECTEDHEAP_HPP
 
 #include "gc/shared/gcCause.hpp"
 #include "gc/shared/gcWhen.hpp"
@@ -625,4 +625,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_SHARED_COLLECTEDHEAP_HPP
+#endif // SHARE_GC_SHARED_COLLECTEDHEAP_HPP
--- a/src/hotspot/share/gc/shared/collectedHeap.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/collectedHeap.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_COLLECTEDHEAP_INLINE_HPP
-#define SHARE_VM_GC_SHARED_COLLECTEDHEAP_INLINE_HPP
+#ifndef SHARE_GC_SHARED_COLLECTEDHEAP_INLINE_HPP
+#define SHARE_GC_SHARED_COLLECTEDHEAP_INLINE_HPP
 
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/memAllocator.hpp"
@@ -82,4 +82,4 @@
   return allocator.allocate();
 }
 
-#endif // SHARE_VM_GC_SHARED_COLLECTEDHEAP_INLINE_HPP
+#endif // SHARE_GC_SHARED_COLLECTEDHEAP_INLINE_HPP
--- a/src/hotspot/share/gc/shared/collectorCounters.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/collectorCounters.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_COLLECTORCOUNTERS_HPP
-#define SHARE_VM_GC_SHARED_COLLECTORCOUNTERS_HPP
+#ifndef SHARE_GC_SHARED_COLLECTORCOUNTERS_HPP
+#define SHARE_GC_SHARED_COLLECTORCOUNTERS_HPP
 
 #include "runtime/perfData.hpp"
 
@@ -73,4 +73,4 @@
     ~TraceCollectorStats();
 };
 
-#endif // SHARE_VM_GC_SHARED_COLLECTORCOUNTERS_HPP
+#endif // SHARE_GC_SHARED_COLLECTORCOUNTERS_HPP
--- a/src/hotspot/share/gc/shared/collectorPolicy.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/collectorPolicy.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_COLLECTORPOLICY_HPP
-#define SHARE_VM_GC_SHARED_COLLECTORPOLICY_HPP
+#ifndef SHARE_GC_SHARED_COLLECTORPOLICY_HPP
+#define SHARE_GC_SHARED_COLLECTORPOLICY_HPP
 
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/cardTableRS.hpp"
@@ -146,4 +146,4 @@
   MarkSweepPolicy() {}
 };
 
-#endif // SHARE_VM_GC_SHARED_COLLECTORPOLICY_HPP
+#endif // SHARE_GC_SHARED_COLLECTORPOLICY_HPP
--- a/src/hotspot/share/gc/shared/concurrentGCPhaseManager.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/concurrentGCPhaseManager.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_CONCURRENTGCPHASEMANAGER_HPP
-#define SHARE_VM_GC_CONCURRENTGCPHASEMANAGER_HPP
+#ifndef SHARE_GC_SHARED_CONCURRENTGCPHASEMANAGER_HPP
+#define SHARE_GC_SHARED_CONCURRENTGCPHASEMANAGER_HPP
 
 #include "memory/allocation.hpp"
 
@@ -134,4 +134,4 @@
   bool wait_when_requested_impl() const;
 };
 
-#endif // include guard
+#endif // SHARE_GC_SHARED_CONCURRENTGCPHASEMANAGER_HPP
--- a/src/hotspot/share/gc/shared/concurrentGCThread.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/concurrentGCThread.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_CONCURRENTGCTHREAD_HPP
-#define SHARE_VM_GC_SHARED_CONCURRENTGCTHREAD_HPP
+#ifndef SHARE_GC_SHARED_CONCURRENTGCTHREAD_HPP
+#define SHARE_GC_SHARED_CONCURRENTGCTHREAD_HPP
 
 #include "runtime/thread.hpp"
 #include "utilities/macros.hpp"
@@ -70,4 +70,4 @@
   bool has_terminated()   { return _has_terminated; }
 };
 
-#endif // SHARE_VM_GC_SHARED_CONCURRENTGCTHREAD_HPP
+#endif // SHARE_GC_SHARED_CONCURRENTGCTHREAD_HPP
--- a/src/hotspot/share/gc/shared/copyFailedInfo.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/copyFailedInfo.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_COPYFAILEDINFO_HPP
-#define SHARE_VM_GC_SHARED_COPYFAILEDINFO_HPP
+#ifndef SHARE_GC_SHARED_COPYFAILEDINFO_HPP
+#define SHARE_GC_SHARED_COPYFAILEDINFO_HPP
 
 #include "jfr/support/jfrThreadId.hpp"
 #include "runtime/thread.hpp"
@@ -90,4 +90,4 @@
 
 class EvacuationFailedInfo : public CopyFailedInfo {};
 
-#endif // SHARE_VM_GC_SHARED_COPYFAILEDINFO_HPP
+#endif // SHARE_GC_SHARED_COPYFAILEDINFO_HPP
--- a/src/hotspot/share/gc/shared/gcBehaviours.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/gcBehaviours.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_GC_SHARED_BEHAVIOURS_HPP
-#define SHARE_GC_SHARED_BEHAVIOURS_HPP
+#ifndef SHARE_GC_SHARED_GCBEHAVIOURS_HPP
+#define SHARE_GC_SHARED_GCBEHAVIOURS_HPP
 
 #include "memory/iterator.hpp"
 #include "oops/oopsHierarchy.hpp"
@@ -50,4 +50,4 @@
   virtual bool is_unloading(CompiledMethod* cm) const;
 };
 
-#endif // SHARE_GC_SHARED_BEHAVIOURS_HPP
+#endif // SHARE_GC_SHARED_GCBEHAVIOURS_HPP
--- a/src/hotspot/share/gc/shared/gcCause.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/gcCause.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_GCCAUSE_HPP
-#define SHARE_VM_GC_SHARED_GCCAUSE_HPP
+#ifndef SHARE_GC_SHARED_GCCAUSE_HPP
+#define SHARE_GC_SHARED_GCCAUSE_HPP
 
 #include "memory/allocation.hpp"
 
@@ -137,4 +137,4 @@
   static const char* to_string(GCCause::Cause cause);
 };
 
-#endif // SHARE_VM_GC_SHARED_GCCAUSE_HPP
+#endif // SHARE_GC_SHARED_GCCAUSE_HPP
--- a/src/hotspot/share/gc/shared/gcConfiguration.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/gcConfiguration.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_GCCONFIGURATION_HPP
-#define SHARE_VM_GC_SHARED_GCCONFIGURATION_HPP
+#ifndef SHARE_GC_SHARED_GCCONFIGURATION_HPP
+#define SHARE_GC_SHARED_GCCONFIGURATION_HPP
 
 #include "gc/shared/gcName.hpp"
 #include "memory/universe.hpp"
@@ -77,4 +77,4 @@
   intx new_ratio() const;
 };
 
-#endif // SHARE_VM_GC_SHARED_GCCONFIGURATION_HPP
+#endif // SHARE_GC_SHARED_GCCONFIGURATION_HPP
--- a/src/hotspot/share/gc/shared/gcHeapSummary.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/gcHeapSummary.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_GCHEAPSUMMARY_HPP
-#define SHARE_VM_GC_SHARED_GCHEAPSUMMARY_HPP
+#ifndef SHARE_GC_SHARED_GCHEAPSUMMARY_HPP
+#define SHARE_GC_SHARED_GCHEAPSUMMARY_HPP
 
 #include "memory/allocation.hpp"
 #include "memory/metaspaceChunkFreeListSummary.hpp"
@@ -231,4 +231,4 @@
   size_t failure_waste() const { return _failure_waste; }
 };
 
-#endif // SHARE_VM_GC_SHARED_GCHEAPSUMMARY_HPP
+#endif // SHARE_GC_SHARED_GCHEAPSUMMARY_HPP
--- a/src/hotspot/share/gc/shared/gcId.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/gcId.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_GCID_HPP
-#define SHARE_VM_GC_SHARED_GCID_HPP
+#ifndef SHARE_GC_SHARED_GCID_HPP
+#define SHARE_GC_SHARED_GCID_HPP
 
 #include "memory/allocation.hpp"
 
@@ -56,4 +56,4 @@
   ~GCIdMark();
 };
 
-#endif // SHARE_VM_GC_SHARED_GCID_HPP
+#endif // SHARE_GC_SHARED_GCID_HPP
--- a/src/hotspot/share/gc/shared/gcLocker.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/gcLocker.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_GCLOCKER_HPP
-#define SHARE_VM_GC_SHARED_GCLOCKER_HPP
+#ifndef SHARE_GC_SHARED_GCLOCKER_HPP
+#define SHARE_GC_SHARED_GCLOCKER_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -145,4 +145,4 @@
   static address needs_gc_address() { return (address) &_needs_gc; }
 };
 
-#endif // SHARE_VM_GC_SHARED_GCLOCKER_HPP
+#endif // SHARE_GC_SHARED_GCLOCKER_HPP
--- a/src/hotspot/share/gc/shared/gcLocker.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/gcLocker.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_GCLOCKER_INLINE_HPP
-#define SHARE_VM_GC_SHARED_GCLOCKER_INLINE_HPP
+#ifndef SHARE_GC_SHARED_GCLOCKER_INLINE_HPP
+#define SHARE_GC_SHARED_GCLOCKER_INLINE_HPP
 
 #include "gc/shared/gcLocker.hpp"
 #include "runtime/thread.hpp"
@@ -54,4 +54,4 @@
   thread->exit_critical();
 }
 
-#endif // SHARE_VM_GC_SHARED_GCLOCKER_INLINE_HPP
+#endif // SHARE_GC_SHARED_GCLOCKER_INLINE_HPP
--- a/src/hotspot/share/gc/shared/gcName.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/gcName.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_GCNAME_HPP
-#define SHARE_VM_GC_SHARED_GCNAME_HPP
+#ifndef SHARE_GC_SHARED_GCNAME_HPP
+#define SHARE_GC_SHARED_GCNAME_HPP
 
 #include "utilities/debug.hpp"
 
@@ -66,4 +66,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_SHARED_GCNAME_HPP
+#endif // SHARE_GC_SHARED_GCNAME_HPP
--- a/src/hotspot/share/gc/shared/gcPolicyCounters.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/gcPolicyCounters.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_GCPOLICYCOUNTERS_HPP
-#define SHARE_VM_GC_SHARED_GCPOLICYCOUNTERS_HPP
+#ifndef SHARE_GC_SHARED_GCPOLICYCOUNTERS_HPP
+#define SHARE_GC_SHARED_GCPOLICYCOUNTERS_HPP
 
 #include "runtime/perfData.hpp"
 
@@ -75,4 +75,4 @@
     }
 };
 
-#endif // SHARE_VM_GC_SHARED_GCPOLICYCOUNTERS_HPP
+#endif // SHARE_GC_SHARED_GCPOLICYCOUNTERS_HPP
--- a/src/hotspot/share/gc/shared/gcStats.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/gcStats.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_GCSTATS_HPP
-#define SHARE_VM_GC_SHARED_GCSTATS_HPP
+#ifndef SHARE_GC_SHARED_GCSTATS_HPP
+#define SHARE_GC_SHARED_GCSTATS_HPP
 
 #include "gc/shared/gcUtil.hpp"
 
@@ -58,4 +58,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_SHARED_GCSTATS_HPP
+#endif // SHARE_GC_SHARED_GCSTATS_HPP
--- a/src/hotspot/share/gc/shared/gcTimer.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/gcTimer.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_GCTIMER_HPP
-#define SHARE_VM_GC_SHARED_GCTIMER_HPP
+#ifndef SHARE_GC_SHARED_GCTIMER_HPP
+#define SHARE_GC_SHARED_GCTIMER_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/macros.hpp"
@@ -183,4 +183,4 @@
   virtual GCPhase* next();
 };
 
-#endif // SHARE_VM_GC_SHARED_GCTIMER_HPP
+#endif // SHARE_GC_SHARED_GCTIMER_HPP
--- a/src/hotspot/share/gc/shared/gcTrace.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/gcTrace.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_GCTRACE_HPP
-#define SHARE_VM_GC_SHARED_GCTRACE_HPP
+#ifndef SHARE_GC_SHARED_GCTRACE_HPP
+#define SHARE_GC_SHARED_GCTRACE_HPP
 
 #include "gc/shared/copyFailedInfo.hpp"
 #include "gc/shared/gcCause.hpp"
@@ -309,4 +309,4 @@
   void set_gc_cause(GCCause::Cause cause);
 };
 
-#endif // SHARE_VM_GC_SHARED_GCTRACE_HPP
+#endif // SHARE_GC_SHARED_GCTRACE_HPP
--- a/src/hotspot/share/gc/shared/gcTraceTime.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/gcTraceTime.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_GCTRACETIME_HPP
-#define SHARE_VM_GC_SHARED_GCTRACETIME_HPP
+#ifndef SHARE_GC_SHARED_GCTRACETIME_HPP
+#define SHARE_GC_SHARED_GCTRACETIME_HPP
 
 #include "logging/log.hpp"
 #include "logging/logHandle.hpp"
@@ -86,4 +86,4 @@
   jlong start_time() { return _start_time; }
 };
 
-#endif // SHARE_VM_GC_SHARED_GCTRACETIME_HPP
+#endif // SHARE_GC_SHARED_GCTRACETIME_HPP
--- a/src/hotspot/share/gc/shared/gcTraceTime.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/gcTraceTime.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_GCTRACETIME_INLINE_HPP
-#define SHARE_VM_GC_SHARED_GCTRACETIME_INLINE_HPP
+#ifndef SHARE_GC_SHARED_GCTRACETIME_INLINE_HPP
+#define SHARE_GC_SHARED_GCTRACETIME_INLINE_HPP
 
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/gcTimer.hpp"
@@ -158,4 +158,4 @@
 #define GCTraceTime(Level, ...) GCTraceTimeImplWrapper<LogLevel::Level, LOG_TAGS(__VA_ARGS__)>
 #define GCTraceConcTime(Level, ...) GCTraceConcTimeImpl<LogLevel::Level, LOG_TAGS(__VA_ARGS__)>
 
-#endif // SHARE_VM_GC_SHARED_GCTRACETIME_INLINE_HPP
+#endif // SHARE_GC_SHARED_GCTRACETIME_INLINE_HPP
--- a/src/hotspot/share/gc/shared/gcUtil.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/gcUtil.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_GCUTIL_HPP
-#define SHARE_VM_GC_SHARED_GCUTIL_HPP
+#ifndef SHARE_GC_SHARED_GCUTIL_HPP
+#define SHARE_GC_SHARED_GCUTIL_HPP
 
 #include "memory/allocation.hpp"
 #include "runtime/timer.hpp"
@@ -216,4 +216,4 @@
   bool increment_will_decrease();
 };
 
-#endif // SHARE_VM_GC_SHARED_GCUTIL_HPP
+#endif // SHARE_GC_SHARED_GCUTIL_HPP
--- a/src/hotspot/share/gc/shared/gcUtil.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/gcUtil.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_GCUTIL_INLINE_HPP
-#define SHARE_VM_GC_SHARED_GCUTIL_INLINE_HPP
+#ifndef SHARE_GC_SHARED_GCUTIL_INLINE_HPP
+#define SHARE_GC_SHARED_GCUTIL_INLINE_HPP
 
 #include "gc/shared/gcUtil.hpp"
 #include "memory/allocation.inline.hpp"
@@ -32,4 +32,4 @@
   return CHeapObj<mtGC>::operator new(size);
 }
 
-#endif // SHARE_VM_GC_SHARED_GCUTIL_INLINE_HPP
+#endif // SHARE_GC_SHARED_GCUTIL_INLINE_HPP
--- a/src/hotspot/share/gc/shared/gcVMOperations.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/gcVMOperations.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_GCVMOPERATIONS_HPP
-#define SHARE_VM_GC_SHARED_GCVMOPERATIONS_HPP
+#ifndef SHARE_GC_SHARED_GCVMOPERATIONS_HPP
+#define SHARE_GC_SHARED_GCVMOPERATIONS_HPP
 
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/genCollectedHeap.hpp"
@@ -238,4 +238,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_SHARED_GCVMOPERATIONS_HPP
+#endif // SHARE_GC_SHARED_GCVMOPERATIONS_HPP
--- a/src/hotspot/share/gc/shared/gcWhen.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/gcWhen.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_GCWHEN_HPP
-#define SHARE_VM_GC_SHARED_GCWHEN_HPP
+#ifndef SHARE_GC_SHARED_GCWHEN_HPP
+#define SHARE_GC_SHARED_GCWHEN_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/debug.hpp"
@@ -45,4 +45,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_SHARED_GCWHEN_HPP
+#endif // SHARE_GC_SHARED_GCWHEN_HPP
--- a/src/hotspot/share/gc/shared/genCollectedHeap.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/genCollectedHeap.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_GENCOLLECTEDHEAP_HPP
-#define SHARE_VM_GC_SHARED_GENCOLLECTEDHEAP_HPP
+#ifndef SHARE_GC_SHARED_GENCOLLECTEDHEAP_HPP
+#define SHARE_GC_SHARED_GENCOLLECTEDHEAP_HPP
 
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/collectorPolicy.hpp"
@@ -505,4 +505,4 @@
   void record_gen_tops_before_GC() PRODUCT_RETURN;
 };
 
-#endif // SHARE_VM_GC_SHARED_GENCOLLECTEDHEAP_HPP
+#endif // SHARE_GC_SHARED_GENCOLLECTEDHEAP_HPP
--- a/src/hotspot/share/gc/shared/genMemoryPools.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/genMemoryPools.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_GENMEMORYPOOLS_HPP
-#define SHARE_VM_GC_SHARED_GENMEMORYPOOLS_HPP
+#ifndef SHARE_GC_SHARED_GENMEMORYPOOLS_HPP
+#define SHARE_GC_SHARED_GENMEMORYPOOLS_HPP
 
 #include "services/memoryPool.hpp"
 
@@ -72,4 +72,4 @@
   size_t used_in_bytes();
 };
 
-#endif // SHARE_VM_GC_SHARED_GENMEMORYPOOLS_HPP
+#endif // SHARE_GC_SHARED_GENMEMORYPOOLS_HPP
--- a/src/hotspot/share/gc/shared/genOopClosures.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/genOopClosures.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_GENOOPCLOSURES_HPP
-#define SHARE_VM_GC_SHARED_GENOOPCLOSURES_HPP
+#ifndef SHARE_GC_SHARED_GENOOPCLOSURES_HPP
+#define SHARE_GC_SHARED_GENOOPCLOSURES_HPP
 
 #include "memory/iterator.hpp"
 #include "oops/oop.hpp"
@@ -188,4 +188,4 @@
 
 #endif // INCLUDE_SERIALGC
 
-#endif // SHARE_VM_GC_SHARED_GENOOPCLOSURES_HPP
+#endif // SHARE_GC_SHARED_GENOOPCLOSURES_HPP
--- a/src/hotspot/share/gc/shared/genOopClosures.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/genOopClosures.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_GENOOPCLOSURES_INLINE_HPP
-#define SHARE_VM_GC_SHARED_GENOOPCLOSURES_INLINE_HPP
+#ifndef SHARE_GC_SHARED_GENOOPCLOSURES_INLINE_HPP
+#define SHARE_GC_SHARED_GENOOPCLOSURES_INLINE_HPP
 
 #include "gc/shared/cardTableRS.hpp"
 #include "gc/shared/genCollectedHeap.hpp"
@@ -171,4 +171,4 @@
 
 #endif // INCLUDE_SERIALGC
 
-#endif // SHARE_VM_GC_SHARED_GENOOPCLOSURES_INLINE_HPP
+#endif // SHARE_GC_SHARED_GENOOPCLOSURES_INLINE_HPP
--- a/src/hotspot/share/gc/shared/generation.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/generation.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_GENERATION_HPP
-#define SHARE_VM_GC_SHARED_GENERATION_HPP
+#ifndef SHARE_GC_SHARED_GENERATION_HPP
+#define SHARE_GC_SHARED_GENERATION_HPP
 
 #include "gc/shared/collectorCounters.hpp"
 #include "gc/shared/referenceProcessor.hpp"
@@ -553,4 +553,4 @@
 
 };
 
-#endif // SHARE_VM_GC_SHARED_GENERATION_HPP
+#endif // SHARE_GC_SHARED_GENERATION_HPP
--- a/src/hotspot/share/gc/shared/generationCounters.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/generationCounters.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_GENERATIONCOUNTERS_HPP
-#define SHARE_VM_GC_SHARED_GENERATIONCOUNTERS_HPP
+#ifndef SHARE_GC_SHARED_GENERATIONCOUNTERS_HPP
+#define SHARE_GC_SHARED_GENERATIONCOUNTERS_HPP
 
 #include "memory/virtualspace.hpp"
 #include "runtime/perfData.hpp"
@@ -75,4 +75,4 @@
   const char* name_space() const        { return _name_space; }
 
 };
-#endif // SHARE_VM_GC_SHARED_GENERATIONCOUNTERS_HPP
+#endif // SHARE_GC_SHARED_GENERATIONCOUNTERS_HPP
--- a/src/hotspot/share/gc/shared/generationSpec.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/generationSpec.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_GENERATIONSPEC_HPP
-#define SHARE_VM_GC_SHARED_GENERATIONSPEC_HPP
+#ifndef SHARE_GC_SHARED_GENERATIONSPEC_HPP
+#define SHARE_GC_SHARED_GENERATIONSPEC_HPP
 
 #include "gc/shared/generation.hpp"
 #include "utilities/align.hpp"
@@ -58,4 +58,4 @@
 
 typedef GenerationSpec* GenerationSpecPtr;
 
-#endif // SHARE_VM_GC_SHARED_GENERATIONSPEC_HPP
+#endif // SHARE_GC_SHARED_GENERATIONSPEC_HPP
--- a/src/hotspot/share/gc/shared/hSpaceCounters.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/hSpaceCounters.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_HSPACECOUNTERS_HPP
-#define SHARE_VM_GC_SHARED_HSPACECOUNTERS_HPP
+#ifndef SHARE_GC_SHARED_HSPACECOUNTERS_HPP
+#define SHARE_GC_SHARED_HSPACECOUNTERS_HPP
 
 #include "memory/allocation.hpp"
 #include "runtime/perfData.hpp"
@@ -65,4 +65,4 @@
 
   const char* name_space() const        { return _name_space; }
 };
-#endif // SHARE_VM_GC_SHARED_HSPACECOUNTERS_HPP
+#endif // SHARE_GC_SHARED_HSPACECOUNTERS_HPP
--- a/src/hotspot/share/gc/shared/isGCActiveMark.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/isGCActiveMark.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_ISGCACTIVEMARK_HPP
-#define SHARE_VM_GC_SHARED_ISGCACTIVEMARK_HPP
+#ifndef SHARE_GC_SHARED_ISGCACTIVEMARK_HPP
+#define SHARE_GC_SHARED_ISGCACTIVEMARK_HPP
 
 #include "gc/shared/collectedHeap.hpp"
 #include "memory/allocation.hpp"
@@ -48,4 +48,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_SHARED_ISGCACTIVEMARK_HPP
+#endif // SHARE_GC_SHARED_ISGCACTIVEMARK_HPP
--- a/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/jvmFlagConstraintsGC.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_GC_SHARED_COMMANDLINEFLAGCONSTRAINTSGC_HPP
-#define SHARE_GC_SHARED_COMMANDLINEFLAGCONSTRAINTSGC_HPP
+#ifndef SHARE_GC_SHARED_JVMFLAGCONSTRAINTSGC_HPP
+#define SHARE_GC_SHARED_JVMFLAGCONSTRAINTSGC_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -74,4 +74,4 @@
 // Internal
 JVMFlag::Error MaxPLABSizeBounds(const char* name, size_t value, bool verbose);
 
-#endif // SHARE_GC_SHARED_COMMANDLINEFLAGCONSTRAINTSGC_HPP
+#endif // SHARE_GC_SHARED_JVMFLAGCONSTRAINTSGC_HPP
--- a/src/hotspot/share/gc/shared/markBitMap.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/markBitMap.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_MARKBITMAP_HPP
-#define SHARE_VM_GC_SHARED_MARKBITMAP_HPP
+#ifndef SHARE_GC_SHARED_MARKBITMAP_HPP
+#define SHARE_GC_SHARED_MARKBITMAP_HPP
 
 #include "memory/memRegion.hpp"
 #include "oops/oopsHierarchy.hpp"
@@ -98,4 +98,4 @@
   void clear_range_large(MemRegion mr) { do_clear(mr, true);       }
 };
 
-#endif // SHARE_VM_GC_SHARED_MARKBITMAP_HPP
+#endif // SHARE_GC_SHARED_MARKBITMAP_HPP
--- a/src/hotspot/share/gc/shared/markBitMap.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/markBitMap.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_MARKBITMAP_INLINE_HPP
-#define SHARE_VM_GC_SHARED_MARKBITMAP_INLINE_HPP
+#ifndef SHARE_GC_SHARED_MARKBITMAP_INLINE_HPP
+#define SHARE_GC_SHARED_MARKBITMAP_INLINE_HPP
 
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/markBitMap.hpp"
@@ -69,4 +69,4 @@
   clear((HeapWord*) obj);
 }
 
-#endif // SHARE_VM_GC_SHARED_MARKBITMAP_INLINE_HPP
+#endif // SHARE_GC_SHARED_MARKBITMAP_INLINE_HPP
--- a/src/hotspot/share/gc/shared/memAllocator.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/memAllocator.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_GC_SHARED_MEM_ALLOCATOR_HPP
-#define SHARE_GC_SHARED_MEM_ALLOCATOR_HPP
+#ifndef SHARE_GC_SHARED_MEMALLOCATOR_HPP
+#define SHARE_GC_SHARED_MEMALLOCATOR_HPP
 
 #include "gc/shared/collectedHeap.hpp"
 #include "memory/memRegion.hpp"
@@ -107,4 +107,4 @@
   virtual oop initialize(HeapWord* mem) const;
 };
 
-#endif // SHARE_GC_SHARED_MEM_ALLOCATOR_HPP
+#endif // SHARE_GC_SHARED_MEMALLOCATOR_HPP
--- a/src/hotspot/share/gc/shared/memset_with_concurrent_readers.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/memset_with_concurrent_readers.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SRC_SHARE_VM_GC_SHARED_MEMSETWITHCONCURRENTREADERS_HPP
-#define SRC_SHARE_VM_GC_SHARED_MEMSETWITHCONCURRENTREADERS_HPP
+#ifndef SHARE_GC_SHARED_MEMSET_WITH_CONCURRENT_READERS_HPP
+#define SHARE_GC_SHARED_MEMSET_WITH_CONCURRENT_READERS_HPP
 
 #include "utilities/macros.hpp"
 
@@ -47,4 +47,4 @@
 
 #endif // End of target dispatch.
 
-#endif // SRC_SHARE_VM_GC_SHARED_MEMSETWITHCONCURRENTREADERS_HPP
+#endif // SHARE_GC_SHARED_MEMSET_WITH_CONCURRENT_READERS_HPP
--- a/src/hotspot/share/gc/shared/modRefBarrierSet.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/modRefBarrierSet.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_MODREFBARRIERSET_HPP
-#define SHARE_VM_GC_SHARED_MODREFBARRIERSET_HPP
+#ifndef SHARE_GC_SHARED_MODREFBARRIERSET_HPP
+#define SHARE_GC_SHARED_MODREFBARRIERSET_HPP
 
 #include "gc/shared/barrierSet.hpp"
 #include "memory/memRegion.hpp"
@@ -109,4 +109,4 @@
   static const BarrierSet::Name value = BarrierSet::ModRef;
 };
 
-#endif // SHARE_VM_GC_SHARED_MODREFBARRIERSET_HPP
+#endif // SHARE_GC_SHARED_MODREFBARRIERSET_HPP
--- a/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/modRefBarrierSet.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_MODREFBARRIERSET_INLINE_HPP
-#define SHARE_VM_GC_SHARED_MODREFBARRIERSET_INLINE_HPP
+#ifndef SHARE_GC_SHARED_MODREFBARRIERSET_INLINE_HPP
+#define SHARE_GC_SHARED_MODREFBARRIERSET_INLINE_HPP
 
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/modRefBarrierSet.hpp"
@@ -138,4 +138,4 @@
   bs->write_region(MemRegion((HeapWord*)(void*)dst, size));
 }
 
-#endif // SHARE_VM_GC_SHARED_MODREFBARRIERSET_INLINE_HPP
+#endif // SHARE_GC_SHARED_MODREFBARRIERSET_INLINE_HPP
--- a/src/hotspot/share/gc/shared/objectCountEventSender.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/objectCountEventSender.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_OBJECTCOUNTEVENTSENDER_HPP
-#define SHARE_VM_GC_SHARED_OBJECTCOUNTEVENTSENDER_HPP
+#ifndef SHARE_GC_SHARED_OBJECTCOUNTEVENTSENDER_HPP
+#define SHARE_GC_SHARED_OBJECTCOUNTEVENTSENDER_HPP
 
 #include "gc/shared/gcTrace.hpp"
 #include "memory/allocation.hpp"
@@ -52,4 +52,4 @@
 
 #endif // INCLUDE_SERVICES
 
-#endif // SHARE_VM_GC_SHARED_OBJECTCOUNTEVENTSENDER_HPP
+#endif // SHARE_GC_SHARED_OBJECTCOUNTEVENTSENDER_HPP
--- a/src/hotspot/share/gc/shared/oopStorage.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/oopStorage.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -275,4 +275,4 @@
   template<typename F> static SkipNullFn<F> skip_null_fn(F f);
 };
 
-#endif // include guard
+#endif // SHARE_GC_SHARED_OOPSTORAGE_HPP
--- a/src/hotspot/share/gc/shared/oopStorage.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/oopStorage.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -403,4 +403,4 @@
   iterate_safepoint(if_alive_fn(is_alive, oop_fn(cl)));
 }
 
-#endif // include guard
+#endif // SHARE_GC_SHARED_OOPSTORAGE_INLINE_HPP
--- a/src/hotspot/share/gc/shared/owstTaskTerminator.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/owstTaskTerminator.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -20,8 +20,8 @@
  * questions.
  *
  */
-#ifndef SHARE_VM_GC_SHARED_OWSTTASKTERMINATOR_HPP
-#define SHARE_VM_GC_SHARED_OWSTTASKTERMINATOR_HPP
+#ifndef SHARE_GC_SHARED_OWSTTASKTERMINATOR_HPP
+#define SHARE_GC_SHARED_OWSTTASKTERMINATOR_HPP
 
 #include "gc/shared/taskqueue.hpp"
 #include "runtime/mutex.hpp"
@@ -76,4 +76,4 @@
 };
 
 
-#endif // SHARE_VM_GC_SHARED_OWSTTASKTERMINATOR_HPP
+#endif // SHARE_GC_SHARED_OWSTTASKTERMINATOR_HPP
--- a/src/hotspot/share/gc/shared/parallelCleaning.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/parallelCleaning.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_PARALLELCLEANING_HPP
-#define SHARE_VM_GC_SHARED_PARALLELCLEANING_HPP
+#ifndef SHARE_GC_SHARED_PARALLELCLEANING_HPP
+#define SHARE_GC_SHARED_PARALLELCLEANING_HPP
 
 #include "classfile/classLoaderDataGraph.inline.hpp"
 #include "gc/shared/oopStorageParState.hpp"
@@ -115,4 +115,4 @@
   void work(uint worker_id);
 };
 
-#endif // SHARE_VM_GC_SHARED_PARALLELCLEANING_HPP
+#endif // SHARE_GC_SHARED_PARALLELCLEANING_HPP
--- a/src/hotspot/share/gc/shared/plab.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/plab.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_PLAB_HPP
-#define SHARE_VM_GC_SHARED_PLAB_HPP
+#ifndef SHARE_GC_SHARED_PLAB_HPP
+#define SHARE_GC_SHARED_PLAB_HPP
 
 #include "gc/shared/gcUtil.hpp"
 #include "memory/allocation.hpp"
@@ -211,4 +211,4 @@
   inline void add_undo_wasted(size_t v);
 };
 
-#endif // SHARE_VM_GC_SHARED_PLAB_HPP
+#endif // SHARE_GC_SHARED_PLAB_HPP
--- a/src/hotspot/share/gc/shared/plab.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/plab.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_PLAB_INLINE_HPP
-#define SHARE_VM_GC_SHARED_PLAB_INLINE_HPP
+#ifndef SHARE_GC_SHARED_PLAB_INLINE_HPP
+#define SHARE_GC_SHARED_PLAB_INLINE_HPP
 
 #include "gc/shared/collectedHeap.inline.hpp"
 #include "gc/shared/plab.hpp"
@@ -58,4 +58,4 @@
   Atomic::add(v, &_undo_wasted);
 }
 
-#endif // SHARE_VM_GC_SHARED_PLAB_INLINE_HPP
+#endif // SHARE_GC_SHARED_PLAB_INLINE_HPP
--- a/src/hotspot/share/gc/shared/preservedMarks.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/preservedMarks.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_PRESERVEDMARKS_HPP
-#define SHARE_VM_GC_SHARED_PRESERVEDMARKS_HPP
+#ifndef SHARE_GC_SHARED_PRESERVEDMARKS_HPP
+#define SHARE_GC_SHARED_PRESERVEDMARKS_HPP
 
 #include "memory/allocation.hpp"
 #include "memory/padded.hpp"
@@ -146,4 +146,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_SHARED_PRESERVEDMARKS_HPP
+#endif // SHARE_GC_SHARED_PRESERVEDMARKS_HPP
--- a/src/hotspot/share/gc/shared/preservedMarks.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/preservedMarks.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_PRESERVEDMARKS_INLINE_HPP
-#define SHARE_VM_GC_SHARED_PRESERVEDMARKS_INLINE_HPP
+#ifndef SHARE_GC_SHARED_PRESERVEDMARKS_INLINE_HPP
+#define SHARE_GC_SHARED_PRESERVEDMARKS_INLINE_HPP
 
 #include "gc/shared/preservedMarks.hpp"
 #include "logging/log.hpp"
@@ -83,4 +83,4 @@
   _o->set_mark_raw(_m);
 }
 
-#endif // SHARE_VM_GC_SHARED_PRESERVEDMARKS_INLINE_HPP
+#endif // SHARE_GC_SHARED_PRESERVEDMARKS_INLINE_HPP
--- a/src/hotspot/share/gc/shared/referencePolicy.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/referencePolicy.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_REFERENCEPOLICY_HPP
-#define SHARE_VM_GC_SHARED_REFERENCEPOLICY_HPP
+#ifndef SHARE_GC_SHARED_REFERENCEPOLICY_HPP
+#define SHARE_GC_SHARED_REFERENCEPOLICY_HPP
 
 #include "oops/oopsHierarchy.hpp"
 
@@ -80,4 +80,4 @@
   virtual bool should_clear_reference(oop p, jlong timestamp_clock);
 };
 
-#endif // SHARE_VM_GC_SHARED_REFERENCEPOLICY_HPP
+#endif // SHARE_GC_SHARED_REFERENCEPOLICY_HPP
--- a/src/hotspot/share/gc/shared/referenceProcessor.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/referenceProcessor.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_REFERENCEPROCESSOR_HPP
-#define SHARE_VM_GC_SHARED_REFERENCEPROCESSOR_HPP
+#ifndef SHARE_GC_SHARED_REFERENCEPROCESSOR_HPP
+#define SHARE_GC_SHARED_REFERENCEPROCESSOR_HPP
 
 #include "gc/shared/referenceDiscoverer.hpp"
 #include "gc/shared/referencePolicy.hpp"
@@ -695,4 +695,4 @@
   ~RefProcMTDegreeAdjuster();
 };
 
-#endif // SHARE_VM_GC_SHARED_REFERENCEPROCESSOR_HPP
+#endif // SHARE_GC_SHARED_REFERENCEPROCESSOR_HPP
--- a/src/hotspot/share/gc/shared/referenceProcessor.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/referenceProcessor.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_REFERENCEPROCESSOR_INLINE_HPP
-#define SHARE_VM_GC_SHARED_REFERENCEPROCESSOR_INLINE_HPP
+#ifndef SHARE_GC_SHARED_REFERENCEPROCESSOR_INLINE_HPP
+#define SHARE_GC_SHARED_REFERENCEPROCESSOR_INLINE_HPP
 
 #include "gc/shared/referenceProcessor.hpp"
 #include "oops/compressedOops.inline.hpp"
@@ -72,4 +72,4 @@
   _removed(0) {
 }
 
-#endif // SHARE_VM_GC_SHARED_REFERENCEPROCESSOR_INLINE_HPP
+#endif // SHARE_GC_SHARED_REFERENCEPROCESSOR_INLINE_HPP
--- a/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/referenceProcessorPhaseTimes.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_REFERENCEPROCESSORPHASETIMES_HPP
-#define SHARE_VM_GC_SHARED_REFERENCEPROCESSORPHASETIMES_HPP
+#ifndef SHARE_GC_SHARED_REFERENCEPROCESSORPHASETIMES_HPP
+#define SHARE_GC_SHARED_REFERENCEPROCESSORPHASETIMES_HPP
 
 #include "gc/shared/referenceProcessor.hpp"
 #include "gc/shared/referenceProcessorStats.hpp"
@@ -168,4 +168,4 @@
   ~RefProcTotalPhaseTimesTracker();
 };
 
-#endif // SHARE_VM_GC_SHARED_REFERENCEPROCESSORPHASETIMES_HPP
+#endif // SHARE_GC_SHARED_REFERENCEPROCESSORPHASETIMES_HPP
--- a/src/hotspot/share/gc/shared/referenceProcessorStats.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/referenceProcessorStats.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_REFERENCEPROCESSORSTATS_HPP
-#define SHARE_VM_GC_SHARED_REFERENCEPROCESSORSTATS_HPP
+#ifndef SHARE_GC_SHARED_REFERENCEPROCESSORSTATS_HPP
+#define SHARE_GC_SHARED_REFERENCEPROCESSORSTATS_HPP
 
 #include "utilities/globalDefinitions.hpp"
 
@@ -70,4 +70,4 @@
     return _phantom_count;
   }
 };
-#endif
+#endif // SHARE_GC_SHARED_REFERENCEPROCESSORSTATS_HPP
--- a/src/hotspot/share/gc/shared/softRefGenPolicy.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/softRefGenPolicy.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_SOFTREFGENPOLICY_HPP
-#define SHARE_VM_GC_SHARED_SOFTREFGENPOLICY_HPP
+#ifndef SHARE_GC_SHARED_SOFTREFGENPOLICY_HPP
+#define SHARE_GC_SHARED_SOFTREFGENPOLICY_HPP
 
 #include "gc/shared/softRefPolicy.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -35,4 +35,4 @@
   virtual void cleared_all_soft_refs();
 };
 
-#endif // SHARE_VM_GC_SHARED_SOFTREFGENPOLICY_HPP
+#endif // SHARE_GC_SHARED_SOFTREFGENPOLICY_HPP
--- a/src/hotspot/share/gc/shared/softRefPolicy.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/softRefPolicy.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_SOFTREFPOLICY_HPP
-#define SHARE_VM_GC_SHARED_SOFTREFPOLICY_HPP
+#ifndef SHARE_GC_SHARED_SOFTREFPOLICY_HPP
+#define SHARE_GC_SHARED_SOFTREFPOLICY_HPP
 
 #include "memory/allocation.hpp"
 
@@ -73,4 +73,4 @@
   bool should_clear() { return _clear_all_soft_refs; }
 };
 
-#endif // SHARE_VM_GC_SHARED_SOFTREFPOLICY_HPP
+#endif // SHARE_GC_SHARED_SOFTREFPOLICY_HPP
--- a/src/hotspot/share/gc/shared/space.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/space.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_SPACE_HPP
-#define SHARE_VM_GC_SHARED_SPACE_HPP
+#ifndef SHARE_GC_SHARED_SPACE_HPP
+#define SHARE_GC_SHARED_SPACE_HPP
 
 #include "gc/shared/blockOffsetTable.hpp"
 #include "gc/shared/cardTable.hpp"
@@ -782,4 +782,4 @@
                MemRegion mr) :
     OffsetTableContigSpace(sharedOffsetArray, mr) {}
 };
-#endif // SHARE_VM_GC_SHARED_SPACE_HPP
+#endif // SHARE_GC_SHARED_SPACE_HPP
--- a/src/hotspot/share/gc/shared/space.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/space.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_SPACE_INLINE_HPP
-#define SHARE_VM_GC_SHARED_SPACE_INLINE_HPP
+#ifndef SHARE_GC_SHARED_SPACE_INLINE_HPP
+#define SHARE_GC_SHARED_SPACE_INLINE_HPP
 
 #include "gc/shared/blockOffsetTable.inline.hpp"
 #include "gc/shared/collectedHeap.hpp"
@@ -388,4 +388,4 @@
   }
 }
 
-#endif // SHARE_VM_GC_SHARED_SPACE_INLINE_HPP
+#endif // SHARE_GC_SHARED_SPACE_INLINE_HPP
--- a/src/hotspot/share/gc/shared/spaceDecorator.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/spaceDecorator.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_SPACEDECORATOR_HPP
-#define SHARE_VM_GC_SHARED_SPACEDECORATOR_HPP
+#ifndef SHARE_GC_SHARED_SPACEDECORATOR_HPP
+#define SHARE_GC_SHARED_SPACEDECORATOR_HPP
 
 #include "gc/parallel/mutableSpace.hpp"
 #include "gc/shared/space.hpp"
@@ -147,4 +147,4 @@
   MutableSpaceMangler(MutableSpace* sp) : SpaceMangler(), _sp(sp) {}
 };
 
-#endif // SHARE_VM_GC_SHARED_SPACEDECORATOR_HPP
+#endif // SHARE_GC_SHARED_SPACEDECORATOR_HPP
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedup.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedup.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUP_HPP
-#define SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUP_HPP
+#ifndef SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUP_HPP
+#define SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUP_HPP
 
 //
 // String Deduplication
@@ -139,4 +139,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUP_HPP
+#endif // SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUP_HPP
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedup.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedup.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUP_INLINE_HPP
-#define SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUP_INLINE_HPP
+#ifndef SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUP_INLINE_HPP
+#define SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUP_INLINE_HPP
 
 #include "gc/shared/stringdedup/stringDedup.hpp"
 #include "gc/shared/stringdedup/stringDedupThread.inline.hpp"
@@ -38,4 +38,4 @@
   }
 }
 
-#endif // SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUP_INLINE_HPP
+#endif // SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUP_INLINE_HPP
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupQueue.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupQueue.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPQUEUE_HPP
-#define SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPQUEUE_HPP
+#ifndef SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPQUEUE_HPP
+#define SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPQUEUE_HPP
 
 #include "memory/allocation.hpp"
 #include "oops/oop.hpp"
@@ -109,4 +109,4 @@
   static size_t claim();
 };
 
-#endif // SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPQUEUE_HPP
+#endif // SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPQUEUE_HPP
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupQueue.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupQueue.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPQUEUE_INLINE_HPP
-#define SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPQUEUE_INLINE_HPP
+#ifndef SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPQUEUE_INLINE_HPP
+#define SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPQUEUE_INLINE_HPP
 
 #include "gc/shared/stringdedup/stringDedup.hpp"
 #include "gc/shared/stringdedup/stringDedupQueue.hpp"
@@ -51,4 +51,4 @@
   return queue()->pop_impl();
 }
 
-#endif // SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPQUEUE_INLINE_HPP
+#endif // SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPQUEUE_INLINE_HPP
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupStat.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupStat.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPSTAT_HPP
-#define SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPSTAT_HPP
+#ifndef SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPSTAT_HPP
+#define SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPSTAT_HPP
 
 #include "memory/allocation.hpp"
 #include "runtime/os.hpp"
@@ -135,5 +135,4 @@
   static void print_end(const StringDedupStat* last_stat, const StringDedupStat* total_stat);
 };
 
-#endif // SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPSTAT_HPP
-
+#endif // SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPSTAT_HPP
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupTable.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPTABLE_HPP
-#define SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPTABLE_HPP
+#ifndef SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPTABLE_HPP
+#define SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPTABLE_HPP
 
 #include "gc/shared/stringdedup/stringDedupStat.hpp"
 #include "runtime/mutexLocker.hpp"
@@ -252,4 +252,4 @@
   static void gc_epilogue();
 };
 
-#endif // SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPTABLE_HPP
+#endif // SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPTABLE_HPP
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupThread.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupThread.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPTHREAD_HPP
-#define SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPTHREAD_HPP
+#ifndef SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPTHREAD_HPP
+#define SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPTHREAD_HPP
 
 #include "gc/shared/concurrentGCThread.hpp"
 #include "gc/shared/stringdedup/stringDedupStat.hpp"
@@ -69,4 +69,4 @@
   static void create();
 };
 
-#endif // SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPTHREAD_HPP
+#endif // SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPTHREAD_HPP
--- a/src/hotspot/share/gc/shared/stringdedup/stringDedupThread.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/stringdedup/stringDedupThread.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPTHREAD_INLINE_HPP
-#define SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPTHREAD_INLINE_HPP
+#ifndef SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPTHREAD_INLINE_HPP
+#define SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPTHREAD_INLINE_HPP
 
 #include "gc/shared/suspendibleThreadSet.hpp"
 #include "gc/shared/stringdedup/stringDedupQueue.inline.hpp"
@@ -88,4 +88,4 @@
   _thread = new StringDedupThreadImpl<S>();
 }
 
-#endif // SHARE_VM_GC_SHARED_STRINGDEDUP_STRINGDEDUPTHREAD_INLINE_HPP
+#endif // SHARE_GC_SHARED_STRINGDEDUP_STRINGDEDUPTHREAD_INLINE_HPP
--- a/src/hotspot/share/gc/shared/strongRootsScope.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/strongRootsScope.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_STRONGROOTSSCOPE_HPP
-#define SHARE_VM_GC_SHARED_STRONGROOTSSCOPE_HPP
+#ifndef SHARE_GC_SHARED_STRONGROOTSSCOPE_HPP
+#define SHARE_GC_SHARED_STRONGROOTSSCOPE_HPP
 
 #include "memory/allocation.hpp"
 
@@ -46,4 +46,4 @@
   uint n_threads() const { return _n_threads; }
 };
 
-#endif // SHARE_VM_GC_SHARED_STRONGROOTSSCOPE_HPP
+#endif // SHARE_GC_SHARED_STRONGROOTSSCOPE_HPP
--- a/src/hotspot/share/gc/shared/taskqueue.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/taskqueue.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_TASKQUEUE_HPP
-#define SHARE_VM_GC_SHARED_TASKQUEUE_HPP
+#ifndef SHARE_GC_SHARED_TASKQUEUE_HPP
+#define SHARE_GC_SHARED_TASKQUEUE_HPP
 
 #include "memory/allocation.hpp"
 #include "memory/padded.hpp"
@@ -619,4 +619,4 @@
 typedef OverflowTaskQueue<size_t, mtGC>             RegionTaskQueue;
 typedef GenericTaskQueueSet<RegionTaskQueue, mtGC>  RegionTaskQueueSet;
 
-#endif // SHARE_VM_GC_SHARED_TASKQUEUE_HPP
+#endif // SHARE_GC_SHARED_TASKQUEUE_HPP
--- a/src/hotspot/share/gc/shared/taskqueue.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/taskqueue.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_TASKQUEUE_INLINE_HPP
-#define SHARE_VM_GC_SHARED_TASKQUEUE_INLINE_HPP
+#ifndef SHARE_GC_SHARED_TASKQUEUE_INLINE_HPP
+#define SHARE_GC_SHARED_TASKQUEUE_INLINE_HPP
 
 #include "gc/shared/taskqueue.hpp"
 #include "memory/allocation.inline.hpp"
@@ -331,4 +331,4 @@
 }
 
 
-#endif // SHARE_VM_GC_SHARED_TASKQUEUE_INLINE_HPP
+#endif // SHARE_GC_SHARED_TASKQUEUE_INLINE_HPP
--- a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_THREADLOCALALLOCBUFFER_HPP
-#define SHARE_VM_GC_SHARED_THREADLOCALALLOCBUFFER_HPP
+#ifndef SHARE_GC_SHARED_THREADLOCALALLOCBUFFER_HPP
+#define SHARE_GC_SHARED_THREADLOCALALLOCBUFFER_HPP
 
 #include "gc/shared/gcUtil.hpp"
 #include "runtime/perfData.hpp"
@@ -238,4 +238,4 @@
   void publish();
 };
 
-#endif // SHARE_VM_GC_SHARED_THREADLOCALALLOCBUFFER_HPP
+#endif // SHARE_GC_SHARED_THREADLOCALALLOCBUFFER_HPP
--- a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_THREADLOCALALLOCBUFFER_INLINE_HPP
-#define SHARE_VM_GC_SHARED_THREADLOCALALLOCBUFFER_INLINE_HPP
+#ifndef SHARE_GC_SHARED_THREADLOCALALLOCBUFFER_INLINE_HPP
+#define SHARE_GC_SHARED_THREADLOCALALLOCBUFFER_INLINE_HPP
 
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/threadLocalAllocBuffer.hpp"
@@ -95,4 +95,4 @@
                               obj_size, free(), refill_waste_limit());
 }
 
-#endif // SHARE_VM_GC_SHARED_THREADLOCALALLOCBUFFER_INLINE_HPP
+#endif // SHARE_GC_SHARED_THREADLOCALALLOCBUFFER_INLINE_HPP
--- a/src/hotspot/share/gc/shared/weakProcessor.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/weakProcessor.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_WEAKPROCESSOR_HPP
-#define SHARE_VM_GC_SHARED_WEAKPROCESSOR_HPP
+#ifndef SHARE_GC_SHARED_WEAKPROCESSOR_HPP
+#define SHARE_GC_SHARED_WEAKPROCESSOR_HPP
 
 #include "gc/shared/oopStorageParState.hpp"
 #include "gc/shared/workgroup.hpp"
@@ -92,4 +92,4 @@
   void work(uint worker_id, IsAlive* is_alive, KeepAlive* keep_alive);
 };
 
-#endif // SHARE_VM_GC_SHARED_WEAKPROCESSOR_HPP
+#endif // SHARE_GC_SHARED_WEAKPROCESSOR_HPP
--- a/src/hotspot/share/gc/shared/weakProcessor.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/weakProcessor.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_WEAKPROCESSOR_INLINE_HPP
-#define SHARE_VM_GC_SHARED_WEAKPROCESSOR_INLINE_HPP
+#ifndef SHARE_GC_SHARED_WEAKPROCESSOR_INLINE_HPP
+#define SHARE_GC_SHARED_WEAKPROCESSOR_INLINE_HPP
 
 #include "gc/shared/oopStorage.inline.hpp"
 #include "gc/shared/oopStorageParState.inline.hpp"
@@ -116,4 +116,4 @@
   pt.log_print_phases(indent_log);
 }
 
-#endif // SHARE_VM_GC_SHARED_WEAKPROCESSOR_INLINE_HPP
+#endif // SHARE_GC_SHARED_WEAKPROCESSOR_INLINE_HPP
--- a/src/hotspot/share/gc/shared/workerDataArray.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/workerDataArray.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_WORKERDATAARRAY_HPP
-#define SHARE_VM_GC_SHARED_WORKERDATAARRAY_HPP
+#ifndef SHARE_GC_SHARED_WORKERDATAARRAY_HPP
+#define SHARE_GC_SHARED_WORKERDATAARRAY_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/debug.hpp"
@@ -90,4 +90,4 @@
   void print_details_on(outputStream* out) const;
 };
 
-#endif // SHARE_VM_GC_SHARED_WORKERDATAARRAY_HPP
+#endif // SHARE_GC_SHARED_WORKERDATAARRAY_HPP
--- a/src/hotspot/share/gc/shared/workerDataArray.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/workerDataArray.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_WORKERDATAARRAY_INLINE_HPP
-#define SHARE_VM_GC_SHARED_WORKERDATAARRAY_INLINE_HPP
+#ifndef SHARE_GC_SHARED_WORKERDATAARRAY_INLINE_HPP
+#define SHARE_GC_SHARED_WORKERDATAARRAY_INLINE_HPP
 
 #include "gc/shared/workerDataArray.hpp"
 #include "memory/allocation.inline.hpp"
@@ -177,4 +177,4 @@
   }
 }
 
-#endif // SHARE_VM_GC_SHARED_WORKERDATAARRAY_INLINE_HPP
+#endif // SHARE_GC_SHARED_WORKERDATAARRAY_INLINE_HPP
--- a/src/hotspot/share/gc/shared/workerManager.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/workerManager.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_WORKERMANAGER_HPP
-#define SHARE_VM_GC_SHARED_WORKERMANAGER_HPP
+#ifndef SHARE_GC_SHARED_WORKERMANAGER_HPP
+#define SHARE_GC_SHARED_WORKERMANAGER_HPP
 
 #include "logging/log.hpp"
 #include "memory/allocation.hpp"
@@ -115,4 +115,4 @@
   }
 }
 
-#endif // SHARE_VM_GC_SHARED_WORKERMANAGER_HPP
+#endif // SHARE_GC_SHARED_WORKERMANAGER_HPP
--- a/src/hotspot/share/gc/shared/workerPolicy.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/workerPolicy.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_WORKERPOLICY_HPP
-#define SHARE_VM_GC_SHARED_WORKERPOLICY_HPP
+#ifndef SHARE_GC_SHARED_WORKERPOLICY_HPP
+#define SHARE_GC_SHARED_WORKERPOLICY_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -78,4 +78,4 @@
 
 };
 
-#endif // SHARE_VM_GC_SHARED_WORKERPOLICY_HPP
+#endif // SHARE_GC_SHARED_WORKERPOLICY_HPP
--- a/src/hotspot/share/gc/shared/workgroup.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shared/workgroup.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHARED_WORKGROUP_HPP
-#define SHARE_VM_GC_SHARED_WORKGROUP_HPP
+#ifndef SHARE_GC_SHARED_WORKGROUP_HPP
+#define SHARE_GC_SHARED_WORKGROUP_HPP
 
 #include "memory/allocation.hpp"
 #include "runtime/globals.hpp"
@@ -406,4 +406,4 @@
   bool all_tasks_completed();
 };
 
-#endif // SHARE_VM_GC_SHARED_WORKGROUP_HPP
+#endif // SHARE_GC_SHARED_WORKGROUP_HPP
--- a/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/c1/shenandoahBarrierSetC1.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_C1_SHENANDOAHBARRIERSETC1_HPP
-#define SHARE_VM_GC_SHENANDOAH_C1_SHENANDOAHBARRIERSETC1_HPP
+#ifndef SHARE_GC_SHENANDOAH_C1_SHENANDOAHBARRIERSETC1_HPP
+#define SHARE_GC_SHENANDOAH_C1_SHENANDOAHBARRIERSETC1_HPP
 
 #include "c1/c1_CodeStubs.hpp"
 #include "gc/shared/c1/barrierSetC1.hpp"
@@ -210,4 +210,4 @@
   virtual void generate_c1_runtime_stubs(BufferBlob* buffer_blob);
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_C1_SHENANDOAHBARRIERSETC1_HPP
+#endif // SHARE_GC_SHENANDOAH_C1_SHENANDOAHBARRIERSETC1_HPP
--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_C2_SHENANDOAHBARRIERSETC2_HPP
-#define SHARE_VM_GC_SHENANDOAH_C2_SHENANDOAHBARRIERSETC2_HPP
+#ifndef SHARE_GC_SHENANDOAH_C2_SHENANDOAHBARRIERSETC2_HPP
+#define SHARE_GC_SHENANDOAH_C2_SHENANDOAHBARRIERSETC2_HPP
 
 #include "gc/shared/c2/barrierSetC2.hpp"
 #include "gc/shenandoah/c2/shenandoahSupport.hpp"
@@ -171,4 +171,4 @@
   virtual bool sink_node(PhaseIdealLoop* phase, Node* n, Node* x, Node* x_ctrl, Node* n_ctrl) const;
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_C2_SHENANDOAHBARRIERSETC2_HPP
+#endif // SHARE_GC_SHENANDOAH_C2_SHENANDOAHBARRIERSETC2_HPP
--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahSupport.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_C2_SHENANDOAH_SUPPORT_HPP
-#define SHARE_VM_GC_SHENANDOAH_C2_SHENANDOAH_SUPPORT_HPP
+#ifndef SHARE_GC_SHENANDOAH_C2_SHENANDOAHSUPPORT_HPP
+#define SHARE_GC_SHENANDOAH_C2_SHENANDOAHSUPPORT_HPP
 
 #include "gc/shenandoah/shenandoahBrooksPointer.hpp"
 #include "memory/allocation.hpp"
@@ -382,4 +382,4 @@
   virtual int Opcode() const;
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_C2_SHENANDOAH_SUPPORT_HPP
+#endif // SHARE_GC_SHENANDOAH_C2_SHENANDOAHSUPPORT_HPP
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAdaptiveHeuristics.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHADAPTIVEHEURISTICS_HPP
-#define SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHADAPTIVEHEURISTICS_HPP
+#ifndef SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHADAPTIVEHEURISTICS_HPP
+#define SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHADAPTIVEHEURISTICS_HPP
 
 #include "gc/shenandoah/shenandoahHeuristics.hpp"
 #include "gc/shenandoah/shenandoahPhaseTimings.hpp"
@@ -58,4 +58,4 @@
   virtual bool is_experimental();
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHADAPTIVEHEURISTICS_HPP
+#endif // SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHADAPTIVEHEURISTICS_HPP
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAggressiveHeuristics.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahAggressiveHeuristics.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHAGGRESSIVEHEURISTICS_HPP
-#define SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHAGGRESSIVEHEURISTICS_HPP
+#ifndef SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHAGGRESSIVEHEURISTICS_HPP
+#define SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHAGGRESSIVEHEURISTICS_HPP
 
 #include "gc/shenandoah/shenandoahHeuristics.hpp"
 
@@ -47,4 +47,4 @@
   virtual bool is_experimental();
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHAGGRESSIVEHEURISTICS_HPP
+#endif // SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHAGGRESSIVEHEURISTICS_HPP
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahCompactHeuristics.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHCOMPACTHEURISTICS_HPP
-#define SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHCOMPACTHEURISTICS_HPP
+#ifndef SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHCOMPACTHEURISTICS_HPP
+#define SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHCOMPACTHEURISTICS_HPP
 
 #include "gc/shenandoah/shenandoahHeuristics.hpp"
 
@@ -43,4 +43,4 @@
   virtual bool is_experimental();
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHCOMPACTHEURISTICS_HPP
+#endif // SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHCOMPACTHEURISTICS_HPP
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahPassiveHeuristics.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahPassiveHeuristics.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHPASSIVEHEURISTICS_HPP
-#define SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHPASSIVEHEURISTICS_HPP
+#ifndef SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHPASSIVEHEURISTICS_HPP
+#define SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHPASSIVEHEURISTICS_HPP
 
 #include "gc/shenandoah/shenandoahHeuristics.hpp"
 
@@ -49,4 +49,4 @@
   virtual bool is_experimental();
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHPASSIVEHEURISTICS_HPP
+#endif // SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHPASSIVEHEURISTICS_HPP
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahStaticHeuristics.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahStaticHeuristics.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHSTATICHEURISTICS_HPP
-#define SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHSTATICHEURISTICS_HPP
+#ifndef SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHSTATICHEURISTICS_HPP
+#define SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHSTATICHEURISTICS_HPP
 
 #include "gc/shenandoah/shenandoahHeuristics.hpp"
 
@@ -45,4 +45,4 @@
   virtual bool is_experimental();
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHSTATICHEURISTICS_HPP
+#endif // SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHSTATICHEURISTICS_HPP
--- a/src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalHeuristics.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/heuristics/shenandoahTraversalHeuristics.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHTRAVERSALHEURISTICS_HPP
-#define SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHTRAVERSALHEURISTICS_HPP
+#ifndef SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHTRAVERSALHEURISTICS_HPP
+#define SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHTRAVERSALHEURISTICS_HPP
 
 #include "gc/shenandoah/shenandoahHeuristics.hpp"
 
@@ -53,4 +53,4 @@
   virtual bool should_start_traversal_gc();
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_HEURISTICS_SHENANDOAHTRAVERSALHEURISTICS_HPP
+#endif // SHARE_GC_SHENANDOAH_HEURISTICS_SHENANDOAHTRAVERSALHEURISTICS_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahAllocRequest.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahAllocRequest.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHALLOCREQUEST_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHALLOCREQUEST_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHALLOCREQUEST_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHALLOCREQUEST_HPP
 
 #include "memory/allocation.hpp"
 
@@ -155,4 +155,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHALLOCREQUEST_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHALLOCREQUEST_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahAllocTracker.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahAllocTracker.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHALLOCTRACKER_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHALLOCTRACKER_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHALLOCTRACKER_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHALLOCTRACKER_HPP
 
 #include "gc/shenandoah/shenandoahAllocRequest.hpp"
 #include "gc/shenandoah/shenandoahNumberSeq.hpp"
@@ -45,4 +45,4 @@
   void print_on(outputStream* out) const;
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHALLOCTRACKER_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHALLOCTRACKER_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahAsserts.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahAsserts.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHASSERTS_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHASSERTS_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHASSERTS_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHASSERTS_HPP
 
 #include "memory/iterator.hpp"
 #include "utilities/formatBuffer.hpp"
@@ -167,4 +167,4 @@
 
 };
 
-#endif //SHARE_VM_GC_SHENANDOAH_SHENANDOAHASSERTS_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHASSERTS_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHBARRIERSET_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHBARRIERSET_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHBARRIERSET_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHBARRIERSET_HPP
 
 #include "gc/shared/accessBarrierSupport.hpp"
 #include "gc/shared/barrierSet.hpp"
@@ -293,4 +293,4 @@
   typedef ::ShenandoahBarrierSet type;
 };
 
-#endif //SHARE_VM_GC_SHENANDOAH_SHENANDOAHBARRIERSET_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHBARRIERSET_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHBARRIERSET_INLINE_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHBARRIERSET_INLINE_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHBARRIERSET_INLINE_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHBARRIERSET_INLINE_HPP
 
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shenandoah/shenandoahBarrierSet.hpp"
@@ -279,4 +279,4 @@
   return bs->arraycopy_loop_1(src_raw, dst_raw, length, bound, checkcast, satb, disjoint, storeval_mode);
 }
 
-#endif //SHARE_VM_GC_SHENANDOAH_SHENANDOAHBARRIERSET_INLINE_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHBARRIERSET_INLINE_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahBrooksPointer.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahBrooksPointer.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHBROOKSPOINTER_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHBROOKSPOINTER_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHBROOKSPOINTER_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHBROOKSPOINTER_HPP
 
 #include "oops/oop.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -103,4 +103,4 @@
   static inline HeapWord** brooks_ptr_addr(oop obj);
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHBROOKSPOINTER_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHBROOKSPOINTER_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahBrooksPointer.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahBrooksPointer.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHBROOKSPOINTER_INLINE_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHBROOKSPOINTER_INLINE_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHBROOKSPOINTER_INLINE_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHBROOKSPOINTER_INLINE_HPP
 
 #include "gc/shenandoah/shenandoahAsserts.hpp"
 #include "gc/shenandoah/shenandoahBrooksPointer.hpp"
@@ -62,4 +62,4 @@
   return result;
 }
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHBROOKSPOINTER_INLINE_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHBROOKSPOINTER_INLINE_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHCODEROOTS_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHCODEROOTS_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHCODEROOTS_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHCODEROOTS_HPP
 
 #include "code/codeCache.hpp"
 #include "gc/shenandoah/shenandoahSharedVariables.hpp"
@@ -197,4 +197,4 @@
   }
 };
 
-#endif //SHARE_VM_GC_SHENANDOAH_SHENANDOAHCODEROOTS_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHCODEROOTS_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHCOLLECTIONSET_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHCOLLECTIONSET_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHCOLLECTIONSET_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHCOLLECTIONSET_HPP
 
 #include "memory/allocation.hpp"
 #include "gc/shenandoah/shenandoahHeap.hpp"
@@ -93,4 +93,4 @@
   }
 };
 
-#endif //SHARE_VM_GC_SHENANDOAH_SHENANDOAHCOLLECTIONSET_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHCOLLECTIONSET_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHCOLLECTIONSET_INLINE_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHCOLLECTIONSET_INLINE_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHCOLLECTIONSET_INLINE_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHCOLLECTIONSET_INLINE_HPP
 
 #include "gc/shenandoah/shenandoahCollectionSet.hpp"
 #include "gc/shenandoah/shenandoahHeap.hpp"
@@ -46,4 +46,4 @@
   return _biased_cset_map[index] == 1;
 }
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHCOLLECTIONSET_INLINE_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHCOLLECTIONSET_INLINE_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahCollectorPolicy.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahCollectorPolicy.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHCOLLECTORPOLICY_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHCOLLECTORPOLICY_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHCOLLECTORPOLICY_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHCOLLECTORPOLICY_HPP
 
 #include "gc/shared/collectorPolicy.hpp"
 #include "gc/shenandoah/shenandoahHeap.hpp"
@@ -79,4 +79,4 @@
   void print_gc_stats(outputStream* out) const;
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHCOLLECTORPOLICY_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHCOLLECTORPOLICY_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_HPP
 
 #include "gc/shared/taskqueue.hpp"
 #include "gc/shenandoah/shenandoahOopClosures.hpp"
@@ -108,4 +108,4 @@
 
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_INLINE_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_INLINE_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_INLINE_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_INLINE_HPP
 
 #include "gc/shenandoah/shenandoahAsserts.hpp"
 #include "gc/shenandoah/shenandoahBrooksPointer.hpp"
@@ -275,4 +275,4 @@
   }
 }
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_INLINE_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHCONCURRENTMARK_INLINE_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahControlThread.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahControlThread.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHSCHEDULERTHREAD_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHSCHEDULERTHREAD_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHCONTROLTHREAD_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHCONTROLTHREAD_HPP
 
 #include "gc/shared/gcCause.hpp"
 #include "gc/shared/concurrentGCThread.hpp"
@@ -140,4 +140,4 @@
   void print() const;
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHSCHEDULERTHREAD_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHCONTROLTHREAD_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahEvacOOMHandler.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHEVACOOMHANDLER_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHEVACOOMHANDLER_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHEVACOOMHANDLER_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHEVACOOMHANDLER_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -125,4 +125,4 @@
   ~ShenandoahEvacOOMScopeLeaver();
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHEVACOOMHANDLER_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHEVACOOMHANDLER_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahFreeSet.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHFREESET_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHFREESET_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHFREESET_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHFREESET_HPP
 
 #include "gc/shenandoah/shenandoahHeapRegionSet.hpp"
 #include "gc/shenandoah/shenandoahHeap.hpp"
@@ -94,4 +94,4 @@
   void print_on(outputStream* out) const;
 };
 
-#endif //SHARE_VM_GC_SHENANDOAH_SHENANDOAHFREESET_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHFREESET_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAP_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAP_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHHEAP_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHHEAP_HPP
 
 #include "gc/shared/markBitMap.hpp"
 #include "gc/shared/softRefPolicy.hpp"
@@ -754,4 +754,4 @@
   bool should_inject_alloc_failure();
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAP_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHHEAP_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeap.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAP_INLINE_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAP_INLINE_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHHEAP_INLINE_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHHEAP_INLINE_HPP
 
 #include "classfile/javaClasses.inline.hpp"
 #include "gc/shared/markBitMap.inline.hpp"
@@ -549,4 +549,4 @@
   return _marking_context;
 }
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAP_INLINE_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHHEAP_INLINE_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapLock.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapLock.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPLOCK_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPLOCK_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHHEAPLOCK_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHHEAPLOCK_HPP
 
 #include "memory/allocation.hpp"
 #include "runtime/thread.hpp"
@@ -90,4 +90,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPLOCK_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHHEAPLOCK_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGION_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGION_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGION_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGION_HPP
 
 #include "gc/shared/space.hpp"
 #include "gc/shenandoah/shenandoahAllocRequest.hpp"
@@ -428,4 +428,4 @@
   inline void internal_increase_live_data(size_t s);
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGION_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGION_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegion.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGION_INLINE_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGION_INLINE_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGION_INLINE_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGION_INLINE_HPP
 
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahHeapRegion.hpp"
@@ -108,4 +108,4 @@
 #endif
 }
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGION_INLINE_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGION_INLINE_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionCounters.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionCounters.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGIONCOUNTERS_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGIONCOUNTERS_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGIONCOUNTERS_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGIONCOUNTERS_HPP
 
 #include "memory/allocation.hpp"
 
@@ -82,4 +82,4 @@
   void update();
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGIONCOUNTERS_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGIONCOUNTERS_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGIONSET_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGIONSET_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGIONSET_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGIONSET_HPP
 
 #include "memory/allocation.hpp"
 #include "gc/shenandoah/shenandoahHeap.hpp"
@@ -95,4 +95,4 @@
   }
 };
 
-#endif //SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGIONSET_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGIONSET_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeapRegionSet.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGIONSET_INLINE_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGIONSET_INLINE_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGIONSET_INLINE_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGIONSET_INLINE_HPP
 
 #include "gc/shenandoah/shenandoahHeapRegionSet.hpp"
 #include "gc/shenandoah/shenandoahHeap.hpp"
@@ -46,4 +46,4 @@
   return _biased_set_map[index] == 1;
 }
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEAPREGIONSET_INLINE_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHHEAPREGIONSET_INLINE_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahHeuristics.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahHeuristics.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEURISTICS_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEURISTICS_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHHEURISTICS_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHHEURISTICS_HPP
 
 #include "gc/shenandoah/shenandoahHeap.hpp"
 #include "gc/shenandoah/shenandoahPhaseTimings.hpp"
@@ -164,4 +164,4 @@
   double time_since_last_gc() const;
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHHEURISTICS_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHHEURISTICS_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkCompact.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHMARKCOMPACT_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHMARKCOMPACT_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHMARKCOMPACT_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHMARKCOMPACT_HPP
 
 #include "gc/shared/gcTimer.hpp"
 #include "gc/shenandoah/shenandoahHeap.hpp"
@@ -68,4 +68,4 @@
 
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHMARKCOMPACT_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHMARKCOMPACT_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHMARKINGCONTEXT_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHMARKINGCONTEXT_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHMARKINGCONTEXT_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHMARKINGCONTEXT_HPP
 
 #include "gc/shared/markBitMap.hpp"
 #include "memory/allocation.hpp"
@@ -77,4 +77,4 @@
 
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHMARKINGCONTEXT_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHMARKINGCONTEXT_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMarkingContext.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHMARKINGCONTEXT_INLINE_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHMARKINGCONTEXT_INLINE_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHMARKINGCONTEXT_INLINE_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHMARKINGCONTEXT_INLINE_HPP
 
 #include "gc/shenandoah/shenandoahMarkingContext.hpp"
 
@@ -48,4 +48,4 @@
   return alloc_after_mark_start;
 }
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHMARKINGCONTEXT_INLINE_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHMARKINGCONTEXT_INLINE_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahMemoryPool.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMemoryPool.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_SERVICES_SHENANDOAHMEMORYPOOL_HPP
-#define SHARE_VM_SERVICES_SHENANDOAHMEMORYPOOL_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHMEMORYPOOL_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHMEMORYPOOL_HPP
 
 #ifndef SERIALGC
 #include "gc/shenandoah/shenandoahHeap.hpp"
@@ -41,4 +41,4 @@
   size_t max_size() const             { return _heap->max_capacity(); }
 };
 
-#endif //SHARE_VM_SERVICES_SHENANDOAHMEMORYPOOL_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHMEMORYPOOL_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahMetrics.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMetrics.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHMETRICS_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHMETRICS_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHMETRICS_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHMETRICS_HPP
 
 #include "gc/shenandoah/shenandoahHeap.hpp"
 
@@ -52,4 +52,4 @@
   bool is_good_progress(const char *label);
 };
 
-#endif //SHARE_VM_GC_SHENANDOAH_SHENANDOAHMETRICS_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHMETRICS_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahMonitoringSupport.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMonitoringSupport.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHMONITORINGSUPPORT_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHMONITORINGSUPPORT_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHMONITORINGSUPPORT_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHMONITORINGSUPPORT_HPP
 
 #include "memory/allocation.hpp"
 
@@ -53,4 +53,4 @@
  void update_counters();
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHMONITORINGSUPPORT_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHMONITORINGSUPPORT_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahNumberSeq.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahNumberSeq.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHNUMBERSEQ_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHNUMBERSEQ_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHNUMBERSEQ_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHNUMBERSEQ_HPP
 
 #include "utilities/numberSeq.hpp"
 
@@ -71,4 +71,4 @@
   int max_level() const;
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHNUMBERSEQ_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHNUMBERSEQ_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_HPP
 
 #include "gc/shared/referenceProcessor.hpp"
 #include "gc/shenandoah/shenandoahHeap.hpp"
@@ -347,4 +347,4 @@
   virtual bool do_metadata()        { return true; }
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahOopClosures.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_INLINE_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_INLINE_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_INLINE_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_INLINE_HPP
 
 #include "gc/shenandoah/shenandoahHeap.inline.hpp"
 #include "gc/shenandoah/shenandoahConcurrentMark.inline.hpp"
@@ -43,4 +43,4 @@
   _traversal_gc->process_oop<T, STRING_DEDUP, DEGEN>(p, _thread, _queue, _mark_context);
 }
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_INLINE_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHOOPCLOSURES_INLINE_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahPacer.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahPacer.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHPACER_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHPACER_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHPACER_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHPACER_HPP
 
 #include "gc/shenandoah/shenandoahNumberSeq.hpp"
 #include "memory/allocation.hpp"
@@ -96,4 +96,4 @@
   size_t update_and_get_progress_history();
 };
 
-#endif //SHARE_VM_GC_SHENANDOAH_SHENANDOAHPACER_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHPACER_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahPacer.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahPacer.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHPACER_INLINE_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHPACER_INLINE_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHPACER_INLINE_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHPACER_INLINE_HPP
 
 #include "gc/shenandoah/shenandoahPacer.hpp"
 #include "runtime/atomic.hpp"
@@ -56,4 +56,4 @@
   Atomic::add((intptr_t)words, &_progress);
 }
 
-#endif //SHARE_VM_GC_SHENANDOAH_SHENANDOAHPACER_INLINE_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHPACER_INLINE_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHPHASETIMEINGS_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHPHASETIMEINGS_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHPHASETIMINGS_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHPHASETIMINGS_HPP
 
 #include "gc/shenandoah/shenandoahNumberSeq.hpp"
 #include "gc/shared/workerDataArray.hpp"
@@ -395,4 +395,4 @@
   void print() const;
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHGCPHASETIMEINGS_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHPHASETIMINGS_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHROOTPROCESSOR_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHROOTPROCESSOR_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHROOTPROCESSOR_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHROOTPROCESSOR_HPP
 
 #include "code/codeCache.hpp"
 #include "gc/shared/oopStorageParState.hpp"
@@ -123,4 +123,4 @@
   // Number of worker threads used by the root processor.
   uint n_workers() const;
 };
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHROOTPROCESSOR_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHROOTPROCESSOR_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahRuntime.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahRuntime.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHRUNTIME_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHRUNTIME_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHRUNTIME_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHRUNTIME_HPP
 
 #include "memory/allocation.hpp"
 #include "oops/oopsHierarchy.hpp"
@@ -43,4 +43,4 @@
   static void shenandoah_clone_barrier(oopDesc* obj);
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHRUNTIME_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHRUNTIME_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahSATBMarkQueueSet.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahSATBMarkQueueSet.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHSATBMARKQUEUESET_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHSATBMARKQUEUESET_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHSATBMARKQUEUESET_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHSATBMARKQUEUESET_HPP
 
 #include "gc/shared/satbMarkQueue.hpp"
 #include "gc/shenandoah/shenandoahHeap.hpp"
@@ -52,4 +52,4 @@
   virtual void filter(SATBMarkQueue* queue);
 };
 
-#endif
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHSATBMARKQUEUESET_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahSharedVariables.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahSharedVariables.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHSHAREDFLAG_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHSHAREDFLAG_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHSHAREDVARIABLES_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHSHAREDVARIABLES_HPP
 
 #include "memory/allocation.hpp"
 #include "runtime/orderAccess.hpp"
@@ -243,4 +243,4 @@
 
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHSHAREDFLAG_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHSHAREDVARIABLES_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahStrDedupQueue.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahStrDedupQueue.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUPQUEUE_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUPQUEUE_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHSTRDEDUPQUEUE_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHSTRDEDUPQUEUE_HPP
 
 #include "gc/shared/stringdedup/stringDedup.hpp"
 #include "gc/shenandoah/shenandoahHeap.hpp"
@@ -110,4 +110,4 @@
   void verify(ShenandoahQueueBuffer* head);
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUPQUEUE_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHSTRDEDUPQUEUE_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahStrDedupQueue.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahStrDedupQueue.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUPQUEUE_INLINE_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUPQUEUE_INLINE_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHSTRDEDUPQUEUE_INLINE_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHSTRDEDUPQUEUE_INLINE_HPP
 
 #include "gc/shenandoah/shenandoahStrDedupQueue.hpp"
 
@@ -95,4 +95,4 @@
   }
 }
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUPQUEUE_INLINE_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHSTRDEDUPQUEUE_INLINE_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahStringDedup.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahStringDedup.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUP_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUP_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUP_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUP_HPP
 
 #include "classfile/javaClasses.inline.hpp"
 #include "gc/shared/stringdedup/stringDedup.hpp"
@@ -56,4 +56,4 @@
 
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUP_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHSTRINGDEDUP_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHTASKQUEUE_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHTASKQUEUE_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHTASKQUEUE_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHTASKQUEUE_HPP
 #include "gc/shared/owstTaskTerminator.hpp"
 #include "gc/shared/taskqueue.hpp"
 #include "gc/shared/taskqueue.inline.hpp"
@@ -329,4 +329,4 @@
   bool offer_termination() { return offer_termination((ShenandoahTerminatorTerminator*)NULL); }
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHTASKQUEUE_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHTASKQUEUE_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahTaskqueue.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHTASKQUEUE_INLINE_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHTASKQUEUE_INLINE_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHTASKQUEUE_INLINE_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHTASKQUEUE_INLINE_HPP
 
 #include "gc/shenandoah/shenandoahTaskqueue.hpp"
 
@@ -56,4 +56,4 @@
   return true;
 }
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHTASKQUEUE_INLINE_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHTASKQUEUE_INLINE_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahTimingTracker.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahTimingTracker.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHTIMINGTRACKER_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHTIMINGTRACKER_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHTIMINGTRACKER_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHTIMINGTRACKER_HPP
 
 #include "jfr/jfrEvents.hpp"
 #include "gc/shenandoah/shenandoahPhaseTimings.hpp"
@@ -65,5 +65,4 @@
   static ShenandoahPhaseTimings::Phase current_termination_phase() { return _current_termination_phase; }
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHTIMINGTRACKER_HPP
-
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHTIMINGTRACKER_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahTracer.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahTracer.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHTRACER_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHTRACER_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHTRACER_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHTRACER_HPP
 
 #include "gc/shared/gcTrace.hpp"
 
@@ -31,4 +31,4 @@
   ShenandoahTracer() : GCTracer(Shenandoah) {}
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHTRACER_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHTRACER_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHTRAVERSALGC_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHTRAVERSALGC_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHTRAVERSALGC_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHTRAVERSALGC_HPP
 
 #include "memory/allocation.hpp"
 #include "gc/shenandoah/shenandoahHeap.hpp"
@@ -70,4 +70,4 @@
   void fixup_roots();
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHTRAVERSALGC_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHTRAVERSALGC_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahTraversalGC.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHTRAVERSALGC_INLINE_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHTRAVERSALGC_INLINE_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHTRAVERSALGC_INLINE_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHTRAVERSALGC_INLINE_HPP
 
 #include "gc/shenandoah/shenandoahAsserts.hpp"
 #include "gc/shenandoah/shenandoahBarrierSet.inline.hpp"
@@ -74,4 +74,4 @@
   }
 }
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHTRAVERSALGC_INLINE_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHTRAVERSALGC_INLINE_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahUtils.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahUtils.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAHUTILS_HPP
-#define SHARE_VM_GC_SHENANDOAHUTILS_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHUTILS_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHUTILS_HPP
 
 #include "jfr/jfrEvents.hpp"
 
@@ -175,4 +175,4 @@
   }
 };
 
-#endif // SHARE_VM_GC_SHENANDOAHUTILS_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHUTILS_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahVMOperations.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahVMOperations.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_VM_OPERATIONS_SHENANDOAH_HPP
-#define SHARE_VM_GC_SHENANDOAH_VM_OPERATIONS_SHENANDOAH_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHVMOPERATIONS_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHVMOPERATIONS_HPP
 
 #include "gc/shared/gcVMOperations.hpp"
 
@@ -131,4 +131,4 @@
   virtual void doit();
 };
 
-#endif //SHARE_VM_GC_SHENANDOAH_VM_OPERATIONS_SHENANDOAH_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHVMOPERATIONS_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahVerifier.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahVerifier.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHVERIFIER_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHVERIFIER_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHVERIFIER_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHVERIFIER_HPP
 
 #include "gc/shared/markBitMap.hpp"
 #include "memory/allocation.hpp"
@@ -184,4 +184,4 @@
   void verify_generic(VerifyOption option);
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHVERIFIER_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHVERIFIER_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahWorkGroup.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahWorkGroup.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHWORKGROUP_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHWORKGROUP_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHWORKGROUP_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHWORKGROUP_HPP
 
 #include "gc/shared/workgroup.hpp"
 #include "gc/shenandoah/shenandoahTaskqueue.hpp"
@@ -87,4 +87,4 @@
   void set_initialize_gclab() { assert(!_initialize_gclab, "Can only enable once"); _initialize_gclab = true; }
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHWORKGROUP_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHWORKGROUP_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoahWorkerPolicy.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoahWorkerPolicy.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAHWORKERPOLICY_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAHWORKERPOLICY_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAHWORKERPOLICY_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAHWORKERPOLICY_HPP
 
 #include "memory/allocation.hpp"
 
@@ -81,4 +81,4 @@
   static uint calc_workers_for_conc_reset();
 };
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAHWORKERPOLICY_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAHWORKERPOLICY_HPP
--- a/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/shenandoah_globals.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_GC_SHENANDOAH_SHENANDOAH_GLOBALS_HPP
-#define SHARE_VM_GC_SHENANDOAH_SHENANDOAH_GLOBALS_HPP
+#ifndef SHARE_GC_SHENANDOAH_SHENANDOAH_GLOBALS_HPP
+#define SHARE_GC_SHENANDOAH_SHENANDOAH_GLOBALS_HPP
 
 #define GC_SHENANDOAH_FLAGS(develop,                                        \
                             develop_pd,                                     \
@@ -414,4 +414,4 @@
   experimental(bool, ShenandoahLoopOptsAfterExpansion, true,                \
           "Attempt more loop opts after write barrier expansion")           \
 
-#endif // SHARE_VM_GC_SHENANDOAH_SHENANDOAH_GLOBALS_HPP
+#endif // SHARE_GC_SHENANDOAH_SHENANDOAH_GLOBALS_HPP
--- a/src/hotspot/share/gc/shenandoah/vmStructs_shenandoah.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/shenandoah/vmStructs_shenandoah.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -20,8 +20,8 @@
  * questions.
  *
  */
-#ifndef SHARE_VM_GC_SHENANDOAH_VMSTRUCTS_SHENANDOAH_HPP
-#define SHARE_VM_GC_SHENANDOAH_VMSTRUCTS_SHENANDOAH_HPP
+#ifndef SHARE_GC_SHENANDOAH_VMSTRUCTS_SHENANDOAH_HPP
+#define SHARE_GC_SHENANDOAH_VMSTRUCTS_SHENANDOAH_HPP
 
 #include "gc/shenandoah/shenandoahHeap.hpp"
 #include "gc/shenandoah/shenandoahHeapRegion.hpp"
@@ -43,4 +43,4 @@
   declare_toplevel_type(ShenandoahHeap*)                                      \
   declare_toplevel_type(ShenandoahHeapRegion*)                                \
 
-#endif // SHARE_VM_GC_SHENANDOAH_VMSTRUCTS_SHENANDOAH_HPP
+#endif // SHARE_GC_SHENANDOAH_VMSTRUCTS_SHENANDOAH_HPP
--- a/src/hotspot/share/gc/z/vmStructs_z.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/z/vmStructs_z.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  */
 
-#ifndef SHARE_VM_GC_Z_VMSTRUCTS_Z_HPP
-#define SHARE_VM_GC_Z_VMSTRUCTS_Z_HPP
+#ifndef SHARE_GC_Z_VMSTRUCTS_Z_HPP
+#define SHARE_GC_Z_VMSTRUCTS_Z_HPP
 
 #include "gc/z/zAddressRangeMap.hpp"
 #include "gc/z/zCollectedHeap.hpp"
@@ -117,4 +117,4 @@
   declare_toplevel_type(ZForwardingTableEntry)                                                       \
   declare_toplevel_type(ZPhysicalMemoryManager)
 
-#endif // SHARE_VM_GC_Z_VMSTRUCTS_Z_HPP
+#endif // SHARE_GC_Z_VMSTRUCTS_Z_HPP
--- a/src/hotspot/share/gc/z/zForwardingTable.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/z/zForwardingTable.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  */
 
-#ifndef SHARE_GC_Z_ZFORWARDING_HPP
-#define SHARE_GC_Z_ZFORWARDING_HPP
+#ifndef SHARE_GC_Z_ZFORWARDINGTABLE_HPP
+#define SHARE_GC_Z_ZFORWARDINGTABLE_HPP
 
 #include "gc/z/zForwardingTableEntry.hpp"
 #include "memory/allocation.hpp"
@@ -56,4 +56,4 @@
   void verify(size_t object_max_count, size_t live_objects) const;
 };
 
-#endif // SHARE_GC_Z_ZFORWARDING_HPP
+#endif // SHARE_GC_Z_ZFORWARDINGTABLE_HPP
--- a/src/hotspot/share/gc/z/zForwardingTable.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/gc/z/zForwardingTable.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  */
 
-#ifndef SHARE_GC_Z_ZFORWARDING_INLINE_HPP
-#define SHARE_GC_Z_ZFORWARDING_INLINE_HPP
+#ifndef SHARE_GC_Z_ZFORWARDINGTABLE_INLINE_HPP
+#define SHARE_GC_Z_ZFORWARDINGTABLE_INLINE_HPP
 
 #include "gc/z/zForwardingTable.hpp"
 #include "gc/z/zGlobals.hpp"
@@ -106,4 +106,4 @@
   }
 }
 
-#endif // SHARE_GC_Z_ZFORWARDING_INLINE_HPP
+#endif // SHARE_GC_Z_ZFORWARDINGTABLE_INLINE_HPP
--- a/src/hotspot/share/interpreter/abstractInterpreter.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/interpreter/abstractInterpreter.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_INTERPRETER_ABSTRACTINTERPRETER_HPP
-#define SHARE_VM_INTERPRETER_ABSTRACTINTERPRETER_HPP
+#ifndef SHARE_INTERPRETER_ABSTRACTINTERPRETER_HPP
+#define SHARE_INTERPRETER_ABSTRACTINTERPRETER_HPP
 
 #include "asm/macroAssembler.hpp"
 #include "code/stubs.hpp"
@@ -333,4 +333,4 @@
   AbstractInterpreterGenerator(StubQueue* _code);
 };
 
-#endif // SHARE_VM_INTERPRETER_ABSTRACTINTERPRETER_HPP
+#endif // SHARE_INTERPRETER_ABSTRACTINTERPRETER_HPP
--- a/src/hotspot/share/interpreter/bytecode.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/interpreter/bytecode.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_INTERPRETER_BYTECODE_HPP
-#define SHARE_VM_INTERPRETER_BYTECODE_HPP
+#ifndef SHARE_INTERPRETER_BYTECODE_HPP
+#define SHARE_INTERPRETER_BYTECODE_HPP
 
 #include "interpreter/bytecodes.hpp"
 #include "memory/allocation.hpp"
@@ -342,4 +342,4 @@
   oop resolve_constant(TRAPS) const;
 };
 
-#endif // SHARE_VM_INTERPRETER_BYTECODE_HPP
+#endif // SHARE_INTERPRETER_BYTECODE_HPP
--- a/src/hotspot/share/interpreter/bytecode.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/interpreter/bytecode.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,12 @@
  *
  */
 
-#ifndef SHARE_VM_INTERPRETER_BYTECODE_INLINE_HPP
-#define SHARE_VM_INTERPRETER_BYTECODE_INLINE_HPP
+#ifndef SHARE_INTERPRETER_BYTECODE_INLINE_HPP
+#define SHARE_INTERPRETER_BYTECODE_INLINE_HPP
 
 #include "interpreter/bytecode.hpp"
 #include "oops/cpCache.inline.hpp"
 
 inline bool Bytecode_invoke::has_appendix() { return cpcache_entry()->has_appendix(); }
 
-#endif // SHARE_VM_INTERPRETER_BYTECODE_INLINE_HPP
+#endif // SHARE_INTERPRETER_BYTECODE_INLINE_HPP
--- a/src/hotspot/share/interpreter/bytecodeHistogram.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/interpreter/bytecodeHistogram.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_INTERPRETER_BYTECODEHISTOGRAM_HPP
-#define SHARE_VM_INTERPRETER_BYTECODEHISTOGRAM_HPP
+#ifndef SHARE_INTERPRETER_BYTECODEHISTOGRAM_HPP
+#define SHARE_INTERPRETER_BYTECODEHISTOGRAM_HPP
 
 #include "interpreter/bytecodes.hpp"
 #include "memory/allocation.hpp"
@@ -95,4 +95,4 @@
   static void print(float cutoff = 0.01F)   PRODUCT_RETURN;   // cutoff in percent
 };
 
-#endif // SHARE_VM_INTERPRETER_BYTECODEHISTOGRAM_HPP
+#endif // SHARE_INTERPRETER_BYTECODEHISTOGRAM_HPP
--- a/src/hotspot/share/interpreter/bytecodeInterpreter.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/interpreter/bytecodeInterpreter.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_INTERPRETER_BYTECODEINTERPRETER_HPP
-#define SHARE_VM_INTERPRETER_BYTECODEINTERPRETER_HPP
+#ifndef SHARE_INTERPRETER_BYTECODEINTERPRETER_HPP
+#define SHARE_INTERPRETER_BYTECODEINTERPRETER_HPP
 
 #include "memory/allocation.hpp"
 #include "oops/methodData.hpp"
@@ -584,4 +584,4 @@
 
 #endif // CC_INTERP
 
-#endif // SHARE_VM_INTERPRETER_BYTECODEINTERPRETER_HPP
+#endif // SHARE_INTERPRETER_BYTECODEINTERPRETER_HPP
--- a/src/hotspot/share/interpreter/bytecodeInterpreter.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/interpreter/bytecodeInterpreter.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_INTERPRETER_BYTECODEINTERPRETER_INLINE_HPP
-#define SHARE_VM_INTERPRETER_BYTECODEINTERPRETER_INLINE_HPP
+#ifndef SHARE_INTERPRETER_BYTECODEINTERPRETER_INLINE_HPP
+#define SHARE_INTERPRETER_BYTECODEINTERPRETER_INLINE_HPP
 
 #include "interpreter/bytecodeInterpreter.hpp"
 #include "runtime/stubRoutines.hpp"
@@ -51,4 +51,4 @@
 
 #endif // CC_INTERP
 
-#endif // SHARE_VM_INTERPRETER_BYTECODEINTERPRETER_INLINE_HPP
+#endif // SHARE_INTERPRETER_BYTECODEINTERPRETER_INLINE_HPP
--- a/src/hotspot/share/interpreter/bytecodeInterpreterProfiling.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/interpreter/bytecodeInterpreterProfiling.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2014 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -27,8 +27,8 @@
 // for updating a method's methodData object.
 
 
-#ifndef SHARE_VM_INTERPRETER_BYTECODEINTERPRETERPROFILING_HPP
-#define SHARE_VM_INTERPRETER_BYTECODEINTERPRETERPROFILING_HPP
+#ifndef SHARE_INTERPRETER_BYTECODEINTERPRETERPROFILING_HPP
+#define SHARE_INTERPRETER_BYTECODEINTERPRETERPROFILING_HPP
 
 #ifdef CC_INTERP
 
@@ -56,4 +56,4 @@
 
 #endif // CC_INTERP
 
-#endif // SHARE_VM_INTERPRETER_BYTECODECINTERPRETERPROFILING_HPP
+#endif // SHARE_INTERPRETER_BYTECODEINTERPRETERPROFILING_HPP
--- a/src/hotspot/share/interpreter/bytecodeStream.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/interpreter/bytecodeStream.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_INTERPRETER_BYTECODESTREAM_HPP
-#define SHARE_VM_INTERPRETER_BYTECODESTREAM_HPP
+#ifndef SHARE_INTERPRETER_BYTECODESTREAM_HPP
+#define SHARE_INTERPRETER_BYTECODESTREAM_HPP
 
 #include "interpreter/bytecode.hpp"
 #include "memory/allocation.hpp"
@@ -227,4 +227,4 @@
   bool            has_index_u4() const           { return bytecode().has_index_u4(raw_code()); }
 };
 
-#endif // SHARE_VM_INTERPRETER_BYTECODESTREAM_HPP
+#endif // SHARE_INTERPRETER_BYTECODESTREAM_HPP
--- a/src/hotspot/share/interpreter/bytecodeTracer.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/interpreter/bytecodeTracer.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_INTERPRETER_BYTECODETRACER_HPP
-#define SHARE_VM_INTERPRETER_BYTECODETRACER_HPP
+#ifndef SHARE_INTERPRETER_BYTECODETRACER_HPP
+#define SHARE_INTERPRETER_BYTECODETRACER_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/ostream.hpp"
@@ -62,4 +62,4 @@
   virtual void trace(const methodHandle& method, address bcp, outputStream* st) = 0;
 };
 
-#endif // SHARE_VM_INTERPRETER_BYTECODETRACER_HPP
+#endif // SHARE_INTERPRETER_BYTECODETRACER_HPP
--- a/src/hotspot/share/interpreter/bytecodes.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/interpreter/bytecodes.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_INTERPRETER_BYTECODES_HPP
-#define SHARE_VM_INTERPRETER_BYTECODES_HPP
+#ifndef SHARE_INTERPRETER_BYTECODES_HPP
+#define SHARE_INTERPRETER_BYTECODES_HPP
 
 #include "memory/allocation.hpp"
 
@@ -442,4 +442,4 @@
   static void        initialize     ();
 };
 
-#endif // SHARE_VM_INTERPRETER_BYTECODES_HPP
+#endif // SHARE_INTERPRETER_BYTECODES_HPP
--- a/src/hotspot/share/interpreter/cppInterpreter.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/interpreter/cppInterpreter.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_INTERPRETER_CPPINTERPRETER_HPP
-#define SHARE_VM_INTERPRETER_CPPINTERPRETER_HPP
+#ifndef SHARE_INTERPRETER_CPPINTERPRETER_HPP
+#define SHARE_INTERPRETER_CPPINTERPRETER_HPP
 
 #include "interpreter/abstractInterpreter.hpp"
 #include "utilities/macros.hpp"
@@ -70,4 +70,4 @@
 
 #endif // CC_INTERP
 
-#endif // SHARE_VM_INTERPRETER_CPPINTERPRETER_HPP
+#endif // SHARE_INTERPRETER_CPPINTERPRETER_HPP
--- a/src/hotspot/share/interpreter/cppInterpreterGenerator.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/interpreter/cppInterpreterGenerator.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_INTERPRETER_CPPINTERPRETERGENERATOR_HPP
-#define SHARE_VM_INTERPRETER_CPPINTERPRETERGENERATOR_HPP
+#ifndef SHARE_INTERPRETER_CPPINTERPRETERGENERATOR_HPP
+#define SHARE_INTERPRETER_CPPINTERPRETERGENERATOR_HPP
 
 // This file contains the platform-independent parts
 // of the template interpreter generator.
@@ -75,4 +75,4 @@
 };
 
 #endif // CC_INTERP
-#endif // SHARE_VM_INTERPRETER_CPPINTERPRETERGENERATOR_HPP
+#endif // SHARE_INTERPRETER_CPPINTERPRETERGENERATOR_HPP
--- a/src/hotspot/share/interpreter/interp_masm.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/interpreter/interp_masm.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,12 @@
  *
  */
 
-#ifndef SHARE_VM_INTERPRETER_INTERP_MASM_HPP
-#define SHARE_VM_INTERPRETER_INTERP_MASM_HPP
+#ifndef SHARE_INTERPRETER_INTERP_MASM_HPP
+#define SHARE_INTERPRETER_INTERP_MASM_HPP
 
 #include "asm/macroAssembler.hpp"
 #include "utilities/macros.hpp"
 
 #include CPU_HEADER(interp_masm)
 
-#endif // SHARE_VM_INTERPRETER_INTERP_MASM_HPP
+#endif // SHARE_INTERPRETER_INTERP_MASM_HPP
--- a/src/hotspot/share/interpreter/interpreter.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/interpreter/interpreter.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_INTERPRETER_INTERPRETER_HPP
-#define SHARE_VM_INTERPRETER_INTERPRETER_HPP
+#ifndef SHARE_INTERPRETER_INTERPRETER_HPP
+#define SHARE_INTERPRETER_INTERPRETER_HPP
 
 #include "code/stubs.hpp"
 #include "interpreter/cppInterpreter.hpp"
@@ -119,4 +119,4 @@
 
 typedef CC_INTERP_ONLY(CppInterpreter) NOT_CC_INTERP(TemplateInterpreter) Interpreter;
 
-#endif // SHARE_VM_INTERPRETER_INTERPRETER_HPP
+#endif // SHARE_INTERPRETER_INTERPRETER_HPP
--- a/src/hotspot/share/interpreter/interpreterRuntime.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/interpreter/interpreterRuntime.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_INTERPRETER_INTERPRETERRUNTIME_HPP
-#define SHARE_VM_INTERPRETER_INTERPRETERRUNTIME_HPP
+#ifndef SHARE_INTERPRETER_INTERPRETERRUNTIME_HPP
+#define SHARE_INTERPRETER_INTERPRETERRUNTIME_HPP
 
 #include "interpreter/bytecode.hpp"
 #include "interpreter/linkResolver.hpp"
@@ -196,4 +196,4 @@
   static void add(uint64_t fingerprint, address handler);
 };
 
-#endif // SHARE_VM_INTERPRETER_INTERPRETERRUNTIME_HPP
+#endif // SHARE_INTERPRETER_INTERPRETERRUNTIME_HPP
--- a/src/hotspot/share/interpreter/invocationCounter.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/interpreter/invocationCounter.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_INTERPRETER_INVOCATIONCOUNTER_HPP
-#define SHARE_VM_INTERPRETER_INVOCATIONCOUNTER_HPP
+#ifndef SHARE_INTERPRETER_INVOCATIONCOUNTER_HPP
+#define SHARE_INTERPRETER_INVOCATIONCOUNTER_HPP
 
 #include "runtime/handles.hpp"
 #include "utilities/exceptions.hpp"
@@ -153,4 +153,4 @@
 }
 
 
-#endif // SHARE_VM_INTERPRETER_INVOCATIONCOUNTER_HPP
+#endif // SHARE_INTERPRETER_INVOCATIONCOUNTER_HPP
--- a/src/hotspot/share/interpreter/linkResolver.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/interpreter/linkResolver.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_INTERPRETER_LINKRESOLVER_HPP
-#define SHARE_VM_INTERPRETER_LINKRESOLVER_HPP
+#ifndef SHARE_INTERPRETER_LINKRESOLVER_HPP
+#define SHARE_INTERPRETER_LINKRESOLVER_HPP
 
 #include "oops/method.hpp"
 
@@ -362,4 +362,4 @@
                                           const methodHandle& selected_method,
                                           Klass *recv_klass, TRAPS);
 };
-#endif // SHARE_VM_INTERPRETER_LINKRESOLVER_HPP
+#endif // SHARE_INTERPRETER_LINKRESOLVER_HPP
--- a/src/hotspot/share/interpreter/oopMapCache.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/interpreter/oopMapCache.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_INTERPRETER_OOPMAPCACHE_HPP
-#define SHARE_VM_INTERPRETER_OOPMAPCACHE_HPP
+#ifndef SHARE_INTERPRETER_OOPMAPCACHE_HPP
+#define SHARE_INTERPRETER_OOPMAPCACHE_HPP
 
 #include "oops/generateOopMap.hpp"
 #include "runtime/mutex.hpp"
@@ -177,4 +177,4 @@
   static void cleanup_old_entries();
 };
 
-#endif // SHARE_VM_INTERPRETER_OOPMAPCACHE_HPP
+#endif // SHARE_INTERPRETER_OOPMAPCACHE_HPP
--- a/src/hotspot/share/interpreter/rewriter.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/interpreter/rewriter.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_INTERPRETER_REWRITER_HPP
-#define SHARE_VM_INTERPRETER_REWRITER_HPP
+#ifndef SHARE_INTERPRETER_REWRITER_HPP
+#define SHARE_INTERPRETER_REWRITER_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/growableArray.hpp"
@@ -213,4 +213,4 @@
   static void rewrite(InstanceKlass* klass, TRAPS);
 };
 
-#endif // SHARE_VM_INTERPRETER_REWRITER_HPP
+#endif // SHARE_INTERPRETER_REWRITER_HPP
--- a/src/hotspot/share/interpreter/templateInterpreter.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/interpreter/templateInterpreter.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_INTERPRETER_TEMPLATEINTERPRETER_HPP
-#define SHARE_VM_INTERPRETER_TEMPLATEINTERPRETER_HPP
+#ifndef SHARE_INTERPRETER_TEMPLATEINTERPRETER_HPP
+#define SHARE_INTERPRETER_TEMPLATEINTERPRETER_HPP
 
 #include "interpreter/abstractInterpreter.hpp"
 #include "interpreter/templateTable.hpp"
@@ -196,4 +196,4 @@
 
 #endif // !CC_INTERP
 
-#endif // SHARE_VM_INTERPRETER_TEMPLATEINTERPRETER_HPP
+#endif // SHARE_INTERPRETER_TEMPLATEINTERPRETER_HPP
--- a/src/hotspot/share/interpreter/templateInterpreterGenerator.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/interpreter/templateInterpreterGenerator.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_INTERPRETER_TEMPLATEINTERPRETERGENERATOR_HPP
-#define SHARE_VM_INTERPRETER_TEMPLATEINTERPRETERGENERATOR_HPP
+#ifndef SHARE_INTERPRETER_TEMPLATEINTERPRETERGENERATOR_HPP
+#define SHARE_INTERPRETER_TEMPLATEINTERPRETERGENERATOR_HPP
 
 // This file contains the platform-independent parts
 // of the template interpreter generator.
@@ -129,4 +129,4 @@
 
 #endif // !CC_INTERP
 
-#endif // SHARE_VM_INTERPRETER_TEMPLATEINTERPRETERGENERATOR_HPP
+#endif // SHARE_INTERPRETER_TEMPLATEINTERPRETERGENERATOR_HPP
--- a/src/hotspot/share/interpreter/templateTable.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/interpreter/templateTable.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_INTERPRETER_TEMPLATETABLE_HPP
-#define SHARE_VM_INTERPRETER_TEMPLATETABLE_HPP
+#ifndef SHARE_INTERPRETER_TEMPLATETABLE_HPP
+#define SHARE_INTERPRETER_TEMPLATETABLE_HPP
 
 #include "interpreter/bytecodes.hpp"
 #include "memory/allocation.hpp"
@@ -357,4 +357,4 @@
 };
 #endif /* !CC_INTERP */
 
-#endif // SHARE_VM_INTERPRETER_TEMPLATETABLE_HPP
+#endif // SHARE_INTERPRETER_TEMPLATETABLE_HPP
--- a/src/hotspot/share/jfr/dcmd/jfrDcmds.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/dcmd/jfrDcmds.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_JFRDCMDS_HPP
-#define SHARE_VM_JFR_JFRDCMDS_HPP
+#ifndef SHARE_JFR_DCMD_JFRDCMDS_HPP
+#define SHARE_JFR_DCMD_JFRDCMDS_HPP
 
 #include "services/diagnosticCommand.hpp"
 
@@ -172,4 +172,4 @@
 
 bool register_jfr_dcmds();
 
-#endif // SHARE_VM_JFR_JFRDCMDS_HPP
+#endif // SHARE_JFR_DCMD_JFRDCMDS_HPP
--- a/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_INSTRUMENTATION_JFREVENTCLASSTRANSFORMER_HPP
-#define SHARE_VM_JFR_INSTRUMENTATION_JFREVENTCLASSTRANSFORMER_HPP
+#ifndef SHARE_JFR_INSTRUMENTATION_JFREVENTCLASSTRANSFORMER_HPP
+#define SHARE_JFR_INSTRUMENTATION_JFREVENTCLASSTRANSFORMER_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/exceptions.hpp"
@@ -42,4 +42,4 @@
   static bool is_force_instrumentation();
 };
 
-#endif // SHARE_VM_JFR_INSTRUMENTATION_JFREVENTCLASSTRANSFORMER_HPP
+#endif // SHARE_JFR_INSTRUMENTATION_JFREVENTCLASSTRANSFORMER_HPP
--- a/src/hotspot/share/jfr/instrumentation/jfrJvmtiAgent.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/instrumentation/jfrJvmtiAgent.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_INSTRUMENTATION_JFRJVMTIAGENT_HPP
-#define SHARE_VM_JFR_INSTRUMENTATION_JFRJVMTIAGENT_HPP
+#ifndef SHARE_JFR_INSTRUMENTATION_JFRJVMTIAGENT_HPP
+#define SHARE_JFR_INSTRUMENTATION_JFRJVMTIAGENT_HPP
 
 #include "jfr/utilities/jfrAllocation.hpp"
 
@@ -38,4 +38,4 @@
   static void retransform_classes(JNIEnv* env, jobjectArray classes, TRAPS);
 };
 
-#endif // SHARE_VM_JFR_INSTRUMENTATION_JFRJVMTIAGENT_HPP
+#endif // SHARE_JFR_INSTRUMENTATION_JFRJVMTIAGENT_HPP
--- a/src/hotspot/share/jfr/jfr.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/jfr.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_JFR_HPP
-#define SHARE_VM_JFR_JFR_HPP
+#ifndef SHARE_JFR_JFR_HPP
+#define SHARE_JFR_JFR_HPP
 
 #include "jni.h"
 #include "memory/allocation.hpp"
@@ -55,4 +55,4 @@
   static void weak_oops_do(BoolObjectClosure* is_alive, OopClosure* f);
 };
 
-#endif // SHARE_VM_JFR_JFR_HPP
+#endif // SHARE_JFR_JFR_HPP
--- a/src/hotspot/share/jfr/jfrEvents.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/jfrEvents.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_JFREVENTS_HPP
-#define SHARE_VM_JFR_JFREVENTS_HPP
+#ifndef SHARE_JFR_JFREVENTS_HPP
+#define SHARE_JFR_JFREVENTS_HPP
 /*
  * Declare your event in jfr/metadata/metadata.xml.
  *
@@ -32,4 +32,4 @@
 #include "jfrfiles/jfrEventClasses.hpp"
 #include "jfrfiles/jfrEventIds.hpp"
 
-#endif // SHARE_VM_JFR_JFREVENTS_HPP
+#endif // SHARE_JFR_JFREVENTS_HPP
--- a/src/hotspot/share/jfr/jni/jfrGetAllEventClasses.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/jni/jfrGetAllEventClasses.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  *
  */
-#ifndef SHARE_VM_JFR_JNI_JFRGETALLEVENTCLASSES_HPP
-#define SHARE_VM_JFR_JNI_JFRGETALLEVENTCLASSES_HPP
+#ifndef SHARE_JFR_JNI_JFRGETALLEVENTCLASSES_HPP
+#define SHARE_JFR_JNI_JFRGETALLEVENTCLASSES_HPP
 
 #include "jni.h"
 #include "memory/allocation.hpp"
@@ -38,4 +38,4 @@
   static jobject get_all_event_classes(TRAPS);
 };
 
-#endif // SHARE_VM_JFR_JNI_JFRGETALLEVENTCLASSES_HPP
+#endif // SHARE_JFR_JNI_JFRGETALLEVENTCLASSES_HPP
--- a/src/hotspot/share/jfr/jni/jfrJavaCall.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/jni/jfrJavaCall.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_JNI_JFRJAVACALL_HPP
-#define SHARE_VM_JFR_JNI_JFRJAVACALL_HPP
+#ifndef SHARE_JFR_JNI_JFRJAVACALL_HPP
+#define SHARE_JFR_JNI_JFRJAVACALL_HPP
 
 #include "jni.h"
 #include "jfr/utilities/jfrAllocation.hpp"
@@ -131,4 +131,4 @@
   static void call_virtual(JfrJavaArguments* args, TRAPS);
 };
 
-#endif // SHARE_VM_JFR_JNI_JFRJAVACALL_HPP
+#endif // SHARE_JFR_JNI_JFRJAVACALL_HPP
--- a/src/hotspot/share/jfr/jni/jfrJavaSupport.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/jni/jfrJavaSupport.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_JNI_JFRJAVASUPPORT_HPP
-#define SHARE_VM_JFR_JNI_JFRJAVASUPPORT_HPP
+#ifndef SHARE_JFR_JNI_JFRJAVASUPPORT_HPP
+#define SHARE_JFR_JNI_JFRJAVASUPPORT_HPP
 
 #include "jfr/jni/jfrJavaCall.hpp"
 #include "utilities/exceptions.hpp"
@@ -111,4 +111,4 @@
   static void set_cause(jthrowable throwable, Thread* t);
 };
 
-#endif // SHARE_VM_JFR_JNI_JFRJAVASUPPORT_HPP
+#endif // SHARE_JFR_JNI_JFRJAVASUPPORT_HPP
--- a/src/hotspot/share/jfr/jni/jfrJniMethod.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/jni/jfrJniMethod.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_JNI_JFRJNIMETHOD_HPP
-#define SHARE_VM_JFR_JNI_JFRJNIMETHOD_HPP
+#ifndef SHARE_JFR_JNI_JFRJNIMETHOD_HPP
+#define SHARE_JFR_JNI_JFRJNIMETHOD_HPP
 
 #include "jni.h"
 
@@ -136,4 +136,4 @@
 }
 #endif
 
-#endif // SHARE_VM_JFR_JNI_JFRJNIMETHOD_HPP
+#endif // SHARE_JFR_JNI_JFRJNIMETHOD_HPP
--- a/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/jni/jfrJniMethodRegistration.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_JNI_JFRJNIMETHODREGISTRATION_HPP
-#define SHARE_VM_JFR_JNI_JFRJNIMETHODREGISTRATION_HPP
+#ifndef SHARE_JFR_JNI_JFRJNIMETHODREGISTRATION_HPP
+#define SHARE_JFR_JNI_JFRJNIMETHODREGISTRATION_HPP
 
 #include "jni.h"
 #include "memory/allocation.hpp"
@@ -36,4 +36,4 @@
   JfrJniMethodRegistration(JNIEnv* env);
 };
 
-#endif // SHARE_VM_JFR_JNI_JFRJNIMETHODREGISTRATION_HPP
+#endif // SHARE_JFR_JNI_JFRJNIMETHODREGISTRATION_HPP
--- a/src/hotspot/share/jfr/jni/jfrUpcalls.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/jni/jfrUpcalls.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_JNI_JFRUPCALLS_HPP
-#define SHARE_VM_JFR_JNI_JFRUPCALLS_HPP
+#ifndef SHARE_JFR_JNI_JFRUPCALLS_HPP
+#define SHARE_JFR_JNI_JFRUPCALLS_HPP
 
 #include "jni.h"
 #include "jfr/utilities/jfrAllocation.hpp"
@@ -55,4 +55,4 @@
                              TRAPS);
 };
 
-#endif // SHARE_VM_JFR_JNI_JFRUPCALLS_HPP
+#endif // SHARE_JFR_JNI_JFRUPCALLS_HPP
--- a/src/hotspot/share/jfr/leakprofiler/chains/bfsClosure.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/leakprofiler/chains/bfsClosure.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_LEAKPROFILER_CHAINS_BFSCLOSURE_HPP
-#define SHARE_VM_JFR_LEAKPROFILER_CHAINS_BFSCLOSURE_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_CHAINS_BFSCLOSURE_HPP
+#define SHARE_JFR_LEAKPROFILER_CHAINS_BFSCLOSURE_HPP
 
 #include "memory/iterator.hpp"
 #include "oops/oop.hpp"
@@ -70,4 +70,4 @@
   virtual void do_oop(narrowOop* ref);
 };
 
-#endif // SHARE_VM_JFR_LEAKPROFILER_CHAINS_BFSCLOSURE_HPP
+#endif // SHARE_JFR_LEAKPROFILER_CHAINS_BFSCLOSURE_HPP
--- a/src/hotspot/share/jfr/leakprofiler/chains/bitset.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/leakprofiler/chains/bitset.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_LEAKPROFILER_CHAINS_BITSET_HPP
-#define SHARE_VM_JFR_LEAKPROFILER_CHAINS_BITSET_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_CHAINS_BITSET_HPP
+#define SHARE_JFR_LEAKPROFILER_CHAINS_BITSET_HPP
 
 #include "memory/allocation.hpp"
 #include "oops/oopsHierarchy.hpp"
@@ -76,4 +76,4 @@
   }
 };
 
-#endif  // SHARE_VM_JFR_LEAKPROFILER_CHAINS_BITSET_HPP
+#endif // SHARE_JFR_LEAKPROFILER_CHAINS_BITSET_HPP
--- a/src/hotspot/share/jfr/leakprofiler/chains/dfsClosure.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/leakprofiler/chains/dfsClosure.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_LEAKPROFILER_CHAINS_DFSCLOSURE_HPP
-#define SHARE_VM_JFR_LEAKPROFILER_CHAINS_DFSCLOSURE_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_CHAINS_DFSCLOSURE_HPP
+#define SHARE_JFR_LEAKPROFILER_CHAINS_DFSCLOSURE_HPP
 
 #include "memory/iterator.hpp"
 #include "oops/oop.hpp"
@@ -62,4 +62,4 @@
   virtual void do_oop(narrowOop* ref);
 };
 
-#endif // SHARE_VM_JFR_LEAKPROFILER_CHAINS_DFSCLOSURE_HPP
+#endif // SHARE_JFR_LEAKPROFILER_CHAINS_DFSCLOSURE_HPP
--- a/src/hotspot/share/jfr/leakprofiler/chains/edge.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/leakprofiler/chains/edge.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_LEAKPROFILER_CHAINS_EDGE_HPP
-#define SHARE_VM_JFR_LEAKPROFILER_CHAINS_EDGE_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_CHAINS_EDGE_HPP
+#define SHARE_JFR_LEAKPROFILER_CHAINS_EDGE_HPP
 
 #include "memory/allocation.hpp"
 #include "oops/oopsHierarchy.hpp"
@@ -56,4 +56,4 @@
   }
 };
 
-#endif // SHARE_VM_JFR_LEAKPROFILER_CHAINS_EDGE_HPP
+#endif // SHARE_JFR_LEAKPROFILER_CHAINS_EDGE_HPP
--- a/src/hotspot/share/jfr/leakprofiler/chains/edgeQueue.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/leakprofiler/chains/edgeQueue.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_LEAKPROFILER_CHAINS_EDGEQUEUE_HPP
-#define SHARE_VM_JFR_LEAKPROFILER_CHAINS_EDGEQUEUE_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_CHAINS_EDGEQUEUE_HPP
+#define SHARE_JFR_LEAKPROFILER_CHAINS_EDGEQUEUE_HPP
 
 #include "memory/allocation.hpp"
 #include "jfr/leakprofiler/chains/edge.hpp"
@@ -57,4 +57,4 @@
   size_t sizeof_edge() const; // with alignments
 };
 
-#endif // SHARE_VM_JFR_LEAKPROFILER_CHAINS_EDGEQUEUE_HPP
+#endif // SHARE_JFR_LEAKPROFILER_CHAINS_EDGEQUEUE_HPP
--- a/src/hotspot/share/jfr/leakprofiler/chains/edgeStore.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/leakprofiler/chains/edgeStore.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_LEAKPROFILER_CHAINS_EDGESTORE_HPP
-#define SHARE_VM_LEAKPROFILER_CHAINS_EDGESTORE_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_CHAINS_EDGESTORE_HPP
+#define SHARE_JFR_LEAKPROFILER_CHAINS_EDGESTORE_HPP
 
 #include "jfr/utilities/jfrHashtable.hpp"
 #include "jfr/leakprofiler/chains/edge.hpp"
@@ -116,4 +116,4 @@
   void iterate_edges(T& functor) const { _edges->iterate_value<T>(functor); }
 };
 
-#endif // SHARE_VM_LEAKPROFILER_CHAINS_EDGESTORE_HPP
+#endif // SHARE_JFR_LEAKPROFILER_CHAINS_EDGESTORE_HPP
--- a/src/hotspot/share/jfr/leakprofiler/chains/edgeUtils.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/leakprofiler/chains/edgeUtils.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_LEAKPROFILER_CHAINS_EDGEUTILS_HPP
-#define SHARE_VM_LEAKPROFILER_CHAINS_EDGEUTILS_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_CHAINS_EDGEUTILS_HPP
+#define SHARE_JFR_LEAKPROFILER_CHAINS_EDGEUTILS_HPP
 
 #include "memory/allocation.hpp"
 
@@ -48,4 +48,4 @@
   static void collapse_chain(const RoutableEdge& edge);
 };
 
-#endif // SHARE_VM_LEAKPROFILER_CHAINS_EDGEUTILS_HPP
+#endif // SHARE_JFR_LEAKPROFILER_CHAINS_EDGEUTILS_HPP
--- a/src/hotspot/share/jfr/leakprofiler/chains/objectSampleMarker.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/leakprofiler/chains/objectSampleMarker.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_LEAKPROFILER_CHAINS_OBJECTSAMPLEMARKER_HPP
-#define SHARE_VM_JFR_LEAKPROFILER_CHAINS_OBJECTSAMPLEMARKER_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_CHAINS_OBJECTSAMPLEMARKER_HPP
+#define SHARE_JFR_LEAKPROFILER_CHAINS_OBJECTSAMPLEMARKER_HPP
 
 #include "memory/allocation.hpp"
 #include "oops/markOop.hpp"
@@ -78,4 +78,4 @@
   }
 };
 
-#endif // SHARE_VM_JFR_LEAKPROFILER_CHAINS_OBJECTSAMPLEMARKER_HPP
+#endif // SHARE_JFR_LEAKPROFILER_CHAINS_OBJECTSAMPLEMARKER_HPP
--- a/src/hotspot/share/jfr/leakprofiler/chains/rootSetClosure.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/leakprofiler/chains/rootSetClosure.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_LEAKPROFILER_CHAINS_ROOTSETCLOSURE_HPP
-#define SHARE_VM_JFR_LEAKPROFILER_CHAINS_ROOTSETCLOSURE_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_CHAINS_ROOTSETCLOSURE_HPP
+#define SHARE_JFR_LEAKPROFILER_CHAINS_ROOTSETCLOSURE_HPP
 
 #include "memory/iterator.hpp"
 #include "oops/oop.hpp"
@@ -43,4 +43,4 @@
   virtual void do_oop(narrowOop* reference);
 };
 
-#endif // SHARE_VM_JFR_LEAKPROFILER_CHAINS_ROOTSETCLOSURE_HPP
+#endif // SHARE_JFR_LEAKPROFILER_CHAINS_ROOTSETCLOSURE_HPP
--- a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleCheckpoint.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLECHECKPOINT_HPP
-#define SHARE_VM_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLECHECKPOINT_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLECHECKPOINT_HPP
+#define SHARE_JFR_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLECHECKPOINT_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/exceptions.hpp"
@@ -48,4 +48,4 @@
   bool process();
 };
 
-#endif // SHARE_VM_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLECHECKPOINT_HPP
+#endif // SHARE_JFR_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLECHECKPOINT_HPP
--- a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleDescription.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleDescription.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLEDESCRIPTION_HPP
-#define SHARE_VM_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLEDESCRIPTION_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLEDESCRIPTION_HPP
+#define SHARE_JFR_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLEDESCRIPTION_HPP
 
 #define OBJECT_SAMPLE_DESCRIPTION_BUFFER_SIZE 100
 
@@ -71,4 +71,4 @@
   const char* description();
 };
 
-#endif // SHARE_VM_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLEDESCRIPTION_HPP
+#endif // SHARE_JFR_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLEDESCRIPTION_HPP
--- a/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleWriter.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleWriter.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLEWRITER_HPP
-#define SHARE_VM_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLEWRITER_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLEWRITER_HPP
+#define SHARE_JFR_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLEWRITER_HPP
 
 #include "memory/allocation.hpp"
 
@@ -47,4 +47,4 @@
   bool operator()(const RoutableEdge& edge);
 };
 
-#endif // SHARE_VM_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLEWRITER_HPP
+#endif // SHARE_JFR_LEAKPROFILER_CHECKPOINT_OBJECTSAMPLEWRITER_HPP
--- a/src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_LEAKPROFILER_CHECKPOINT_ROOTRESOLVER_HPP
-#define SHARE_VM_JFR_LEAKPROFILER_CHECKPOINT_ROOTRESOLVER_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_CHECKPOINT_ROOTRESOLVER_HPP
+#define SHARE_JFR_LEAKPROFILER_CHECKPOINT_ROOTRESOLVER_HPP
 
 #include "memory/allocation.hpp"
 #include "jfr/leakprofiler/utilities/rootType.hpp"
@@ -49,4 +49,4 @@
   static void resolve(RootCallback& callback);
 };
 
-#endif // SHARE_VM_JFR_LEAKPROFILER_CHECKPOINT_ROOTRESOLVER_HPP
+#endif // SHARE_JFR_LEAKPROFILER_CHECKPOINT_ROOTRESOLVER_HPP
--- a/src/hotspot/share/jfr/leakprofiler/emitEventOperation.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/leakprofiler/emitEventOperation.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_LEAKPROFILER_EMITEVENTOPERATION_HPP
-#define SHARE_VM_LEAKPROFILER_EMITEVENTOPERATION_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_EMITEVENTOPERATION_HPP
+#define SHARE_JFR_LEAKPROFILER_EMITEVENTOPERATION_HPP
 
 #include "runtime/vmOperations.hpp"
 
@@ -68,4 +68,4 @@
   virtual void doit();
 };
 
-#endif // SHARE_VM_LEAKPROFILER_EMITEVENTOPERATION_HPP
+#endif // SHARE_JFR_LEAKPROFILER_EMITEVENTOPERATION_HPP
--- a/src/hotspot/share/jfr/leakprofiler/leakProfiler.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/leakprofiler/leakProfiler.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_LEAKPROFILER_LEAKPROFILER_HPP
-#define SHARE_VM_JFR_LEAKPROFILER_LEAKPROFILER_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_LEAKPROFILER_HPP
+#define SHARE_JFR_LEAKPROFILER_LEAKPROFILER_HPP
 
 #include "memory/allocation.hpp"
 
@@ -64,4 +64,4 @@
   static void oops_do(BoolObjectClosure* is_alive, OopClosure* f);
 };
 
-#endif // SHARE_VM_JFR_LEAKPROFILER_LEAKPROFILER_HPP
+#endif // SHARE_JFR_LEAKPROFILER_LEAKPROFILER_HPP
--- a/src/hotspot/share/jfr/leakprofiler/sampling/objectSample.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/leakprofiler/sampling/objectSample.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_LEAKPROFILER_SAMPLING_OBJECTSAMPLE_HPP
-#define SHARE_VM_JFR_LEAKPROFILER_SAMPLING_OBJECTSAMPLE_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_SAMPLING_OBJECTSAMPLE_HPP
+#define SHARE_JFR_LEAKPROFILER_SAMPLING_OBJECTSAMPLE_HPP
 
 #include "jfr/recorder/checkpoint/jfrCheckpointBlob.hpp"
 #include "jfr/utilities/jfrAllocation.hpp"
@@ -246,4 +246,4 @@
   }
 };
 
-#endif // SHARE_VM_JFR_LEAKPROFILER_SAMPLING_OBJECTSAMPLE_HPP
+#endif // SHARE_JFR_LEAKPROFILER_SAMPLING_OBJECTSAMPLE_HPP
--- a/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_LEAKPROFILER_SAMPLING_OBJECTSAMPLER_HPP
-#define SHARE_VM_LEAKPROFILER_SAMPLING_OBJECTSAMPLER_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_SAMPLING_OBJECTSAMPLER_HPP
+#define SHARE_JFR_LEAKPROFILER_SAMPLING_OBJECTSAMPLER_HPP
 
 #include "memory/allocation.hpp"
 #include "jfr/utilities/jfrTime.hpp"
@@ -76,4 +76,4 @@
   const JfrTicks& last_sweep() const;
 };
 
-#endif // SHARE_VM_LEAKPROFILER_SAMPLING_OBJECTSAMPLER_HPP
+#endif // SHARE_JFR_LEAKPROFILER_SAMPLING_OBJECTSAMPLER_HPP
--- a/src/hotspot/share/jfr/leakprofiler/sampling/sampleList.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/leakprofiler/sampling/sampleList.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_LEAKPROFILER_SAMPLING_SAMPLELIST_HPP
-#define SHARE_VM_JFR_LEAKPROFILER_SAMPLING_SAMPLELIST_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_SAMPLING_SAMPLELIST_HPP
+#define SHARE_JFR_LEAKPROFILER_SAMPLING_SAMPLELIST_HPP
 #include "jfr/utilities/jfrAllocation.hpp"
 #include "jfr/utilities/jfrDoublyLinkedList.hpp"
 
@@ -61,4 +61,4 @@
   size_t count() const;
 };
 
-#endif // SHARE_VM_JFR_LEAKPROFILER_SAMPLING_SAMPLELIST_HPP
+#endif // SHARE_JFR_LEAKPROFILER_SAMPLING_SAMPLELIST_HPP
--- a/src/hotspot/share/jfr/leakprofiler/sampling/samplePriorityQueue.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/leakprofiler/sampling/samplePriorityQueue.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_LEAKPROFILER_SAMPLING_SAMPLEPRIORITYQUEUE_HPP
-#define SHARE_VM_JFR_LEAKPROFILER_SAMPLING_SAMPLEPRIORITYQUEUE_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_SAMPLING_SAMPLEPRIORITYQUEUE_HPP
+#define SHARE_JFR_LEAKPROFILER_SAMPLING_SAMPLEPRIORITYQUEUE_HPP
 
 #include "memory/allocation.hpp"
 
@@ -55,4 +55,4 @@
   int count() const;
 };
 
-#endif // SHARE_VM_JFR_LEAKPROFILER_SAMPLING_SAMPLEPRIORITYQUEUE_HPP
+#endif // SHARE_JFR_LEAKPROFILER_SAMPLING_SAMPLEPRIORITYQUEUE_HPP
--- a/src/hotspot/share/jfr/leakprofiler/startOperation.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/leakprofiler/startOperation.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_LEAKPROFILER_STARTOPERATION_HPP
-#define SHARE_VM_LEAKPROFILER_STARTOPERATION_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_STARTOPERATION_HPP
+#define SHARE_JFR_LEAKPROFILER_STARTOPERATION_HPP
 
 #include "jfr/recorder/jfrRecorder.hpp"
 #include "jfr/leakprofiler/leakProfiler.hpp"
@@ -57,4 +57,4 @@
   }
 };
 
-#endif // SHARE_VM_LEAKPROFILER_STARTOPERATION_HPP
+#endif // SHARE_JFR_LEAKPROFILER_STARTOPERATION_HPP
--- a/src/hotspot/share/jfr/leakprofiler/stopOperation.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/leakprofiler/stopOperation.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_LEAKPROFILER_STOPOPERATION_HPP
-#define SHARE_VM_LEAKPROFILER_STOPOPERATION_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_STOPOPERATION_HPP
+#define SHARE_JFR_LEAKPROFILER_STOPOPERATION_HPP
 
 #include "jfr/leakprofiler/leakProfiler.hpp"
 #include "jfr/leakprofiler/sampling/objectSampler.hpp"
@@ -53,4 +53,4 @@
   }
 };
 
-#endif // SHARE_VM_LEAKPROFILER_STOPOPERATION_HPP
+#endif // SHARE_JFR_LEAKPROFILER_STOPOPERATION_HPP
--- a/src/hotspot/share/jfr/leakprofiler/utilities/granularTimer.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/leakprofiler/utilities/granularTimer.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_LEAKPROFILER_UTILITIES_GRANULARTIMER_HPP
-#define SHARE_VM_LEAKPROFILER_UTILITIES_GRANULARTIMER_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_UTILITIES_GRANULARTIMER_HPP
+#define SHARE_JFR_LEAKPROFILER_UTILITIES_GRANULARTIMER_HPP
 
 #include "jfr/utilities/jfrTime.hpp"
 #include "memory/allocation.hpp"
@@ -43,4 +43,4 @@
   static bool is_finished();
 };
 
-#endif // SHARE_VM_LEAKPROFILER_UTILITIES_GRANULARTIMER_HPP
+#endif // SHARE_JFR_LEAKPROFILER_UTILITIES_GRANULARTIMER_HPP
--- a/src/hotspot/share/jfr/leakprofiler/utilities/rootType.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/leakprofiler/utilities/rootType.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_LEAKPROFILER_UTILITIES_ROOTTYPE_HPP
-#define SHARE_VM_LEAKPROFILER_UTILITIES_ROOTTYPE_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_UTILITIES_ROOTTYPE_HPP
+#define SHARE_JFR_LEAKPROFILER_UTILITIES_ROOTTYPE_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/debug.hpp"
@@ -106,4 +106,4 @@
   }
 };
 
-#endif // SHARE_VM_LEAKPROFILER_UTILITIES_ROOTTYPE_HPP
+#endif // SHARE_JFR_LEAKPROFILER_UTILITIES_ROOTTYPE_HPP
--- a/src/hotspot/share/jfr/leakprofiler/utilities/saveRestore.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/leakprofiler/utilities/saveRestore.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_LEAKPROFILER_UTILITIES_SAVERESTORE_HPP
-#define SHARE_VM_JFR_LEAKPROFILER_UTILITIES_SAVERESTORE_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_UTILITIES_SAVERESTORE_HPP
+#define SHARE_JFR_LEAKPROFILER_UTILITIES_SAVERESTORE_HPP
 
 #include "memory/allocation.hpp"
 #include "memory/iterator.hpp"
@@ -125,4 +125,4 @@
   ~SaveRestoreCLDClaimBits();
 };
 
-#endif // SHARE_VM_JFR_LEAKPROFILER_UTILITIES_SAVERESTORE_HPP
+#endif // SHARE_JFR_LEAKPROFILER_UTILITIES_SAVERESTORE_HPP
--- a/src/hotspot/share/jfr/leakprofiler/utilities/unifiedOop.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/leakprofiler/utilities/unifiedOop.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_LEAKPROFILER_UTILITIES_UNIFIEDOOP_HPP
-#define SHARE_VM_JFR_LEAKPROFILER_UTILITIES_UNIFIEDOOP_HPP
+#ifndef SHARE_JFR_LEAKPROFILER_UTILITIES_UNIFIEDOOP_HPP
+#define SHARE_JFR_LEAKPROFILER_UTILITIES_UNIFIEDOOP_HPP
 
 #include "oops/oop.inline.hpp"
 
@@ -53,4 +53,4 @@
   }
 };
 
-#endif // SHARE_VM_JFR_LEAKPROFILER_UTILITIES_UNIFIEDOOP_HPP
+#endif // SHARE_JFR_LEAKPROFILER_UTILITIES_UNIFIEDOOP_HPP
--- a/src/hotspot/share/jfr/metadata/jfrSerializer.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/metadata/jfrSerializer.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_METADATA_JFRSERIALIZER_HPP
-#define SHARE_VM_JFR_METADATA_JFRSERIALIZER_HPP
+#ifndef SHARE_JFR_METADATA_JFRSERIALIZER_HPP
+#define SHARE_JFR_METADATA_JFRSERIALIZER_HPP
 
 #include "memory/allocation.hpp"
 #include "jfr/recorder/checkpoint/jfrCheckpointWriter.hpp"
@@ -97,4 +97,4 @@
  * Please see jfr/recorder/checkpoint/types/jfrType.cpp for reference.
  */
 
-#endif // SHARE_VM_JFR_METADATA_JFRSERIALIZER_HPP
+#endif // SHARE_JFR_METADATA_JFRSERIALIZER_HPP
--- a/src/hotspot/share/jfr/periodic/jfrModuleEvent.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/periodic/jfrModuleEvent.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_EVENT_JFRMODULEEVENT_HPP
-#define SHARE_VM_JFR_EVENT_JFRMODULEEVENT_HPP
+#ifndef SHARE_JFR_PERIODIC_JFRMODULEEVENT_HPP
+#define SHARE_JFR_PERIODIC_JFRMODULEEVENT_HPP
 
 #include "memory/allocation.hpp"
 
@@ -33,4 +33,4 @@
   static void generate_module_export_events();
 };
 
-#endif // SHARE_VM_JFR_EVENT_JFRMODULEEVENT_HPP
+#endif // SHARE_JFR_PERIODIC_JFRMODULEEVENT_HPP
--- a/src/hotspot/share/jfr/periodic/jfrNetworkUtilization.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/periodic/jfrNetworkUtilization.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_PERIODIC_JFRNETWORKUTILIZATION_HPP
-#define SHARE_VM_JFR_PERIODIC_JFRNETWORKUTILIZATION_HPP
+#ifndef SHARE_JFR_PERIODIC_JFRNETWORKUTILIZATION_HPP
+#define SHARE_JFR_PERIODIC_JFRNETWORKUTILIZATION_HPP
 
 #include "memory/allocation.hpp"
 
@@ -35,4 +35,4 @@
   static void send_events();
 };
 
-#endif // SHARE_VM_JFR_PERIODIC_JFRNETWORKUTILIZATION_HPP
+#endif // SHARE_JFR_PERIODIC_JFRNETWORKUTILIZATION_HPP
--- a/src/hotspot/share/jfr/periodic/jfrOSInterface.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/periodic/jfrOSInterface.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_PERIODIC_JFROSINTERFACE_HPP
-#define SHARE_VM_JFR_PERIODIC_JFROSINTERFACE_HPP
+#ifndef SHARE_JFR_PERIODIC_JFROSINTERFACE_HPP
+#define SHARE_JFR_PERIODIC_JFROSINTERFACE_HPP
 
 #include "jfr/utilities/jfrAllocation.hpp"
 
@@ -57,4 +57,4 @@
   static int network_utilization(NetworkInterface** network_interfaces);
 };
 
-#endif // SHARE_VM_JFR_PERIODIC_JFROSINTERFACE_HPP
+#endif // SHARE_JFR_PERIODIC_JFROSINTERFACE_HPP
--- a/src/hotspot/share/jfr/periodic/jfrThreadCPULoadEvent.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/periodic/jfrThreadCPULoadEvent.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_PERIODIC_JFRTHREADCPULOAD_HPP
-#define SHARE_VM_JFR_PERIODIC_JFRTHREADCPULOAD_HPP
+#ifndef SHARE_JFR_PERIODIC_JFRTHREADCPULOADEVENT_HPP
+#define SHARE_JFR_PERIODIC_JFRTHREADCPULOADEVENT_HPP
 
 #include "jni.h"
 #include "memory/allocation.hpp"
@@ -41,5 +41,4 @@
   static void send_event_for_thread(JavaThread* jt);
 };
 
-#endif // SHARE_VM_JFR_PERIODIC_JFRTHREADCPULOAD_HPP
-
+#endif // SHARE_JFR_PERIODIC_JFRTHREADCPULOADEVENT_HPP
--- a/src/hotspot/share/jfr/periodic/jfrThreadDumpEvent.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/periodic/jfrThreadDumpEvent.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_PERIODIC_JFRDCMDEVENT_HPP
-#define SHARE_VM_JFR_PERIODIC_JFRDCMDEVENT_HPP
+#ifndef SHARE_JFR_PERIODIC_JFRTHREADDUMPEVENT_HPP
+#define SHARE_JFR_PERIODIC_JFRTHREADDUMPEVENT_HPP
 
 #include "memory/allocation.hpp"
 
@@ -36,4 +36,4 @@
   static const char* thread_dump();
 };
 
-#endif // SHARE_VM_JFR_PERIODIC_JFRDCMDEVENT_HPP
+#endif // SHARE_JFR_PERIODIC_JFRTHREADDUMPEVENT_HPP
--- a/src/hotspot/share/jfr/periodic/sampling/jfrCallTrace.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrCallTrace.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_ENGINE_SAMPLING_JFRCALLTRACE_HPP
-#define SHARE_VM_JFR_ENGINE_SAMPLING_JFRCALLTRACE_HPP
+#ifndef SHARE_JFR_PERIODIC_SAMPLING_JFRCALLTRACE_HPP
+#define SHARE_JFR_PERIODIC_SAMPLING_JFRCALLTRACE_HPP
 
 #include "memory/allocation.hpp"
 
@@ -42,4 +42,4 @@
   bool get_topframe(void* ucontext, frame& top);
 };
 
-#endif // SHARE_VM_JFR_ENGINE_SAMPLING_JFRCALLTRACE_HPP
+#endif // SHARE_JFR_PERIODIC_SAMPLING_JFRCALLTRACE_HPP
--- a/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/periodic/sampling/jfrThreadSampler.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_PERIODIC_SAMPLING_JFRTHREADSAMPLER_HPP
-#define SHARE_VM_JFR_PERIODIC_SAMPLING_JFRTHREADSAMPLER_HPP
+#ifndef SHARE_JFR_PERIODIC_SAMPLING_JFRTHREADSAMPLER_HPP
+#define SHARE_JFR_PERIODIC_SAMPLING_JFRTHREADSAMPLER_HPP
 
 #include "jfr/utilities/jfrAllocation.hpp"
 
@@ -52,4 +52,4 @@
   static void on_javathread_suspend(JavaThread* thread);
 };
 
-#endif // SHARE_VM_JFR_PERIODIC_SAMPLING_JFRTHREADSAMPLER_HPP
+#endif // SHARE_JFR_PERIODIC_SAMPLING_JFRTHREADSAMPLER_HPP
--- a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointBlob.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointBlob.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTBLOB_HPP
-#define SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTBLOB_HPP
+#ifndef SHARE_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTBLOB_HPP
+#define SHARE_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTBLOB_HPP
 
 #include "jfr/utilities/jfrAllocation.hpp"
 #include "jfr/utilities/jfrRefCountPointer.hpp"
@@ -56,4 +56,4 @@
   static JfrCheckpointBlobHandle make(const u1* checkpoint, size_t size);
 };
 
-#endif // SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTBLOB_HPP
+#endif // SHARE_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTBLOB_HPP
--- a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTMANAGER_HPP
-#define SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTMANAGER_HPP
+#ifndef SHARE_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTMANAGER_HPP
+#define SHARE_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTMANAGER_HPP
 
 #include "jfr/recorder/storage/jfrBuffer.hpp"
 #include "jfr/recorder/storage/jfrMemorySpace.hpp"
@@ -105,4 +105,4 @@
   friend class JfrMemorySpace;
 };
 
-#endif //SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTMANAGER_HPP
+#endif // SHARE_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTMANAGER_HPP
--- a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointWriter.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointWriter.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTWRITER_HPP
-#define SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTWRITER_HPP
+#ifndef SHARE_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTWRITER_HPP
+#define SHARE_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTWRITER_HPP
 
 #include "jfr/recorder/checkpoint/jfrCheckpointBlob.hpp"
 #include "jfr/recorder/storage/jfrBuffer.hpp"
@@ -85,4 +85,4 @@
   JfrCheckpointBlobHandle move(const JfrCheckpointContext* ctx = NULL);
 };
 
-#endif // SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTWRITER_HPP
+#endif // SHARE_JFR_RECORDER_CHECKPOINT_JFRCHECKPOINTWRITER_HPP
--- a/src/hotspot/share/jfr/recorder/checkpoint/jfrMetadataEvent.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/checkpoint/jfrMetadataEvent.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRMETADATAEVENT_HPP
-#define SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRMETADATAEVENT_HPP
+#ifndef SHARE_JFR_RECORDER_CHECKPOINT_JFRMETADATAEVENT_HPP
+#define SHARE_JFR_RECORDER_CHECKPOINT_JFRMETADATAEVENT_HPP
 
 #include "jni.h"
 #include "memory/allocation.hpp"
@@ -43,4 +43,4 @@
   static void update(jbyteArray metadata);
 };
 
-#endif // SHARE_VM_JFR_RECORDER_CHECKPOINT_JFRMETADATAEVENT_HPP
+#endif // SHARE_JFR_RECORDER_CHECKPOINT_JFRMETADATAEVENT_HPP
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrThreadGroup.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrThreadGroup.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTHREADGROUP_HPP
-#define SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTHREADGROUP_HPP
+#ifndef SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTHREADGROUP_HPP
+#define SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTHREADGROUP_HPP
 
 #include "jni.h"
 #include "jfr/utilities/jfrAllocation.hpp"
@@ -62,4 +62,4 @@
   static traceid thread_group_id(const JavaThread* thread, Thread* current);
 };
 
-#endif // SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTHREADGROUP_HPP
+#endif // SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTHREADGROUP_HPP
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrThreadState.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrThreadState.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
 *
 */
 
-#ifndef SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTHREADSTATE_HPP
-#define SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTHREADSTATE_HPP
+#ifndef SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTHREADSTATE_HPP
+#define SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTHREADSTATE_HPP
 
 #include "memory/allocation.hpp"
 
@@ -34,4 +34,4 @@
   static void serialize(JfrCheckpointWriter& writer);
 };
 
-#endif // SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTHREADSTATE_HPP
+#endif // SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTHREADSTATE_HPP
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_CHECKPOINT_TYPES_JFRTYPE_HPP
-#define SHARE_VM_JFR_CHECKPOINT_TYPES_JFRTYPE_HPP
+#ifndef SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPE_HPP
+#define SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPE_HPP
 
 #include "jfr/metadata/jfrSerializer.hpp"
 
@@ -135,4 +135,4 @@
   void serialize(JfrCheckpointWriter& writer);
 };
 
-#endif // SHARE_VM_JFR_CHECKPOINT_CONSTANT_JFRCONSTANT_HPP
+#endif // SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPE_HPP
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeManager.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  *
  */
-#ifndef SHARE_VM_JFR_CHECKPOINT_TYPES_JFRTYPEMANAGER_HPP
-#define SHARE_VM_JFR_CHECKPOINT_TYPES_JFRTYPEMANAGER_HPP
+#ifndef SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPEMANAGER_HPP
+#define SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPEMANAGER_HPP
 
 #include "jfr/utilities/jfrAllocation.hpp"
 
@@ -41,4 +41,4 @@
   static void write_thread_checkpoint(JavaThread* jt);
 };
 
-#endif // SHARE_VM_JFR_CHECKPOINT_TYPES_JFRTYPEMANAGER_HPP
+#endif // SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPEMANAGER_HPP
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESET_HPP
-#define SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESET_HPP
+#ifndef SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESET_HPP
+#define SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESET_HPP
 
 #include "jfr/utilities/jfrAllocation.hpp"
 
@@ -70,4 +70,4 @@
   static void serialize(JfrCheckpointWriter* writer, JfrCheckpointWriter* leakp_writer, bool class_unload);
 };
 
-#endif // SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESET_HPP
+#endif // SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESET_HPP
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetUtils.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESETUTILS_HPP
-#define SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESETUTILS_HPP
+#ifndef SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESETUTILS_HPP
+#define SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESETUTILS_HPP
 
 #include "jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp"
 #include "jfr/utilities/jfrAllocation.hpp"
@@ -373,4 +373,4 @@
   }
 };
 
-#endif // SHARE_VM_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESETUTILS_HPP
+#endif // SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESETUTILS_HPP
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetWriter.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSetWriter.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_CHECKPOINT_TYPES_JFRTYPESETWRITER_HPP
-#define SHARE_VM_JFR_CHECKPOINT_TYPES_JFRTYPESETWRITER_HPP
+#ifndef SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESETWRITER_HPP
+#define SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESETWRITER_HPP
 
 #include "jfr/recorder/checkpoint/jfrCheckpointWriter.hpp"
 #include "jfr/utilities/jfrTypes.hpp"
@@ -105,4 +105,4 @@
   }
 };
 
-#endif // SHARE_VM_JFR_CHECKPOINT_TYPES_JFRTYPESETWRITER_HPP
+#endif // SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTYPESETWRITER_HPP
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_CHECKPOINT_TYPES_TRACEID_JFRTRACEID_HPP
-#define SHARE_VM_JFR_CHECKPOINT_TYPES_TRACEID_JFRTRACEID_HPP
+#ifndef SHARE_JFR_RECORDER_CHECKPOINT_TYPES_TRACEID_JFRTRACEID_HPP
+#define SHARE_JFR_RECORDER_CHECKPOINT_TYPES_TRACEID_JFRTRACEID_HPP
 
 #include "jni.h"
 #include "jfr/utilities/jfrTypes.hpp"
@@ -125,4 +125,4 @@
   static void tag_as_event_host(const jclass jc);
 };
 
-#endif // SHARE_VM_JFR_CHECKPOINT_TYPES_TRACEID_JFRTRACEID_HPP
+#endif // SHARE_JFR_RECORDER_CHECKPOINT_TYPES_TRACEID_JFRTRACEID_HPP
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_CHECKPOINT_TYPES_TRACEID_JFRTYPEIDS_INLINE_HPP
-#define SHARE_VM_JFR_CHECKPOINT_TYPES_TRACEID_JFRTYPEIDS_INLINE_HPP
+#ifndef SHARE_JFR_RECORDER_CHECKPOINT_TYPES_TRACEID_JFRTRACEID_INLINE_HPP
+#define SHARE_JFR_RECORDER_CHECKPOINT_TYPES_TRACEID_JFRTRACEID_INLINE_HPP
 
 #include "classfile/classLoaderData.hpp"
 #include "classfile/moduleEntry.hpp"
@@ -149,4 +149,4 @@
   assert(IS_EVENT_HOST_KLASS(k), "invariant");
 }
 
-#endif // SHARE_VM_JFR_CHECKPOINT_TYPES_TRACEID_JFRTYPEIDS_INLINE_HPP
+#endif // SHARE_JFR_RECORDER_CHECKPOINT_TYPES_TRACEID_JFRTRACEID_INLINE_HPP
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdBits.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdBits.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDBITS_INLINE_HPP
-#define SHARE_VM_JFR_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDBITS_INLINE_HPP
+#ifndef SHARE_JFR_RECORDER_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDBITS_INLINE_HPP
+#define SHARE_JFR_RECORDER_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDBITS_INLINE_HPP
 
 #include "jfr/utilities/jfrTypes.hpp"
 #include "runtime/atomic.hpp"
@@ -106,5 +106,4 @@
   set_mask(mask, ((jbyte*)dest) + leakp_offset);
 }
 
-#endif // SHARE_VM_JFR_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDBITS_INLINE_HPP
-
+#endif // SHARE_JFR_RECORDER_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDBITS_INLINE_HPP
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDEPOCH_HPP
-#define SHARE_VM_JFR_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDEPOCH_HPP
+#ifndef SHARE_JFR_RECORDER_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDEPOCH_HPP
+#define SHARE_JFR_RECORDER_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDEPOCH_HPP
 
 #include "memory/allocation.hpp"
 #include "jfr/utilities/jfrTypes.hpp"
@@ -100,4 +100,4 @@
   }
 };
 
-#endif // SHARE_VM_JFR_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDEPOCH_HPP
+#endif // SHARE_JFR_RECORDER_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDEPOCH_HPP
--- a/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdMacros.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdMacros.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDMACROS_HPP
-#define SHARE_VM_JFR_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDMACROS_HPP
+#ifndef SHARE_JFR_RECORDER_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDMACROS_HPP
+#define SHARE_JFR_RECORDER_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDMACROS_HPP
 
 #include "jfr/recorder/checkpoint/types/traceid/jfrTraceIdBits.inline.hpp"
 #include "jfr/recorder/checkpoint/types/traceid/jfrTraceIdEpoch.hpp"
@@ -184,4 +184,4 @@
 #define CLEAR_METHOD_FLAG_USED_THIS_EPOCH(m) (clear_bits_cas((jbyte)JfrTraceIdEpoch::in_use_this_epoch_bit(), (m)->trace_flags_addr()))
 #define CLEAR_METHOD_FLAG_USED_PREV_EPOCH(m) (clear_bits_cas((jbyte)JfrTraceIdEpoch::in_use_prev_epoch_bit(), (m)->trace_flags_addr()))
 
-#endif // SHARE_VM_JFR_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDMACROS_HPP
+#endif // SHARE_JFR_RECORDER_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDMACROS_HPP
--- a/src/hotspot/share/jfr/recorder/jfrEventSetting.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/jfrEventSetting.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_RECORDER_JFREVENTSETTING_HPP
-#define SHARE_VM_JFR_RECORDER_JFREVENTSETTING_HPP
+#ifndef SHARE_JFR_RECORDER_JFREVENTSETTING_HPP
+#define SHARE_JFR_RECORDER_JFREVENTSETTING_HPP
 
 #include "jni.h"
 #include "jfr/utilities/jfrAllocation.hpp"
@@ -49,4 +49,4 @@
   DEBUG_ONLY(static bool bounds_check_event(jlong id);)
 };
 
-#endif //  SHARE_VM_JFR_RECORDER_JFREVENTSETTING_HPP
+#endif // SHARE_JFR_RECORDER_JFREVENTSETTING_HPP
--- a/src/hotspot/share/jfr/recorder/jfrEventSetting.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/jfrEventSetting.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_RECORDER_JFREVENTSETTING_INLINE_HPP
-#define SHARE_VM_JFR_RECORDER_JFREVENTSETTING_INLINE_HPP
+#ifndef SHARE_JFR_RECORDER_JFREVENTSETTING_INLINE_HPP
+#define SHARE_JFR_RECORDER_JFREVENTSETTING_INLINE_HPP
 
 #include "jfr/recorder/jfrEventSetting.hpp"
 
@@ -47,5 +47,4 @@
   return setting(event_id).cutoff_ticks;
 }
 
-#endif // SHARE_VM_JFR_RECORDER_JFREVENTSETTING_INLINE_HPP
-
+#endif // SHARE_JFR_RECORDER_JFREVENTSETTING_INLINE_HPP
--- a/src/hotspot/share/jfr/recorder/jfrRecorder.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/jfrRecorder.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_RECORDER_JFRRECORDER_HPP
-#define SHARE_VM_JFR_RECORDER_JFRRECORDER_HPP
+#ifndef SHARE_JFR_RECORDER_JFRRECORDER_HPP
+#define SHARE_JFR_RECORDER_JFRRECORDER_HPP
 
 #include "jfr/utilities/jfrAllocation.hpp"
 
@@ -65,4 +65,4 @@
   static void stop_recording();
 };
 
-#endif // SHARE_VM_JFR_RECORDER_JFRRECORDER_HPP
+#endif // SHARE_JFR_RECORDER_JFRRECORDER_HPP
--- a/src/hotspot/share/jfr/recorder/repository/jfrChunkRotation.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/repository/jfrChunkRotation.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_RECORDER_REPOSITORY_JFRCHUNKROTATION_HPP
-#define SHARE_VM_JFR_RECORDER_REPOSITORY_JFRCHUNKROTATION_HPP
+#ifndef SHARE_JFR_RECORDER_REPOSITORY_JFRCHUNKROTATION_HPP
+#define SHARE_JFR_RECORDER_REPOSITORY_JFRCHUNKROTATION_HPP
 
 #include "memory/allocation.hpp"
 
@@ -41,4 +41,4 @@
   static void on_rotation();
 };
 
-#endif // SHARE_VM_JFR_RECORDER_REPOSITORY_JFRCHUNKROTATION_HPP
+#endif // SHARE_JFR_RECORDER_REPOSITORY_JFRCHUNKROTATION_HPP
--- a/src/hotspot/share/jfr/recorder/repository/jfrChunkState.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/repository/jfrChunkState.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_RECORDER_REPOSITORY_JFRRCHUNKSTATE_HPP
-#define SHARE_VM_JFR_RECORDER_REPOSITORY_JFRRCHUNKSTATE_HPP
+#ifndef SHARE_JFR_RECORDER_REPOSITORY_JFRCHUNKSTATE_HPP
+#define SHARE_JFR_RECORDER_REPOSITORY_JFRCHUNKSTATE_HPP
 
 #include "jni.h"
 #include "jfr/utilities/jfrAllocation.hpp"
@@ -57,4 +57,4 @@
   const char* path() const;
 };
 
-#endif // SHARE_VM_JFR_RECORDER_REPOSITORY_JFRRCHUNKSTATE_HPP
+#endif // SHARE_JFR_RECORDER_REPOSITORY_JFRCHUNKSTATE_HPP
--- a/src/hotspot/share/jfr/recorder/repository/jfrChunkWriter.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/repository/jfrChunkWriter.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_RECORDER_REPOSITORY_JFRCHUNKWRITER_HPP
-#define SHARE_VM_JFR_RECORDER_REPOSITORY_JFRCHUNKWRITER_HPP
+#ifndef SHARE_JFR_RECORDER_REPOSITORY_JFRCHUNKWRITER_HPP
+#define SHARE_JFR_RECORDER_REPOSITORY_JFRCHUNKWRITER_HPP
 
 #include "jfr/writers/jfrStorageAdapter.hpp"
 #include "jfr/writers/jfrStreamWriterHost.inline.hpp"
@@ -54,4 +54,4 @@
   void time_stamp_chunk_now();
 };
 
-#endif // SHARE_VM_JFR_RECORDER_REPOSITORY_JFRCHUNKWRITER_HPP
+#endif // SHARE_JFR_RECORDER_REPOSITORY_JFRCHUNKWRITER_HPP
--- a/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_RECORDER_INTERNAL_JFREMERGENCY_HPP
-#define SHARE_VM_JFR_RECORDER_INTERNAL_JFREMERGENCY_HPP
+#ifndef SHARE_JFR_RECORDER_REPOSITORY_JFREMERGENCYDUMP_HPP
+#define SHARE_JFR_RECORDER_REPOSITORY_JFREMERGENCYDUMP_HPP
 
 #include "memory/allocation.hpp"
 
@@ -35,6 +35,4 @@
   static void on_vm_shutdown(bool exception_handler);
 };
 
-#endif // SHARE_VM_JFR_RECORDER_INTERNAL_JFREMERGENCY_HPP
-
-
+#endif // SHARE_JFR_RECORDER_REPOSITORY_JFREMERGENCYDUMP_HPP
--- a/src/hotspot/share/jfr/recorder/repository/jfrRepository.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/repository/jfrRepository.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  *
  */
-#ifndef SHARE_VM_JFR_RECORDER_REPOSITORY_JFRREPOSITORY_HPP
-#define SHARE_VM_JFR_RECORDER_REPOSITORY_JFRREPOSITORY_HPP
+#ifndef SHARE_JFR_RECORDER_REPOSITORY_JFRREPOSITORY_HPP
+#define SHARE_JFR_RECORDER_REPOSITORY_JFRREPOSITORY_HPP
 
 #include "jni.h"
 #include "jfr/utilities/jfrAllocation.hpp"
@@ -70,4 +70,4 @@
   static void set_chunk_path(jstring path, JavaThread* jt);
 };
 
-#endif // SHARE_VM_JFR_RECORDER_REPOSITORY_JFRREPOSITORY_HPP
+#endif // SHARE_JFR_RECORDER_REPOSITORY_JFRREPOSITORY_HPP
--- a/src/hotspot/share/jfr/recorder/service/jfrEvent.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/service/jfrEvent.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_RECORDER_SERVICE_JFREVENT_HPP
-#define SHARE_VM_JFR_RECORDER_SERVICE_JFREVENT_HPP
+#ifndef SHARE_JFR_RECORDER_SERVICE_JFREVENT_HPP
+#define SHARE_JFR_RECORDER_SERVICE_JFREVENT_HPP
 
 #include "jfr/recorder/jfrEventSetting.inline.hpp"
 #include "jfr/recorder/stacktrace/jfrStackTraceRepository.hpp"
@@ -211,4 +211,4 @@
 #endif // ASSERT
 };
 
-#endif // SHARE_VM_JFR_RECORDER_SERVICE_JFREVENT_HPP
+#endif // SHARE_JFR_RECORDER_SERVICE_JFREVENT_HPP
--- a/src/hotspot/share/jfr/recorder/service/jfrMemorySizer.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/service/jfrMemorySizer.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_RECORDER_SERVICE_JFRMEMORYSIZER_HPP
-#define SHARE_VM_JFR_RECORDER_SERVICE_JFRMEMORYSIZER_HPP
+#ifndef SHARE_JFR_RECORDER_SERVICE_JFRMEMORYSIZER_HPP
+#define SHARE_JFR_RECORDER_SERVICE_JFRMEMORYSIZER_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -53,4 +53,4 @@
   static bool adjust_options(JfrMemoryOptions* options);
 };
 
-#endif // SHARE_VM_JFR_RECORDER_SERVICE_JFRMEMORYSIZER_HPP
+#endif // SHARE_JFR_RECORDER_SERVICE_JFRMEMORYSIZER_HPP
--- a/src/hotspot/share/jfr/recorder/service/jfrOptionSet.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/service/jfrOptionSet.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_RECORDER_SERVICE_JFROPTIONSET_HPP
-#define SHARE_VM_JFR_RECORDER_SERVICE_JFROPTIONSET_HPP
+#ifndef SHARE_JFR_RECORDER_SERVICE_JFROPTIONSET_HPP
+#define SHARE_JFR_RECORDER_SERVICE_JFROPTIONSET_HPP
 
 #include "jni.h"
 #include "memory/allocation.hpp"
@@ -84,4 +84,4 @@
   static void release_startup_recording_options();
 };
 
-#endif // SHARE_VM_JFR_RECORDER_SERVICE_JFROPTIONSET_HPP
+#endif // SHARE_JFR_RECORDER_SERVICE_JFROPTIONSET_HPP
--- a/src/hotspot/share/jfr/recorder/service/jfrPostBox.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/service/jfrPostBox.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_RECORDER_SERVICE_JFRPOSTBOX_HPP
-#define SHARE_VM_JFR_RECORDER_SERVICE_JFRPOSTBOX_HPP
+#ifndef SHARE_JFR_RECORDER_SERVICE_JFRPOSTBOX_HPP
+#define SHARE_JFR_RECORDER_SERVICE_JFRPOSTBOX_HPP
 
 #include "jfr/utilities/jfrAllocation.hpp"
 
@@ -94,4 +94,4 @@
   void notify_collection_stop();
 };
 
-#endif // SHARE_VM_JFR_RECORDER_SERVICE_JFRPOSTBOX_HPP
+#endif // SHARE_JFR_RECORDER_SERVICE_JFRPOSTBOX_HPP
--- a/src/hotspot/share/jfr/recorder/service/jfrRecorderService.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/service/jfrRecorderService.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_RECORDER_SERVICE_JFRRECORDERSERVICE_HPP
-#define SHARE_VM_JFR_RECORDER_SERVICE_JFRRECORDERSERVICE_HPP
+#ifndef SHARE_JFR_RECORDER_SERVICE_JFRRECORDERSERVICE_HPP
+#define SHARE_JFR_RECORDER_SERVICE_JFRRECORDERSERVICE_HPP
 
 #include "jfr/utilities/jfrAllocation.hpp"
 
@@ -74,4 +74,4 @@
   static bool is_recording();
 };
 
-#endif // SHARE_VM_JFR_RECORDER_SERVICE_JFRRECORDERSERVICE_HPP
+#endif // SHARE_JFR_RECORDER_SERVICE_JFRRECORDERSERVICE_HPP
--- a/src/hotspot/share/jfr/recorder/service/jfrRecorderThread.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/service/jfrRecorderThread.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_RECORDER_SERVICE_JFRRECORDERTHREAD_HPP
-#define SHARE_VM_JFR_RECORDER_SERVICE_JFRRECORDERTHREAD_HPP
+#ifndef SHARE_JFR_RECORDER_SERVICE_JFRRECORDERTHREAD_HPP
+#define SHARE_JFR_RECORDER_SERVICE_JFRRECORDERTHREAD_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/debug.hpp"
@@ -42,4 +42,4 @@
   static bool start(JfrCheckpointManager* cp_manager, JfrPostBox* post_box, TRAPS);
 };
 
-#endif // SHARE_VM_JFR_RECORDER_SERVICE_JFRRECORDERTHREAD_HPP
+#endif // SHARE_JFR_RECORDER_SERVICE_JFRRECORDERTHREAD_HPP
--- a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_RECORDER_STACKTRACE_JFRSTACKTRACEREPOSITORY_HPP
-#define SHARE_VM_JFR_RECORDER_STACKTRACE_JFRSTACKTRACEREPOSITORY_HPP
+#ifndef SHARE_JFR_RECORDER_STACKTRACE_JFRSTACKTRACEREPOSITORY_HPP
+#define SHARE_JFR_RECORDER_STACKTRACE_JFRSTACKTRACEREPOSITORY_HPP
 
 #include "jfr/utilities/jfrAllocation.hpp"
 #include "jfr/utilities/jfrTypes.hpp"
@@ -150,4 +150,4 @@
   size_t clear();
 };
 
-#endif // SHARE_VM_JFR_RECORDER_STACKTRACE_JFRSTACKTRACEREPOSITORY_HPP
+#endif // SHARE_JFR_RECORDER_STACKTRACE_JFRSTACKTRACEREPOSITORY_HPP
--- a/src/hotspot/share/jfr/recorder/storage/jfrBuffer.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/storage/jfrBuffer.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_RECORDER_STORAGE_JFRBUFFER_HPP
-#define SHARE_VM_JFR_RECORDER_STORAGE_JFRBUFFER_HPP
+#ifndef SHARE_JFR_RECORDER_STORAGE_JFRBUFFER_HPP
+#define SHARE_JFR_RECORDER_STORAGE_JFRBUFFER_HPP
 
 #include "memory/allocation.hpp"
 
@@ -184,4 +184,4 @@
   }
 };
 
-#endif // SHARE_VM_JFR_RECORDER_STORAGE_JFRBUFFER_HPP
+#endif // SHARE_JFR_RECORDER_STORAGE_JFRBUFFER_HPP
--- a/src/hotspot/share/jfr/recorder/storage/jfrMemorySpace.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/storage/jfrMemorySpace.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  *
  */
-#ifndef SHARE_VM_JFR_RECORDER_STORAGE_JFRMEMORYSPACE_HPP
-#define SHARE_VM_JFR_RECORDER_STORAGE_JFRMEMORYSPACE_HPP
+#ifndef SHARE_JFR_RECORDER_STORAGE_JFRMEMORYSPACE_HPP
+#define SHARE_JFR_RECORDER_STORAGE_JFRMEMORYSPACE_HPP
 
 #include "jfr/utilities/jfrAllocation.hpp"
 #include "jfr/utilities/jfrDoublyLinkedList.hpp"
@@ -165,4 +165,4 @@
   size_t processed() const { return 0; }
 };
 
-#endif // SHARE_VM_JFR_RECORDER_STORAGE_JFRMEMORYSPACE_HPP
+#endif // SHARE_JFR_RECORDER_STORAGE_JFRMEMORYSPACE_HPP
--- a/src/hotspot/share/jfr/recorder/storage/jfrMemorySpace.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/storage/jfrMemorySpace.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_RECORDER_STORAGE_JFRMEMORYSPACE_INLINE_HPP
-#define SHARE_VM_JFR_RECORDER_STORAGE_JFRMEMORYSPACE_INLINE_HPP
+#ifndef SHARE_JFR_RECORDER_STORAGE_JFRMEMORYSPACE_INLINE_HPP
+#define SHARE_JFR_RECORDER_STORAGE_JFRMEMORYSPACE_INLINE_HPP
 
 #include "jfr/recorder/storage/jfrMemorySpace.hpp"
 
@@ -381,5 +381,4 @@
   }
 }
 
-#endif // SHARE_VM_JFR_RECORDER_STORAGE_JFRMEMORYSPACE_INLINE_HPP
-
+#endif // SHARE_JFR_RECORDER_STORAGE_JFRMEMORYSPACE_INLINE_HPP
--- a/src/hotspot/share/jfr/recorder/storage/jfrMemorySpaceRetrieval.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/storage/jfrMemorySpaceRetrieval.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_RECORDER_STORAGE_JFRMEMORYSPACERETRIEVAL_HPP
-#define SHARE_VM_JFR_RECORDER_STORAGE_JFRMEMORYSPACERETRIEVAL_HPP
+#ifndef SHARE_JFR_RECORDER_STORAGE_JFRMEMORYSPACERETRIEVAL_HPP
+#define SHARE_JFR_RECORDER_STORAGE_JFRMEMORYSPACERETRIEVAL_HPP
 
 #include "memory/allocation.hpp"
 #include "jfr/recorder/repository/jfrChunkWriter.hpp"
@@ -110,4 +110,4 @@
   }
 };
 
-#endif // SHARE_VM_JFR_RECORDER_STORAGE_JFRMEMORYSPACERETRIEVAL_HPP
+#endif // SHARE_JFR_RECORDER_STORAGE_JFRMEMORYSPACERETRIEVAL_HPP
--- a/src/hotspot/share/jfr/recorder/storage/jfrStorage.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/storage/jfrStorage.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  *
  */
-#ifndef SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGE_HPP
-#define SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGE_HPP
+#ifndef SHARE_JFR_RECORDER_STORAGE_JFRSTORAGE_HPP
+#define SHARE_JFR_RECORDER_STORAGE_JFRSTORAGE_HPP
 
 #include "jfr/recorder/storage/jfrBuffer.hpp"
 #include "jfr/recorder/storage/jfrMemorySpace.hpp"
@@ -95,4 +95,4 @@
   friend class JfrMemorySpace;
 };
 
-#endif // SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGE_HPP
+#endif // SHARE_JFR_RECORDER_STORAGE_JFRSTORAGE_HPP
--- a/src/hotspot/share/jfr/recorder/storage/jfrStorageControl.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/storage/jfrStorageControl.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGECONTROL_HPP
-#define SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGECONTROL_HPP
+#ifndef SHARE_JFR_RECORDER_STORAGE_JFRSTORAGECONTROL_HPP
+#define SHARE_JFR_RECORDER_STORAGE_JFRSTORAGECONTROL_HPP
 
 #include "jfr/utilities/jfrAllocation.hpp"
 
@@ -65,4 +65,4 @@
   bool should_scavenge() const;
 };
 
-#endif // SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGECONTROL_HPP
+#endif // SHARE_JFR_RECORDER_STORAGE_JFRSTORAGECONTROL_HPP
--- a/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGEUTILS_HPP
-#define SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGEUTILS_HPP
+#ifndef SHARE_JFR_RECORDER_STORAGE_JFRSTORAGEUTILS_HPP
+#define SHARE_JFR_RECORDER_STORAGE_JFRSTORAGEUTILS_HPP
 
 #include "jfr/recorder/storage/jfrBuffer.hpp"
 #include "jfr/recorder/repository/jfrChunkWriter.hpp"
@@ -121,4 +121,4 @@
   size_t processed() const { return _operation.processed(); }
 };
 
-#endif // SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGEUTILS_HPP
+#endif // SHARE_JFR_RECORDER_STORAGE_JFRSTORAGEUTILS_HPP
--- a/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/storage/jfrStorageUtils.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGEUTILS_INLINE_HPP
-#define SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGEUTILS_INLINE_HPP
+#ifndef SHARE_JFR_RECORDER_STORAGE_JFRSTORAGEUTILS_INLINE_HPP
+#define SHARE_JFR_RECORDER_STORAGE_JFRSTORAGEUTILS_INLINE_HPP
 
 #include "jfr/recorder/storage/jfrStorageUtils.hpp"
 
@@ -95,4 +95,4 @@
   return result;
 }
 
-#endif // SHARE_VM_JFR_RECORDER_STORAGE_JFRSTORAGEUTILS_INLINE_HPP
+#endif // SHARE_JFR_RECORDER_STORAGE_JFRSTORAGEUTILS_INLINE_HPP
--- a/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/storage/jfrVirtualMemory.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_RECORDER_STORAGE_JFRVIRTUALMEMORY_HPP
-#define SHARE_VM_JFR_RECORDER_STORAGE_JFRVIRTUALMEMORY_HPP
+#ifndef SHARE_JFR_RECORDER_STORAGE_JFRVIRTUALMEMORY_HPP
+#define SHARE_JFR_RECORDER_STORAGE_JFRVIRTUALMEMORY_HPP
 
 #include "jfr/utilities/jfrAllocation.hpp"
 
@@ -63,4 +63,4 @@
   bool compact(size_t index);
 };
 
-#endif // SHARE_VM_JFR_RECORDER_STORAGE_JFRVIRTUALMEMORY_HPP
+#endif // SHARE_JFR_RECORDER_STORAGE_JFRVIRTUALMEMORY_HPP
--- a/src/hotspot/share/jfr/recorder/stringpool/jfrStringPool.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/stringpool/jfrStringPool.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOL_HPP
-#define SHARE_VM_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOL_HPP
+#ifndef SHARE_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOL_HPP
+#define SHARE_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOL_HPP
 
 #include "jni.h"
 #include "jfr/recorder/storage/jfrMemorySpace.hpp"
@@ -80,4 +80,4 @@
   friend class JfrMemorySpace;
 };
 
-#endif // SHARE_VM_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOL_HPP
+#endif // SHARE_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOL_HPP
--- a/src/hotspot/share/jfr/recorder/stringpool/jfrStringPoolBuffer.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/stringpool/jfrStringPoolBuffer.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOLBUFFER_HPP
-#define SHARE_VM_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOLBUFFER_HPP
+#ifndef SHARE_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOLBUFFER_HPP
+#define SHARE_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOLBUFFER_HPP
 
 #include "jfr/recorder/storage/jfrBuffer.hpp"
 
@@ -43,4 +43,4 @@
   void set_string_top(uint64_t value);
 };
 
-#endif // SHARE_VM_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOLBUFFER_HPP
+#endif // SHARE_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOLBUFFER_HPP
--- a/src/hotspot/share/jfr/recorder/stringpool/jfrStringPoolWriter.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/recorder/stringpool/jfrStringPoolWriter.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOLWRITER_HPP
-#define SHARE_VM_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOLWRITER_HPP
+#ifndef SHARE_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOLWRITER_HPP
+#define SHARE_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOLWRITER_HPP
 
 #include "memory/allocation.hpp"
 #include "jfr/recorder/stringpool/jfrStringPoolBuffer.hpp"
@@ -55,4 +55,4 @@
   void inc_nof_strings();
 };
 
-#endif // SHARE_VM_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOLWRITER_HPP
+#endif // SHARE_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOLWRITER_HPP
--- a/src/hotspot/share/jfr/support/jfrAllocationTracer.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/support/jfrAllocationTracer.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
 *
 */
 
-#ifndef SHARE_VM_JFR_SUPPORT_JFRALLOCATIONTRACER_HPP
-#define SHARE_VM_JFR_SUPPORT_JFRALLOCATIONTRACER_HPP
+#ifndef SHARE_JFR_SUPPORT_JFRALLOCATIONTRACER_HPP
+#define SHARE_JFR_SUPPORT_JFRALLOCATIONTRACER_HPP
 
 #include "memory/allocation.hpp"
 
@@ -37,4 +37,4 @@
   ~JfrAllocationTracer();
 };
 
-#endif // SHARE_VM_JFR_SUPPORT_JFRALLOCATIONTRACER_HPP
+#endif // SHARE_JFR_SUPPORT_JFRALLOCATIONTRACER_HPP
--- a/src/hotspot/share/jfr/support/jfrEventClass.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/support/jfrEventClass.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_SUPPORT_JFREVENTCLASS_HPP
-#define SHARE_VM_JFR_SUPPORT_JFREVENTCLASS_HPP
+#ifndef SHARE_JFR_SUPPORT_JFREVENTCLASS_HPP
+#define SHARE_JFR_SUPPORT_JFREVENTCLASS_HPP
 
 #include "jni.h"
 #include "memory/allocation.hpp"
@@ -61,4 +61,4 @@
   static bool is_visible(const jclass jc);
 };
 
-#endif // SHARE_VM_JFR_SUPPORT_JFREVENTCLASS_HPP
+#endif // SHARE_JFR_SUPPORT_JFREVENTCLASS_HPP
--- a/src/hotspot/share/jfr/support/jfrFlush.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/support/jfrFlush.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_SUPPORT_JFRFLUSH_HPP
-#define SHARE_VM_JFR_SUPPORT_JFRFLUSH_HPP
+#ifndef SHARE_JFR_SUPPORT_JFRFLUSH_HPP
+#define SHARE_JFR_SUPPORT_JFRFLUSH_HPP
 
 #include "jfr/recorder/storage/jfrBuffer.hpp"
 #include "jfr/utilities/jfrTypes.hpp"
@@ -74,4 +74,4 @@
   }
 };
 
-#endif // SHARE_VM_JFR_SUPPORT_JFRFLUSH_HPP
+#endif // SHARE_JFR_SUPPORT_JFRFLUSH_HPP
--- a/src/hotspot/share/jfr/support/jfrIntrinsics.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/support/jfrIntrinsics.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
 *
 */
 
-#ifndef SHARE_VM_JFR_SUPPORT_JFRINTRINSICS_HPP
-#define SHARE_VM_JFR_SUPPORT_JFRINTRINSICS_HPP
+#ifndef SHARE_JFR_SUPPORT_JFRINTRINSICS_HPP
+#define SHARE_JFR_SUPPORT_JFRINTRINSICS_HPP
 
 #include "utilities/macros.hpp"
 
@@ -53,4 +53,4 @@
 #define JFR_INTRINSICS(do_intrinsic, do_class, do_name, do_signature, do_alias)
 
 #endif // INCLUDE_JFR
-#endif // SHARE_VM_JFR_SUPPORT_JFRINTRINSICS_HPP
+#endif // SHARE_JFR_SUPPORT_JFRINTRINSICS_HPP
--- a/src/hotspot/share/jfr/support/jfrKlassExtension.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/support/jfrKlassExtension.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
 *
 */
 
-#ifndef SHARE_VM_JFR_SUPPORT_JFRKLASSEXTENSION_HPP
-#define SHARE_VM_JFR_SUPPORT_JFRKLASSEXTENSION_HPP
+#ifndef SHARE_JFR_SUPPORT_JFRKLASSEXTENSION_HPP
+#define SHARE_JFR_SUPPORT_JFRKLASSEXTENSION_HPP
 
 #include "jfr/instrumentation/jfrEventClassTransformer.hpp"
 #include "jfr/support/jfrTraceIdExtension.hpp"
@@ -39,4 +39,4 @@
 #define IS_EVENT_KLASS(ptr) (((ptr)->trace_id() & (JDK_JFR_EVENT_KLASS | JDK_JFR_EVENT_SUBKLASS)) != 0)
 #define ON_KLASS_CREATION(k, p, t) if (IS_EVENT_KLASS(k)) JfrEventClassTransformer::on_klass_creation(k, p, t)
 
-#endif // SHARE_VM_JFR_SUPPORT_JFRKLASSEXTENSION_HPP
+#endif // SHARE_JFR_SUPPORT_JFRKLASSEXTENSION_HPP
--- a/src/hotspot/share/jfr/support/jfrStackTraceMark.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/support/jfrStackTraceMark.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_SUPPORT_JFRSTACKTRACEMARK_HPP
-#define SHARE_VM_JFR_SUPPORT_JFRSTACKTRACEMARK_HPP
+#ifndef SHARE_JFR_SUPPORT_JFRSTACKTRACEMARK_HPP
+#define SHARE_JFR_SUPPORT_JFRSTACKTRACEMARK_HPP
 
 #include "memory/allocation.hpp"
 #include "jfrfiles/jfrEventIds.hpp"
@@ -44,4 +44,4 @@
   ~JfrStackTraceMark();
 };
 
-#endif // SHARE_VM_JFR_SUPPORT_JFRSTACKTRACEMARK_HPP
+#endif // SHARE_JFR_SUPPORT_JFRSTACKTRACEMARK_HPP
--- a/src/hotspot/share/jfr/support/jfrThreadExtension.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/support/jfrThreadExtension.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
 *
 */
 
-#ifndef SHARE_VM_JFR_SUPPORT_JFRTHREADEXTENSION_HPP
-#define SHARE_VM_JFR_SUPPORT_JFRTHREADEXTENSION_HPP
+#ifndef SHARE_JFR_SUPPORT_JFRTHREADEXTENSION_HPP
+#define SHARE_JFR_SUPPORT_JFRTHREADEXTENSION_HPP
 
 #include "jfr/periodic/sampling/jfrThreadSampler.hpp"
 #include "jfr/support/jfrThreadLocal.hpp"
@@ -48,4 +48,4 @@
 
 #define SUSPEND_THREAD_CONDITIONAL(thread) if ((thread)->is_trace_suspend()) JfrThreadSampling::on_javathread_suspend(thread)
 
-#endif // SHARE_VM_JFR_SUPPORT_JFRTHREADEXTENSION_HPP
+#endif // SHARE_JFR_SUPPORT_JFRTHREADEXTENSION_HPP
--- a/src/hotspot/share/jfr/support/jfrThreadId.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/support/jfrThreadId.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
 *
 */
 
-#ifndef SHARE_VM_JFR_SUPPORT_JFRTHREADID_HPP
-#define SHARE_VM_JFR_SUPPORT_JFRTHREADID_HPP
+#ifndef SHARE_JFR_SUPPORT_JFRTHREADID_HPP
+#define SHARE_JFR_SUPPORT_JFRTHREADID_HPP
 
 #include "utilities/macros.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -37,5 +37,4 @@
 #define JFR_THREAD_ID(thread) ((traceid)(thread)->osthread()->thread_id())
 #endif
 
-#endif // SHARE_VM_JFR_SUPPORT_JFRTHREADID_HPP
-
+#endif // SHARE_JFR_SUPPORT_JFRTHREADID_HPP
--- a/src/hotspot/share/jfr/support/jfrThreadLocal.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/support/jfrThreadLocal.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_SUPPORT_JFRTHREADLOCAL_HPP
-#define SHARE_VM_JFR_SUPPORT_JFRTHREADLOCAL_HPP
+#ifndef SHARE_JFR_SUPPORT_JFRTHREADLOCAL_HPP
+#define SHARE_JFR_SUPPORT_JFRTHREADLOCAL_HPP
 
 #include "jfr/recorder/checkpoint/jfrCheckpointBlob.hpp"
 #include "jfr/utilities/jfrTypes.hpp"
@@ -221,4 +221,4 @@
   static ByteSize java_event_writer_offset();
 };
 
-#endif // SHARE_VM_JFR_SUPPORT_JFRTHREADLOCAL_HPP
+#endif // SHARE_JFR_SUPPORT_JFRTHREADLOCAL_HPP
--- a/src/hotspot/share/jfr/support/jfrTraceIdExtension.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/support/jfrTraceIdExtension.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
 *
 */
 
-#ifndef SHARE_VM_JFR_SUPPORT_JFRTRACEIDEXTENSION_HPP
-#define SHARE_VM_JFR_SUPPORT_JFRTRACEIDEXTENSION_HPP
+#ifndef SHARE_JFR_SUPPORT_JFRTRACEIDEXTENSION_HPP
+#define SHARE_JFR_SUPPORT_JFRTRACEIDEXTENSION_HPP
 
 #include "jfr/recorder/checkpoint/types/traceid/jfrTraceId.hpp"
 
@@ -78,4 +78,4 @@
     return _trace_flags.flags_addr();              \
   }
 
-#endif // SHARE_VM_JFR_SUPPORT_JFRTRACEIDEXTENSION_HPP
+#endif // SHARE_JFR_SUPPORT_JFRTRACEIDEXTENSION_HPP
--- a/src/hotspot/share/jfr/utilities/jfrAllocation.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/utilities/jfrAllocation.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_UTILITIES_JFRALLOCATION_HPP
-#define SHARE_VM_JFR_UTILITIES_JFRALLOCATION_HPP
+#ifndef SHARE_JFR_UTILITIES_JFRALLOCATION_HPP
+#define SHARE_JFR_UTILITIES_JFRALLOCATION_HPP
 
 #include "memory/allocation.hpp"
 #include "services/memTracker.hpp"
@@ -71,4 +71,4 @@
   }
 };
 
-#endif // SHARE_VM_JFR_UTILITIES_JFRALLOCATION_HPP
+#endif // SHARE_JFR_UTILITIES_JFRALLOCATION_HPP
--- a/src/hotspot/share/jfr/utilities/jfrBigEndian.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/utilities/jfrBigEndian.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_UTILITIES_JFRBIGENDIAN_HPP
-#define SHARE_VM_JFR_UTILITIES_JFRBIGENDIAN_HPP
+#ifndef SHARE_JFR_UTILITIES_JFRBIGENDIAN_HPP
+#define SHARE_JFR_UTILITIES_JFRBIGENDIAN_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/bytes.hpp"
@@ -133,4 +133,4 @@
   return read_unaligned<T>((const address)location);
 }
 
-#endif // SHARE_VM_JFR_UTILITIES_JFRBIGENDIAN_HPP
+#endif // SHARE_JFR_UTILITIES_JFRBIGENDIAN_HPP
--- a/src/hotspot/share/jfr/utilities/jfrDoublyLinkedList.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/utilities/jfrDoublyLinkedList.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_UTILITIES_JFRDOUBLYLINKEDLIST_HPP
-#define SHARE_VM_JFR_UTILITIES_JFRDOUBLYLINKEDLIST_HPP
+#ifndef SHARE_JFR_UTILITIES_JFRDOUBLYLINKEDLIST_HPP
+#define SHARE_JFR_UTILITIES_JFRDOUBLYLINKEDLIST_HPP
 
 #include "memory/allocation.hpp"
 
@@ -215,4 +215,4 @@
   assert(in_list(head_node), "not in list error");
 }
 
-#endif // SHARE_VM_JFR_UTILITIES_JFRDOUBLYLINKEDLIST_HPP
+#endif // SHARE_JFR_UTILITIES_JFRDOUBLYLINKEDLIST_HPP
--- a/src/hotspot/share/jfr/utilities/jfrHashtable.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/utilities/jfrHashtable.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_UTILITIES_JFRHASHTABLE_HPP
-#define SHARE_VM_JFR_UTILITIES_JFRHASHTABLE_HPP
+#ifndef SHARE_JFR_UTILITIES_JFRHASHTABLE_HPP
+#define SHARE_JFR_UTILITIES_JFRHASHTABLE_HPP
 
 #include "memory/allocation.inline.hpp"
 #include "runtime/orderAccess.hpp"
@@ -280,4 +280,4 @@
   return entry;
 }
 
-#endif // SHARE_VM_JFR_UTILITIES_JFRHASHTABLE_HPP
+#endif // SHARE_JFR_UTILITIES_JFRHASHTABLE_HPP
--- a/src/hotspot/share/jfr/utilities/jfrIterator.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/utilities/jfrIterator.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_UTILITIES_JFRLISTITERATOR_HPP
-#define SHARE_VM_JFR_UTILITIES_JFRLISTITERATOR_HPP
+#ifndef SHARE_JFR_UTILITIES_JFRITERATOR_HPP
+#define SHARE_JFR_UTILITIES_JFRITERATOR_HPP
 
 #include "memory/allocation.hpp"
 
@@ -104,4 +104,4 @@
   StopOnNullIterator(List& list, jfr_iter_direction direction = forward) : IteratorHost<List, NavigatorStopOnNull, AP>(list, direction) {}
 };
 
-#endif // SHARE_VM_JFR_UTILITIES_JFRLISTITERATOR_HPP
+#endif // SHARE_JFR_UTILITIES_JFRITERATOR_HPP
--- a/src/hotspot/share/jfr/utilities/jfrJavaLog.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/utilities/jfrJavaLog.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_UTILITIES_JFRJAVALOG_HPP
-#define SHARE_VM_JFR_UTILITIES_JFRJAVALOG_HPP
+#ifndef SHARE_JFR_UTILITIES_JFRJAVALOG_HPP
+#define SHARE_JFR_UTILITIES_JFRJAVALOG_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/exceptions.hpp"
@@ -45,4 +45,4 @@
   static void log(jint tag_set, jint level, jstring message, TRAPS);
 };
 
-#endif // SHARE_VM_JFR_UTILITIES_JFRJAVALOG_HPP
+#endif // SHARE_JFR_UTILITIES_JFRJAVALOG_HPP
--- a/src/hotspot/share/jfr/utilities/jfrLogTagSets.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/utilities/jfrLogTagSets.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_UTILITIES_JFRLOGTAGSETS_HPP
-#define SHARE_VM_JFR_UTILITIES_JFRLOGTAGSETS_HPP
+#ifndef SHARE_JFR_UTILITIES_JFRLOGTAGSETS_HPP
+#define SHARE_JFR_UTILITIES_JFRLOGTAGSETS_HPP
 
 #include "logging/logTag.hpp"
 
@@ -59,4 +59,4 @@
   JFR_LOG_TAG(jfr, dcmd)
   /* NEW TAGS, DONT FORGET TO UPDATE JAVA SIDE */
 
-#endif // SHARE_VM_JFR_UTILITIES_JFRLOGTAGSETS_HPP
+#endif // SHARE_JFR_UTILITIES_JFRLOGTAGSETS_HPP
--- a/src/hotspot/share/jfr/utilities/jfrRefCountPointer.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/utilities/jfrRefCountPointer.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_UTILITIES_JFRREFCOUNTPOINTER_HPP
-#define SHARE_VM_JFR_UTILITIES_JFRREFCOUNTPOINTER_HPP
+#ifndef SHARE_JFR_UTILITIES_JFRREFCOUNTPOINTER_HPP
+#define SHARE_JFR_UTILITIES_JFRREFCOUNTPOINTER_HPP
 
 #include "jfr/utilities/jfrAllocation.hpp"
 #include "runtime/atomic.hpp"
@@ -151,4 +151,4 @@
   }
 };
 
-#endif // SHARE_VM_JFR_UTILITIES_JFRREFCOUNTPOINTER_HPP
+#endif // SHARE_JFR_UTILITIES_JFRREFCOUNTPOINTER_HPP
--- a/src/hotspot/share/jfr/utilities/jfrResourceManager.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/utilities/jfrResourceManager.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_UTILITIES_RESOURCEMANAGER_HPP
-#define SHARE_VM_JFR_UTILITIES_RESOURCEMANAGER_HPP
+#ifndef SHARE_JFR_UTILITIES_JFRRESOURCEMANAGER_HPP
+#define SHARE_JFR_UTILITIES_JFRRESOURCEMANAGER_HPP
 
 #include "memory/allocation.hpp"
 
@@ -57,4 +57,4 @@
   T* operator->() const { return _resource_array; }
 };
 
-#endif // SHARE_VM_JFR_UTILITIES_RESOURCEMANAGER_HPP
+#endif // SHARE_JFR_UTILITIES_JFRRESOURCEMANAGER_HPP
--- a/src/hotspot/share/jfr/utilities/jfrSpinlockHelper.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/utilities/jfrSpinlockHelper.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_UTILITIES_JFRSPINLOCKHELPER_HPP
-#define SHARE_VM_JFR_UTILITIES_JFRSPINLOCKHELPER_HPP
+#ifndef SHARE_JFR_UTILITIES_JFRSPINLOCKHELPER_HPP
+#define SHARE_JFR_UTILITIES_JFRSPINLOCKHELPER_HPP
 
 #include "runtime/thread.hpp"
 
@@ -47,4 +47,4 @@
   }
 };
 
-#endif // SHARE_VM_JFR_UTILITIES_JFRSPINLOCKHELPER_HPP
+#endif // SHARE_JFR_UTILITIES_JFRSPINLOCKHELPER_HPP
--- a/src/hotspot/share/jfr/utilities/jfrTime.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/utilities/jfrTime.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_UTILITIES_JFRTIME_HPP
-#define SHARE_VM_JFR_UTILITIES_JFRTIME_HPP
+#ifndef SHARE_JFR_UTILITIES_JFRTIME_HPP
+#define SHARE_JFR_UTILITIES_JFRTIME_HPP
 
 #include "utilities/ticks.hpp"
 
@@ -41,4 +41,4 @@
   static const void* time_function();
 };
 
-#endif // SHARE_VM_JFR_UTILITIES_JFRTIME_HPP
+#endif // SHARE_JFR_UTILITIES_JFRTIME_HPP
--- a/src/hotspot/share/jfr/utilities/jfrTimeConverter.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/utilities/jfrTimeConverter.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_UTILITIES_JFRTIMECONVERTER_HPP
-#define SHARE_VM_JFR_UTILITIES_JFRTIMECONVERTER_HPP
+#ifndef SHARE_JFR_UTILITIES_JFRTIMECONVERTER_HPP
+#define SHARE_JFR_UTILITIES_JFRTIMECONVERTER_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -50,4 +50,4 @@
   static jlong nanos_to_countertime(jlong c, bool as_os_time = false);
 };
 
-#endif // SHARE_VM_JFR_UTILITIES_JFRTIMECONVERTER_HPP
+#endif // SHARE_JFR_UTILITIES_JFRTIMECONVERTER_HPP
--- a/src/hotspot/share/jfr/utilities/jfrTryLock.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/utilities/jfrTryLock.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_UTILITIES_JFRTRYLOCK_HPP
-#define SHARE_VM_JFR_UTILITIES_JFRTRYLOCK_HPP
+#ifndef SHARE_JFR_UTILITIES_JFRTRYLOCK_HPP
+#define SHARE_JFR_UTILITIES_JFRTRYLOCK_HPP
 
 #include "runtime/atomic.hpp"
 #include "runtime/orderAccess.hpp"
@@ -71,4 +71,4 @@
 
 };
 
-#endif // SHARE_VM_JFR_UTILITIES_JFRTRYLOCK_HPP
+#endif // SHARE_JFR_UTILITIES_JFRTRYLOCK_HPP
--- a/src/hotspot/share/jfr/utilities/jfrTypes.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/utilities/jfrTypes.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_UTILITIES_JFRTYPES_HPP
-#define SHARE_VM_JFR_UTILITIES_JFRTYPES_HPP
+#ifndef SHARE_JFR_UTILITIES_JFRTYPES_HPP
+#define SHARE_JFR_UTILITIES_JFRTYPES_HPP
 
 #include "jfrfiles/jfrEventIds.hpp"
 #include "memory/allocation.hpp"
@@ -39,4 +39,4 @@
   TIMED
 };
 
-#endif // SHARE_VM_JFR_UTILITIES_JFRTYPES_HPP
+#endif // SHARE_JFR_UTILITIES_JFRTYPES_HPP
--- a/src/hotspot/share/jfr/writers/jfrBigEndianWriter.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/writers/jfrBigEndianWriter.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_WRITERS_JFRBIGENDIANWRITER_HPP
-#define SHARE_VM_JFR_WRITERS_JFRBIGENDIANWRITER_HPP
+#ifndef SHARE_JFR_WRITERS_JFRBIGENDIANWRITER_HPP
+#define SHARE_JFR_WRITERS_JFRBIGENDIANWRITER_HPP
 
 #include "jfr/writers/jfrEncoding.hpp"
 #include "jfr/writers/jfrMemoryWriterHost.inline.hpp"
@@ -39,4 +39,4 @@
   JfrBigEndianWriter(StorageType* storage, size_t size) : BigEndianWriterBase(storage, size + size_safety_cushion) {}
 };
 
-#endif // SHARE_VM_JFR_WRITERS_JFRBIGENDIANWRITER_HPP
+#endif // SHARE_JFR_WRITERS_JFRBIGENDIANWRITER_HPP
--- a/src/hotspot/share/jfr/writers/jfrEncoders.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/writers/jfrEncoders.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_WRITERS_JFRENCODERS_HPP
-#define SHARE_VM_JFR_WRITERS_JFRENCODERS_HPP
+#ifndef SHARE_JFR_WRITERS_JFRENCODERS_HPP
+#define SHARE_JFR_WRITERS_JFRENCODERS_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/bytes.hpp"
@@ -295,4 +295,4 @@
   return size;
 }
 
-#endif // SHARE_VM_JFR_WRITERS_JFRENCODERS_HPP
+#endif // SHARE_JFR_WRITERS_JFRENCODERS_HPP
--- a/src/hotspot/share/jfr/writers/jfrEncoding.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/writers/jfrEncoding.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_WRITERS_JFRENCODING_HPP
-#define SHARE_VM_JFR_WRITERS_JFRENCODING_HPP
+#ifndef SHARE_JFR_WRITERS_JFRENCODING_HPP
+#define SHARE_JFR_WRITERS_JFRENCODING_HPP
 
 #include "jfr/writers/jfrEncoders.hpp"
 #include "memory/allocation.hpp"
@@ -114,4 +114,4 @@
 typedef EncoderHost<BigEndianEncoderImpl, BigEndianEncoderImpl> BigEndianEncoder;
 typedef EncoderHost<Varint128EncoderImpl, BigEndianEncoderImpl> CompressedIntegerEncoder;
 
-#endif // SHARE_VM_JFR_WRITERS_JFRENCODING_HPP
+#endif // SHARE_JFR_WRITERS_JFRENCODING_HPP
--- a/src/hotspot/share/jfr/writers/jfrEventWriterHost.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/writers/jfrEventWriterHost.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_WRITERS_JFREVENTWRITERHOST_HPP
-#define SHARE_VM_JFR_WRITERS_JFREVENTWRITERHOST_HPP
+#ifndef SHARE_JFR_WRITERS_JFREVENTWRITERHOST_HPP
+#define SHARE_JFR_WRITERS_JFREVENTWRITERHOST_HPP
 
 #include "jfr/writers/jfrWriterHost.inline.hpp"
 
@@ -48,4 +48,4 @@
   ~StackEventWriterHost();
 };
 
-#endif // SHARE_VM_JFR_WRITERS_JFREVENTWRITERHOST_HPP
+#endif // SHARE_JFR_WRITERS_JFREVENTWRITERHOST_HPP
--- a/src/hotspot/share/jfr/writers/jfrEventWriterHost.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/writers/jfrEventWriterHost.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_WRITERS_JFREVENTWRITERHOST_INLINE_HPP
-#define SHARE_VM_JFR_WRITERS_JFREVENTWRITERHOST_INLINE_HPP
+#ifndef SHARE_JFR_WRITERS_JFREVENTWRITERHOST_INLINE_HPP
+#define SHARE_JFR_WRITERS_JFREVENTWRITERHOST_INLINE_HPP
 
 #include "jfr/writers/jfrEventWriterHost.hpp"
 
@@ -94,4 +94,4 @@
   this->end_event_write();
 }
 
-#endif // SHARE_VM_JFR_WRITERS_JFREVENTWRITERHOST_INLINE_HPP
+#endif // SHARE_JFR_WRITERS_JFREVENTWRITERHOST_INLINE_HPP
--- a/src/hotspot/share/jfr/writers/jfrJavaEventWriter.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/writers/jfrJavaEventWriter.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_WRITERS_JFRJAVAEVENTWRITER_HPP
-#define SHARE_VM_JFR_WRITERS_JFRJAVAEVENTWRITER_HPP
+#ifndef SHARE_JFR_WRITERS_JFRJAVAEVENTWRITER_HPP
+#define SHARE_JFR_WRITERS_JFRJAVAEVENTWRITER_HPP
 
 #include "jni.h"
 #include "memory/allocation.hpp"
@@ -46,4 +46,4 @@
   static jboolean flush(jobject writer, jint used, jint requested, JavaThread* jt);
 };
 
-#endif // SHARE_VM_JFR_WRITERS_JFRJAVAEVENTWRITER_HPP
+#endif // SHARE_JFR_WRITERS_JFRJAVAEVENTWRITER_HPP
--- a/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_WRITERS_JFRMEMORYWRITERHOST_HPP
-#define SHARE_VM_JFR_WRITERS_JFRMEMORYWRITERHOST_HPP
+#ifndef SHARE_JFR_WRITERS_JFRMEMORYWRITERHOST_HPP
+#define SHARE_JFR_WRITERS_JFRMEMORYWRITERHOST_HPP
 
 #include "jfr/writers/jfrStorageHost.inline.hpp"
 
@@ -69,4 +69,4 @@
   ~AcquireReleaseMemoryWriterHost();
 };
 
-#endif // SHARE_VM_JFR_WRITERS_JFRMEMORYWRITERHOST_HPP
+#endif // SHARE_JFR_WRITERS_JFRMEMORYWRITERHOST_HPP
--- a/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/writers/jfrMemoryWriterHost.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_WRITERS_JFRMEMORYWRITERHOST_INLINE_HPP
-#define SHARE_VM_JFR_WRITERS_JFRMEMORYWRITERHOST_INLINE_HPP
+#ifndef SHARE_JFR_WRITERS_JFRMEMORYWRITERHOST_INLINE_HPP
+#define SHARE_JFR_WRITERS_JFRMEMORYWRITERHOST_INLINE_HPP
 
 #include "jfr/writers/jfrMemoryWriterHost.hpp"
 
@@ -96,4 +96,4 @@
   this->release();
 }
 
-#endif // SHARE_VM_JFR_WRITERS_JFRMEMORYWRITERHOST_INLINE_HPP
+#endif // SHARE_JFR_WRITERS_JFRMEMORYWRITERHOST_INLINE_HPP
--- a/src/hotspot/share/jfr/writers/jfrNativeEventWriter.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/writers/jfrNativeEventWriter.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_WRITERS_JFRNATIVEEVENTWRITER_HPP
-#define SHARE_VM_JFR_WRITERS_JFRNATIVEEVENTWRITER_HPP
+#ifndef SHARE_JFR_WRITERS_JFRNATIVEEVENTWRITER_HPP
+#define SHARE_JFR_WRITERS_JFRNATIVEEVENTWRITER_HPP
 
 #include "jfr/support/jfrFlush.hpp"
 #include "jfr/writers/jfrEncoding.hpp"
@@ -35,4 +35,4 @@
 typedef MemoryWriterHost<JfrNativeEventAdapter, StackObj> JfrNativeEventWriterImpl;
 typedef StackEventWriterHost<BigEndianEncoder, CompressedIntegerEncoder, JfrNativeEventWriterImpl> JfrNativeEventWriter;
 
-#endif // SHARE_VM_JFR_WRITERS_JFRNATIVEEVENTWRITER_HPP
+#endif // SHARE_JFR_WRITERS_JFRNATIVEEVENTWRITER_HPP
--- a/src/hotspot/share/jfr/writers/jfrPosition.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/writers/jfrPosition.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_WRITERS_JFRPOSITION_HPP
-#define SHARE_VM_JFR_WRITERS_JFRPOSITION_HPP
+#ifndef SHARE_JFR_WRITERS_JFRPOSITION_HPP
+#define SHARE_JFR_WRITERS_JFRPOSITION_HPP
 
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -54,4 +54,4 @@
   void reset();
 };
 
-#endif // SHARE_VM_JFR_WRITERS_JFRPOSITION_HPP
+#endif // SHARE_JFR_WRITERS_JFRPOSITION_HPP
--- a/src/hotspot/share/jfr/writers/jfrPosition.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/writers/jfrPosition.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_WRITERS_JFRPOSITION_INLINE_HPP
-#define SHARE_VM_JFR_WRITERS_JFRPOSITION_INLINE_HPP
+#ifndef SHARE_JFR_WRITERS_JFRPOSITION_INLINE_HPP
+#define SHARE_JFR_WRITERS_JFRPOSITION_INLINE_HPP
 
 #include "jfr/writers/jfrPosition.hpp"
 
@@ -99,4 +99,4 @@
   set_current_pos(_start_pos);
 }
 
-#endif // SHARE_VM_JFR_WRITERS_JFRPOSITION_INLINE_HPP
+#endif // SHARE_JFR_WRITERS_JFRPOSITION_INLINE_HPP
--- a/src/hotspot/share/jfr/writers/jfrStorageAdapter.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/writers/jfrStorageAdapter.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_WRITERS_JFRSTORAGEADAPTER_HPP
-#define SHARE_VM_JFR_WRITERS_JFRSTORAGEADAPTER_HPP
+#ifndef SHARE_JFR_WRITERS_JFRSTORAGEADAPTER_HPP
+#define SHARE_JFR_WRITERS_JFRSTORAGEADAPTER_HPP
 
 #include "jfr/utilities/jfrAllocation.hpp"
 
@@ -240,4 +240,4 @@
   }
 };
 
-#endif // SHARE_VM_JFR_WRITERS_JFRSTORAGEADAPTER_HPP
+#endif // SHARE_JFR_WRITERS_JFRSTORAGEADAPTER_HPP
--- a/src/hotspot/share/jfr/writers/jfrStorageHost.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/writers/jfrStorageHost.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_WRITERS_JFRSTORAGEHOST_HPP
-#define SHARE_VM_JFR_WRITERS_JFRSTORAGEHOST_HPP
+#ifndef SHARE_JFR_WRITERS_JFRSTORAGEHOST_HPP
+#define SHARE_JFR_WRITERS_JFRSTORAGEHOST_HPP
 
 #include "jfr/writers/jfrPosition.inline.hpp"
 
@@ -55,5 +55,4 @@
   void seek(intptr_t offset);
 };
 
-#endif // SHARE_VM_JFR_WRITERS_JFRSTORAGEHOST_HPP
-
+#endif // SHARE_JFR_WRITERS_JFRSTORAGEHOST_HPP
--- a/src/hotspot/share/jfr/writers/jfrStorageHost.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/writers/jfrStorageHost.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_WRITERS_JFRSTORAGEHOST_INLINE_HPP
-#define SHARE_VM_JFR_WRITERS_JFRSTORAGEHOST_INLINE_HPP
+#ifndef SHARE_JFR_WRITERS_JFRSTORAGEHOST_INLINE_HPP
+#define SHARE_JFR_WRITERS_JFRSTORAGEHOST_INLINE_HPP
 
 #include "jfr/writers/jfrStorageHost.hpp"
 
@@ -135,4 +135,4 @@
   }
 }
 
-#endif // SHARE_VM_JFR_WRITERS_JFRSTORAGEHOST_INLINE_HPP
+#endif // SHARE_JFR_WRITERS_JFRSTORAGEHOST_INLINE_HPP
--- a/src/hotspot/share/jfr/writers/jfrStreamWriterHost.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/writers/jfrStreamWriterHost.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_WRITERS_JFRSTREAMWRITERHOST_HPP
-#define SHARE_VM_JFR_WRITERS_JFRSTREAMWRITERHOST_HPP
+#ifndef SHARE_JFR_WRITERS_JFRSTREAMWRITERHOST_HPP
+#define SHARE_JFR_WRITERS_JFRSTREAMWRITERHOST_HPP
 
 #include "jfr/utilities/jfrTypes.hpp"
 #include "jfr/writers/jfrMemoryWriterHost.inline.hpp"
@@ -56,5 +56,4 @@
   void reset(fio_fd fd);
 };
 
-#endif // SHARE_VM_JFR_WRITERS_JFRSTREAMWRITERHOST_HPP
-
+#endif // SHARE_JFR_WRITERS_JFRSTREAMWRITERHOST_HPP
--- a/src/hotspot/share/jfr/writers/jfrStreamWriterHost.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/writers/jfrStreamWriterHost.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_WRITERS_JFRSTREAMWRITERHOST_INLINE_HPP
-#define SHARE_VM_JFR_WRITERS_JFRSTREAMWRITERHOST_INLINE_HPP
+#ifndef SHARE_JFR_WRITERS_JFRSTREAMWRITERHOST_INLINE_HPP
+#define SHARE_JFR_WRITERS_JFRSTREAMWRITERHOST_INLINE_HPP
 
 #include "jfr/writers/jfrStreamWriterHost.hpp"
 #include "runtime/os.hpp"
@@ -136,4 +136,4 @@
   this->hard_reset();
 }
 
-#endif // SHARE_VM_JFR_WRITERS_JFRSTREAMWRITERHOST_INLINE_HPP
+#endif // SHARE_JFR_WRITERS_JFRSTREAMWRITERHOST_INLINE_HPP
--- a/src/hotspot/share/jfr/writers/jfrWriterHost.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/writers/jfrWriterHost.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_WRITERS_JFRWRITERHOST_HPP
-#define SHARE_VM_JFR_WRITERS_JFRWRITERHOST_HPP
+#ifndef SHARE_JFR_WRITERS_JFRWRITERHOST_HPP
+#define SHARE_JFR_WRITERS_JFRWRITERHOST_HPP
 
 #include "jni.h"
 #include "utilities/globalDefinitions.hpp"
@@ -99,4 +99,4 @@
   intptr_t reserve(size_t size);
 };
 
-#endif // SHARE_VM_JFR_WRITERS_JFRWRITERHOST_HPP
+#endif // SHARE_JFR_WRITERS_JFRWRITERHOST_HPP
--- a/src/hotspot/share/jfr/writers/jfrWriterHost.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jfr/writers/jfrWriterHost.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JFR_WRITERS_JFRWRITERHOST_INLINE_HPP
-#define SHARE_VM_JFR_WRITERS_JFRWRITERHOST_INLINE_HPP
+#ifndef SHARE_JFR_WRITERS_JFRWRITERHOST_INLINE_HPP
+#define SHARE_JFR_WRITERS_JFRWRITERHOST_INLINE_HPP
 
 #include "classfile/javaClasses.hpp"
 #include "jfr/recorder/checkpoint/types/traceid/jfrTraceId.inline.hpp"
@@ -360,5 +360,4 @@
   }
 }
 
-#endif // SHARE_VM_JFR_WRITERS_JFRWRITERHOST_INLINE_HPP
-
+#endif // SHARE_JFR_WRITERS_JFRWRITERHOST_INLINE_HPP
--- a/src/hotspot/share/jvmci/compilerRuntime.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jvmci/compilerRuntime.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  */
 
-#ifndef SHARE_VM_RUNTIME_COMPILERRUNTIME_HPP
-#define SHARE_VM_RUNTIME_COMPILERRUNTIME_HPP
+#ifndef SHARE_JVMCI_COMPILERRUNTIME_HPP
+#define SHARE_JVMCI_COMPILERRUNTIME_HPP
 
 #include "memory/allocation.hpp"
 #include "memory/resourceArea.hpp"
@@ -48,4 +48,4 @@
   static void backedge_event(JavaThread *thread, MethodCounters* counters, int branch_bci, int target_bci);
 };
 
-#endif // SHARE_VM_RUNTIME_COMPILERRUNTIME_HPP
+#endif // SHARE_JVMCI_COMPILERRUNTIME_HPP
--- a/src/hotspot/share/jvmci/jvmciCodeInstaller.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jvmci/jvmciCodeInstaller.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  */
 
-#ifndef SHARE_VM_JVMCI_JVMCI_CODE_INSTALLER_HPP
-#define SHARE_VM_JVMCI_JVMCI_CODE_INSTALLER_HPP
+#ifndef SHARE_JVMCI_JVMCICODEINSTALLER_HPP
+#define SHARE_JVMCI_JVMCICODEINSTALLER_HPP
 
 #include "jvmci/jvmciCompiler.hpp"
 #include "jvmci/jvmciEnv.hpp"
@@ -279,4 +279,4 @@
 
 
 
-#endif // SHARE_VM_JVMCI_JVMCI_CODE_INSTALLER_HPP
+#endif // SHARE_JVMCI_JVMCICODEINSTALLER_HPP
--- a/src/hotspot/share/jvmci/jvmciCompiler.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jvmci/jvmciCompiler.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  */
 
-#ifndef SHARE_VM_JVMCI_JVMCI_COMPILER_HPP
-#define SHARE_VM_JVMCI_JVMCI_COMPILER_HPP
+#ifndef SHARE_JVMCI_JVMCICOMPILER_HPP
+#define SHARE_JVMCI_JVMCICOMPILER_HPP
 
 #include "compiler/abstractCompiler.hpp"
 #include "jvmci/jvmciEnv.hpp"
@@ -107,4 +107,4 @@
   static elapsedTimer* codeInstallTimer() { return &_codeInstallTimer; }
 };
 
-#endif // SHARE_VM_JVMCI_JVMCI_COMPILER_HPP
+#endif // SHARE_JVMCI_JVMCICOMPILER_HPP
--- a/src/hotspot/share/jvmci/jvmciCompilerToVM.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jvmci/jvmciCompilerToVM.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  */
 
-#ifndef SHARE_VM_JVMCI_JVMCI_COMPILER_TO_VM_HPP
-#define SHARE_VM_JVMCI_JVMCI_COMPILER_TO_VM_HPP
+#ifndef SHARE_JVMCI_JVMCICOMPILERTOVM_HPP
+#define SHARE_JVMCI_JVMCICOMPILERTOVM_HPP
 
 #include "jni.h"
 #include "runtime/javaCalls.hpp"
@@ -242,4 +242,4 @@
     static void pop_jni_handle_block();
 };
 
-#endif // SHARE_VM_JVMCI_JVMCI_COMPILER_TO_VM_HPP
+#endif // SHARE_JVMCI_JVMCICOMPILERTOVM_HPP
--- a/src/hotspot/share/jvmci/jvmciEnv.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jvmci/jvmciEnv.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JVMCI_JVMCIENV_HPP
-#define SHARE_VM_JVMCI_JVMCIENV_HPP
+#ifndef SHARE_JVMCI_JVMCIENV_HPP
+#define SHARE_JVMCI_JVMCIENV_HPP
 
 #include "classfile/systemDictionary.hpp"
 #include "code/debugInfoRec.hpp"
@@ -181,4 +181,4 @@
   static InstanceKlass* get_instance_klass_for_declared_method_holder(Klass* klass);
 };
 
-#endif // SHARE_VM_JVMCI_JVMCIENV_HPP
+#endif // SHARE_JVMCI_JVMCIENV_HPP
--- a/src/hotspot/share/jvmci/jvmciJavaClasses.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jvmci/jvmciJavaClasses.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  */
 
-#ifndef SHARE_VM_JVMCI_JVMCIJAVACLASSES_HPP
-#define SHARE_VM_JVMCI_JVMCIJAVACLASSES_HPP
+#ifndef SHARE_JVMCI_JVMCIJAVACLASSES_HPP
+#define SHARE_JVMCI_JVMCIJAVACLASSES_HPP
 
 #include "classfile/systemDictionary.hpp"
 #include "oops/access.hpp"
@@ -381,4 +381,4 @@
 
 void compute_offset(int &dest_offset, Klass* klass, const char* name, const char* signature, bool static_field, TRAPS);
 
-#endif // SHARE_VM_JVMCI_JVMCIJAVACLASSES_HPP
+#endif // SHARE_JVMCI_JVMCIJAVACLASSES_HPP
--- a/src/hotspot/share/jvmci/jvmciRuntime.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jvmci/jvmciRuntime.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  */
 
-#ifndef SHARE_VM_JVMCI_JVMCI_RUNTIME_HPP
-#define SHARE_VM_JVMCI_JVMCI_RUNTIME_HPP
+#ifndef SHARE_JVMCI_JVMCIRUNTIME_HPP
+#define SHARE_JVMCI_JVMCIRUNTIME_HPP
 
 #include "interpreter/interpreter.hpp"
 #include "memory/allocation.hpp"
@@ -200,4 +200,4 @@
 #define TRACE_jvmci_4 if (!(JVMCITraceLevel >= 4 && (tty->print("         JVMCITrace-4: "), true))) ; else tty->print_cr
 #define TRACE_jvmci_5 if (!(JVMCITraceLevel >= 5 && (tty->print("            JVMCITrace-5: "), true))) ; else tty->print_cr
 
-#endif // SHARE_VM_JVMCI_JVMCI_RUNTIME_HPP
+#endif // SHARE_JVMCI_JVMCIRUNTIME_HPP
--- a/src/hotspot/share/jvmci/jvmci_globals.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jvmci/jvmci_globals.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JVMCI_JVMCIGLOBALS_HPP
-#define SHARE_VM_JVMCI_JVMCIGLOBALS_HPP
+#ifndef SHARE_JVMCI_JVMCI_GLOBALS_HPP
+#define SHARE_JVMCI_JVMCI_GLOBALS_HPP
 
 #include "runtime/globals.hpp"
 
@@ -140,4 +140,4 @@
   // Check and exit VM with error if selected GC is not supported by JVMCI.
   static void check_jvmci_supported_gc();
 };
-#endif // SHARE_VM_JVMCI_JVMCIGLOBALS_HPP
+#endif // SHARE_JVMCI_JVMCI_GLOBALS_HPP
--- a/src/hotspot/share/jvmci/systemDictionary_jvmci.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jvmci/systemDictionary_jvmci.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  */
 
-#ifndef SHARE_VM_JVMCI_SYSTEMDICTIONARY_JVMCI_HPP
-#define SHARE_VM_JVMCI_SYSTEMDICTIONARY_JVMCI_HPP
+#ifndef SHARE_JVMCI_SYSTEMDICTIONARY_JVMCI_HPP
+#define SHARE_JVMCI_SYSTEMDICTIONARY_JVMCI_HPP
 
 #if !INCLUDE_JVMCI
 #define JVMCI_WK_KLASSES_DO(do_klass)
@@ -91,4 +91,4 @@
   do_klass(Value_klass,                                  jdk_vm_ci_meta_Value                             )
 #endif
 
-#endif // SHARE_VM_JVMCI_SYSTEMDICTIONARY_JVMCI_HPP
+#endif // SHARE_JVMCI_SYSTEMDICTIONARY_JVMCI_HPP
--- a/src/hotspot/share/jvmci/vmStructs_compiler_runtime.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jvmci/vmStructs_compiler_runtime.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  */
 
-#ifndef SHARE_VM_JVMCI_VMSTRUCTS_COMPILER_RUNTIME_HPP
-#define SHARE_VM_JVMCI_VMSTRUCTS_COMPILER_RUNTIME_HPP
+#ifndef SHARE_JVMCI_VMSTRUCTS_COMPILER_RUNTIME_HPP
+#define SHARE_JVMCI_VMSTRUCTS_COMPILER_RUNTIME_HPP
 
 #if INCLUDE_AOT
 #include "jvmci/compilerRuntime.hpp"
@@ -42,4 +42,4 @@
 
 #endif // INCLUDE_AOT
 
-#endif // SHARE_VM_AOT_VMSTRUCTS_COMPILER_RUNTIME_HPP
+#endif // SHARE_JVMCI_VMSTRUCTS_COMPILER_RUNTIME_HPP
--- a/src/hotspot/share/jvmci/vmStructs_jvmci.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jvmci/vmStructs_jvmci.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_JVMCI_VMSTRUCTS_JVMCI_HPP
-#define SHARE_VM_JVMCI_VMSTRUCTS_JVMCI_HPP
+#ifndef SHARE_JVMCI_VMSTRUCTS_JVMCI_HPP
+#define SHARE_JVMCI_VMSTRUCTS_JVMCI_HPP
 
 #include "runtime/vmStructs.hpp"
 
@@ -63,4 +63,4 @@
   static int localHotSpotVMAddresses_count();
 };
 
-#endif // SHARE_VM_JVMCI_VMSTRUCTS_JVMCI_HPP
+#endif // SHARE_JVMCI_VMSTRUCTS_JVMCI_HPP
--- a/src/hotspot/share/jvmci/vmSymbols_jvmci.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/jvmci/vmSymbols_jvmci.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  */
 
-#ifndef SHARE_VM_JVMCI_VMSYMBOLS_JVMCI_HPP
-#define SHARE_VM_JVMCI_VMSYMBOLS_JVMCI_HPP
+#ifndef SHARE_JVMCI_VMSYMBOLS_JVMCI_HPP
+#define SHARE_JVMCI_VMSYMBOLS_JVMCI_HPP
 
 
 #if !INCLUDE_JVMCI
@@ -104,4 +104,4 @@
   template(klass_fromMetaspace_signature,                         "(Ljava/lang/Class;)Ljdk/vm/ci/hotspot/HotSpotResolvedObjectTypeImpl;")
 #endif
 
-#endif // SHARE_VM_JVMCI_VMSYMBOLS_JVMCI_HPP
+#endif // SHARE_JVMCI_VMSYMBOLS_JVMCI_HPP
--- a/src/hotspot/share/libadt/dict.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/libadt/dict.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_LIBADT_DICT_HPP
-#define SHARE_VM_LIBADT_DICT_HPP
+#ifndef SHARE_LIBADT_DICT_HPP
+#define SHARE_LIBADT_DICT_HPP
 
 // Dictionaries - An Abstract Data Type
 
@@ -118,4 +118,4 @@
   int test(void) { return _i<_d->_size;} // Test for end of iteration
 };
 
-#endif // SHARE_VM_LIBADT_DICT_HPP
+#endif // SHARE_LIBADT_DICT_HPP
--- a/src/hotspot/share/libadt/set.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/libadt/set.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_LIBADT_SET_HPP
-#define SHARE_VM_LIBADT_SET_HPP
+#ifndef SHARE_LIBADT_SET_HPP
+#define SHARE_LIBADT_SET_HPP
 
 #include "memory/allocation.hpp"
 
@@ -244,4 +244,4 @@
   int test(void) { return impl->test(); }
 };
 
-#endif // SHARE_VM_LIBADT_SET_HPP
+#endif // SHARE_LIBADT_SET_HPP
--- a/src/hotspot/share/libadt/vectset.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/libadt/vectset.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_LIBADT_VECTSET_HPP
-#define SHARE_VM_LIBADT_VECTSET_HPP
+#ifndef SHARE_LIBADT_VECTSET_HPP
+#define SHARE_LIBADT_VECTSET_HPP
 
 #include "libadt/set.hpp"
 
@@ -184,4 +184,4 @@
   int test(void) { return i < s->size; }
 };
 
-#endif // SHARE_VM_LIBADT_VECTSET_HPP
+#endif // SHARE_LIBADT_VECTSET_HPP
--- a/src/hotspot/share/logging/log.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/logging/log.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  *
  */
-#ifndef SHARE_VM_LOGGING_LOG_HPP
-#define SHARE_VM_LOGGING_LOG_HPP
+#ifndef SHARE_LOGGING_LOG_HPP
+#define SHARE_LOGGING_LOG_HPP
 
 #include "logging/logLevel.hpp"
 #include "logging/logPrefix.hpp"
@@ -198,4 +198,4 @@
 
 };
 
-#endif // SHARE_VM_LOGGING_LOG_HPP
+#endif // SHARE_LOGGING_LOG_HPP
--- a/src/hotspot/share/logging/logConfiguration.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/logging/logConfiguration.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  *
  */
-#ifndef SHARE_VM_LOGGING_LOGCONFIGURATION_HPP
-#define SHARE_VM_LOGGING_LOGCONFIGURATION_HPP
+#ifndef SHARE_LOGGING_LOGCONFIGURATION_HPP
+#define SHARE_LOGGING_LOGCONFIGURATION_HPP
 
 #include "logging/logLevel.hpp"
 #include "memory/allocation.hpp"
@@ -125,4 +125,4 @@
   static void rotate_all_outputs();
 };
 
-#endif // SHARE_VM_LOGGING_LOGCONFIGURATION_HPP
+#endif // SHARE_LOGGING_LOGCONFIGURATION_HPP
--- a/src/hotspot/share/logging/logDecorations.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/logging/logDecorations.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  *
  */
-#ifndef SHARE_VM_LOGGING_LOGDECORATIONS_HPP
-#define SHARE_VM_LOGGING_LOGDECORATIONS_HPP
+#ifndef SHARE_LOGGING_LOGDECORATIONS_HPP
+#define SHARE_LOGGING_LOGDECORATIONS_HPP
 
 #include "logging/logDecorators.hpp"
 #include "logging/logTagSet.hpp"
@@ -64,4 +64,4 @@
   }
 };
 
-#endif // SHARE_VM_LOGGING_LOGDECORATIONS_HPP
+#endif // SHARE_LOGGING_LOGDECORATIONS_HPP
--- a/src/hotspot/share/logging/logDecorators.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/logging/logDecorators.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  * questions.
  *
  */
-#ifndef SHARE_VM_LOGGING_LOGDECORATORS_HPP
-#define SHARE_VM_LOGGING_LOGDECORATORS_HPP
+#ifndef SHARE_LOGGING_LOGDECORATORS_HPP
+#define SHARE_LOGGING_LOGDECORATORS_HPP
 
 #include "utilities/globalDefinitions.hpp"
 
@@ -115,4 +115,4 @@
   bool parse(const char* decorator_args, outputStream* errstream = NULL);
 };
 
-#endif // SHARE_VM_LOGGING_LOGDECORATORS_HPP
+#endif // SHARE_LOGGING_LOGDECORATORS_HPP
--- a/src/hotspot/share/logging/logDiagnosticCommand.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/logging/logDiagnosticCommand.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  *
  */
-#ifndef SHARE_VM_LOGGING_LOGDIAGNOSTICCOMMAND_HPP
-#define SHARE_VM_LOGGING_LOGDIAGNOSTICCOMMAND_HPP
+#ifndef SHARE_LOGGING_LOGDIAGNOSTICCOMMAND_HPP
+#define SHARE_LOGGING_LOGDIAGNOSTICCOMMAND_HPP
 
 #include "services/diagnosticCommand.hpp"
 
@@ -66,4 +66,4 @@
   }
 };
 
-#endif // SHARE_VM_LOGGING_LOGDIAGNOSTICCOMMAND_HPP
+#endif // SHARE_LOGGING_LOGDIAGNOSTICCOMMAND_HPP
--- a/src/hotspot/share/logging/logFileOutput.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/logging/logFileOutput.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  *
  */
-#ifndef SHARE_VM_LOGGING_LOGFILEOUTPUT_HPP
-#define SHARE_VM_LOGGING_LOGFILEOUTPUT_HPP
+#ifndef SHARE_LOGGING_LOGFILEOUTPUT_HPP
+#define SHARE_LOGGING_LOGFILEOUTPUT_HPP
 
 #include "logging/logFileStreamOutput.hpp"
 #include "runtime/semaphore.hpp"
@@ -95,4 +95,4 @@
   static void set_file_name_parameters(jlong start_time);
 };
 
-#endif // SHARE_VM_LOGGING_LOGFILEOUTPUT_HPP
+#endif // SHARE_LOGGING_LOGFILEOUTPUT_HPP
--- a/src/hotspot/share/logging/logFileStreamOutput.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/logging/logFileStreamOutput.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  *
  */
-#ifndef SHARE_VM_LOGGING_LOGFILESTREAMOUTPUT_HPP
-#define SHARE_VM_LOGGING_LOGFILESTREAMOUTPUT_HPP
+#ifndef SHARE_LOGGING_LOGFILESTREAMOUTPUT_HPP
+#define SHARE_LOGGING_LOGFILESTREAMOUTPUT_HPP
 
 #include "logging/logDecorators.hpp"
 #include "logging/logOutput.hpp"
@@ -90,4 +90,4 @@
 extern LogStderrOutput &StderrLog;
 extern LogStdoutOutput &StdoutLog;
 
-#endif // SHARE_VM_LOGGING_LOGFILESTREAMOUTPUT_HPP
+#endif // SHARE_LOGGING_LOGFILESTREAMOUTPUT_HPP
--- a/src/hotspot/share/logging/logHandle.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/logging/logHandle.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  *
  */
-#ifndef SHARE_VM_LOGGING_LOGHANDLE_HPP
-#define SHARE_VM_LOGGING_LOGHANDLE_HPP
+#ifndef SHARE_LOGGING_LOGHANDLE_HPP
+#define SHARE_LOGGING_LOGHANDLE_HPP
 
 #include "logging/log.hpp"
 
@@ -101,4 +101,4 @@
 
 };
 
-#endif // SHARE_VM_LOGGING_LOGHANDLE_HPP
+#endif // SHARE_LOGGING_LOGHANDLE_HPP
--- a/src/hotspot/share/logging/logLevel.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/logging/logLevel.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  *
  */
-#ifndef SHARE_VM_LOGGING_LOGLEVEL_HPP
-#define SHARE_VM_LOGGING_LOGLEVEL_HPP
+#ifndef SHARE_LOGGING_LOGLEVEL_HPP
+#define SHARE_LOGGING_LOGLEVEL_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/macros.hpp"
@@ -79,4 +79,4 @@
 
 typedef LogLevel::type LogLevelType;
 
-#endif // SHARE_VM_LOGGING_LOGLEVEL_HPP
+#endif // SHARE_LOGGING_LOGLEVEL_HPP
--- a/src/hotspot/share/logging/logMessage.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/logging/logMessage.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  *
  */
-#ifndef SHARE_VM_LOGGING_LOGMESSAGE_HPP
-#define SHARE_VM_LOGGING_LOGMESSAGE_HPP
+#ifndef SHARE_LOGGING_LOGMESSAGE_HPP
+#define SHARE_LOGGING_LOGMESSAGE_HPP
 
 #include "logging/log.hpp"
 #include "logging/logMessageBuffer.hpp"
@@ -102,4 +102,4 @@
 #undef LOG_LEVEL
 };
 
-#endif // SHARE_VM_LOGGING_LOGMESSAGE_HPP
+#endif // SHARE_LOGGING_LOGMESSAGE_HPP
--- a/src/hotspot/share/logging/logMessageBuffer.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/logging/logMessageBuffer.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  *
  */
-#ifndef SHARE_VM_LOGGING_LOGMESSAGEBUFFER_HPP
-#define SHARE_VM_LOGGING_LOGMESSAGEBUFFER_HPP
+#ifndef SHARE_LOGGING_LOGMESSAGEBUFFER_HPP
+#define SHARE_LOGGING_LOGMESSAGEBUFFER_HPP
 
 #include "logging/logDecorations.hpp"
 #include "logging/logLevel.hpp"
@@ -128,4 +128,4 @@
 #undef LOG_LEVEL
 };
 
-#endif // SHARE_VM_LOGGING_LOGMESSAGEBUFFER_HPP
+#endif // SHARE_LOGGING_LOGMESSAGEBUFFER_HPP
--- a/src/hotspot/share/logging/logOutput.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/logging/logOutput.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  *
  */
-#ifndef SHARE_VM_LOGGING_LOGOUTPUT_HPP
-#define SHARE_VM_LOGGING_LOGOUTPUT_HPP
+#ifndef SHARE_LOGGING_LOGOUTPUT_HPP
+#define SHARE_LOGGING_LOGOUTPUT_HPP
 
 #include "logging/logDecorators.hpp"
 #include "logging/logLevel.hpp"
@@ -101,4 +101,4 @@
   virtual int write(LogMessageBuffer::Iterator msg_iterator) = 0;
 };
 
-#endif // SHARE_VM_LOGGING_LOGOUTPUT_HPP
+#endif // SHARE_LOGGING_LOGOUTPUT_HPP
--- a/src/hotspot/share/logging/logOutputList.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/logging/logOutputList.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  *
  */
-#ifndef SHARE_VM_LOGGING_LOGOUTPUTLIST_HPP
-#define SHARE_VM_LOGGING_LOGOUTPUTLIST_HPP
+#ifndef SHARE_LOGGING_LOGOUTPUTLIST_HPP
+#define SHARE_LOGGING_LOGOUTPUTLIST_HPP
 
 #include "logging/logLevel.hpp"
 #include "memory/allocation.hpp"
@@ -128,4 +128,4 @@
   }
 };
 
-#endif // SHARE_VM_LOGGING_LOGOUTPUTLIST_HPP
+#endif // SHARE_LOGGING_LOGOUTPUTLIST_HPP
--- a/src/hotspot/share/logging/logPrefix.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/logging/logPrefix.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  *
  */
-#ifndef SHARE_VM_LOGGING_LOGPREFIX_HPP
-#define SHARE_VM_LOGGING_LOGPREFIX_HPP
+#ifndef SHARE_LOGGING_LOGPREFIX_HPP
+#define SHARE_LOGGING_LOGPREFIX_HPP
 
 #include "gc/shared/gcId.hpp"
 #include "logging/logTag.hpp"
@@ -117,4 +117,4 @@
 LOG_PREFIX_LIST
 #undef LOG_PREFIX
 
-#endif // SHARE_VM_LOGGING_LOGPREFIX_HPP
+#endif // SHARE_LOGGING_LOGPREFIX_HPP
--- a/src/hotspot/share/logging/logSelection.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/logging/logSelection.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  *
  */
-#ifndef SHARE_VM_LOGGING_LOGSELECTION_HPP
-#define SHARE_VM_LOGGING_LOGSELECTION_HPP
+#ifndef SHARE_LOGGING_LOGSELECTION_HPP
+#define SHARE_LOGGING_LOGSELECTION_HPP
 
 #include "logging/logLevel.hpp"
 #include "logging/logTag.hpp"
@@ -71,4 +71,4 @@
   double similarity(const LogSelection& other) const;
 };
 
-#endif // SHARE_VM_LOGGING_LOGSELECTION_HPP
+#endif // SHARE_LOGGING_LOGSELECTION_HPP
--- a/src/hotspot/share/logging/logSelectionList.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/logging/logSelectionList.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -21,8 +21,8 @@
  * questions.
  *
  */
-#ifndef SHARE_VM_LOGGING_LOGSELECTIONLIST_HPP
-#define SHARE_VM_LOGGING_LOGSELECTIONLIST_HPP
+#ifndef SHARE_LOGGING_LOGSELECTIONLIST_HPP
+#define SHARE_LOGGING_LOGSELECTIONLIST_HPP
 
 #include "logging/logConfiguration.hpp"
 #include "logging/logSelection.hpp"
@@ -62,4 +62,4 @@
   bool verify_selections(outputStream* out = NULL) const;
 };
 
-#endif // SHARE_VM_LOGGING_LOGSELECTIONLIST_HPP
+#endif // SHARE_LOGGING_LOGSELECTIONLIST_HPP
--- a/src/hotspot/share/logging/logStream.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/logging/logStream.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_LOGGING_LOGSTREAM_HPP
-#define SHARE_VM_LOGGING_LOGSTREAM_HPP
+#ifndef SHARE_LOGGING_LOGSTREAM_HPP
+#define SHARE_LOGGING_LOGSTREAM_HPP
 
 #include "logging/log.hpp"
 #include "logging/logHandle.hpp"
@@ -105,4 +105,4 @@
   LogStreamTemplate() : LogStream((LogTargetImpl<level, T0, T1, T2, T3, T4, GuardTag>*)NULL) {}
 };
 
-#endif // SHARE_VM_LOGGING_LOGSTREAM_HPP
+#endif // SHARE_LOGGING_LOGSTREAM_HPP
--- a/src/hotspot/share/logging/logTag.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/logging/logTag.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  *
  */
-#ifndef SHARE_VM_LOGGING_LOGTAG_HPP
-#define SHARE_VM_LOGGING_LOGTAG_HPP
+#ifndef SHARE_LOGGING_LOGTAG_HPP
+#define SHARE_LOGGING_LOGTAG_HPP
 
 #include "logging/logTag_ext.hpp"
 #include "memory/allocation.hpp"
@@ -220,4 +220,4 @@
 
 typedef LogTag::type LogTagType;
 
-#endif // SHARE_VM_LOGGING_LOGTAG_HPP
+#endif // SHARE_LOGGING_LOGTAG_HPP
--- a/src/hotspot/share/logging/logTagSet.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/logging/logTagSet.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  *
  */
-#ifndef SHARE_VM_LOGGING_LOGTAGSET_HPP
-#define SHARE_VM_LOGGING_LOGTAGSET_HPP
+#ifndef SHARE_LOGGING_LOGTAGSET_HPP
+#define SHARE_LOGGING_LOGTAGSET_HPP
 
 #include "logging/logDecorators.hpp"
 #include "logging/logLevel.hpp"
@@ -156,4 +156,4 @@
 template <LogTagType T0, LogTagType T1, LogTagType T2, LogTagType T3, LogTagType T4, LogTagType GuardTag>
 LogTagSet LogTagSetMapping<T0, T1, T2, T3, T4, GuardTag>::_tagset(&LogPrefix<T0, T1, T2, T3, T4>::prefix, T0, T1, T2, T3, T4);
 
-#endif // SHARE_VM_LOGGING_LOGTAGSET_HPP
+#endif // SHARE_LOGGING_LOGTAGSET_HPP
--- a/src/hotspot/share/logging/logTagSetDescriptions.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/logging/logTagSetDescriptions.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  *
  */
-#ifndef SHARE_VM_LOGGING_LOGTAGSETDESCRIPTIONS_HPP
-#define SHARE_VM_LOGGING_LOGTAGSETDESCRIPTIONS_HPP
+#ifndef SHARE_LOGGING_LOGTAGSETDESCRIPTIONS_HPP
+#define SHARE_LOGGING_LOGTAGSETDESCRIPTIONS_HPP
 
 class LogTagSet;
 
@@ -33,4 +33,4 @@
 
 extern struct LogTagSetDescription tagset_descriptions[];
 
-#endif // SHARE_VM_LOGGING_LOGTAGSETDESCRIPTIONS_HPP
+#endif // SHARE_LOGGING_LOGTAGSETDESCRIPTIONS_HPP
--- a/src/hotspot/share/logging/logTag_ext.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/logging/logTag_ext.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,9 +21,9 @@
  * questions.
  *
  */
-#ifndef SHARE_VM_LOGGING_LOGTAG_EXT_HPP
-#define SHARE_VM_LOGGING_LOGTAG_EXT_HPP
+#ifndef SHARE_LOGGING_LOGTAG_EXT_HPP
+#define SHARE_LOGGING_LOGTAG_EXT_HPP
 
 #define LOG_TAG_LIST_EXT
 
-#endif // SHARE_VM_LOGGING_LOGTAG_EXT_HPP
+#endif // SHARE_LOGGING_LOGTAG_EXT_HPP
--- a/src/hotspot/share/memory/allocation.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/allocation.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_MEMORY_ALLOCATION_HPP
-#define SHARE_VM_MEMORY_ALLOCATION_HPP
+#ifndef SHARE_MEMORY_ALLOCATION_HPP
+#define SHARE_MEMORY_ALLOCATION_HPP
 
 #include "runtime/globals.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -570,4 +570,4 @@
   static void free(E* addr);
 };
 
-#endif // SHARE_VM_MEMORY_ALLOCATION_HPP
+#endif // SHARE_MEMORY_ALLOCATION_HPP
--- a/src/hotspot/share/memory/allocation.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/allocation.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_MEMORY_ALLOCATION_INLINE_HPP
-#define SHARE_VM_MEMORY_ALLOCATION_INLINE_HPP
+#ifndef SHARE_MEMORY_ALLOCATION_INLINE_HPP
+#define SHARE_MEMORY_ALLOCATION_INLINE_HPP
 
 #include "runtime/atomic.hpp"
 #include "runtime/os.hpp"
@@ -171,4 +171,4 @@
   }
 }
 
-#endif // SHARE_VM_MEMORY_ALLOCATION_INLINE_HPP
+#endif // SHARE_MEMORY_ALLOCATION_INLINE_HPP
--- a/src/hotspot/share/memory/arena.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/arena.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_ARENA_HPP
-#define SHARE_VM_ARENA_HPP
+#ifndef SHARE_MEMORY_ARENA_HPP
+#define SHARE_MEMORY_ARENA_HPP
 
 #include "memory/allocation.hpp"
 #include "runtime/globals.hpp"
@@ -256,4 +256,4 @@
 #define NEW_ARENA_OBJ(arena, type) \
   NEW_ARENA_ARRAY(arena, type, 1)
 
-#endif // SHARE_VM_ARENA_HPP
+#endif // SHARE_MEMORY_ARENA_HPP
--- a/src/hotspot/share/memory/binaryTreeDictionary.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/binaryTreeDictionary.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_MEMORY_BINARYTREEDICTIONARY_HPP
-#define SHARE_VM_MEMORY_BINARYTREEDICTIONARY_HPP
+#ifndef SHARE_MEMORY_BINARYTREEDICTIONARY_HPP
+#define SHARE_MEMORY_BINARYTREEDICTIONARY_HPP
 
 #include "memory/freeList.hpp"
 #include "memory/memRegion.hpp"
@@ -392,4 +392,4 @@
   }
 };
 
-#endif // SHARE_VM_MEMORY_BINARYTREEDICTIONARY_HPP
+#endif // SHARE_MEMORY_BINARYTREEDICTIONARY_HPP
--- a/src/hotspot/share/memory/binaryTreeDictionary.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/binaryTreeDictionary.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_MEMORY_BINARYTREEDICTIONARY_INLINE_HPP
-#define SHARE_VM_MEMORY_BINARYTREEDICTIONARY_INLINE_HPP
+#ifndef SHARE_MEMORY_BINARYTREEDICTIONARY_INLINE_HPP
+#define SHARE_MEMORY_BINARYTREEDICTIONARY_INLINE_HPP
 
 #include "gc/shared/spaceDecorator.hpp"
 #include "logging/log.hpp"
@@ -1035,4 +1035,4 @@
   return total_size();
 }
 
-#endif // SHARE_VM_MEMORY_BINARYTREEDICTIONARY_INLINE_HPP
+#endif // SHARE_MEMORY_BINARYTREEDICTIONARY_INLINE_HPP
--- a/src/hotspot/share/memory/filemap.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/filemap.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_MEMORY_FILEMAP_HPP
-#define SHARE_VM_MEMORY_FILEMAP_HPP
+#ifndef SHARE_MEMORY_FILEMAP_HPP
+#define SHARE_MEMORY_FILEMAP_HPP
 
 #include "classfile/classLoader.hpp"
 #include "include/cds.h"
@@ -350,4 +350,4 @@
   address decode_start_address(CDSFileMapRegion* spc, bool with_current_oop_encoding_mode);
 };
 
-#endif // SHARE_VM_MEMORY_FILEMAP_HPP
+#endif // SHARE_MEMORY_FILEMAP_HPP
--- a/src/hotspot/share/memory/freeList.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/freeList.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_MEMORY_FREELIST_HPP
-#define SHARE_VM_MEMORY_FREELIST_HPP
+#ifndef SHARE_MEMORY_FREELIST_HPP
+#define SHARE_MEMORY_FREELIST_HPP
 
 // A class for maintaining a free list of Chunk's.  The FreeList
 // maintains a the structure of the list (head, tail, etc.) plus
@@ -173,4 +173,4 @@
   void print_on(outputStream* st, const char* c = NULL) const;
 };
 
-#endif // SHARE_VM_MEMORY_FREELIST_HPP
+#endif // SHARE_MEMORY_FREELIST_HPP
--- a/src/hotspot/share/memory/guardedMemory.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/guardedMemory.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_MEMORY_GUARDEDMEMORY_HPP
-#define SHARE_VM_MEMORY_GUARDEDMEMORY_HPP
+#ifndef SHARE_MEMORY_GUARDEDMEMORY_HPP
+#define SHARE_MEMORY_GUARDEDMEMORY_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -320,4 +320,4 @@
 
 }; // GuardedMemory
 
-#endif // SHARE_VM_MEMORY_GUARDEDMEMORY_HPP
+#endif // SHARE_MEMORY_GUARDEDMEMORY_HPP
--- a/src/hotspot/share/memory/heap.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/heap.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_MEMORY_HEAP_HPP
-#define SHARE_VM_MEMORY_HEAP_HPP
+#ifndef SHARE_MEMORY_HEAP_HPP
+#define SHARE_MEMORY_HEAP_HPP
 
 #include "code/codeBlob.hpp"
 #include "memory/allocation.hpp"
@@ -223,4 +223,4 @@
   void print()  PRODUCT_RETURN;
 };
 
-#endif // SHARE_VM_MEMORY_HEAP_HPP
+#endif // SHARE_MEMORY_HEAP_HPP
--- a/src/hotspot/share/memory/heapInspection.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/heapInspection.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_MEMORY_HEAPINSPECTION_HPP
-#define SHARE_VM_MEMORY_HEAPINSPECTION_HPP
+#ifndef SHARE_MEMORY_HEAPINSPECTION_HPP
+#define SHARE_MEMORY_HEAPINSPECTION_HPP
 
 #include "memory/allocation.hpp"
 #include "oops/objArrayOop.hpp"
@@ -365,4 +365,4 @@
   void iterate_over_heap(KlassInfoTable* cit, BoolObjectClosure* filter = NULL);
 };
 
-#endif // SHARE_VM_MEMORY_HEAPINSPECTION_HPP
+#endif // SHARE_MEMORY_HEAPINSPECTION_HPP
--- a/src/hotspot/share/memory/heapShared.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/heapShared.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_MEMORY_HEAPSHARED_HPP
-#define SHARE_VM_MEMORY_HEAPSHARED_HPP
+#ifndef SHARE_MEMORY_HEAPSHARED_HPP
+#define SHARE_MEMORY_HEAPSHARED_HPP
 
 #include "classfile/compactHashtable.hpp"
 #include "classfile/systemDictionary.hpp"
@@ -342,4 +342,4 @@
   static void write_subgraph_info_table() NOT_CDS_JAVA_HEAP_RETURN;
   static void serialize_subgraph_info_table_header(SerializeClosure* soc) NOT_CDS_JAVA_HEAP_RETURN;
 };
-#endif // SHARE_VM_MEMORY_HEAPSHARED_HPP
+#endif // SHARE_MEMORY_HEAPSHARED_HPP
--- a/src/hotspot/share/memory/heapShared.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/heapShared.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_MEMORY_HEAPSHARED_INLINE_HPP
-#define SHARE_VM_MEMORY_HEAPSHARED_INLINE_HPP
+#ifndef SHARE_MEMORY_HEAPSHARED_INLINE_HPP
+#define SHARE_MEMORY_HEAPSHARED_INLINE_HPP
 
 #include "oops/compressedOops.inline.hpp"
 #include "memory/heapShared.hpp"
@@ -46,4 +46,4 @@
 
 #endif
 
-#endif // SHARE_VM_MEMORY_HEAPSHARED_INLINE_HPP
+#endif // SHARE_MEMORY_HEAPSHARED_INLINE_HPP
--- a/src/hotspot/share/memory/iterator.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/iterator.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_MEMORY_ITERATOR_HPP
-#define SHARE_VM_MEMORY_ITERATOR_HPP
+#ifndef SHARE_MEMORY_ITERATOR_HPP
+#define SHARE_MEMORY_ITERATOR_HPP
 
 #include "memory/allocation.hpp"
 #include "memory/memRegion.hpp"
@@ -362,4 +362,4 @@
   template <typename OopClosureType> static void oop_oop_iterate_backwards(OopClosureType* cl, oop obj, Klass* klass);
 };
 
-#endif // SHARE_VM_MEMORY_ITERATOR_HPP
+#endif // SHARE_MEMORY_ITERATOR_HPP
--- a/src/hotspot/share/memory/iterator.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/iterator.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_MEMORY_ITERATOR_INLINE_HPP
-#define SHARE_VM_MEMORY_ITERATOR_INLINE_HPP
+#ifndef SHARE_MEMORY_ITERATOR_INLINE_HPP
+#define SHARE_MEMORY_ITERATOR_INLINE_HPP
 
 #include "classfile/classLoaderData.hpp"
 #include "memory/iterator.hpp"
@@ -420,4 +420,4 @@
   OopOopIterateBackwardsDispatch<OopClosureType>::function(klass)(cl, obj, klass);
 }
 
-#endif // SHARE_VM_MEMORY_ITERATOR_INLINE_HPP
+#endif // SHARE_MEMORY_ITERATOR_INLINE_HPP
--- a/src/hotspot/share/memory/memRegion.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/memRegion.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_MEMORY_MEMREGION_HPP
-#define SHARE_VM_MEMORY_MEMREGION_HPP
+#ifndef SHARE_MEMORY_MEMREGION_HPP
+#define SHARE_MEMORY_MEMREGION_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/debug.hpp"
@@ -124,4 +124,4 @@
   void  operator delete(void* p) {} // nothing to do
 };
 
-#endif // SHARE_VM_MEMORY_MEMREGION_HPP
+#endif // SHARE_MEMORY_MEMREGION_HPP
--- a/src/hotspot/share/memory/metadataFactory.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/metadataFactory.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_MEMORY_METADATAFACTORY_HPP
-#define SHARE_VM_MEMORY_METADATAFACTORY_HPP
+#ifndef SHARE_MEMORY_METADATAFACTORY_HPP
+#define SHARE_MEMORY_METADATAFACTORY_HPP
 
 #include "classfile/classLoaderData.hpp"
 #include "oops/array.hpp"
@@ -73,4 +73,4 @@
   }
 };
 
-#endif // SHARE_VM_MEMORY_METADATAFACTORY_HPP
+#endif // SHARE_MEMORY_METADATAFACTORY_HPP
--- a/src/hotspot/share/memory/metaspace.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/metaspace.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  *
  */
-#ifndef SHARE_VM_MEMORY_METASPACE_HPP
-#define SHARE_VM_MEMORY_METASPACE_HPP
+#ifndef SHARE_MEMORY_METASPACE_HPP
+#define SHARE_MEMORY_METASPACE_HPP
 
 #include "memory/allocation.hpp"
 #include "memory/memRegion.hpp"
@@ -484,4 +484,4 @@
   static void compute_new_size();
 };
 
-#endif // SHARE_VM_MEMORY_METASPACE_HPP
+#endif // SHARE_MEMORY_METASPACE_HPP
--- a/src/hotspot/share/memory/metaspace/blockFreelist.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/metaspace/blockFreelist.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -89,5 +89,4 @@
 
 } // namespace metaspace
 
-#endif /* SHARE_MEMORY_METASPACE_BLOCKFREELIST_HPP */
-
+#endif // SHARE_MEMORY_METASPACE_BLOCKFREELIST_HPP
--- a/src/hotspot/share/memory/metaspace/chunkManager.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/metaspace/chunkManager.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -220,5 +220,4 @@
 } // namespace metaspace
 
 
-#endif /* SHARE_MEMORY_METASPACE_CHUNKMANAGER_HPP_ */
-
+#endif // SHARE_MEMORY_METASPACE_CHUNKMANAGER_HPP
--- a/src/hotspot/share/memory/metaspace/metaDebug.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/metaspace/metaDebug.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,5 +43,4 @@
 
 } // namespace metaspace
 
-#endif /* SHARE_MEMORY_METASPACE_METADEBUG_HPP */
-
+#endif // SHARE_MEMORY_METASPACE_METADEBUG_HPP
--- a/src/hotspot/share/memory/metaspace/metabase.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/metaspace/metabase.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -78,5 +78,4 @@
 
 } // namespace metaspace
 
-#endif /* SHARE_MEMORY_METASPACE_METABASE_HPP */
-
+#endif // SHARE_MEMORY_METASPACE_METABASE_HPP
--- a/src/hotspot/share/memory/metaspace/metablock.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/metaspace/metablock.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -47,5 +47,4 @@
 
 } // namespace metaspace
 
-#endif /* SHARE_MEMORY_METASPACE_METABLOCK_HPP */
-
+#endif // SHARE_MEMORY_METASPACE_METABLOCK_HPP
--- a/src/hotspot/share/memory/metaspace/metachunk.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/metaspace/metachunk.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  *
  */
-#ifndef SHARE_VM_MEMORY_METACHUNK_HPP
-#define SHARE_VM_MEMORY_METACHUNK_HPP
+#ifndef SHARE_MEMORY_METASPACE_METACHUNK_HPP
+#define SHARE_MEMORY_METASPACE_METACHUNK_HPP
 
 #include "memory/metaspace/metabase.hpp"
 #include "memory/metaspace/metaspaceCommon.hpp"
@@ -170,4 +170,4 @@
 
 } // namespace metaspace
 
-#endif  // SHARE_VM_MEMORY_METACHUNK_HPP
+#endif // SHARE_MEMORY_METASPACE_METACHUNK_HPP
--- a/src/hotspot/share/memory/metaspace/metaspaceCommon.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/metaspace/metaspaceCommon.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -123,5 +123,4 @@
 
 } // namespace metaspace
 
-#endif /* SHARE_MEMORY_METASPACE_METASPACESTATISTICS_HPP */
-
+#endif // SHARE_MEMORY_METASPACE_METASPACECOMMON_HPP
--- a/src/hotspot/share/memory/metaspace/metaspaceDCmd.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/metaspace/metaspaceDCmd.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018, SAP and/or its affiliates.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -63,4 +63,4 @@
 
 } // namespace metaspace
 
-#endif /* SHARE_MEMORY_METASPACE_METASPACESTATISTICS_HPP */
+#endif // SHARE_MEMORY_METASPACE_METASPACEDCMD_HPP
--- a/src/hotspot/share/memory/metaspace/metaspaceStatistics.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/metaspace/metaspaceStatistics.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -184,5 +184,4 @@
 
 } // namespace metaspace
 
-#endif /* SHARE_MEMORY_METASPACE_METASPACESTATISTICS_HPP */
-
+#endif // SHARE_MEMORY_METASPACE_METASPACESTATISTICS_HPP
--- a/src/hotspot/share/memory/metaspace/occupancyMap.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/metaspace/occupancyMap.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -239,5 +239,4 @@
 
 } // namespace metaspace
 
-#endif /* SHARE_MEMORY_METASPACE_OCCUPANCYMAP_HPP */
-
+#endif // SHARE_MEMORY_METASPACE_OCCUPANCYMAP_HPP
--- a/src/hotspot/share/memory/metaspace/printCLDMetaspaceInfoClosure.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/metaspace/printCLDMetaspaceInfoClosure.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,5 +60,4 @@
 
 } // namespace metaspace
 
-#endif /* SHARE_MEMORY_METASPACE_PRINTCLDMETASPACEINFOCLOSURE_HPP */
-
+#endif // SHARE_MEMORY_METASPACE_PRINTCLDMETASPACEINFOCLOSURE_HPP
--- a/src/hotspot/share/memory/metaspace/printMetaspaceInfoKlassClosure.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/metaspace/printMetaspaceInfoKlassClosure.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018, SAP and/or its affiliates.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef SHARE_MEMORY_METASPACE_PRINTMETASPACEINFOKLASSCLOSURE_HPP_
-#define SHARE_MEMORY_METASPACE_PRINTMETASPACEINFOKLASSCLOSURE_HPP_
+#ifndef SHARE_MEMORY_METASPACE_PRINTMETASPACEINFOKLASSCLOSURE_HPP
+#define SHARE_MEMORY_METASPACE_PRINTMETASPACEINFOKLASSCLOSURE_HPP
 
 #include "memory/iterator.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -55,4 +55,4 @@
 
 } // namespace metaspace
 
-#endif /* SHARE_MEMORY_METASPACE_PRINTMETASPACEINFOKLASSCLOSURE_HPP_ */
+#endif // SHARE_MEMORY_METASPACE_PRINTMETASPACEINFOKLASSCLOSURE_HPP
--- a/src/hotspot/share/memory/metaspace/smallBlocks.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/metaspace/smallBlocks.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -85,5 +85,4 @@
 } // namespace metaspace
 
 
-#endif /* SHARE_MEMORY_METASPACE_SMALLBLOCKS_HPP */
-
+#endif // SHARE_MEMORY_METASPACE_SMALLBLOCKS_HPP
--- a/src/hotspot/share/memory/metaspace/spaceManager.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/metaspace/spaceManager.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -230,5 +230,4 @@
 
 } // namespace metaspace
 
-#endif /* SHARE_MEMORY_METASPACE_SPACEMANAGER_HPP */
-
+#endif // SHARE_MEMORY_METASPACE_SPACEMANAGER_HPP
--- a/src/hotspot/share/memory/metaspace/virtualSpaceList.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/metaspace/virtualSpaceList.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -148,5 +148,4 @@
 
 } // namespace metaspace
 
-#endif /* SHARE_MEMORY_METASPACE_VIRTUALSPACELIST_HPP */
-
+#endif // SHARE_MEMORY_METASPACE_VIRTUALSPACELIST_HPP
--- a/src/hotspot/share/memory/metaspace/virtualSpaceNode.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/metaspace/virtualSpaceNode.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -162,4 +162,4 @@
 
 } // namespace metaspace
 
-#endif /* SHARE_MEMORY_METASPACE_VIRTUALSPACENODE_HPP */
+#endif // SHARE_MEMORY_METASPACE_VIRTUALSPACENODE_HPP
--- a/src/hotspot/share/memory/metaspaceChunkFreeListSummary.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/metaspaceChunkFreeListSummary.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_MEMORY_METASPACECHUNKFREELISTSUMMARY_HPP
-#define SHARE_VM_MEMORY_METASPACECHUNKFREELISTSUMMARY_HPP
+#ifndef SHARE_MEMORY_METASPACECHUNKFREELISTSUMMARY_HPP
+#define SHARE_MEMORY_METASPACECHUNKFREELISTSUMMARY_HPP
 
 
 class MetaspaceChunkFreeListSummary {
@@ -100,4 +100,4 @@
   }
 };
 
-#endif // SHARE_VM_MEMORY_METASPACECHUNKFREELISTSUMMARY_HPP
+#endif // SHARE_MEMORY_METASPACECHUNKFREELISTSUMMARY_HPP
--- a/src/hotspot/share/memory/metaspaceClosure.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/metaspaceClosure.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_MEMORY_METASPACE_ITERATOR_HPP
-#define SHARE_VM_MEMORY_METASPACE_ITERATOR_HPP
+#ifndef SHARE_MEMORY_METASPACECLOSURE_HPP
+#define SHARE_MEMORY_METASPACECLOSURE_HPP
 
 #include "logging/log.hpp"
 #include "memory/allocation.hpp"
@@ -273,4 +273,4 @@
   KVHashtable<address, bool, mtInternal> _has_been_visited;
 };
 
-#endif // SHARE_VM_MEMORY_METASPACE_ITERATOR_HPP
+#endif // SHARE_MEMORY_METASPACECLOSURE_HPP
--- a/src/hotspot/share/memory/metaspaceCounters.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/metaspaceCounters.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_MEMORY_METASPACECOUNTERS_HPP
-#define SHARE_VM_MEMORY_METASPACECOUNTERS_HPP
+#ifndef SHARE_MEMORY_METASPACECOUNTERS_HPP
+#define SHARE_MEMORY_METASPACECOUNTERS_HPP
 
 #include "memory/allocation.hpp"
 
@@ -51,4 +51,4 @@
   static void update_performance_counters();
 };
 
-#endif // SHARE_VM_MEMORY_METASPACECOUNTERS_HPP
+#endif // SHARE_MEMORY_METASPACECOUNTERS_HPP
--- a/src/hotspot/share/memory/metaspaceGCThresholdUpdater.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/metaspaceGCThresholdUpdater.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_MEMORY_METASPACEGCTHRESHOLDUPDATER_HPP
-#define SHARE_VM_MEMORY_METASPACEGCTHRESHOLDUPDATER_HPP
+#ifndef SHARE_MEMORY_METASPACEGCTHRESHOLDUPDATER_HPP
+#define SHARE_MEMORY_METASPACEGCTHRESHOLDUPDATER_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/debug.hpp"
@@ -49,4 +49,4 @@
   }
 };
 
-#endif // SHARE_VM_MEMORY_METASPACEGCTHRESHOLDUPDATER_HPP
+#endif // SHARE_MEMORY_METASPACEGCTHRESHOLDUPDATER_HPP
--- a/src/hotspot/share/memory/metaspaceShared.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/metaspaceShared.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_MEMORY_METASPACESHARED_HPP
-#define SHARE_VM_MEMORY_METASPACESHARED_HPP
+#ifndef SHARE_MEMORY_METASPACESHARED_HPP
+#define SHARE_MEMORY_METASPACESHARED_HPP
 
 #include "classfile/compactHashtable.hpp"
 #include "memory/allocation.hpp"
@@ -203,4 +203,4 @@
 private:
   static void read_extra_data(const char* filename, TRAPS) NOT_CDS_RETURN;
 };
-#endif // SHARE_VM_MEMORY_METASPACESHARED_HPP
+#endif // SHARE_MEMORY_METASPACESHARED_HPP
--- a/src/hotspot/share/memory/metaspaceShared.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/metaspaceShared.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_MEMORY_METASPACESHARED_INLINE_HPP
-#define SHARE_VM_MEMORY_METASPACESHARED_INLINE_HPP
+#ifndef SHARE_MEMORY_METASPACESHARED_INLINE_HPP
+#define SHARE_MEMORY_METASPACESHARED_INLINE_HPP
 
 #include "memory/metaspaceShared.hpp"
 #if INCLUDE_G1GC
@@ -36,4 +36,4 @@
 }
 #endif
 
-#endif // SHARE_VM_MEMORY_METASPACESHARED_INLINE_HPP
+#endif // SHARE_MEMORY_METASPACESHARED_INLINE_HPP
--- a/src/hotspot/share/memory/metaspaceTracer.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/metaspaceTracer.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_MEMORY_METASPACETRACER_HPP
-#define SHARE_VM_MEMORY_METASPACETRACER_HPP
+#ifndef SHARE_MEMORY_METASPACETRACER_HPP
+#define SHARE_MEMORY_METASPACETRACER_HPP
 
 #include "memory/allocation.hpp"
 #include "memory/metaspace.hpp"
@@ -52,4 +52,4 @@
 
 };
 
-#endif // SHARE_VM_MEMORY_METASPACETRACER_HPP
+#endif // SHARE_MEMORY_METASPACETRACER_HPP
--- a/src/hotspot/share/memory/oopFactory.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/oopFactory.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_MEMORY_OOPFACTORY_HPP
-#define SHARE_VM_MEMORY_OOPFACTORY_HPP
+#ifndef SHARE_MEMORY_OOPFACTORY_HPP
+#define SHARE_MEMORY_OOPFACTORY_HPP
 
 #include "classfile/symbolTable.hpp"
 #include "classfile/systemDictionary.hpp"
@@ -72,4 +72,4 @@
   static typeArrayHandle new_byteArray_handle(int length, TRAPS);
 };
 
-#endif // SHARE_VM_MEMORY_OOPFACTORY_HPP
+#endif // SHARE_MEMORY_OOPFACTORY_HPP
--- a/src/hotspot/share/memory/padded.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/padded.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_MEMORY_PADDED_HPP
-#define SHARE_VM_MEMORY_PADDED_HPP
+#ifndef SHARE_MEMORY_PADDED_HPP
+#define SHARE_MEMORY_PADDED_HPP
 
 #include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -117,4 +117,4 @@
   static T* create_unfreeable(size_t length);
 };
 
-#endif // SHARE_VM_MEMORY_PADDED_HPP
+#endif // SHARE_MEMORY_PADDED_HPP
--- a/src/hotspot/share/memory/padded.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/padded.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_MEMORY_PADDED_INLINE_HPP
-#define SHARE_VM_MEMORY_PADDED_INLINE_HPP
+#ifndef SHARE_MEMORY_PADDED_INLINE_HPP
+#define SHARE_MEMORY_PADDED_INLINE_HPP
 
 #include "memory/allocation.inline.hpp"
 #include "memory/padded.hpp"
@@ -90,4 +90,4 @@
   return (T*)align_up(chunk, alignment);
 }
 
-#endif // SHARE_VM_MEMORY_PADDED_INLINE_HPP
+#endif // SHARE_MEMORY_PADDED_INLINE_HPP
--- a/src/hotspot/share/memory/referenceType.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/referenceType.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_MEMORY_REFERENCETYPE_HPP
-#define SHARE_VM_MEMORY_REFERENCETYPE_HPP
+#ifndef SHARE_MEMORY_REFERENCETYPE_HPP
+#define SHARE_MEMORY_REFERENCETYPE_HPP
 
 #include "utilities/debug.hpp"
 
@@ -38,4 +38,4 @@
   REF_PHANTOM    // Subclass of java/lang/ref/PhantomReference
 };
 
-#endif // SHARE_VM_MEMORY_REFERENCETYPE_HPP
+#endif // SHARE_MEMORY_REFERENCETYPE_HPP
--- a/src/hotspot/share/memory/resourceArea.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/resourceArea.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_MEMORY_RESOURCEAREA_HPP
-#define SHARE_VM_MEMORY_RESOURCEAREA_HPP
+#ifndef SHARE_MEMORY_RESOURCEAREA_HPP
+#define SHARE_MEMORY_RESOURCEAREA_HPP
 
 #include "memory/allocation.hpp"
 #include "runtime/thread.hpp"
@@ -261,4 +261,4 @@
   size_t size_in_bytes() { return _size_in_bytes; };
 };
 
-#endif // SHARE_VM_MEMORY_RESOURCEAREA_HPP
+#endif // SHARE_MEMORY_RESOURCEAREA_HPP
--- a/src/hotspot/share/memory/resourceArea.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/resourceArea.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_MEMORY_RESOURCEAREA_INLINE_HPP
-#define SHARE_VM_MEMORY_RESOURCEAREA_INLINE_HPP
+#ifndef SHARE_MEMORY_RESOURCEAREA_INLINE_HPP
+#define SHARE_MEMORY_RESOURCEAREA_INLINE_HPP
 
 #include "memory/resourceArea.hpp"
 
@@ -40,4 +40,4 @@
   return (char*)Amalloc(size, alloc_failmode);
 }
 
-#endif // SHARE_VM_MEMORY_RESOURCEAREA_INLINE_HPP
+#endif // SHARE_MEMORY_RESOURCEAREA_INLINE_HPP
--- a/src/hotspot/share/memory/universe.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/universe.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_MEMORY_UNIVERSE_HPP
-#define SHARE_VM_MEMORY_UNIVERSE_HPP
+#ifndef SHARE_MEMORY_UNIVERSE_HPP
+#define SHARE_MEMORY_UNIVERSE_HPP
 
 #include "oops/array.hpp"
 #include "runtime/handles.hpp"
@@ -538,4 +538,4 @@
     oop    get_oop()  { return _oop; }
 };
 
-#endif // SHARE_VM_MEMORY_UNIVERSE_HPP
+#endif // SHARE_MEMORY_UNIVERSE_HPP
--- a/src/hotspot/share/memory/virtualspace.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/memory/virtualspace.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_VIRTUALSPACE_HPP
-#define SHARE_VM_RUNTIME_VIRTUALSPACE_HPP
+#ifndef SHARE_MEMORY_VIRTUALSPACE_HPP
+#define SHARE_MEMORY_VIRTUALSPACE_HPP
 
 #include "utilities/globalDefinitions.hpp"
 
@@ -236,4 +236,4 @@
   void print();
 };
 
-#endif // SHARE_VM_RUNTIME_VIRTUALSPACE_HPP
+#endif // SHARE_MEMORY_VIRTUALSPACE_HPP
--- a/src/hotspot/share/metaprogramming/conditional.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/metaprogramming/conditional.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_METAPROGRAMMING_CONDITIONAL_HPP
-#define SHARE_VM_METAPROGRAMMING_CONDITIONAL_HPP
+#ifndef SHARE_METAPROGRAMMING_CONDITIONAL_HPP
+#define SHARE_METAPROGRAMMING_CONDITIONAL_HPP
 
 #include "memory/allocation.hpp"
 
@@ -40,4 +40,4 @@
   typedef FalseType type;
 };
 
-#endif // SHARE_VM_METAPROGRAMMING_CONDITIONAL_HPP
+#endif // SHARE_METAPROGRAMMING_CONDITIONAL_HPP
--- a/src/hotspot/share/metaprogramming/decay.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/metaprogramming/decay.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_METAPROGRAMMING_DECAY_HPP
-#define SHARE_VM_METAPROGRAMMING_DECAY_HPP
+#ifndef SHARE_METAPROGRAMMING_DECAY_HPP
+#define SHARE_METAPROGRAMMING_DECAY_HPP
 
 #include "memory/allocation.hpp"
 #include "metaprogramming/removeCV.hpp"
@@ -38,4 +38,4 @@
   typedef typename RemoveCV<typename RemoveReference<T>::type>::type type;
 };
 
-#endif // SHARE_VM_METAPROGRAMMING_DECAY_HPP
+#endif // SHARE_METAPROGRAMMING_DECAY_HPP
--- a/src/hotspot/share/metaprogramming/enableIf.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/metaprogramming/enableIf.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_METAPROGRAMMING_ENABLEIF_HPP
-#define SHARE_VM_METAPROGRAMMING_ENABLEIF_HPP
+#ifndef SHARE_METAPROGRAMMING_ENABLEIF_HPP
+#define SHARE_METAPROGRAMMING_ENABLEIF_HPP
 
 #include "memory/allocation.hpp"
 
@@ -44,4 +44,4 @@
   typedef T type;
 };
 
-#endif // SHARE_VM_METAPROGRAMMING_ENABLEIF_HPP
+#endif // SHARE_METAPROGRAMMING_ENABLEIF_HPP
--- a/src/hotspot/share/metaprogramming/integralConstant.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/metaprogramming/integralConstant.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_METAPROGRAMMING_INTEGRALCONSTANT_HPP
-#define SHARE_VM_METAPROGRAMMING_INTEGRALCONSTANT_HPP
+#ifndef SHARE_METAPROGRAMMING_INTEGRALCONSTANT_HPP
+#define SHARE_METAPROGRAMMING_INTEGRALCONSTANT_HPP
 
 
 // An Integral Constant is a class providing a compile-time value of an
@@ -56,4 +56,4 @@
 // A bool valued IntegralConstant whose value is false.
 typedef IntegralConstant<bool, false> FalseType;
 
-#endif // SHARE_VM_METAPROGRAMMING_INTEGRALCONSTANT_HPP
+#endif // SHARE_METAPROGRAMMING_INTEGRALCONSTANT_HPP
--- a/src/hotspot/share/metaprogramming/isConst.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/metaprogramming/isConst.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,12 @@
  *
  */
 
-#ifndef SHARE_VM_METAPROGRAMMING_ISCONST_HPP
-#define SHARE_VM_METAPROGRAMMING_ISCONST_HPP
+#ifndef SHARE_METAPROGRAMMING_ISCONST_HPP
+#define SHARE_METAPROGRAMMING_ISCONST_HPP
 
 #include "metaprogramming/integralConstant.hpp"
 
 template <typename T> struct IsConst: public FalseType {};
 template <typename T> struct IsConst<const T>: public TrueType {};
 
-#endif // SHARE_VM_METAPROGRAMMING_ISCONST_HPP
+#endif // SHARE_METAPROGRAMMING_ISCONST_HPP
--- a/src/hotspot/share/metaprogramming/isFloatingPoint.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/metaprogramming/isFloatingPoint.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_METAPROGRAMMING_ISFLOATINGPOINT_HPP
-#define SHARE_VM_METAPROGRAMMING_ISFLOATINGPOINT_HPP
+#ifndef SHARE_METAPROGRAMMING_ISFLOATINGPOINT_HPP
+#define SHARE_METAPROGRAMMING_ISFLOATINGPOINT_HPP
 
 #include "metaprogramming/integralConstant.hpp"
 
@@ -47,4 +47,4 @@
 template <> struct IsFloatingPoint<volatile long double>: public TrueType {};
 template <> struct IsFloatingPoint<const volatile long double>: public TrueType {};
 
-#endif // SHARE_VM_METAPROGRAMMING_ISFLOATINGPOINT_HPP
+#endif // SHARE_METAPROGRAMMING_ISFLOATINGPOINT_HPP
--- a/src/hotspot/share/metaprogramming/isIntegral.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/metaprogramming/isIntegral.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef SHARE_VM_METAPROGRAMMING_ISINTEGRAL_HPP
-#define SHARE_VM_METAPROGRAMMING_ISINTEGRAL_HPP
+#ifndef SHARE_METAPROGRAMMING_ISINTEGRAL_HPP
+#define SHARE_METAPROGRAMMING_ISINTEGRAL_HPP
 
 #include "metaprogramming/integralConstant.hpp"
 #include "metaprogramming/isSigned.hpp"
@@ -55,4 +55,4 @@
   : public IntegralConstant<bool, IsIntegral<T>::value && !IsSigned<T>::value>
 {};
 
-#endif // SHARE_VM_METAPROGRAMMING_ISINTEGRAL_HPP
+#endif // SHARE_METAPROGRAMMING_ISINTEGRAL_HPP
--- a/src/hotspot/share/metaprogramming/isPointer.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/metaprogramming/isPointer.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_METAPROGRAMMING_ISPOINTER_HPP
-#define SHARE_VM_METAPROGRAMMING_ISPOINTER_HPP
+#ifndef SHARE_METAPROGRAMMING_ISPOINTER_HPP
+#define SHARE_METAPROGRAMMING_ISPOINTER_HPP
 
 #include "metaprogramming/integralConstant.hpp"
 
@@ -37,4 +37,4 @@
 template <typename T> class IsPointer<T* volatile>: public TrueType {};
 template <typename T> class IsPointer<T* const volatile>: public TrueType {};
 
-#endif // SHARE_VM_METAPROGRAMMING_ISPOINTER_HPP
+#endif // SHARE_METAPROGRAMMING_ISPOINTER_HPP
--- a/src/hotspot/share/metaprogramming/isRegisteredEnum.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/metaprogramming/isRegisteredEnum.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_METAPROGRAMMING_ISREGISTEREDENUM_HPP
-#define SHARE_VM_METAPROGRAMMING_ISREGISTEREDENUM_HPP
+#ifndef SHARE_METAPROGRAMMING_ISREGISTEREDENUM_HPP
+#define SHARE_METAPROGRAMMING_ISREGISTEREDENUM_HPP
 
 #include "metaprogramming/integralConstant.hpp"
 
@@ -37,5 +37,4 @@
 template<typename T>
 struct IsRegisteredEnum : public FalseType {};
 
-#endif // SHARE_VM_METAPROGRAMMING_ISREGISTEREDENUM_HPP
-
+#endif // SHARE_METAPROGRAMMING_ISREGISTEREDENUM_HPP
--- a/src/hotspot/share/metaprogramming/isSame.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/metaprogramming/isSame.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_METAPROGRAMMING_ISSAME_HPP
-#define SHARE_VM_METAPROGRAMMING_ISSAME_HPP
+#ifndef SHARE_METAPROGRAMMING_ISSAME_HPP
+#define SHARE_METAPROGRAMMING_ISSAME_HPP
 
 #include "metaprogramming/integralConstant.hpp"
 
@@ -35,4 +35,4 @@
 template <typename X>
 struct IsSame<X, X>: public TrueType {};
 
-#endif // SHARE_VM_METAPROGRAMMING_ISSAME_HPP
+#endif // SHARE_METAPROGRAMMING_ISSAME_HPP
--- a/src/hotspot/share/metaprogramming/isSigned.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/metaprogramming/isSigned.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_METAPROGRAMMING_ISSIGNED_HPP
-#define SHARE_VM_METAPROGRAMMING_ISSIGNED_HPP
+#ifndef SHARE_METAPROGRAMMING_ISSIGNED_HPP
+#define SHARE_METAPROGRAMMING_ISSIGNED_HPP
 
 #include "metaprogramming/integralConstant.hpp"
 #include "metaprogramming/removeCV.hpp"
@@ -34,4 +34,4 @@
   : public IntegralConstant<bool, std::numeric_limits<typename RemoveCV<T>::type>::is_signed>
 {};
 
-#endif //  SHARE_VM_METAPROGRAMMING_ISSIGNED_HPP
+#endif // SHARE_METAPROGRAMMING_ISSIGNED_HPP
--- a/src/hotspot/share/metaprogramming/isVolatile.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/metaprogramming/isVolatile.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,12 @@
  *
  */
 
-#ifndef SHARE_VM_METAPROGRAMMING_ISVOLATILE_HPP
-#define SHARE_VM_METAPROGRAMMING_ISVOLATILE_HPP
+#ifndef SHARE_METAPROGRAMMING_ISVOLATILE_HPP
+#define SHARE_METAPROGRAMMING_ISVOLATILE_HPP
 
 #include "metaprogramming/integralConstant.hpp"
 
 template <typename T> struct IsVolatile: public FalseType {};
 template <typename T> struct IsVolatile<volatile T>: public TrueType {};
 
-#endif // SHARE_VM_METAPROGRAMMING_ISVOLATILE_HPP
+#endif // SHARE_METAPROGRAMMING_ISVOLATILE_HPP
--- a/src/hotspot/share/metaprogramming/primitiveConversions.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/metaprogramming/primitiveConversions.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_METAPROGRAMMING_PRIMITIVECONVERSIONS_HPP
-#define SHARE_VM_METAPROGRAMMING_PRIMITIVECONVERSIONS_HPP
+#ifndef SHARE_METAPROGRAMMING_PRIMITIVECONVERSIONS_HPP
+#define SHARE_METAPROGRAMMING_PRIMITIVECONVERSIONS_HPP
 
 #include "memory/allocation.hpp"
 #include "metaprogramming/enableIf.hpp"
@@ -182,4 +182,4 @@
   static Value recover(Decayed x) { return PrimitiveConversions::cast<Value>(x); }
 };
 
-#endif // SHARE_VM_METAPROGRAMMING_PRIMITIVECONVERSIONS_HPP
+#endif // SHARE_METAPROGRAMMING_PRIMITIVECONVERSIONS_HPP
--- a/src/hotspot/share/metaprogramming/removeCV.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/metaprogramming/removeCV.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_METAPROGRAMMING_REMOVECV_HPP
-#define SHARE_VM_METAPROGRAMMING_REMOVECV_HPP
+#ifndef SHARE_METAPROGRAMMING_REMOVECV_HPP
+#define SHARE_METAPROGRAMMING_REMOVECV_HPP
 
 #include "memory/allocation.hpp"
 
@@ -47,4 +47,4 @@
   typedef T type;
 };
 
-#endif // SHARE_VM_METAPROGRAMMING_REMOVECV_HPP
+#endif // SHARE_METAPROGRAMMING_REMOVECV_HPP
--- a/src/hotspot/share/metaprogramming/removePointer.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/metaprogramming/removePointer.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_METAPROGRAMMING_REMOVEPOINTER_HPP
-#define SHARE_VM_METAPROGRAMMING_REMOVEPOINTER_HPP
+#ifndef SHARE_METAPROGRAMMING_REMOVEPOINTER_HPP
+#define SHARE_METAPROGRAMMING_REMOVEPOINTER_HPP
 
 #include "memory/allocation.hpp"
 
@@ -38,4 +38,4 @@
 template <typename T> struct RemovePointer<T* volatile>: AllStatic { typedef T type; };
 template <typename T> struct RemovePointer<T* const volatile>: AllStatic { typedef T type; };
 
-#endif // SHARE_VM_METAPROGRAMMING_REMOVEPOINTER_HPP
+#endif // SHARE_METAPROGRAMMING_REMOVEPOINTER_HPP
--- a/src/hotspot/share/metaprogramming/removeReference.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/metaprogramming/removeReference.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_METAPROGRAMMING_REMOVEREFERENCE_HPP
-#define SHARE_VM_METAPROGRAMMING_REMOVEREFERENCE_HPP
+#ifndef SHARE_METAPROGRAMMING_REMOVEREFERENCE_HPP
+#define SHARE_METAPROGRAMMING_REMOVEREFERENCE_HPP
 
 #include "memory/allocation.hpp"
 
@@ -35,4 +35,4 @@
 
 template <typename T> struct RemoveReference<T&>: AllStatic { typedef T type; };
 
-#endif // SHARE_VM_METAPROGRAMMING_REMOVEREFERENCE_HPP
+#endif // SHARE_METAPROGRAMMING_REMOVEREFERENCE_HPP
--- a/src/hotspot/share/oops/accessBackend.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/accessBackend.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_ACCESSBACKEND_INLINE_HPP
-#define SHARE_VM_RUNTIME_ACCESSBACKEND_INLINE_HPP
+#ifndef SHARE_OOPS_ACCESSBACKEND_INLINE_HPP
+#define SHARE_OOPS_ACCESSBACKEND_INLINE_HPP
 
 #include "oops/access.hpp"
 #include "oops/accessBackend.hpp"
@@ -363,4 +363,4 @@
   dst->init_mark_raw();
 }
 
-#endif // SHARE_VM_RUNTIME_ACCESSBACKEND_INLINE_HPP
+#endif // SHARE_OOPS_ACCESSBACKEND_INLINE_HPP
--- a/src/hotspot/share/oops/annotations.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/annotations.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_ANNOTATIONS_HPP
-#define SHARE_VM_OOPS_ANNOTATIONS_HPP
+#ifndef SHARE_OOPS_ANNOTATIONS_HPP
+#define SHARE_OOPS_ANNOTATIONS_HPP
 
 #include "oops/array.hpp"
 #include "oops/metadata.hpp"
@@ -106,4 +106,4 @@
 #endif
   void print_value_on(outputStream* st) const;
 };
-#endif // SHARE_VM_OOPS_ANNOTATIONS_HPP
+#endif // SHARE_OOPS_ANNOTATIONS_HPP
--- a/src/hotspot/share/oops/array.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/array.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_ARRAY_HPP
-#define SHARE_VM_OOPS_ARRAY_HPP
+#ifndef SHARE_OOPS_ARRAY_HPP
+#define SHARE_OOPS_ARRAY_HPP
 
 #include "memory/allocation.hpp"
 #include "memory/metaspace.hpp"
@@ -156,4 +156,4 @@
 };
 
 
-#endif // SHARE_VM_OOPS_ARRAY_HPP
+#endif // SHARE_OOPS_ARRAY_HPP
--- a/src/hotspot/share/oops/array.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/array.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_ARRAY_INLINE_HPP
-#define SHARE_VM_OOPS_ARRAY_INLINE_HPP
+#ifndef SHARE_OOPS_ARRAY_INLINE_HPP
+#define SHARE_OOPS_ARRAY_INLINE_HPP
 
 #include "oops/array.hpp"
 #include "runtime/orderAccess.hpp"
@@ -34,4 +34,4 @@
 template <typename T>
 inline void Array<T>::release_at_put(int which, T contents) { OrderAccess::release_store(adr_at(which), contents); }
 
-#endif // SHARE_VM_OOPS_ARRAY_INLINE_HPP
+#endif // SHARE_OOPS_ARRAY_INLINE_HPP
--- a/src/hotspot/share/oops/arrayKlass.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/arrayKlass.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_ARRAYKLASS_HPP
-#define SHARE_VM_OOPS_ARRAYKLASS_HPP
+#ifndef SHARE_OOPS_ARRAYKLASS_HPP
+#define SHARE_OOPS_ARRAYKLASS_HPP
 
 #include "memory/universe.hpp"
 #include "oops/klass.hpp"
@@ -144,4 +144,4 @@
   void oop_verify_on(oop obj, outputStream* st);
 };
 
-#endif // SHARE_VM_OOPS_ARRAYKLASS_HPP
+#endif // SHARE_OOPS_ARRAYKLASS_HPP
--- a/src/hotspot/share/oops/arrayKlass.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/arrayKlass.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_ARRAYKLASS_INLINE_HPP
-#define SHARE_VM_OOPS_ARRAYKLASS_INLINE_HPP
+#ifndef SHARE_OOPS_ARRAYKLASS_INLINE_HPP
+#define SHARE_OOPS_ARRAYKLASS_INLINE_HPP
 
 #include "runtime/orderAccess.hpp"
 #include "oops/arrayKlass.hpp"
@@ -36,4 +36,4 @@
   OrderAccess::release_store(&_higher_dimension, k);
 }
 
-#endif // SHARE_VM_OOPS_ARRAYKLASS_INLINE_HPP
+#endif // SHARE_OOPS_ARRAYKLASS_INLINE_HPP
--- a/src/hotspot/share/oops/arrayOop.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/arrayOop.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_ARRAYOOP_HPP
-#define SHARE_VM_OOPS_ARRAYOOP_HPP
+#ifndef SHARE_OOPS_ARRAYOOP_HPP
+#define SHARE_OOPS_ARRAYOOP_HPP
 
 #include "memory/universe.hpp"
 #include "oops/oop.hpp"
@@ -150,4 +150,4 @@
 
 };
 
-#endif // SHARE_VM_OOPS_ARRAYOOP_HPP
+#endif // SHARE_OOPS_ARRAYOOP_HPP
--- a/src/hotspot/share/oops/compiledICHolder.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/compiledICHolder.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_COMPILEDICHOLDEROOP_HPP
-#define SHARE_VM_OOPS_COMPILEDICHOLDEROOP_HPP
+#ifndef SHARE_OOPS_COMPILEDICHOLDER_HPP
+#define SHARE_OOPS_COMPILEDICHOLDER_HPP
 
 #include "oops/oop.hpp"
 #include "utilities/macros.hpp"
@@ -97,4 +97,4 @@
   void claim() NOT_DEBUG_RETURN;
 };
 
-#endif // SHARE_VM_OOPS_COMPILEDICHOLDEROOP_HPP
+#endif // SHARE_OOPS_COMPILEDICHOLDER_HPP
--- a/src/hotspot/share/oops/constMethod.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/constMethod.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_CONSTMETHODOOP_HPP
-#define SHARE_VM_OOPS_CONSTMETHODOOP_HPP
+#ifndef SHARE_OOPS_CONSTMETHOD_HPP
+#define SHARE_OOPS_CONSTMETHOD_HPP
 
 #include "oops/oop.hpp"
 #include "utilities/align.hpp"
@@ -561,4 +561,4 @@
   void verify_on(outputStream* st);
 };
 
-#endif // SHARE_VM_OOPS_CONSTMETHODOOP_HPP
+#endif // SHARE_OOPS_CONSTMETHOD_HPP
--- a/src/hotspot/share/oops/constantPool.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/constantPool.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_CONSTANTPOOLOOP_HPP
-#define SHARE_VM_OOPS_CONSTANTPOOLOOP_HPP
+#ifndef SHARE_OOPS_CONSTANTPOOL_HPP
+#define SHARE_OOPS_CONSTANTPOOL_HPP
 
 #include "memory/allocation.hpp"
 #include "oops/arrayOop.hpp"
@@ -1024,4 +1024,4 @@
   ~SymbolHashMap();
 }; // End SymbolHashMap class
 
-#endif // SHARE_VM_OOPS_CONSTANTPOOLOOP_HPP
+#endif // SHARE_OOPS_CONSTANTPOOL_HPP
--- a/src/hotspot/share/oops/constantPool.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/constantPool.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_CONSTANTPOOL_INLINE_HPP
-#define SHARE_VM_OOPS_CONSTANTPOOL_INLINE_HPP
+#ifndef SHARE_OOPS_CONSTANTPOOL_INLINE_HPP
+#define SHARE_OOPS_CONSTANTPOOL_INLINE_HPP
 
 #include "oops/constantPool.hpp"
 #include "oops/cpCache.inline.hpp"
@@ -67,4 +67,4 @@
   return s;
 }
 
-#endif // SHARE_VM_OOPS_CONSTANTPOOL_INLINE_HPP
+#endif // SHARE_OOPS_CONSTANTPOOL_INLINE_HPP
--- a/src/hotspot/share/oops/cpCache.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/cpCache.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_CPCACHEOOP_HPP
-#define SHARE_VM_OOPS_CPCACHEOOP_HPP
+#ifndef SHARE_OOPS_CPCACHE_HPP
+#define SHARE_OOPS_CPCACHE_HPP
 
 #include "interpreter/bytecodes.hpp"
 #include "memory/allocation.hpp"
@@ -526,4 +526,4 @@
   void verify_on(outputStream* st);
 };
 
-#endif // SHARE_VM_OOPS_CPCACHEOOP_HPP
+#endif // SHARE_OOPS_CPCACHE_HPP
--- a/src/hotspot/share/oops/cpCache.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/cpCache.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_CPCACHEOOP_INLINE_HPP
-#define SHARE_VM_OOPS_CPCACHEOOP_INLINE_HPP
+#ifndef SHARE_OOPS_CPCACHE_INLINE_HPP
+#define SHARE_OOPS_CPCACHE_INLINE_HPP
 
 #include "oops/cpCache.hpp"
 #include "oops/oopHandle.inline.hpp"
@@ -99,4 +99,4 @@
 
 inline oop ConstantPoolCache::resolved_references() { return _resolved_references.resolve(); }
 
-#endif // SHARE_VM_OOPS_CPCACHEOOP_INLINE_HPP
+#endif // SHARE_OOPS_CPCACHE_INLINE_HPP
--- a/src/hotspot/share/oops/fieldInfo.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/fieldInfo.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_FIELDINFO_HPP
-#define SHARE_VM_OOPS_FIELDINFO_HPP
+#ifndef SHARE_OOPS_FIELDINFO_HPP
+#define SHARE_OOPS_FIELDINFO_HPP
 
 #include "oops/constantPool.hpp"
 #include "oops/typeArrayOop.hpp"
@@ -254,4 +254,4 @@
   }
 };
 
-#endif // SHARE_VM_OOPS_FIELDINFO_HPP
+#endif // SHARE_OOPS_FIELDINFO_HPP
--- a/src/hotspot/share/oops/fieldStreams.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/fieldStreams.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_FIELDSTREAMS_HPP
-#define SHARE_VM_OOPS_FIELDSTREAMS_HPP
+#ifndef SHARE_OOPS_FIELDSTREAMS_HPP
+#define SHARE_OOPS_FIELDSTREAMS_HPP
 
 #include "oops/instanceKlass.hpp"
 #include "oops/fieldInfo.hpp"
@@ -246,4 +246,4 @@
   AllFieldStream(InstanceKlass* k):      FieldStreamBase(k->fields(), k->constants()) {}
 };
 
-#endif // SHARE_VM_OOPS_FIELDSTREAMS_HPP
+#endif // SHARE_OOPS_FIELDSTREAMS_HPP
--- a/src/hotspot/share/oops/generateOopMap.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/generateOopMap.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_GENERATEOOPMAP_HPP
-#define SHARE_VM_OOPS_GENERATEOOPMAP_HPP
+#ifndef SHARE_OOPS_GENERATEOOPMAP_HPP
+#define SHARE_OOPS_GENERATEOOPMAP_HPP
 
 #include "interpreter/bytecodeStream.hpp"
 #include "memory/allocation.hpp"
@@ -563,4 +563,4 @@
   // Call compute_map(CHECK) to generate info.
 };
 
-#endif // SHARE_VM_OOPS_GENERATEOOPMAP_HPP
+#endif // SHARE_OOPS_GENERATEOOPMAP_HPP
--- a/src/hotspot/share/oops/instanceClassLoaderKlass.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/instanceClassLoaderKlass.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_INSTANCECLASSLOADERKLASS_HPP
-#define SHARE_VM_OOPS_INSTANCECLASSLOADERKLASS_HPP
+#ifndef SHARE_OOPS_INSTANCECLASSLOADERKLASS_HPP
+#define SHARE_OOPS_INSTANCECLASSLOADERKLASS_HPP
 
 #include "oops/instanceKlass.hpp"
 #include "utilities/macros.hpp"
@@ -68,4 +68,4 @@
   inline void oop_oop_iterate_bounded(oop obj, OopClosureType* closure, MemRegion mr);
 };
 
-#endif // SHARE_VM_OOPS_INSTANCECLASSLOADERKLASS_HPP
+#endif // SHARE_OOPS_INSTANCECLASSLOADERKLASS_HPP
--- a/src/hotspot/share/oops/instanceClassLoaderKlass.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/instanceClassLoaderKlass.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_INSTANCECLASSLOADERKLASS_INLINE_HPP
-#define SHARE_VM_OOPS_INSTANCECLASSLOADERKLASS_INLINE_HPP
+#ifndef SHARE_OOPS_INSTANCECLASSLOADERKLASS_INLINE_HPP
+#define SHARE_OOPS_INSTANCECLASSLOADERKLASS_INLINE_HPP
 
 #include "classfile/javaClasses.hpp"
 #include "memory/iterator.hpp"
@@ -70,4 +70,4 @@
   }
 }
 
-#endif // SHARE_VM_OOPS_INSTANCECLASSLOADERKLASS_INLINE_HPP
+#endif // SHARE_OOPS_INSTANCECLASSLOADERKLASS_INLINE_HPP
--- a/src/hotspot/share/oops/instanceKlass.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/instanceKlass.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_INSTANCEKLASS_HPP
-#define SHARE_VM_OOPS_INSTANCEKLASS_HPP
+#ifndef SHARE_OOPS_INSTANCEKLASS_HPP
+#define SHARE_OOPS_INSTANCEKLASS_HPP
 
 #include "classfile/classLoader.hpp"
 #include "classfile/classLoaderData.hpp"
@@ -1470,4 +1470,4 @@
   }
 };
 
-#endif // SHARE_VM_OOPS_INSTANCEKLASS_HPP
+#endif // SHARE_OOPS_INSTANCEKLASS_HPP
--- a/src/hotspot/share/oops/instanceKlass.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/instanceKlass.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_INSTANCEKLASS_INLINE_HPP
-#define SHARE_VM_OOPS_INSTANCEKLASS_INLINE_HPP
+#ifndef SHARE_OOPS_INSTANCEKLASS_INLINE_HPP
+#define SHARE_OOPS_INSTANCEKLASS_INLINE_HPP
 
 #include "memory/iterator.hpp"
 #include "oops/instanceKlass.hpp"
@@ -157,4 +157,4 @@
   oop_oop_iterate_oop_maps_bounded<T>(obj, closure, mr);
 }
 
-#endif // SHARE_VM_OOPS_INSTANCEKLASS_INLINE_HPP
+#endif // SHARE_OOPS_INSTANCEKLASS_INLINE_HPP
--- a/src/hotspot/share/oops/instanceMirrorKlass.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/instanceMirrorKlass.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_INSTANCEMIRRORKLASS_HPP
-#define SHARE_VM_OOPS_INSTANCEMIRRORKLASS_HPP
+#ifndef SHARE_OOPS_INSTANCEMIRRORKLASS_HPP
+#define SHARE_OOPS_INSTANCEMIRRORKLASS_HPP
 
 #include "classfile/systemDictionary.hpp"
 #include "oops/instanceKlass.hpp"
@@ -121,4 +121,4 @@
   inline void oop_oop_iterate_statics_bounded(oop obj, OopClosureType* closure, MemRegion mr);
 };
 
-#endif // SHARE_VM_OOPS_INSTANCEMIRRORKLASS_HPP
+#endif // SHARE_OOPS_INSTANCEMIRRORKLASS_HPP
--- a/src/hotspot/share/oops/instanceMirrorKlass.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/instanceMirrorKlass.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_INSTANCEMIRRORKLASS_INLINE_HPP
-#define SHARE_VM_OOPS_INSTANCEMIRRORKLASS_INLINE_HPP
+#ifndef SHARE_OOPS_INSTANCEMIRRORKLASS_INLINE_HPP
+#define SHARE_OOPS_INSTANCEMIRRORKLASS_INLINE_HPP
 
 #include "classfile/javaClasses.hpp"
 #include "oops/instanceKlass.inline.hpp"
@@ -127,4 +127,4 @@
   oop_oop_iterate_statics_bounded<T>(obj, closure, mr);
 }
 
-#endif // SHARE_VM_OOPS_INSTANCEMIRRORKLASS_INLINE_HPP
+#endif // SHARE_OOPS_INSTANCEMIRRORKLASS_INLINE_HPP
--- a/src/hotspot/share/oops/instanceOop.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/instanceOop.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_INSTANCEOOP_HPP
-#define SHARE_VM_OOPS_INSTANCEOOP_HPP
+#ifndef SHARE_OOPS_INSTANCEOOP_HPP
+#define SHARE_OOPS_INSTANCEOOP_HPP
 
 #include "oops/oop.hpp"
 
@@ -51,4 +51,4 @@
   }
 };
 
-#endif // SHARE_VM_OOPS_INSTANCEOOP_HPP
+#endif // SHARE_OOPS_INSTANCEOOP_HPP
--- a/src/hotspot/share/oops/instanceRefKlass.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/instanceRefKlass.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_INSTANCEREFKLASS_HPP
-#define SHARE_VM_OOPS_INSTANCEREFKLASS_HPP
+#ifndef SHARE_OOPS_INSTANCEREFKLASS_HPP
+#define SHARE_OOPS_INSTANCEREFKLASS_HPP
 
 #include "oops/instanceKlass.hpp"
 #include "utilities/macros.hpp"
@@ -138,4 +138,4 @@
   void oop_verify_on(oop obj, outputStream* st);
 };
 
-#endif // SHARE_VM_OOPS_INSTANCEREFKLASS_HPP
+#endif // SHARE_OOPS_INSTANCEREFKLASS_HPP
--- a/src/hotspot/share/oops/instanceRefKlass.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/instanceRefKlass.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_INSTANCEREFKLASS_INLINE_HPP
-#define SHARE_VM_OOPS_INSTANCEREFKLASS_INLINE_HPP
+#ifndef SHARE_OOPS_INSTANCEREFKLASS_INLINE_HPP
+#define SHARE_OOPS_INSTANCEREFKLASS_INLINE_HPP
 
 #include "classfile/javaClasses.inline.hpp"
 #include "gc/shared/referenceProcessor.hpp"
@@ -197,4 +197,4 @@
 }
 #endif
 
-#endif // SHARE_VM_OOPS_INSTANCEREFKLASS_INLINE_HPP
+#endif // SHARE_OOPS_INSTANCEREFKLASS_INLINE_HPP
--- a/src/hotspot/share/oops/klass.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/klass.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_KLASS_HPP
-#define SHARE_VM_OOPS_KLASS_HPP
+#ifndef SHARE_OOPS_KLASS_HPP
+#define SHARE_OOPS_KLASS_HPP
 
 #include "classfile/classLoaderData.hpp"
 #include "memory/iterator.hpp"
@@ -706,4 +706,4 @@
   static Klass* decode_klass(narrowKlass v);
 };
 
-#endif // SHARE_VM_OOPS_KLASS_HPP
+#endif // SHARE_OOPS_KLASS_HPP
--- a/src/hotspot/share/oops/klass.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/klass.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_KLASS_INLINE_HPP
-#define SHARE_VM_OOPS_KLASS_INLINE_HPP
+#ifndef SHARE_OOPS_KLASS_INLINE_HPP
+#define SHARE_OOPS_KLASS_INLINE_HPP
 
 #include "memory/universe.hpp"
 #include "oops/klass.hpp"
@@ -71,4 +71,4 @@
   return is_null(v) ? (Klass*)NULL : decode_klass_not_null(v);
 }
 
-#endif // SHARE_VM_OOPS_KLASS_INLINE_HPP
+#endif // SHARE_OOPS_KLASS_INLINE_HPP
--- a/src/hotspot/share/oops/klassVtable.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/klassVtable.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_KLASSVTABLE_HPP
-#define SHARE_VM_OOPS_KLASSVTABLE_HPP
+#ifndef SHARE_OOPS_KLASSVTABLE_HPP
+#define SHARE_OOPS_KLASSVTABLE_HPP
 
 #include "oops/oopsHierarchy.hpp"
 #include "runtime/handles.hpp"
@@ -352,4 +352,4 @@
   static void update_stats(int size) PRODUCT_RETURN NOT_PRODUCT({ _total_classes++; _total_size += size; })
 };
 
-#endif // SHARE_VM_OOPS_KLASSVTABLE_HPP
+#endif // SHARE_OOPS_KLASSVTABLE_HPP
--- a/src/hotspot/share/oops/markOop.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/markOop.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_MARKOOP_HPP
-#define SHARE_VM_OOPS_MARKOOP_HPP
+#ifndef SHARE_OOPS_MARKOOP_HPP
+#define SHARE_OOPS_MARKOOP_HPP
 
 #include "oops/oop.hpp"
 
@@ -403,4 +403,4 @@
 #endif // _LP64
 };
 
-#endif // SHARE_VM_OOPS_MARKOOP_HPP
+#endif // SHARE_OOPS_MARKOOP_HPP
--- a/src/hotspot/share/oops/markOop.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/markOop.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_MARKOOP_INLINE_HPP
-#define SHARE_VM_OOPS_MARKOOP_INLINE_HPP
+#ifndef SHARE_OOPS_MARKOOP_INLINE_HPP
+#define SHARE_OOPS_MARKOOP_INLINE_HPP
 
 #include "oops/klass.hpp"
 #include "oops/markOop.hpp"
@@ -111,4 +111,4 @@
   return obj->klass()->prototype_header();
 }
 
-#endif // SHARE_VM_OOPS_MARKOOP_INLINE_HPP
+#endif // SHARE_OOPS_MARKOOP_INLINE_HPP
--- a/src/hotspot/share/oops/metadata.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/metadata.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_METADATA_HPP
-#define SHARE_VM_OOPS_METADATA_HPP
+#ifndef SHARE_OOPS_METADATA_HPP
+#define SHARE_OOPS_METADATA_HPP
 
 #include "utilities/exceptions.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -76,4 +76,4 @@
   static void mark_on_stack(Metadata* m) { m->set_on_stack(true); }
 };
 
-#endif // SHARE_VM_OOPS_METADATA_HPP
+#endif // SHARE_OOPS_METADATA_HPP
--- a/src/hotspot/share/oops/method.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/method.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_METHODOOP_HPP
-#define SHARE_VM_OOPS_METHODOOP_HPP
+#ifndef SHARE_OOPS_METHOD_HPP
+#define SHARE_OOPS_METHOD_HPP
 
 #include "classfile/vmSymbols.hpp"
 #include "code/compressedStream.hpp"
@@ -1176,4 +1176,4 @@
   }
 };
 
-#endif // SHARE_VM_OOPS_METHODOOP_HPP
+#endif // SHARE_OOPS_METHOD_HPP
--- a/src/hotspot/share/oops/method.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/method.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_METHOD_INLINE_HPP
-#define SHARE_VM_OOPS_METHOD_INLINE_HPP
+#ifndef SHARE_OOPS_METHOD_INLINE_HPP
+#define SHARE_OOPS_METHOD_INLINE_HPP
 
 #include "oops/method.hpp"
 #include "runtime/orderAccess.hpp"
@@ -50,4 +50,4 @@
 
 inline bool Method::has_compiled_code() const { return code() != NULL; }
 
-#endif // SHARE_VM_OOPS_METHOD_INLINE_HPP
+#endif // SHARE_OOPS_METHOD_INLINE_HPP
--- a/src/hotspot/share/oops/methodCounters.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/methodCounters.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_METHODCOUNTERS_HPP
-#define SHARE_VM_OOPS_METHODCOUNTERS_HPP
+#ifndef SHARE_OOPS_METHODCOUNTERS_HPP
+#define SHARE_OOPS_METHODCOUNTERS_HPP
 
 #include "oops/metadata.hpp"
 #include "compiler/compilerDefinitions.hpp"
@@ -265,4 +265,4 @@
   virtual void print_value_on(outputStream* st) const;
 
 };
-#endif //SHARE_VM_OOPS_METHODCOUNTERS_HPP
+#endif // SHARE_OOPS_METHODCOUNTERS_HPP
--- a/src/hotspot/share/oops/methodData.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/methodData.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_METHODDATAOOP_HPP
-#define SHARE_VM_OOPS_METHODDATAOOP_HPP
+#ifndef SHARE_OOPS_METHODDATA_HPP
+#define SHARE_OOPS_METHODDATA_HPP
 
 #include "interpreter/bytecodes.hpp"
 #include "memory/universe.hpp"
@@ -2427,4 +2427,4 @@
   Mutex* extra_data_lock() { return &_extra_data_lock; }
 };
 
-#endif // SHARE_VM_OOPS_METHODDATAOOP_HPP
+#endif // SHARE_OOPS_METHODDATA_HPP
--- a/src/hotspot/share/oops/methodData.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/methodData.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_METHODDATA_INLINE_HPP
-#define SHARE_VM_OOPS_METHODDATA_INLINE_HPP
+#ifndef SHARE_OOPS_METHODDATA_INLINE_HPP
+#define SHARE_OOPS_METHODDATA_INLINE_HPP
 
 #include "oops/methodData.hpp"
 #include "runtime/orderAccess.hpp"
@@ -52,4 +52,4 @@
   release_set_int_at(bci0_offset + row * ret_row_cell_count, bci);
 }
 
-#endif // SHARE_VM_OOPS_METHODDATA_INLINE_HPP
+#endif // SHARE_OOPS_METHODDATA_INLINE_HPP
--- a/src/hotspot/share/oops/objArrayKlass.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/objArrayKlass.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_OBJARRAYKLASS_HPP
-#define SHARE_VM_OOPS_OBJARRAYKLASS_HPP
+#ifndef SHARE_OOPS_OBJARRAYKLASS_HPP
+#define SHARE_OOPS_OBJARRAYKLASS_HPP
 
 #include "classfile/classLoaderData.hpp"
 #include "oops/arrayKlass.hpp"
@@ -174,4 +174,4 @@
   void oop_verify_on(oop obj, outputStream* st);
 };
 
-#endif // SHARE_VM_OOPS_OBJARRAYKLASS_HPP
+#endif // SHARE_OOPS_OBJARRAYKLASS_HPP
--- a/src/hotspot/share/oops/objArrayKlass.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/objArrayKlass.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_OBJARRAYKLASS_INLINE_HPP
-#define SHARE_VM_OOPS_OBJARRAYKLASS_INLINE_HPP
+#ifndef SHARE_OOPS_OBJARRAYKLASS_INLINE_HPP
+#define SHARE_OOPS_OBJARRAYKLASS_INLINE_HPP
 
 #include "memory/memRegion.hpp"
 #include "memory/iterator.hpp"
@@ -117,4 +117,4 @@
   }
 }
 
-#endif // SHARE_VM_OOPS_OBJARRAYKLASS_INLINE_HPP
+#endif // SHARE_OOPS_OBJARRAYKLASS_INLINE_HPP
--- a/src/hotspot/share/oops/objArrayOop.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/objArrayOop.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_OBJARRAYOOP_HPP
-#define SHARE_VM_OOPS_OBJARRAYOOP_HPP
+#ifndef SHARE_OOPS_OBJARRAYOOP_HPP
+#define SHARE_OOPS_OBJARRAYOOP_HPP
 
 #include "oops/arrayOop.hpp"
 #include "utilities/align.hpp"
@@ -112,4 +112,4 @@
   void oop_iterate_range(OopClosureType* blk, int start, int end);
 };
 
-#endif // SHARE_VM_OOPS_OBJARRAYOOP_HPP
+#endif // SHARE_OOPS_OBJARRAYOOP_HPP
--- a/src/hotspot/share/oops/objArrayOop.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/objArrayOop.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_OBJARRAYOOP_INLINE_HPP
-#define SHARE_VM_OOPS_OBJARRAYOOP_INLINE_HPP
+#ifndef SHARE_OOPS_OBJARRAYOOP_INLINE_HPP
+#define SHARE_OOPS_OBJARRAYOOP_INLINE_HPP
 
 #include "oops/access.inline.hpp"
 #include "oops/arrayOop.inline.hpp"
@@ -54,4 +54,4 @@
   HeapAccess<IS_ARRAY>::oop_store_at(as_oop(), offset, value);
 }
 
-#endif // SHARE_VM_OOPS_OBJARRAYOOP_INLINE_HPP
+#endif // SHARE_OOPS_OBJARRAYOOP_INLINE_HPP
--- a/src/hotspot/share/oops/oop.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/oop.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_OOP_HPP
-#define SHARE_VM_OOPS_OOP_HPP
+#ifndef SHARE_OOPS_OOP_HPP
+#define SHARE_OOPS_OOP_HPP
 
 #include "memory/iterator.hpp"
 #include "memory/memRegion.hpp"
@@ -331,4 +331,4 @@
   static oop   oop_or_null(address addr);
 };
 
-#endif // SHARE_VM_OOPS_OOP_HPP
+#endif // SHARE_OOPS_OOP_HPP
--- a/src/hotspot/share/oops/oop.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/oop.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_OOP_INLINE_HPP
-#define SHARE_VM_OOPS_OOP_INLINE_HPP
+#ifndef SHARE_OOPS_OOP_INLINE_HPP
+#define SHARE_OOPS_OOP_INLINE_HPP
 
 #include "gc/shared/collectedHeap.hpp"
 #include "oops/access.inline.hpp"
@@ -481,4 +481,4 @@
   mark_raw()->set_displaced_mark_helper(m);
 }
 
-#endif // SHARE_VM_OOPS_OOP_INLINE_HPP
+#endif // SHARE_OOPS_OOP_INLINE_HPP
--- a/src/hotspot/share/oops/oopHandle.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/oopHandle.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_OOPHANDLE_HPP
-#define SHARE_VM_OOPS_OOPHANDLE_HPP
+#ifndef SHARE_OOPS_OOPHANDLE_HPP
+#define SHARE_OOPS_OOPHANDLE_HPP
 
 #include "oops/oop.hpp"
 
@@ -50,4 +50,4 @@
   oop* ptr_raw() const { return _obj; }
 };
 
-#endif // SHARE_VM_OOPS_OOPHANDLE_HPP
+#endif // SHARE_OOPS_OOPHANDLE_HPP
--- a/src/hotspot/share/oops/oopHandle.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/oopHandle.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_OOPHANDLE_INLINE_HPP
-#define SHARE_VM_OOPS_OOPHANDLE_INLINE_HPP
+#ifndef SHARE_OOPS_OOPHANDLE_INLINE_HPP
+#define SHARE_OOPS_OOPHANDLE_INLINE_HPP
 
 #include "oops/access.inline.hpp"
 #include "oops/oopHandle.hpp"
@@ -36,4 +36,4 @@
   return (_obj == NULL) ? (oop)NULL : NativeAccess<AS_NO_KEEPALIVE>::oop_load(_obj);
 }
 
-#endif //  SHARE_VM_OOPS_OOPHANDLE_INLINE_HPP
+#endif // SHARE_OOPS_OOPHANDLE_INLINE_HPP
--- a/src/hotspot/share/oops/oopsHierarchy.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/oopsHierarchy.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_OOPSHIERARCHY_HPP
-#define SHARE_VM_OOPS_OOPSHIERARCHY_HPP
+#ifndef SHARE_OOPS_OOPSHIERARCHY_HPP
+#define SHARE_OOPS_OOPSHIERARCHY_HPP
 
 #include "metaprogramming/integralConstant.hpp"
 #include "metaprogramming/primitiveConversions.hpp"
@@ -220,4 +220,4 @@
 class     ObjArrayKlass;
 class     TypeArrayKlass;
 
-#endif // SHARE_VM_OOPS_OOPSHIERARCHY_HPP
+#endif // SHARE_OOPS_OOPSHIERARCHY_HPP
--- a/src/hotspot/share/oops/reflectionAccessorImplKlassHelper.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/reflectionAccessorImplKlassHelper.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018, SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef HOTSPOT_SHARE_OOPS_REFLECTIONACCESSORIMPLKLASSHELPER_HPP
-#define HOTSPOT_SHARE_OOPS_REFLECTIONACCESSORIMPLKLASSHELPER_HPP
+#ifndef SHARE_OOPS_REFLECTIONACCESSORIMPLKLASSHELPER_HPP
+#define SHARE_OOPS_REFLECTIONACCESSORIMPLKLASSHELPER_HPP
 
 #include "memory/allocation.hpp"
 
@@ -71,5 +71,4 @@
 
 
 
-#endif /* HOTSPOT_SHARE_OOPS_REFLECTIONACCESSORIMPLKLASSHELPER_HPP */
-
+#endif // SHARE_OOPS_REFLECTIONACCESSORIMPLKLASSHELPER_HPP
--- a/src/hotspot/share/oops/symbol.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/symbol.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_SYMBOL_HPP
-#define SHARE_VM_OOPS_SYMBOL_HPP
+#ifndef SHARE_OOPS_SYMBOL_HPP
+#define SHARE_OOPS_SYMBOL_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/exceptions.hpp"
@@ -271,4 +271,4 @@
  return (((uintptr_t)this < (uintptr_t)other) ? -1
    : ((uintptr_t)this == (uintptr_t) other) ? 0 : 1);
 }
-#endif // SHARE_VM_OOPS_SYMBOL_HPP
+#endif // SHARE_OOPS_SYMBOL_HPP
--- a/src/hotspot/share/oops/typeArrayKlass.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/typeArrayKlass.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_TYPEARRAYKLASS_HPP
-#define SHARE_VM_OOPS_TYPEARRAYKLASS_HPP
+#ifndef SHARE_OOPS_TYPEARRAYKLASS_HPP
+#define SHARE_OOPS_TYPEARRAYKLASS_HPP
 
 #include "classfile/classLoaderData.hpp"
 #include "oops/arrayKlass.hpp"
@@ -135,4 +135,4 @@
   PackageEntry* package() const;
 };
 
-#endif // SHARE_VM_OOPS_TYPEARRAYKLASS_HPP
+#endif // SHARE_OOPS_TYPEARRAYKLASS_HPP
--- a/src/hotspot/share/oops/typeArrayKlass.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/typeArrayKlass.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_TYPEARRAYKLASS_INLINE_HPP
-#define SHARE_VM_OOPS_TYPEARRAYKLASS_INLINE_HPP
+#ifndef SHARE_OOPS_TYPEARRAYKLASS_INLINE_HPP
+#define SHARE_OOPS_TYPEARRAYKLASS_INLINE_HPP
 
 #include "oops/arrayKlass.hpp"
 #include "oops/klass.hpp"
@@ -54,4 +54,4 @@
   oop_oop_iterate_impl(obj, closure);
 }
 
-#endif // SHARE_VM_OOPS_TYPEARRAYKLASS_INLINE_HPP
+#endif // SHARE_OOPS_TYPEARRAYKLASS_INLINE_HPP
--- a/src/hotspot/share/oops/typeArrayOop.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/typeArrayOop.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_TYPEARRAYOOP_HPP
-#define SHARE_VM_OOPS_TYPEARRAYOOP_HPP
+#ifndef SHARE_OOPS_TYPEARRAYOOP_HPP
+#define SHARE_OOPS_TYPEARRAYOOP_HPP
 
 #include "oops/arrayOop.hpp"
 #include "oops/typeArrayKlass.hpp"
@@ -134,4 +134,4 @@
   inline int object_size();
 };
 
-#endif // SHARE_VM_OOPS_TYPEARRAYOOP_HPP
+#endif // SHARE_OOPS_TYPEARRAYOOP_HPP
--- a/src/hotspot/share/oops/typeArrayOop.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/typeArrayOop.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_TYPEARRAYOOP_INLINE_HPP
-#define SHARE_VM_OOPS_TYPEARRAYOOP_INLINE_HPP
+#ifndef SHARE_OOPS_TYPEARRAYOOP_INLINE_HPP
+#define SHARE_OOPS_TYPEARRAYOOP_INLINE_HPP
 
 #include "oops/access.inline.hpp"
 #include "oops/oop.inline.hpp"
@@ -203,4 +203,4 @@
 #endif // _LP64
 
 
-#endif // SHARE_VM_OOPS_TYPEARRAYOOP_INLINE_HPP
+#endif // SHARE_OOPS_TYPEARRAYOOP_INLINE_HPP
--- a/src/hotspot/share/oops/verifyOopClosure.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/verifyOopClosure.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_VERIFYOOPCLOSURE_HPP
-#define SHARE_VM_OOPS_VERIFYOOPCLOSURE_HPP
+#ifndef SHARE_OOPS_VERIFYOOPCLOSURE_HPP
+#define SHARE_OOPS_VERIFYOOPCLOSURE_HPP
 
 #include "memory/iterator.hpp"
 
@@ -36,4 +36,4 @@
   static VerifyOopClosure verify_oop;
 };
 
-#endif // SHARE_VM_OOPS_VERIFYOOPCLOSURE_HPP
+#endif // SHARE_OOPS_VERIFYOOPCLOSURE_HPP
--- a/src/hotspot/share/oops/weakHandle.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/weakHandle.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_WEAKHANDLE_HPP
-#define SHARE_VM_OOPS_WEAKHANDLE_HPP
+#ifndef SHARE_OOPS_WEAKHANDLE_HPP
+#define SHARE_OOPS_WEAKHANDLE_HPP
 
 #include "oops/oop.hpp"
 #include "runtime/handles.hpp"
@@ -66,4 +66,4 @@
 
 typedef WeakHandle<vm_class_loader_data> ClassLoaderWeakHandle;
 
-#endif // SHARE_VM_OOPS_WEAKHANDLE_HPP
+#endif // SHARE_OOPS_WEAKHANDLE_HPP
--- a/src/hotspot/share/oops/weakHandle.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/oops/weakHandle.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OOPS_WEAKHANDLE_INLINE_HPP
-#define SHARE_VM_OOPS_WEAKHANDLE_INLINE_HPP
+#ifndef SHARE_OOPS_WEAKHANDLE_INLINE_HPP
+#define SHARE_OOPS_WEAKHANDLE_INLINE_HPP
 
 #include "oops/weakHandle.hpp"
 #include "oops/access.inline.hpp"
@@ -45,5 +45,4 @@
   NativeAccess<ON_PHANTOM_OOP_REF>::oop_store(_obj, with_obj);
 }
 
-#endif // SHARE_VM_OOPS_WEAKHANDLE_INLINE_HPP
-
+#endif // SHARE_OOPS_WEAKHANDLE_INLINE_HPP
--- a/src/hotspot/share/opto/ad.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/ad.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,12 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_AD_HPP
-#define SHARE_VM_OPTO_AD_HPP
+#ifndef SHARE_OPTO_AD_HPP
+#define SHARE_OPTO_AD_HPP
 
 
 #include "utilities/macros.hpp"
 
 #include CPU_HEADER(adfiles/ad)
 
-#endif // SHARE_VM_OPTO_AD_HPP
+#endif // SHARE_OPTO_AD_HPP
--- a/src/hotspot/share/opto/addnode.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/addnode.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_ADDNODE_HPP
-#define SHARE_VM_OPTO_ADDNODE_HPP
+#ifndef SHARE_OPTO_ADDNODE_HPP
+#define SHARE_OPTO_ADDNODE_HPP
 
 #include "opto/node.hpp"
 #include "opto/opcodes.hpp"
@@ -297,4 +297,4 @@
   virtual uint ideal_reg() const { return Op_RegD; }
 };
 
-#endif // SHARE_VM_OPTO_ADDNODE_HPP
+#endif // SHARE_OPTO_ADDNODE_HPP
--- a/src/hotspot/share/opto/adlcVMDeps.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/adlcVMDeps.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,20 +22,18 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_ADLCVMDEPS_HPP
-#define SHARE_VM_OPTO_ADLCVMDEPS_HPP
+#ifndef SHARE_OPTO_ADLCVMDEPS_HPP
+#define SHARE_OPTO_ADLCVMDEPS_HPP
+
 
 // adlcVMDeps.hpp is used by both adlc and vm builds.
-// Only include allocation.hpp when we're not building adlc.
-#ifndef SHARE_VM_ADLC_ARENA_HPP
-#include "memory/allocation.hpp"
-#endif
+// Don't inherit from AllStatic to avoid including memory/allocation.hpp.
 
 // Declare commonly known constant and data structures between the
 // ADLC and the VM
 //
 
-class AdlcVMDeps : public AllStatic {
+class AdlcVMDeps {   // AllStatic
  public:
   // Mirror of TypeFunc types
   enum { Control, I_O, Memory, FramePtr, ReturnAdr, Parms };
@@ -52,4 +50,4 @@
   static const char* none_reloc_type() { return "relocInfo::none"; }
 };
 
-#endif // SHARE_VM_OPTO_ADLCVMDEPS_HPP
+#endif // SHARE_OPTO_ADLCVMDEPS_HPP
--- a/src/hotspot/share/opto/arraycopynode.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/arraycopynode.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_ARRAYCOPYNODE_HPP
-#define SHARE_VM_OPTO_ARRAYCOPYNODE_HPP
+#ifndef SHARE_OPTO_ARRAYCOPYNODE_HPP
+#define SHARE_OPTO_ARRAYCOPYNODE_HPP
 
 #include "gc/shared/c2/barrierSetC2.hpp"
 #include "opto/callnode.hpp"
@@ -178,4 +178,4 @@
   virtual void dump_compact_spec(outputStream* st) const;
 #endif
 };
-#endif // SHARE_VM_OPTO_ARRAYCOPYNODE_HPP
+#endif // SHARE_OPTO_ARRAYCOPYNODE_HPP
--- a/src/hotspot/share/opto/block.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/block.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_BLOCK_HPP
-#define SHARE_VM_OPTO_BLOCK_HPP
+#ifndef SHARE_OPTO_BLOCK_HPP
+#define SHARE_OPTO_BLOCK_HPP
 
 #include "opto/multnode.hpp"
 #include "opto/node.hpp"
@@ -887,4 +887,4 @@
   void union_traces(Trace* from, Trace* to);
 };
 
-#endif // SHARE_VM_OPTO_BLOCK_HPP
+#endif // SHARE_OPTO_BLOCK_HPP
--- a/src/hotspot/share/opto/c2_globals.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/c2_globals.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_C2_GLOBALS_HPP
-#define SHARE_VM_OPTO_C2_GLOBALS_HPP
+#ifndef SHARE_OPTO_C2_GLOBALS_HPP
+#define SHARE_OPTO_C2_GLOBALS_HPP
 
 #include "runtime/globals.hpp"
 #include "utilities/macros.hpp"
@@ -773,4 +773,4 @@
          IGNORE_CONSTRAINT, \
          IGNORE_WRITEABLE)
 
-#endif // SHARE_VM_OPTO_C2_GLOBALS_HPP
+#endif // SHARE_OPTO_C2_GLOBALS_HPP
--- a/src/hotspot/share/opto/c2compiler.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/c2compiler.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_C2COMPILER_HPP
-#define SHARE_VM_OPTO_C2COMPILER_HPP
+#ifndef SHARE_OPTO_C2COMPILER_HPP
+#define SHARE_OPTO_C2COMPILER_HPP
 
 #include "compiler/abstractCompiler.hpp"
 #include "opto/output.hpp"
@@ -70,4 +70,4 @@
   static int initial_code_buffer_size(int const_size = initial_const_capacity);
 };
 
-#endif // SHARE_VM_OPTO_C2COMPILER_HPP
+#endif // SHARE_OPTO_C2COMPILER_HPP
--- a/src/hotspot/share/opto/callGenerator.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/callGenerator.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_CALLGENERATOR_HPP
-#define SHARE_VM_OPTO_CALLGENERATOR_HPP
+#ifndef SHARE_OPTO_CALLGENERATOR_HPP
+#define SHARE_OPTO_CALLGENERATOR_HPP
 
 #include "compiler/compileBroker.hpp"
 #include "opto/callnode.hpp"
@@ -342,4 +342,4 @@
 #endif
 };
 
-#endif // SHARE_VM_OPTO_CALLGENERATOR_HPP
+#endif // SHARE_OPTO_CALLGENERATOR_HPP
--- a/src/hotspot/share/opto/callnode.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/callnode.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_CALLNODE_HPP
-#define SHARE_VM_OPTO_CALLNODE_HPP
+#ifndef SHARE_OPTO_CALLNODE_HPP
+#define SHARE_OPTO_CALLNODE_HPP
 
 #include "opto/connode.hpp"
 #include "opto/mulnode.hpp"
@@ -1126,4 +1126,4 @@
   JVMState* dbg_jvms() const { return NULL; }
 #endif
 };
-#endif // SHARE_VM_OPTO_CALLNODE_HPP
+#endif // SHARE_OPTO_CALLNODE_HPP
--- a/src/hotspot/share/opto/castnode.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/castnode.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_CASTNODE_HPP
-#define SHARE_VM_OPTO_CASTNODE_HPP
+#ifndef SHARE_OPTO_CASTNODE_HPP
+#define SHARE_OPTO_CASTNODE_HPP
 
 #include "opto/node.hpp"
 #include "opto/opcodes.hpp"
@@ -151,4 +151,4 @@
 
 
 
-#endif // SHARE_VM_OPTO_CASTNODE_HPP
+#endif // SHARE_OPTO_CASTNODE_HPP
--- a/src/hotspot/share/opto/cfgnode.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/cfgnode.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_CFGNODE_HPP
-#define SHARE_VM_OPTO_CFGNODE_HPP
+#ifndef SHARE_OPTO_CFGNODE_HPP
+#define SHARE_OPTO_CFGNODE_HPP
 
 #include "opto/multnode.hpp"
 #include "opto/node.hpp"
@@ -613,4 +613,4 @@
 #endif
 };
 
-#endif // SHARE_VM_OPTO_CFGNODE_HPP
+#endif // SHARE_OPTO_CFGNODE_HPP
--- a/src/hotspot/share/opto/chaitin.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/chaitin.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_CHAITIN_HPP
-#define SHARE_VM_OPTO_CHAITIN_HPP
+#ifndef SHARE_OPTO_CHAITIN_HPP
+#define SHARE_OPTO_CHAITIN_HPP
 
 #include "code/vmreg.hpp"
 #include "memory/resourceArea.hpp"
@@ -801,4 +801,4 @@
   friend class PhaseConservativeCoalesce;
 };
 
-#endif // SHARE_VM_OPTO_CHAITIN_HPP
+#endif // SHARE_OPTO_CHAITIN_HPP
--- a/src/hotspot/share/opto/coalesce.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/coalesce.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_COALESCE_HPP
-#define SHARE_VM_OPTO_COALESCE_HPP
+#ifndef SHARE_OPTO_COALESCE_HPP
+#define SHARE_OPTO_COALESCE_HPP
 
 #include "opto/phase.hpp"
 
@@ -114,4 +114,4 @@
   void update_ifg(uint lr1, uint lr2, IndexSet *n_lr1, IndexSet *n_lr2);
 };
 
-#endif // SHARE_VM_OPTO_COALESCE_HPP
+#endif // SHARE_OPTO_COALESCE_HPP
--- a/src/hotspot/share/opto/compile.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/compile.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_COMPILE_HPP
-#define SHARE_VM_OPTO_COMPILE_HPP
+#ifndef SHARE_OPTO_COMPILE_HPP
+#define SHARE_OPTO_COMPILE_HPP
 
 #include "asm/codeBuffer.hpp"
 #include "ci/compilerInterface.hpp"
@@ -1363,4 +1363,4 @@
   void          set_clone_map(Dict* d);
 };
 
-#endif // SHARE_VM_OPTO_COMPILE_HPP
+#endif // SHARE_OPTO_COMPILE_HPP
--- a/src/hotspot/share/opto/connode.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/connode.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_CONNODE_HPP
-#define SHARE_VM_OPTO_CONNODE_HPP
+#ifndef SHARE_OPTO_CONNODE_HPP
+#define SHARE_OPTO_CONNODE_HPP
 
 #include "opto/node.hpp"
 #include "opto/opcodes.hpp"
@@ -151,4 +151,4 @@
 
 
 
-#endif // SHARE_VM_OPTO_CONNODE_HPP
+#endif // SHARE_OPTO_CONNODE_HPP
--- a/src/hotspot/share/opto/convertnode.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/convertnode.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_CONVERTNODE_HPP
-#define SHARE_VM_OPTO_CONVERTNODE_HPP
+#ifndef SHARE_OPTO_CONVERTNODE_HPP
+#define SHARE_OPTO_CONVERTNODE_HPP
 
 #include "opto/node.hpp"
 #include "opto/opcodes.hpp"
@@ -213,4 +213,4 @@
 };
 
 
-#endif // SHARE_VM_OPTO_CONVERTNODE_HPP
+#endif // SHARE_OPTO_CONVERTNODE_HPP
--- a/src/hotspot/share/opto/countbitsnode.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/countbitsnode.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_COUNTBITSNODE_HPP
-#define SHARE_VM_OPTO_COUNTBITSNODE_HPP
+#ifndef SHARE_OPTO_COUNTBITSNODE_HPP
+#define SHARE_OPTO_COUNTBITSNODE_HPP
 
 #include "opto/node.hpp"
 #include "opto/opcodes.hpp"
@@ -91,4 +91,4 @@
 };
 
 
-#endif // SHARE_VM_OPTO_COUNTBITSNODE_HPP
+#endif // SHARE_OPTO_COUNTBITSNODE_HPP
--- a/src/hotspot/share/opto/divnode.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/divnode.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_DIVNODE_HPP
-#define SHARE_VM_OPTO_DIVNODE_HPP
+#ifndef SHARE_OPTO_DIVNODE_HPP
+#define SHARE_OPTO_DIVNODE_HPP
 
 #include "opto/multnode.hpp"
 #include "opto/node.hpp"
@@ -184,4 +184,4 @@
   static DivModLNode* make(Node* div_or_mod);
 };
 
-#endif // SHARE_VM_OPTO_DIVNODE_HPP
+#endif // SHARE_OPTO_DIVNODE_HPP
--- a/src/hotspot/share/opto/escape.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/escape.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_ESCAPE_HPP
-#define SHARE_VM_OPTO_ESCAPE_HPP
+#ifndef SHARE_OPTO_ESCAPE_HPP
+#define SHARE_OPTO_ESCAPE_HPP
 
 #include "opto/addnode.hpp"
 #include "opto/node.hpp"
@@ -615,4 +615,4 @@
   assert(n != NULL && es != UnknownEscape, "sanity");
 }
 
-#endif // SHARE_VM_OPTO_ESCAPE_HPP
+#endif // SHARE_OPTO_ESCAPE_HPP
--- a/src/hotspot/share/opto/graphKit.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/graphKit.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_GRAPHKIT_HPP
-#define SHARE_VM_OPTO_GRAPHKIT_HPP
+#ifndef SHARE_OPTO_GRAPHKIT_HPP
+#define SHARE_OPTO_GRAPHKIT_HPP
 
 #include "ci/ciEnv.hpp"
 #include "ci/ciMethodData.hpp"
@@ -927,4 +927,4 @@
   ~PreserveReexecuteState();
 };
 
-#endif // SHARE_VM_OPTO_GRAPHKIT_HPP
+#endif // SHARE_OPTO_GRAPHKIT_HPP
--- a/src/hotspot/share/opto/idealGraphPrinter.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/idealGraphPrinter.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_IDEALGRAPHPRINTER_HPP
-#define SHARE_VM_OPTO_IDEALGRAPHPRINTER_HPP
+#ifndef SHARE_OPTO_IDEALGRAPHPRINTER_HPP
+#define SHARE_OPTO_IDEALGRAPHPRINTER_HPP
 
 #include "libadt/dict.hpp"
 #include "libadt/vectset.hpp"
@@ -139,4 +139,4 @@
 
 #endif
 
-#endif // SHARE_VM_OPTO_IDEALGRAPHPRINTER_HPP
+#endif // SHARE_OPTO_IDEALGRAPHPRINTER_HPP
--- a/src/hotspot/share/opto/idealKit.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/idealKit.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_IDEALKIT_HPP
-#define SHARE_VM_OPTO_IDEALKIT_HPP
+#ifndef SHARE_OPTO_IDEALKIT_HPP
+#define SHARE_OPTO_IDEALKIT_HPP
 
 #include "opto/addnode.hpp"
 #include "opto/cfgnode.hpp"
@@ -260,4 +260,4 @@
                             Node* parm3);
 };
 
-#endif // SHARE_VM_OPTO_IDEALKIT_HPP
+#endif // SHARE_OPTO_IDEALKIT_HPP
--- a/src/hotspot/share/opto/indexSet.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/indexSet.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_INDEXSET_HPP
-#define SHARE_VM_OPTO_INDEXSET_HPP
+#ifndef SHARE_OPTO_INDEXSET_HPP
+#define SHARE_OPTO_INDEXSET_HPP
 
 #include "memory/allocation.hpp"
 #include "memory/resourceArea.hpp"
@@ -468,4 +468,4 @@
   }
 };
 
-#endif // SHARE_VM_OPTO_INDEXSET_HPP
+#endif // SHARE_OPTO_INDEXSET_HPP
--- a/src/hotspot/share/opto/intrinsicnode.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/intrinsicnode.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_INTRINSICNODE_HPP
-#define SHARE_VM_OPTO_INTRINSICNODE_HPP
+#ifndef SHARE_OPTO_INTRINSICNODE_HPP
+#define SHARE_OPTO_INTRINSICNODE_HPP
 
 #include "opto/node.hpp"
 #include "opto/opcodes.hpp"
@@ -216,4 +216,4 @@
   virtual uint ideal_reg() const { return Op_RegI; }
 };
 
-#endif // SHARE_VM_OPTO_INTRINSICNODE_HPP
+#endif // SHARE_OPTO_INTRINSICNODE_HPP
--- a/src/hotspot/share/opto/live.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/live.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_LIVE_HPP
-#define SHARE_VM_OPTO_LIVE_HPP
+#ifndef SHARE_OPTO_LIVE_HPP
+#define SHARE_OPTO_LIVE_HPP
 
 #include "libadt/vectset.hpp"
 #include "opto/block.hpp"
@@ -90,4 +90,4 @@
 #endif
 };
 
-#endif // SHARE_VM_OPTO_LIVE_HPP
+#endif // SHARE_OPTO_LIVE_HPP
--- a/src/hotspot/share/opto/locknode.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/locknode.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_LOCKNODE_HPP
-#define SHARE_VM_OPTO_LOCKNODE_HPP
+#ifndef SHARE_OPTO_LOCKNODE_HPP
+#define SHARE_OPTO_LOCKNODE_HPP
 
 #include "opto/node.hpp"
 #include "opto/opcodes.hpp"
@@ -128,4 +128,4 @@
 
 };
 
-#endif // SHARE_VM_OPTO_LOCKNODE_HPP
+#endif // SHARE_OPTO_LOCKNODE_HPP
--- a/src/hotspot/share/opto/loopnode.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/loopnode.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_LOOPNODE_HPP
-#define SHARE_VM_OPTO_LOOPNODE_HPP
+#ifndef SHARE_OPTO_LOOPNODE_HPP
+#define SHARE_OPTO_LOOPNODE_HPP
 
 #include "opto/cfgnode.hpp"
 #include "opto/multnode.hpp"
@@ -1428,4 +1428,4 @@
   IdealLoopTree* current() { return _curnt; }  // Return current value of iterator.
 };
 
-#endif // SHARE_VM_OPTO_LOOPNODE_HPP
+#endif // SHARE_OPTO_LOOPNODE_HPP
--- a/src/hotspot/share/opto/machnode.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/machnode.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_MACHNODE_HPP
-#define SHARE_VM_OPTO_MACHNODE_HPP
+#ifndef SHARE_OPTO_MACHNODE_HPP
+#define SHARE_OPTO_MACHNODE_HPP
 
 #include "opto/callnode.hpp"
 #include "opto/matcher.hpp"
@@ -1102,4 +1102,4 @@
 #endif
 };
 
-#endif // SHARE_VM_OPTO_MACHNODE_HPP
+#endif // SHARE_OPTO_MACHNODE_HPP
--- a/src/hotspot/share/opto/macro.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/macro.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_MACRO_HPP
-#define SHARE_VM_OPTO_MACRO_HPP
+#ifndef SHARE_OPTO_MACRO_HPP
+#define SHARE_OPTO_MACRO_HPP
 
 #include "opto/phase.hpp"
 
@@ -217,4 +217,4 @@
                             intx lines);
 };
 
-#endif // SHARE_VM_OPTO_MACRO_HPP
+#endif // SHARE_OPTO_MACRO_HPP
--- a/src/hotspot/share/opto/matcher.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/matcher.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_MATCHER_HPP
-#define SHARE_VM_OPTO_MATCHER_HPP
+#ifndef SHARE_OPTO_MATCHER_HPP
+#define SHARE_OPTO_MATCHER_HPP
 
 #include "libadt/vectset.hpp"
 #include "memory/resourceArea.hpp"
@@ -564,4 +564,4 @@
 #endif
 };
 
-#endif // SHARE_VM_OPTO_MATCHER_HPP
+#endif // SHARE_OPTO_MATCHER_HPP
--- a/src/hotspot/share/opto/mathexactnode.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/mathexactnode.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_MATHEXACTNODE_HPP
-#define SHARE_VM_OPTO_MATHEXACTNODE_HPP
+#ifndef SHARE_OPTO_MATHEXACTNODE_HPP
+#define SHARE_OPTO_MATHEXACTNODE_HPP
 
 #include "opto/multnode.hpp"
 #include "opto/node.hpp"
@@ -135,5 +135,4 @@
   static bool is_overflow(jlong v1, jlong v2);
 };
 
-#endif
-
+#endif // SHARE_OPTO_MATHEXACTNODE_HPP
--- a/src/hotspot/share/opto/memnode.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/memnode.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_MEMNODE_HPP
-#define SHARE_VM_OPTO_MEMNODE_HPP
+#ifndef SHARE_OPTO_MEMNODE_HPP
+#define SHARE_OPTO_MEMNODE_HPP
 
 #include "opto/multnode.hpp"
 #include "opto/node.hpp"
@@ -1640,4 +1640,4 @@
   virtual const Type *bottom_type() const { return ( AllocatePrefetchStyle == 3 ) ? Type::MEMORY : Type::ABIO; }
 };
 
-#endif // SHARE_VM_OPTO_MEMNODE_HPP
+#endif // SHARE_OPTO_MEMNODE_HPP
--- a/src/hotspot/share/opto/movenode.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/movenode.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_MOVENODE_HPP
-#define SHARE_VM_OPTO_MOVENODE_HPP
+#ifndef SHARE_OPTO_MOVENODE_HPP
+#define SHARE_OPTO_MOVENODE_HPP
 
 #include "opto/node.hpp"
 
@@ -152,5 +152,4 @@
 };
 
 
-#endif // SHARE_VM_OPTO_MOVENODE_HPP
-
+#endif // SHARE_OPTO_MOVENODE_HPP
--- a/src/hotspot/share/opto/mulnode.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/mulnode.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_MULNODE_HPP
-#define SHARE_VM_OPTO_MULNODE_HPP
+#ifndef SHARE_OPTO_MULNODE_HPP
+#define SHARE_OPTO_MULNODE_HPP
 
 #include "opto/node.hpp"
 #include "opto/opcodes.hpp"
@@ -296,4 +296,4 @@
   virtual uint ideal_reg() const { return Op_RegI; }
 };
 
-#endif // SHARE_VM_OPTO_MULNODE_HPP
+#endif // SHARE_OPTO_MULNODE_HPP
--- a/src/hotspot/share/opto/multnode.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/multnode.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_MULTNODE_HPP
-#define SHARE_VM_OPTO_MULTNODE_HPP
+#ifndef SHARE_OPTO_MULTNODE_HPP
+#define SHARE_OPTO_MULTNODE_HPP
 
 #include "opto/node.hpp"
 
@@ -105,4 +105,4 @@
   ProjNode* other_if_proj() const;
 };
 
-#endif // SHARE_VM_OPTO_MULTNODE_HPP
+#endif // SHARE_OPTO_MULTNODE_HPP
--- a/src/hotspot/share/opto/narrowptrnode.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/narrowptrnode.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_NARROWPTRNODE_HPP
-#define SHARE_VM_OPTO_NARROWPTRNODE_HPP
+#ifndef SHARE_OPTO_NARROWPTRNODE_HPP
+#define SHARE_OPTO_NARROWPTRNODE_HPP
 
 #include "opto/node.hpp"
 #include "opto/opcodes.hpp"
@@ -114,5 +114,4 @@
   virtual Node* Identity(PhaseGVN* phase);
 };
 
-#endif // SHARE_VM_OPTO_NARROWPTRNODE_HPP
-
+#endif // SHARE_OPTO_NARROWPTRNODE_HPP
--- a/src/hotspot/share/opto/node.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/node.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_NODE_HPP
-#define SHARE_VM_OPTO_NODE_HPP
+#ifndef SHARE_OPTO_NODE_HPP
+#define SHARE_OPTO_NODE_HPP
 
 #include "libadt/vectset.hpp"
 #include "opto/compile.hpp"
@@ -1742,4 +1742,4 @@
 #endif
 };
 
-#endif // SHARE_VM_OPTO_NODE_HPP
+#endif // SHARE_OPTO_NODE_HPP
--- a/src/hotspot/share/opto/opaquenode.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/opaquenode.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_OPAQUENODE_HPP
-#define SHARE_VM_OPTO_OPAQUENODE_HPP
+#ifndef SHARE_OPTO_OPAQUENODE_HPP
+#define SHARE_OPTO_OPAQUENODE_HPP
 
 #include "opto/node.hpp"
 #include "opto/opcodes.hpp"
@@ -133,5 +133,4 @@
   virtual const Type *bottom_type() const { return TypeInt::BOOL; }
 };
 
-#endif // SHARE_VM_OPTO_OPAQUENODE_HPP
-
+#endif // SHARE_OPTO_OPAQUENODE_HPP
--- a/src/hotspot/share/opto/opcodes.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/opcodes.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_OPCODES_HPP
-#define SHARE_VM_OPTO_OPCODES_HPP
+#ifndef SHARE_OPTO_OPCODES_HPP
+#define SHARE_OPTO_OPCODES_HPP
 
 // Build a big enum of class names to give them dense integer indices
 #define macro(x) Op_##x,
@@ -53,4 +53,4 @@
 // Table of names, indexed by Opcode
 extern const char *NodeClassNames[];
 
-#endif // SHARE_VM_OPTO_OPCODES_HPP
+#endif // SHARE_OPTO_OPCODES_HPP
--- a/src/hotspot/share/opto/optoreg.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/optoreg.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_OPTOREG_HPP
-#define SHARE_VM_OPTO_OPTOREG_HPP
+#ifndef SHARE_OPTO_OPTOREG_HPP
+#define SHARE_OPTO_OPTOREG_HPP
 
 #include "utilities/macros.hpp"
 
@@ -207,4 +207,4 @@
   OptoRegPair() { _second = OptoReg::Bad; _first = OptoReg::Bad; }
 };
 
-#endif // SHARE_VM_OPTO_OPTOREG_HPP
+#endif // SHARE_OPTO_OPTOREG_HPP
--- a/src/hotspot/share/opto/output.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/output.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_OUTPUT_HPP
-#define SHARE_VM_OPTO_OUTPUT_HPP
+#ifndef SHARE_OPTO_OUTPUT_HPP
+#define SHARE_OPTO_OUTPUT_HPP
 
 #include "opto/ad.hpp"
 #include "opto/block.hpp"
@@ -218,4 +218,4 @@
 
 };
 
-#endif // SHARE_VM_OPTO_OUTPUT_HPP
+#endif // SHARE_OPTO_OUTPUT_HPP
--- a/src/hotspot/share/opto/parse.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/parse.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_PARSE_HPP
-#define SHARE_VM_OPTO_PARSE_HPP
+#ifndef SHARE_OPTO_PARSE_HPP
+#define SHARE_OPTO_PARSE_HPP
 
 #include "ci/ciMethodData.hpp"
 #include "ci/ciTypeFlow.hpp"
@@ -629,4 +629,4 @@
 #endif
 };
 
-#endif // SHARE_VM_OPTO_PARSE_HPP
+#endif // SHARE_OPTO_PARSE_HPP
--- a/src/hotspot/share/opto/phase.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/phase.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_PHASE_HPP
-#define SHARE_VM_OPTO_PHASE_HPP
+#ifndef SHARE_OPTO_PHASE_HPP
+#define SHARE_OPTO_PHASE_HPP
 
 #include "runtime/timer.hpp"
 
@@ -140,4 +140,4 @@
   static void print_timers();
 };
 
-#endif // SHARE_VM_OPTO_PHASE_HPP
+#endif // SHARE_OPTO_PHASE_HPP
--- a/src/hotspot/share/opto/phaseX.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/phaseX.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_PHASEX_HPP
-#define SHARE_VM_OPTO_PHASEX_HPP
+#ifndef SHARE_OPTO_PHASEX_HPP
+#define SHARE_OPTO_PHASEX_HPP
 
 #include "libadt/dict.hpp"
 #include "libadt/vectset.hpp"
@@ -639,4 +639,4 @@
 #endif
 };
 
-#endif // SHARE_VM_OPTO_PHASEX_HPP
+#endif // SHARE_OPTO_PHASEX_HPP
--- a/src/hotspot/share/opto/phasetype.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/phasetype.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_PHASETYPE_HPP
-#define SHARE_VM_OPTO_PHASETYPE_HPP
+#ifndef SHARE_OPTO_PHASETYPE_HPP
+#define SHARE_OPTO_PHASETYPE_HPP
 
 enum CompilerPhaseType {
   PHASE_BEFORE_STRINGOPTS,
@@ -101,4 +101,4 @@
   }
 };
 
-#endif //SHARE_VM_OPTO_PHASETYPE_HPP
+#endif // SHARE_OPTO_PHASETYPE_HPP
--- a/src/hotspot/share/opto/regalloc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/regalloc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_REGALLOC_HPP
-#define SHARE_VM_OPTO_REGALLOC_HPP
+#ifndef SHARE_OPTO_REGALLOC_HPP
+#define SHARE_OPTO_REGALLOC_HPP
 
 #include "code/vmreg.hpp"
 #include "opto/block.hpp"
@@ -132,4 +132,4 @@
 #endif
 };
 
-#endif // SHARE_VM_OPTO_REGALLOC_HPP
+#endif // SHARE_OPTO_REGALLOC_HPP
--- a/src/hotspot/share/opto/regmask.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/regmask.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_REGMASK_HPP
-#define SHARE_VM_OPTO_REGMASK_HPP
+#ifndef SHARE_OPTO_REGMASK_HPP
+#define SHARE_OPTO_REGMASK_HPP
 
 #include "code/vmreg.hpp"
 #include "opto/optoreg.hpp"
@@ -313,4 +313,4 @@
 // Do not use this constant directly in client code!
 #undef RM_SIZE
 
-#endif // SHARE_VM_OPTO_REGMASK_HPP
+#endif // SHARE_OPTO_REGMASK_HPP
--- a/src/hotspot/share/opto/replacednodes.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/replacednodes.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_REPLACEDNODES_HPP
-#define SHARE_VM_OPTO_REPLACEDNODES_HPP
+#ifndef SHARE_OPTO_REPLACEDNODES_HPP
+#define SHARE_OPTO_REPLACEDNODES_HPP
 
 #include "opto/connode.hpp"
 
@@ -78,4 +78,4 @@
   void apply(Compile* C, Node* ctl);
 };
 
-#endif // SHARE_VM_OPTO_REPLACEDNODES_HPP
+#endif // SHARE_OPTO_REPLACEDNODES_HPP
--- a/src/hotspot/share/opto/rootnode.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/rootnode.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_ROOTNODE_HPP
-#define SHARE_VM_OPTO_ROOTNODE_HPP
+#ifndef SHARE_OPTO_ROOTNODE_HPP
+#define SHARE_OPTO_ROOTNODE_HPP
 
 #include "opto/loopnode.hpp"
 
@@ -70,4 +70,4 @@
 #endif
 };
 
-#endif // SHARE_VM_OPTO_ROOTNODE_HPP
+#endif // SHARE_OPTO_ROOTNODE_HPP
--- a/src/hotspot/share/opto/runtime.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/runtime.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_RUNTIME_HPP
-#define SHARE_VM_OPTO_RUNTIME_HPP
+#ifndef SHARE_OPTO_RUNTIME_HPP
+#define SHARE_OPTO_RUNTIME_HPP
 
 #include "code/codeBlob.hpp"
 #include "opto/machnode.hpp"
@@ -331,4 +331,4 @@
 
 };
 
-#endif // SHARE_VM_OPTO_RUNTIME_HPP
+#endif // SHARE_OPTO_RUNTIME_HPP
--- a/src/hotspot/share/opto/stringopts.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/stringopts.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_STRINGOPTS_HPP
-#define SHARE_VM_OPTO_STRINGOPTS_HPP
+#ifndef SHARE_OPTO_STRINGOPTS_HPP
+#define SHARE_OPTO_STRINGOPTS_HPP
 
 #include "opto/node.hpp"
 #include "opto/phaseX.hpp"
@@ -115,4 +115,4 @@
   PhaseStringOpts(PhaseGVN* gvn, Unique_Node_List* worklist);
 };
 
-#endif // SHARE_VM_OPTO_STRINGOPTS_HPP
+#endif // SHARE_OPTO_STRINGOPTS_HPP
--- a/src/hotspot/share/opto/subnode.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/subnode.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_SUBNODE_HPP
-#define SHARE_VM_OPTO_SUBNODE_HPP
+#ifndef SHARE_OPTO_SUBNODE_HPP
+#define SHARE_OPTO_SUBNODE_HPP
 
 #include "opto/node.hpp"
 #include "opto/opcodes.hpp"
@@ -502,4 +502,4 @@
   virtual uint ideal_reg() const { return Op_RegI; }
 };
 
-#endif // SHARE_VM_OPTO_SUBNODE_HPP
+#endif // SHARE_OPTO_SUBNODE_HPP
--- a/src/hotspot/share/opto/superword.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/superword.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  */
 
-#ifndef SHARE_VM_OPTO_SUPERWORD_HPP
-#define SHARE_VM_OPTO_SUPERWORD_HPP
+#ifndef SHARE_OPTO_SUPERWORD_HPP
+#define SHARE_OPTO_SUPERWORD_HPP
 
 #include "opto/loopnode.hpp"
 #include "opto/node.hpp"
@@ -695,4 +695,4 @@
 #endif
 };
 
-#endif // SHARE_VM_OPTO_SUPERWORD_HPP
+#endif // SHARE_OPTO_SUPERWORD_HPP
--- a/src/hotspot/share/opto/type.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/type.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_OPTO_TYPE_HPP
-#define SHARE_VM_OPTO_TYPE_HPP
+#ifndef SHARE_OPTO_TYPE_HPP
+#define SHARE_OPTO_TYPE_HPP
 
 #include "opto/adlcVMDeps.hpp"
 #include "runtime/handles.hpp"
@@ -1845,4 +1845,4 @@
 
 #endif
 
-#endif // SHARE_VM_OPTO_TYPE_HPP
+#endif // SHARE_OPTO_TYPE_HPP
--- a/src/hotspot/share/opto/vectornode.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/opto/vectornode.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,8 +21,8 @@
  * questions.
  */
 
-#ifndef SHARE_VM_OPTO_VECTORNODE_HPP
-#define SHARE_VM_OPTO_VECTORNODE_HPP
+#ifndef SHARE_OPTO_VECTORNODE_HPP
+#define SHARE_OPTO_VECTORNODE_HPP
 
 #include "opto/matcher.hpp"
 #include "opto/memnode.hpp"
@@ -859,4 +859,4 @@
   virtual const Type *Value(PhaseGVN *phase) const { return TypeInt::INT; }
 };
 
-#endif // SHARE_VM_OPTO_VECTORNODE_HPP
+#endif // SHARE_OPTO_VECTORNODE_HPP
--- a/src/hotspot/share/prims/forte.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/prims/forte.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_PRIMS_FORTE_HPP
-#define SHARE_VM_PRIMS_FORTE_HPP
+#ifndef SHARE_PRIMS_FORTE_HPP
+#define SHARE_PRIMS_FORTE_HPP
 
 // Interface to Forte support.
 
@@ -34,4 +34,4 @@
                                                  // register internal VM stub
 };
 
-#endif // SHARE_VM_PRIMS_FORTE_HPP
+#endif // SHARE_PRIMS_FORTE_HPP
--- a/src/hotspot/share/prims/jniCheck.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/prims/jniCheck.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_PRIMS_JNICHECK_HPP
-#define SHARE_VM_PRIMS_JNICHECK_HPP
+#ifndef SHARE_PRIMS_JNICHECK_HPP
+#define SHARE_PRIMS_JNICHECK_HPP
 
 #include "runtime/thread.hpp"
 
@@ -56,4 +56,4 @@
   static Method* validate_jmethod_id(JavaThread* thr, jmethodID method_id);
 };
 
-#endif // SHARE_VM_PRIMS_JNICHECK_HPP
+#endif // SHARE_PRIMS_JNICHECK_HPP
--- a/src/hotspot/share/prims/jniExport.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/prims/jniExport.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_PRIMS_JNI_EXPORT_HPP
-#define SHARE_VM_PRIMS_JNI_EXPORT_HPP
+#ifndef SHARE_PRIMS_JNIEXPORT_HPP
+#define SHARE_PRIMS_JNIEXPORT_HPP
 
 #include "jni.h"
 #include "prims/jvmtiExport.hpp"
@@ -39,4 +39,4 @@
   }
 };
 
-#endif // SHARE_VM_PRIMS_JNI_EXPORT_HPP
+#endif // SHARE_PRIMS_JNIEXPORT_HPP
--- a/src/hotspot/share/prims/jniFastGetField.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/prims/jniFastGetField.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_PRIMS_JNIFASTGETFIELD_HPP
-#define SHARE_VM_PRIMS_JNIFASTGETFIELD_HPP
+#ifndef SHARE_PRIMS_JNIFASTGETFIELD_HPP
+#define SHARE_PRIMS_JNIFASTGETFIELD_HPP
 
 #include "memory/allocation.hpp"
 #include "prims/jvm_misc.hpp"
@@ -99,4 +99,4 @@
   static address find_slowcase_pc(address pc);
 };
 
-#endif // SHARE_VM_PRIMS_JNIFASTGETFIELD_HPP
+#endif // SHARE_PRIMS_JNIFASTGETFIELD_HPP
--- a/src/hotspot/share/prims/jvm_misc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/prims/jvm_misc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_PRIMS_JVM_MISC_HPP
-#define SHARE_VM_PRIMS_JVM_MISC_HPP
+#ifndef SHARE_PRIMS_JVM_MISC_HPP
+#define SHARE_PRIMS_JVM_MISC_HPP
 
 #include "jni.h"
 #include "runtime/handles.hpp"
@@ -78,4 +78,4 @@
 address jni_GetFloatField_addr();
 address jni_GetDoubleField_addr();
 
-#endif // SHARE_VM_PRIMS_JVM_MISC_HPP
+#endif // SHARE_PRIMS_JVM_MISC_HPP
--- a/src/hotspot/share/prims/jvmtiAgentThread.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/prims/jvmtiAgentThread.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_PRIMS_JVMTIAGENTTHREAD_HPP
-#define SHARE_VM_PRIMS_JVMTIAGENTTHREAD_HPP
+#ifndef SHARE_PRIMS_JVMTIAGENTTHREAD_HPP
+#define SHARE_PRIMS_JVMTIAGENTTHREAD_HPP
 
 #include "jvmtifiles/jvmtiEnv.hpp"
 
@@ -48,4 +48,4 @@
   void call_start_function();
 };
 
-#endif // SHARE_VM_PRIMS_JVMTIAGENTTHREAD_HPP
+#endif // SHARE_PRIMS_JVMTIAGENTTHREAD_HPP
--- a/src/hotspot/share/prims/jvmtiClassFileReconstituter.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/prims/jvmtiClassFileReconstituter.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_PRIMS_JVMTICLASSFILERECONSTITUTER_HPP
-#define SHARE_VM_PRIMS_JVMTICLASSFILERECONSTITUTER_HPP
+#ifndef SHARE_PRIMS_JVMTICLASSFILERECONSTITUTER_HPP
+#define SHARE_PRIMS_JVMTICLASSFILERECONSTITUTER_HPP
 
 #include "jvmtifiles/jvmtiEnv.hpp"
 
@@ -143,4 +143,4 @@
   static void copy_bytecodes(const methodHandle& method, unsigned char* bytecodes);
 };
 
-#endif // SHARE_VM_PRIMS_JVMTICLASSFILERECONSTITUTER_HPP
+#endif // SHARE_PRIMS_JVMTICLASSFILERECONSTITUTER_HPP
--- a/src/hotspot/share/prims/jvmtiCodeBlobEvents.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/prims/jvmtiCodeBlobEvents.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_PRIMS_JVMTICODEBLOBEVENTS_HPP
-#define SHARE_VM_PRIMS_JVMTICODEBLOBEVENTS_HPP
+#ifndef SHARE_PRIMS_JVMTICODEBLOBEVENTS_HPP
+#define SHARE_PRIMS_JVMTICODEBLOBEVENTS_HPP
 
 #include "jvmtifiles/jvmti.h"
 
@@ -53,4 +53,4 @@
                                             jint *map_length);
 };
 
-#endif // SHARE_VM_PRIMS_JVMTICODEBLOBEVENTS_HPP
+#endif // SHARE_PRIMS_JVMTICODEBLOBEVENTS_HPP
--- a/src/hotspot/share/prims/jvmtiEnter.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/prims/jvmtiEnter.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_PRIMS_JVMTIENTER_INLINE_HPP
-#define SHARE_VM_PRIMS_JVMTIENTER_INLINE_HPP
+#ifndef SHARE_PRIMS_JVMTIENTER_INLINE_HPP
+#define SHARE_PRIMS_JVMTIENTER_INLINE_HPP
 
 #include "classfile/systemDictionary.hpp"
 #include "jvmtifiles/jvmtiEnv.hpp"
@@ -31,4 +31,4 @@
 #include "prims/jvmtiImpl.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 
-#endif // SHARE_VM_PRIMS_JVMTIENTER_INLINE_HPP
+#endif // SHARE_PRIMS_JVMTIENTER_INLINE_HPP
--- a/src/hotspot/share/prims/jvmtiEnvBase.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/prims/jvmtiEnvBase.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_PRIMS_JVMTIENVBASE_HPP
-#define SHARE_VM_PRIMS_JVMTIENVBASE_HPP
+#ifndef SHARE_PRIMS_JVMTIENVBASE_HPP
+#define SHARE_PRIMS_JVMTIENVBASE_HPP
 
 #include "classfile/classLoader.hpp"
 #include "prims/jvmtiEnvThreadState.hpp"
@@ -644,4 +644,4 @@
   jvmtiError get_all_modules(JvmtiEnv* env, jint* module_count_ptr, jobject** modules_ptr);
 };
 
-#endif // SHARE_VM_PRIMS_JVMTIENVBASE_HPP
+#endif // SHARE_PRIMS_JVMTIENVBASE_HPP
--- a/src/hotspot/share/prims/jvmtiEnvThreadState.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/prims/jvmtiEnvThreadState.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_PRIMS_JVMTIENVTHREADSTATE_HPP
-#define SHARE_VM_PRIMS_JVMTIENVTHREADSTATE_HPP
+#ifndef SHARE_PRIMS_JVMTIENVTHREADSTATE_HPP
+#define SHARE_PRIMS_JVMTIENVTHREADSTATE_HPP
 
 #include "jvmtifiles/jvmti.h"
 #include "memory/allocation.hpp"
@@ -182,4 +182,4 @@
 
 };
 
-#endif // SHARE_VM_PRIMS_JVMTIENVTHREADSTATE_HPP
+#endif // SHARE_PRIMS_JVMTIENVTHREADSTATE_HPP
--- a/src/hotspot/share/prims/jvmtiEventController.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/prims/jvmtiEventController.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_PRIMS_JVMTIEVENTCONTROLLER_HPP
-#define SHARE_VM_PRIMS_JVMTIEVENTCONTROLLER_HPP
+#ifndef SHARE_PRIMS_JVMTIEVENTCONTROLLER_HPP
+#define SHARE_PRIMS_JVMTIEVENTCONTROLLER_HPP
 
 #include "jvmtifiles/jvmti.h"
 #include "memory/allocation.hpp"
@@ -241,4 +241,4 @@
   static void vm_death();
 };
 
-#endif // SHARE_VM_PRIMS_JVMTIEVENTCONTROLLER_HPP
+#endif // SHARE_PRIMS_JVMTIEVENTCONTROLLER_HPP
--- a/src/hotspot/share/prims/jvmtiEventController.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/prims/jvmtiEventController.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_PRIMS_JVMTIEVENTCONTROLLER_INLINE_HPP
-#define SHARE_VM_PRIMS_JVMTIEVENTCONTROLLER_INLINE_HPP
+#ifndef SHARE_PRIMS_JVMTIEVENTCONTROLLER_INLINE_HPP
+#define SHARE_PRIMS_JVMTIEVENTCONTROLLER_INLINE_HPP
 
 #include "prims/jvmtiEventController.hpp"
 #include "prims/jvmtiImpl.hpp"
@@ -107,4 +107,4 @@
   return _universal_global_event_enabled.is_enabled(event_type);
 }
 
-#endif // SHARE_VM_PRIMS_JVMTIEVENTCONTROLLER_INLINE_HPP
+#endif // SHARE_PRIMS_JVMTIEVENTCONTROLLER_INLINE_HPP
--- a/src/hotspot/share/prims/jvmtiExport.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/prims/jvmtiExport.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_PRIMS_JVMTIEXPORT_HPP
-#define SHARE_VM_PRIMS_JVMTIEXPORT_HPP
+#ifndef SHARE_PRIMS_JVMTIEXPORT_HPP
+#define SHARE_PRIMS_JVMTIEXPORT_HPP
 
 #include "jvmtifiles/jvmti.h"
 #include "memory/allocation.hpp"
@@ -601,4 +601,4 @@
   }
 };
 
-#endif // SHARE_VM_PRIMS_JVMTIEXPORT_HPP
+#endif // SHARE_PRIMS_JVMTIEXPORT_HPP
--- a/src/hotspot/share/prims/jvmtiExtensions.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/prims/jvmtiExtensions.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_PRIMS_JVMTIEXTENSIONS_HPP
-#define SHARE_VM_PRIMS_JVMTIEXTENSIONS_HPP
+#ifndef SHARE_PRIMS_JVMTIEXTENSIONS_HPP
+#define SHARE_PRIMS_JVMTIEXTENSIONS_HPP
 
 #include "jvmtifiles/jvmti.h"
 #include "jvmtifiles/jvmtiEnv.hpp"
@@ -58,4 +58,4 @@
                                        jvmtiExtensionEvent callback);
 };
 
-#endif // SHARE_VM_PRIMS_JVMTIEXTENSIONS_HPP
+#endif // SHARE_PRIMS_JVMTIEXTENSIONS_HPP
--- a/src/hotspot/share/prims/jvmtiGetLoadedClasses.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/prims/jvmtiGetLoadedClasses.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_PRIMS_JVMTIGETLOADEDCLASSES_HPP
-#define SHARE_VM_PRIMS_JVMTIGETLOADEDCLASSES_HPP
+#ifndef SHARE_PRIMS_JVMTIGETLOADEDCLASSES_HPP
+#define SHARE_PRIMS_JVMTIGETLOADEDCLASSES_HPP
 
 #include "jvmtifiles/jvmtiEnv.hpp"
 
@@ -34,4 +34,4 @@
                                           jint* classCountPtr, jclass** classesPtr);
 };
 
-#endif // SHARE_VM_PRIMS_JVMTIGETLOADEDCLASSES_HPP
+#endif // SHARE_PRIMS_JVMTIGETLOADEDCLASSES_HPP
--- a/src/hotspot/share/prims/jvmtiImpl.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/prims/jvmtiImpl.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_PRIMS_JVMTIIMPL_HPP
-#define SHARE_VM_PRIMS_JVMTIIMPL_HPP
+#ifndef SHARE_PRIMS_JVMTIIMPL_HPP
+#define SHARE_PRIMS_JVMTIIMPL_HPP
 
 #include "classfile/systemDictionary.hpp"
 #include "jvmtifiles/jvmti.h"
@@ -532,4 +532,4 @@
 // Utility macro that checks for NULL pointers:
 #define NULL_CHECK(X, Y) if ((X) == NULL) { return (Y); }
 
-#endif // SHARE_VM_PRIMS_JVMTIIMPL_HPP
+#endif // SHARE_PRIMS_JVMTIIMPL_HPP
--- a/src/hotspot/share/prims/jvmtiManageCapabilities.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/prims/jvmtiManageCapabilities.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_PRIMS_JVMTIMANAGECAPABILITIES_HPP
-#define SHARE_VM_PRIMS_JVMTIMANAGECAPABILITIES_HPP
+#ifndef SHARE_PRIMS_JVMTIMANAGECAPABILITIES_HPP
+#define SHARE_PRIMS_JVMTIMANAGECAPABILITIES_HPP
 
 #include "jvmtifiles/jvmti.h"
 #include "memory/allocation.hpp"
@@ -82,4 +82,4 @@
 #endif
 };
 
-#endif // SHARE_VM_PRIMS_JVMTIMANAGECAPABILITIES_HPP
+#endif // SHARE_PRIMS_JVMTIMANAGECAPABILITIES_HPP
--- a/src/hotspot/share/prims/jvmtiRawMonitor.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/prims/jvmtiRawMonitor.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_PRIMS_JVMTIRAWMONITOR_HPP
-#define SHARE_VM_PRIMS_JVMTIRAWMONITOR_HPP
+#ifndef SHARE_PRIMS_JVMTIRAWMONITOR_HPP
+#define SHARE_PRIMS_JVMTIRAWMONITOR_HPP
 
 #include "runtime/objectMonitor.hpp"
 #include "utilities/growableArray.hpp"
@@ -104,4 +104,4 @@
   static void transition_raw_monitors();
 };
 
-#endif // SHARE_VM_PRIMS_JVMTIRAWMONITOR_HPP
+#endif // SHARE_PRIMS_JVMTIRAWMONITOR_HPP
--- a/src/hotspot/share/prims/jvmtiRedefineClasses.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/prims/jvmtiRedefineClasses.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_PRIMS_JVMTIREDEFINECLASSES_HPP
-#define SHARE_VM_PRIMS_JVMTIREDEFINECLASSES_HPP
+#ifndef SHARE_PRIMS_JVMTIREDEFINECLASSES_HPP
+#define SHARE_PRIMS_JVMTIREDEFINECLASSES_HPP
 
 #include "jvmtifiles/jvmtiEnv.hpp"
 #include "memory/oopFactory.hpp"
@@ -552,4 +552,4 @@
   // Error printing
   void print_on_error(outputStream* st) const;
 };
-#endif // SHARE_VM_PRIMS_JVMTIREDEFINECLASSES_HPP
+#endif // SHARE_PRIMS_JVMTIREDEFINECLASSES_HPP
--- a/src/hotspot/share/prims/jvmtiTagMap.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/prims/jvmtiTagMap.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,8 +24,8 @@
 
 // JvmtiTagMap
 
-#ifndef SHARE_VM_PRIMS_JVMTITAGMAP_HPP
-#define SHARE_VM_PRIMS_JVMTITAGMAP_HPP
+#ifndef SHARE_PRIMS_JVMTITAGMAP_HPP
+#define SHARE_PRIMS_JVMTITAGMAP_HPP
 
 #include "gc/shared/collectedHeap.hpp"
 #include "jvmtifiles/jvmti.h"
@@ -125,4 +125,4 @@
       BoolObjectClosure* is_alive, OopClosure* f) NOT_JVMTI_RETURN;
 };
 
-#endif // SHARE_VM_PRIMS_JVMTITAGMAP_HPP
+#endif // SHARE_PRIMS_JVMTITAGMAP_HPP
--- a/src/hotspot/share/prims/jvmtiThreadState.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/prims/jvmtiThreadState.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_PRIMS_JVMTITHREADSTATE_HPP
-#define SHARE_VM_PRIMS_JVMTITHREADSTATE_HPP
+#ifndef SHARE_PRIMS_JVMTITHREADSTATE_HPP
+#define SHARE_PRIMS_JVMTITHREADSTATE_HPP
 
 #include "jvmtifiles/jvmti.h"
 #include "memory/allocation.hpp"
@@ -413,4 +413,4 @@
   }
 };
 
-#endif // SHARE_VM_PRIMS_JVMTITHREADSTATE_HPP
+#endif // SHARE_PRIMS_JVMTITHREADSTATE_HPP
--- a/src/hotspot/share/prims/jvmtiThreadState.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/prims/jvmtiThreadState.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_PRIMS_JVMTITHREADSTATE_INLINE_HPP
-#define SHARE_VM_PRIMS_JVMTITHREADSTATE_INLINE_HPP
+#ifndef SHARE_PRIMS_JVMTITHREADSTATE_INLINE_HPP
+#define SHARE_PRIMS_JVMTITHREADSTATE_INLINE_HPP
 
 #include "prims/jvmtiEnvThreadState.hpp"
 #include "prims/jvmtiThreadState.hpp"
@@ -95,4 +95,4 @@
   return state;
 }
 
-#endif // SHARE_VM_PRIMS_JVMTITHREADSTATE_INLINE_HPP
+#endif // SHARE_PRIMS_JVMTITHREADSTATE_INLINE_HPP
--- a/src/hotspot/share/prims/jvmtiTrace.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/prims/jvmtiTrace.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_PRIMS_JVMTITRACE_HPP
-#define SHARE_VM_PRIMS_JVMTITRACE_HPP
+#ifndef SHARE_PRIMS_JVMTITRACE_HPP
+#define SHARE_PRIMS_JVMTITRACE_HPP
 
 #include "classfile/systemDictionary.hpp"
 #include "jvmtifiles/jvmti.h"
@@ -109,4 +109,4 @@
 
 #endif /*JVMTI_TRACE */
 
-#endif // SHARE_VM_PRIMS_JVMTITRACE_HPP
+#endif // SHARE_PRIMS_JVMTITRACE_HPP
--- a/src/hotspot/share/prims/jvmtiUtil.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/prims/jvmtiUtil.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_PRIMS_JVMTIUTIL_HPP
-#define SHARE_VM_PRIMS_JVMTIUTIL_HPP
+#ifndef SHARE_PRIMS_JVMTIUTIL_HPP
+#define SHARE_PRIMS_JVMTIUTIL_HPP
 
 #include "jvmtifiles/jvmti.h"
 #include "memory/resourceArea.hpp"
@@ -92,4 +92,4 @@
 
 };
 
-#endif // SHARE_VM_PRIMS_JVMTIUTIL_HPP
+#endif // SHARE_PRIMS_JVMTIUTIL_HPP
--- a/src/hotspot/share/prims/methodComparator.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/prims/methodComparator.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_PRIMS_METHODCOMPARATOR_HPP
-#define SHARE_VM_PRIMS_METHODCOMPARATOR_HPP
+#ifndef SHARE_PRIMS_METHODCOMPARATOR_HPP
+#define SHARE_PRIMS_METHODCOMPARATOR_HPP
 
 #include "interpreter/bytecodeStream.hpp"
 #include "oops/constantPool.hpp"
@@ -52,4 +52,4 @@
 
 };
 
-#endif // SHARE_VM_PRIMS_METHODCOMPARATOR_HPP
+#endif // SHARE_PRIMS_METHODCOMPARATOR_HPP
--- a/src/hotspot/share/prims/methodHandles.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/prims/methodHandles.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_PRIMS_METHODHANDLES_HPP
-#define SHARE_VM_PRIMS_METHODHANDLES_HPP
+#ifndef SHARE_PRIMS_METHODHANDLES_HPP
+#define SHARE_PRIMS_METHODHANDLES_HPP
 
 #include "classfile/javaClasses.hpp"
 #include "classfile/vmSymbols.hpp"
@@ -215,4 +215,4 @@
   void generate();
 };
 
-#endif // SHARE_VM_PRIMS_METHODHANDLES_HPP
+#endif // SHARE_PRIMS_METHODHANDLES_HPP
--- a/src/hotspot/share/prims/nativeLookup.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/prims/nativeLookup.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_PRIMS_NATIVELOOKUP_HPP
-#define SHARE_VM_PRIMS_NATIVELOOKUP_HPP
+#ifndef SHARE_PRIMS_NATIVELOOKUP_HPP
+#define SHARE_PRIMS_NATIVELOOKUP_HPP
 
 #include "memory/allocation.hpp"
 #include "runtime/handles.hpp"
@@ -53,4 +53,4 @@
   static address base_library_lookup(const char* class_name, const char* method_name, const char* signature);
 };
 
-#endif // SHARE_VM_PRIMS_NATIVELOOKUP_HPP
+#endif // SHARE_PRIMS_NATIVELOOKUP_HPP
--- a/src/hotspot/share/prims/resolvedMethodTable.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/prims/resolvedMethodTable.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_PRIMS_RESOLVEDMETHOD_HPP
-#define SHARE_VM_PRIMS_RESOLVEDMETHOD_HPP
+#ifndef SHARE_PRIMS_RESOLVEDMETHODTABLE_HPP
+#define SHARE_PRIMS_RESOLVEDMETHODTABLE_HPP
 
 #include "oops/symbol.hpp"
 #include "oops/weakHandle.hpp"
@@ -110,4 +110,4 @@
   void verify();
 };
 
-#endif // SHARE_VM_PRIMS_RESOLVEDMETHOD_HPP
+#endif // SHARE_PRIMS_RESOLVEDMETHODTABLE_HPP
--- a/src/hotspot/share/prims/stackwalk.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/prims/stackwalk.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef SHARE_VM_PRIMS_STACKWALK_HPP
-#define SHARE_VM_PRIMS_STACKWALK_HPP
+#ifndef SHARE_PRIMS_STACKWALK_HPP
+#define SHARE_PRIMS_STACKWALK_HPP
 
 #include "oops/oop.hpp"
 #include "runtime/vframe.hpp"
@@ -157,4 +157,4 @@
                              int frame_count, int start_index,
                              objArrayHandle frames_array, TRAPS);
 };
-#endif // SHARE_VM_PRIMS_STACKWALK_HPP
+#endif // SHARE_PRIMS_STACKWALK_HPP
--- a/src/hotspot/share/prims/unsafe.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/prims/unsafe.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef SHARE_VM_PRIMS_UNSAFE_HPP
-#define SHARE_VM_PRIMS_UNSAFE_HPP
+#ifndef SHARE_PRIMS_UNSAFE_HPP
+#define SHARE_PRIMS_UNSAFE_HPP
 
 #include "jni.h"
 
@@ -36,4 +36,4 @@
 
 jlong Unsafe_field_offset_from_byte_offset(jlong byte_offset);
 
-#endif // SHARE_VM_PRIMS_UNSAFE_HPP
+#endif // SHARE_PRIMS_UNSAFE_HPP
--- a/src/hotspot/share/prims/wbtestmethods/parserTests.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/prims/wbtestmethods/parserTests.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,12 +21,12 @@
  * questions.
  */
 
-#ifndef SHARE_VM_PRIMS_WBTESTMETHODS_PARSERTESTS_H
-#define SHARE_VM_PRIMS_WBTESTMETHODS_PARSERTESTS_H
+#ifndef SHARE_PRIMS_WBTESTMETHODS_PARSERTESTS_HPP
+#define SHARE_PRIMS_WBTESTMETHODS_PARSERTESTS_HPP
 
 #include "jni.h"
 #include "prims/whitebox.hpp"
 
 WB_METHOD_DECLARE(jobjectArray) WB_ParseCommandLine(JNIEnv* env, jobject o, jstring args, jchar delim, jobjectArray arguments);
 
-#endif //SHARE_VM_PRIMS_WBTESTMETHODS_PARSERTESTS_H
+#endif //SHARE_PRIMS_WBTESTMETHODS_PARSERTESTS_HPP
--- a/src/hotspot/share/prims/whitebox.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/prims/whitebox.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_PRIMS_WHITEBOX_HPP
-#define SHARE_VM_PRIMS_WHITEBOX_HPP
+#ifndef SHARE_PRIMS_WHITEBOX_HPP
+#define SHARE_PRIMS_WHITEBOX_HPP
 
 #include "jni.h"
 
@@ -70,4 +70,4 @@
   static bool compile_method(Method* method, int comp_level, int bci, Thread* THREAD);
 };
 
-#endif // SHARE_VM_PRIMS_WHITEBOX_HPP
+#endif // SHARE_PRIMS_WHITEBOX_HPP
--- a/src/hotspot/share/prims/whitebox.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/prims/whitebox.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_PRIMS_WHITEBOX_INLINE_HPP
-#define SHARE_VM_PRIMS_WHITEBOX_INLINE_HPP
+#ifndef SHARE_PRIMS_WHITEBOX_INLINE_HPP
+#define SHARE_PRIMS_WHITEBOX_INLINE_HPP
 
 #include "prims/whitebox.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
@@ -35,4 +35,4 @@
 
 #define WB_END JNI_END
 
-#endif // SHARE_VM_PRIMS_WHITEBOX_INLINE_HPP
+#endif // SHARE_PRIMS_WHITEBOX_INLINE_HPP
--- a/src/hotspot/share/runtime/arguments.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/arguments.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_ARGUMENTS_HPP
-#define SHARE_VM_RUNTIME_ARGUMENTS_HPP
+#ifndef SHARE_RUNTIME_ARGUMENTS_HPP
+#define SHARE_RUNTIME_ARGUMENTS_HPP
 
 #include "logging/logLevel.hpp"
 #include "logging/logTag.hpp"
@@ -665,4 +665,4 @@
   }                                                      \
 } while(0)
 
-#endif // SHARE_VM_RUNTIME_ARGUMENTS_HPP
+#endif // SHARE_RUNTIME_ARGUMENTS_HPP
--- a/src/hotspot/share/runtime/atomic.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/atomic.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_ATOMIC_HPP
-#define SHARE_VM_RUNTIME_ATOMIC_HPP
+#ifndef SHARE_RUNTIME_ATOMIC_HPP
+#define SHARE_RUNTIME_ATOMIC_HPP
 
 #include "memory/allocation.hpp"
 #include "metaprogramming/conditional.hpp"
@@ -873,4 +873,4 @@
   return XchgImpl<T, D>()(exchange_value, dest, order);
 }
 
-#endif // SHARE_VM_RUNTIME_ATOMIC_HPP
+#endif // SHARE_RUNTIME_ATOMIC_HPP
--- a/src/hotspot/share/runtime/basicLock.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/basicLock.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_BASICLOCK_HPP
-#define SHARE_VM_RUNTIME_BASICLOCK_HPP
+#ifndef SHARE_RUNTIME_BASICLOCK_HPP
+#define SHARE_RUNTIME_BASICLOCK_HPP
 
 #include "oops/markOop.hpp"
 #include "runtime/handles.hpp"
@@ -78,4 +78,4 @@
 };
 
 
-#endif // SHARE_VM_RUNTIME_BASICLOCK_HPP
+#endif // SHARE_RUNTIME_BASICLOCK_HPP
--- a/src/hotspot/share/runtime/biasedLocking.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/biasedLocking.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_BIASEDLOCKING_HPP
-#define SHARE_VM_RUNTIME_BIASEDLOCKING_HPP
+#ifndef SHARE_RUNTIME_BIASEDLOCKING_HPP
+#define SHARE_RUNTIME_BIASEDLOCKING_HPP
 
 #include "runtime/handles.hpp"
 #include "utilities/growableArray.hpp"
@@ -192,4 +192,4 @@
   static void restore_marks();
 };
 
-#endif // SHARE_VM_RUNTIME_BIASEDLOCKING_HPP
+#endif // SHARE_RUNTIME_BIASEDLOCKING_HPP
--- a/src/hotspot/share/runtime/compilationPolicy.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/compilationPolicy.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_COMPILATIONPOLICY_HPP
-#define SHARE_VM_RUNTIME_COMPILATIONPOLICY_HPP
+#ifndef SHARE_RUNTIME_COMPILATIONPOLICY_HPP
+#define SHARE_RUNTIME_COMPILATIONPOLICY_HPP
 
 #include "code/nmethod.hpp"
 #include "compiler/compileBroker.hpp"
@@ -140,4 +140,4 @@
 };
 #endif
 
-#endif // SHARE_VM_RUNTIME_COMPILATIONPOLICY_HPP
+#endif // SHARE_RUNTIME_COMPILATIONPOLICY_HPP
--- a/src/hotspot/share/runtime/deoptimization.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/deoptimization.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_DEOPTIMIZATION_HPP
-#define SHARE_VM_RUNTIME_DEOPTIMIZATION_HPP
+#ifndef SHARE_RUNTIME_DEOPTIMIZATION_HPP
+#define SHARE_RUNTIME_DEOPTIMIZATION_HPP
 
 #include "memory/allocation.hpp"
 #include "runtime/frame.hpp"
@@ -468,4 +468,4 @@
   static bool is_active() { return _is_active; }
 };
 
-#endif // SHARE_VM_RUNTIME_DEOPTIMIZATION_HPP
+#endif // SHARE_RUNTIME_DEOPTIMIZATION_HPP
--- a/src/hotspot/share/runtime/extendedPC.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/extendedPC.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_EXTENDEDPC_HPP
-#define SHARE_VM_RUNTIME_EXTENDEDPC_HPP
+#ifndef SHARE_RUNTIME_EXTENDEDPC_HPP
+#define SHARE_RUNTIME_EXTENDEDPC_HPP
 
 #include "utilities/globalDefinitions.hpp"
 
@@ -40,4 +40,4 @@
   ExtendedPC()           { _pc  = NULL; }
 };
 
-#endif // SHARE_VM_RUNTIME_EXTENDEDPC_HPP
+#endif // SHARE_RUNTIME_EXTENDEDPC_HPP
--- a/src/hotspot/share/runtime/fieldDescriptor.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/fieldDescriptor.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_FIELDDESCRIPTOR_HPP
-#define SHARE_VM_RUNTIME_FIELDDESCRIPTOR_HPP
+#ifndef SHARE_RUNTIME_FIELDDESCRIPTOR_HPP
+#define SHARE_RUNTIME_FIELDDESCRIPTOR_HPP
 
 #include "oops/constantPool.hpp"
 #include "oops/fieldInfo.hpp"
@@ -117,4 +117,4 @@
   void verify() const                           PRODUCT_RETURN;
 };
 
-#endif // SHARE_VM_RUNTIME_FIELDDESCRIPTOR_HPP
+#endif // SHARE_RUNTIME_FIELDDESCRIPTOR_HPP
--- a/src/hotspot/share/runtime/fieldDescriptor.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/fieldDescriptor.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_FIELDDESCRIPTOR_INLINE_HPP
-#define SHARE_VM_RUNTIME_FIELDDESCRIPTOR_INLINE_HPP
+#ifndef SHARE_RUNTIME_FIELDDESCRIPTOR_INLINE_HPP
+#define SHARE_RUNTIME_FIELDDESCRIPTOR_INLINE_HPP
 
 #include "runtime/handles.inline.hpp"
 
@@ -79,4 +79,4 @@
   return FieldType::basic_type(signature());
 }
 
-#endif // SHARE_VM_RUNTIME_FIELDDESCRIPTOR_INLINE_HPP
+#endif // SHARE_RUNTIME_FIELDDESCRIPTOR_INLINE_HPP
--- a/src/hotspot/share/runtime/fieldType.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/fieldType.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_FIELDTYPE_HPP
-#define SHARE_VM_RUNTIME_FIELDTYPE_HPP
+#ifndef SHARE_RUNTIME_FIELDTYPE_HPP
+#define SHARE_RUNTIME_FIELDTYPE_HPP
 
 #include "memory/allocation.hpp"
 #include "oops/symbol.hpp"
@@ -72,4 +72,4 @@
   static BasicType get_array_info(Symbol* signature, FieldArrayInfo& ai, TRAPS);
 };
 
-#endif // SHARE_VM_RUNTIME_FIELDTYPE_HPP
+#endif // SHARE_RUNTIME_FIELDTYPE_HPP
--- a/src/hotspot/share/runtime/flags/flagSetting.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/flags/flagSetting.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_FLAGS_FLAGSETTING_HPP
-#define SHARE_VM_RUNTIME_FLAGS_FLAGSETTING_HPP
+#ifndef SHARE_RUNTIME_FLAGS_FLAGSETTING_HPP
+#define SHARE_RUNTIME_FLAGS_FLAGSETTING_HPP
 
 #include "memory/allocation.hpp"
 
@@ -68,4 +68,4 @@
 
 #define FLAG_GUARD(f) FlagGuard<sizeof(f)> f ## _guard(&f)
 
-#endif // SHARE_VM_RUNTIME_FLAGS_FLAGSETTING_HPP
+#endif // SHARE_RUNTIME_FLAGS_FLAGSETTING_HPP
--- a/src/hotspot/share/runtime/flags/jvmFlag.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/flags/jvmFlag.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_FLAGS_JVMFLAG_HPP
-#define SHARE_VM_RUNTIME_FLAGS_JVMFLAG_HPP
+#ifndef SHARE_RUNTIME_FLAGS_JVMFLAG_HPP
+#define SHARE_RUNTIME_FLAGS_JVMFLAG_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
@@ -279,4 +279,4 @@
   static void verify() PRODUCT_RETURN;
 };
 
-#endif // SHARE_VM_RUNTIME_FLAGS_JVMFLAG_HPP
+#endif // SHARE_RUNTIME_FLAGS_JVMFLAG_HPP
--- a/src/hotspot/share/runtime/flags/jvmFlagConstraintList.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/flags/jvmFlagConstraintList.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_JVMFLAGCONSTRAINTLIST_HPP
-#define SHARE_VM_RUNTIME_JVMFLAGCONSTRAINTLIST_HPP
+#ifndef SHARE_RUNTIME_FLAGS_JVMFLAGCONSTRAINTLIST_HPP
+#define SHARE_RUNTIME_FLAGS_JVMFLAGCONSTRAINTLIST_HPP
 
 #include "runtime/flags/jvmFlag.hpp"
 #include "utilities/growableArray.hpp"
@@ -98,4 +98,4 @@
   static bool check_constraints(JVMFlagConstraint::ConstraintType type);
 };
 
-#endif /* SHARE_VM_RUNTIME_JVMFLAGCONSTRAINTLIST_HPP */
+#endif // SHARE_RUNTIME_FLAGS_JVMFLAGCONSTRAINTLIST_HPP
--- a/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/flags/jvmFlagConstraintsCompiler.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_JVMFLAGCONSTRAINTSCOMPILER_HPP
-#define SHARE_VM_RUNTIME_JVMFLAGCONSTRAINTSCOMPILER_HPP
+#ifndef SHARE_RUNTIME_FLAGS_JVMFLAGCONSTRAINTSCOMPILER_HPP
+#define SHARE_RUNTIME_FLAGS_JVMFLAGCONSTRAINTSCOMPILER_HPP
 
 #include "runtime/flags/jvmFlag.hpp"
 
@@ -71,4 +71,4 @@
 
 JVMFlag::Error RTMTotalCountIncrRateConstraintFunc(int value, bool verbose);
 
-#endif /* SHARE_VM_RUNTIME_JVMFLAGCONSTRAINTSCOMPILER_HPP */
+#endif // SHARE_RUNTIME_FLAGS_JVMFLAGCONSTRAINTSCOMPILER_HPP
--- a/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_JVMFLAGCONSTRAINTSRUNTIME_HPP
-#define SHARE_VM_RUNTIME_JVMFLAGCONSTRAINTSRUNTIME_HPP
+#ifndef SHARE_RUNTIME_FLAGS_JVMFLAGCONSTRAINTSRUNTIME_HPP
+#define SHARE_RUNTIME_FLAGS_JVMFLAGCONSTRAINTSRUNTIME_HPP
 
 #include "runtime/flags/jvmFlag.hpp"
 
@@ -47,4 +47,4 @@
 JVMFlag::Error ThreadLocalHandshakesConstraintFunc(bool value, bool verbose);
 
 
-#endif /* SHARE_VM_RUNTIME_JVMFLAGCONSTRAINTSRUNTIME_HPP */
+#endif // SHARE_RUNTIME_FLAGS_JVMFLAGCONSTRAINTSRUNTIME_HPP
--- a/src/hotspot/share/runtime/flags/jvmFlagRangeList.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/flags/jvmFlagRangeList.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_JVMFLAGRANGELIST_HPP
-#define SHARE_VM_RUNTIME_JVMFLAGRANGELIST_HPP
+#ifndef SHARE_RUNTIME_FLAGS_JVMFLAGRANGELIST_HPP
+#define SHARE_RUNTIME_FLAGS_JVMFLAGRANGELIST_HPP
 
 #include "runtime/flags/jvmFlag.hpp"
 #include "utilities/growableArray.hpp"
@@ -70,4 +70,4 @@
   static bool check_ranges();
 };
 
-#endif // SHARE_VM_RUNTIME_JVMFLAGRANGELIST_HPP
+#endif // SHARE_RUNTIME_FLAGS_JVMFLAGRANGELIST_HPP
--- a/src/hotspot/share/runtime/flags/jvmFlagWriteableList.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/flags/jvmFlagWriteableList.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_JVMFLAGWRITEABLE_HPP
-#define SHARE_VM_RUNTIME_JVMFLAGWRITEABLE_HPP
+#ifndef SHARE_RUNTIME_FLAGS_JVMFLAGWRITEABLELIST_HPP
+#define SHARE_RUNTIME_FLAGS_JVMFLAGWRITEABLELIST_HPP
 
 #include "utilities/growableArray.hpp"
 
@@ -64,4 +64,4 @@
   static void mark_startup(void);
 };
 
-#endif // SHARE_VM_RUNTIME_JVMFLAGWRITEABLE_HPP
+#endif // SHARE_RUNTIME_FLAGS_JVMFLAGWRITEABLELIST_HPP
--- a/src/hotspot/share/runtime/frame.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/frame.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_FRAME_HPP
-#define SHARE_VM_RUNTIME_FRAME_HPP
+#ifndef SHARE_RUNTIME_FRAME_HPP
+#define SHARE_RUNTIME_FRAME_HPP
 
 #include "oops/method.hpp"
 #include "runtime/basicLock.hpp"
@@ -470,4 +470,4 @@
   RegisterMap* register_map()     { return &_reg_map; }
 };
 
-#endif // SHARE_VM_RUNTIME_FRAME_HPP
+#endif // SHARE_RUNTIME_FRAME_HPP
--- a/src/hotspot/share/runtime/frame.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/frame.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_FRAME_INLINE_HPP
-#define SHARE_VM_RUNTIME_FRAME_INLINE_HPP
+#ifndef SHARE_RUNTIME_FRAME_INLINE_HPP
+#define SHARE_RUNTIME_FRAME_INLINE_HPP
 
 #include "code/compiledMethod.inline.hpp"
 #include "interpreter/bytecodeInterpreter.hpp"
@@ -67,4 +67,4 @@
   return (_is_done) ? true : (_is_done = _fr.is_first_frame(), false);
 }
 
-#endif // SHARE_VM_RUNTIME_FRAME_INLINE_HPP
+#endif // SHARE_RUNTIME_FRAME_INLINE_HPP
--- a/src/hotspot/share/runtime/globals.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/globals.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_GLOBALS_HPP
-#define SHARE_VM_RUNTIME_GLOBALS_HPP
+#ifndef SHARE_RUNTIME_GLOBALS_HPP
+#define SHARE_RUNTIME_GLOBALS_HPP
 
 #include "gc/shared/gc_globals.hpp"
 #include "utilities/align.hpp"
@@ -2733,4 +2733,4 @@
 
 #include "runtime/globals_ext.hpp"
 
-#endif // SHARE_VM_RUNTIME_GLOBALS_HPP
+#endif // SHARE_RUNTIME_GLOBALS_HPP
--- a/src/hotspot/share/runtime/globals_ext.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/globals_ext.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_GLOBALS_EXT_HPP
-#define SHARE_VM_RUNTIME_GLOBALS_EXT_HPP
+#ifndef SHARE_RUNTIME_GLOBALS_EXT_HPP
+#define SHARE_RUNTIME_GLOBALS_EXT_HPP
 
 #include "runtime/flags/jvmFlag.hpp"
 
@@ -69,4 +69,4 @@
   return JVMFlag::NONE;
 }
 
-#endif // SHARE_VM_RUNTIME_GLOBALS_EXT_HPP
+#endif // SHARE_RUNTIME_GLOBALS_EXT_HPP
--- a/src/hotspot/share/runtime/globals_extension.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/globals_extension.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_GLOBALS_EXTENSION_HPP
-#define SHARE_VM_RUNTIME_GLOBALS_EXTENSION_HPP
+#ifndef SHARE_RUNTIME_GLOBALS_EXTENSION_HPP
+#define SHARE_RUNTIME_GLOBALS_EXTENSION_HPP
 
 #include "runtime/globals.hpp"
 #include "utilities/macros.hpp"
@@ -334,4 +334,4 @@
   static void setOnCmdLine(JVMFlagsWithType flag);
 };
 
-#endif // SHARE_VM_RUNTIME_GLOBALS_EXTENSION_HPP
+#endif // SHARE_RUNTIME_GLOBALS_EXTENSION_HPP
--- a/src/hotspot/share/runtime/handles.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/handles.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_HANDLES_HPP
-#define SHARE_VM_RUNTIME_HANDLES_HPP
+#ifndef SHARE_RUNTIME_HANDLES_HPP
+#define SHARE_RUNTIME_HANDLES_HPP
 
 #include "memory/arena.hpp"
 #include "oops/oop.hpp"
@@ -310,4 +310,4 @@
   inline ~HandleMarkCleaner();
 };
 
-#endif // SHARE_VM_RUNTIME_HANDLES_HPP
+#endif // SHARE_RUNTIME_HANDLES_HPP
--- a/src/hotspot/share/runtime/handles.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/handles.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_HANDLES_INLINE_HPP
-#define SHARE_VM_RUNTIME_HANDLES_INLINE_HPP
+#ifndef SHARE_RUNTIME_HANDLES_INLINE_HPP
+#define SHARE_RUNTIME_HANDLES_INLINE_HPP
 
 #include "runtime/handles.hpp"
 #include "runtime/thread.inline.hpp"
@@ -113,4 +113,4 @@
   _thread->last_handle_mark()->pop_and_restore();
 }
 
-#endif // SHARE_VM_RUNTIME_HANDLES_INLINE_HPP
+#endif // SHARE_RUNTIME_HANDLES_INLINE_HPP
--- a/src/hotspot/share/runtime/handshake.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/handshake.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_HANDSHAKE_HPP
-#define SHARE_VM_RUNTIME_HANDSHAKE_HPP
+#ifndef SHARE_RUNTIME_HANDSHAKE_HPP
+#define SHARE_RUNTIME_HANDSHAKE_HPP
 
 #include "memory/allocation.hpp"
 #include "runtime/flags/flagSetting.hpp"
@@ -81,4 +81,4 @@
   void process_by_vmthread(JavaThread* target);
 };
 
-#endif // SHARE_VM_RUNTIME_HANDSHAKE_HPP
+#endif // SHARE_RUNTIME_HANDSHAKE_HPP
--- a/src/hotspot/share/runtime/icache.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/icache.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_ICACHE_HPP
-#define SHARE_VM_RUNTIME_ICACHE_HPP
+#ifndef SHARE_RUNTIME_ICACHE_HPP
+#define SHARE_RUNTIME_ICACHE_HPP
 
 #include "memory/allocation.hpp"
 #include "runtime/stubCodeGenerator.hpp"
@@ -120,4 +120,4 @@
   void generate_icache_flush(ICache::flush_icache_stub_t* flush_icache_stub);
 };
 
-#endif // SHARE_VM_RUNTIME_ICACHE_HPP
+#endif // SHARE_RUNTIME_ICACHE_HPP
--- a/src/hotspot/share/runtime/init.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/init.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_INIT_HPP
-#define SHARE_VM_RUNTIME_INIT_HPP
+#ifndef SHARE_RUNTIME_INIT_HPP
+#define SHARE_RUNTIME_INIT_HPP
 
 #include "utilities/globalDefinitions.hpp"
 
@@ -42,4 +42,4 @@
 bool is_init_completed();     // returns true when bootstrapping has completed
 void set_init_completed();    // set basic init to completed
 
-#endif // SHARE_VM_RUNTIME_INIT_HPP
+#endif // SHARE_RUNTIME_INIT_HPP
--- a/src/hotspot/share/runtime/interfaceSupport.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/interfaceSupport.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_INTERFACESUPPORT_INLINE_HPP
-#define SHARE_VM_RUNTIME_INTERFACESUPPORT_INLINE_HPP
+#ifndef SHARE_RUNTIME_INTERFACESUPPORT_INLINE_HPP
+#define SHARE_RUNTIME_INTERFACESUPPORT_INLINE_HPP
 
 #include "runtime/handles.inline.hpp"
 #include "runtime/mutexLocker.hpp"
@@ -568,4 +568,4 @@
 
 #define JVM_END } }
 
-#endif // SHARE_VM_RUNTIME_INTERFACESUPPORT_INLINE_HPP
+#endif // SHARE_RUNTIME_INTERFACESUPPORT_INLINE_HPP
--- a/src/hotspot/share/runtime/java.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/java.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_JAVA_HPP
-#define SHARE_VM_RUNTIME_JAVA_HPP
+#ifndef SHARE_RUNTIME_JAVA_HPP
+#define SHARE_RUNTIME_JAVA_HPP
 
 #include "runtime/os.hpp"
 
@@ -157,4 +157,4 @@
 
 };
 
-#endif // SHARE_VM_RUNTIME_JAVA_HPP
+#endif // SHARE_RUNTIME_JAVA_HPP
--- a/src/hotspot/share/runtime/javaCalls.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/javaCalls.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_JAVACALLS_HPP
-#define SHARE_VM_RUNTIME_JAVACALLS_HPP
+#ifndef SHARE_RUNTIME_JAVACALLS_HPP
+#define SHARE_RUNTIME_JAVACALLS_HPP
 
 #include "memory/allocation.hpp"
 #include "oops/method.hpp"
@@ -268,4 +268,4 @@
   static void call(JavaValue* result, const methodHandle& method, JavaCallArguments* args, TRAPS);
 };
 
-#endif // SHARE_VM_RUNTIME_JAVACALLS_HPP
+#endif // SHARE_RUNTIME_JAVACALLS_HPP
--- a/src/hotspot/share/runtime/javaFrameAnchor.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/javaFrameAnchor.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_JAVAFRAMEANCHOR_HPP
-#define SHARE_VM_RUNTIME_JAVAFRAMEANCHOR_HPP
+#ifndef SHARE_RUNTIME_JAVAFRAMEANCHOR_HPP
+#define SHARE_RUNTIME_JAVAFRAMEANCHOR_HPP
 
 #include "runtime/orderAccess.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -94,4 +94,4 @@
 
 };
 
-#endif // SHARE_VM_RUNTIME_JAVAFRAMEANCHOR_HPP
+#endif // SHARE_RUNTIME_JAVAFRAMEANCHOR_HPP
--- a/src/hotspot/share/runtime/jfieldIDWorkaround.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/jfieldIDWorkaround.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_JFIELDIDWORKAROUND_HPP
-#define SHARE_VM_RUNTIME_JFIELDIDWORKAROUND_HPP
+#ifndef SHARE_RUNTIME_JFIELDIDWORKAROUND_HPP
+#define SHARE_RUNTIME_JFIELDIDWORKAROUND_HPP
 
 class jfieldIDWorkaround: AllStatic {
   // This workaround is because JVMTI doesn't have distinct entry points
@@ -161,4 +161,4 @@
   }
 };
 
-#endif // SHARE_VM_RUNTIME_JFIELDIDWORKAROUND_HPP
+#endif // SHARE_RUNTIME_JFIELDIDWORKAROUND_HPP
--- a/src/hotspot/share/runtime/jniHandles.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/jniHandles.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_JNIHANDLES_HPP
-#define SHARE_VM_RUNTIME_JNIHANDLES_HPP
+#ifndef SHARE_RUNTIME_JNIHANDLES_HPP
+#define SHARE_RUNTIME_JNIHANDLES_HPP
 
 #include "memory/allocation.hpp"
 #include "runtime/handles.hpp"
@@ -206,4 +206,4 @@
   #endif
 };
 
-#endif // SHARE_VM_RUNTIME_JNIHANDLES_HPP
+#endif // SHARE_RUNTIME_JNIHANDLES_HPP
--- a/src/hotspot/share/runtime/jniHandles.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/jniHandles.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -102,4 +102,3 @@
 }
 
 #endif // SHARE_RUNTIME_JNIHANDLES_INLINE_HPP
-
--- a/src/hotspot/share/runtime/jniPeriodicChecker.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/jniPeriodicChecker.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_JNIPERIODICCHECKER_HPP
-#define SHARE_VM_RUNTIME_JNIPERIODICCHECKER_HPP
+#ifndef SHARE_RUNTIME_JNIPERIODICCHECKER_HPP
+#define SHARE_RUNTIME_JNIPERIODICCHECKER_HPP
 
 class JniPeriodicCheckerTask;
 
@@ -54,4 +54,4 @@
 
 void jniPeriodicChecker_exit();
 
-#endif // SHARE_VM_RUNTIME_JNIPERIODICCHECKER_HPP
+#endif // SHARE_RUNTIME_JNIPERIODICCHECKER_HPP
--- a/src/hotspot/share/runtime/memprofiler.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/memprofiler.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_MEMPROFILER_HPP
-#define SHARE_VM_RUNTIME_MEMPROFILER_HPP
+#ifndef SHARE_RUNTIME_MEMPROFILER_HPP
+#define SHARE_RUNTIME_MEMPROFILER_HPP
 
 // Prints periodic memory usage trace of HotSpot VM
 
@@ -44,4 +44,4 @@
   static bool is_active()     PRODUCT_RETURN0;
 };
 
-#endif // SHARE_VM_RUNTIME_MEMPROFILER_HPP
+#endif // SHARE_RUNTIME_MEMPROFILER_HPP
--- a/src/hotspot/share/runtime/monitorChunk.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/monitorChunk.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_MONITORCHUNK_HPP
-#define SHARE_VM_RUNTIME_MONITORCHUNK_HPP
+#ifndef SHARE_RUNTIME_MONITORCHUNK_HPP
+#define SHARE_RUNTIME_MONITORCHUNK_HPP
 
 #include "runtime/synchronizer.hpp"
 
@@ -62,4 +62,4 @@
   bool contains(void* addr) const           { return (addr >= (void*) monitors()) && (addr <  (void*) (monitors() + number_of_monitors())); }
 };
 
-#endif // SHARE_VM_RUNTIME_MONITORCHUNK_HPP
+#endif // SHARE_RUNTIME_MONITORCHUNK_HPP
--- a/src/hotspot/share/runtime/mutex.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/mutex.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_MUTEX_HPP
-#define SHARE_VM_RUNTIME_MUTEX_HPP
+#ifndef SHARE_RUNTIME_MUTEX_HPP
+#define SHARE_RUNTIME_MUTEX_HPP
 
 #include "memory/allocation.hpp"
 #include "runtime/os.hpp"
@@ -320,4 +320,4 @@
     Mutex(rank, name, allow_vm_block, safepoint_check_required) {};
 };
 
-#endif // SHARE_VM_RUNTIME_MUTEX_HPP
+#endif // SHARE_RUNTIME_MUTEX_HPP
--- a/src/hotspot/share/runtime/mutexLocker.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/mutexLocker.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_MUTEXLOCKER_HPP
-#define SHARE_VM_RUNTIME_MUTEXLOCKER_HPP
+#ifndef SHARE_RUNTIME_MUTEXLOCKER_HPP
+#define SHARE_RUNTIME_MUTEXLOCKER_HPP
 
 #include "memory/allocation.hpp"
 #include "runtime/flags/flagSetting.hpp"
@@ -352,4 +352,4 @@
   }
 };
 
-#endif // SHARE_VM_RUNTIME_MUTEXLOCKER_HPP
+#endif // SHARE_RUNTIME_MUTEXLOCKER_HPP
--- a/src/hotspot/share/runtime/objectMonitor.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/objectMonitor.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_OBJECTMONITOR_HPP
-#define SHARE_VM_RUNTIME_OBJECTMONITOR_HPP
+#ifndef SHARE_RUNTIME_OBJECTMONITOR_HPP
+#define SHARE_RUNTIME_OBJECTMONITOR_HPP
 
 #include "memory/allocation.hpp"
 #include "memory/padded.hpp"
@@ -315,4 +315,4 @@
   bool      ExitSuspendEquivalent(JavaThread * Self);
 };
 
-#endif // SHARE_VM_RUNTIME_OBJECTMONITOR_HPP
+#endif // SHARE_RUNTIME_OBJECTMONITOR_HPP
--- a/src/hotspot/share/runtime/objectMonitor.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/objectMonitor.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_OBJECTMONITOR_INLINE_HPP
-#define SHARE_VM_RUNTIME_OBJECTMONITOR_INLINE_HPP
+#ifndef SHARE_RUNTIME_OBJECTMONITOR_INLINE_HPP
+#define SHARE_RUNTIME_OBJECTMONITOR_INLINE_HPP
 
 inline intptr_t ObjectMonitor::is_entered(TRAPS) const {
   if (THREAD == _owner || THREAD->is_lock_owned((address) _owner)) {
@@ -110,4 +110,4 @@
 }
 
 
-#endif // SHARE_VM_RUNTIME_OBJECTMONITOR_INLINE_HPP
+#endif // SHARE_RUNTIME_OBJECTMONITOR_INLINE_HPP
--- a/src/hotspot/share/runtime/orderAccess.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/orderAccess.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_ORDERACCESS_HPP
-#define SHARE_VM_RUNTIME_ORDERACCESS_HPP
+#ifndef SHARE_RUNTIME_ORDERACCESS_HPP
+#define SHARE_RUNTIME_ORDERACCESS_HPP
 
 #include "memory/allocation.hpp"
 #include "runtime/atomic.hpp"
@@ -346,4 +346,4 @@
 inline void OrderAccess::release_store_fence(volatile D* p, T v) {
   StoreImpl<T, D, PlatformOrderedStore<sizeof(D), RELEASE_X_FENCE> >()(v, p);
 }
-#endif // SHARE_VM_RUNTIME_ORDERACCESS_HPP
+#endif // SHARE_RUNTIME_ORDERACCESS_HPP
--- a/src/hotspot/share/runtime/os.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/os.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_OS_HPP
-#define SHARE_VM_RUNTIME_OS_HPP
+#ifndef SHARE_RUNTIME_OS_HPP
+#define SHARE_RUNTIME_OS_HPP
 
 #include "jvm.h"
 #include "jvmtifiles/jvmti.h"
@@ -995,4 +995,4 @@
 
 extern "C" int SpinPause();
 
-#endif // SHARE_VM_RUNTIME_OS_HPP
+#endif // SHARE_RUNTIME_OS_HPP
--- a/src/hotspot/share/runtime/os.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/os.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,11 +22,11 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_OS_INLINE_HPP
-#define SHARE_VM_RUNTIME_OS_INLINE_HPP
+#ifndef SHARE_RUNTIME_OS_INLINE_HPP
+#define SHARE_RUNTIME_OS_INLINE_HPP
 
 #include "runtime/os.hpp"
 
 #include OS_HEADER_INLINE(os)
 
-#endif // SHARE_VM_RUNTIME_OS_INLINE_HPP
+#endif // SHARE_RUNTIME_OS_INLINE_HPP
--- a/src/hotspot/share/runtime/osThread.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/osThread.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_OSTHREAD_HPP
-#define SHARE_VM_RUNTIME_OSTHREAD_HPP
+#ifndef SHARE_RUNTIME_OSTHREAD_HPP
+#define SHARE_RUNTIME_OSTHREAD_HPP
 
 #include "runtime/frame.hpp"
 #include "runtime/handles.hpp"
@@ -147,4 +147,4 @@
   }
 };
 
-#endif // SHARE_VM_RUNTIME_OSTHREAD_HPP
+#endif // SHARE_RUNTIME_OSTHREAD_HPP
--- a/src/hotspot/share/runtime/os_ext.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/os_ext.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_OS_EXT_HPP
-#define SHARE_VM_RUNTIME_OS_EXT_HPP
+#ifndef SHARE_RUNTIME_OS_EXT_HPP
+#define SHARE_RUNTIME_OS_EXT_HPP
 
 #define EMIT_RANGES_FOR_GLOBALS_EXT // NOP
 #define EMIT_CONSTRAINTS_FOR_GLOBALS_EXT // NOP
@@ -35,4 +35,4 @@
 
  private:
 
-#endif // SHARE_VM_RUNTIME_OS_EXT_HPP
+#endif // SHARE_RUNTIME_OS_EXT_HPP
--- a/src/hotspot/share/runtime/os_perf.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/os_perf.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_OS_PERF_HPP
-#define SHARE_VM_RUNTIME_OS_PERF_HPP
+#ifndef SHARE_RUNTIME_OS_PERF_HPP
+#define SHARE_RUNTIME_OS_PERF_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/macros.hpp"
@@ -287,4 +287,4 @@
   int network_utilization(NetworkInterface** network_interfaces) const;
 };
 
-#endif // SHARE_VM_RUNTIME_OS_PERF_HPP
+#endif // SHARE_RUNTIME_OS_PERF_HPP
--- a/src/hotspot/share/runtime/park.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/park.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_PARK_HPP
-#define SHARE_VM_RUNTIME_PARK_HPP
+#ifndef SHARE_RUNTIME_PARK_HPP
+#define SHARE_RUNTIME_PARK_HPP
 
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -163,4 +163,4 @@
     static void Release (ParkEvent * e) ;
 } ;
 
-#endif // SHARE_VM_RUNTIME_PARK_HPP
+#endif // SHARE_RUNTIME_PARK_HPP
--- a/src/hotspot/share/runtime/perfData.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/perfData.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_PERFDATA_HPP
-#define SHARE_VM_RUNTIME_PERFDATA_HPP
+#ifndef SHARE_RUNTIME_PERFDATA_HPP
+#define SHARE_RUNTIME_PERFDATA_HPP
 
 #include "memory/allocation.hpp"
 #include "runtime/perfMemory.hpp"
@@ -970,4 +970,4 @@
     }
 };
 
-#endif // SHARE_VM_RUNTIME_PERFDATA_HPP
+#endif // SHARE_RUNTIME_PERFDATA_HPP
--- a/src/hotspot/share/runtime/perfData.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/perfData.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_PERFDATA_INLINE_HPP
-#define SHARE_VM_RUNTIME_PERFDATA_INLINE_HPP
+#ifndef SHARE_RUNTIME_PERFDATA_INLINE_HPP
+#define SHARE_RUNTIME_PERFDATA_INLINE_HPP
 
 #include "runtime/perfData.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -65,4 +65,4 @@
   }
 }
 
-#endif // SHARE_VM_RUNTIME_PERFDATA_INLINE_HPP
+#endif // SHARE_RUNTIME_PERFDATA_INLINE_HPP
--- a/src/hotspot/share/runtime/perfMemory.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/perfMemory.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_PERFMEMORY_HPP
-#define SHARE_VM_RUNTIME_PERFMEMORY_HPP
+#ifndef SHARE_RUNTIME_PERFMEMORY_HPP
+#define SHARE_RUNTIME_PERFMEMORY_HPP
 
 #include "utilities/exceptions.hpp"
 
@@ -167,4 +167,4 @@
 void perfMemory_init();
 void perfMemory_exit();
 
-#endif // SHARE_VM_RUNTIME_PERFMEMORY_HPP
+#endif // SHARE_RUNTIME_PERFMEMORY_HPP
--- a/src/hotspot/share/runtime/prefetch.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/prefetch.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_PREFETCH_HPP
-#define SHARE_VM_RUNTIME_PREFETCH_HPP
+#ifndef SHARE_RUNTIME_PREFETCH_HPP
+#define SHARE_RUNTIME_PREFETCH_HPP
 
 #include "memory/allocation.hpp"
 
@@ -48,4 +48,4 @@
   static void write(void* loc, intx interval);
 };
 
-#endif // SHARE_VM_RUNTIME_PREFETCH_HPP
+#endif // SHARE_RUNTIME_PREFETCH_HPP
--- a/src/hotspot/share/runtime/prefetch.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/prefetch.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,11 +22,11 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_PREFETCH_INLINE_HPP
-#define SHARE_VM_RUNTIME_PREFETCH_INLINE_HPP
+#ifndef SHARE_RUNTIME_PREFETCH_INLINE_HPP
+#define SHARE_RUNTIME_PREFETCH_INLINE_HPP
 
 #include "runtime/prefetch.hpp"
 #include "utilities/macros.hpp"
 #include OS_CPU_HEADER_INLINE(prefetch)
 
-#endif // SHARE_VM_RUNTIME_PREFETCH_INLINE_HPP
+#endif // SHARE_RUNTIME_PREFETCH_INLINE_HPP
--- a/src/hotspot/share/runtime/reflection.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/reflection.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_REFLECTION_HPP
-#define SHARE_VM_RUNTIME_REFLECTION_HPP
+#ifndef SHARE_RUNTIME_REFLECTION_HPP
+#define SHARE_RUNTIME_REFLECTION_HPP
 
 #include "oops/oop.hpp"
 #include "runtime/fieldDescriptor.hpp"
@@ -131,4 +131,4 @@
 
 };
 
-#endif // SHARE_VM_RUNTIME_REFLECTION_HPP
+#endif // SHARE_RUNTIME_REFLECTION_HPP
--- a/src/hotspot/share/runtime/reflectionUtils.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/reflectionUtils.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_REFLECTIONUTILS_HPP
-#define SHARE_VM_RUNTIME_REFLECTIONUTILS_HPP
+#ifndef SHARE_RUNTIME_REFLECTIONUTILS_HPP
+#define SHARE_RUNTIME_REFLECTIONUTILS_HPP
 
 #include "memory/allocation.hpp"
 #include "oops/instanceKlass.hpp"
@@ -232,4 +232,4 @@
   }
 };
 
-#endif // SHARE_VM_RUNTIME_REFLECTIONUTILS_HPP
+#endif // SHARE_RUNTIME_REFLECTIONUTILS_HPP
--- a/src/hotspot/share/runtime/registerMap.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/registerMap.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_REGISTERMAP_HPP
-#define SHARE_VM_RUNTIME_REGISTERMAP_HPP
+#ifndef SHARE_RUNTIME_REGISTERMAP_HPP
+#define SHARE_RUNTIME_REGISTERMAP_HPP
 
 #include "code/vmreg.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -125,4 +125,4 @@
 
 };
 
-#endif // SHARE_VM_RUNTIME_REGISTERMAP_HPP
+#endif // SHARE_RUNTIME_REGISTERMAP_HPP
--- a/src/hotspot/share/runtime/relocator.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/relocator.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_RELOCATOR_HPP
-#define SHARE_VM_RUNTIME_RELOCATOR_HPP
+#ifndef SHARE_RUNTIME_RELOCATOR_HPP
+#define SHARE_RUNTIME_RELOCATOR_HPP
 
 #include "interpreter/bytecodes.hpp"
 #include "oops/method.hpp"
@@ -125,4 +125,4 @@
   }
 };
 
-#endif // SHARE_VM_RUNTIME_RELOCATOR_HPP
+#endif // SHARE_RUNTIME_RELOCATOR_HPP
--- a/src/hotspot/share/runtime/rframe.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/rframe.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_RFRAME_HPP
-#define SHARE_VM_RUNTIME_RFRAME_HPP
+#ifndef SHARE_RUNTIME_RFRAME_HPP
+#define SHARE_RUNTIME_RFRAME_HPP
 
 #include "memory/allocation.hpp"
 #include "runtime/frame.hpp"
@@ -122,4 +122,4 @@
   void print();
 };
 
-#endif // SHARE_VM_RUNTIME_RFRAME_HPP
+#endif // SHARE_RUNTIME_RFRAME_HPP
--- a/src/hotspot/share/runtime/rtmLocking.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/rtmLocking.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_RTMLOCKING_HPP
-#define SHARE_VM_RUNTIME_RTMLOCKING_HPP
+#ifndef SHARE_RUNTIME_RTMLOCKING_HPP
+#define SHARE_RUNTIME_RTMLOCKING_HPP
 
 // Generate RTM (Restricted Transactional Memory) locking code for all inflated
 // locks when "UseRTMLocking" option is on with normal locking mechanism as fall back
@@ -110,4 +110,4 @@
   void print() { print_on(tty); }
 };
 
-#endif // SHARE_VM_RUNTIME_RTMLOCKING_HPP
+#endif // SHARE_RUNTIME_RTMLOCKING_HPP
--- a/src/hotspot/share/runtime/safepoint.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/safepoint.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_SAFEPOINT_HPP
-#define SHARE_VM_RUNTIME_SAFEPOINT_HPP
+#ifndef SHARE_RUNTIME_SAFEPOINT_HPP
+#define SHARE_RUNTIME_SAFEPOINT_HPP
 
 #include "memory/allocation.hpp"
 #include "runtime/mutexLocker.hpp"
@@ -253,4 +253,4 @@
 
 
 
-#endif // SHARE_VM_RUNTIME_SAFEPOINT_HPP
+#endif // SHARE_RUNTIME_SAFEPOINT_HPP
--- a/src/hotspot/share/runtime/safepointMechanism.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/safepointMechanism.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_SAFEPOINTMECHANISM_HPP
-#define SHARE_VM_RUNTIME_SAFEPOINTMECHANISM_HPP
+#ifndef SHARE_RUNTIME_SAFEPOINTMECHANISM_HPP
+#define SHARE_RUNTIME_SAFEPOINTMECHANISM_HPP
 
 #include "runtime/globals.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -90,4 +90,4 @@
   static void initialize_header(JavaThread* thread);
 };
 
-#endif // SHARE_VM_RUNTIME_SAFEPOINTMECHANISM_HPP
+#endif // SHARE_RUNTIME_SAFEPOINTMECHANISM_HPP
--- a/src/hotspot/share/runtime/safepointMechanism.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/safepointMechanism.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_SAFEPOINTMECHANISM_INLINE_HPP
-#define SHARE_VM_RUNTIME_SAFEPOINTMECHANISM_INLINE_HPP
+#ifndef SHARE_RUNTIME_SAFEPOINTMECHANISM_INLINE_HPP
+#define SHARE_RUNTIME_SAFEPOINTMECHANISM_INLINE_HPP
 
 #include "runtime/safepointMechanism.hpp"
 #include "runtime/safepoint.hpp"
@@ -95,4 +95,4 @@
   thread->set_polling_page_release(poll_disarmed_value());
 }
 
-#endif // SHARE_VM_RUNTIME_SAFEPOINTMECHANISM_INLINE_HPP
+#endif // SHARE_RUNTIME_SAFEPOINTMECHANISM_INLINE_HPP
--- a/src/hotspot/share/runtime/safepointVerifiers.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/safepointVerifiers.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_SAFEPOINTVERIFIERS_HPP
-#define SHARE_VM_RUNTIME_SAFEPOINTVERIFIERS_HPP
+#ifndef SHARE_RUNTIME_SAFEPOINTVERIFIERS_HPP
+#define SHARE_RUNTIME_SAFEPOINTVERIFIERS_HPP
 
 #include "memory/allocation.hpp"
 #include "runtime/thread.hpp"
@@ -172,4 +172,4 @@
 #endif
 };
 
-#endif // SHARE_VM_RUNTIME_SAFEPOINTVERIFIERS_HPP
+#endif // SHARE_RUNTIME_SAFEPOINTVERIFIERS_HPP
--- a/src/hotspot/share/runtime/semaphore.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/semaphore.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_SEMAPHORE_HPP
-#define SHARE_VM_RUNTIME_SEMAPHORE_HPP
+#ifndef SHARE_RUNTIME_SEMAPHORE_HPP
+#define SHARE_RUNTIME_SEMAPHORE_HPP
 
 #include "memory/allocation.hpp"
 
@@ -60,4 +60,4 @@
   void wait_with_safepoint_check(JavaThread* thread);
 };
 
-#endif // SHARE_VM_RUNTIME_SEMAPHORE_HPP
+#endif // SHARE_RUNTIME_SEMAPHORE_HPP
--- a/src/hotspot/share/runtime/semaphore.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/semaphore.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_SEMAPHORE_INLINE_HPP
-#define SHARE_VM_RUNTIME_SEMAPHORE_INLINE_HPP
+#ifndef SHARE_RUNTIME_SEMAPHORE_INLINE_HPP
+#define SHARE_RUNTIME_SEMAPHORE_INLINE_HPP
 
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/semaphore.hpp"
@@ -38,4 +38,4 @@
   _impl.wait();
 }
 
-#endif // SHARE_VM_RUNTIME_SEMAPHORE_INLINE_HPP
+#endif // SHARE_RUNTIME_SEMAPHORE_INLINE_HPP
--- a/src/hotspot/share/runtime/serviceThread.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/serviceThread.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_SERVICETHREAD_HPP
-#define SHARE_VM_RUNTIME_SERVICETHREAD_HPP
+#ifndef SHARE_RUNTIME_SERVICETHREAD_HPP
+#define SHARE_RUNTIME_SERVICETHREAD_HPP
 
 #include "runtime/thread.hpp"
 
@@ -48,4 +48,4 @@
   static bool is_service_thread(Thread* thread);
 };
 
-#endif // SHARE_VM_RUNTIME_SERVICETHREAD_HPP
+#endif // SHARE_RUNTIME_SERVICETHREAD_HPP
--- a/src/hotspot/share/runtime/sharedRuntime.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/sharedRuntime.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_SHAREDRUNTIME_HPP
-#define SHARE_VM_RUNTIME_SHAREDRUNTIME_HPP
+#ifndef SHARE_RUNTIME_SHAREDRUNTIME_HPP
+#define SHARE_RUNTIME_SHAREDRUNTIME_HPP
 
 #include "interpreter/bytecodeHistogram.hpp"
 #include "interpreter/bytecodeTracer.hpp"
@@ -725,4 +725,4 @@
 
 };
 
-#endif // SHARE_VM_RUNTIME_SHAREDRUNTIME_HPP
+#endif // SHARE_RUNTIME_SHAREDRUNTIME_HPP
--- a/src/hotspot/share/runtime/sharedRuntimeMath.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/sharedRuntimeMath.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_SHAREDRUNTIMEMATH_HPP
-#define SHARE_VM_RUNTIME_SHAREDRUNTIMEMATH_HPP
+#ifndef SHARE_RUNTIME_SHAREDRUNTIMEMATH_HPP
+#define SHARE_RUNTIME_SHAREDRUNTIMEMATH_HPP
 
 #include <math.h>
 
@@ -127,4 +127,4 @@
   return x*twom54;
 }
 
-#endif // SHARE_VM_RUNTIME_SHAREDRUNTIMEMATH_HPP
+#endif // SHARE_RUNTIME_SHAREDRUNTIMEMATH_HPP
--- a/src/hotspot/share/runtime/signature.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/signature.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_SIGNATURE_HPP
-#define SHARE_VM_RUNTIME_SIGNATURE_HPP
+#ifndef SHARE_RUNTIME_SIGNATURE_HPP
+#define SHARE_RUNTIME_SIGNATURE_HPP
 
 #include "memory/allocation.hpp"
 #include "oops/method.hpp"
@@ -428,4 +428,4 @@
     static bool invalid_name_char(char);
 };
 
-#endif // SHARE_VM_RUNTIME_SIGNATURE_HPP
+#endif // SHARE_RUNTIME_SIGNATURE_HPP
--- a/src/hotspot/share/runtime/stackValue.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/stackValue.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_STACKVALUE_HPP
-#define SHARE_VM_RUNTIME_STACKVALUE_HPP
+#ifndef SHARE_RUNTIME_STACKVALUE_HPP
+#define SHARE_RUNTIME_STACKVALUE_HPP
 
 #include "code/location.hpp"
 #include "runtime/handles.hpp"
@@ -117,4 +117,4 @@
 #endif
 };
 
-#endif // SHARE_VM_RUNTIME_STACKVALUE_HPP
+#endif // SHARE_RUNTIME_STACKVALUE_HPP
--- a/src/hotspot/share/runtime/stackValueCollection.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/stackValueCollection.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_STACKVALUECOLLECTION_HPP
-#define SHARE_VM_RUNTIME_STACKVALUECOLLECTION_HPP
+#ifndef SHARE_RUNTIME_STACKVALUECOLLECTION_HPP
+#define SHARE_RUNTIME_STACKVALUECOLLECTION_HPP
 
 #include "memory/allocation.hpp"
 #include "runtime/stackValue.hpp"
@@ -59,4 +59,4 @@
   void print();
 };
 
-#endif // SHARE_VM_RUNTIME_STACKVALUECOLLECTION_HPP
+#endif // SHARE_RUNTIME_STACKVALUECOLLECTION_HPP
--- a/src/hotspot/share/runtime/statSampler.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/statSampler.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_STATSAMPLER_HPP
-#define SHARE_VM_RUNTIME_STATSAMPLER_HPP
+#ifndef SHARE_RUNTIME_STATSAMPLER_HPP
+#define SHARE_RUNTIME_STATSAMPLER_HPP
 
 #include "runtime/perfData.hpp"
 #include "runtime/task.hpp"
@@ -67,4 +67,4 @@
 
 void statSampler_exit();
 
-#endif // SHARE_VM_RUNTIME_STATSAMPLER_HPP
+#endif // SHARE_RUNTIME_STATSAMPLER_HPP
--- a/src/hotspot/share/runtime/stubCodeGenerator.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/stubCodeGenerator.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_STUBCODEGENERATOR_HPP
-#define SHARE_VM_RUNTIME_STUBCODEGENERATOR_HPP
+#ifndef SHARE_RUNTIME_STUBCODEGENERATOR_HPP
+#define SHARE_RUNTIME_STUBCODEGENERATOR_HPP
 
 #include "asm/assembler.hpp"
 #include "memory/allocation.hpp"
@@ -128,4 +128,4 @@
 
 };
 
-#endif // SHARE_VM_RUNTIME_STUBCODEGENERATOR_HPP
+#endif // SHARE_RUNTIME_STUBCODEGENERATOR_HPP
--- a/src/hotspot/share/runtime/stubRoutines.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/stubRoutines.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_STUBROUTINES_HPP
-#define SHARE_VM_RUNTIME_STUBROUTINES_HPP
+#ifndef SHARE_RUNTIME_STUBROUTINES_HPP
+#define SHARE_RUNTIME_STUBROUTINES_HPP
 
 #include "code/codeBlob.hpp"
 #include "memory/allocation.hpp"
@@ -474,4 +474,4 @@
 inline bool CanUseSafeFetchN() {
   return StubRoutines::SafeFetchN_stub() ? true : false;
 }
-#endif // SHARE_VM_RUNTIME_STUBROUTINES_HPP
+#endif // SHARE_RUNTIME_STUBROUTINES_HPP
--- a/src/hotspot/share/runtime/sweeper.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/sweeper.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_SWEEPER_HPP
-#define SHARE_VM_RUNTIME_SWEEPER_HPP
+#ifndef SHARE_RUNTIME_SWEEPER_HPP
+#define SHARE_RUNTIME_SWEEPER_HPP
 
 class WhiteBox;
 
@@ -128,4 +128,4 @@
   static void print() { print(tty); }
 };
 
-#endif // SHARE_VM_RUNTIME_SWEEPER_HPP
+#endif // SHARE_RUNTIME_SWEEPER_HPP
--- a/src/hotspot/share/runtime/synchronizer.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/synchronizer.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_SYNCHRONIZER_HPP
-#define SHARE_VM_RUNTIME_SYNCHRONIZER_HPP
+#ifndef SHARE_RUNTIME_SYNCHRONIZER_HPP
+#define SHARE_RUNTIME_SYNCHRONIZER_HPP
 
 #include "memory/padded.hpp"
 #include "oops/markOop.hpp"
@@ -206,4 +206,4 @@
   void reenter(intptr_t recursion, TRAPS)  { ObjectSynchronizer::reenter(_obj, recursion, CHECK); }
 };
 
-#endif // SHARE_VM_RUNTIME_SYNCHRONIZER_HPP
+#endif // SHARE_RUNTIME_SYNCHRONIZER_HPP
--- a/src/hotspot/share/runtime/task.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/task.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_TASK_HPP
-#define SHARE_VM_RUNTIME_TASK_HPP
+#ifndef SHARE_RUNTIME_TASK_HPP
+#define SHARE_RUNTIME_TASK_HPP
 
 #include "memory/allocation.hpp"
 #include "runtime/timer.hpp"
@@ -107,4 +107,4 @@
   virtual void task() = 0;
 };
 
-#endif // SHARE_VM_RUNTIME_TASK_HPP
+#endif // SHARE_RUNTIME_TASK_HPP
--- a/src/hotspot/share/runtime/thread.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/thread.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_THREAD_HPP
-#define SHARE_VM_RUNTIME_THREAD_HPP
+#ifndef SHARE_RUNTIME_THREAD_HPP
+#define SHARE_RUNTIME_THREAD_HPP
 
 #include "jni.h"
 #include "code/compiledMethod.hpp"
@@ -2329,4 +2329,4 @@
 };
 
 
-#endif // SHARE_VM_RUNTIME_THREAD_HPP
+#endif // SHARE_RUNTIME_THREAD_HPP
--- a/src/hotspot/share/runtime/thread.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/thread.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_THREAD_INLINE_HPP
-#define SHARE_VM_RUNTIME_THREAD_INLINE_HPP
+#ifndef SHARE_RUNTIME_THREAD_INLINE_HPP
+#define SHARE_RUNTIME_THREAD_INLINE_HPP
 
 #include "runtime/atomic.hpp"
 #include "runtime/globals.hpp"
@@ -233,4 +233,4 @@
   OrderAccess::release_store((volatile jint *) &_terminated, (jint) _thread_terminated);
 }
 
-#endif // SHARE_VM_RUNTIME_THREAD_INLINE_HPP
+#endif // SHARE_RUNTIME_THREAD_INLINE_HPP
--- a/src/hotspot/share/runtime/threadCritical.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/threadCritical.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_THREADCRITICAL_HPP
-#define SHARE_VM_RUNTIME_THREADCRITICAL_HPP
+#ifndef SHARE_RUNTIME_THREADCRITICAL_HPP
+#define SHARE_RUNTIME_THREADCRITICAL_HPP
 
 #include "memory/allocation.hpp"
 
@@ -52,4 +52,4 @@
   ~ThreadCritical();
 };
 
-#endif // SHARE_VM_RUNTIME_THREADCRITICAL_HPP
+#endif // SHARE_RUNTIME_THREADCRITICAL_HPP
--- a/src/hotspot/share/runtime/threadHeapSampler.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/threadHeapSampler.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018, Google and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef RUNTIME_THREADHEAPSAMPLER_HPP
-#define RUNTIME_THREADHEAPSAMPLER_HPP
+#ifndef SHARE_RUNTIME_THREADHEAPSAMPLER_HPP
+#define SHARE_RUNTIME_THREADHEAPSAMPLER_HPP
 
 #include "memory/allocation.hpp"
 
--- a/src/hotspot/share/runtime/threadLocalStorage.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/threadLocalStorage.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_THREADLOCALSTORAGE_HPP
-#define SHARE_VM_RUNTIME_THREADLOCALSTORAGE_HPP
+#ifndef SHARE_RUNTIME_THREADLOCALSTORAGE_HPP
+#define SHARE_RUNTIME_THREADLOCALSTORAGE_HPP
 
 #include "memory/allocation.hpp"
 
@@ -47,4 +47,4 @@
   static bool    is_initialized(); // can't use TLS prior to initialization
 };
 
-#endif // SHARE_VM_RUNTIME_THREADLOCALSTORAGE_HPP
+#endif // SHARE_RUNTIME_THREADLOCALSTORAGE_HPP
--- a/src/hotspot/share/runtime/threadSMR.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/threadSMR.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_THREADSMR_HPP
-#define SHARE_VM_RUNTIME_THREADSMR_HPP
+#ifndef SHARE_RUNTIME_THREADSMR_HPP
+#define SHARE_RUNTIME_THREADSMR_HPP
 
 #include "memory/allocation.hpp"
 #include "runtime/timer.hpp"
@@ -372,4 +372,4 @@
   }
 };
 
-#endif // SHARE_VM_RUNTIME_THREADSMR_HPP
+#endif // SHARE_RUNTIME_THREADSMR_HPP
--- a/src/hotspot/share/runtime/threadSMR.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/threadSMR.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_THREADSMR_INLINE_HPP
-#define SHARE_VM_RUNTIME_THREADSMR_INLINE_HPP
+#ifndef SHARE_RUNTIME_THREADSMR_INLINE_HPP
+#define SHARE_RUNTIME_THREADSMR_INLINE_HPP
 
 #include "runtime/atomic.hpp"
 #include "runtime/prefetch.inline.hpp"
@@ -92,4 +92,4 @@
   ThreadsSMRSupport::update_tlh_time_max(millis);
 }
 
-#endif // SHARE_VM_RUNTIME_THREADSMR_INLINE_HPP
+#endif // SHARE_RUNTIME_THREADSMR_INLINE_HPP
--- a/src/hotspot/share/runtime/threadStatisticalInfo.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/threadStatisticalInfo.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2018 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_THREADSTATISTICS_HPP
-#define SHARE_VM_RUNTIME_THREADSTATISTICS_HPP
+#ifndef SHARE_RUNTIME_THREADSTATISTICALINFO_HPP
+#define SHARE_RUNTIME_THREADSTATISTICALINFO_HPP
 
 #include "jni.h"
 #include "runtime/os.hpp"
@@ -45,4 +45,4 @@
   uint64_t getElapsedTime() const           { return os::javaTimeMillis() - getStartTime(); }
 };
 
-#endif // SHARE_VM_RUNTIME_THREADSTATISTICS_HPP
+#endif // SHARE_RUNTIME_THREADSTATISTICALINFO_HPP
--- a/src/hotspot/share/runtime/tieredThresholdPolicy.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/tieredThresholdPolicy.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_TIEREDTHRESHOLDPOLICY_HPP
-#define SHARE_VM_RUNTIME_TIEREDTHRESHOLDPOLICY_HPP
+#ifndef SHARE_RUNTIME_TIEREDTHRESHOLDPOLICY_HPP
+#define SHARE_RUNTIME_TIEREDTHRESHOLDPOLICY_HPP
 
 #include "code/nmethod.hpp"
 #include "oops/methodData.hpp"
@@ -274,4 +274,4 @@
 
 #endif // TIERED
 
-#endif // SHARE_VM_RUNTIME_TIEREDTHRESHOLDPOLICY_HPP
+#endif // SHARE_RUNTIME_TIEREDTHRESHOLDPOLICY_HPP
--- a/src/hotspot/share/runtime/timer.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/timer.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_TIMER_HPP
-#define SHARE_VM_RUNTIME_TIMER_HPP
+#ifndef SHARE_RUNTIME_TIMER_HPP
+#define SHARE_RUNTIME_TIMER_HPP
 
 #include "utilities/globalDefinitions.hpp"
 
@@ -96,4 +96,4 @@
   static jlong millis_to_counter(jlong millis);
 };
 
-#endif // SHARE_VM_RUNTIME_TIMER_HPP
+#endif // SHARE_RUNTIME_TIMER_HPP
--- a/src/hotspot/share/runtime/timerTrace.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/timerTrace.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_TIMERTRACE_HPP
-#define SHARE_VM_RUNTIME_TIMERTRACE_HPP
+#ifndef SHARE_RUNTIME_TIMERTRACE_HPP
+#define SHARE_RUNTIME_TIMERTRACE_HPP
 
 #include "logging/log.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -77,4 +77,4 @@
 };
 
 
-#endif // SHARE_VM_RUNTIME_TIMERTRACE_HPP
+#endif // SHARE_RUNTIME_TIMERTRACE_HPP
--- a/src/hotspot/share/runtime/unhandledOops.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/unhandledOops.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_UNHANDLEDOOPS_HPP
-#define SHARE_VM_RUNTIME_UNHANDLEDOOPS_HPP
+#ifndef SHARE_RUNTIME_UNHANDLEDOOPS_HPP
+#define SHARE_RUNTIME_UNHANDLEDOOPS_HPP
 
 #ifdef CHECK_UNHANDLED_OOPS
 
@@ -86,4 +86,4 @@
 #endif // _LP64
 #endif // CHECK_UNHANDLED_OOPS
 
-#endif // SHARE_VM_RUNTIME_UNHANDLEDOOPS_HPP
+#endif // SHARE_RUNTIME_UNHANDLEDOOPS_HPP
--- a/src/hotspot/share/runtime/vframe.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/vframe.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_VFRAME_HPP
-#define SHARE_VM_RUNTIME_VFRAME_HPP
+#ifndef SHARE_RUNTIME_VFRAME_HPP
+#define SHARE_RUNTIME_VFRAME_HPP
 
 #include "code/debugInfo.hpp"
 #include "code/debugInfoRec.hpp"
@@ -354,4 +354,4 @@
   vframeStream(JavaThread* thread, frame top_frame, bool stop_at_java_call_stub = false);
 };
 
-#endif // SHARE_VM_RUNTIME_VFRAME_HPP
+#endif // SHARE_RUNTIME_VFRAME_HPP
--- a/src/hotspot/share/runtime/vframe.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/vframe.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_VFRAME_INLINE_HPP
-#define SHARE_VM_RUNTIME_VFRAME_INLINE_HPP
+#ifndef SHARE_RUNTIME_VFRAME_INLINE_HPP
+#define SHARE_RUNTIME_VFRAME_INLINE_HPP
 
 #include "runtime/frame.inline.hpp"
 #include "runtime/vframe.hpp"
@@ -228,4 +228,4 @@
   _bci    = bci;
 }
 
-#endif // SHARE_VM_RUNTIME_VFRAME_INLINE_HPP
+#endif // SHARE_RUNTIME_VFRAME_INLINE_HPP
--- a/src/hotspot/share/runtime/vframeArray.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/vframeArray.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_VFRAMEARRAY_HPP
-#define SHARE_VM_RUNTIME_VFRAMEARRAY_HPP
+#ifndef SHARE_RUNTIME_VFRAMEARRAY_HPP
+#define SHARE_RUNTIME_VFRAMEARRAY_HPP
 
 #include "memory/allocation.hpp"
 #include "oops/arrayOop.hpp"
@@ -228,4 +228,4 @@
 
 };
 
-#endif // SHARE_VM_RUNTIME_VFRAMEARRAY_HPP
+#endif // SHARE_RUNTIME_VFRAMEARRAY_HPP
--- a/src/hotspot/share/runtime/vframe_hp.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/vframe_hp.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_VFRAME_HP_HPP
-#define SHARE_VM_RUNTIME_VFRAME_HP_HPP
+#ifndef SHARE_RUNTIME_VFRAME_HP_HPP
+#define SHARE_RUNTIME_VFRAME_HP_HPP
 
 #include "runtime/vframe.hpp"
 
@@ -162,4 +162,4 @@
 
 };
 
-#endif // SHARE_VM_RUNTIME_VFRAME_HP_HPP
+#endif // SHARE_RUNTIME_VFRAME_HP_HPP
--- a/src/hotspot/share/runtime/vmOperations.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/vmOperations.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_VMOPERATIONS_HPP
-#define SHARE_VM_RUNTIME_VMOPERATIONS_HPP
+#ifndef SHARE_RUNTIME_VMOPERATIONS_HPP
+#define SHARE_RUNTIME_VMOPERATIONS_HPP
 
 #include "classfile/javaClasses.hpp"
 #include "memory/allocation.hpp"
@@ -518,4 +518,4 @@
 };
 #endif // INCLUDE_SERVICES
 
-#endif // SHARE_VM_RUNTIME_VMOPERATIONS_HPP
+#endif // SHARE_RUNTIME_VMOPERATIONS_HPP
--- a/src/hotspot/share/runtime/vmStructs.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/vmStructs.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_VMSTRUCTS_HPP
-#define SHARE_VM_RUNTIME_VMSTRUCTS_HPP
+#ifndef SHARE_RUNTIME_VMSTRUCTS_HPP
+#define SHARE_RUNTIME_VMSTRUCTS_HPP
 
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -299,4 +299,4 @@
 #define GENERATE_VM_ADDRESS_LAST_ENTRY() \
  { NULL, NULL }
 
-#endif // SHARE_VM_RUNTIME_VMSTRUCTS_HPP
+#endif // SHARE_RUNTIME_VMSTRUCTS_HPP
--- a/src/hotspot/share/runtime/vmThread.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/vmThread.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_VMTHREAD_HPP
-#define SHARE_VM_RUNTIME_VMTHREAD_HPP
+#ifndef SHARE_RUNTIME_VMTHREAD_HPP
+#define SHARE_RUNTIME_VMTHREAD_HPP
 
 #include "runtime/perfData.hpp"
 #include "runtime/thread.hpp"
@@ -186,4 +186,4 @@
   static VMThread*     _vm_thread;
 };
 
-#endif // SHARE_VM_RUNTIME_VMTHREAD_HPP
+#endif // SHARE_RUNTIME_VMTHREAD_HPP
--- a/src/hotspot/share/runtime/vm_version.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/runtime/vm_version.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_RUNTIME_VM_VERSION_HPP
-#define SHARE_VM_RUNTIME_VM_VERSION_HPP
+#ifndef SHARE_RUNTIME_VM_VERSION_HPP
+#define SHARE_RUNTIME_VM_VERSION_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/ostream.hpp"
@@ -153,4 +153,4 @@
 
 #include CPU_HEADER(vm_version)
 
-#endif // SHARE_VM_RUNTIME_VM_VERSION_HPP
+#endif // SHARE_RUNTIME_VM_VERSION_HPP
--- a/src/hotspot/share/services/allocationSite.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/services/allocationSite.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_SERVICES_ALLOCATION_SITE_HPP
-#define SHARE_VM_SERVICES_ALLOCATION_SITE_HPP
+#ifndef SHARE_SERVICES_ALLOCATIONSITE_HPP
+#define SHARE_SERVICES_ALLOCATIONSITE_HPP
 
 #include "utilities/nativeCallStack.hpp"
 
@@ -53,4 +53,4 @@
   const E* peek() const { return &e; }
 };
 
-#endif  // SHARE_VM_SERVICES_ALLOCATION_SITE_HPP
+#endif // SHARE_SERVICES_ALLOCATIONSITE_HPP
--- a/src/hotspot/share/services/attachListener.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/services/attachListener.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_SERVICES_ATTACHLISTENER_HPP
-#define SHARE_VM_SERVICES_ATTACHLISTENER_HPP
+#ifndef SHARE_SERVICES_ATTACHLISTENER_HPP
+#define SHARE_SERVICES_ATTACHLISTENER_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/debug.hpp"
@@ -160,4 +160,4 @@
 };
 #endif // INCLUDE_SERVICES
 
-#endif // SHARE_VM_SERVICES_ATTACHLISTENER_HPP
+#endif // SHARE_SERVICES_ATTACHLISTENER_HPP
--- a/src/hotspot/share/services/classLoadingService.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/services/classLoadingService.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_SERVICES_CLASSLOADINGSERVICE_HPP
-#define SHARE_VM_SERVICES_CLASSLOADINGSERVICE_HPP
+#ifndef SHARE_SERVICES_CLASSLOADINGSERVICE_HPP
+#define SHARE_SERVICES_CLASSLOADINGSERVICE_HPP
 
 #include "logging/log.hpp"
 #include "runtime/handles.hpp"
@@ -117,4 +117,4 @@
   }
 };
 
-#endif // SHARE_VM_SERVICES_CLASSLOADINGSERVICE_HPP
+#endif // SHARE_SERVICES_CLASSLOADINGSERVICE_HPP
--- a/src/hotspot/share/services/diagnosticArgument.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/services/diagnosticArgument.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_SERVICES_DIAGNOSTICARGUMENT_HPP
-#define SHARE_VM_SERVICES_DIAGNOSTICARGUMENT_HPP
+#ifndef SHARE_SERVICES_DIAGNOSTICARGUMENT_HPP
+#define SHARE_SERVICES_DIAGNOSTICARGUMENT_HPP
 
 #include "classfile/vmSymbols.hpp"
 #include "memory/allocation.hpp"
@@ -134,4 +134,4 @@
   void value_as_str(char *buf, size_t len) const { to_string(_value, buf, len);}
 };
 
-#endif  /* SHARE_VM_SERVICES_DIAGNOSTICARGUMENT_HPP */
+#endif // SHARE_SERVICES_DIAGNOSTICARGUMENT_HPP
--- a/src/hotspot/share/services/diagnosticCommand.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/services/diagnosticCommand.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_SERVICES_DIAGNOSTICCOMMAND_HPP
-#define SHARE_VM_SERVICES_DIAGNOSTICCOMMAND_HPP
+#ifndef SHARE_SERVICES_DIAGNOSTICCOMMAND_HPP
+#define SHARE_SERVICES_DIAGNOSTICCOMMAND_HPP
 
 #include "classfile/stringTable.hpp"
 #include "classfile/symbolTable.hpp"
@@ -888,4 +888,4 @@
 };
 #endif // INCLUDE_JVMTI
 
-#endif // SHARE_VM_SERVICES_DIAGNOSTICCOMMAND_HPP
+#endif // SHARE_SERVICES_DIAGNOSTICCOMMAND_HPP
--- a/src/hotspot/share/services/diagnosticFramework.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/services/diagnosticFramework.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_SERVICES_DIAGNOSTICFRAMEWORK_HPP
-#define SHARE_VM_SERVICES_DIAGNOSTICFRAMEWORK_HPP
+#ifndef SHARE_SERVICES_DIAGNOSTICFRAMEWORK_HPP
+#define SHARE_SERVICES_DIAGNOSTICFRAMEWORK_HPP
 
 #include "classfile/vmSymbols.hpp"
 #include "memory/allocation.hpp"
@@ -439,4 +439,4 @@
     friend class Management;
 };
 
-#endif // SHARE_VM_SERVICES_DIAGNOSTICFRAMEWORK_HPP
+#endif // SHARE_SERVICES_DIAGNOSTICFRAMEWORK_HPP
--- a/src/hotspot/share/services/dtraceAttacher.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/services/dtraceAttacher.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_SERVICES_DTRACEATTACHER_HPP
-#define SHARE_VM_SERVICES_DTRACEATTACHER_HPP
+#ifndef SHARE_SERVICES_DTRACEATTACHER_HPP
+#define SHARE_SERVICES_DTRACEATTACHER_HPP
 
 #define DTRACE_ALLOC_PROBES    0x1
 #define DTRACE_METHOD_PROBES   0x2
@@ -48,4 +48,4 @@
   static void set_monitor_dprobes(bool value);
 };
 
-#endif // SHARE_VM_SERVICES_DTRACEATTACHER_HPP
+#endif // SHARE_SERVICES_DTRACEATTACHER_HPP
--- a/src/hotspot/share/services/gcNotifier.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/services/gcNotifier.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_SERVICES_GCNOTIFIER_HPP
-#define SHARE_VM_SERVICES_GCNOTIFIER_HPP
+#ifndef SHARE_SERVICES_GCNOTIFIER_HPP
+#define SHARE_SERVICES_GCNOTIFIER_HPP
 
 #include "memory/allocation.hpp"
 #include "services/memoryPool.hpp"
@@ -67,4 +67,4 @@
   static void sendNotification(TRAPS);
 };
 
-#endif // SHARE_VM_SERVICES_GCNOTIFIER_HPP
+#endif // SHARE_SERVICES_GCNOTIFIER_HPP
--- a/src/hotspot/share/services/heapDumper.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/services/heapDumper.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_SERVICES_HEAPDUMPER_HPP
-#define SHARE_VM_SERVICES_HEAPDUMPER_HPP
+#ifndef SHARE_SERVICES_HEAPDUMPER_HPP
+#define SHARE_SERVICES_HEAPDUMPER_HPP
 
 #include "memory/allocation.hpp"
 #include "oops/oop.hpp"
@@ -81,4 +81,4 @@
   static void dump_heap_from_oome()    NOT_SERVICES_RETURN;
 };
 
-#endif // SHARE_VM_SERVICES_HEAPDUMPER_HPP
+#endif // SHARE_SERVICES_HEAPDUMPER_HPP
--- a/src/hotspot/share/services/lowMemoryDetector.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/services/lowMemoryDetector.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_SERVICES_LOWMEMORYDETECTOR_HPP
-#define SHARE_VM_SERVICES_LOWMEMORYDETECTOR_HPP
+#ifndef SHARE_SERVICES_LOWMEMORYDETECTOR_HPP
+#define SHARE_SERVICES_LOWMEMORYDETECTOR_HPP
 
 #include "memory/allocation.hpp"
 #include "services/memoryPool.hpp"
@@ -290,4 +290,4 @@
   }
 };
 
-#endif // SHARE_VM_SERVICES_LOWMEMORYDETECTOR_HPP
+#endif // SHARE_SERVICES_LOWMEMORYDETECTOR_HPP
--- a/src/hotspot/share/services/mallocSiteTable.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/services/mallocSiteTable.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_SERVICES_MALLOC_SITE_TABLE_HPP
-#define SHARE_VM_SERVICES_MALLOC_SITE_TABLE_HPP
+#ifndef SHARE_SERVICES_MALLOCSITETABLE_HPP
+#define SHARE_SERVICES_MALLOCSITETABLE_HPP
 
 #if INCLUDE_NMT
 
@@ -271,4 +271,4 @@
 };
 
 #endif // INCLUDE_NMT
-#endif // SHARE_VM_SERVICES_MALLOC_SITE_TABLE_HPP
+#endif // SHARE_SERVICES_MALLOCSITETABLE_HPP
--- a/src/hotspot/share/services/mallocTracker.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/services/mallocTracker.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_SERVICES_MALLOC_TRACKER_HPP
-#define SHARE_VM_SERVICES_MALLOC_TRACKER_HPP
+#ifndef SHARE_SERVICES_MALLOCTRACKER_HPP
+#define SHARE_SERVICES_MALLOCTRACKER_HPP
 
 #if INCLUDE_NMT
 
@@ -375,4 +375,4 @@
 #endif // INCLUDE_NMT
 
 
-#endif //SHARE_VM_SERVICES_MALLOC_TRACKER_HPP
+#endif // SHARE_SERVICES_MALLOCTRACKER_HPP
--- a/src/hotspot/share/services/mallocTracker.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/services/mallocTracker.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_SERVICES_MALLOC_TRACKER_INLINE_HPP
-#define SHARE_VM_SERVICES_MALLOC_TRACKER_INLINE_HPP
+#ifndef SHARE_SERVICES_MALLOCTRACKER_INLINE_HPP
+#define SHARE_SERVICES_MALLOCTRACKER_INLINE_HPP
 
 #include "services/mallocTracker.hpp"
 #include "services/memTracker.hpp"
@@ -32,5 +32,4 @@
   return get_base(memblock, MemTracker::tracking_level());
 }
 
-#endif // SHARE_VM_SERVICES_MALLOC_TRACKER_INLINE_HPP
-
+#endif // SHARE_SERVICES_MALLOCTRACKER_INLINE_HPP
--- a/src/hotspot/share/services/management.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/services/management.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_SERVICES_MANAGEMENT_HPP
-#define SHARE_VM_SERVICES_MANAGEMENT_HPP
+#ifndef SHARE_SERVICES_MANAGEMENT_HPP
+#define SHARE_SERVICES_MANAGEMENT_HPP
 
 #include "jmm.h"
 #include "memory/allocation.hpp"
@@ -134,4 +134,4 @@
 
 };
 
-#endif // SHARE_VM_SERVICES_MANAGEMENT_HPP
+#endif // SHARE_SERVICES_MANAGEMENT_HPP
--- a/src/hotspot/share/services/memBaseline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/services/memBaseline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_SERVICES_MEM_BASELINE_HPP
-#define SHARE_VM_SERVICES_MEM_BASELINE_HPP
+#ifndef SHARE_SERVICES_MEMBASELINE_HPP
+#define SHARE_SERVICES_MEMBASELINE_HPP
 
 #if INCLUDE_NMT
 
@@ -216,4 +216,4 @@
 
 #endif // INCLUDE_NMT
 
-#endif // SHARE_VM_SERVICES_MEM_BASELINE_HPP
+#endif // SHARE_SERVICES_MEMBASELINE_HPP
--- a/src/hotspot/share/services/memReporter.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/services/memReporter.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_SERVICES_MEM_REPORTER_HPP
-#define SHARE_VM_SERVICES_MEM_REPORTER_HPP
+#ifndef SHARE_SERVICES_MEMREPORTER_HPP
+#define SHARE_SERVICES_MEMREPORTER_HPP
 
 #if INCLUDE_NMT
 
@@ -235,5 +235,4 @@
 
 #endif // INCLUDE_NMT
 
-#endif
-
+#endif // SHARE_SERVICES_MEMREPORTER_HPP
--- a/src/hotspot/share/services/memTracker.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/services/memTracker.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_SERVICES_MEM_TRACKER_HPP
-#define SHARE_VM_SERVICES_MEM_TRACKER_HPP
+#ifndef SHARE_SERVICES_MEMTRACKER_HPP
+#define SHARE_SERVICES_MEMTRACKER_HPP
 
 #include "services/nmtCommon.hpp"
 #include "utilities/nativeCallStack.hpp"
@@ -321,4 +321,4 @@
 
 #endif // INCLUDE_NMT
 
-#endif // SHARE_VM_SERVICES_MEM_TRACKER_HPP
+#endif // SHARE_SERVICES_MEMTRACKER_HPP
--- a/src/hotspot/share/services/memoryManager.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/services/memoryManager.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_SERVICES_MEMORYMANAGER_HPP
-#define SHARE_VM_SERVICES_MEMORYMANAGER_HPP
+#ifndef SHARE_SERVICES_MEMORYMANAGER_HPP
+#define SHARE_SERVICES_MEMORYMANAGER_HPP
 
 #include "gc/shared/gcCause.hpp"
 #include "memory/allocation.hpp"
@@ -182,4 +182,4 @@
   bool is_notification_enabled() { return _notification_enabled; }
 };
 
-#endif // SHARE_VM_SERVICES_MEMORYMANAGER_HPP
+#endif // SHARE_SERVICES_MEMORYMANAGER_HPP
--- a/src/hotspot/share/services/memoryPool.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/services/memoryPool.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_SERVICES_MEMORYPOOL_HPP
-#define SHARE_VM_SERVICES_MEMORYPOOL_HPP
+#ifndef SHARE_SERVICES_MEMORYPOOL_HPP
+#define SHARE_SERVICES_MEMORYPOOL_HPP
 
 #include "memory/heap.hpp"
 #include "oops/oop.hpp"
@@ -172,4 +172,4 @@
   size_t used_in_bytes();
 };
 
-#endif // SHARE_VM_SERVICES_MEMORYPOOL_HPP
+#endif // SHARE_SERVICES_MEMORYPOOL_HPP
--- a/src/hotspot/share/services/memoryService.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/services/memoryService.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_SERVICES_MEMORYSERVICE_HPP
-#define SHARE_VM_SERVICES_MEMORYSERVICE_HPP
+#ifndef SHARE_SERVICES_MEMORYSERVICE_HPP
+#define SHARE_SERVICES_MEMORYSERVICE_HPP
 
 #include "gc/shared/gcCause.hpp"
 #include "logging/log.hpp"
@@ -153,4 +153,4 @@
   ~TraceMemoryManagerStats();
 };
 
-#endif // SHARE_VM_SERVICES_MEMORYSERVICE_HPP
+#endif // SHARE_SERVICES_MEMORYSERVICE_HPP
--- a/src/hotspot/share/services/memoryUsage.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/services/memoryUsage.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_SERVICES_MEMORYUSAGE_HPP
-#define SHARE_VM_SERVICES_MEMORYUSAGE_HPP
+#ifndef SHARE_SERVICES_MEMORYUSAGE_HPP
+#define SHARE_SERVICES_MEMORYUSAGE_HPP
 
 #include "utilities/globalDefinitions.hpp"
 
@@ -83,4 +83,4 @@
   jlong max_size_as_jlong()  const { return convert_to_jlong(_maxSize); }
 };
 
-#endif // SHARE_VM_SERVICES_MEMORYUSAGE_HPP
+#endif // SHARE_SERVICES_MEMORYUSAGE_HPP
--- a/src/hotspot/share/services/nmtCommon.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/services/nmtCommon.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_SERVICES_NMT_COMMON_HPP
-#define SHARE_VM_SERVICES_NMT_COMMON_HPP
+#ifndef SHARE_SERVICES_NMTCOMMON_HPP
+#define SHARE_SERVICES_NMTCOMMON_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/align.hpp"
@@ -78,4 +78,4 @@
 };
 
 
-#endif
+#endif // SHARE_SERVICES_NMTCOMMON_HPP
--- a/src/hotspot/share/services/nmtDCmd.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/services/nmtDCmd.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_SERVICES_NMT_DCMD_HPP
-#define SHARE_VM_SERVICES_NMT_DCMD_HPP
+#ifndef SHARE_SERVICES_NMTDCMD_HPP
+#define SHARE_SERVICES_NMTDCMD_HPP
 
 #if INCLUDE_NMT
 
@@ -75,4 +75,4 @@
 
 #endif // INCLUDE_NMT
 
-#endif // SHARE_VM_SERVICES_NMT_DCMD_HPP
+#endif // SHARE_SERVICES_NMTDCMD_HPP
--- a/src/hotspot/share/services/runtimeService.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/services/runtimeService.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_SERVICES_RUNTIMESERVICE_HPP
-#define SHARE_VM_SERVICES_RUNTIMESERVICE_HPP
+#ifndef SHARE_SERVICES_RUNTIMESERVICE_HPP
+#define SHARE_SERVICES_RUNTIMESERVICE_HPP
 
 #include "runtime/perfData.hpp"
 #include "runtime/timer.hpp"
@@ -58,4 +58,4 @@
 
 };
 
-#endif // SHARE_VM_SERVICES_RUNTIMESERVICE_HPP
+#endif // SHARE_SERVICES_RUNTIMESERVICE_HPP
--- a/src/hotspot/share/services/threadService.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/services/threadService.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_SERVICES_THREADSERVICE_HPP
-#define SHARE_VM_SERVICES_THREADSERVICE_HPP
+#ifndef SHARE_SERVICES_THREADSERVICE_HPP
+#define SHARE_SERVICES_THREADSERVICE_HPP
 
 #include "classfile/javaClasses.hpp"
 #include "runtime/handles.hpp"
@@ -610,4 +610,4 @@
   }
 };
 
-#endif // SHARE_VM_SERVICES_THREADSERVICE_HPP
+#endif // SHARE_SERVICES_THREADSERVICE_HPP
--- a/src/hotspot/share/services/virtualMemoryTracker.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/services/virtualMemoryTracker.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_SERVICES_VIRTUAL_MEMORY_TRACKER_HPP
-#define SHARE_VM_SERVICES_VIRTUAL_MEMORY_TRACKER_HPP
+#ifndef SHARE_SERVICES_VIRTUALMEMORYTRACKER_HPP
+#define SHARE_SERVICES_VIRTUALMEMORYTRACKER_HPP
 
 #if INCLUDE_NMT
 
@@ -445,4 +445,4 @@
 
 #endif // INCLUDE_NMT
 
-#endif // SHARE_VM_SERVICES_VIRTUAL_MEMORY_TRACKER_HPP
+#endif // SHARE_SERVICES_VIRTUALMEMORYTRACKER_HPP
--- a/src/hotspot/share/services/writeableFlags.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/services/writeableFlags.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_SERVICES_WRITEABLEFLAG_HPP
-#define SHARE_VM_SERVICES_WRITEABLEFLAG_HPP
+#ifndef SHARE_SERVICES_WRITEABLEFLAGS_HPP
+#define SHARE_SERVICES_WRITEABLEFLAGS_HPP
 
 #include "runtime/flags/jvmFlag.hpp"
 #include "runtime/globals.hpp"
@@ -89,4 +89,4 @@
   static JVMFlag::Error set_flag(const char* flag_name, jvalue flag_value, JVMFlag::Flags origin, FormatBuffer<80>& err_msg);
 };
 
-#endif /* SHARE_VM_SERVICES_WRITEABLEFLAG_HPP */
+#endif // SHARE_SERVICES_WRITEABLEFLAGS_HPP
--- a/src/hotspot/share/utilities/accessFlags.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/accessFlags.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_ACCESSFLAGS_HPP
-#define SHARE_VM_UTILITIES_ACCESSFLAGS_HPP
+#ifndef SHARE_UTILITIES_ACCESSFLAGS_HPP
+#define SHARE_UTILITIES_ACCESSFLAGS_HPP
 
 #include "jvm.h"
 #include "utilities/debug.hpp"
@@ -282,4 +282,4 @@
   return af;
 }
 
-#endif // SHARE_VM_UTILITIES_ACCESSFLAGS_HPP
+#endif // SHARE_UTILITIES_ACCESSFLAGS_HPP
--- a/src/hotspot/share/utilities/align.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/align.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_ALIGN_HPP
-#define SHARE_VM_UTILITIES_ALIGN_HPP
+#ifndef SHARE_UTILITIES_ALIGN_HPP
+#define SHARE_UTILITIES_ALIGN_HPP
 
 #include "utilities/globalDefinitions.hpp"
 
@@ -149,4 +149,4 @@
   }
 }
 
-#endif // SHARE_VM_UTILITIES_ALIGN_HPP
+#endif // SHARE_UTILITIES_ALIGN_HPP
--- a/src/hotspot/share/utilities/bitMap.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/bitMap.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_BITMAP_HPP
-#define SHARE_VM_UTILITIES_BITMAP_HPP
+#ifndef SHARE_UTILITIES_BITMAP_HPP
+#define SHARE_UTILITIES_BITMAP_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/align.hpp"
@@ -452,4 +452,4 @@
   virtual bool do_bit(BitMap::idx_t offset) = 0;
 };
 
-#endif // SHARE_VM_UTILITIES_BITMAP_HPP
+#endif // SHARE_UTILITIES_BITMAP_HPP
--- a/src/hotspot/share/utilities/bitMap.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/bitMap.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_BITMAP_INLINE_HPP
-#define SHARE_VM_UTILITIES_BITMAP_INLINE_HPP
+#ifndef SHARE_UTILITIES_BITMAP_INLINE_HPP
+#define SHARE_UTILITIES_BITMAP_INLINE_HPP
 
 #include "runtime/atomic.hpp"
 #include "utilities/bitMap.hpp"
@@ -287,4 +287,4 @@
   _map.at_put(bit, value);
 }
 
-#endif // SHARE_VM_UTILITIES_BITMAP_INLINE_HPP
+#endif // SHARE_UTILITIES_BITMAP_INLINE_HPP
--- a/src/hotspot/share/utilities/breakpoint.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/breakpoint.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_BREAKPOINT_HPP
-#define SHARE_VM_UTILITIES_BREAKPOINT_HPP
+#ifndef SHARE_UTILITIES_BREAKPOINT_HPP
+#define SHARE_UTILITIES_BREAKPOINT_HPP
 
 // Provide BREAKPOINT macro for requesting stop in the debugger.
 
@@ -43,4 +43,4 @@
 #define BREAKPOINT ::breakpoint()
 #endif
 
-#endif // SHARE_VM_UTILITIES_BREAKPOINT_HPP
+#endif // SHARE_UTILITIES_BREAKPOINT_HPP
--- a/src/hotspot/share/utilities/bytes.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/bytes.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_BYTES_HPP
-#define SHARE_VM_UTILITIES_BYTES_HPP
+#ifndef SHARE_UTILITIES_BYTES_HPP
+#define SHARE_UTILITIES_BYTES_HPP
 
 #include "utilities/macros.hpp"
 
@@ -50,4 +50,4 @@
 
 #include CPU_HEADER(bytes)
 
-#endif // SHARE_VM_UTILITIES_BYTES_HPP
+#endif // SHARE_UTILITIES_BYTES_HPP
--- a/src/hotspot/share/utilities/chunkedList.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/chunkedList.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_CHUNKED_LIST_HPP
-#define SHARE_VM_UTILITIES_CHUNKED_LIST_HPP
+#ifndef SHARE_UTILITIES_CHUNKEDLIST_HPP
+#define SHARE_UTILITIES_CHUNKEDLIST_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/debug.hpp"
@@ -78,4 +78,4 @@
   }
 };
 
-#endif // SHARE_VM_UTILITIES_CHUNKED_LIST_HPP
+#endif // SHARE_UTILITIES_CHUNKEDLIST_HPP
--- a/src/hotspot/share/utilities/compilerWarnings.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/compilerWarnings.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_COMPILERWARNINGS_HPP
-#define SHARE_VM_UTILITIES_COMPILERWARNINGS_HPP
+#ifndef SHARE_UTILITIES_COMPILERWARNINGS_HPP
+#define SHARE_UTILITIES_COMPILERWARNINGS_HPP
 
 // Macros related to control of compiler warnings.
 
@@ -84,4 +84,4 @@
 #define PRAGMA_DIAG_POP
 #endif
 
-#endif // SHARE_VM_UTILITIES_COMPILERWARNINGS_HPP
+#endif // SHARE_UTILITIES_COMPILERWARNINGS_HPP
--- a/src/hotspot/share/utilities/concurrentHashTable.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/concurrentHashTable.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_UTILITIES_CONCURRENT_HASH_TABLE_HPP
-#define SHARE_UTILITIES_CONCURRENT_HASH_TABLE_HPP
+#ifndef SHARE_UTILITIES_CONCURRENTHASHTABLE_HPP
+#define SHARE_UTILITIES_CONCURRENTHASHTABLE_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/globalCounter.hpp"
@@ -505,4 +505,4 @@
   class GrowTask;
 };
 
-#endif // include guard
+#endif // SHARE_UTILITIES_CONCURRENTHASHTABLE_HPP
--- a/src/hotspot/share/utilities/concurrentHashTable.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/concurrentHashTable.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_UTILITIES_CONCURRENT_HASH_TABLE_INLINE_HPP
-#define SHARE_UTILITIES_CONCURRENT_HASH_TABLE_INLINE_HPP
+#ifndef SHARE_UTILITIES_CONCURRENTHASHTABLE_INLINE_HPP
+#define SHARE_UTILITIES_CONCURRENTHASHTABLE_INLINE_HPP
 
 #include "memory/allocation.inline.hpp"
 #include "runtime/atomic.hpp"
@@ -1279,4 +1279,4 @@
   return true;
 }
 
-#endif // include guard
+#endif // SHARE_UTILITIES_CONCURRENTHASHTABLE_INLINE_HPP
--- a/src/hotspot/share/utilities/concurrentHashTableTasks.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/concurrentHashTableTasks.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_UTILITIES_CONCURRENT_HASH_TABLE_TASKS_INLINE_HPP
-#define SHARE_UTILITIES_CONCURRENT_HASH_TABLE_TASKS_INLINE_HPP
+#ifndef SHARE_UTILITIES_CONCURRENTHASHTABLETASKS_INLINE_HPP
+#define SHARE_UTILITIES_CONCURRENTHASHTABLETASKS_INLINE_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/concurrentHashTable.inline.hpp"
@@ -199,4 +199,4 @@
   }
 };
 
-#endif // include guard
+#endif // SHARE_UTILITIES_CONCURRENTHASHTABLETASKS_INLINE_HPP
--- a/src/hotspot/share/utilities/constantTag.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/constantTag.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_CONSTANTTAG_HPP
-#define SHARE_VM_UTILITIES_CONSTANTTAG_HPP
+#ifndef SHARE_UTILITIES_CONSTANTTAG_HPP
+#define SHARE_UTILITIES_CONSTANTTAG_HPP
 
 #include "jvm.h"
 #include "utilities/globalDefinitions.hpp"
@@ -141,4 +141,4 @@
   void print_on(outputStream* st) const PRODUCT_RETURN;
 };
 
-#endif // SHARE_VM_UTILITIES_CONSTANTTAG_HPP
+#endif // SHARE_UTILITIES_CONSTANTTAG_HPP
--- a/src/hotspot/share/utilities/copy.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/copy.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_COPY_HPP
-#define SHARE_VM_UTILITIES_COPY_HPP
+#ifndef SHARE_UTILITIES_COPY_HPP
+#define SHARE_UTILITIES_COPY_HPP
 
 #include "runtime/stubRoutines.hpp"
 #include "utilities/align.hpp"
@@ -346,4 +346,4 @@
 
 };
 
-#endif // SHARE_VM_UTILITIES_COPY_HPP
+#endif // SHARE_UTILITIES_COPY_HPP
--- a/src/hotspot/share/utilities/count_trailing_zeros.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/count_trailing_zeros.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_COUNTTRAILINGZEROS_HPP
-#define SHARE_VM_UTILITIES_COUNTTRAILINGZEROS_HPP
+#ifndef SHARE_UTILITIES_COUNT_TRAILING_ZEROS_HPP
+#define SHARE_UTILITIES_COUNT_TRAILING_ZEROS_HPP
 
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -105,4 +105,4 @@
 
 #endif // Toolchain dispatch
 
-#endif // include guard
+#endif // SHARE_UTILITIES_COUNT_TRAILING_ZEROS_HPP
--- a/src/hotspot/share/utilities/debug.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/debug.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_DEBUG_HPP
-#define SHARE_VM_UTILITIES_DEBUG_HPP
+#ifndef SHARE_UTILITIES_DEBUG_HPP
+#define SHARE_UTILITIES_DEBUG_HPP
 
 #include "utilities/breakpoint.hpp"
 #include "utilities/compilerWarnings.hpp"
@@ -205,4 +205,4 @@
 // out of memory reporting
 void report_java_out_of_memory(const char* message);
 
-#endif // SHARE_VM_UTILITIES_DEBUG_HPP
+#endif // SHARE_UTILITIES_DEBUG_HPP
--- a/src/hotspot/share/utilities/decoder.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/decoder.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef SHARE_VM_UTILITIES_DECODER_HPP
-#define SHARE_VM_UTILITIES_DECODER_HPP
+#ifndef SHARE_UTILITIES_DECODER_HPP
+#define SHARE_UTILITIES_DECODER_HPP
 
 #include "memory/allocation.hpp"
 #include "runtime/mutex.hpp"
@@ -146,4 +146,4 @@
   }
 };
 
-#endif // SHARE_VM_UTILITIES_DECODER_HPP
+#endif // SHARE_UTILITIES_DECODER_HPP
--- a/src/hotspot/share/utilities/decoder_elf.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/decoder_elf.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_DECODER_ELF_HPP
-#define SHARE_VM_UTILITIES_DECODER_ELF_HPP
+#ifndef SHARE_UTILITIES_DECODER_ELF_HPP
+#define SHARE_UTILITIES_DECODER_ELF_HPP
 
 #if !defined(_WINDOWS) && !defined(__APPLE__)
 
@@ -54,4 +54,4 @@
 };
 
 #endif // !_WINDOWS && !__APPLE__
-#endif // SHARE_VM_UTILITIES_DECODER_ELF_HPP
+#endif // SHARE_UTILITIES_DECODER_ELF_HPP
--- a/src/hotspot/share/utilities/defaultStream.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/defaultStream.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_DEFAULTSTREAM_HPP
-#define SHARE_VM_UTILITIES_DEFAULTSTREAM_HPP
+#ifndef SHARE_UTILITIES_DEFAULTSTREAM_HPP
+#define SHARE_UTILITIES_DEFAULTSTREAM_HPP
 
 #include "utilities/xmlstream.hpp"
 
@@ -96,4 +96,4 @@
   static defaultStream* instance;  // sole instance
 };
 
-#endif // SHARE_VM_UTILITIES_DEFAULTSTREAM_HPP
+#endif // SHARE_UTILITIES_DEFAULTSTREAM_HPP
--- a/src/hotspot/share/utilities/dtrace.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/dtrace.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2009, 2012 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_DTRACE_HPP
-#define SHARE_VM_UTILITIES_DTRACE_HPP
+#ifndef SHARE_UTILITIES_DTRACE_HPP
+#define SHARE_UTILITIES_DTRACE_HPP
 
 #if defined(DTRACE_ENABLED)
 
@@ -61,4 +61,4 @@
 
 #endif /* defined(DTRACE_ENABLED) */
 
-#endif // SHARE_VM_UTILITIES_DTRACE_HPP
+#endif // SHARE_UTILITIES_DTRACE_HPP
--- a/src/hotspot/share/utilities/dtrace_disabled.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/dtrace_disabled.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_DTRACE_USDT2_DISABLED_HPP
-#define SHARE_VM_UTILITIES_DTRACE_USDT2_DISABLED_HPP
+#ifndef SHARE_UTILITIES_DTRACE_DISABLED_HPP
+#define SHARE_UTILITIES_DTRACE_DISABLED_HPP
 
 /* This file contains dummy provider probes needed when compiling a hotspot
  * that does not support dtrace probes. This could be because we're building
@@ -1094,4 +1094,4 @@
 #error This file should only be included when dtrace is not enabled
 #endif /* !defined(DTRACE_ENABLED) */
 
-#endif // SHARE_VM_UTILITIES_DTRACE_USDT2_DISABLED_HPP
+#endif // SHARE_UTILITIES_DTRACE_DISABLED_HPP
--- a/src/hotspot/share/utilities/elfFile.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/elfFile.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_ELF_FILE_HPP
-#define SHARE_VM_UTILITIES_ELF_FILE_HPP
+#ifndef SHARE_UTILITIES_ELFFILE_HPP
+#define SHARE_UTILITIES_ELFFILE_HPP
 
 #if !defined(_WINDOWS) && !defined(__APPLE__) && !defined(_AIX)
 
@@ -214,4 +214,4 @@
 
 #endif // !_WINDOWS && !__APPLE__
 
-#endif // SHARE_VM_UTILITIES_ELF_FILE_HPP
+#endif // SHARE_UTILITIES_ELFFILE_HPP
--- a/src/hotspot/share/utilities/elfFuncDescTable.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/elfFuncDescTable.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_ELF_FUNC_DESC_TABLE_HPP
-#define SHARE_VM_UTILITIES_ELF_FUNC_DESC_TABLE_HPP
+#ifndef SHARE_UTILITIES_ELFFUNCDESCTABLE_HPP
+#define SHARE_UTILITIES_ELFFUNCDESCTABLE_HPP
 
 #if !defined(_WINDOWS) && !defined(__APPLE__)
 
@@ -145,4 +145,4 @@
 
 #endif // !_WINDOWS && !__APPLE__
 
-#endif // SHARE_VM_UTILITIES_ELF_FUNC_DESC_TABLE_HPP
+#endif // SHARE_UTILITIES_ELFFUNCDESCTABLE_HPP
--- a/src/hotspot/share/utilities/elfStringTable.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/elfStringTable.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_ELF_STRING_TABLE_HPP
-#define SHARE_VM_UTILITIES_ELF_STRING_TABLE_HPP
+#ifndef SHARE_UTILITIES_ELFSTRINGTABLE_HPP
+#define SHARE_UTILITIES_ELFSTRINGTABLE_HPP
 
 #if !defined(_WINDOWS) && !defined(__APPLE__)
 
@@ -71,4 +71,4 @@
 
 #endif // !_WINDOWS && !__APPLE__
 
-#endif // SHARE_VM_UTILITIES_ELF_STRING_TABLE_HPP
+#endif // SHARE_UTILITIES_ELFSTRINGTABLE_HPP
--- a/src/hotspot/share/utilities/elfSymbolTable.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/elfSymbolTable.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_ELF_SYMBOL_TABLE_HPP
-#define SHARE_VM_UTILITIES_ELF_SYMBOL_TABLE_HPP
+#ifndef SHARE_UTILITIES_ELFSYMBOLTABLE_HPP
+#define SHARE_UTILITIES_ELFSYMBOLTABLE_HPP
 
 #if !defined(_WINDOWS) && !defined(__APPLE__)
 
@@ -67,4 +67,4 @@
 
 #endif // !_WINDOWS and !__APPLE__
 
-#endif // SHARE_VM_UTILITIES_ELF_SYMBOL_TABLE_HPP
+#endif // SHARE_UTILITIES_ELFSYMBOLTABLE_HPP
--- a/src/hotspot/share/utilities/events.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/events.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_EVENTS_HPP
-#define SHARE_VM_UTILITIES_EVENTS_HPP
+#ifndef SHARE_UTILITIES_EVENTS_HPP
+#define SHARE_UTILITIES_EVENTS_HPP
 
 #include "memory/allocation.hpp"
 #include "runtime/mutexLocker.hpp"
@@ -301,4 +301,4 @@
   ~EventMark();
 };
 
-#endif // SHARE_VM_UTILITIES_EVENTS_HPP
+#endif // SHARE_UTILITIES_EVENTS_HPP
--- a/src/hotspot/share/utilities/exceptions.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/exceptions.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_EXCEPTIONS_HPP
-#define SHARE_VM_UTILITIES_EXCEPTIONS_HPP
+#ifndef SHARE_UTILITIES_EXCEPTIONS_HPP
+#define SHARE_UTILITIES_EXCEPTIONS_HPP
 
 #include "memory/allocation.hpp"
 #include "oops/oopsHierarchy.hpp"
@@ -333,4 +333,4 @@
 
 #define EXCEPTION_MARK                           Thread* THREAD = NULL; ExceptionMark __em(THREAD);
 
-#endif // SHARE_VM_UTILITIES_EXCEPTIONS_HPP
+#endif // SHARE_UTILITIES_EXCEPTIONS_HPP
--- a/src/hotspot/share/utilities/fakeRttiSupport.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/fakeRttiSupport.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_FAKERTTISUPPORT_HPP
-#define SHARE_VM_UTILITIES_FAKERTTISUPPORT_HPP
+#ifndef SHARE_UTILITIES_FAKERTTISUPPORT_HPP
+#define SHARE_UTILITIES_FAKERTTISUPPORT_HPP
 
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/debug.hpp"
@@ -98,4 +98,4 @@
   }
 };
 
-#endif // include guard
+#endif // SHARE_UTILITIES_FAKERTTISUPPORT_HPP
--- a/src/hotspot/share/utilities/formatBuffer.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/formatBuffer.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_FORMATBUFFER_HPP
-#define SHARE_VM_UTILITIES_FORMATBUFFER_HPP
+#ifndef SHARE_UTILITIES_FORMATBUFFER_HPP
+#define SHARE_UTILITIES_FORMATBUFFER_HPP
 
 #include "jvm.h"
 #include "utilities/globalDefinitions.hpp"
@@ -116,4 +116,4 @@
 // Used to format messages.
 typedef FormatBuffer<> err_msg;
 
-#endif // SHARE_VM_UTILITIES_FORMATBUFFER_HPP
+#endif // SHARE_UTILITIES_FORMATBUFFER_HPP
--- a/src/hotspot/share/utilities/globalCounter.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/globalCounter.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_UTILITIES_GLOBAL_COUNTER_HPP
-#define SHARE_UTILITIES_GLOBAL_COUNTER_HPP
+#ifndef SHARE_UTILITIES_GLOBALCOUNTER_HPP
+#define SHARE_UTILITIES_GLOBALCOUNTER_HPP
 
 #include "memory/allocation.hpp"
 #include "memory/padded.hpp"
@@ -86,4 +86,4 @@
   class CriticalSection;
 };
 
-#endif // include guard
+#endif // SHARE_UTILITIES_GLOBALCOUNTER_HPP
--- a/src/hotspot/share/utilities/globalCounter.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/globalCounter.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_UTILITIES_GLOBAL_COUNTER_INLINE_HPP
-#define SHARE_UTILITIES_GLOBAL_COUNTER_INLINE_HPP
+#ifndef SHARE_UTILITIES_GLOBALCOUNTER_INLINE_HPP
+#define SHARE_UTILITIES_GLOBALCOUNTER_INLINE_HPP
 
 #include "runtime/atomic.hpp"
 #include "runtime/orderAccess.hpp"
@@ -68,4 +68,4 @@
   }
 };
 
-#endif // include guard
+#endif // SHARE_UTILITIES_GLOBALCOUNTER_INLINE_HPP
--- a/src/hotspot/share/utilities/globalDefinitions.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/globalDefinitions.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_GLOBALDEFINITIONS_HPP
-#define SHARE_VM_UTILITIES_GLOBALDEFINITIONS_HPP
+#ifndef SHARE_UTILITIES_GLOBALDEFINITIONS_HPP
+#define SHARE_UTILITIES_GLOBALDEFINITIONS_HPP
 
 #include "utilities/compilerWarnings.hpp"
 #include "utilities/debug.hpp"
@@ -1096,4 +1096,4 @@
 }
 
 
-#endif // SHARE_VM_UTILITIES_GLOBALDEFINITIONS_HPP
+#endif // SHARE_UTILITIES_GLOBALDEFINITIONS_HPP
--- a/src/hotspot/share/utilities/globalDefinitions_gcc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/globalDefinitions_gcc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_GLOBALDEFINITIONS_GCC_HPP
-#define SHARE_VM_UTILITIES_GLOBALDEFINITIONS_GCC_HPP
+#ifndef SHARE_UTILITIES_GLOBALDEFINITIONS_GCC_HPP
+#define SHARE_UTILITIES_GLOBALDEFINITIONS_GCC_HPP
 
 #include "jni.h"
 
@@ -271,4 +271,4 @@
 //
 #define ATTRIBUTE_ALIGNED(x) __attribute__((aligned(x+0)))
 
-#endif // SHARE_VM_UTILITIES_GLOBALDEFINITIONS_GCC_HPP
+#endif // SHARE_UTILITIES_GLOBALDEFINITIONS_GCC_HPP
--- a/src/hotspot/share/utilities/globalDefinitions_solstudio.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/globalDefinitions_solstudio.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_GLOBALDEFINITIONS_SOLSTUDIO_HPP
-#define SHARE_VM_UTILITIES_GLOBALDEFINITIONS_SOLSTUDIO_HPP
+#ifndef SHARE_UTILITIES_GLOBALDEFINITIONS_SOLSTUDIO_HPP
+#define SHARE_UTILITIES_GLOBALDEFINITIONS_SOLSTUDIO_HPP
 
 #include "jni.h"
 
@@ -256,4 +256,4 @@
 // Alignment
 #define ATTRIBUTE_ALIGNED(x) __attribute__((aligned(x)))
 
-#endif // SHARE_VM_UTILITIES_GLOBALDEFINITIONS_SOLSTUDIO_HPP
+#endif // SHARE_UTILITIES_GLOBALDEFINITIONS_SOLSTUDIO_HPP
--- a/src/hotspot/share/utilities/globalDefinitions_visCPP.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/globalDefinitions_visCPP.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_GLOBALDEFINITIONS_VISCPP_HPP
-#define SHARE_VM_UTILITIES_GLOBALDEFINITIONS_VISCPP_HPP
+#ifndef SHARE_UTILITIES_GLOBALDEFINITIONS_VISCPP_HPP
+#define SHARE_UTILITIES_GLOBALDEFINITIONS_VISCPP_HPP
 
 #include "jni.h"
 
@@ -167,4 +167,4 @@
 // Alignment
 #define ATTRIBUTE_ALIGNED(x) __declspec(align(x))
 
-#endif // SHARE_VM_UTILITIES_GLOBALDEFINITIONS_VISCPP_HPP
+#endif // SHARE_UTILITIES_GLOBALDEFINITIONS_VISCPP_HPP
--- a/src/hotspot/share/utilities/globalDefinitions_xlc.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/globalDefinitions_xlc.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_GLOBALDEFINITIONS_XLC_HPP
-#define SHARE_VM_UTILITIES_GLOBALDEFINITIONS_XLC_HPP
+#ifndef SHARE_UTILITIES_GLOBALDEFINITIONS_XLC_HPP
+#define SHARE_UTILITIES_GLOBALDEFINITIONS_XLC_HPP
 
 #include "jni.h"
 
@@ -162,4 +162,4 @@
 #define NOINLINE     __attribute__((__noinline__))
 #define ALWAYSINLINE inline __attribute__((__always_inline__))
 
-#endif // SHARE_VM_UTILITIES_GLOBALDEFINITIONS_XLC_HPP
+#endif // SHARE_UTILITIES_GLOBALDEFINITIONS_XLC_HPP
--- a/src/hotspot/share/utilities/growableArray.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/growableArray.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_GROWABLEARRAY_HPP
-#define SHARE_VM_UTILITIES_GROWABLEARRAY_HPP
+#ifndef SHARE_UTILITIES_GROWABLEARRAY_HPP
+#define SHARE_UTILITIES_GROWABLEARRAY_HPP
 
 #include "memory/allocation.hpp"
 #include "oops/oop.hpp"
@@ -584,4 +584,4 @@
 typedef GrowableArray<int> intStack;
 typedef GrowableArray<bool> boolArray;
 
-#endif // SHARE_VM_UTILITIES_GROWABLEARRAY_HPP
+#endif // SHARE_UTILITIES_GROWABLEARRAY_HPP
--- a/src/hotspot/share/utilities/hashtable.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/hashtable.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_HASHTABLE_HPP
-#define SHARE_VM_UTILITIES_HASHTABLE_HPP
+#ifndef SHARE_UTILITIES_HASHTABLE_HPP
+#define SHARE_UTILITIES_HASHTABLE_HPP
 
 #include "memory/allocation.hpp"
 #include "oops/oop.hpp"
@@ -316,4 +316,4 @@
 };
 
 
-#endif // SHARE_VM_UTILITIES_HASHTABLE_HPP
+#endif // SHARE_UTILITIES_HASHTABLE_HPP
--- a/src/hotspot/share/utilities/hashtable.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/hashtable.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_HASHTABLE_INLINE_HPP
-#define SHARE_VM_UTILITIES_HASHTABLE_INLINE_HPP
+#ifndef SHARE_UTILITIES_HASHTABLE_INLINE_HPP
+#define SHARE_UTILITIES_HASHTABLE_INLINE_HPP
 
 #include "memory/allocation.inline.hpp"
 #include "runtime/orderAccess.hpp"
@@ -116,4 +116,4 @@
   --_number_of_entries;
 }
 
-#endif // SHARE_VM_UTILITIES_HASHTABLE_INLINE_HPP
+#endif // SHARE_UTILITIES_HASHTABLE_INLINE_HPP
--- a/src/hotspot/share/utilities/histogram.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/histogram.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_HISTOGRAM_HPP
-#define SHARE_VM_UTILITIES_HISTOGRAM_HPP
+#ifndef SHARE_UTILITIES_HISTOGRAM_HPP
+#define SHARE_UTILITIES_HISTOGRAM_HPP
 
 #include "memory/allocation.hpp"
 #include "runtime/os.hpp"
@@ -97,4 +97,4 @@
 
 #endif
 
-#endif // SHARE_VM_UTILITIES_HISTOGRAM_HPP
+#endif // SHARE_UTILITIES_HISTOGRAM_HPP
--- a/src/hotspot/share/utilities/intHisto.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/intHisto.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_INTHISTO_HPP
-#define SHARE_VM_UTILITIES_INTHISTO_HPP
+#ifndef SHARE_UTILITIES_INTHISTO_HPP
+#define SHARE_UTILITIES_INTHISTO_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/growableArray.hpp"
@@ -75,4 +75,4 @@
   void print_on(outputStream* st) const;
 };
 
-#endif // SHARE_VM_UTILITIES_INTHISTO_HPP
+#endif // SHARE_UTILITIES_INTHISTO_HPP
--- a/src/hotspot/share/utilities/json.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/json.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_JSON_HPP
-#define SHARE_VM_UTILITIES_JSON_HPP
+#ifndef SHARE_UTILITIES_JSON_HPP
+#define SHARE_UTILITIES_JSON_HPP
 
 #include "memory/allocation.hpp"
 #include "utilities/globalDefinitions.hpp"
@@ -109,4 +109,4 @@
   const char* strerror(JSON_ERROR e);
 };
 
-#endif // SHARE_VM_UTILITIES_JSON_HPP
+#endif // SHARE_UTILITIES_JSON_HPP
--- a/src/hotspot/share/utilities/linkedlist.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/linkedlist.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_LINKED_LIST_HPP
-#define SHARE_VM_UTILITIES_LINKED_LIST_HPP
+#ifndef SHARE_UTILITIES_LINKEDLIST_HPP
+#define SHARE_UTILITIES_LINKEDLIST_HPP
 
 #include "memory/allocation.hpp"
 
@@ -418,4 +418,4 @@
   }
 };
 
-#endif
+#endif // SHARE_UTILITIES_LINKEDLIST_HPP
--- a/src/hotspot/share/utilities/macros.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/macros.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_MACROS_HPP
-#define SHARE_VM_UTILITIES_MACROS_HPP
+#ifndef SHARE_UTILITIES_MACROS_HPP
+#define SHARE_UTILITIES_MACROS_HPP
 
 // Use this to mark code that needs to be cleaned up (for development only)
 #define NEEDS_CLEANUP
@@ -640,4 +640,4 @@
 #define NOT_CDS_JAVA_HEAP_RETURN_(code) { return code; }
 #endif
 
-#endif // SHARE_VM_UTILITIES_MACROS_HPP
+#endif // SHARE_UTILITIES_MACROS_HPP
--- a/src/hotspot/share/utilities/nativeCallStack.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/nativeCallStack.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_NATIVE_CALL_STACK_HPP
-#define SHARE_VM_UTILITIES_NATIVE_CALL_STACK_HPP
+#ifndef SHARE_UTILITIES_NATIVECALLSTACK_HPP
+#define SHARE_UTILITIES_NATIVECALLSTACK_HPP
 
 #include "memory/allocation.hpp"
 #include "services/nmtCommon.hpp"
@@ -98,4 +98,4 @@
   void print_on(outputStream* out, int indent) const;
 };
 
-#endif
+#endif // SHARE_UTILITIES_NATIVECALLSTACK_HPP
--- a/src/hotspot/share/utilities/numberSeq.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/numberSeq.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_NUMBERSEQ_HPP
-#define SHARE_VM_UTILITIES_NUMBERSEQ_HPP
+#ifndef SHARE_UTILITIES_NUMBERSEQ_HPP
+#define SHARE_UTILITIES_NUMBERSEQ_HPP
 
 #include "memory/allocation.hpp"
 
@@ -131,4 +131,4 @@
   virtual void dump_on(outputStream* s);
 };
 
-#endif // SHARE_VM_UTILITIES_NUMBERSEQ_HPP
+#endif // SHARE_UTILITIES_NUMBERSEQ_HPP
--- a/src/hotspot/share/utilities/ostream.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/ostream.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_OSTREAM_HPP
-#define SHARE_VM_UTILITIES_OSTREAM_HPP
+#ifndef SHARE_UTILITIES_OSTREAM_HPP
+#define SHARE_UTILITIES_OSTREAM_HPP
 
 #include "memory/allocation.hpp"
 #include "runtime/timer.hpp"
@@ -294,4 +294,4 @@
 
 #endif
 
-#endif // SHARE_VM_UTILITIES_OSTREAM_HPP
+#endif // SHARE_UTILITIES_OSTREAM_HPP
--- a/src/hotspot/share/utilities/pair.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/pair.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_PAIR_HPP
-#define SHARE_VM_UTILITIES_PAIR_HPP
+#ifndef SHARE_UTILITIES_PAIR_HPP
+#define SHARE_UTILITIES_PAIR_HPP
 
 #include "memory/allocation.hpp"
 
@@ -38,4 +38,4 @@
 };
 
 
-#endif // SHARE_VM_UTILITIES_PAIR_HPP
+#endif // SHARE_UTILITIES_PAIR_HPP
--- a/src/hotspot/share/utilities/preserveException.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/preserveException.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_PRESERVEEXCEPTION_HPP
-#define SHARE_VM_UTILITIES_PRESERVEEXCEPTION_HPP
+#ifndef SHARE_UTILITIES_PRESERVEEXCEPTION_HPP
+#define SHARE_UTILITIES_PRESERVEEXCEPTION_HPP
 
 #include "runtime/handles.hpp"
 #include "runtime/thread.hpp"
@@ -90,4 +90,4 @@
 // saving and restoring them
 #define PRESERVE_EXCEPTION_MARK                    Thread* THREAD; PreserveExceptionMark __em(THREAD);
 
-#endif // SHARE_VM_UTILITIES_PRESERVEEXCEPTION_HPP
+#endif // SHARE_UTILITIES_PRESERVEEXCEPTION_HPP
--- a/src/hotspot/share/utilities/quickSort.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/quickSort.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_QUICKSORT_HPP
-#define SHARE_VM_UTILITIES_QUICKSORT_HPP
+#ifndef SHARE_UTILITIES_QUICKSORT_HPP
+#define SHARE_UTILITIES_QUICKSORT_HPP
 
 #include "memory/allocation.hpp"
 #include "runtime/globals.hpp"
@@ -127,4 +127,4 @@
 };
 
 
-#endif //SHARE_VM_UTILITIES_QUICKSORT_HPP
+#endif // SHARE_UTILITIES_QUICKSORT_HPP
--- a/src/hotspot/share/utilities/resourceHash.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/resourceHash.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_RESOURCEHASH_HPP
-#define SHARE_VM_UTILITIES_RESOURCEHASH_HPP
+#ifndef SHARE_UTILITIES_RESOURCEHASH_HPP
+#define SHARE_UTILITIES_RESOURCEHASH_HPP
 
 #include "memory/allocation.hpp"
 
@@ -167,4 +167,4 @@
 };
 
 
-#endif // SHARE_VM_UTILITIES_RESOURCEHASH_HPP
+#endif // SHARE_UTILITIES_RESOURCEHASH_HPP
--- a/src/hotspot/share/utilities/sizes.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/sizes.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_SIZES_HPP
-#define SHARE_VM_UTILITIES_SIZES_HPP
+#ifndef SHARE_UTILITIES_SIZES_HPP
+#define SHARE_UTILITIES_SIZES_HPP
 
 #include "utilities/globalDefinitions.hpp"
 
@@ -148,4 +148,4 @@
 
 #define byte_offset_of(klass,field)   in_ByteSize((int)offset_of(klass, field))
 
-#endif // SHARE_VM_UTILITIES_SIZES_HPP
+#endif // SHARE_UTILITIES_SIZES_HPP
--- a/src/hotspot/share/utilities/stack.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/stack.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_STACK_HPP
-#define SHARE_VM_UTILITIES_STACK_HPP
+#ifndef SHARE_UTILITIES_STACK_HPP
+#define SHARE_UTILITIES_STACK_HPP
 
 #include "memory/allocation.hpp"
 
@@ -211,4 +211,4 @@
 #undef inline
 #endif // __GNUC__
 
-#endif // SHARE_VM_UTILITIES_STACK_HPP
+#endif // SHARE_UTILITIES_STACK_HPP
--- a/src/hotspot/share/utilities/stack.inline.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/stack.inline.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_STACK_INLINE_HPP
-#define SHARE_VM_UTILITIES_STACK_INLINE_HPP
+#ifndef SHARE_UTILITIES_STACK_INLINE_HPP
+#define SHARE_UTILITIES_STACK_INLINE_HPP
 
 #include "memory/allocation.inline.hpp"
 #include "utilities/align.hpp"
@@ -273,4 +273,4 @@
   return _cur_seg + --_cur_seg_size;
 }
 
-#endif // SHARE_VM_UTILITIES_STACK_INLINE_HPP
+#endif // SHARE_UTILITIES_STACK_INLINE_HPP
--- a/src/hotspot/share/utilities/stringUtils.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/stringUtils.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_STRINGUTILS_HPP
-#define SHARE_VM_UTILITIES_STRINGUTILS_HPP
+#ifndef SHARE_UTILITIES_STRINGUTILS_HPP
+#define SHARE_UTILITIES_STRINGUTILS_HPP
 
 #include "memory/allocation.hpp"
 
@@ -42,4 +42,4 @@
   static double similarity(const char* str1, size_t len1, const char* str2, size_t len2);
 };
 
-#endif // SHARE_VM_UTILITIES_STRINGUTILS_HPP
+#endif // SHARE_UTILITIES_STRINGUTILS_HPP
--- a/src/hotspot/share/utilities/ticks.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/ticks.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
 *
 */
 
-#ifndef SHARE_VM_UTILITIES_TICKS_HPP
-#define SHARE_VM_UTILITIES_TICKS_HPP
+#ifndef SHARE_UTILITIES_TICKS_HPP
+#define SHARE_UTILITIES_TICKS_HPP
 
 #include "jni.h"
 #include "memory/allocation.hpp"
@@ -246,4 +246,4 @@
 typedef TimeInterval<CounterRepresentation, ElapsedCounterSource> Tickspan;
 #endif
 
-#endif // SHARE_VM_UTILITIES_TICKS_HPP
+#endif // SHARE_UTILITIES_TICKS_HPP
--- a/src/hotspot/share/utilities/utf8.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/utf8.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_UTF8_HPP
-#define SHARE_VM_UTILITIES_UTF8_HPP
+#ifndef SHARE_UTILITIES_UTF8_HPP
+#define SHARE_UTILITIES_UTF8_HPP
 
 #include "memory/allocation.hpp"
 
@@ -116,4 +116,4 @@
   template<typename T> static void as_quoted_ascii(const T* base, int length, char* buf, int buflen);
 };
 
-#endif // SHARE_VM_UTILITIES_UTF8_HPP
+#endif // SHARE_UTILITIES_UTF8_HPP
--- a/src/hotspot/share/utilities/vmError.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/vmError.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_VMERROR_HPP
-#define SHARE_VM_UTILITIES_VMERROR_HPP
+#ifndef SHARE_UTILITIES_VMERROR_HPP
+#define SHARE_UTILITIES_VMERROR_HPP
 
 #include "utilities/globalDefinitions.hpp"
 
@@ -198,4 +198,4 @@
   // for test purposes, which is not NULL and contains bits in every word
   static void* get_segfault_address();
 };
-#endif // SHARE_VM_UTILITIES_VMERROR_HPP
+#endif // SHARE_UTILITIES_VMERROR_HPP
--- a/src/hotspot/share/utilities/xmlstream.hpp	Thu Jan 10 14:32:56 2019 -0500
+++ b/src/hotspot/share/utilities/xmlstream.hpp	Thu Jan 10 15:13:51 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef SHARE_VM_UTILITIES_XMLSTREAM_HPP
-#define SHARE_VM_UTILITIES_XMLSTREAM_HPP
+#ifndef SHARE_UTILITIES_XMLSTREAM_HPP
+#define SHARE_UTILITIES_XMLSTREAM_HPP
 
 #include "runtime/handles.hpp"
 #include "utilities/ostream.hpp"
@@ -184,4 +184,4 @@
 
 // Note:  If ::xtty != NULL, ::tty == ::xtty->text().
 
-#endif // SHARE_VM_UTILITIES_XMLSTREAM_HPP
+#endif // SHARE_UTILITIES_XMLSTREAM_HPP