8296886: Fix various include sort order issues

Reviewed-by: kbarrett, dholmes, stuefe

src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp

@@ -29,6 +29,8 @@
 #include "asm/assembler.hpp"
 #include "asm/assembler.inline.hpp"
 #include "ci/ciEnv.hpp"
+#include "compiler/compileTask.hpp"
+#include "compiler/disassembler.hpp"
 #include "compiler/oopMap.hpp"
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
@@ -39,8 +41,6 @@
 #include "interpreter/bytecodeHistogram.hpp"
 #include "interpreter/interpreter.hpp"
 #include "jvm.h"
-#include "compiler/compileTask.hpp"
-#include "compiler/disassembler.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
 #include "nativeInst_aarch64.hpp"

src/hotspot/cpu/arm/frame_arm.cpp

@@ -30,6 +30,7 @@
 #include "oops/markWord.hpp"
 #include "oops/method.hpp"
 #include "oops/oop.inline.hpp"
+#include "prims/methodHandles.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/javaCalls.hpp"
@@ -43,7 +44,6 @@
 #include "c1/c1_Runtime1.hpp"
 #include "runtime/vframeArray.hpp"
 #endif
-#include "prims/methodHandles.hpp"
 
 #ifdef ASSERT
 void RegisterMap::check_location_valid() {

src/hotspot/cpu/arm/nativeInst_arm_32.cpp

@@ -25,6 +25,7 @@
 #include "precompiled.hpp"
 #include "asm/assembler.inline.hpp"
 #include "code/codeCache.hpp"
+#include "code/icBuffer.hpp"
 #include "memory/resourceArea.hpp"
 #include "nativeInst_arm.hpp"
 #include "oops/oop.inline.hpp"
@@ -35,7 +36,6 @@
 #ifdef COMPILER1
 #include "c1/c1_Runtime1.hpp"
 #endif
-#include "code/icBuffer.hpp"
 
 int NativeMovRegMem::offset() const {
   switch (kind()) {

src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.cpp

@@ -42,13 +42,10 @@
 #include "runtime/sharedRuntime.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "vm_version_ppc.hpp"
-
 #ifdef COMPILER1
-
 #include "c1/c1_LIRAssembler.hpp"
 #include "c1/c1_MacroAssembler.hpp"
 #include "gc/shenandoah/c1/shenandoahBarrierSetC1.hpp"
-
 #endif
 
 #define __ masm->

src/hotspot/cpu/ppc/macroAssembler_ppc_sha.cpp

@@ -23,7 +23,7 @@
 // (http://www.iwar.org.uk/comsec/resources/cipher/sha256-384-512.pdf).
 
 #include "asm/macroAssembler.inline.hpp"
-#include "runtime/os.hpp" // malloc
+#include "runtime/os.hpp"
 #include "runtime/stubRoutines.hpp"
 
 /**********************************************************************

src/hotspot/cpu/ppc/stubRoutines_ppc_64.cpp

@@ -25,7 +25,7 @@
 
 #include "precompiled.hpp"
 #include "asm/macroAssembler.inline.hpp"
-#include "runtime/os.hpp" // malloc
+#include "runtime/os.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "runtime/vm_version.hpp"
 

src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.hpp

@@ -29,6 +29,7 @@
 #include "asm/macroAssembler.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "gc/shenandoah/shenandoahBarrierSet.hpp"
+
 #ifdef COMPILER1
 class LIR_Assembler;
 class ShenandoahPreBarrierStub;

src/hotspot/cpu/x86/macroAssembler_x86.cpp

@@ -27,6 +27,7 @@
 #include "asm/assembler.inline.hpp"
 #include "compiler/compiler_globals.hpp"
 #include "compiler/disassembler.hpp"
+#include "crc32c.h"
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "gc/shared/collectedHeap.inline.hpp"
@@ -52,7 +53,6 @@
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "utilities/macros.hpp"
-#include "crc32c.h"
 
 #ifdef PRODUCT
 #define BLOCK_COMMENT(str) /* nothing */

src/hotspot/cpu/zero/sharedRuntime_zero.cpp

@@ -34,7 +34,6 @@
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/vframeArray.hpp"
 #include "vmreg_zero.inline.hpp"
-
 #ifdef COMPILER1
 #include "c1/c1_Runtime1.hpp"
 #endif

src/hotspot/os/aix/os_aix.cpp

@@ -35,12 +35,12 @@
 #include "interpreter/interpreter.hpp"
 #include "jvm.h"
 #include "jvmtifiles/jvmti.h"
-#include "logging/log.hpp"
-#include "logging/logStream.hpp"
 #include "libo4.hpp"
 #include "libperfstat_aix.hpp"
 #include "libodm_aix.hpp"
 #include "loadlib_aix.hpp"
+#include "logging/log.hpp"
+#include "logging/logStream.hpp"
 #include "memory/allocation.inline.hpp"
 #include "misc_aix.hpp"
 #include "oops/oop.inline.hpp"

src/hotspot/os/linux/os_linux.cpp

@@ -45,8 +45,8 @@
 #include "runtime/atomic.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/globals_extension.hpp"
-#include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/init.hpp"
+#include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/java.hpp"
 #include "runtime/javaCalls.hpp"
 #include "runtime/javaThread.hpp"

src/hotspot/os/windows/jvm_windows.cpp

@@ -24,8 +24,8 @@
 
 #include "precompiled.hpp"
 #include "jvm.h"
-#include "runtime/interfaceSupport.inline.hpp"
 #include "os_windows.hpp"
+#include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/osThread.hpp"
 
 #include <signal.h>

src/hotspot/os/windows/os_perf_windows.cpp

@@ -35,6 +35,7 @@
 #include "runtime/vm_version.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
+
 #include <math.h>
 #include <psapi.h>
 #include <TlHelp32.h>

src/hotspot/os/windows/os_windows.cpp

@@ -70,13 +70,13 @@
 #include "services/attachListener.hpp"
 #include "services/memTracker.hpp"
 #include "services/runtimeService.hpp"
+#include "symbolengine.hpp"
 #include "utilities/align.hpp"
 #include "utilities/decoder.hpp"
 #include "utilities/defaultStream.hpp"
 #include "utilities/events.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/vmError.hpp"
-#include "symbolengine.hpp"
 #include "windbghelp.hpp"
 
 #ifdef _DEBUG

src/hotspot/os_cpu/bsd_zero/os_bsd_zero.cpp

@@ -23,11 +23,6 @@
  *
  */
 
-#if !defined(__APPLE__) && !defined(__NetBSD__)
-#include <pthread.h>
-# include <pthread_np.h> /* For pthread_attr_get_np */
-#endif
-
 // no precompiled headers
 #include "asm/assembler.inline.hpp"
 #include "atomic_bsd_zero.hpp"
@@ -57,6 +52,11 @@
 #include "utilities/events.hpp"
 #include "utilities/vmError.hpp"
 
+#if !defined(__APPLE__) && !defined(__NetBSD__)
+#include <pthread.h>
+# include <pthread_np.h> /* For pthread_attr_get_np */
+#endif
+
 address os::current_stack_pointer() {
   address dummy = (address) &dummy;
   return dummy;

src/hotspot/os_cpu/windows_aarch64/os_windows_aarch64.cpp

@@ -52,7 +52,6 @@
 #include "utilities/events.hpp"
 #include "utilities/vmError.hpp"
 
-
 // put OS-includes here
 # include <sys/types.h>
 # include <signal.h>

src/hotspot/share/cds/archiveHeapLoader.hpp

@@ -28,9 +28,9 @@
 #include "gc/shared/gc_globals.hpp"
 #include "memory/allocation.hpp"
 #include "memory/allStatic.hpp"
-#include "runtime/globals.hpp"
-#include "oops/oopsHierarchy.hpp"
 #include "memory/memRegion.hpp"
+#include "oops/oopsHierarchy.hpp"
+#include "runtime/globals.hpp"
 #include "utilities/macros.hpp"
 
 class  FileMapInfo;

src/hotspot/share/cds/cdsProtectionDomain.hpp

@@ -24,10 +24,11 @@
 
 #ifndef SHARED_CDS_CDSPROTECTIONDOMAIN_HPP
 #define SHARED_CDS_CDSPROTECTIONDOMAIN_HPP
+
+#include "classfile/moduleEntry.hpp"
 #include "oops/oopHandle.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/javaThread.hpp"
-#include "classfile/moduleEntry.hpp"
 
 class InstanceKlass;
 class Symbol;

src/hotspot/share/cds/classListParser.cpp

@@ -23,7 +23,6 @@
  */
 
 #include "precompiled.hpp"
-#include "jimage.hpp"
 #include "cds/archiveUtils.hpp"
 #include "cds/classListParser.hpp"
 #include "cds/lambdaFormInvokers.hpp"
@@ -39,6 +38,7 @@
 #include "interpreter/bytecode.hpp"
 #include "interpreter/bytecodeStream.hpp"
 #include "interpreter/linkResolver.hpp"
+#include "jimage.hpp"
 #include "jvm.h"
 #include "logging/log.hpp"
 #include "logging/logTag.hpp"

src/hotspot/share/cds/dumpTimeClassInfo.inline.hpp

@@ -27,6 +27,7 @@
 #define SHARED_CDS_DUMPTIMESHAREDCLASSINFO_INLINE_HPP
 
 #include "cds/dumpTimeClassInfo.hpp"
+
 #include "classfile/systemDictionaryShared.hpp"
 #include "classfile/classLoaderData.inline.hpp"
 #include "oops/instanceKlass.hpp"

src/hotspot/share/classfile/classFileParser.cpp

@@ -83,7 +83,6 @@
 #include "utilities/ostream.hpp"
 #include "utilities/resourceHash.hpp"
 #include "utilities/utf8.hpp"
-
 #if INCLUDE_CDS
 #include "classfile/systemDictionaryShared.hpp"
 #endif

src/hotspot/share/classfile/classLoader.cpp

@@ -23,7 +23,6 @@
  */
 
 #include "precompiled.hpp"
-#include "jimage.hpp"
 #include "cds/cds_globals.hpp"
 #include "cds/filemap.hpp"
 #include "classfile/classFileStream.hpp"
@@ -44,6 +43,7 @@
 #include "compiler/compileBroker.hpp"
 #include "interpreter/bytecodeStream.hpp"
 #include "interpreter/oopMapCache.hpp"
+#include "jimage.hpp"
 #include "jvm.h"
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"

src/hotspot/share/classfile/compactHashtable.cpp

@@ -34,6 +34,7 @@
 #include "runtime/globals.hpp"
 #include "runtime/vmThread.hpp"
 #include "utilities/numberSeq.hpp"
+
 #include <sys/stat.h>
 
 #if INCLUDE_CDS

src/hotspot/share/classfile/moduleEntry.cpp

@@ -23,7 +23,6 @@
  */
 
 #include "precompiled.hpp"
-#include "jni.h"
 #include "cds/archiveBuilder.hpp"
 #include "cds/archiveUtils.hpp"
 #include "cds/filemap.hpp"
@@ -32,6 +31,7 @@
 #include "classfile/classLoaderData.inline.hpp"
 #include "classfile/javaClasses.inline.hpp"
 #include "classfile/moduleEntry.hpp"
+#include "jni.h"
 #include "logging/log.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"

src/hotspot/share/compiler/compilationPolicy.cpp

@@ -41,18 +41,15 @@
 #include "runtime/handles.inline.hpp"
 #include "runtime/safepoint.hpp"
 #include "runtime/safepointVerifiers.hpp"
-
-#if INCLUDE_JVMCI
-#include "jvmci/jvmci.hpp"
-#endif
-
 #ifdef COMPILER1
 #include "c1/c1_Compiler.hpp"
 #endif
-
 #ifdef COMPILER2
 #include "opto/c2compiler.hpp"
 #endif
+#if INCLUDE_JVMCI
+#include "jvmci/jvmci.hpp"
+#endif
 
 jlong CompilationPolicy::_start_time = 0;
 int CompilationPolicy::_c1_count = 0;

src/hotspot/share/compiler/compileBroker.cpp

@@ -76,13 +76,13 @@
 #ifdef COMPILER1
 #include "c1/c1_Compiler.hpp"
 #endif
+#ifdef COMPILER2
+#include "opto/c2compiler.hpp"
+#endif
 #if INCLUDE_JVMCI
 #include "jvmci/jvmciEnv.hpp"
 #include "jvmci/jvmciRuntime.hpp"
 #endif
-#ifdef COMPILER2
-#include "opto/c2compiler.hpp"
-#endif
 
 #ifdef DTRACE_ENABLED
 

src/hotspot/share/compiler/compilerEvent.cpp

@@ -29,7 +29,7 @@
 #include "jfr/metadata/jfrSerializer.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/javaThread.hpp"
-#include "runtime/os.hpp" // malloc
+#include "runtime/os.hpp"
 #include "runtime/semaphore.inline.hpp"
 #include "utilities/growableArray.hpp"
 

src/hotspot/share/compiler/compilerEvent.hpp

@@ -24,12 +24,11 @@
 #ifndef SHARE_COMPILER_COMPILEREVENT_HPP
 #define SHARE_COMPILER_COMPILEREVENT_HPP
 
-#include "jni.h"
 #include "compiler/compilerDefinitions.hpp"
+#include "jni.h"
 #include "memory/allStatic.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/ticks.hpp"
-
 #if INCLUDE_JFR
 #include "jfr/utilities/jfrTime.hpp"
 #endif

src/hotspot/share/gc/epsilon/epsilonBarrierSet.cpp

@@ -27,13 +27,13 @@
 #include "gc/epsilon/epsilonThreadLocalData.hpp"
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
+#include "runtime/javaThread.hpp"
 #ifdef COMPILER1
 #include "gc/shared/c1/barrierSetC1.hpp"
 #endif
 #ifdef COMPILER2
 #include "gc/shared/c2/barrierSetC2.hpp"
 #endif
-#include "runtime/javaThread.hpp"
 
 EpsilonBarrierSet::EpsilonBarrierSet() : BarrierSet(
           make_barrier_set_assembler<BarrierSetAssembler>(),

src/hotspot/share/gc/g1/g1CodeCacheRemSet.hpp

@@ -25,6 +25,8 @@
 #ifndef SHARE_GC_G1_G1CODECACHEREMSET_HPP
 #define SHARE_GC_G1_G1CODECACHEREMSET_HPP
 
+#include "utilities/globalDefinitions.hpp"
+
 class CodeBlobClosure;
 class G1CodeRootSetTable;
 class HeapRegion;

src/hotspot/share/gc/g1/g1MonotonicArena.cpp

@@ -23,7 +23,6 @@
  */
 
 #include "precompiled.hpp"
-
 #include "gc/g1/g1MonotonicArena.inline.hpp"
 #include "memory/allocation.hpp"
 #include "runtime/atomic.hpp"

src/hotspot/share/gc/shared/ageTable.cpp

@@ -28,10 +28,10 @@
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/gc_globals.hpp"
 #include "jvm.h"
-#include "memory/resourceArea.hpp"
-#include "runtime/perfData.hpp"
 #include "logging/log.hpp"
+#include "memory/resourceArea.hpp"
 #include "oops/oop.inline.hpp"
+#include "runtime/perfData.hpp"
 #include "utilities/copy.hpp"
 
 /* Copyright (c) 1992, 2021, Oracle and/or its affiliates, and Stanford University.

src/hotspot/share/gc/shared/gcLogPrecious.cpp

@@ -25,7 +25,7 @@
 #include "gc/shared/gcLogPrecious.hpp"
 #include "runtime/mutex.hpp"
 #include "runtime/mutexLocker.hpp"
-#include "runtime/os.hpp" // malloc
+#include "runtime/os.hpp"
 #include "utilities/ostream.hpp"
 
 stringStream* GCLogPrecious::_lines = NULL;

src/hotspot/share/gc/z/zBarrierSetAssembler.hpp

@@ -33,6 +33,7 @@ public:
   static Address address_bad_mask_from_jni_env(Register env);
 };
 
+// Needs to be included after definition of ZBarrierSetAssemblerBase
 #include CPU_HEADER(gc/z/zBarrierSetAssembler)
 
 #endif // SHARE_GC_Z_ZBARRIERSETASSEMBLER_HPP

src/hotspot/share/interpreter/zero/bytecodeInterpreter.cpp

@@ -60,8 +60,6 @@
 #include "utilities/exceptions.hpp"
 #include "utilities/macros.hpp"
 
-// no precompiled headers
-
 /*
  * USELABELS - If using GCC, then use labels for the opcode dispatching
  * rather -then a switch statement. This improves performance because it

src/hotspot/share/jfr/instrumentation/jfrResolution.cpp

@@ -32,11 +32,9 @@
 #include "oops/method.inline.hpp"
 #include "runtime/javaThread.hpp"
 #include "runtime/vframe.inline.hpp"
-
 #ifdef COMPILER1
 #include "c1/c1_GraphBuilder.hpp"
 #endif
-
 #ifdef COMPILER2
 #include "opto/parse.hpp"
 #endif

src/hotspot/share/jfr/jni/jfrJavaCall.hpp

@@ -25,8 +25,8 @@
 #ifndef SHARE_JFR_JNI_JFRJAVACALL_HPP
 #define SHARE_JFR_JNI_JFRJAVACALL_HPP
 
-#include "jni.h"
 #include "jfr/utilities/jfrAllocation.hpp"
+#include "jni.h"
 #include "utilities/exceptions.hpp"
 #include "utilities/globalDefinitions.hpp"
 

src/hotspot/share/jfr/jni/jfrJniMethod.cpp

@@ -23,7 +23,6 @@
  */
 
 #include "precompiled.hpp"
-#include "jni.h"
 #include "jfr/jfr.hpp"
 #include "jfr/jfrEvents.hpp"
 #include "jfr/periodic/sampling/jfrThreadSampler.hpp"
@@ -52,6 +51,7 @@
 #include "jfr/writers/jfrJavaEventWriter.hpp"
 #include "jfrfiles/jfrPeriodic.hpp"
 #include "jfrfiles/jfrTypes.hpp"
+#include "jni.h"
 #include "jvm.h"
 #include "logging/log.hpp"
 #include "memory/resourceArea.hpp"
@@ -60,7 +60,6 @@
 #include "runtime/mutexLocker.hpp"
 #include "runtime/os.hpp"
 #include "utilities/debug.hpp"
-
 #ifdef LINUX
 #include "osContainer_linux.hpp"
 #include "os_linux.hpp"

src/hotspot/share/jfr/jni/jfrUpcalls.hpp

@@ -25,8 +25,8 @@
 #ifndef SHARE_JFR_JNI_JFRUPCALLS_HPP
 #define SHARE_JFR_JNI_JFRUPCALLS_HPP
 
-#include "jni.h"
 #include "jfr/utilities/jfrAllocation.hpp"
+#include "jni.h"
 #include "utilities/exceptions.hpp"
 
 class JavaThread;

src/hotspot/share/jfr/periodic/jfrPeriodic.cpp

@@ -72,6 +72,7 @@
 #if INCLUDE_SHENANDOAHGC
 #include "gc/shenandoah/shenandoahJfrSupport.hpp"
 #endif
+
 /**
  *  JfrPeriodic class
  *  Implementation of declarations in

src/hotspot/share/jfr/recorder/checkpoint/types/jfrThreadGroup.hpp

@@ -25,9 +25,9 @@
 #ifndef SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTHREADGROUP_HPP
 #define SHARE_JFR_RECORDER_CHECKPOINT_TYPES_JFRTHREADGROUP_HPP
 
-#include "jni.h"
 #include "jfr/utilities/jfrAllocation.hpp"
 #include "jfr/utilities/jfrTypes.hpp"
+#include "jni.h"
 
 class JfrCheckpointWriter;
 template <typename>

src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.cpp

@@ -53,7 +53,6 @@
 #include "runtime/safepoint.hpp"
 #include "runtime/synchronizer.hpp"
 #include "runtime/vmOperations.hpp"
-
 #ifdef COMPILER2
 #include "opto/compile.hpp"
 #include "opto/node.hpp"

src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceId.hpp

@@ -25,8 +25,8 @@
 #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"
+#include "jni.h"
 #include "memory/allStatic.hpp"
 
 class ClassLoaderData;

src/hotspot/share/jfr/recorder/checkpoint/types/traceid/jfrTraceIdBits.hpp

@@ -25,8 +25,8 @@
 #ifndef SHARE_JFR_RECORDER_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDBITS_HPP
 #define SHARE_JFR_RECORDER_CHECKPOINT_TYPES_TRACEID_JFRTRACEIDBITS_HPP
 
-#include "jni.h"
 #include "jfr/utilities/jfrTypes.hpp"
+#include "jni.h"
 #include "memory/allStatic.hpp"
 
 class JfrTraceIdBits : AllStatic {

src/hotspot/share/jfr/recorder/repository/jfrRepository.hpp

@@ -24,8 +24,8 @@
 #ifndef SHARE_JFR_RECORDER_REPOSITORY_JFRREPOSITORY_HPP
 #define SHARE_JFR_RECORDER_REPOSITORY_JFRREPOSITORY_HPP
 
-#include "jni.h"
 #include "jfr/utilities/jfrAllocation.hpp"
+#include "jni.h"
 
 class JfrChunkWriter;
 class JfrPostBox;

src/hotspot/share/jfr/recorder/stringpool/jfrStringPool.hpp

@@ -25,11 +25,11 @@
 #ifndef SHARE_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOL_HPP
 #define SHARE_JFR_RECORDER_STRINGPOOL_JFRSTRINGPOOL_HPP
 
-#include "jni.h"
 #include "jfr/recorder/storage/jfrMemorySpace.hpp"
 #include "jfr/recorder/storage/jfrMemorySpaceRetrieval.hpp"
 #include "jfr/recorder/stringpool/jfrStringPoolBuffer.hpp"
 #include "jfr/utilities/jfrLinkedList.hpp"
+#include "jni.h"
 
 class JavaThread;
 class JfrChunkWriter;

src/hotspot/share/jvmci/jvmci.cpp

@@ -35,7 +35,7 @@
 #include "memory/universe.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/atomic.hpp"
-#include "runtime/os.hpp" // malloc
+#include "runtime/os.hpp"
 #include "utilities/events.hpp"
 
 JVMCIRuntime* JVMCI::_compiler_runtimes = nullptr;

src/hotspot/share/jvmci/jvmciCodeInstaller.cpp

@@ -37,7 +37,7 @@
 #include "prims/methodHandles.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/jniHandles.inline.hpp"
-#include "runtime/os.hpp" // malloc
+#include "runtime/os.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "utilities/align.hpp"
 

src/hotspot/share/logging/logFileOutput.cpp

@@ -30,8 +30,8 @@
 #include "memory/allocation.inline.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/os.hpp"
-#include "utilities/globalDefinitions.hpp"
 #include "utilities/defaultStream.hpp"
+#include "utilities/globalDefinitions.hpp"
 
 const char* const LogFileOutput::Prefix = "file=";
 const char* const LogFileOutput::FileOpenMode = "a";

src/hotspot/share/logging/logFileStreamOutput.cpp

@@ -24,8 +24,8 @@
 #include "precompiled.hpp"
 #include "jvm.h"
 #include "logging/logAsyncWriter.hpp"
-#include "logging/logDecorators.hpp"
 #include "logging/logDecorations.hpp"
+#include "logging/logDecorators.hpp"
 #include "logging/logFileStreamOutput.hpp"
 #include "logging/logMessageBuffer.hpp"
 #include "memory/allocation.inline.hpp"

src/hotspot/share/logging/logSelection.cpp

@@ -23,7 +23,6 @@
  */
 #include "precompiled.hpp"
 #include "jvm_io.h"
-#include "utilities/ostream.hpp"
 #include "logging/log.hpp"
 #include "logging/logSelection.hpp"
 #include "logging/logTagSet.hpp"

src/hotspot/share/opto/compile.cpp

@@ -21,6 +21,7 @@
  * questions.
  *
  */
+
 #include "precompiled.hpp"
 #include "asm/macroAssembler.hpp"
 #include "asm/macroAssembler.inline.hpp"
@@ -81,7 +82,6 @@
 #include "utilities/macros.hpp"
 #include "utilities/resourceHash.hpp"
 
-
 // -------------------- Compile::mach_constant_base_node -----------------------
 // Constant table base node singleton.
 MachConstantBaseNode* Compile::mach_constant_base_node() {

src/hotspot/share/prims/jni.cpp

@@ -25,7 +25,6 @@
  */
 
 #include "precompiled.hpp"
-#include "jni.h"
 #include "ci/ciReplay.hpp"
 #include "classfile/altHashing.hpp"
 #include "classfile/classFileStream.hpp"
@@ -47,6 +46,7 @@
 #include "interpreter/linkResolver.hpp"
 #include "jfr/jfrEvents.hpp"
 #include "jfr/support/jfrThreadId.hpp"
+#include "jni.h"
 #include "jvm.h"
 #include "logging/log.hpp"
 #include "memory/allocation.hpp"

src/hotspot/share/prims/jniCheck.cpp

@@ -23,10 +23,10 @@
  */
 
 #include "precompiled.hpp"
-#include "jni.h"
 #include "classfile/javaClasses.inline.hpp"
 #include "classfile/vmClasses.hpp"
 #include "classfile/vmSymbols.hpp"
+#include "jni.h"
 #include "jvm.h"
 #include "logging/log.hpp"
 #include "logging/logTag.hpp"

src/hotspot/share/prims/perf.cpp

@@ -23,8 +23,8 @@
  */
 
 #include "precompiled.hpp"
-#include "jni.h"
 #include "classfile/vmSymbols.hpp"
+#include "jni.h"
 #include "jvm.h"
 #include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"

src/hotspot/share/prims/scopedMemoryAccess.cpp

@@ -23,18 +23,17 @@
  */
 
 #include "precompiled.hpp"
-#include "jni.h"
 #include "classfile/vmSymbols.hpp"
+#include "jni.h"
 #include "jvm.h"
 #include "oops/access.inline.hpp"
 #include "oops/oop.inline.hpp"
-#include "runtime/jniHandles.inline.hpp"
+#include "prims/stackwalk.hpp"
+#include "runtime/deoptimization.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
+#include "runtime/jniHandles.inline.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/vframe.inline.hpp"
-#include "runtime/deoptimization.hpp"
-#include "prims/stackwalk.hpp"
-
 
 class CloseScopedMemoryFindOopClosure : public OopClosure {
   oop _deopt;

src/hotspot/share/prims/unsafe.cpp

@@ -23,7 +23,6 @@
  */
 
 #include "precompiled.hpp"
-#include "jni.h"
 #include "classfile/classFileStream.hpp"
 #include "classfile/classLoader.hpp"
 #include "classfile/classLoadInfo.hpp"
@@ -31,6 +30,7 @@
 #include "classfile/systemDictionary.hpp"
 #include "classfile/vmSymbols.hpp"
 #include "jfr/jfrEvents.hpp"
+#include "jni.h"
 #include "jvm.h"
 #include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"

src/hotspot/share/prims/vectorSupport.cpp

@@ -23,11 +23,11 @@
  */
 
 #include "precompiled.hpp"
-#include "jni.h"
 #include "classfile/javaClasses.inline.hpp"
 #include "classfile/vmClasses.hpp"
 #include "classfile/vmSymbols.hpp"
 #include "code/location.hpp"
+#include "jni.h"
 #include "jvm.h"
 #include "oops/klass.inline.hpp"
 #include "oops/typeArrayOop.inline.hpp"
@@ -38,9 +38,8 @@
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/jniHandles.inline.hpp"
 #include "runtime/stackValue.hpp"
-
 #ifdef COMPILER2
-#include "opto/matcher.hpp" // Matcher::max_vector_size(BasicType)
+#include "opto/matcher.hpp"
 #endif // COMPILER2
 
 #ifdef COMPILER2

src/hotspot/share/prims/vectorSupport.hpp

@@ -25,8 +25,8 @@
 #ifndef SHARE_PRIMS_VECTORSUPPORT_HPP
 #define SHARE_PRIMS_VECTORSUPPORT_HPP
 
-#include "jni.h"
 #include "code/debugInfo.hpp"
+#include "jni.h"
 #include "memory/allStatic.hpp"
 #include "oops/typeArrayOop.hpp"
 #include "runtime/registerMap.hpp"

src/hotspot/share/prims/wbtestmethods/parserTests.cpp

@@ -23,10 +23,10 @@
  */
 
 #include "precompiled.hpp"
-#include "jni.h"
 #include "classfile/javaClasses.inline.hpp"
 #include "classfile/symbolTable.hpp"
 #include "classfile/vmClasses.hpp"
+#include "jni.h"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/objArrayOop.inline.hpp"

src/hotspot/share/prims/whitebox.cpp

@@ -23,7 +23,7 @@
  */
 
 #include "precompiled.hpp"
-#include <new>
+#include "cds.h"
 #include "cds/archiveHeapLoader.hpp"
 #include "cds/cdsConstants.hpp"
 #include "cds/filemap.hpp"
@@ -46,7 +46,6 @@
 #include "gc/shared/gcLocker.inline.hpp"
 #include "gc/shared/genArguments.hpp"
 #include "gc/shared/genCollectedHeap.hpp"
-#include "include/cds.h"
 #include "jvmtifiles/jvmtiEnv.hpp"
 #include "logging/log.hpp"
 #include "memory/iterator.hpp"
@@ -112,7 +111,6 @@
 #include "jvmci/jvmciEnv.hpp"
 #include "jvmci/jvmciRuntime.hpp"
 #endif
-
 #ifdef LINUX
 #include "osContainer_linux.hpp"
 #include "cgroupSubsystem_linux.hpp"

src/hotspot/share/prims/whitebox.hpp

@@ -26,11 +26,10 @@
 #define SHARE_PRIMS_WHITEBOX_HPP
 
 #include "jni.h"
-
-#include "utilities/exceptions.hpp"
 #include "memory/allocation.hpp"
 #include "oops/oopsHierarchy.hpp"
 #include "oops/symbol.hpp"
+#include "utilities/exceptions.hpp"
 
 #define WB_METHOD_DECLARE(result_type) extern "C" result_type JNICALL
 

src/hotspot/share/runtime/arguments.cpp

@@ -67,6 +67,7 @@
 #if INCLUDE_JFR
 #include "jfr/jfr.hpp"
 #endif
+
 #include <limits>
 
 #define DEFAULT_JAVA_LAUNCHER  "generic"

src/hotspot/share/runtime/continuation.hpp

@@ -25,9 +25,9 @@
 #ifndef SHARE_VM_RUNTIME_CONTINUATION_HPP
 #define SHARE_VM_RUNTIME_CONTINUATION_HPP
 
+#include "jni.h"
 #include "memory/allStatic.hpp"
 #include "oops/oopsHierarchy.hpp"
-#include "jni.h"
 
 class ContinuationEntry;
 class frame;

src/hotspot/share/runtime/init.cpp

@@ -28,9 +28,6 @@
 #include "code/icBuffer.hpp"
 #include "compiler/compiler_globals.hpp"
 #include "gc/shared/collectedHeap.hpp"
-#if INCLUDE_JVMCI
-#include "jvmci/jvmci.hpp"
-#endif
 #include "interpreter/bytecodes.hpp"
 #include "logging/logAsyncWriter.hpp"
 #include "memory/universe.hpp"
@@ -48,7 +45,9 @@
 #include "runtime/sharedRuntime.hpp"
 #include "services/memTracker.hpp"
 #include "utilities/macros.hpp"
-
+#if INCLUDE_JVMCI
+#include "jvmci/jvmci.hpp"
+#endif
 
 // Initialization done by VM thread in vm_init_globals()
 void check_ThreadShadow();

src/hotspot/share/runtime/java.cpp

@@ -39,9 +39,6 @@
 #include "jfr/jfrEvents.hpp"
 #include "jfr/support/jfrThreadId.hpp"
 #include "jvm.h"
-#if INCLUDE_JVMCI
-#include "jvmci/jvmci.hpp"
-#endif
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/metaspaceUtils.hpp"
@@ -93,6 +90,9 @@
 #if INCLUDE_JFR
 #include "jfr/jfr.hpp"
 #endif
+#if INCLUDE_JVMCI
+#include "jvmci/jvmci.hpp"
+#endif
 
 GrowableArray<Method*>* collected_profiled_methods;
 

src/hotspot/share/runtime/javaCalls.cpp

@@ -30,9 +30,6 @@
 #include "compiler/compileBroker.hpp"
 #include "interpreter/interpreter.hpp"
 #include "interpreter/linkResolver.hpp"
-#if INCLUDE_JVMCI
-#include "jvmci/jvmciJavaClasses.hpp"
-#endif
 #include "memory/universe.hpp"
 #include "oops/method.inline.hpp"
 #include "oops/oop.inline.hpp"
@@ -49,6 +46,9 @@
 #include "runtime/signature.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "runtime/thread.inline.hpp"
+#if INCLUDE_JVMCI
+#include "jvmci/jvmciJavaClasses.hpp"
+#endif
 
 // -----------------------------------------------------
 // Implementation of JavaCallWrapper

src/hotspot/share/runtime/nonJavaThread.cpp

@@ -36,7 +36,6 @@
 #include "utilities/defaultStream.hpp"
 #include "utilities/singleWriterSynchronizer.hpp"
 #include "utilities/vmError.hpp"
-
 #if INCLUDE_JFR
 #include "jfr/jfr.hpp"
 #endif

src/hotspot/share/runtime/threadCrashProtection.hpp

@@ -27,16 +27,15 @@
 #define SHARE_RUNTIME_THREADCRASHPROTECTION_HPP
 
 #include "memory/allocation.hpp"
-
-class CrashProtectionCallback : public StackObj {
-public:
-  virtual void call() = 0;
-};
-
 #if defined(LINUX) || defined(AIX) || defined(BSD)
 # include "threadCrashProtection_posix.hpp"
 #else
 # include OS_HEADER(threadCrashProtection)
 #endif
 
+class CrashProtectionCallback : public StackObj {
+public:
+  virtual void call() = 0;
+};
+
 #endif // SHARE_RUNTIME_THREADCRASHPROTECTION_HPP

src/hotspot/share/runtime/vmStructs.cpp

@@ -109,11 +109,6 @@
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/vmError.hpp"
-
-#include CPU_HEADER(vmStructs)
-#include OS_HEADER(vmStructs)
-#include OS_CPU_HEADER(vmStructs)
-
 #ifdef COMPILER2
 #include "opto/addnode.hpp"
 #include "opto/block.hpp"
@@ -142,6 +137,10 @@
 #include "opto/vectornode.hpp"
 #endif // COMPILER2
 
+#include CPU_HEADER(vmStructs)
+#include OS_HEADER(vmStructs)
+#include OS_CPU_HEADER(vmStructs)
+
 // Note: the cross-product of (c1, c2, product, nonproduct, ...),
 // (nonstatic, static), and (unchecked, checked) has not been taken.
 // Only the macros currently needed have been defined.

src/hotspot/share/runtime/vm_version.hpp

@@ -26,7 +26,7 @@
 #define SHARE_RUNTIME_VM_VERSION_HPP
 
 #include "runtime/globals.hpp"
-#include "utilities/macros.hpp"  // for CPU_HEADER() macro.
+#include "utilities/macros.hpp"
 #include CPU_HEADER(vm_version)
 
 #endif // SHARE_RUNTIME_VM_VERSION_HPP

src/hotspot/share/services/mallocTracker.cpp

@@ -22,6 +22,7 @@
  * questions.
  *
  */
+
 #include "precompiled.hpp"
 #include "jvm_io.h"
 #include "logging/log.hpp"

src/hotspot/share/utilities/elfFile.cpp

@@ -26,11 +26,6 @@
 
 #if !defined(_WINDOWS) && !defined(__APPLE__)
 
-#include <string.h>
-#include <stdio.h>
-#include <limits.h>
-#include <new>
-
 #include "jvm_io.h"
 #include "logging/log.hpp"
 #include "memory/allocation.inline.hpp"
@@ -41,6 +36,11 @@
 #include "utilities/elfSymbolTable.hpp"
 #include "utilities/ostream.hpp"
 
+#include <string.h>
+#include <stdio.h>
+#include <limits.h>
+#include <new>
+
 const char* ElfFile::USR_LIB_DEBUG_DIRECTORY = "/usr/lib/debug";
 
 // For test only, disable elf section cache and force to read from file directly.

src/hotspot/share/utilities/formatBuffer.hpp

@@ -27,6 +27,7 @@
 
 #include "jvm_io.h"
 #include "utilities/globalDefinitions.hpp"
+
 #include <stdarg.h>
 
 // Simple class to format the ctor arguments into a fixed-sized buffer.

src/hotspot/share/utilities/ostream.cpp

@@ -29,8 +29,8 @@
 #include "memory/allocation.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/arguments.hpp"
-#include "runtime/os.inline.hpp"
 #include "runtime/orderAccess.hpp"
+#include "runtime/os.inline.hpp"
 #include "runtime/safepoint.hpp"
 #include "runtime/vm_version.hpp"
 #include "utilities/defaultStream.hpp"

src/hotspot/share/utilities/vmError.cpp

@@ -40,6 +40,7 @@
 #include "prims/whitebox.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/atomic.hpp"
+#include "runtime/flags/jvmFlag.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/javaThread.inline.hpp"
 #include "runtime/init.hpp"
@@ -53,7 +54,6 @@
 #include "runtime/vmThread.hpp"
 #include "runtime/vmOperations.hpp"
 #include "runtime/vm_version.hpp"
-#include "runtime/flags/jvmFlag.hpp"
 #include "services/memTracker.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/decoder.hpp"

test/hotspot/gtest/classfile/test_symbolTable.cpp

@@ -22,8 +22,8 @@
  */
 
 #include "precompiled.hpp"
-#include "runtime/interfaceSupport.inline.hpp"
 #include "classfile/symbolTable.hpp"
+#include "runtime/interfaceSupport.inline.hpp"
 #include "threadHelper.inline.hpp"
 #include "unittest.hpp"
 

test/hotspot/gtest/compiler/test_directivesParser.cpp

@@ -22,14 +22,13 @@
  */
 
 #include "precompiled.hpp"
-
-#include <locale.h>
-
 #include "compiler/directivesParser.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/thread.hpp"
 #include "unittest.hpp"
 
+#include <locale.h>
+
 class DirectivesParserTest : public ::testing::Test{
  protected:
   const char* const _locale;

test/hotspot/gtest/gc/g1/test_freeRegionList.cpp

@@ -22,7 +22,6 @@
  */
 
 #include "precompiled.hpp"
-
 #include "gc/g1/g1BlockOffsetTable.inline.hpp"
 #include "gc/g1/g1CardSet.inline.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"

test/hotspot/gtest/gc/g1/test_g1Analytics.cpp

@@ -23,8 +23,8 @@
  */
 
 #include "precompiled.hpp"
-#include "gc/g1/g1Predictions.hpp"
 #include "gc/g1/g1Analytics.hpp"
+#include "gc/g1/g1Predictions.hpp"
 #include "unittest.hpp"
 
 TEST_VM(G1Analytics, is_initialized) {

test/hotspot/gtest/gc/g1/test_g1BatchedGangTask.cpp

@@ -23,7 +23,6 @@
  */
 
 #include "precompiled.hpp"
-
 #include "gc/g1/g1BatchedTask.hpp"
 #include "gc/shared/workerThread.hpp"
 #include "runtime/atomic.hpp"

test/hotspot/gtest/gc/g1/test_g1CodeCacheRemSet.cpp

@@ -22,8 +22,8 @@
  */
 
 #include "precompiled.hpp"
-#include "gc/g1/g1CodeRootSetTable.hpp"
 #include "gc/g1/g1CodeCacheRemSet.hpp"
+#include "gc/g1/g1CodeRootSetTable.hpp"
 #include "unittest.hpp"
 
 class G1CodeRootSetTest : public ::testing::Test {

test/hotspot/gtest/gc/g1/test_stressCommitUncommit.cpp

@@ -25,8 +25,8 @@
 #include "precompiled.hpp"
 #include "gc/g1/g1BlockOffsetTable.hpp"
 #include "gc/g1/g1RegionToSpaceMapper.hpp"
-#include "memory/virtualspace.hpp"
 #include "gc/shared/workerThread.hpp"
+#include "memory/virtualspace.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/os.hpp"
 #include "unittest.hpp"

test/hotspot/gtest/gc/parallel/test_psParallelCompact.cpp

@@ -23,8 +23,8 @@
 
 #include "precompiled.hpp"
 #include "gc/parallel/parMarkBitMap.inline.hpp"
-#include "gc/parallel/psParallelCompact.hpp"
 #include "gc/parallel/psCompactionManager.inline.hpp"
+#include "gc/parallel/psParallelCompact.hpp"
 #include "unittest.hpp"
 
 #ifndef PRODUCT

test/hotspot/gtest/gc/shared/test_ptrQueueBufferAllocator.cpp

@@ -25,8 +25,8 @@
 #include "precompiled.hpp"
 #include "gc/shared/ptrQueue.hpp"
 #include "memory/allocation.hpp"
-#include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/atomic.hpp"
+#include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/semaphore.inline.hpp"
 #include "runtime/thread.hpp"
 #include "utilities/globalCounter.inline.hpp"

test/hotspot/gtest/gtestMain.cpp

@@ -22,26 +22,24 @@
  *
  */
 
+#include "jni.h"
+#include "runtime/os.hpp"
+#include "runtime/thread.inline.hpp"
+#include "utilities/globalDefinitions.hpp"
+#include "unittest.hpp"
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #ifdef __APPLE__
-#  include <dlfcn.h>
+#include <dlfcn.h>
 #endif
-
 #ifdef _WIN32
 #include <windows.h>
 #else
 #include <pthread.h>
 #endif
 
-#include "jni.h"
-#include "unittest.hpp"
-
-#include "runtime/os.hpp"
-#include "runtime/thread.inline.hpp"
-#include "utilities/globalDefinitions.hpp"
-
 // Default value for -new-thread option: true on AIX because we run into
 // problems when attempting to initialize the JVM on the primordial thread.
 #ifdef _AIX

test/hotspot/gtest/jfr/test_adaptiveSampler.cpp

@@ -33,8 +33,6 @@
 // with the ones that should pick up the mocks removed. Those should be included
 // later after the mocks have been defined.
 
-#include <cmath>
-
 #include "jfr/utilities/jfrAllocation.hpp"
 #include "jfr/utilities/jfrRandom.inline.hpp"
 #include "jfr/utilities/jfrSpinlockHelper.hpp"
@@ -44,9 +42,10 @@
 #include "logging/log.hpp"
 #include "runtime/atomic.hpp"
 #include "utilities/globalDefinitions.hpp"
-
 #include "unittest.hpp"
 
+#include <cmath>
+
 // #undef SHARE_JFR_SUPPORT_JFRADAPTIVESAMPLER_HPP
 
 namespace {

test/hotspot/gtest/jfr/test_networkUtilization.cpp

@@ -32,16 +32,15 @@
 // with the ones that should pick up the mocks removed. Those should be included
 // later after the mocks have been defined.
 
-#include "logging/log.hpp"
 #include "jfr/jfrEvents.hpp"
 #include "jfr/metadata/jfrSerializer.hpp"
 #include "jfr/periodic/jfrOSInterface.hpp"
 #include "jfr/utilities/jfrTime.hpp"
 #include "jfr/utilities/jfrTypes.hpp"
+#include "logging/log.hpp"
 #include "runtime/os_perf.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/growableArray.hpp"
-
 #include "unittest.hpp"
 
 #include <vector>

test/hotspot/gtest/jfr/test_threadCpuLoad.cpp

@@ -32,15 +32,14 @@
 // with the ones that should pick up the mocks removed. Those should be included
 // later after the mocks have been defined.
 
-#include "logging/log.hpp"
 #include "jfr/jfrEvents.hpp"
 #include "jfr/support/jfrThreadId.hpp"
 #include "jfr/support/jfrThreadLocal.hpp"
 #include "jfr/utilities/jfrThreadIterator.hpp"
 #include "jfr/utilities/jfrTime.hpp"
-#include "utilities/globalDefinitions.hpp"
+#include "logging/log.hpp"
 #include "runtime/os.hpp"
-
+#include "utilities/globalDefinitions.hpp"
 #include "unittest.hpp"
 
 namespace {

test/hotspot/gtest/logging/test_log.cpp

@@ -24,9 +24,9 @@
 #include "precompiled.hpp"
 #include "gc/shared/gcTraceTime.inline.hpp"
 #include "jvm.h"
+#include "logging/log.hpp"
 #include "logTestFixture.hpp"
 #include "logTestUtils.inline.hpp"
-#include "logging/log.hpp"
 #include "unittest.hpp"
 
 class LogTest : public LogTestFixture {

test/hotspot/gtest/logging/test_logDecorators.cpp

@@ -24,8 +24,8 @@
 #include "precompiled.hpp"
 #include "jvm.h"
 #include "logging/logDecorators.hpp"
+#include "runtime/os.hpp"
 #include "unittest.hpp"
-#include "runtime/os.hpp" // malloc
 
 static LogDecorators::Decorator decorator_array[] = {
 #define DECORATOR(name, abbr) LogDecorators::name##_decorator,

test/hotspot/gtest/memory/test_guardedMemory.cpp

@@ -22,7 +22,6 @@
  */
 
 #include "precompiled.hpp"
-#include "memory/allocation.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/guardedMemory.hpp"
 #include "runtime/os.hpp"

test/hotspot/gtest/memory/test_virtualspace.cpp

@@ -23,8 +23,8 @@
 
 #include "precompiled.hpp"
 #include "memory/virtualspace.hpp"
-#include "runtime/os.hpp"
 #include "oops/oop.hpp"
+#include "runtime/os.hpp"
 #include "utilities/align.hpp"
 #include "concurrentTestRunner.inline.hpp"
 #include "unittest.hpp"

test/hotspot/gtest/metaprogramming/test_enableIf.cpp

@@ -26,9 +26,10 @@
 #include "memory/allStatic.hpp"
 #include "metaprogramming/enableIf.hpp"
 #include "utilities/debug.hpp"
-#include <type_traits>
 #include "unittest.hpp"
 
+#include <type_traits>
+
 class EnableIfTest: AllStatic {
   class A: AllStatic {
   public:

test/hotspot/gtest/metaspace/metaspaceGtestCommon.hpp

@@ -27,8 +27,8 @@
 #define GTEST_METASPACE_METASPACEGTESTCOMMON_HPP
 
 #include "memory/allocation.hpp"
-#include "utilities/globalDefinitions.hpp"
 #include "runtime/os.hpp"
+#include "utilities/globalDefinitions.hpp"
 #include "unittest.hpp"
 
 /////////////////////////////////////////////////////////////////////

test/hotspot/gtest/oops/test_markWord.cpp

@@ -31,8 +31,8 @@
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/orderAccess.hpp"
 #include "runtime/os.hpp"
-#include "runtime/synchronizer.hpp"
 #include "runtime/semaphore.inline.hpp"
+#include "runtime/synchronizer.hpp"
 #include "threadHelper.inline.hpp"
 #include "unittest.hpp"
 #include "utilities/globalDefinitions.hpp"

test/hotspot/gtest/runtime/test_arguments.cpp

@@ -28,6 +28,7 @@
 #include "runtime/flags/jvmFlag.hpp"
 #include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
+
 #include <errno.h>
 
 class ArgumentsTest : public ::testing::Test {

test/hotspot/gtest/runtime/test_classPrinter.cpp

@@ -24,8 +24,8 @@
 #include "precompiled.hpp"
 #include "classfile/classPrinter.hpp"
 #include "memory/resourceArea.hpp"
-#include "runtime/javaThread.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
+#include "runtime/javaThread.hpp"
 #include "utilities/ostream.hpp"
 #include "unittest.hpp"
 

test/hotspot/gtest/runtime/test_committed_virtualmemory.cpp

@@ -22,17 +22,13 @@
  */
 
 #include "precompiled.hpp"
-
-// Included early because the NMT flags don't include it.
-#include "utilities/macros.hpp"
-
 #include "runtime/thread.hpp"
 #include "services/memTracker.hpp"
 #include "services/virtualMemoryTracker.hpp"
 #include "utilities/globalDefinitions.hpp"
+#include "utilities/macros.hpp"
 #include "unittest.hpp"
 
-
 class CommittedVirtualMemoryTest {
 public:
   static void test() {

test/hotspot/gtest/runtime/test_os.cpp

@@ -24,16 +24,16 @@
 #include "precompiled.hpp"
 #include "memory/allocation.hpp"
 #include "memory/resourceArea.hpp"
+#include "runtime/frame.inline.hpp"
 #include "runtime/os.inline.hpp"
 #include "runtime/thread.hpp"
+#include "runtime/threads.hpp"
 #include "services/memTracker.hpp"
+#include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/macros.hpp"
 #include "utilities/ostream.hpp"
-#include "utilities/align.hpp"
 #include "unittest.hpp"
-#include "runtime/frame.inline.hpp"
-#include "runtime/threads.hpp"
 #ifdef _WIN32
 #include "os_windows.hpp"
 #endif