diff --git a/runtime/onert/.clang-format b/runtime/onert/.clang-format
new file mode 100644
index 00000000000..1af6fad54ad
--- /dev/null
+++ b/runtime/onert/.clang-format
@@ -0,0 +1,20 @@
+BasedOnStyle: InheritParentConfig
+IncludeBlocks: Regroup
+IncludeCategories:
+    # external library headers
+  - Regex:           '^(<|")((cker|half|json|absl|arm_compute|Eigen|unsupported/Eigen|flatbuffers|gtest|pybind11|ruy|tensorflow)/|(ggml\.h|h5.*\.h|H5.*\.h|public\/gemmlowp\.h))'
+    Priority:        10
+    # standard library headers
+  - Regex:           '^<[a-z_]+>$'
+    Priority:        100
+    # In same module headers
+  - Regex:           '^".*\.h"$'
+    Priority:        2
+    # Different module headers
+  - Regex:           '^<.*\.h>$'
+    Priority:        3
+    # headers in the same directory
+  - Regex:           '.*.h'
+    Priority:        1
+KeepEmptyLinesAtTheStartOfBlocks: true
+SortIncludes: true
diff --git a/runtime/onert/api/nnfw/src/CustomKernel.h b/runtime/onert/api/nnfw/src/CustomKernel.h
index 4c41dd9baa7..a64aa6ab314 100644
--- a/runtime/onert/api/nnfw/src/CustomKernel.h
+++ b/runtime/onert/api/nnfw/src/CustomKernel.h
@@ -17,10 +17,9 @@
 #ifndef __ONERT_API_CUSTOM_KERNEL_H__
 #define __ONERT_API_CUSTOM_KERNEL_H__
 
-#include "nnfw_experimental.h"
-
 #include "backend/CustomKernelBuilder.h"
 #include "exec/IFunction.h"
+#include "nnfw_experimental.h"
 
 #include <vector>
 
diff --git a/runtime/onert/api/nnfw/src/CustomKernelRegistry.h b/runtime/onert/api/nnfw/src/CustomKernelRegistry.h
index 2be78ccbb70..04cd9cc965f 100644
--- a/runtime/onert/api/nnfw/src/CustomKernelRegistry.h
+++ b/runtime/onert/api/nnfw/src/CustomKernelRegistry.h
@@ -19,11 +19,10 @@
 
 #include "CustomKernel.h"
 
-#include <unordered_map>
 #include <functional>
-#include <memory>
-
 #include <iostream>
+#include <memory>
+#include <unordered_map>
 
 namespace onert
 {
diff --git a/runtime/onert/api/nnfw/src/nnfw_api.cc b/runtime/onert/api/nnfw/src/nnfw_api.cc
index ff02769c623..4f42c368d94 100644
--- a/runtime/onert/api/nnfw/src/nnfw_api.cc
+++ b/runtime/onert/api/nnfw/src/nnfw_api.cc
@@ -16,9 +16,8 @@
 
 #include "nnfw.h"
 #include "nnfw_experimental.h"
-#include "nnfw_version.h"
-
 #include "nnfw_session.h"
+#include "nnfw_version.h"
 
 // Double-check enum value changes
 
diff --git a/runtime/onert/api/nnfw/src/nnfw_session.cc b/runtime/onert/api/nnfw/src/nnfw_session.cc
index 1db906f519f..a829e8d3046 100644
--- a/runtime/onert/api/nnfw/src/nnfw_session.cc
+++ b/runtime/onert/api/nnfw/src/nnfw_session.cc
@@ -20,7 +20,6 @@
 #include "exporter/CircleExporter.h"
 #include "exporter/train/CheckpointExporter.h"
 #include "ir/OpCode.h"
-#include "json/json.h"
 #include "loader/CircleLoader.h"
 #include "loader/ModelLoader.h"
 #include "loader/TFLiteLoader.h"
@@ -28,11 +27,13 @@
 #include "loader/train/CheckpointLoader.h"
 #include "util/ConfigSource.h"
 #include "util/Exceptions.h"
-#include "util/logging.h"
 #include "util/TracingCtx.h"
+#include "util/logging.h"
 
 #include <misc/string_helpers.h>
 
+#include "json/json.h"
+
 #include <fstream>
 #include <iostream>
 #include <string>
diff --git a/runtime/onert/api/nnfw/src/nnfw_session.h b/runtime/onert/api/nnfw/src/nnfw_session.h
index 6a255b12ccd..0abbae49de0 100644
--- a/runtime/onert/api/nnfw/src/nnfw_session.h
+++ b/runtime/onert/api/nnfw/src/nnfw_session.h
@@ -17,14 +17,13 @@
 #ifndef __API_NNFW_SESSION_H__
 #define __API_NNFW_SESSION_H__
 
-#include "nnfw.h"
-
 #include "CustomKernelRegistry.h"
 #include "compiler/CompilerOptions.h"
 #include "compiler/ICompiler.h"
 #include "exec/Execution.h"
 #include "ir/NNPkg.h"
 #include "ir/train/TrainingInfo.h"
+#include "nnfw.h"
 #include "odc/CodegenManager.h"
 #include "odc/QuantizeManager.h"
 
diff --git a/runtime/onert/api/python/include/nnfw_api_wrapper.h b/runtime/onert/api/python/include/nnfw_api_wrapper.h
index 1160806ddf9..c221295e2c0 100644
--- a/runtime/onert/api/python/include/nnfw_api_wrapper.h
+++ b/runtime/onert/api/python/include/nnfw_api_wrapper.h
@@ -21,8 +21,8 @@
 #include "nnfw_experimental.h"
 #include "nnfw_internal.h"
 
-#include <pybind11/stl.h>
 #include <pybind11/numpy.h>
+#include <pybind11/stl.h>
 
 namespace onert
 {
diff --git a/runtime/onert/api/python/src/bindings/nnfw_api_wrapper_pybind.cc b/runtime/onert/api/python/src/bindings/nnfw_api_wrapper_pybind.cc
index c95086876e6..4a5f49ee706 100644
--- a/runtime/onert/api/python/src/bindings/nnfw_api_wrapper_pybind.cc
+++ b/runtime/onert/api/python/src/bindings/nnfw_api_wrapper_pybind.cc
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include <pybind11/pybind11.h>
-
 #include "nnfw_exception_bindings.h"
 #include "nnfw_session_bindings.h"
 #include "nnfw_tensorinfo_bindings.h"
 #include "nnfw_traininfo_bindings.h"
 
+#include <pybind11/pybind11.h>
+
 using namespace onert::api::python;
 namespace py = pybind11;
 
diff --git a/runtime/onert/api/python/src/wrapper/nnfw_api_wrapper.cc b/runtime/onert/api/python/src/wrapper/nnfw_api_wrapper.cc
index 2a3c6c271a4..d70cbf1a94a 100644
--- a/runtime/onert/api/python/src/wrapper/nnfw_api_wrapper.cc
+++ b/runtime/onert/api/python/src/wrapper/nnfw_api_wrapper.cc
@@ -15,6 +15,7 @@
  */
 
 #include "nnfw_api_wrapper.h"
+
 #include "nnfw_exceptions.h"
 
 #include <iostream>
diff --git a/runtime/onert/backend/acl_cl/Backend.h b/runtime/onert/backend/acl_cl/Backend.h
index 14b1a36a7e4..9122e7a3740 100644
--- a/runtime/onert/backend/acl_cl/Backend.h
+++ b/runtime/onert/backend/acl_cl/Backend.h
@@ -17,16 +17,17 @@
 #ifndef __ONERT_BACKEND_ACL_CL_BACKEND_H__
 #define __ONERT_BACKEND_ACL_CL_BACKEND_H__
 
-#include <memory>
-#include <backend/Backend.h>
-
+#include "AclTensorRegistry.h"
 #include "BackendContext.h"
 #include "Config.h"
 #include "ConstantInitializer.h"
 #include "KernelGenerator.h"
-#include "TensorManager.h"
 #include "Optimizer.h"
-#include "AclTensorRegistry.h"
+#include "TensorManager.h"
+
+#include <backend/Backend.h>
+
+#include <memory>
 
 namespace onert::backend::acl_cl
 {
diff --git a/runtime/onert/backend/acl_cl/BackendContext.h b/runtime/onert/backend/acl_cl/BackendContext.h
index 40d074a0cff..fdbfdf0ebe2 100644
--- a/runtime/onert/backend/acl_cl/BackendContext.h
+++ b/runtime/onert/backend/acl_cl/BackendContext.h
@@ -17,12 +17,12 @@
 #ifndef __ONERT_BACKEND_ACL_CL_BACKEND_CONTEXT_H__
 #define __ONERT_BACKEND_ACL_CL_BACKEND_CONTEXT_H__
 
-#include <AclBackendContext.h>
-
 #include "ConstantInitializer.h"
 #include "KernelGenerator.h"
 #include "TensorBuilder.h"
 
+#include <AclBackendContext.h>
+
 namespace onert::backend::acl_cl
 {
 
diff --git a/runtime/onert/backend/acl_cl/CLTimer.h b/runtime/onert/backend/acl_cl/CLTimer.h
index 0bb73b14818..d44947639f8 100644
--- a/runtime/onert/backend/acl_cl/CLTimer.h
+++ b/runtime/onert/backend/acl_cl/CLTimer.h
@@ -18,8 +18,10 @@
 #define __ONERT_BACKEND_ACL_CL_CLTIMER_H__
 
 #include <util/ITimer.h>
+
 #include <arm_compute/core/CL/OpenCL.h>
 #include <arm_compute/runtime/CL/CLScheduler.h>
+
 #include <chrono>
 #include <list>
 #include <sstream>
diff --git a/runtime/onert/backend/acl_cl/Config.cc b/runtime/onert/backend/acl_cl/Config.cc
index 9a2ff462c68..befc5f03b29 100644
--- a/runtime/onert/backend/acl_cl/Config.cc
+++ b/runtime/onert/backend/acl_cl/Config.cc
@@ -15,16 +15,15 @@
  */
 
 // For CLKernelLibraryEx initialization
-#include "arm_compute/core/CL/CLHelpers.h"
-#include "arm_compute/core/CL/CLKernelLibrary.h"
-#include "arm_compute/core/CL/CLKernelLibraryEx.h"
+#include "Config.h"
 
 #include <util/ConfigSource.h>
 
+#include "arm_compute/core/CL/CLHelpers.h"
+#include "arm_compute/core/CL/CLKernelLibrary.h"
+#include "arm_compute/core/CL/CLKernelLibraryEx.h"
 #include <arm_compute/runtime/CL/CLScheduler.h>
 
-#include "Config.h"
-
 namespace onert::backend::acl_cl
 {
 
diff --git a/runtime/onert/backend/acl_cl/Config.h b/runtime/onert/backend/acl_cl/Config.h
index 1d4ba722e4a..9fa82260bec 100644
--- a/runtime/onert/backend/acl_cl/Config.h
+++ b/runtime/onert/backend/acl_cl/Config.h
@@ -18,10 +18,13 @@
 #define __ONERT_BACKEND_ACL_CL_CONFIG_H__
 
 #include "CLTimer.h"
-#include <memory>
+
 #include <backend/IConfig.h>
+
 #include <arm_compute/runtime/CL/CLScheduler.h>
 
+#include <memory>
+
 namespace onert::backend::acl_cl
 {
 
diff --git a/runtime/onert/backend/acl_cl/ConstantInitializer.cc b/runtime/onert/backend/acl_cl/ConstantInitializer.cc
index 379b02b5b22..4dbb7a4d922 100644
--- a/runtime/onert/backend/acl_cl/ConstantInitializer.cc
+++ b/runtime/onert/backend/acl_cl/ConstantInitializer.cc
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
+#include "ConstantInitializer.h"
+
 #include <AclActivationBuilder.h>
 #include <AclFunction.h>
 #include <Convert.h>
 #include <Swizzle.h>
 
-#include "ConstantInitializer.h"
-
 namespace onert::backend::acl_cl
 {
 
diff --git a/runtime/onert/backend/acl_cl/KernelGenerator.cc b/runtime/onert/backend/acl_cl/KernelGenerator.cc
index 8ed15cb2886..6175212ef36 100644
--- a/runtime/onert/backend/acl_cl/KernelGenerator.cc
+++ b/runtime/onert/backend/acl_cl/KernelGenerator.cc
@@ -16,21 +16,21 @@
 
 #include "KernelGenerator.h"
 
-#include <arm_compute/runtime/CL/CLFunctions.h>   // Include all ARM Compute CL functions
-#include <arm_compute/runtime/CL/CLFunctionsEx.h> // Include all ARM Compute EX CL functions
+#include "AclKernelGen.h"
+#include "exec/FunctionSequence.h"
+#include "exec/NopFunction.h"
+#include "ir/DataType.h"
+#include "ir/Index.h"
+#include "ir/InternalType.h"
+#include "util/logging.h"
 
 #include <AclActivationBuilder.h>
 #include <AclFunction.h>
 #include <Convert.h>
 #include <Swizzle.h>
 
-#include "ir/Index.h"
-#include "ir/DataType.h"
-#include "ir/InternalType.h"
-#include "exec/NopFunction.h"
-#include "exec/FunctionSequence.h"
-#include "util/logging.h"
-#include "AclKernelGen.h"
+#include <arm_compute/runtime/CL/CLFunctions.h>   // Include all ARM Compute CL functions
+#include <arm_compute/runtime/CL/CLFunctionsEx.h> // Include all ARM Compute EX CL functions
 
 namespace onert::backend::acl_cl
 {
diff --git a/runtime/onert/backend/acl_cl/KernelGenerator.h b/runtime/onert/backend/acl_cl/KernelGenerator.h
index 9556e7b5256..d909dca60ab 100644
--- a/runtime/onert/backend/acl_cl/KernelGenerator.h
+++ b/runtime/onert/backend/acl_cl/KernelGenerator.h
@@ -17,12 +17,12 @@
 #ifndef __ONERT_BACKEND_ACL_CL_KERNEL_GENERATOR_H__
 #define __ONERT_BACKEND_ACL_CL_KERNEL_GENERATOR_H__
 
-#include <backend/basic/KernelGeneratorBase.h>
-
-#include "TensorBuilder.h"
 #include "AclTensorRegistry.h"
+#include "TensorBuilder.h"
 #include "TensorManager.h"
 
+#include <backend/basic/KernelGeneratorBase.h>
+
 namespace onert::backend::acl_cl
 {
 
diff --git a/runtime/onert/backend/acl_cl/Optimizer.cc b/runtime/onert/backend/acl_cl/Optimizer.cc
index bbd624c22cb..0133e4c3216 100644
--- a/runtime/onert/backend/acl_cl/Optimizer.cc
+++ b/runtime/onert/backend/acl_cl/Optimizer.cc
@@ -17,7 +17,6 @@
 #include "Optimizer.h"
 
 #include <AclSubTensorAnalyzer.h>
-
 #include <compiler/LoweredGraph.h>
 #include <util/logging.h>
 
diff --git a/runtime/onert/backend/acl_cl/TensorBuilder.h b/runtime/onert/backend/acl_cl/TensorBuilder.h
index 8301b60b151..e0e51271f50 100644
--- a/runtime/onert/backend/acl_cl/TensorBuilder.h
+++ b/runtime/onert/backend/acl_cl/TensorBuilder.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_BACKEND_ACL_CL_TENSOR_BUILDER_H__
 #define __ONERT_BACKEND_ACL_CL_TENSOR_BUILDER_H__
 
-#include <AclTensorBuilder.h>
-
-#include "operand/CLTensor.h"
 #include "operand/CLSubTensor.h"
+#include "operand/CLTensor.h"
+
+#include <AclTensorBuilder.h>
 
 namespace onert::backend::acl_cl
 {
diff --git a/runtime/onert/backend/acl_cl/TensorManager.h b/runtime/onert/backend/acl_cl/TensorManager.h
index a601c3b5599..9f9128b8841 100644
--- a/runtime/onert/backend/acl_cl/TensorManager.h
+++ b/runtime/onert/backend/acl_cl/TensorManager.h
@@ -17,21 +17,20 @@
 #ifndef __ONERT_BACKEND_ACL_CL_TENSOR_MANAGER_H__
 #define __ONERT_BACKEND_ACL_CL_TENSOR_MANAGER_H__
 
-#include <arm_compute/runtime/CL/CLBufferAllocator.h>
-#include <arm_compute/runtime/PoolManager.h>
-#include <arm_compute/runtime/BlobLifetimeManager.h>
-#include <arm_compute/runtime/MemoryManagerOnDemand.h>
-#include <arm_compute/runtime/MemoryGroup.h>
+#include "operand/CLSubTensor.h"
+#include "operand/CLTensor.h"
+#include "util/logging.h"
 
-#include <AclMemoryManager.h>
-#include <AclLinearMemoryManager.h>
 #include <AclInternalBufferManager.h>
+#include <AclLinearMemoryManager.h>
+#include <AclMemoryManager.h>
 #include <AclTensorManager.h>
 
-#include "operand/CLTensor.h"
-#include "operand/CLSubTensor.h"
-
-#include "util/logging.h"
+#include <arm_compute/runtime/BlobLifetimeManager.h>
+#include <arm_compute/runtime/CL/CLBufferAllocator.h>
+#include <arm_compute/runtime/MemoryGroup.h>
+#include <arm_compute/runtime/MemoryManagerOnDemand.h>
+#include <arm_compute/runtime/PoolManager.h>
 
 namespace onert::backend::acl_cl
 {
diff --git a/runtime/onert/backend/acl_cl/operand/CLSubTensor.h b/runtime/onert/backend/acl_cl/operand/CLSubTensor.h
index 87eadc9ee50..e2bfb0cb26a 100644
--- a/runtime/onert/backend/acl_cl/operand/CLSubTensor.h
+++ b/runtime/onert/backend/acl_cl/operand/CLSubTensor.h
@@ -17,9 +17,10 @@
 #ifndef __ONERT_BACKEND_ACL_CL_OPERAND_CL_SUB_TENSOR_H__
 #define __ONERT_BACKEND_ACL_CL_OPERAND_CL_SUB_TENSOR_H__
 
-#include <arm_compute/runtime/CL/CLSubTensor.h>
 #include "ICLTensor.h"
 
+#include <arm_compute/runtime/CL/CLSubTensor.h>
+
 namespace onert::backend::acl_cl::operand
 {
 
diff --git a/runtime/onert/backend/acl_cl/operand/CLTensor.cc b/runtime/onert/backend/acl_cl/operand/CLTensor.cc
index 6f09932a622..a6647d1e1a8 100644
--- a/runtime/onert/backend/acl_cl/operand/CLTensor.cc
+++ b/runtime/onert/backend/acl_cl/operand/CLTensor.cc
@@ -16,11 +16,11 @@
 
 #include "CLTensor.h"
 
-#include <arm_compute/runtime/CL/CLScheduler.h>
+#include <Convert.h>
+
 #include <arm_compute/runtime/CL/CLMemory.h>
 #include <arm_compute/runtime/CL/CLMemoryRegion.h>
-
-#include <Convert.h>
+#include <arm_compute/runtime/CL/CLScheduler.h>
 
 namespace onert::backend::acl_cl::operand
 {
diff --git a/runtime/onert/backend/acl_cl/operand/CLTensor.h b/runtime/onert/backend/acl_cl/operand/CLTensor.h
index bf0f49baa90..2350d942175 100644
--- a/runtime/onert/backend/acl_cl/operand/CLTensor.h
+++ b/runtime/onert/backend/acl_cl/operand/CLTensor.h
@@ -17,11 +17,12 @@
 #ifndef __ONERT_BACKEND_ACL_CL_OPERAND_CL_TENSOR_H__
 #define __ONERT_BACKEND_ACL_CL_OPERAND_CL_TENSOR_H__
 
+#include "ICLTensor.h"
+
+#include "arm_compute/runtime/CL/CLTensorAllocator.h"
 #include <arm_compute/core/TensorInfo.h>
-#include <arm_compute/runtime/CL/CLTensor.h>
 #include <arm_compute/runtime/CL/CLScheduler.h>
-#include "arm_compute/runtime/CL/CLTensorAllocator.h"
-#include "ICLTensor.h"
+#include <arm_compute/runtime/CL/CLTensor.h>
 
 namespace onert::backend::acl_cl::operand
 {
diff --git a/runtime/onert/backend/acl_cl/operand/ICLTensor.cc b/runtime/onert/backend/acl_cl/operand/ICLTensor.cc
index 0b2303c550b..b3a7d218770 100644
--- a/runtime/onert/backend/acl_cl/operand/ICLTensor.cc
+++ b/runtime/onert/backend/acl_cl/operand/ICLTensor.cc
@@ -16,8 +16,8 @@
 
 #include "ICLTensor.h"
 
-#include <arm_compute/runtime/CL/CLScheduler.h>
 #include <arm_compute/core/CL/OpenCL.h>
+#include <arm_compute/runtime/CL/CLScheduler.h>
 
 namespace onert::backend::acl_cl::operand
 {
diff --git a/runtime/onert/backend/acl_cl/operand/ICLTensor.h b/runtime/onert/backend/acl_cl/operand/ICLTensor.h
index 479825d81b1..fb91e539733 100644
--- a/runtime/onert/backend/acl_cl/operand/ICLTensor.h
+++ b/runtime/onert/backend/acl_cl/operand/ICLTensor.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_BACKEND_ACL_CL_OPERAND_I_CL_TENSOR_H__
 #define __ONERT_BACKEND_ACL_CL_OPERAND_I_CL_TENSOR_H__
 
-#include <arm_compute/core/CL/ICLTensor.h>
-
 #include <IACLTensor.h>
 
+#include <arm_compute/core/CL/ICLTensor.h>
+
 namespace onert::backend::acl_cl::operand
 {
 
diff --git a/runtime/onert/backend/acl_common/AclActivationBuilder.h b/runtime/onert/backend/acl_common/AclActivationBuilder.h
index 93a97a2a8ad..349ee4d6ba3 100644
--- a/runtime/onert/backend/acl_common/AclActivationBuilder.h
+++ b/runtime/onert/backend/acl_common/AclActivationBuilder.h
@@ -17,13 +17,13 @@
 #ifndef __ONERT_BACKEND_ACL_COMMON_ACL_ACTIVATION_BUILDER_H__
 #define __ONERT_BACKEND_ACL_COMMON_ACL_ACTIVATION_BUILDER_H__
 
-#include <memory>
+#include "Convert.h"
 
-#include <ir/InternalType.h>
 #include <exec/IFunction.h>
 #include <exec/NopFunction.h>
+#include <ir/InternalType.h>
 
-#include "Convert.h"
+#include <memory>
 
 namespace onert::backend::acl_common
 {
diff --git a/runtime/onert/backend/acl_common/AclBackendContext.h b/runtime/onert/backend/acl_common/AclBackendContext.h
index be177794147..412d9d3ad99 100644
--- a/runtime/onert/backend/acl_common/AclBackendContext.h
+++ b/runtime/onert/backend/acl_common/AclBackendContext.h
@@ -18,13 +18,12 @@
 #define __ONERT_BACKEND_ACL_COMMON_ACLBACKEND_CONTEXT_H__
 
 #include <backend/BackendContext.h>
+#include <cl_common/BackendContext.h>
 #include <ir/Index.h>
 #include <ir/OperandIndexMap.h>
 #include <ir/OperandIndexSequence.h>
 #include <util/logging.h>
 
-#include <cl_common/BackendContext.h>
-
 namespace onert::backend::acl_common
 {
 
diff --git a/runtime/onert/backend/acl_common/AclConstantInitializer.h b/runtime/onert/backend/acl_common/AclConstantInitializer.h
index 8016db5a1ce..8ca2a0e8484 100644
--- a/runtime/onert/backend/acl_common/AclConstantInitializer.h
+++ b/runtime/onert/backend/acl_common/AclConstantInitializer.h
@@ -19,17 +19,17 @@
 
 #include "AclTensorRegistry.h"
 
-#include <unordered_map>
-#include <functional>
-
+#include <backend/ITensorRegistry.h>
 #include <ir/Coordinates.h>
 #include <ir/Layout.h>
 #include <ir/Operand.h>
 #include <ir/Operands.h>
 #include <ir/OperationVisitor.h>
-#include <backend/ITensorRegistry.h>
 #include <util/logging.h>
 
+#include <functional>
+#include <unordered_map>
+
 namespace onert::backend::acl_common
 {
 
diff --git a/runtime/onert/backend/acl_common/AclFunction.h b/runtime/onert/backend/acl_common/AclFunction.h
index f825ba7b8cd..ac462eec7b4 100644
--- a/runtime/onert/backend/acl_common/AclFunction.h
+++ b/runtime/onert/backend/acl_common/AclFunction.h
@@ -18,7 +18,9 @@
 #define __ONERT_BACKEND_ACL_COMMON_KERNEL_ACL_FUNCTION_H__
 
 #include <exec/IFunction.h>
+
 #include <arm_compute/runtime/IFunction.h>
+
 #include <memory>
 
 namespace onert::backend::acl_common
diff --git a/runtime/onert/backend/acl_common/AclInternalBufferManager.h b/runtime/onert/backend/acl_common/AclInternalBufferManager.h
index d1e9c166a92..ff93dd20361 100644
--- a/runtime/onert/backend/acl_common/AclInternalBufferManager.h
+++ b/runtime/onert/backend/acl_common/AclInternalBufferManager.h
@@ -18,6 +18,7 @@
 #define __ONERT_BACKEND_ACL_COMMON_INTERNAL_BUFFER_MANAGER_H__
 
 #include <arm_compute/runtime/IMemoryManager.h>
+
 #include <cassert>
 #include <memory>
 
diff --git a/runtime/onert/backend/acl_common/AclKernelGen.h b/runtime/onert/backend/acl_common/AclKernelGen.h
index bff8e23593e..54b9ab30951 100644
--- a/runtime/onert/backend/acl_common/AclKernelGen.h
+++ b/runtime/onert/backend/acl_common/AclKernelGen.h
@@ -19,8 +19,8 @@
 
 #include <exec/IFunction.h>
 #include <ir/Operands.h>
-
 #include <ir/operation/LSTM.h>
+
 #include <arm_compute/runtime/CL/CLFunctions.h>
 
 namespace onert::backend::acl_common
diff --git a/runtime/onert/backend/acl_common/AclLinearMemoryManager.h b/runtime/onert/backend/acl_common/AclLinearMemoryManager.h
index 228a5f9a7b2..1b6004c6a7f 100644
--- a/runtime/onert/backend/acl_common/AclLinearMemoryManager.h
+++ b/runtime/onert/backend/acl_common/AclLinearMemoryManager.h
@@ -17,12 +17,12 @@
 #ifndef __ONERT_BACKEND_ACL_COMMON_LINEAR_MEMORY_MANAGER_H__
 #define __ONERT_BACKEND_ACL_COMMON_LINEAR_MEMORY_MANAGER_H__
 
-#include <cassert>
-
 #include "AclMemoryManager.h"
 #include "ir/OperandIndexMap.h"
 #include "util/logging.h"
 
+#include <cassert>
+
 namespace onert::backend::acl_common
 {
 
diff --git a/runtime/onert/backend/acl_common/AclMemoryManager.h b/runtime/onert/backend/acl_common/AclMemoryManager.h
index 6ba5b60bfb6..cbbd393a64b 100644
--- a/runtime/onert/backend/acl_common/AclMemoryManager.h
+++ b/runtime/onert/backend/acl_common/AclMemoryManager.h
@@ -17,13 +17,14 @@
 #ifndef __ONERT_BACKEND_ACL_COMMON_MEMORY_MANAGER_H__
 #define __ONERT_BACKEND_ACL_COMMON_MEMORY_MANAGER_H__
 
+#include "Convert.h"
+#include "ir/OperandIndexMap.h"
+#include "util/logging.h"
+
 #include <arm_compute/core/Types.h>
 #include <arm_compute/runtime/IMemoryManager.h>
-#include <cassert>
 
-#include "ir/OperandIndexMap.h"
-#include "Convert.h"
-#include "util/logging.h"
+#include <cassert>
 
 namespace onert::backend::acl_common
 {
diff --git a/runtime/onert/backend/acl_common/AclSubTensorAnalyzer.h b/runtime/onert/backend/acl_common/AclSubTensorAnalyzer.h
index 568fa32da3e..cadce3d3ffd 100644
--- a/runtime/onert/backend/acl_common/AclSubTensorAnalyzer.h
+++ b/runtime/onert/backend/acl_common/AclSubTensorAnalyzer.h
@@ -18,9 +18,8 @@
 #define __ONERT_BACKEND_ACL_COMMON_ACL_SUB_TENSOR_ANALYZER_H__
 
 #include <cl_common/ParentInfo.h>
-
-#include <ir/OperationVisitor.h>
 #include <ir/Graph.h>
+#include <ir/OperationVisitor.h>
 
 namespace onert::backend::acl_common
 {
diff --git a/runtime/onert/backend/acl_common/AclTensorBuilder.h b/runtime/onert/backend/acl_common/AclTensorBuilder.h
index 47edf02e7bc..3da734be054 100644
--- a/runtime/onert/backend/acl_common/AclTensorBuilder.h
+++ b/runtime/onert/backend/acl_common/AclTensorBuilder.h
@@ -22,7 +22,6 @@
 
 #include <cl_common/LifetimeMap.h>
 #include <cl_common/ParentInfo.h>
-
 #include <ir/OperandIndexMap.h>
 #include <ir/Operands.h>
 #include <util/Utils.h>
@@ -104,13 +103,12 @@ template <typename T_ITensor, typename T_Tensor, typename T_SubTensor> class Acl
 
 } // namespace onert::backend::acl_common
 
-#include <cassert>
-#include <stack>
-
 #include "Convert.h"
-
 #include "util/logging.h"
 
+#include <cassert>
+#include <stack>
+
 namespace onert::backend::acl_common
 {
 
diff --git a/runtime/onert/backend/acl_common/AclTensorManager.h b/runtime/onert/backend/acl_common/AclTensorManager.h
index 3fb51bb6f9e..83562b3f7f6 100644
--- a/runtime/onert/backend/acl_common/AclTensorManager.h
+++ b/runtime/onert/backend/acl_common/AclTensorManager.h
@@ -17,12 +17,12 @@
 #ifndef __ONERT_BACKEND_ACL_COMMON_TENSOR_MANAGER_H__
 #define __ONERT_BACKEND_ACL_COMMON_TENSOR_MANAGER_H__
 
-#include <arm_compute/runtime/IMemoryManager.h>
-
-#include "AclMemoryManager.h"
 #include "AclInternalBufferManager.h"
+#include "AclMemoryManager.h"
 #include "ir/OperandIndexMap.h"
 
+#include <arm_compute/runtime/IMemoryManager.h>
+
 namespace onert::backend::acl_common
 {
 
@@ -77,9 +77,10 @@ template <typename T_ITensor, typename T_Tensor, typename T_SubTensor> class Acl
 
 } // namespace onert::backend::acl_common
 
-#include <cassert>
 #include "util/logging.h"
 
+#include <cassert>
+
 namespace onert::backend::acl_common
 {
 
diff --git a/runtime/onert/backend/acl_common/Convert.cc b/runtime/onert/backend/acl_common/Convert.cc
index 3dd34235836..a292697bb79 100644
--- a/runtime/onert/backend/acl_common/Convert.cc
+++ b/runtime/onert/backend/acl_common/Convert.cc
@@ -19,6 +19,7 @@
 #include "Swizzle.h"
 #include "ir/DataType.h"
 #include "ir/operation/ElementwiseActivation.h"
+
 #include <memory>
 
 namespace onert::backend::acl_common
diff --git a/runtime/onert/backend/acl_common/Convert.h b/runtime/onert/backend/acl_common/Convert.h
index 5dfe59c06ef..6a936d73380 100644
--- a/runtime/onert/backend/acl_common/Convert.h
+++ b/runtime/onert/backend/acl_common/Convert.h
@@ -17,26 +17,25 @@
 #ifndef __ONERT_BACKEND_ACL_COMMON_CONVERT_H__
 #define __ONERT_BACKEND_ACL_COMMON_CONVERT_H__
 
-#include <arm_compute/core/PixelValue.h>
-#include <arm_compute/core/TensorInfo.h>
-#include <arm_compute/core/SubTensorInfo.h>
-#include <arm_compute/core/TensorShape.h>
-#include <arm_compute/core/TypesEx.h>
-
-#include "ir/Layout.h"
+#include "AclFunction.h"
+#include "ir/Coordinates.h"
 #include "ir/InternalType.h"
+#include "ir/Layout.h"
 #include "ir/Operand.h"
-#include "ir/operation/Pool2D.h"
-#include "ir/operation/Reduce.h"
-#include "ir/operation/ElementwiseActivation.h"
+#include "ir/Padding.h"
 #include "ir/Shape.h"
 #include "ir/TypeInfo.h"
-#include "ir/Coordinates.h"
-#include "ir/Padding.h"
+#include "ir/operation/ElementwiseActivation.h"
+#include "ir/operation/Pool2D.h"
+#include "ir/operation/Reduce.h"
 #include "misc/feature/Shape.h"
 #include "misc/kernel/Shape.h"
 
-#include "AclFunction.h"
+#include <arm_compute/core/PixelValue.h>
+#include <arm_compute/core/SubTensorInfo.h>
+#include <arm_compute/core/TensorInfo.h>
+#include <arm_compute/core/TensorShape.h>
+#include <arm_compute/core/TypesEx.h>
 
 #include <set>
 
diff --git a/runtime/onert/backend/acl_common/IACLTensor.cc b/runtime/onert/backend/acl_common/IACLTensor.cc
index 820dc2105b3..5a1b683be92 100644
--- a/runtime/onert/backend/acl_common/IACLTensor.cc
+++ b/runtime/onert/backend/acl_common/IACLTensor.cc
@@ -15,6 +15,7 @@
  */
 
 #include "IACLTensor.h"
+
 #include "Convert.h"
 #include "Swizzle.h"
 
diff --git a/runtime/onert/backend/acl_common/IACLTensor.h b/runtime/onert/backend/acl_common/IACLTensor.h
index b3a80cdeb31..c6127ab0c89 100644
--- a/runtime/onert/backend/acl_common/IACLTensor.h
+++ b/runtime/onert/backend/acl_common/IACLTensor.h
@@ -17,9 +17,11 @@
 #ifndef __ONERT_BACKEND_ACL_COMMON_I_ACL_TENSOR_H__
 #define __ONERT_BACKEND_ACL_COMMON_I_ACL_TENSOR_H__
 
+#include "Swizzle.h"
+
 #include <backend/ITensor.h>
+
 #include <arm_compute/core/ITensor.h>
-#include "Swizzle.h"
 
 namespace onert::backend::acl_common
 {
diff --git a/runtime/onert/backend/acl_common/Swizzle.h b/runtime/onert/backend/acl_common/Swizzle.h
index 2d0a1dde0cb..0fdd2922479 100644
--- a/runtime/onert/backend/acl_common/Swizzle.h
+++ b/runtime/onert/backend/acl_common/Swizzle.h
@@ -17,9 +17,10 @@
 #ifndef __ONERT_BACKEND_ACL_COMMON_SWIZZLE_H__
 #define __ONERT_BACKEND_ACL_COMMON_SWIZZLE_H__
 
-#include <cassert>
 #include <ir/Layout.h>
 
+#include <cassert>
+
 namespace onert::backend::acl_common
 {
 
diff --git a/runtime/onert/backend/acl_neon/Backend.h b/runtime/onert/backend/acl_neon/Backend.h
index bab834f0b49..53e2bf63283 100644
--- a/runtime/onert/backend/acl_neon/Backend.h
+++ b/runtime/onert/backend/acl_neon/Backend.h
@@ -17,16 +17,17 @@
 #ifndef __ONERT_BACKEND_ACL_NEON_BACKEND_H__
 #define __ONERT_BACKEND_ACL_NEON_BACKEND_H__
 
-#include <memory>
-#include <backend/Backend.h>
-#include <ir/Operands.h>
-
 #include "BackendContext.h"
 #include "Config.h"
 #include "ConstantInitializer.h"
 #include "KernelGenerator.h"
-#include "TensorManager.h"
 #include "Optimizer.h"
+#include "TensorManager.h"
+
+#include <backend/Backend.h>
+#include <ir/Operands.h>
+
+#include <memory>
 
 namespace onert::backend::acl_neon
 {
diff --git a/runtime/onert/backend/acl_neon/BackendContext.h b/runtime/onert/backend/acl_neon/BackendContext.h
index 71e91755b2c..50ad7e801e3 100644
--- a/runtime/onert/backend/acl_neon/BackendContext.h
+++ b/runtime/onert/backend/acl_neon/BackendContext.h
@@ -17,12 +17,12 @@
 #ifndef __ONERT_BACKEND_ACL_NEON_BACKEND_CONTEXT_H__
 #define __ONERT_BACKEND_ACL_NEON_BACKEND_CONTEXT_H__
 
-#include <AclBackendContext.h>
-
 #include "ConstantInitializer.h"
 #include "KernelGenerator.h"
 #include "TensorBuilder.h"
 
+#include <AclBackendContext.h>
+
 namespace onert::backend::acl_neon
 {
 
diff --git a/runtime/onert/backend/acl_neon/Config.h b/runtime/onert/backend/acl_neon/Config.h
index 806442d28e8..eda1e64b61c 100644
--- a/runtime/onert/backend/acl_neon/Config.h
+++ b/runtime/onert/backend/acl_neon/Config.h
@@ -18,9 +18,10 @@
 #define __ONERT_BACKEND_ACL_NEON_CONFIG_H__
 
 #include <backend/IConfig.h>
-#include <memory>
 #include <util/ITimer.h>
 
+#include <memory>
+
 namespace onert::backend::acl_neon
 {
 
diff --git a/runtime/onert/backend/acl_neon/KernelGenerator.cc b/runtime/onert/backend/acl_neon/KernelGenerator.cc
index 51dc58f2da0..ddecf990f78 100644
--- a/runtime/onert/backend/acl_neon/KernelGenerator.cc
+++ b/runtime/onert/backend/acl_neon/KernelGenerator.cc
@@ -16,20 +16,20 @@
 
 #include "KernelGenerator.h"
 
-#include <arm_compute/runtime/NEON/NEFunctions.h>   // Include all ARM Compute NEON functions
-#include <arm_compute/runtime/NEON/NEFunctionsEx.h> // Include all ARM Compute EX NEON functions
+#include "AclKernelGen.h"
+#include "exec/NopFunction.h"
+#include "ir/DataType.h"
+#include "ir/Index.h"
+#include "ir/InternalType.h"
+#include "util/logging.h"
 
 #include <AclActivationBuilder.h>
 #include <AclFunction.h>
 #include <Convert.h>
 #include <Swizzle.h>
 
-#include "ir/Index.h"
-#include "ir/DataType.h"
-#include "ir/InternalType.h"
-#include "exec/NopFunction.h"
-#include "util/logging.h"
-#include "AclKernelGen.h"
+#include <arm_compute/runtime/NEON/NEFunctions.h>   // Include all ARM Compute NEON functions
+#include <arm_compute/runtime/NEON/NEFunctionsEx.h> // Include all ARM Compute EX NEON functions
 
 namespace onert::backend::acl_neon
 {
diff --git a/runtime/onert/backend/acl_neon/KernelGenerator.h b/runtime/onert/backend/acl_neon/KernelGenerator.h
index 999501972f3..2a7d8e8319a 100644
--- a/runtime/onert/backend/acl_neon/KernelGenerator.h
+++ b/runtime/onert/backend/acl_neon/KernelGenerator.h
@@ -17,12 +17,12 @@
 #ifndef __ONERT_BACKEND_ACL_NEON_KERNEL_GENERATOR_H__
 #define __ONERT_BACKEND_ACL_NEON_KERNEL_GENERATOR_H__
 
-#include <backend/basic/KernelGeneratorBase.h>
-
-#include "ir/Operands.h"
-#include "TensorBuilder.h"
 #include "AclTensorRegistry.h"
+#include "TensorBuilder.h"
 #include "TensorManager.h"
+#include "ir/Operands.h"
+
+#include <backend/basic/KernelGeneratorBase.h>
 
 namespace onert::backend::acl_neon
 {
diff --git a/runtime/onert/backend/acl_neon/Optimizer.cc b/runtime/onert/backend/acl_neon/Optimizer.cc
index cdf721b16f4..a923733f540 100644
--- a/runtime/onert/backend/acl_neon/Optimizer.cc
+++ b/runtime/onert/backend/acl_neon/Optimizer.cc
@@ -17,7 +17,6 @@
 #include "Optimizer.h"
 
 #include <AclSubTensorAnalyzer.h>
-
 #include <compiler/LoweredGraph.h>
 #include <util/logging.h>
 
diff --git a/runtime/onert/backend/acl_neon/TensorBuilder.h b/runtime/onert/backend/acl_neon/TensorBuilder.h
index c702b841030..76c195a5fc6 100644
--- a/runtime/onert/backend/acl_neon/TensorBuilder.h
+++ b/runtime/onert/backend/acl_neon/TensorBuilder.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_BACKEND_ACL_NEON_TENSOR_BUILDER_H__
 #define __ONERT_BACKEND_ACL_NEON_TENSOR_BUILDER_H__
 
-#include <AclTensorBuilder.h>
-
-#include "operand/NETensor.h"
 #include "operand/NESubTensor.h"
+#include "operand/NETensor.h"
+
+#include <AclTensorBuilder.h>
 
 namespace onert::backend::acl_neon
 {
diff --git a/runtime/onert/backend/acl_neon/TensorManager.h b/runtime/onert/backend/acl_neon/TensorManager.h
index cfd608d4ab7..ae13fd60bbc 100644
--- a/runtime/onert/backend/acl_neon/TensorManager.h
+++ b/runtime/onert/backend/acl_neon/TensorManager.h
@@ -17,21 +17,20 @@
 #ifndef __ONERT_BACKEND_ACL_NEON_TENSOR_MANAGER_H__
 #define __ONERT_BACKEND_ACL_NEON_TENSOR_MANAGER_H__
 
-#include <arm_compute/runtime/Allocator.h>
-#include <arm_compute/runtime/PoolManager.h>
-#include <arm_compute/runtime/OffsetLifetimeManager.h>
-#include <arm_compute/runtime/MemoryManagerOnDemand.h>
-#include <arm_compute/runtime/MemoryGroup.h>
+#include "operand/NESubTensor.h"
+#include "operand/NETensor.h"
+#include "util/logging.h"
 
-#include <AclMemoryManager.h>
-#include <AclLinearMemoryManager.h>
 #include <AclInternalBufferManager.h>
+#include <AclLinearMemoryManager.h>
+#include <AclMemoryManager.h>
 #include <AclTensorManager.h>
 
-#include "operand/NETensor.h"
-#include "operand/NESubTensor.h"
-
-#include "util/logging.h"
+#include <arm_compute/runtime/Allocator.h>
+#include <arm_compute/runtime/MemoryGroup.h>
+#include <arm_compute/runtime/MemoryManagerOnDemand.h>
+#include <arm_compute/runtime/OffsetLifetimeManager.h>
+#include <arm_compute/runtime/PoolManager.h>
 
 namespace onert::backend::acl_neon
 {
diff --git a/runtime/onert/backend/acl_neon/operand/INETensor.h b/runtime/onert/backend/acl_neon/operand/INETensor.h
index 301089d3682..059c74076d8 100644
--- a/runtime/onert/backend/acl_neon/operand/INETensor.h
+++ b/runtime/onert/backend/acl_neon/operand/INETensor.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_BACKEND_ACL_NEON_OPERAND_I_NE_TENSOR_H__
 #define __ONERT_BACKEND_ACL_NEON_OPERAND_I_NE_TENSOR_H__
 
-#include <arm_compute/core/ITensor.h>
-
 #include <IACLTensor.h>
 
+#include <arm_compute/core/ITensor.h>
+
 namespace onert::backend::acl_neon::operand
 {
 
diff --git a/runtime/onert/backend/acl_neon/operand/NESubTensor.h b/runtime/onert/backend/acl_neon/operand/NESubTensor.h
index 81c7f1deac4..3743889cba8 100644
--- a/runtime/onert/backend/acl_neon/operand/NESubTensor.h
+++ b/runtime/onert/backend/acl_neon/operand/NESubTensor.h
@@ -17,9 +17,10 @@
 #ifndef __ONERT_BACKEND_ACL_NEON_OPERAND_NE_SUB_TENSOR_H__
 #define __ONERT_BACKEND_ACL_NEON_OPERAND_NE_SUB_TENSOR_H__
 
-#include <arm_compute/runtime/SubTensor.h>
 #include "INETensor.h"
 
+#include <arm_compute/runtime/SubTensor.h>
+
 namespace onert::backend::acl_neon::operand
 {
 
diff --git a/runtime/onert/backend/acl_neon/operand/NETensor.cc b/runtime/onert/backend/acl_neon/operand/NETensor.cc
index b7fa345efb3..a6af1f9cc62 100644
--- a/runtime/onert/backend/acl_neon/operand/NETensor.cc
+++ b/runtime/onert/backend/acl_neon/operand/NETensor.cc
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
+#include "NETensor.h"
+
 #include <arm_compute/runtime/Memory.h>
 #include <arm_compute/runtime/MemoryRegion.h>
-#include "NETensor.h"
 
 namespace onert::backend::acl_neon::operand
 {
diff --git a/runtime/onert/backend/acl_neon/operand/NETensor.h b/runtime/onert/backend/acl_neon/operand/NETensor.h
index 33076a16812..81d4e3ac552 100644
--- a/runtime/onert/backend/acl_neon/operand/NETensor.h
+++ b/runtime/onert/backend/acl_neon/operand/NETensor.h
@@ -17,10 +17,11 @@
 #ifndef __ONERT_BACKEND_ACL_NEON_OPERAND_NE_TENSOR_H__
 #define __ONERT_BACKEND_ACL_NEON_OPERAND_NE_TENSOR_H__
 
+#include "INETensor.h"
+
+#include "arm_compute/runtime/TensorAllocator.h"
 #include <arm_compute/core/TensorInfo.h>
 #include <arm_compute/runtime/Tensor.h>
-#include "arm_compute/runtime/TensorAllocator.h"
-#include "INETensor.h"
 
 namespace onert::backend::acl_neon::operand
 {
diff --git a/runtime/onert/backend/cl_common/include/cl_common/ParentInfo.h b/runtime/onert/backend/cl_common/include/cl_common/ParentInfo.h
index 90897dcf44c..c6283220621 100644
--- a/runtime/onert/backend/cl_common/include/cl_common/ParentInfo.h
+++ b/runtime/onert/backend/cl_common/include/cl_common/ParentInfo.h
@@ -17,8 +17,8 @@
 #ifndef __ONERT_BACKEND_CL_COMMON_PARENT_INFO_H__
 #define __ONERT_BACKEND_CL_COMMON_PARENT_INFO_H__
 
-#include <ir/Index.h>
 #include <ir/Coordinates.h>
+#include <ir/Index.h>
 
 namespace onert::backend::cl_common
 {
diff --git a/runtime/onert/backend/cpu/BackendContext.cc b/runtime/onert/backend/cpu/BackendContext.cc
index dd10d447fcd..23dcff9ad5a 100644
--- a/runtime/onert/backend/cpu/BackendContext.cc
+++ b/runtime/onert/backend/cpu/BackendContext.cc
@@ -16,14 +16,14 @@
 
 #include "BackendContext.h"
 
-#include "TensorBuilder.h"
 #include "KernelGenerator.h"
-#include "util/logging.h"
+#include "TensorBuilder.h"
+#include "backend/basic/BackendContextHelpers.h"
+#include "backend/basic/TensorRegistry.h"
 #include "ir/Index.h"
 #include "ir/OperandIndexMap.h"
 #include "ir/OperandIndexSequence.h"
-#include "backend/basic/BackendContextHelpers.h"
-#include "backend/basic/TensorRegistry.h"
+#include "util/logging.h"
 
 #include <misc/polymorphic_downcast.h>
 
diff --git a/runtime/onert/backend/cpu/BackendContext.h b/runtime/onert/backend/cpu/BackendContext.h
index 44df9ae9282..5621bae1839 100644
--- a/runtime/onert/backend/cpu/BackendContext.h
+++ b/runtime/onert/backend/cpu/BackendContext.h
@@ -17,10 +17,11 @@
 #ifndef __ONERT_BACKEND_CPU_BACKEND_CONTEXT_H__
 #define __ONERT_BACKEND_CPU_BACKEND_CONTEXT_H__
 
-#include <backend/BackendContext.h>
-#include "TensorBuilder.h"
-#include "KernelGenerator.h"
 #include "ExternalContext.h"
+#include "KernelGenerator.h"
+#include "TensorBuilder.h"
+
+#include <backend/BackendContext.h>
 
 namespace onert::backend::cpu
 {
diff --git a/runtime/onert/backend/cpu/Config.h b/runtime/onert/backend/cpu/Config.h
index 5a2aa1e8565..8ae287d95e1 100644
--- a/runtime/onert/backend/cpu/Config.h
+++ b/runtime/onert/backend/cpu/Config.h
@@ -18,9 +18,10 @@
 #define __ONERT_BACKEND_CPU_CONFIG_H__
 
 #include <backend/IConfig.h>
-#include <memory>
 #include <util/ITimer.h>
 
+#include <memory>
+
 namespace onert::backend::cpu
 {
 
diff --git a/runtime/onert/backend/cpu/ExternalContext.h b/runtime/onert/backend/cpu/ExternalContext.h
index 2f0fa7dcf7c..7dab50bb3d7 100644
--- a/runtime/onert/backend/cpu/ExternalContext.h
+++ b/runtime/onert/backend/cpu/ExternalContext.h
@@ -18,8 +18,9 @@
 #define __ONERT_BACKEND_CPU_EXTERNAL_CONTEXT_H__
 
 #include <util/ConfigSource.h>
-#include <ruy/context.h>
+
 #include <ggml.h>
+#include <ruy/context.h>
 
 #include <memory>
 
diff --git a/runtime/onert/backend/cpu/KernelGenerator.cc b/runtime/onert/backend/cpu/KernelGenerator.cc
index 0984c7d0f0c..150baf1f6dd 100644
--- a/runtime/onert/backend/cpu/KernelGenerator.cc
+++ b/runtime/onert/backend/cpu/KernelGenerator.cc
@@ -18,13 +18,16 @@
 
 #include "ops/AddNLayer.h"
 #include "ops/ArgMinMaxLayer.h"
+#include "ops/BatchMatMulLayer.h"
 #include "ops/BatchToSpaceNDLayer.h"
 #include "ops/BinaryArithmeticLayer.h"
+#include "ops/BroadcastToLayer.h"
 #include "ops/CompareLayer.h"
 #include "ops/ConcatLayer.h"
 #include "ops/ConvolutionLayer.h"
 #include "ops/DepthToSpaceLayer.h"
 #include "ops/DepthwiseConvolutionLayer.h"
+#include "ops/DetectionPostProcessLayer.h"
 #include "ops/DynamicUpdateSlice.h"
 #include "ops/ElementwiseActivationLayer.h"
 #include "ops/ElementwiseBinaryLayer.h"
@@ -32,10 +35,12 @@
 #include "ops/ExpandDimsLayer.h"
 #include "ops/FillLayer.h"
 #include "ops/FullyConnectedLayer.h"
+#include "ops/FusedBatchNormLayer.h"
 #include "ops/GatherLayer.h"
+#include "ops/L2NormLayer.h"
 #include "ops/LSTMLayer.h"
+#include "ops/LogSoftMaxLayer.h"
 #include "ops/MeanLayer.h"
-#include "ops/DetectionPostProcessLayer.h"
 #include "ops/OneHotLayer.h"
 #include "ops/OperationUtils.h"
 #include "ops/PackLayer.h"
@@ -49,36 +54,31 @@
 #include "ops/ReshapeLayer.h"
 #include "ops/ResizeBilinearLayer.h"
 #include "ops/ReverseLayer.h"
+#include "ops/RmsNormLayer.h"
 #include "ops/RoPELayer.h"
 #include "ops/SelectLayer.h"
 #include "ops/ShapeLayer.h"
 #include "ops/SliceLayer.h"
 #include "ops/SoftMaxLayer.h"
-#include "ops/StridedSliceLayer.h"
 #include "ops/SpaceToBatchNDLayer.h"
 #include "ops/SpaceToDepthLayer.h"
 #include "ops/SplitLayer.h"
 #include "ops/SplitVLayer.h"
+#include "ops/SquaredDiffLayer.h"
+#include "ops/StatelessRandomUniformLayer.h"
+#include "ops/StridedSliceLayer.h"
 #include "ops/TileLayer.h"
 #include "ops/TopKV2Layer.h"
 #include "ops/TransposeLayer.h"
 #include "ops/UnpackLayer.h"
-#include "ops/SquaredDiffLayer.h"
-#include "ops/L2NormLayer.h"
-#include "ops/BatchMatMulLayer.h"
-#include "ops/BroadcastToLayer.h"
-#include "ops/FusedBatchNormLayer.h"
-#include "ops/LogSoftMaxLayer.h"
-#include "ops/StatelessRandomUniformLayer.h"
-#include "ops/RmsNormLayer.h"
 
 #include <backend/Backend.h>
 #include <backend/IConfig.h>
-#include <memory>
+#include <exec/DynamicShapeInferer.h>
 #include <util/Utils.h>
 #include <util/logging.h>
-#include <exec/DynamicShapeInferer.h>
 
+#include <memory>
 #include <stdexcept>
 
 namespace onert::backend::cpu
diff --git a/runtime/onert/backend/cpu/KernelGenerator.h b/runtime/onert/backend/cpu/KernelGenerator.h
index 468d58d0da5..f8498afd965 100644
--- a/runtime/onert/backend/cpu/KernelGenerator.h
+++ b/runtime/onert/backend/cpu/KernelGenerator.h
@@ -18,9 +18,9 @@
 #define __ONERT_BACKEND_CPU_KERNEL_GENERATOR_H__
 
 #include "ExternalContext.h"
+#include "Tensor.h"
 #include "TensorBuilder.h"
 #include "backend/basic/TensorRegistry.h"
-#include "Tensor.h"
 
 #include <backend/basic/KernelGeneratorBase.h>
 #include <ir/Operands.h>
diff --git a/runtime/onert/backend/cpu/SharedMemoryOperands.test.cc b/runtime/onert/backend/cpu/SharedMemoryOperands.test.cc
index b21f0f15544..a677402f25c 100644
--- a/runtime/onert/backend/cpu/SharedMemoryOperands.test.cc
+++ b/runtime/onert/backend/cpu/SharedMemoryOperands.test.cc
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
-
-#include <memory>
-
 #include "SharedMemoryOperands.h"
 
 #include "ir/Graph.h"
 #include "ir/operation/Permute.h"
-#include "ir/operation/Squeeze.h"
 #include "ir/operation/Reshape.h"
+#include "ir/operation/Squeeze.h"
+
+#include <gtest/gtest.h>
+
+#include <memory>
 
 using namespace onert::backend::cpu;
 using namespace onert::ir;
diff --git a/runtime/onert/backend/cpu/ops/AddNLayer.cc b/runtime/onert/backend/cpu/ops/AddNLayer.cc
index 5d9985c3ffb..987815124af 100644
--- a/runtime/onert/backend/cpu/ops/AddNLayer.cc
+++ b/runtime/onert/backend/cpu/ops/AddNLayer.cc
@@ -18,9 +18,10 @@
 
 #include "OperationUtils.h"
 
-#include <cker/operation/AddN.h>
 #include <assert.h>
 
+#include <cker/operation/AddN.h>
+
 namespace onert::backend::cpu::ops
 {
 
diff --git a/runtime/onert/backend/cpu/ops/AddNLayer.h b/runtime/onert/backend/cpu/ops/AddNLayer.h
index a8c14b18ab8..e7a2c79bea4 100644
--- a/runtime/onert/backend/cpu/ops/AddNLayer.h
+++ b/runtime/onert/backend/cpu/ops/AddNLayer.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_CPU_OPS_ADDNLAYER_H__
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/ArgMinMaxLayer.cc b/runtime/onert/backend/cpu/ops/ArgMinMaxLayer.cc
index 68191ab35f1..bfdfb5f7669 100644
--- a/runtime/onert/backend/cpu/ops/ArgMinMaxLayer.cc
+++ b/runtime/onert/backend/cpu/ops/ArgMinMaxLayer.cc
@@ -18,9 +18,10 @@
 
 #include "OperationUtils.h"
 
-#include <cker/operation/ArgMinMax.h>
 #include <assert.h>
 
+#include <cker/operation/ArgMinMax.h>
+
 namespace onert::backend::cpu::ops
 {
 namespace
diff --git a/runtime/onert/backend/cpu/ops/ArgMinMaxLayer.h b/runtime/onert/backend/cpu/ops/ArgMinMaxLayer.h
index 250db4e78b9..c6155807bc3 100644
--- a/runtime/onert/backend/cpu/ops/ArgMinMaxLayer.h
+++ b/runtime/onert/backend/cpu/ops/ArgMinMaxLayer.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_CPU_OPS_ARGMINMAXLAYER_H__
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/BatchMatMulLayer.h b/runtime/onert/backend/cpu/ops/BatchMatMulLayer.h
index f1bb79673ca..1aa32538c63 100644
--- a/runtime/onert/backend/cpu/ops/BatchMatMulLayer.h
+++ b/runtime/onert/backend/cpu/ops/BatchMatMulLayer.h
@@ -17,9 +17,9 @@
 #ifndef __ONERT_BACKEND_CPU_OPS_BATCH_MATMUL_LAYER_H__
 #define __ONERT_BACKEND_CPU_OPS_BATCH_MATMUL_LAYER_H__
 
-#include <backend/IPortableTensor.h>
 #include "OperationUtils.h"
 
+#include <backend/IPortableTensor.h>
 #include <exec/IFunction.h>
 
 namespace nnfw::cker
diff --git a/runtime/onert/backend/cpu/ops/BatchToSpaceNDLayer.h b/runtime/onert/backend/cpu/ops/BatchToSpaceNDLayer.h
index f5102011480..3c5eb25abfe 100644
--- a/runtime/onert/backend/cpu/ops/BatchToSpaceNDLayer.h
+++ b/runtime/onert/backend/cpu/ops/BatchToSpaceNDLayer.h
@@ -17,9 +17,9 @@
 #ifndef __ONERT_BACKEND_CPU_OPS_BATCHTOSPACEND_LAYER_H__
 #define __ONERT_BACKEND_CPU_OPS_BATCHTOSPACEND_LAYER_H__
 
-#include <backend/IPortableTensor.h>
 #include "OperationUtils.h"
 
+#include <backend/IPortableTensor.h>
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/BinaryArithmeticLayer.h b/runtime/onert/backend/cpu/ops/BinaryArithmeticLayer.h
index 3f655e3c898..d84189f277e 100644
--- a/runtime/onert/backend/cpu/ops/BinaryArithmeticLayer.h
+++ b/runtime/onert/backend/cpu/ops/BinaryArithmeticLayer.h
@@ -17,9 +17,9 @@
 #ifndef __ONERT_BACKEND_CPU_OPS_BINARYARITHMETICLAYER_H__
 #define __ONERT_BACKEND_CPU_OPS_BINARYARITHMETICLAYER_H__
 
-#include <backend/IPortableTensor.h>
 #include "OperationUtils.h"
 
+#include <backend/IPortableTensor.h>
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/BroadcastToLayer.h b/runtime/onert/backend/cpu/ops/BroadcastToLayer.h
index 144052bf8ff..270cc5f7090 100644
--- a/runtime/onert/backend/cpu/ops/BroadcastToLayer.h
+++ b/runtime/onert/backend/cpu/ops/BroadcastToLayer.h
@@ -17,9 +17,9 @@
 #ifndef __ONERT_BACKEND_CPU_OPS_BROADCASTLAYER_H__
 #define __ONERT_BACKEND_CPU_OPS_BROADCASTLAYER_H__
 
-#include <backend/IPortableTensor.h>
 #include "OperationUtils.h"
 
+#include <backend/IPortableTensor.h>
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/CompareLayer.cc b/runtime/onert/backend/cpu/ops/CompareLayer.cc
index 0945b21cf77..9b432f0b2da 100644
--- a/runtime/onert/backend/cpu/ops/CompareLayer.cc
+++ b/runtime/onert/backend/cpu/ops/CompareLayer.cc
@@ -18,6 +18,7 @@
 #include "OperationUtils.h"
 
 #include <assert.h>
+
 #include <cker/operation/Comparison.h>
 using namespace nnfw::cker;
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/CompareLayer.h b/runtime/onert/backend/cpu/ops/CompareLayer.h
index 3f440e6c727..4d6121cb9fe 100644
--- a/runtime/onert/backend/cpu/ops/CompareLayer.h
+++ b/runtime/onert/backend/cpu/ops/CompareLayer.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_CPU_OPS_COMPARELAYER_H__
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
 #include <ir/operation/Comparison.h>
 
diff --git a/runtime/onert/backend/cpu/ops/ConcatLayer.h b/runtime/onert/backend/cpu/ops/ConcatLayer.h
index 37cbf0a9071..bcf47c5f176 100644
--- a/runtime/onert/backend/cpu/ops/ConcatLayer.h
+++ b/runtime/onert/backend/cpu/ops/ConcatLayer.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_CPU_OPS_CONCATLAYER_H__
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/ConvolutionLayer.cc b/runtime/onert/backend/cpu/ops/ConvolutionLayer.cc
index b9862002733..bdc1e764cf6 100644
--- a/runtime/onert/backend/cpu/ops/ConvolutionLayer.cc
+++ b/runtime/onert/backend/cpu/ops/ConvolutionLayer.cc
@@ -15,11 +15,12 @@
  */
 
 #include "ConvolutionLayer.h"
-#include "OperationUtils.h"
-#include "cker/PortableTensorUtils.h"
 
 #include "../Tensor.h"
+#include "OperationUtils.h"
 #include "ir/Padding.h"
+
+#include "cker/PortableTensorUtils.h"
 #include <cker/operation/Conv.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/ConvolutionLayer.h b/runtime/onert/backend/cpu/ops/ConvolutionLayer.h
index 62a879c534f..86db78aa5ee 100644
--- a/runtime/onert/backend/cpu/ops/ConvolutionLayer.h
+++ b/runtime/onert/backend/cpu/ops/ConvolutionLayer.h
@@ -17,10 +17,11 @@
 #ifndef __ONERT_BACKEND_CPU_OPS_CONVOLUTIONLAYER_H__
 #define __ONERT_BACKEND_CPU_OPS_CONVOLUTIONLAYER_H__
 
-#include <backend/IPortableTensor.h>
 #include "OperationUtils.h"
 
+#include <backend/IPortableTensor.h>
 #include <exec/IFunction.h>
+
 #include <functional>
 #include <memory>
 
diff --git a/runtime/onert/backend/cpu/ops/DepthToSpaceLayer.h b/runtime/onert/backend/cpu/ops/DepthToSpaceLayer.h
index e31891fa803..3a3d826a12f 100644
--- a/runtime/onert/backend/cpu/ops/DepthToSpaceLayer.h
+++ b/runtime/onert/backend/cpu/ops/DepthToSpaceLayer.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_CPU_OPS_DEPTH_TO_SPACE_LAYER_H__
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/DepthwiseConvolutionLayer.h b/runtime/onert/backend/cpu/ops/DepthwiseConvolutionLayer.h
index e6c27a90064..d9909bcf1cc 100644
--- a/runtime/onert/backend/cpu/ops/DepthwiseConvolutionLayer.h
+++ b/runtime/onert/backend/cpu/ops/DepthwiseConvolutionLayer.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_KERNEL_CPU_DEPTHWISECONVOLUTIONLAYER_H__
 #define __ONERT_KERNEL_CPU_DEPTHWISECONVOLUTIONLAYER_H__
 
-#include <backend/IPortableTensor.h>
-#include "OperationUtils.h"
 #include "../ExternalContext.h"
+#include "OperationUtils.h"
 
+#include <backend/IPortableTensor.h>
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/DetectionPostProcessLayer.cc b/runtime/onert/backend/cpu/ops/DetectionPostProcessLayer.cc
index fbbdde6a905..7e09d272d58 100644
--- a/runtime/onert/backend/cpu/ops/DetectionPostProcessLayer.cc
+++ b/runtime/onert/backend/cpu/ops/DetectionPostProcessLayer.cc
@@ -18,9 +18,9 @@
 
 #include "ndarray/Array.h"
 
+#include <cmath>
 #include <numeric>
 #include <utility>
-#include <cmath>
 
 namespace onert::backend::cpu::ops
 {
diff --git a/runtime/onert/backend/cpu/ops/DetectionPostProcessLayer.h b/runtime/onert/backend/cpu/ops/DetectionPostProcessLayer.h
index b5696076b23..b6571001af6 100644
--- a/runtime/onert/backend/cpu/ops/DetectionPostProcessLayer.h
+++ b/runtime/onert/backend/cpu/ops/DetectionPostProcessLayer.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_BACKEND_CPU_OPS_DPP_H__
 #define __ONERT_BACKEND_CPU_OPS_DPP_H__
 
-#include <exec/IFunction.h>
-
 #include "OperationUtils.h"
 
+#include <exec/IFunction.h>
+
 namespace onert::backend::cpu::ops
 {
 
diff --git a/runtime/onert/backend/cpu/ops/DynamicUpdateSlice.cc b/runtime/onert/backend/cpu/ops/DynamicUpdateSlice.cc
index ae7993f0752..9ee5ae1f62f 100644
--- a/runtime/onert/backend/cpu/ops/DynamicUpdateSlice.cc
+++ b/runtime/onert/backend/cpu/ops/DynamicUpdateSlice.cc
@@ -15,6 +15,7 @@
  */
 
 #include "DynamicUpdateSlice.h"
+
 #include "OperationUtils.h"
 
 #include <cker/operation/DynamicUpdateSlice.h>
diff --git a/runtime/onert/backend/cpu/ops/DynamicUpdateSlice.h b/runtime/onert/backend/cpu/ops/DynamicUpdateSlice.h
index a79b9810be1..f10c8745efc 100644
--- a/runtime/onert/backend/cpu/ops/DynamicUpdateSlice.h
+++ b/runtime/onert/backend/cpu/ops/DynamicUpdateSlice.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_CPU_OPS_DYNAMIC_UPDATE_SLICE_LAYER_H__
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
 #include <ir/operation/DynamicUpdateSlice.h>
 
diff --git a/runtime/onert/backend/cpu/ops/ElementwiseActivationLayer.cc b/runtime/onert/backend/cpu/ops/ElementwiseActivationLayer.cc
index 6c44e4c499d..8c8c2ab9fa0 100644
--- a/runtime/onert/backend/cpu/ops/ElementwiseActivationLayer.cc
+++ b/runtime/onert/backend/cpu/ops/ElementwiseActivationLayer.cc
@@ -19,12 +19,12 @@
 #include "OperationUtils.h"
 
 #include <cker/operation/ELU.h>
+#include <cker/operation/GELU.h>
 #include <cker/operation/LeakyReLU.h>
 #include <cker/operation/Logistic.h>
 #include <cker/operation/ReLU.h>
 #include <cker/operation/ReLU6.h>
 #include <cker/operation/Tanh.h>
-#include <cker/operation/GELU.h>
 
 namespace onert::backend::cpu::ops
 {
diff --git a/runtime/onert/backend/cpu/ops/ElementwiseActivationLayer.h b/runtime/onert/backend/cpu/ops/ElementwiseActivationLayer.h
index efde33ba7d0..e553472b4e0 100644
--- a/runtime/onert/backend/cpu/ops/ElementwiseActivationLayer.h
+++ b/runtime/onert/backend/cpu/ops/ElementwiseActivationLayer.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_CPU_OPS_ElementwiseActivationLAYER_H__
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/ElementwiseBinaryLayer.h b/runtime/onert/backend/cpu/ops/ElementwiseBinaryLayer.h
index ebdd946a4cb..c695321691d 100644
--- a/runtime/onert/backend/cpu/ops/ElementwiseBinaryLayer.h
+++ b/runtime/onert/backend/cpu/ops/ElementwiseBinaryLayer.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_CPU_OPS_ELEMENTWISEBINARYLAYER_H__
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/ElementwiseUnaryLayer.h b/runtime/onert/backend/cpu/ops/ElementwiseUnaryLayer.h
index a560c5807e4..d4788cafa51 100644
--- a/runtime/onert/backend/cpu/ops/ElementwiseUnaryLayer.h
+++ b/runtime/onert/backend/cpu/ops/ElementwiseUnaryLayer.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_CPU_OPS_ELEMENTWISEUNARYLAYER_H__
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/ExpandDimsLayer.h b/runtime/onert/backend/cpu/ops/ExpandDimsLayer.h
index df49eddd4f2..8e6d792ba87 100644
--- a/runtime/onert/backend/cpu/ops/ExpandDimsLayer.h
+++ b/runtime/onert/backend/cpu/ops/ExpandDimsLayer.h
@@ -18,7 +18,6 @@
 #define ExpandDi__ONERT_BACKEND_CPU_OPS_EXPANDDIMS_LAYER_H__ms
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/FillLayer.h b/runtime/onert/backend/cpu/ops/FillLayer.h
index 732d3658de9..f4ee427ea79 100644
--- a/runtime/onert/backend/cpu/ops/FillLayer.h
+++ b/runtime/onert/backend/cpu/ops/FillLayer.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_CPU_OPS_FILLLAYER_H__
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/FullyConnectedLayer.cc b/runtime/onert/backend/cpu/ops/FullyConnectedLayer.cc
index 4f7e6bdca78..28259caa03d 100644
--- a/runtime/onert/backend/cpu/ops/FullyConnectedLayer.cc
+++ b/runtime/onert/backend/cpu/ops/FullyConnectedLayer.cc
@@ -16,13 +16,14 @@
 
 #include "FullyConnectedLayer.h"
 
+#include "../Tensor.h"
 #include "GGMLHelper.h"
 
-#include "../Tensor.h"
-#include <cker/operation/FullyConnected.h>
-#include <cker/TensorUtils.h>
 #include <misc/polymorphic_downcast.h>
 
+#include <cker/TensorUtils.h>
+#include <cker/operation/FullyConnected.h>
+
 namespace onert::backend::cpu::ops
 {
 
diff --git a/runtime/onert/backend/cpu/ops/FullyConnectedLayer.h b/runtime/onert/backend/cpu/ops/FullyConnectedLayer.h
index 912b946a8bb..178b3f02bfe 100644
--- a/runtime/onert/backend/cpu/ops/FullyConnectedLayer.h
+++ b/runtime/onert/backend/cpu/ops/FullyConnectedLayer.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_BACKEND_CPU_OPS_FULLYCONNECTEDLAYER_H__
 #define __ONERT_BACKEND_CPU_OPS_FULLYCONNECTEDLAYER_H__
 
-#include <backend/IPortableTensor.h>
 #include "../ExternalContext.h"
 #include "OperationUtils.h"
 
+#include <backend/IPortableTensor.h>
 #include <exec/IFunction.h>
 
 namespace nnfw::cker
diff --git a/runtime/onert/backend/cpu/ops/FusedBatchNormLayer.h b/runtime/onert/backend/cpu/ops/FusedBatchNormLayer.h
index 0f62b23ffc6..adc3cdcb8ff 100644
--- a/runtime/onert/backend/cpu/ops/FusedBatchNormLayer.h
+++ b/runtime/onert/backend/cpu/ops/FusedBatchNormLayer.h
@@ -17,10 +17,11 @@
 #ifndef __ONERT_BACKEND_CPU_OPS_FUSEDBATCHNORM_LAYER_H__
 #define __ONERT_BACKEND_CPU_OPS_FUSEDBATCHNORM_LAYER_H__
 
-#include <backend/IPortableTensor.h>
 #include "OperationUtils.h"
 
+#include <backend/IPortableTensor.h>
 #include <exec/IFunction.h>
+
 #include <functional>
 #include <memory>
 
diff --git a/runtime/onert/backend/cpu/ops/GatherLayer.cc b/runtime/onert/backend/cpu/ops/GatherLayer.cc
index 18a3464447a..2d8c0dbb930 100644
--- a/runtime/onert/backend/cpu/ops/GatherLayer.cc
+++ b/runtime/onert/backend/cpu/ops/GatherLayer.cc
@@ -16,8 +16,8 @@
 
 #include "GatherLayer.h"
 
-#include "OperationUtils.h"
 #include "GGMLHelper.h"
+#include "OperationUtils.h"
 
 #include <cker/operation/Gather.h>
 
diff --git a/runtime/onert/backend/cpu/ops/GatherLayer.h b/runtime/onert/backend/cpu/ops/GatherLayer.h
index 0761b0a8b5c..ce1fd6655f0 100644
--- a/runtime/onert/backend/cpu/ops/GatherLayer.h
+++ b/runtime/onert/backend/cpu/ops/GatherLayer.h
@@ -20,7 +20,6 @@
 #include "../ExternalContext.h"
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/L2NormLayer.cc b/runtime/onert/backend/cpu/ops/L2NormLayer.cc
index 0ff9b24f390..0840bc58e3e 100644
--- a/runtime/onert/backend/cpu/ops/L2NormLayer.cc
+++ b/runtime/onert/backend/cpu/ops/L2NormLayer.cc
@@ -18,8 +18,8 @@
 
 #include "OperationUtils.h"
 
-#include <cker/operation/L2Normalize.h>
 #include <cker/Types.h>
+#include <cker/operation/L2Normalize.h>
 
 namespace onert::backend::cpu::ops
 {
diff --git a/runtime/onert/backend/cpu/ops/L2NormLayer.h b/runtime/onert/backend/cpu/ops/L2NormLayer.h
index 51d31476501..a4fd05a4078 100644
--- a/runtime/onert/backend/cpu/ops/L2NormLayer.h
+++ b/runtime/onert/backend/cpu/ops/L2NormLayer.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_CPU_OPS_L2NORM_LAYER_H__
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/LSTMLayer.h b/runtime/onert/backend/cpu/ops/LSTMLayer.h
index c6a44bec7bf..332feb0613f 100644
--- a/runtime/onert/backend/cpu/ops/LSTMLayer.h
+++ b/runtime/onert/backend/cpu/ops/LSTMLayer.h
@@ -17,11 +17,12 @@
 #ifndef __ONERT_BACKEND_CPU_OPS_LSTMLAYER_H__
 #define __ONERT_BACKEND_CPU_OPS_LSTMLAYER_H__
 
-#include <backend/IPortableTensor.h>
 #include "OperationUtils.h"
+
+#include <backend/IPortableTensor.h>
+#include <exec/IFunction.h>
 #include <ir/InternalType.h>
 #include <ir/operation/LSTM.h>
-#include <exec/IFunction.h>
 
 namespace nnfw::cker
 {
diff --git a/runtime/onert/backend/cpu/ops/MeanLayer.h b/runtime/onert/backend/cpu/ops/MeanLayer.h
index 0ec26d78061..0ef3bb49d7e 100644
--- a/runtime/onert/backend/cpu/ops/MeanLayer.h
+++ b/runtime/onert/backend/cpu/ops/MeanLayer.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_CPU_OPS_MEANLAYER_H__
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/OneHotLayer.h b/runtime/onert/backend/cpu/ops/OneHotLayer.h
index e286bb6f2f5..3ee686be8ff 100644
--- a/runtime/onert/backend/cpu/ops/OneHotLayer.h
+++ b/runtime/onert/backend/cpu/ops/OneHotLayer.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_CPU_OPS_ONEHOTLAYER_H__
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/PackLayer.h b/runtime/onert/backend/cpu/ops/PackLayer.h
index 9aa98217757..c085ffba99f 100644
--- a/runtime/onert/backend/cpu/ops/PackLayer.h
+++ b/runtime/onert/backend/cpu/ops/PackLayer.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_CPU_OPS_PACKLAYER_H__
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/PadLayer.h b/runtime/onert/backend/cpu/ops/PadLayer.h
index c0049dceb00..1968c4aa171 100644
--- a/runtime/onert/backend/cpu/ops/PadLayer.h
+++ b/runtime/onert/backend/cpu/ops/PadLayer.h
@@ -17,9 +17,9 @@
 #ifndef __ONERT_BACKEND_CPU_OPS_PADLAYER_H__
 #define __ONERT_BACKEND_CPU_OPS_PADLAYER_H__
 
-#include <backend/IPortableTensor.h>
 #include "OperationUtils.h"
 
+#include <backend/IPortableTensor.h>
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/PoolLayer.h b/runtime/onert/backend/cpu/ops/PoolLayer.h
index 6d63ea059e2..e18c5c1fa80 100644
--- a/runtime/onert/backend/cpu/ops/PoolLayer.h
+++ b/runtime/onert/backend/cpu/ops/PoolLayer.h
@@ -17,9 +17,9 @@
 #ifndef __ONERT_BACKEND_CPU_OPS_POOLLAYER_H__
 #define __ONERT_BACKEND_CPU_OPS_POOLLAYER_H__
 
-#include <backend/IPortableTensor.h>
 #include "OperationUtils.h"
 
+#include <backend/IPortableTensor.h>
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/PowLayer.cc b/runtime/onert/backend/cpu/ops/PowLayer.cc
index fb78bcfe61d..f8672883d03 100644
--- a/runtime/onert/backend/cpu/ops/PowLayer.cc
+++ b/runtime/onert/backend/cpu/ops/PowLayer.cc
@@ -16,8 +16,8 @@
 
 #include "PowLayer.h"
 
-#include <cker/operation/Pow.h>
 #include <cker/operation/BinaryArithmeticOps.h>
+#include <cker/operation/Pow.h>
 
 namespace onert::backend::cpu::ops
 {
diff --git a/runtime/onert/backend/cpu/ops/PowLayer.h b/runtime/onert/backend/cpu/ops/PowLayer.h
index d282a479959..c892f186341 100644
--- a/runtime/onert/backend/cpu/ops/PowLayer.h
+++ b/runtime/onert/backend/cpu/ops/PowLayer.h
@@ -17,9 +17,9 @@
 #ifndef __ONERT_BACKEND_CPU_OPS_POWLAYER_H__
 #define __ONERT_BACKEND_CPU_OPS_POWLAYER_H__
 
-#include <backend/IPortableTensor.h>
 #include "OperationUtils.h"
 
+#include <backend/IPortableTensor.h>
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/QuantizeLayer.cc b/runtime/onert/backend/cpu/ops/QuantizeLayer.cc
index e99f3c8ad52..9281f6ab325 100644
--- a/runtime/onert/backend/cpu/ops/QuantizeLayer.cc
+++ b/runtime/onert/backend/cpu/ops/QuantizeLayer.cc
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-#include "OperationUtils.h"
 #include "QuantizeLayer.h"
 
+#include "OperationUtils.h"
+
 #include <cker/operation/Dequantize.h>
 #include <cker/operation/Erf.h>
 #include <cker/operation/Exp.h>
diff --git a/runtime/onert/backend/cpu/ops/QuantizeLayer.h b/runtime/onert/backend/cpu/ops/QuantizeLayer.h
index ef3f79a997a..eb89083ca80 100644
--- a/runtime/onert/backend/cpu/ops/QuantizeLayer.h
+++ b/runtime/onert/backend/cpu/ops/QuantizeLayer.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_CPU_OPS_QUANTIZELAYER_H__
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/RangeLayer.h b/runtime/onert/backend/cpu/ops/RangeLayer.h
index 5ab4063dd9f..e217e9bea86 100644
--- a/runtime/onert/backend/cpu/ops/RangeLayer.h
+++ b/runtime/onert/backend/cpu/ops/RangeLayer.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_CPU_OPS_RANGELAYER_H__
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/RankLayer.h b/runtime/onert/backend/cpu/ops/RankLayer.h
index d7ffb1e8cf7..ed10e275a41 100644
--- a/runtime/onert/backend/cpu/ops/RankLayer.h
+++ b/runtime/onert/backend/cpu/ops/RankLayer.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_CPU_OPS_RANKLAYER_H__
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/ReduceLayer.h b/runtime/onert/backend/cpu/ops/ReduceLayer.h
index 1fed24c0437..b299d349e24 100644
--- a/runtime/onert/backend/cpu/ops/ReduceLayer.h
+++ b/runtime/onert/backend/cpu/ops/ReduceLayer.h
@@ -17,11 +17,11 @@
 #ifndef __ONERT_BACKEND_CPU_OPS_REDUCESUMLAYER_H__
 #define __ONERT_BACKEND_CPU_OPS_REDUCESUMLAYER_H__
 
-#include "cker/neon/neon_check.h"
-
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
+
+#include "cker/neon/neon_check.h"
+
 #include <memory>
 
 namespace nnfw::cker
diff --git a/runtime/onert/backend/cpu/ops/ReshapeLayer.h b/runtime/onert/backend/cpu/ops/ReshapeLayer.h
index c61fc18d8e9..938b9f467ea 100644
--- a/runtime/onert/backend/cpu/ops/ReshapeLayer.h
+++ b/runtime/onert/backend/cpu/ops/ReshapeLayer.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_CPU_OPS_RESHAPELAYER_H__
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/ResizeBilinearLayer.cc b/runtime/onert/backend/cpu/ops/ResizeBilinearLayer.cc
index 9b46d049b7a..21f8d93336f 100644
--- a/runtime/onert/backend/cpu/ops/ResizeBilinearLayer.cc
+++ b/runtime/onert/backend/cpu/ops/ResizeBilinearLayer.cc
@@ -13,8 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "OperationUtils.h"
 #include "ResizeBilinearLayer.h"
+
+#include "OperationUtils.h"
+
 #include "cker/operation/ResizeBilinear.h"
 #include <cker/Types.h>
 
diff --git a/runtime/onert/backend/cpu/ops/ResizeBilinearLayer.h b/runtime/onert/backend/cpu/ops/ResizeBilinearLayer.h
index cc20845f2ee..0a44ad3ef29 100644
--- a/runtime/onert/backend/cpu/ops/ResizeBilinearLayer.h
+++ b/runtime/onert/backend/cpu/ops/ResizeBilinearLayer.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_CPU_OPS_RESIZEBILINEAR_H__
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/ReverseLayer.h b/runtime/onert/backend/cpu/ops/ReverseLayer.h
index 6af20016e18..90b64d7adb1 100644
--- a/runtime/onert/backend/cpu/ops/ReverseLayer.h
+++ b/runtime/onert/backend/cpu/ops/ReverseLayer.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_CPU_OPS_REVERSE_LAYER_H__
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/RmsNormLayer.cc b/runtime/onert/backend/cpu/ops/RmsNormLayer.cc
index a8dad9b59df..a9ef0ee8569 100644
--- a/runtime/onert/backend/cpu/ops/RmsNormLayer.cc
+++ b/runtime/onert/backend/cpu/ops/RmsNormLayer.cc
@@ -18,8 +18,8 @@
 
 #include "OperationUtils.h"
 
-#include <cker/operation/RmsNorm.h>
 #include <cker/Types.h>
+#include <cker/operation/RmsNorm.h>
 
 namespace onert::backend::cpu::ops
 {
diff --git a/runtime/onert/backend/cpu/ops/RmsNormLayer.h b/runtime/onert/backend/cpu/ops/RmsNormLayer.h
index 8e570299044..e4209d80351 100644
--- a/runtime/onert/backend/cpu/ops/RmsNormLayer.h
+++ b/runtime/onert/backend/cpu/ops/RmsNormLayer.h
@@ -17,8 +17,9 @@
 #ifndef __ONERT_BACKEND_CPU_OPS_RMSNORM_LAYER_H__
 #define __ONERT_BACKEND_CPU_OPS_RMSNORM_LAYER_H__
 
-#include <backend/IPortableTensor.h>
 #include "OperationUtils.h"
+
+#include <backend/IPortableTensor.h>
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/RoPELayer.h b/runtime/onert/backend/cpu/ops/RoPELayer.h
index ee3a6fbb51a..0536347b3f9 100644
--- a/runtime/onert/backend/cpu/ops/RoPELayer.h
+++ b/runtime/onert/backend/cpu/ops/RoPELayer.h
@@ -17,9 +17,9 @@
 #ifndef __ONERT_BACKEND_CPU_OPS_ROPE_LAYER_H__
 #define __ONERT_BACKEND_CPU_OPS_ROPE_LAYER_H__
 
-#include <backend/IPortableTensor.h>
 #include "OperationUtils.h"
 
+#include <backend/IPortableTensor.h>
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/SelectLayer.h b/runtime/onert/backend/cpu/ops/SelectLayer.h
index 180ff1bf1d9..5f18dc47078 100644
--- a/runtime/onert/backend/cpu/ops/SelectLayer.h
+++ b/runtime/onert/backend/cpu/ops/SelectLayer.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_CPU_OPS_SELECT_LAYER_H__
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/ShapeLayer.h b/runtime/onert/backend/cpu/ops/ShapeLayer.h
index 37bb1503c7d..81935c5dca9 100644
--- a/runtime/onert/backend/cpu/ops/ShapeLayer.h
+++ b/runtime/onert/backend/cpu/ops/ShapeLayer.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_CPU_OPS_SHAPELAYER_H__
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/SliceLayer.h b/runtime/onert/backend/cpu/ops/SliceLayer.h
index edc04253fa7..01dbf30c038 100644
--- a/runtime/onert/backend/cpu/ops/SliceLayer.h
+++ b/runtime/onert/backend/cpu/ops/SliceLayer.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_CPU_OPS_SLICELAYER_H__
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/SoftMaxLayer.h b/runtime/onert/backend/cpu/ops/SoftMaxLayer.h
index 32a789c7b02..f248a13c01e 100644
--- a/runtime/onert/backend/cpu/ops/SoftMaxLayer.h
+++ b/runtime/onert/backend/cpu/ops/SoftMaxLayer.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_CPU_OPS_SOFTMAXLAYER_H__
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/SpaceToBatchNDLayer.h b/runtime/onert/backend/cpu/ops/SpaceToBatchNDLayer.h
index 2eae8ef8d78..ab7f251011a 100644
--- a/runtime/onert/backend/cpu/ops/SpaceToBatchNDLayer.h
+++ b/runtime/onert/backend/cpu/ops/SpaceToBatchNDLayer.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_CPU_OPS_SPACE_TO_BATCH_ND_LAYER_H__
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/SpaceToDepthLayer.h b/runtime/onert/backend/cpu/ops/SpaceToDepthLayer.h
index 59f9b3fa590..aea139da959 100644
--- a/runtime/onert/backend/cpu/ops/SpaceToDepthLayer.h
+++ b/runtime/onert/backend/cpu/ops/SpaceToDepthLayer.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_CPU_OPS_SPACE_TO_DEPTH_LAYER_H__
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/SplitLayer.h b/runtime/onert/backend/cpu/ops/SplitLayer.h
index 94c92efefa4..9e096d16a22 100644
--- a/runtime/onert/backend/cpu/ops/SplitLayer.h
+++ b/runtime/onert/backend/cpu/ops/SplitLayer.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_CPU_OPS_SPLITLAYER_H__
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/SplitVLayer.h b/runtime/onert/backend/cpu/ops/SplitVLayer.h
index 1e7a0421612..832f276d90f 100644
--- a/runtime/onert/backend/cpu/ops/SplitVLayer.h
+++ b/runtime/onert/backend/cpu/ops/SplitVLayer.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_CPU_OPS_SPLIT_V_LAYER_H__
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/SquaredDiffLayer.h b/runtime/onert/backend/cpu/ops/SquaredDiffLayer.h
index a8c9dd6a55e..d39e6941455 100644
--- a/runtime/onert/backend/cpu/ops/SquaredDiffLayer.h
+++ b/runtime/onert/backend/cpu/ops/SquaredDiffLayer.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_CPU_OPS_SQDIFFLAYER_H__
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/StatelessRandomUniformLayer.h b/runtime/onert/backend/cpu/ops/StatelessRandomUniformLayer.h
index ae1c3700230..0164df54cb4 100644
--- a/runtime/onert/backend/cpu/ops/StatelessRandomUniformLayer.h
+++ b/runtime/onert/backend/cpu/ops/StatelessRandomUniformLayer.h
@@ -17,9 +17,9 @@
 #ifndef __ONERT_BACKEND_CPU_OPS_STATELESS_RANDOM_UNIFORM_H__
 #define __ONERT_BACKEND_CPU_OPS_STATELESS_RANDOM_UNIFORM_H__
 
-#include <backend/IPortableTensor.h>
 #include "OperationUtils.h"
 
+#include <backend/IPortableTensor.h>
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/StridedSliceLayer.h b/runtime/onert/backend/cpu/ops/StridedSliceLayer.h
index 9619a5f268a..63168aaff9a 100644
--- a/runtime/onert/backend/cpu/ops/StridedSliceLayer.h
+++ b/runtime/onert/backend/cpu/ops/StridedSliceLayer.h
@@ -17,9 +17,9 @@
 #ifndef __ONERT_BACKEND_CPU_OPS_STRIDEDSLICELAYER_H__
 #define __ONERT_BACKEND_CPU_OPS_STRIDEDSLICELAYER_H__
 
-#include <backend/IPortableTensor.h>
 #include "OperationUtils.h"
 
+#include <backend/IPortableTensor.h>
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/TileLayer.h b/runtime/onert/backend/cpu/ops/TileLayer.h
index 40376dc4a5f..1a6896ad098 100644
--- a/runtime/onert/backend/cpu/ops/TileLayer.h
+++ b/runtime/onert/backend/cpu/ops/TileLayer.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_CPU_OPS_TILELAYER_H__
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/TopKV2Layer.h b/runtime/onert/backend/cpu/ops/TopKV2Layer.h
index 58191d0051c..1768f0fcfad 100644
--- a/runtime/onert/backend/cpu/ops/TopKV2Layer.h
+++ b/runtime/onert/backend/cpu/ops/TopKV2Layer.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_CPU_OPS_TOPK_V2_LAYER_H__
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/TransposeLayer.cc b/runtime/onert/backend/cpu/ops/TransposeLayer.cc
index a2592cdcbb8..aab5d938e28 100644
--- a/runtime/onert/backend/cpu/ops/TransposeLayer.cc
+++ b/runtime/onert/backend/cpu/ops/TransposeLayer.cc
@@ -19,6 +19,7 @@
 #include "OperationUtils.h"
 
 #include <cker/operation/Transpose.h>
+
 #include <numeric>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/TransposeLayer.h b/runtime/onert/backend/cpu/ops/TransposeLayer.h
index 289d3bf5d49..360aab26d97 100644
--- a/runtime/onert/backend/cpu/ops/TransposeLayer.h
+++ b/runtime/onert/backend/cpu/ops/TransposeLayer.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_CPU_OPS_TRANSPOSELAYER_H__
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/cpu/ops/UnpackLayer.h b/runtime/onert/backend/cpu/ops/UnpackLayer.h
index 6609bbdac37..c71de81b4e3 100644
--- a/runtime/onert/backend/cpu/ops/UnpackLayer.h
+++ b/runtime/onert/backend/cpu/ops/UnpackLayer.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_CPU_OPS_UNPACKLAYER_H__
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/IFunction.h>
 
 namespace onert::backend::cpu::ops
diff --git a/runtime/onert/backend/ruy/BackendContext.cc b/runtime/onert/backend/ruy/BackendContext.cc
index 52b0da2cba9..8463dc9ed95 100644
--- a/runtime/onert/backend/ruy/BackendContext.cc
+++ b/runtime/onert/backend/ruy/BackendContext.cc
@@ -16,13 +16,13 @@
 
 #include "BackendContext.h"
 
-#include "TensorBuilder.h"
 #include "KernelGenerator.h"
-#include "util/logging.h"
+#include "TensorBuilder.h"
+#include "backend/basic/BackendContextHelpers.h"
 #include "ir/Index.h"
 #include "ir/OperandIndexMap.h"
 #include "ir/OperandIndexSequence.h"
-#include "backend/basic/BackendContextHelpers.h"
+#include "util/logging.h"
 
 namespace onert::backend::ruy
 {
diff --git a/runtime/onert/backend/ruy/Config.h b/runtime/onert/backend/ruy/Config.h
index 657ee20e283..f7a50eaafdd 100644
--- a/runtime/onert/backend/ruy/Config.h
+++ b/runtime/onert/backend/ruy/Config.h
@@ -18,9 +18,10 @@
 #define __ONERT_BACKEND_RUY_CONFIG_H__
 
 #include <backend/IConfig.h>
-#include <memory>
 #include <util/ITimer.h>
 
+#include <memory>
+
 namespace onert::backend::ruy
 {
 
diff --git a/runtime/onert/backend/ruy/ExternalContext.h b/runtime/onert/backend/ruy/ExternalContext.h
index 2ffbf7548fb..2cf708355fc 100644
--- a/runtime/onert/backend/ruy/ExternalContext.h
+++ b/runtime/onert/backend/ruy/ExternalContext.h
@@ -18,6 +18,7 @@
 #define __ONERT_BACKEND_RUY_EXTERNAL_CONTEXT_H__
 
 #include <util/ConfigSource.h>
+
 #include <ruy/context.h>
 
 #include <memory>
diff --git a/runtime/onert/backend/ruy/KernelGenerator.cc b/runtime/onert/backend/ruy/KernelGenerator.cc
index 6a209507b4a..fb29adf53e9 100644
--- a/runtime/onert/backend/ruy/KernelGenerator.cc
+++ b/runtime/onert/backend/ruy/KernelGenerator.cc
@@ -21,11 +21,11 @@
 
 #include <backend/Backend.h>
 #include <backend/IConfig.h>
-#include <memory>
+#include <exec/DynamicShapeInferer.h>
 #include <util/Utils.h>
 #include <util/logging.h>
-#include <exec/DynamicShapeInferer.h>
 
+#include <memory>
 #include <stdexcept>
 
 namespace onert::backend::ruy
diff --git a/runtime/onert/backend/ruy/KernelGenerator.h b/runtime/onert/backend/ruy/KernelGenerator.h
index 93466cf2ca7..87a767b11c7 100644
--- a/runtime/onert/backend/ruy/KernelGenerator.h
+++ b/runtime/onert/backend/ruy/KernelGenerator.h
@@ -18,9 +18,9 @@
 #define __ONERT_BACKEND_RUY_KERNEL_GENERATOR_H__
 
 #include "ExternalContext.h"
+#include "Tensor.h"
 #include "TensorBuilder.h"
 #include "backend/basic/TensorRegistry.h"
-#include "Tensor.h"
 
 #include <backend/basic/KernelGeneratorBase.h>
 #include <ir/Operands.h>
diff --git a/runtime/onert/backend/ruy/ops/ConvolutionLayer.h b/runtime/onert/backend/ruy/ops/ConvolutionLayer.h
index 8965c754e61..bd9dc38e118 100644
--- a/runtime/onert/backend/ruy/ops/ConvolutionLayer.h
+++ b/runtime/onert/backend/ruy/ops/ConvolutionLayer.h
@@ -17,12 +17,14 @@
 #ifndef __ONERT_BACKEND_RUY_OPS_CONVOLUTIONLAYER_H__
 #define __ONERT_BACKEND_RUY_OPS_CONVOLUTIONLAYER_H__
 
-#include <backend/IPortableTensor.h>
 #include "../ExternalContext.h"
 #include "OperationUtils.h"
 
-#include <ruy/operation/Conv.h>
+#include <backend/IPortableTensor.h>
 #include <exec/IFunction.h>
+
+#include <ruy/operation/Conv.h>
+
 #include <functional>
 #include <memory>
 
diff --git a/runtime/onert/backend/ruy/ops/FullyConnectedLayer.cc b/runtime/onert/backend/ruy/ops/FullyConnectedLayer.cc
index cddefc4dbf4..e5ea907020f 100644
--- a/runtime/onert/backend/ruy/ops/FullyConnectedLayer.cc
+++ b/runtime/onert/backend/ruy/ops/FullyConnectedLayer.cc
@@ -17,8 +17,9 @@
 #include "FullyConnectedLayer.h"
 
 #include "../Tensor.h"
-#include <ruy/operation/FullyConnected.h>
+
 #include <ruy/TensorUtils.h>
+#include <ruy/operation/FullyConnected.h>
 
 namespace onert::backend::ruy::ops
 {
diff --git a/runtime/onert/backend/ruy/ops/FullyConnectedLayer.h b/runtime/onert/backend/ruy/ops/FullyConnectedLayer.h
index 7de20ef7667..93debd3fad2 100644
--- a/runtime/onert/backend/ruy/ops/FullyConnectedLayer.h
+++ b/runtime/onert/backend/ruy/ops/FullyConnectedLayer.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_BACKEND_RUY_OPS_FULLYCONNECTEDLAYER_H__
 #define __ONERT_BACKEND_RUY_OPS_FULLYCONNECTEDLAYER_H__
 
-#include <backend/IPortableTensor.h>
 #include "../ExternalContext.h"
 #include "OperationUtils.h"
 
+#include <backend/IPortableTensor.h>
 #include <exec/IFunction.h>
 
 namespace onert::backend::ruy::ops
diff --git a/runtime/onert/backend/train/BackendContext.cc b/runtime/onert/backend/train/BackendContext.cc
index 342d6dc98e9..b1c198831db 100644
--- a/runtime/onert/backend/train/BackendContext.cc
+++ b/runtime/onert/backend/train/BackendContext.cc
@@ -16,9 +16,9 @@
 
 #include "BackendContext.h"
 
+#include "KernelGenerator.h"
 #include "TensorBuilder.h"
 #include "TensorPlanner.h"
-#include "KernelGenerator.h"
 #include "ops/BackPropInitializer.h"
 
 #include <backend/basic/train/TrainableBackendContextHelpers.h>
diff --git a/runtime/onert/backend/train/BackendContext.h b/runtime/onert/backend/train/BackendContext.h
index 01218b05644..ab47679a3cf 100644
--- a/runtime/onert/backend/train/BackendContext.h
+++ b/runtime/onert/backend/train/BackendContext.h
@@ -17,12 +17,12 @@
 #ifndef __ONERT_BACKEND_TRAIN_BACKEND_CONTEXT_H__
 #define __ONERT_BACKEND_TRAIN_BACKEND_CONTEXT_H__
 
-#include <backend/train/TrainableBackendContext.h>
-
 #include "ExternalContext.h"
 #include "KernelGenerator.h"
 #include "TensorBuilder.h"
 
+#include <backend/train/TrainableBackendContext.h>
+
 namespace onert::backend::train
 {
 
diff --git a/runtime/onert/backend/train/DisposableTensorIndex.h b/runtime/onert/backend/train/DisposableTensorIndex.h
index 10f2d929336..26d91bdc604 100644
--- a/runtime/onert/backend/train/DisposableTensorIndex.h
+++ b/runtime/onert/backend/train/DisposableTensorIndex.h
@@ -17,12 +17,12 @@
 #ifndef __ONERT_BACKEND_TRAIN_DISPOSABLE_TENSOR_INDEX_H__
 #define __ONERT_BACKEND_TRAIN_DISPOSABLE_TENSOR_INDEX_H__
 
+#include "ir/Index.h"
+
 #include <cassert>
 #include <functional>
 #include <unordered_map>
 
-#include "ir/Index.h"
-
 namespace onert::backend::train
 {
 
diff --git a/runtime/onert/backend/train/KernelGenerator.cc b/runtime/onert/backend/train/KernelGenerator.cc
index 2ac767debcf..0a419750e3d 100644
--- a/runtime/onert/backend/train/KernelGenerator.cc
+++ b/runtime/onert/backend/train/KernelGenerator.cc
@@ -22,10 +22,10 @@
 #include "ops/DepthwiseConvolutionLayer.h"
 #include "ops/ElementwiseActivationLayer.h"
 #include "ops/FullyConnectedLayer.h"
-#include "ops/LossMeanSquaredErrorLayer.h"
+#include "ops/GradientApplier.h"
 #include "ops/LossCategoricalCrossentropyLayer.h"
+#include "ops/LossMeanSquaredErrorLayer.h"
 #include "ops/MeanLayer.h"
-#include "ops/GradientApplier.h"
 #include "ops/PadLayer.h"
 #include "ops/PoolLayer.h"
 #include "ops/ReshapeLayer.h"
@@ -33,10 +33,10 @@
 
 #include <backend/Backend.h>
 #include <backend/IConfig.h>
-#include <memory>
-#include <util/logging.h>
 #include <exec/DynamicShapeInferer.h>
+#include <util/logging.h>
 
+#include <memory>
 #include <stdexcept>
 
 namespace onert::backend::train
diff --git a/runtime/onert/backend/train/KernelGenerator.h b/runtime/onert/backend/train/KernelGenerator.h
index 898991d7b3c..77992c4b0cc 100644
--- a/runtime/onert/backend/train/KernelGenerator.h
+++ b/runtime/onert/backend/train/KernelGenerator.h
@@ -18,9 +18,9 @@
 #define __ONERT_BACKEND_TRAIN_KERNEL_GENERATOR_H__
 
 #include "ExternalContext.h"
-#include "backend/basic/TensorRegistry.h"
-#include "TensorBuilder.h"
 #include "Tensor.h"
+#include "TensorBuilder.h"
+#include "backend/basic/TensorRegistry.h"
 
 #include <backend/train/KernelGeneratorBase.h>
 #include <exec/train/IGradientApplier.h>
diff --git a/runtime/onert/backend/train/MemoryManager.h b/runtime/onert/backend/train/MemoryManager.h
index 3bb9756b3e8..0ed63e89fe6 100644
--- a/runtime/onert/backend/train/MemoryManager.h
+++ b/runtime/onert/backend/train/MemoryManager.h
@@ -17,11 +17,11 @@
 #ifndef __ONERT_BACKEND_TRAIN_MEMORY_MANAGER_H__
 #define __ONERT_BACKEND_TRAIN_MEMORY_MANAGER_H__
 
-#include <backend/basic/MemoryManager.h>
-
 #include "DisposableTensorIndex.h"
 #include "LayerScopeTensorIndex.h"
 
+#include <backend/basic/MemoryManager.h>
+
 namespace onert::backend::train
 {
 
diff --git a/runtime/onert/backend/train/MemoryPlanner.h b/runtime/onert/backend/train/MemoryPlanner.h
index 46cb065cc8f..5119d5d28b9 100644
--- a/runtime/onert/backend/train/MemoryPlanner.h
+++ b/runtime/onert/backend/train/MemoryPlanner.h
@@ -22,14 +22,14 @@
 #ifndef __ONERT_BACKEND_TRAIN_MEMORY_PLANNER_H__
 #define __ONERT_BACKEND_TRAIN_MEMORY_PLANNER_H__
 
-#include <backend/basic/IMemoryPlanner.h>
-
 #include "DisposableTensorIndex.h"
 
+#include <backend/basic/IMemoryPlanner.h>
+
 #include <map>
-#include <vector>
-#include <unordered_set>
 #include <memory>
+#include <unordered_set>
+#include <vector>
 
 namespace onert::backend::train
 {
diff --git a/runtime/onert/backend/train/MemoryPlanner.test.cc b/runtime/onert/backend/train/MemoryPlanner.test.cc
index 55320b49868..e0edf486414 100644
--- a/runtime/onert/backend/train/MemoryPlanner.test.cc
+++ b/runtime/onert/backend/train/MemoryPlanner.test.cc
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
+#include "MemoryPlanner.h"
 
 #include "DisposableTensorIndex.h"
 #include "LayerScopeTensorIndex.h"
-#include "MemoryPlanner.h"
 #include "ir/Index.h"
 
+#include <gtest/gtest.h>
+
 using namespace onert::backend::train;
 using onert::ir::OperandIndex;
 using onert::ir::OperationIndex;
diff --git a/runtime/onert/backend/train/TensorBuilder.h b/runtime/onert/backend/train/TensorBuilder.h
index 3115f36ecdb..5d8250db471 100644
--- a/runtime/onert/backend/train/TensorBuilder.h
+++ b/runtime/onert/backend/train/TensorBuilder.h
@@ -23,8 +23,8 @@
 #include "TensorRegistry.h"
 #include "util/Set.h"
 
-#include <ir/OperationIndexMap.h>
 #include <exec/train/optimizer/Optimizer.h>
+#include <ir/OperationIndexMap.h>
 
 namespace onert::backend::train
 {
diff --git a/runtime/onert/backend/train/TensorRegistry.h b/runtime/onert/backend/train/TensorRegistry.h
index f59e8b7666f..6e0ac549925 100644
--- a/runtime/onert/backend/train/TensorRegistry.h
+++ b/runtime/onert/backend/train/TensorRegistry.h
@@ -17,13 +17,13 @@
 #ifndef __ONERT_BACKEND_TRAIN_TENSOR_REGISTRY__
 #define __ONERT_BACKEND_TRAIN_TENSOR_REGISTRY__
 
-#include <backend/train/ITensorRegistry.h>
-#include <backend/train/LayerScopeTensor.h>
-
 #include "DisposableTensorIndex.h"
 #include "LayerScopeTensorIndex.h"
 #include "Tensor.h"
 
+#include <backend/train/ITensorRegistry.h>
+#include <backend/train/LayerScopeTensor.h>
+
 namespace onert::backend::train
 {
 
diff --git a/runtime/onert/backend/train/ops/BackPropAccumulator.cc b/runtime/onert/backend/train/ops/BackPropAccumulator.cc
index dc8fcdfb704..1aee87e705c 100644
--- a/runtime/onert/backend/train/ops/BackPropAccumulator.cc
+++ b/runtime/onert/backend/train/ops/BackPropAccumulator.cc
@@ -18,9 +18,10 @@
 
 #include "OperationUtils.h"
 
-#include <cker/operation/BinaryArithmeticOps.h>
 #include <util/CalculateActivationRange.h>
 
+#include <cker/operation/BinaryArithmeticOps.h>
+
 namespace onert::backend::train::ops
 {
 
diff --git a/runtime/onert/backend/train/ops/BackPropAccumulator.h b/runtime/onert/backend/train/ops/BackPropAccumulator.h
index 593e759fa2a..7bc5bece4d9 100644
--- a/runtime/onert/backend/train/ops/BackPropAccumulator.h
+++ b/runtime/onert/backend/train/ops/BackPropAccumulator.h
@@ -18,9 +18,10 @@
 #define __ONERT_BACKEND_TRAIN_OPS_BACKPROP_ACCUMULATOR_H__
 
 #include <backend/IPortableTensor.h>
-#include <cker/Types.h>
 #include <exec/train/ITrainableFunction.h>
 
+#include <cker/Types.h>
+
 namespace onert::backend::train::ops
 {
 
diff --git a/runtime/onert/backend/train/ops/BackPropInitializer.h b/runtime/onert/backend/train/ops/BackPropInitializer.h
index 9eb7894cef4..d1c86438d03 100644
--- a/runtime/onert/backend/train/ops/BackPropInitializer.h
+++ b/runtime/onert/backend/train/ops/BackPropInitializer.h
@@ -17,11 +17,11 @@
 #ifndef __ONERT_BACKEND_TRAIN_OPS_BACKPROP_INITIALIZER_H__
 #define __ONERT_BACKEND_TRAIN_OPS_BACKPROP_INITIALIZER_H__
 
+#include "../Tensor.h"
+
 #include <backend/IPortableTensor.h>
 #include <exec/train/ITrainableFunction.h>
 
-#include "../Tensor.h"
-
 namespace onert::backend::train::ops
 {
 
diff --git a/runtime/onert/backend/train/ops/BinaryArithmeticLayer.cc b/runtime/onert/backend/train/ops/BinaryArithmeticLayer.cc
index 61ed838b8c6..9348c7e8c91 100644
--- a/runtime/onert/backend/train/ops/BinaryArithmeticLayer.cc
+++ b/runtime/onert/backend/train/ops/BinaryArithmeticLayer.cc
@@ -19,7 +19,6 @@
 #include "OperationUtils.h"
 
 #include <cker/Shape.h>
-#include <cker/train/operation/BinaryArithmetic.h>
 #include <cker/operation/BinaryArithmeticOps.h>
 #include <cker/train/operation/BinaryArithmetic.h>
 #include <cker/train/operation/ReLU.h>
diff --git a/runtime/onert/backend/train/ops/BinaryArithmeticLayer.h b/runtime/onert/backend/train/ops/BinaryArithmeticLayer.h
index 88bb9a3c4b9..c63bfa8edb4 100644
--- a/runtime/onert/backend/train/ops/BinaryArithmeticLayer.h
+++ b/runtime/onert/backend/train/ops/BinaryArithmeticLayer.h
@@ -17,11 +17,11 @@
 #ifndef __ONERT_BACKEND_TRAIN_OPS_BINARYARITHMETICLAYER_H__
 #define __ONERT_BACKEND_TRAIN_OPS_BINARYARITHMETICLAYER_H__
 
-#include <ops/BinaryArithmeticLayer.h>
-#include <backend/IPortableTensor.h>
-
 #include "../Tensor.h"
+
+#include <backend/IPortableTensor.h>
 #include <exec/train/ITrainableFunction.h>
+#include <ops/BinaryArithmeticLayer.h>
 
 namespace onert::backend::train::ops
 {
diff --git a/runtime/onert/backend/train/ops/ConvolutionLayer.cc b/runtime/onert/backend/train/ops/ConvolutionLayer.cc
index eeb56ffc244..1e05f2d9cfe 100644
--- a/runtime/onert/backend/train/ops/ConvolutionLayer.cc
+++ b/runtime/onert/backend/train/ops/ConvolutionLayer.cc
@@ -20,11 +20,10 @@
 
 #include <cker/operation/Conv.h>
 #include <cker/operation/Transpose.h>
+#include <cker/operation/TransposeConv.h>
 #include <cker/train/operation/Conv.h>
 #include <cker/train/operation/ReLU.h>
 
-#include <cker/operation/TransposeConv.h>
-
 namespace
 {
 
diff --git a/runtime/onert/backend/train/ops/ConvolutionLayer.h b/runtime/onert/backend/train/ops/ConvolutionLayer.h
index f6bcb0a2752..16ee70925b9 100644
--- a/runtime/onert/backend/train/ops/ConvolutionLayer.h
+++ b/runtime/onert/backend/train/ops/ConvolutionLayer.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_BACKEND_TRAIN_OPS_CONVOLUTIONLAYER_H__
 #define __ONERT_BACKEND_TRAIN_OPS_CONVOLUTIONLAYER_H__
 
-#include <ops/ConvolutionLayer.h>
-
 #include "../Tensor.h"
+
 #include <exec/train/ITrainableFunction.h>
+#include <ops/ConvolutionLayer.h>
 
 namespace onert::backend::train::ops
 {
diff --git a/runtime/onert/backend/train/ops/DepthwiseConvolutionLayer.h b/runtime/onert/backend/train/ops/DepthwiseConvolutionLayer.h
index a11afd66879..9b67fffec23 100644
--- a/runtime/onert/backend/train/ops/DepthwiseConvolutionLayer.h
+++ b/runtime/onert/backend/train/ops/DepthwiseConvolutionLayer.h
@@ -17,12 +17,12 @@
 #ifndef __ONERT_BACKEND_TRAIN_OPS_DEPTHWISECONVOLUTIONLAYER_H__
 #define __ONERT_BACKEND_TRAIN_OPS_DEPTHWISECONVOLUTIONLAYER_H__
 
-#include <ops/DepthwiseConvolutionLayer.h>
-#include <backend/basic/Allocator.h>
-
-#include "../Tensor.h"
 #include "../ExternalContext.h"
+#include "../Tensor.h"
+
+#include <backend/basic/Allocator.h>
 #include <exec/train/ITrainableFunction.h>
+#include <ops/DepthwiseConvolutionLayer.h>
 
 namespace onert::backend::train::ops
 {
diff --git a/runtime/onert/backend/train/ops/ElementwiseActivationLayer.h b/runtime/onert/backend/train/ops/ElementwiseActivationLayer.h
index a4bec312758..d3ff9e1a631 100644
--- a/runtime/onert/backend/train/ops/ElementwiseActivationLayer.h
+++ b/runtime/onert/backend/train/ops/ElementwiseActivationLayer.h
@@ -18,9 +18,8 @@
 #define __ONERT_BACKEND_TRAIN_OPS_ELEMENTWISEACTIVATIONLAYER_H__
 
 #include <backend/IPortableTensor.h>
-#include <ops/ElementwiseActivationLayer.h>
-
 #include <exec/train/ITrainableFunction.h>
+#include <ops/ElementwiseActivationLayer.h>
 
 namespace onert::backend::train::ops
 {
diff --git a/runtime/onert/backend/train/ops/GradientApplier.h b/runtime/onert/backend/train/ops/GradientApplier.h
index 40b477ab33d..11fe1c7cc66 100644
--- a/runtime/onert/backend/train/ops/GradientApplier.h
+++ b/runtime/onert/backend/train/ops/GradientApplier.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_TRAIN_OPS_GRADIENT_APPLIER_H__
 
 #include <exec/train/IGradientApplier.h>
-
 #include <exec/train/optimizer/Optimizer.h>
 
 namespace onert::backend::train::ops
diff --git a/runtime/onert/backend/train/ops/LossCategoricalCrossentropyLayer.cc b/runtime/onert/backend/train/ops/LossCategoricalCrossentropyLayer.cc
index 17b54d2333a..f6634996b5a 100644
--- a/runtime/onert/backend/train/ops/LossCategoricalCrossentropyLayer.cc
+++ b/runtime/onert/backend/train/ops/LossCategoricalCrossentropyLayer.cc
@@ -15,6 +15,7 @@
  */
 
 #include "LossCategoricalCrossentropyLayer.h"
+
 #include "OperationUtils.h"
 
 #include <cker/train/operation/Loss.h>
diff --git a/runtime/onert/backend/train/ops/LossCategoricalCrossentropyLayer.h b/runtime/onert/backend/train/ops/LossCategoricalCrossentropyLayer.h
index 054dbbf392b..e262cc15571 100644
--- a/runtime/onert/backend/train/ops/LossCategoricalCrossentropyLayer.h
+++ b/runtime/onert/backend/train/ops/LossCategoricalCrossentropyLayer.h
@@ -17,8 +17,8 @@
 #ifndef __ONERT_BACKEND_TRAIN_OPS_LOSS_CATEGORICALCROSSENTROPY_LAYER_H__
 #define __ONERT_BACKEND_TRAIN_OPS_LOSS_CATEGORICALCROSSENTROPY_LAYER_H__
 
-#include "LossLayer.h"
 #include "../Tensor.h"
+#include "LossLayer.h"
 
 namespace onert::backend::train::ops
 {
diff --git a/runtime/onert/backend/train/ops/LossLayer.h b/runtime/onert/backend/train/ops/LossLayer.h
index 15eb06e29b6..f002d4cbca1 100644
--- a/runtime/onert/backend/train/ops/LossLayer.h
+++ b/runtime/onert/backend/train/ops/LossLayer.h
@@ -18,10 +18,9 @@
 #define __ONERT_BACKEND_TRAIN_OPS_LOSSLAYER_H__
 
 #include <backend/IPortableTensor.h>
-#include <ops/ElementwiseActivationLayer.h>
-
 #include <exec/train/ITrainableFunction.h>
 #include <ir/train/LossInfo.h>
+#include <ops/ElementwiseActivationLayer.h>
 
 namespace onert::backend::train::ops
 {
diff --git a/runtime/onert/backend/train/ops/LossMeanSquaredErrorLayer.cc b/runtime/onert/backend/train/ops/LossMeanSquaredErrorLayer.cc
index 95ab2e376f0..9512bbe3db1 100644
--- a/runtime/onert/backend/train/ops/LossMeanSquaredErrorLayer.cc
+++ b/runtime/onert/backend/train/ops/LossMeanSquaredErrorLayer.cc
@@ -15,6 +15,7 @@
  */
 
 #include "LossMeanSquaredErrorLayer.h"
+
 #include "OperationUtils.h"
 
 #include <cker/train/operation/Loss.h>
diff --git a/runtime/onert/backend/train/ops/MeanLayer.cc b/runtime/onert/backend/train/ops/MeanLayer.cc
index 82de9007e14..425c499033c 100644
--- a/runtime/onert/backend/train/ops/MeanLayer.cc
+++ b/runtime/onert/backend/train/ops/MeanLayer.cc
@@ -19,8 +19,8 @@
 #include "OperationUtils.h"
 
 #include <cker/Shape.h>
-#include <cker/train/operation/ReduceMean.h>
 #include <cker/operation/BinaryArithmeticOps.h>
+#include <cker/train/operation/ReduceMean.h>
 
 namespace onert::backend::train::ops
 {
diff --git a/runtime/onert/backend/train/ops/MeanLayer.h b/runtime/onert/backend/train/ops/MeanLayer.h
index 175fc0effd9..9a6a5c390ee 100644
--- a/runtime/onert/backend/train/ops/MeanLayer.h
+++ b/runtime/onert/backend/train/ops/MeanLayer.h
@@ -17,10 +17,9 @@
 #ifndef __ONERT_BACKEND_TRAIN_OPS_MEANLAYER_H__
 #define __ONERT_BACKEND_TRAIN_OPS_MEANLAYER_H__
 
-#include <ops/MeanLayer.h>
 #include <backend/IPortableTensor.h>
-
 #include <exec/train/ITrainableFunction.h>
+#include <ops/MeanLayer.h>
 
 namespace onert::backend::train::ops
 {
diff --git a/runtime/onert/backend/train/ops/OperationUtils.h b/runtime/onert/backend/train/ops/OperationUtils.h
index 6bcf8e0652d..3756a3aec5d 100644
--- a/runtime/onert/backend/train/ops/OperationUtils.h
+++ b/runtime/onert/backend/train/ops/OperationUtils.h
@@ -17,9 +17,10 @@
 #ifndef __ONERT_BACKEND_TRAIN_OPS_OPERATION_UTILS_H__
 #define __ONERT_BACKEND_TRAIN_OPS_OPERATION_UTILS_H__
 
+#include <ir/train/LossInfo.h>
 #include <ops/OperationUtils.h>
+
 #include <cker/train/Types.h>
-#include <ir/train/LossInfo.h>
 
 namespace onert::backend::train::ops
 {
diff --git a/runtime/onert/backend/train/ops/PadLayer.h b/runtime/onert/backend/train/ops/PadLayer.h
index 5bb2e05b492..05052eb2daa 100644
--- a/runtime/onert/backend/train/ops/PadLayer.h
+++ b/runtime/onert/backend/train/ops/PadLayer.h
@@ -17,11 +17,11 @@
 #ifndef __ONERT_BACKEND_TRAIN_OPS_PADLAYER_H__
 #define __ONERT_BACKEND_TRAIN_OPS_PADLAYER_H__
 
-#include <ops/PadLayer.h>
-#include <backend/IPortableTensor.h>
 #include "OperationUtils.h"
 
+#include <backend/IPortableTensor.h>
 #include <exec/train/ITrainableFunction.h>
+#include <ops/PadLayer.h>
 
 namespace onert::backend::train::ops
 {
diff --git a/runtime/onert/backend/train/ops/PoolLayer.cc b/runtime/onert/backend/train/ops/PoolLayer.cc
index 44e88b8d955..934eb43f24f 100644
--- a/runtime/onert/backend/train/ops/PoolLayer.cc
+++ b/runtime/onert/backend/train/ops/PoolLayer.cc
@@ -15,8 +15,9 @@
  */
 
 #include "PoolLayer.h"
-#include "OperationUtils.h"
+
 #include "../Tensor.h"
+#include "OperationUtils.h"
 
 #include <cker/Utils.h>
 #include <cker/operation/AveragePool.h>
diff --git a/runtime/onert/backend/train/ops/PoolLayer.h b/runtime/onert/backend/train/ops/PoolLayer.h
index 7d2825bfb63..900d61b5054 100644
--- a/runtime/onert/backend/train/ops/PoolLayer.h
+++ b/runtime/onert/backend/train/ops/PoolLayer.h
@@ -17,9 +17,8 @@
 #ifndef __ONERT_BACKEND_TRAIN_OPS_POOLLAYER_H__
 #define __ONERT_BACKEND_TRAIN_OPS_POOLLAYER_H__
 
-#include <ops/PoolLayer.h>
-
 #include <exec/train/ITrainableFunction.h>
+#include <ops/PoolLayer.h>
 
 namespace onert::backend::train::ops
 {
diff --git a/runtime/onert/backend/train/ops/ReshapeLayer.h b/runtime/onert/backend/train/ops/ReshapeLayer.h
index 658026ad6ed..91c4a925cb6 100644
--- a/runtime/onert/backend/train/ops/ReshapeLayer.h
+++ b/runtime/onert/backend/train/ops/ReshapeLayer.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_TRAIN_OPS_RESHAPELAYER_H__
 
 #include <backend/IPortableTensor.h>
-
 #include <exec/train/ITrainableFunction.h>
 
 namespace onert::backend::train::ops
diff --git a/runtime/onert/backend/train/ops/SoftMaxLayer.h b/runtime/onert/backend/train/ops/SoftMaxLayer.h
index e5b2071e1fc..af748f6beed 100644
--- a/runtime/onert/backend/train/ops/SoftMaxLayer.h
+++ b/runtime/onert/backend/train/ops/SoftMaxLayer.h
@@ -17,10 +17,9 @@
 #ifndef __ONERT_BACKEND_TRAIN_OPS_SOFTMAXLAYER_H__
 #define __ONERT_BACKEND_TRAIN_OPS_SOFTMAXLAYER_H__
 
-#include <ops/SoftMaxLayer.h>
 #include <backend/IPortableTensor.h>
-
 #include <exec/train/ITrainableFunction.h>
+#include <ops/SoftMaxLayer.h>
 
 namespace onert::backend::train::ops
 {
diff --git a/runtime/onert/backend/train/optimizer/Adam.cc b/runtime/onert/backend/train/optimizer/Adam.cc
index 9443b56bcd2..682e8bddf10 100644
--- a/runtime/onert/backend/train/optimizer/Adam.cc
+++ b/runtime/onert/backend/train/optimizer/Adam.cc
@@ -17,9 +17,12 @@
 #include "Adam.h"
 
 #include "../ops/OperationUtils.h"
+
+#include <misc/polymorphic_downcast.h>
+
 #include <cker/train/optimizer/Adam.h>
+
 #include <cmath>
-#include <misc/polymorphic_downcast.h>
 
 namespace onert::backend::train::optimizer
 {
diff --git a/runtime/onert/backend/train/optimizer/Adam.h b/runtime/onert/backend/train/optimizer/Adam.h
index 0c8f5d1feb8..7787ff28481 100644
--- a/runtime/onert/backend/train/optimizer/Adam.h
+++ b/runtime/onert/backend/train/optimizer/Adam.h
@@ -17,9 +17,8 @@
 #ifndef __ONERT_BACKEND_TRAIN_OPTIMIZER_ADAM_H__
 #define __ONERT_BACKEND_TRAIN_OPTIMIZER_ADAM_H__
 
-#include "exec/train/optimizer/Optimizer.h"
-
 #include "backend/basic/Tensor.h"
+#include "exec/train/optimizer/Optimizer.h"
 #include "ir/OperandIndexMap.h"
 
 namespace onert::backend::train::optimizer
diff --git a/runtime/onert/backend/train/optimizer/Optimizers.test.cc b/runtime/onert/backend/train/optimizer/Optimizers.test.cc
index 2876fe430cc..d678f22ddf0 100644
--- a/runtime/onert/backend/train/optimizer/Optimizers.test.cc
+++ b/runtime/onert/backend/train/optimizer/Optimizers.test.cc
@@ -18,8 +18,9 @@
 
 #include <backend/train/ITrainableTensor.h>
 
-#include <cmath>
 #include <gtest/gtest.h>
+
+#include <cmath>
 #include <vector>
 
 namespace
diff --git a/runtime/onert/backend/trix/BackendContext.cc b/runtime/onert/backend/trix/BackendContext.cc
index 6ae185ebff2..9c523e46752 100644
--- a/runtime/onert/backend/trix/BackendContext.cc
+++ b/runtime/onert/backend/trix/BackendContext.cc
@@ -16,13 +16,13 @@
 
 #include "BackendContext.h"
 
-#include "TensorBuilder.h"
 #include "KernelGenerator.h"
-#include "util/logging.h"
+#include "TensorBuilder.h"
+#include "backend/basic/BackendContextHelpers.h"
 #include "ir/Index.h"
 #include "ir/OperandIndexMap.h"
 #include "ir/OperandIndexSequence.h"
-#include "backend/basic/BackendContextHelpers.h"
+#include "util/logging.h"
 
 namespace onert::backend::trix
 {
diff --git a/runtime/onert/backend/trix/BackendContext.h b/runtime/onert/backend/trix/BackendContext.h
index 1852de156c1..9fd0a7a835f 100644
--- a/runtime/onert/backend/trix/BackendContext.h
+++ b/runtime/onert/backend/trix/BackendContext.h
@@ -17,10 +17,11 @@
 #ifndef __ONERT_BACKEND_TRIX_BACKEND_CONTEXT_H__
 #define __ONERT_BACKEND_TRIX_BACKEND_CONTEXT_H__
 
-#include <backend/BackendContext.h>
-#include "TensorBuilder.h"
-#include "KernelGenerator.h"
 #include "DevContext.h"
+#include "KernelGenerator.h"
+#include "TensorBuilder.h"
+
+#include <backend/BackendContext.h>
 
 namespace onert::backend::trix
 {
diff --git a/runtime/onert/backend/trix/Config.h b/runtime/onert/backend/trix/Config.h
index 468890cccb0..69c227f4db6 100644
--- a/runtime/onert/backend/trix/Config.h
+++ b/runtime/onert/backend/trix/Config.h
@@ -18,9 +18,10 @@
 #define __ONERT_BACKEND_TRIX_CONFIG_H__
 
 #include <backend/IConfig.h>
-#include <memory>
 #include <util/ITimer.h>
 
+#include <memory>
+
 namespace onert::backend::trix
 {
 
diff --git a/runtime/onert/backend/trix/Convert.h b/runtime/onert/backend/trix/Convert.h
index 98f530382b3..66672340328 100644
--- a/runtime/onert/backend/trix/Convert.h
+++ b/runtime/onert/backend/trix/Convert.h
@@ -20,8 +20,8 @@
 #include <backend/IPortableTensor.h>
 #include <ir/DataType.h>
 #include <ir/Layout.h>
-
 #include <libnpuhost.h>
+
 #include <type_traits>
 
 namespace onert::backend::trix
diff --git a/runtime/onert/backend/trix/DevContext.h b/runtime/onert/backend/trix/DevContext.h
index 27f0e22e743..51999deccb9 100644
--- a/runtime/onert/backend/trix/DevContext.h
+++ b/runtime/onert/backend/trix/DevContext.h
@@ -20,6 +20,7 @@
 #include "BatchThreadPool.h"
 
 #include <libnpuhost.h>
+
 #include <memory>
 #include <string>
 #include <unordered_map>
diff --git a/runtime/onert/backend/trix/KernelGenerator.cc b/runtime/onert/backend/trix/KernelGenerator.cc
index c33dd8ce5d6..8e1e1935e3c 100644
--- a/runtime/onert/backend/trix/KernelGenerator.cc
+++ b/runtime/onert/backend/trix/KernelGenerator.cc
@@ -20,11 +20,11 @@
 
 #include <backend/Backend.h>
 #include <backend/IConfig.h>
-#include <memory>
+#include <exec/DynamicShapeInferer.h>
 #include <util/Utils.h>
 #include <util/logging.h>
-#include <exec/DynamicShapeInferer.h>
 
+#include <memory>
 #include <stdexcept>
 
 namespace onert::backend::trix
diff --git a/runtime/onert/backend/trix/KernelGenerator.h b/runtime/onert/backend/trix/KernelGenerator.h
index 0f555d36515..f4dcb909a39 100644
--- a/runtime/onert/backend/trix/KernelGenerator.h
+++ b/runtime/onert/backend/trix/KernelGenerator.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_BACKEND_TRIX_KERNEL_GENERATOR_H__
 #define __ONERT_BACKEND_TRIX_KERNEL_GENERATOR_H__
 
+#include "DevContext.h"
+#include "Tensor.h"
 #include "TensorBuilder.h"
 #include "backend/basic/TensorRegistry.h"
-#include "Tensor.h"
-#include "DevContext.h"
 
 #include <backend/basic/KernelGeneratorBase.h>
 #include <ir/Operands.h>
diff --git a/runtime/onert/backend/trix/ops/BulkLayer.h b/runtime/onert/backend/trix/ops/BulkLayer.h
index c3221c47caa..be8f0b6fe37 100644
--- a/runtime/onert/backend/trix/ops/BulkLayer.h
+++ b/runtime/onert/backend/trix/ops/BulkLayer.h
@@ -17,9 +17,9 @@
 #ifndef __ONERT_BACKEND_TRIX_OPS_BULKLAYER_H__
 #define __ONERT_BACKEND_TRIX_OPS_BULKLAYER_H__
 
-#include <backend/IPortableTensor.h>
 #include "../DevContext.h"
 
+#include <backend/IPortableTensor.h>
 #include <exec/IFunction.h>
 
 namespace onert::backend::trix::ops
diff --git a/runtime/onert/core/include/backend/Backend.h b/runtime/onert/core/include/backend/Backend.h
index 54e4a909ada..c32f9153d25 100644
--- a/runtime/onert/core/include/backend/Backend.h
+++ b/runtime/onert/core/include/backend/Backend.h
@@ -17,11 +17,11 @@
 #ifndef __ONERT_BACKEND_BACKEND_H__
 #define __ONERT_BACKEND_BACKEND_H__
 
-#include <memory>
-
-#include "ir/Graph.h"
-#include "backend/IConfig.h"
 #include "backend/BackendContext.h"
+#include "backend/IConfig.h"
+#include "ir/Graph.h"
+
+#include <memory>
 
 namespace onert::backend
 {
diff --git a/runtime/onert/core/include/backend/BackendContext.h b/runtime/onert/core/include/backend/BackendContext.h
index 4e24b77575e..db59fd10600 100644
--- a/runtime/onert/core/include/backend/BackendContext.h
+++ b/runtime/onert/core/include/backend/BackendContext.h
@@ -17,13 +17,14 @@
 #ifndef __ONERT_BACKEND_BACKEND_CONTEXT_H__
 #define __ONERT_BACKEND_BACKEND_CONTEXT_H__
 
-#include <memory>
+#include "exec/FunctionSequence.h"
 #include "ir/Graph.h"
-#include "ir/OperationIndexMap.h"
 #include "ir/OperandIndexMap.h"
-#include "exec/FunctionSequence.h"
+#include "ir/OperationIndexMap.h"
 #include "util/Set.h"
 
+#include <memory>
+
 namespace onert::backend
 {
 
diff --git a/runtime/onert/core/include/backend/CustomKernelBuilder.h b/runtime/onert/core/include/backend/CustomKernelBuilder.h
index d6d42dfe5b6..c791100eb2a 100644
--- a/runtime/onert/core/include/backend/CustomKernelBuilder.h
+++ b/runtime/onert/core/include/backend/CustomKernelBuilder.h
@@ -18,11 +18,11 @@
 #define __ONERT_BACKEND_CUSTOM_KERNEL_BUILDER_H__
 
 #include "backend/IPortableTensor.h"
-#include "ir/Shape.h"
 #include "ir/DataType.h"
+#include "ir/Shape.h"
 
-#include <vector>
 #include <memory>
+#include <vector>
 
 namespace onert::exec
 {
diff --git a/runtime/onert/core/include/backend/IConfig.h b/runtime/onert/core/include/backend/IConfig.h
index bf9346a38ad..2662231bded 100644
--- a/runtime/onert/core/include/backend/IConfig.h
+++ b/runtime/onert/core/include/backend/IConfig.h
@@ -17,8 +17,8 @@
 #ifndef __ONERT_BACKEND_ICONFIG_H__
 #define __ONERT_BACKEND_ICONFIG_H__
 
-#include "ir/Layout.h"
 #include "ir/IOperation.h"
+#include "ir/Layout.h"
 #include "util/ITimer.h"
 
 #include <memory>
diff --git a/runtime/onert/core/include/backend/ITensor.h b/runtime/onert/core/include/backend/ITensor.h
index 83bc532da68..197422aed93 100644
--- a/runtime/onert/core/include/backend/ITensor.h
+++ b/runtime/onert/core/include/backend/ITensor.h
@@ -17,15 +17,15 @@
 #ifndef __ONERT_BACKEND_OPERAND_I_TENSOR_H__
 #define __ONERT_BACKEND_OPERAND_I_TENSOR_H__
 
-#include <cstring>
-#include <cstdint>
-#include <functional>
-#include <stdexcept>
-
+#include "ir/Coordinates.h"
 #include "ir/DataType.h"
 #include "ir/Layout.h"
 #include "ir/Shape.h"
-#include "ir/Coordinates.h"
+
+#include <cstdint>
+#include <cstring>
+#include <functional>
+#include <stdexcept>
 
 namespace onert::backend
 {
diff --git a/runtime/onert/core/include/backend/ITensorRegistry.h b/runtime/onert/core/include/backend/ITensorRegistry.h
index 1cd0fc90e84..7c0259db348 100644
--- a/runtime/onert/core/include/backend/ITensorRegistry.h
+++ b/runtime/onert/core/include/backend/ITensorRegistry.h
@@ -17,11 +17,11 @@
 #ifndef __ONERT_BACKEND_ITENSOR_REGISTRY__
 #define __ONERT_BACKEND_ITENSOR_REGISTRY__
 
-#include <memory>
-
-#include "ir/Index.h"
-#include "backend/ITensor.h"
 #include "backend/IPortableTensor.h"
+#include "backend/ITensor.h"
+#include "ir/Index.h"
+
+#include <memory>
 
 namespace onert::backend
 {
diff --git a/runtime/onert/core/include/backend/basic/BackendContextHelpers.h b/runtime/onert/core/include/backend/basic/BackendContextHelpers.h
index 82998500c1d..36803e2d888 100644
--- a/runtime/onert/core/include/backend/basic/BackendContextHelpers.h
+++ b/runtime/onert/core/include/backend/basic/BackendContextHelpers.h
@@ -17,15 +17,15 @@
 #ifndef __ONERT_BACKEND_BASIC_BACKEND_CONTEXT_HELPERS_H__
 #define __ONERT_BACKEND_BASIC_BACKEND_CONTEXT_HELPERS_H__
 
-#include <vector>
-
-#include "ir/Index.h"
-#include "compiler/GraphLowerInfo.h"
-#include "util/logging.h"
-#include "backend/ITensorRegistry.h"
+#include "Tensor.h"
 #include "backend/BackendContext.h"
+#include "backend/ITensorRegistry.h"
 #include "backend/basic/TensorRegistry.h"
-#include "Tensor.h"
+#include "compiler/GraphLowerInfo.h"
+#include "ir/Index.h"
+#include "util/logging.h"
+
+#include <vector>
 
 namespace onert::backend::basic
 {
diff --git a/runtime/onert/core/include/backend/basic/DynamicTensorManager.h b/runtime/onert/core/include/backend/basic/DynamicTensorManager.h
index 0dd58cf295a..f48736ad02e 100644
--- a/runtime/onert/core/include/backend/basic/DynamicTensorManager.h
+++ b/runtime/onert/core/include/backend/basic/DynamicTensorManager.h
@@ -20,9 +20,9 @@
 #include "MemoryManager.h"
 #include "TensorRegistry.h"
 
-#include <ir/OperandInfo.h>
 #include <ir/IOperation.h>
 #include <ir/Index.h>
+#include <ir/OperandInfo.h>
 
 #include <unordered_set>
 
diff --git a/runtime/onert/core/include/backend/basic/KernelGeneratorBase.h b/runtime/onert/core/include/backend/basic/KernelGeneratorBase.h
index acedddc057c..0a0c0aee080 100644
--- a/runtime/onert/core/include/backend/basic/KernelGeneratorBase.h
+++ b/runtime/onert/core/include/backend/basic/KernelGeneratorBase.h
@@ -17,14 +17,15 @@
 #ifndef __ONERT_BACKEND_BASIC_KERNEL_GENERATOR_BASE_H__
 #define __ONERT_BACKEND_BASIC_KERNEL_GENERATOR_BASE_H__
 
-#include <assert.h>
-#include <memory>
-#include <functional>
-
+#include "backend/ITensorRegistry.h"
+#include "exec/FunctionSequence.h"
 #include "ir/Graph.h"
 #include "ir/OperationVisitor.h"
-#include "exec/FunctionSequence.h"
-#include "backend/ITensorRegistry.h"
+
+#include <assert.h>
+
+#include <functional>
+#include <memory>
 
 namespace onert::backend::basic
 {
diff --git a/runtime/onert/core/include/backend/basic/MemoryManager.h b/runtime/onert/core/include/backend/basic/MemoryManager.h
index 8eb817770de..1d625b064a4 100644
--- a/runtime/onert/core/include/backend/basic/MemoryManager.h
+++ b/runtime/onert/core/include/backend/basic/MemoryManager.h
@@ -18,8 +18,8 @@
 #define __ONERT_BACKEND_CPU_MEMORY_MANAGER_H__
 
 #include "Allocator.h"
-#include "ir/Index.h"
 #include "IMemoryPlanner.h"
+#include "ir/Index.h"
 
 namespace onert::backend
 {
diff --git a/runtime/onert/core/include/backend/basic/StaticTensorManager.h b/runtime/onert/core/include/backend/basic/StaticTensorManager.h
index f6635b62e3c..4386bf7051f 100644
--- a/runtime/onert/core/include/backend/basic/StaticTensorManager.h
+++ b/runtime/onert/core/include/backend/basic/StaticTensorManager.h
@@ -17,12 +17,12 @@
 #ifndef __ONERT_BACKEND_BASIC_STATICTENSOR_MANAGER_H__
 #define __ONERT_BACKEND_BASIC_STATICTENSOR_MANAGER_H__
 
+#include "TensorRegistry.h"
 #include "backend/basic/DynamicTensorManager.h"
 #include "backend/basic/MemoryManager.h"
 #include "backend/basic/TensorRegistry.h"
 #include "ir/OperandIndexMap.h"
 #include "ir/OperandInfo.h"
-#include "TensorRegistry.h"
 
 namespace onert::backend::basic
 {
diff --git a/runtime/onert/core/include/backend/basic/Tensor.h b/runtime/onert/core/include/backend/basic/Tensor.h
index f531360f2b3..e117855d784 100644
--- a/runtime/onert/core/include/backend/basic/Tensor.h
+++ b/runtime/onert/core/include/backend/basic/Tensor.h
@@ -20,8 +20,8 @@
 #include "Allocator.h"
 
 #include <backend/IPortableTensor.h>
-#include <ir/OperandInfo.h>
 #include <ir/Data.h>
+#include <ir/OperandInfo.h>
 
 namespace onert::backend::basic
 {
diff --git a/runtime/onert/core/include/backend/basic/TensorBuilder.h b/runtime/onert/core/include/backend/basic/TensorBuilder.h
index a60c78952a4..919794d18fc 100644
--- a/runtime/onert/core/include/backend/basic/TensorBuilder.h
+++ b/runtime/onert/core/include/backend/basic/TensorBuilder.h
@@ -17,14 +17,13 @@
 #ifndef __ONERT_BACKEND_BASIC_TENSOR_BUILDER_H__
 #define __ONERT_BACKEND_BASIC_TENSOR_BUILDER_H__
 
+#include "Tensor.h"
+
 #include <backend/basic/DynamicTensorManager.h>
-#include <backend/basic/TensorRegistry.h>
 #include <backend/basic/StaticTensorManager.h>
-
+#include <backend/basic/TensorRegistry.h>
 #include <ir/OperandIndexMap.h>
 
-#include "Tensor.h"
-
 #include <unordered_map>
 
 namespace onert::backend::basic
diff --git a/runtime/onert/core/include/backend/basic/TensorRegistry.h b/runtime/onert/core/include/backend/basic/TensorRegistry.h
index edbbd31116e..a2321b3d9ec 100644
--- a/runtime/onert/core/include/backend/basic/TensorRegistry.h
+++ b/runtime/onert/core/include/backend/basic/TensorRegistry.h
@@ -17,8 +17,8 @@
 #ifndef __ONERT_BACKEND_BASIC_TENSOR_REGISTRY__
 #define __ONERT_BACKEND_BASIC_TENSOR_REGISTRY__
 
-#include "backend/ITensorRegistry.h"
 #include "Tensor.h"
+#include "backend/ITensorRegistry.h"
 
 namespace onert::backend::basic
 {
diff --git a/runtime/onert/core/include/backend/basic/train/TrainableTensor.h b/runtime/onert/core/include/backend/basic/train/TrainableTensor.h
index 0569ebe73af..2f71181766c 100644
--- a/runtime/onert/core/include/backend/basic/train/TrainableTensor.h
+++ b/runtime/onert/core/include/backend/basic/train/TrainableTensor.h
@@ -17,9 +17,8 @@
 #ifndef __ONERT_BACKEND_BASIC_TRAIN_TRAINABLE_TENSOR_H__
 #define __ONERT_BACKEND_BASIC_TRAIN_TRAINABLE_TENSOR_H__
 
-#include "backend/train/ITrainableTensor.h"
-
 #include "backend/basic/Tensor.h"
+#include "backend/train/ITrainableTensor.h"
 
 namespace onert::backend::basic::train
 {
diff --git a/runtime/onert/core/include/backend/train/KernelGeneratorBase.h b/runtime/onert/core/include/backend/train/KernelGeneratorBase.h
index 8f8ebe7310e..7bee8cbec42 100644
--- a/runtime/onert/core/include/backend/train/KernelGeneratorBase.h
+++ b/runtime/onert/core/include/backend/train/KernelGeneratorBase.h
@@ -17,13 +17,13 @@
 #ifndef __ONERT_BACKEND_TRAIN_KERNEL_GENERATOR_BASE_H__
 #define __ONERT_BACKEND_TRAIN_KERNEL_GENERATOR_BASE_H__
 
-#include <memory>
-
 #include "backend/ITensorRegistry.h"
 #include "exec/train/TrainableFnSequence.h"
 #include "ir/train/TrainableGraph.h"
 #include "ir/train/TrainableOperationVisitor.h"
 
+#include <memory>
+
 namespace onert::backend::train
 {
 
diff --git a/runtime/onert/core/include/compiler/BackendResolver.h b/runtime/onert/core/include/compiler/BackendResolver.h
index 1fdfd90a2ba..1d514c20df6 100644
--- a/runtime/onert/core/include/compiler/BackendResolver.h
+++ b/runtime/onert/core/include/compiler/BackendResolver.h
@@ -17,12 +17,12 @@
 #ifndef __ONERT_COMPILER_BACKEND_RESOLVER_H__
 #define __ONERT_COMPILER_BACKEND_RESOLVER_H__
 
-#include <unordered_map>
-#include <typeindex>
-
 #include "backend/Backend.h"
 #include "ir/OperationIndexMap.h"
 
+#include <typeindex>
+#include <unordered_map>
+
 namespace onert::compiler
 {
 
diff --git a/runtime/onert/core/include/compiler/CodeMap.h b/runtime/onert/core/include/compiler/CodeMap.h
index 9cf31b33813..460f7b04f81 100644
--- a/runtime/onert/core/include/compiler/CodeMap.h
+++ b/runtime/onert/core/include/compiler/CodeMap.h
@@ -19,8 +19,8 @@
 
 #include "backend/Backend.h"
 #include "exec/FunctionSequence.h"
-#include "ir/Index.h"
 #include "ir/IOperation.h"
+#include "ir/Index.h"
 
 #include <unordered_map>
 
diff --git a/runtime/onert/core/include/compiler/CompilerFactory.h b/runtime/onert/core/include/compiler/CompilerFactory.h
index 1f5da96b59d..710e8d8d40f 100644
--- a/runtime/onert/core/include/compiler/CompilerFactory.h
+++ b/runtime/onert/core/include/compiler/CompilerFactory.h
@@ -17,8 +17,8 @@
 #ifndef __ONERT_COMPILER_COMPILER_FACTORY_H__
 #define __ONERT_COMPILER_COMPILER_FACTORY_H__
 
-#include "ICompiler.h"
 #include "CompilerOptions.h"
+#include "ICompiler.h"
 #include "ir/NNPkg.h"
 #include "ir/train/TrainingInfo.h"
 
diff --git a/runtime/onert/core/include/compiler/CompilerOptions.h b/runtime/onert/core/include/compiler/CompilerOptions.h
index a8e29219bf8..22108e0f1f3 100644
--- a/runtime/onert/core/include/compiler/CompilerOptions.h
+++ b/runtime/onert/core/include/compiler/CompilerOptions.h
@@ -17,9 +17,9 @@
 #ifndef __ONERT_COMPILER_COMPILER_OPTIONS_H_
 #define __ONERT_COMPILER_COMPILER_OPTIONS_H_
 
-#include "ir/OpCode.h"
 #include "ir/Index.h"
 #include "ir/Layout.h"
+#include "ir/OpCode.h"
 #include "ir/TypeInfo.h"
 
 #include <memory>
diff --git a/runtime/onert/core/include/compiler/ExecutionBuilder.h b/runtime/onert/core/include/compiler/ExecutionBuilder.h
index cff76036d6c..7861f0d2346 100644
--- a/runtime/onert/core/include/compiler/ExecutionBuilder.h
+++ b/runtime/onert/core/include/compiler/ExecutionBuilder.h
@@ -17,11 +17,11 @@
 #ifndef __ONERT_COMPILER_EXECUTION_BUILDER_H__
 #define __ONERT_COMPILER_EXECUTION_BUILDER_H__
 
-#include <memory>
-
-#include "ir/Index.h"
-#include "exec/FunctionSequence.h"
 #include "CodeMap.h"
+#include "exec/FunctionSequence.h"
+#include "ir/Index.h"
+
+#include <memory>
 
 namespace onert::compiler
 {
diff --git a/runtime/onert/core/include/compiler/ILoweredGraph.h b/runtime/onert/core/include/compiler/ILoweredGraph.h
index 000af698c39..45a3538baf0 100644
--- a/runtime/onert/core/include/compiler/ILoweredGraph.h
+++ b/runtime/onert/core/include/compiler/ILoweredGraph.h
@@ -17,8 +17,8 @@
 #ifndef __ONERT_COMPILER_ILOWERED_GRAPH_H__
 #define __ONERT_COMPILER_ILOWERED_GRAPH_H__
 
-#include "ir/Graph.h"
 #include "compiler/GraphLowerInfo.h"
+#include "ir/Graph.h"
 
 namespace onert::compiler
 {
diff --git a/runtime/onert/core/include/compiler/StaticShapeInferer.h b/runtime/onert/core/include/compiler/StaticShapeInferer.h
index 6e0214df108..27426d8aba7 100644
--- a/runtime/onert/core/include/compiler/StaticShapeInferer.h
+++ b/runtime/onert/core/include/compiler/StaticShapeInferer.h
@@ -17,9 +17,9 @@
 #ifndef __ONERT_COMPILER_STATIC_SHAPE_INFERER_H__
 #define __ONERT_COMPILER_STATIC_SHAPE_INFERER_H__
 
-#include "ir/OperationVisitor.h"
 #include "compiler/LoweredGraph.h"
 #include "ir/Index.h"
+#include "ir/OperationVisitor.h"
 
 #include <memory>
 #include <unordered_map>
diff --git a/runtime/onert/core/include/exec/DynamicShapeInferer.h b/runtime/onert/core/include/exec/DynamicShapeInferer.h
index 5c5308bec9b..745afa4b9e8 100644
--- a/runtime/onert/core/include/exec/DynamicShapeInferer.h
+++ b/runtime/onert/core/include/exec/DynamicShapeInferer.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_EXEC_DYNAMIC_SHAPE_INFERER_H__
 #define __ONERT_EXEC_DYNAMIC_SHAPE_INFERER_H__
 
+#include "backend/ITensorRegistry.h"
+#include "ir/Index.h"
 #include "ir/Operands.h"
 #include "ir/OperationVisitor.h"
-#include "ir/Index.h"
-#include "backend/ITensorRegistry.h"
 
 #include <map>
 
diff --git a/runtime/onert/core/include/exec/Execution.h b/runtime/onert/core/include/exec/Execution.h
index 49300314fc1..8ff320dcacb 100644
--- a/runtime/onert/core/include/exec/Execution.h
+++ b/runtime/onert/core/include/exec/Execution.h
@@ -21,15 +21,16 @@
 #ifndef __ONERT_EXEC_EXECUTION_H__
 #define __ONERT_EXEC_EXECUTION_H__
 
+#include "ExecutionContext.h"
 #include "backend/train/ITrainableTensor.h"
-#include "ir/Layout.h"
 #include "exec/IExecutors.h"
-#include "ExecutionContext.h"
+#include "ir/Layout.h"
 
-#include <thread>
-#include <deque>
 #include <semaphore.h>
 
+#include <deque>
+#include <thread>
+
 namespace onert::exec
 {
 
diff --git a/runtime/onert/core/include/exec/ExecutionContext.h b/runtime/onert/core/include/exec/ExecutionContext.h
index ad47c667fa0..c8e3c0964cb 100644
--- a/runtime/onert/core/include/exec/ExecutionContext.h
+++ b/runtime/onert/core/include/exec/ExecutionContext.h
@@ -17,12 +17,13 @@
 #ifndef __ONERT_EXEC_EXECUTION_CONTEXT_H__
 #define __ONERT_EXEC_EXECUTION_CONTEXT_H__
 
-#include <vector>
-#include <unordered_map>
+#include "ir/Index.h"
+#include "ir/OperandInfo.h"
+
 #include <semaphore.h>
 
-#include "ir/OperandInfo.h"
-#include "ir/Index.h"
+#include <unordered_map>
+#include <vector>
 
 namespace onert::exec
 {
diff --git a/runtime/onert/core/include/exec/FunctionSequence.h b/runtime/onert/core/include/exec/FunctionSequence.h
index ab7438272e1..bbf5ffb802f 100644
--- a/runtime/onert/core/include/exec/FunctionSequence.h
+++ b/runtime/onert/core/include/exec/FunctionSequence.h
@@ -17,15 +17,15 @@
 #ifndef __ONERT_EXEC_FUNCTION_SEQUENCE_H__
 #define __ONERT_EXEC_FUNCTION_SEQUENCE_H__
 
-#include <memory>
-#include <cassert>
-#include <vector>
-#include <functional>
-
-#include "exec/IFunction.h"
+#include "backend/ITensorRegistry.h"
 #include "exec/DynamicShapeInferer.h"
+#include "exec/IFunction.h"
 #include "ir/Operations.h"
-#include "backend/ITensorRegistry.h"
+
+#include <cassert>
+#include <functional>
+#include <memory>
+#include <vector>
 
 namespace onert::exec
 {
diff --git a/runtime/onert/core/include/exec/train/ITrainableFunction.h b/runtime/onert/core/include/exec/train/ITrainableFunction.h
index a4e181b6584..efa2cfd1548 100644
--- a/runtime/onert/core/include/exec/train/ITrainableFunction.h
+++ b/runtime/onert/core/include/exec/train/ITrainableFunction.h
@@ -17,11 +17,11 @@
 #ifndef __ONERT_EXEC_TRAIN_I_TRAINABLE_FUNCTION_H__
 #define __ONERT_EXEC_TRAIN_I_TRAINABLE_FUNCTION_H__
 
+#include "backend/train/LayerScopeTensor.h"
+
 #include <cstdint>
 #include <optional>
 
-#include "backend/train/LayerScopeTensor.h"
-
 namespace onert::exec::train
 {
 
diff --git a/runtime/onert/core/include/exec/train/TrainableFnSequence.h b/runtime/onert/core/include/exec/train/TrainableFnSequence.h
index 8f05ad1f62c..448fd0e47c6 100644
--- a/runtime/onert/core/include/exec/train/TrainableFnSequence.h
+++ b/runtime/onert/core/include/exec/train/TrainableFnSequence.h
@@ -17,12 +17,12 @@
 #ifndef __ONERT_EXEC_TRAIN_TRAINABLE_FN_SEQUENCE_H__
 #define __ONERT_EXEC_TRAIN_TRAINABLE_FN_SEQUENCE_H__
 
-#include "exec/train/ITrainableFunction.h"
 #include "exec/train/IGradientApplier.h"
+#include "exec/train/ITrainableFunction.h"
 
+#include <functional>
 #include <memory>
 #include <vector>
-#include <functional>
 
 namespace onert::exec::train
 {
diff --git a/runtime/onert/core/include/exporter/CircleExporter.h b/runtime/onert/core/include/exporter/CircleExporter.h
index c5c5c5b3910..ef79e507490 100644
--- a/runtime/onert/core/include/exporter/CircleExporter.h
+++ b/runtime/onert/core/include/exporter/CircleExporter.h
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <string>
 #include <memory>
 #include <mutex>
+#include <string>
 
 namespace circle
 {
diff --git a/runtime/onert/core/include/exporter/train/CheckpointExporter.h b/runtime/onert/core/include/exporter/train/CheckpointExporter.h
index aa6605d5d31..f0a63ca0450 100644
--- a/runtime/onert/core/include/exporter/train/CheckpointExporter.h
+++ b/runtime/onert/core/include/exporter/train/CheckpointExporter.h
@@ -17,9 +17,9 @@
 #ifndef __ONERT_EXPORTER_TRAIN_CHECKPOINT_EXPORTER_H__
 #define __ONERT_EXPORTER_TRAIN_CHECKPOINT_EXPORTER_H__
 
+#include <memory>
 #include <string>
 #include <vector>
-#include <memory>
 
 namespace onert::exec
 {
diff --git a/runtime/onert/core/include/ir/Coordinates.h b/runtime/onert/core/include/ir/Coordinates.h
index 76bc8b44de0..fef91da7428 100644
--- a/runtime/onert/core/include/ir/Coordinates.h
+++ b/runtime/onert/core/include/ir/Coordinates.h
@@ -17,11 +17,12 @@
 #ifndef __ONERT_IR_COORDINATES_H__
 #define __ONERT_IR_COORDINATES_H__
 
-#include <cassert>
+#include "Layout.h"
+
 #include <stdint.h>
-#include <vector>
 
-#include "Layout.h"
+#include <cassert>
+#include <vector>
 
 namespace onert::ir
 {
diff --git a/runtime/onert/core/include/ir/Data.h b/runtime/onert/core/include/ir/Data.h
index 971db6927e7..4d78a0d06ef 100644
--- a/runtime/onert/core/include/ir/Data.h
+++ b/runtime/onert/core/include/ir/Data.h
@@ -17,9 +17,10 @@
 #ifndef __ONERT_IR_DATA_H__
 #define __ONERT_IR_DATA_H__
 
-#include <algorithm>
 #include <sys/mman.h>
 
+#include <algorithm>
+
 namespace onert::ir
 {
 
diff --git a/runtime/onert/core/include/ir/Graph.h b/runtime/onert/core/include/ir/Graph.h
index 85978a5dbc5..9af2593b988 100644
--- a/runtime/onert/core/include/ir/Graph.h
+++ b/runtime/onert/core/include/ir/Graph.h
@@ -17,14 +17,14 @@
 #ifndef __ONERT_IR_GRAPH_H__
 #define __ONERT_IR_GRAPH_H__
 
-#include <functional>
-#include <unordered_map>
-
 #include "ir/IGraph.h"
 #include "ir/Model.h"
 #include "ir/Operands.h"
 #include "ir/Operations.h"
 
+#include <functional>
+#include <unordered_map>
+
 namespace onert::ir
 {
 
diff --git a/runtime/onert/core/include/ir/IOperation.h b/runtime/onert/core/include/ir/IOperation.h
index 05fe62f0d3c..f1bc0e8d20d 100644
--- a/runtime/onert/core/include/ir/IOperation.h
+++ b/runtime/onert/core/include/ir/IOperation.h
@@ -17,12 +17,12 @@
 #ifndef __ONERT_IR_IOPERATION_H__
 #define __ONERT_IR_IOPERATION_H__
 
-#include <memory>
-
 #include "ir/Index.h"
 #include "ir/OpCode.h"
 #include "ir/OperandIndexSequence.h"
 
+#include <memory>
+
 namespace onert::ir
 {
 
diff --git a/runtime/onert/core/include/ir/Model.h b/runtime/onert/core/include/ir/Model.h
index 175cd7e5f81..10fc04e9728 100644
--- a/runtime/onert/core/include/ir/Model.h
+++ b/runtime/onert/core/include/ir/Model.h
@@ -17,13 +17,13 @@
 #ifndef __ONERT_IR_MODEL_H__
 #define __ONERT_IR_MODEL_H__
 
-#include <memory>
-#include <unordered_map>
-
 #include "ir/IGraph.h"
 #include "ir/Index.h"
 #include "util/ObjectManager.h"
 
+#include <memory>
+#include <unordered_map>
+
 namespace onert::backend::custom
 {
 class IKernelBuilder;
diff --git a/runtime/onert/core/include/ir/NNPkg.h b/runtime/onert/core/include/ir/NNPkg.h
index 609d8066d61..f9d0d1a9d4f 100644
--- a/runtime/onert/core/include/ir/NNPkg.h
+++ b/runtime/onert/core/include/ir/NNPkg.h
@@ -17,13 +17,13 @@
 #ifndef __ONERT_IR_NNPKG_H__
 #define __ONERT_IR_NNPKG_H__
 
+#include "ir/Index.h"
+#include "ir/Model.h"
+
 #include <memory>
 #include <unordered_set>
 #include <vector>
 
-#include "ir/Index.h"
-#include "ir/Model.h"
-
 namespace onert::ir
 {
 
diff --git a/runtime/onert/core/include/ir/OpCode.h b/runtime/onert/core/include/ir/OpCode.h
index 5675bb2d82f..7b52c4a70a9 100644
--- a/runtime/onert/core/include/ir/OpCode.h
+++ b/runtime/onert/core/include/ir/OpCode.h
@@ -17,8 +17,9 @@
 #ifndef __ONERT_IR_OP_CODE_H__
 #define __ONERT_IR_OP_CODE_H__
 
-#include <functional>
 #include <stdint.h>
+
+#include <functional>
 #include <string>
 
 namespace onert::ir
diff --git a/runtime/onert/core/include/ir/Operand.h b/runtime/onert/core/include/ir/Operand.h
index 8304fc251d9..7eb0cfb0520 100644
--- a/runtime/onert/core/include/ir/Operand.h
+++ b/runtime/onert/core/include/ir/Operand.h
@@ -17,16 +17,16 @@
 #ifndef __ONERT_IR_OPERAND_H__
 #define __ONERT_IR_OPERAND_H__
 
-#include <cassert>
-#include <cstdint>
-#include <memory>
-#include <algorithm>
-
 #include "ir/Data.h"
 #include "ir/DataType.h"
 #include "ir/OperandInfo.h"
 #include "ir/OperationIndexSet.h"
 
+#include <algorithm>
+#include <cassert>
+#include <cstdint>
+#include <memory>
+
 namespace onert::ir
 {
 
diff --git a/runtime/onert/core/include/ir/OperandConstraint.h b/runtime/onert/core/include/ir/OperandConstraint.h
index 2462ba66bd3..87291094c08 100644
--- a/runtime/onert/core/include/ir/OperandConstraint.h
+++ b/runtime/onert/core/include/ir/OperandConstraint.h
@@ -18,6 +18,7 @@
 #define __ONERT_MODEL_OPERAND_CONSTRAINT_H__
 
 #include <stdint.h>
+
 #include <limits>
 #include <set>
 
diff --git a/runtime/onert/core/include/ir/OperandIndexMap.h b/runtime/onert/core/include/ir/OperandIndexMap.h
index f9c993310c7..0c8272a481a 100644
--- a/runtime/onert/core/include/ir/OperandIndexMap.h
+++ b/runtime/onert/core/include/ir/OperandIndexMap.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_IR_OPERAND_INDEX_MAP_H__
 #define __ONERT_IR_OPERAND_INDEX_MAP_H__
 
-#include <unordered_map>
-
 #include "ir/Index.h"
 
+#include <unordered_map>
+
 namespace onert::ir
 {
 
diff --git a/runtime/onert/core/include/ir/OperandIndexSequence.h b/runtime/onert/core/include/ir/OperandIndexSequence.h
index 45716621c1e..8ee5e3d18cd 100644
--- a/runtime/onert/core/include/ir/OperandIndexSequence.h
+++ b/runtime/onert/core/include/ir/OperandIndexSequence.h
@@ -17,11 +17,11 @@
 #ifndef __ONERT_MODEL_OPERAND_INDEX_SEQUENCE_H__
 #define __ONERT_MODEL_OPERAND_INDEX_SEQUENCE_H__
 
+#include "ir/Index.h"
+
 #include <initializer_list>
 #include <vector>
 
-#include "ir/Index.h"
-
 namespace onert::ir
 {
 
diff --git a/runtime/onert/core/include/ir/Operands.h b/runtime/onert/core/include/ir/Operands.h
index c771fcd4158..554c80fbe2b 100644
--- a/runtime/onert/core/include/ir/Operands.h
+++ b/runtime/onert/core/include/ir/Operands.h
@@ -17,13 +17,13 @@
 #ifndef __ONERT_IR_OPERANDS_H__
 #define __ONERT_IR_OPERANDS_H__
 
-#include <memory>
-#include <unordered_map>
-
-#include "ir/Operand.h"
 #include "ir/Index.h"
+#include "ir/Operand.h"
 #include "util/ObjectManager.h"
 
+#include <memory>
+#include <unordered_map>
+
 namespace onert::ir
 {
 
diff --git a/runtime/onert/core/include/ir/Operation.h b/runtime/onert/core/include/ir/Operation.h
index d3065f50286..89205a7912b 100644
--- a/runtime/onert/core/include/ir/Operation.h
+++ b/runtime/onert/core/include/ir/Operation.h
@@ -17,12 +17,12 @@
 #ifndef __ONERT_IR_OPERATION_H__
 #define __ONERT_IR_OPERATION_H__
 
-#include <memory>
-
 #include "ir/IOperation.h"
 #include "ir/Operand.h"
 #include "ir/OperandConstraint.h"
 
+#include <memory>
+
 namespace onert::ir
 {
 
diff --git a/runtime/onert/core/include/ir/OperationIndexMap.h b/runtime/onert/core/include/ir/OperationIndexMap.h
index f2b62566b73..291656ee63e 100644
--- a/runtime/onert/core/include/ir/OperationIndexMap.h
+++ b/runtime/onert/core/include/ir/OperationIndexMap.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_IR_OPERATION_INDEX_MAP_H__
 #define __ONERT_IR_OPERATION_INDEX_MAP_H__
 
-#include <unordered_map>
-
 #include "ir/Index.h"
 
+#include <unordered_map>
+
 namespace onert::ir
 {
 
diff --git a/runtime/onert/core/include/ir/OperationIndexSet.h b/runtime/onert/core/include/ir/OperationIndexSet.h
index 46dbda77d6d..a5abd5a92b0 100644
--- a/runtime/onert/core/include/ir/OperationIndexSet.h
+++ b/runtime/onert/core/include/ir/OperationIndexSet.h
@@ -17,13 +17,13 @@
 #ifndef __ONERT_MODEL_OPERATION_INDEX_SET_H__
 #define __ONERT_MODEL_OPERATION_INDEX_SET_H__
 
+#include "ir/Index.h"
+
 #include <algorithm>
 #include <cassert>
 #include <initializer_list>
 #include <unordered_set>
 
-#include "ir/Index.h"
-
 namespace onert::ir
 {
 
diff --git a/runtime/onert/core/include/ir/Operations.Include.h b/runtime/onert/core/include/ir/Operations.Include.h
index 352ed870d98..3cefb7510f4 100644
--- a/runtime/onert/core/include/ir/Operations.Include.h
+++ b/runtime/onert/core/include/ir/Operations.Include.h
@@ -18,10 +18,10 @@
 
 #include "ir/operation/AddN.h"
 #include "ir/operation/ArgMinMax.h"
-#include "ir/operation/BatchMatMul.h"
-#include "ir/operation/BatchToSpaceND.h"
 #include "ir/operation/BCQFullyConnected.h"
 #include "ir/operation/BCQGather.h"
+#include "ir/operation/BatchMatMul.h"
+#include "ir/operation/BatchToSpaceND.h"
 #include "ir/operation/BinaryArithmetic.h"
 #include "ir/operation/BroadcastTo.h"
 #include "ir/operation/Bulk.h"
@@ -34,6 +34,7 @@
 #include "ir/operation/Custom.h"
 #include "ir/operation/DepthToSpace.h"
 #include "ir/operation/DepthwiseConv2D.h"
+#include "ir/operation/DetectionPostProcess.h"
 #include "ir/operation/DynamicUpdateSlice.h"
 #include "ir/operation/ElementwiseActivation.h"
 #include "ir/operation/ElementwiseBinary.h"
@@ -48,18 +49,18 @@
 #include "ir/operation/If.h"
 #include "ir/operation/InstanceNorm.h"
 #include "ir/operation/L2Normalization.h"
+#include "ir/operation/LSTM.h"
 #include "ir/operation/LocalResponseNormalization.h"
 #include "ir/operation/LogSoftmax.h"
 #include "ir/operation/Loss.h"
-#include "ir/operation/LSTM.h"
-#include "ir/operation/DetectionPostProcess.h"
 #include "ir/operation/OneHot.h"
+#include "ir/operation/PReLU.h"
 #include "ir/operation/Pack.h"
 #include "ir/operation/Pad.h"
 #include "ir/operation/Permute.h"
 #include "ir/operation/Pool2D.h"
 #include "ir/operation/Pow.h"
-#include "ir/operation/PReLU.h"
+#include "ir/operation/RNN.h"
 #include "ir/operation/Range.h"
 #include "ir/operation/Rank.h"
 #include "ir/operation/Reduce.h"
@@ -69,7 +70,6 @@
 #include "ir/operation/Reverse.h"
 #include "ir/operation/RmsNorm.h"
 #include "ir/operation/RoPE.h"
-#include "ir/operation/RNN.h"
 #include "ir/operation/Select.h"
 #include "ir/operation/Shape.h"
 #include "ir/operation/Slice.h"
diff --git a/runtime/onert/core/include/ir/Operations.h b/runtime/onert/core/include/ir/Operations.h
index 69ac8c781c5..d14097acd76 100644
--- a/runtime/onert/core/include/ir/Operations.h
+++ b/runtime/onert/core/include/ir/Operations.h
@@ -17,8 +17,8 @@
 #ifndef __ONERT_IR_OPERATIONS_H__
 #define __ONERT_IR_OPERATIONS_H__
 
-#include "ir/Index.h"
 #include "ir/IOperation.h"
+#include "ir/Index.h"
 #include "util/ObjectManager.h"
 
 namespace onert::ir
diff --git a/runtime/onert/core/include/ir/Padding.h b/runtime/onert/core/include/ir/Padding.h
index 894eaa8f523..65839a50d27 100644
--- a/runtime/onert/core/include/ir/Padding.h
+++ b/runtime/onert/core/include/ir/Padding.h
@@ -17,8 +17,8 @@
 #ifndef __ONERT_IR_PADDIGN_H__
 #define __ONERT_IR_PADDIGN_H__
 
-#include "Shape.h"
 #include "InternalType.h"
+#include "Shape.h"
 
 #include <cstdint>
 #include <string>
diff --git a/runtime/onert/core/include/ir/Shape.h b/runtime/onert/core/include/ir/Shape.h
index 1ddca1e537c..aa975c686e8 100644
--- a/runtime/onert/core/include/ir/Shape.h
+++ b/runtime/onert/core/include/ir/Shape.h
@@ -19,10 +19,10 @@
 
 #include "ir/Layout.h"
 
+#include <algorithm>
 #include <cassert>
 #include <cstdint>
 #include <vector>
-#include <algorithm>
 
 namespace onert::ir
 {
diff --git a/runtime/onert/core/include/ir/TypeInfo.h b/runtime/onert/core/include/ir/TypeInfo.h
index 79c00f41a97..37e1cae6353 100644
--- a/runtime/onert/core/include/ir/TypeInfo.h
+++ b/runtime/onert/core/include/ir/TypeInfo.h
@@ -17,15 +17,15 @@
 #ifndef __ONERT_IR_TYPEINFO_H__
 #define __ONERT_IR_TYPEINFO_H__
 
+#include "ir/DataType.h"
+#include "ir/Sparsity.h"
+
 #include <algorithm>
 #include <cassert>
 #include <cstdint>
 #include <memory>
 #include <vector>
 
-#include "ir/DataType.h"
-#include "ir/Sparsity.h"
-
 namespace onert::ir
 {
 
diff --git a/runtime/onert/core/include/ir/operation/BCQFullyConnected.h b/runtime/onert/core/include/ir/operation/BCQFullyConnected.h
index 47b866d263b..49fec320466 100644
--- a/runtime/onert/core/include/ir/operation/BCQFullyConnected.h
+++ b/runtime/onert/core/include/ir/operation/BCQFullyConnected.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_IR_OPERATION_BCQFULLYCONNECTED_H__
 #define __ONERT_IR_OPERATION_BCQFULLYCONNECTED_H__
 
-#include <memory>
-
-#include "ir/Operation.h"
 #include "ir/InternalType.h"
+#include "ir/Operation.h"
+
+#include <memory>
 
 namespace onert::ir::operation
 {
diff --git a/runtime/onert/core/include/ir/operation/BCQGather.h b/runtime/onert/core/include/ir/operation/BCQGather.h
index e7843ede965..cb48b3ddacb 100644
--- a/runtime/onert/core/include/ir/operation/BCQGather.h
+++ b/runtime/onert/core/include/ir/operation/BCQGather.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_IR_OPERATION_BCQGATHER_H__
 #define __ONERT_IR_OPERATION_BCQGATHER_H__
 
-#include <memory>
-
-#include "ir/Operation.h"
 #include "ir/InternalType.h"
+#include "ir/Operation.h"
+
+#include <memory>
 
 namespace onert::ir::operation
 {
diff --git a/runtime/onert/core/include/ir/operation/BinaryArithmetic.h b/runtime/onert/core/include/ir/operation/BinaryArithmetic.h
index 0b6fb3f681b..43ad7ef199b 100644
--- a/runtime/onert/core/include/ir/operation/BinaryArithmetic.h
+++ b/runtime/onert/core/include/ir/operation/BinaryArithmetic.h
@@ -17,8 +17,8 @@
 #ifndef __ONERT_IR_OPERATION_BINARY_ARITHMETIC_H__
 #define __ONERT_IR_OPERATION_BINARY_ARITHMETIC_H__
 
-#include "ir/Operation.h"
 #include "ir/InternalType.h"
+#include "ir/Operation.h"
 
 namespace onert::ir::operation
 {
diff --git a/runtime/onert/core/include/ir/operation/BroadcastTo.h b/runtime/onert/core/include/ir/operation/BroadcastTo.h
index fddce7160a9..30665979efb 100644
--- a/runtime/onert/core/include/ir/operation/BroadcastTo.h
+++ b/runtime/onert/core/include/ir/operation/BroadcastTo.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_IR_OPERATION_BROADCAST_TO_H__
 #define __ONERT_IR_OPERATION_BROADCAST_TO_H__
 
-#include <memory>
-
 #include "ir/Operation.h"
 
+#include <memory>
+
 namespace onert::ir::operation
 {
 
diff --git a/runtime/onert/core/include/ir/operation/Call.h b/runtime/onert/core/include/ir/operation/Call.h
index c28e1c0bdab..ffadb5bfc41 100644
--- a/runtime/onert/core/include/ir/operation/Call.h
+++ b/runtime/onert/core/include/ir/operation/Call.h
@@ -17,8 +17,8 @@
 #ifndef __ONERT_IR_OPERATION_CALL_H__
 #define __ONERT_IR_OPERATION_CALL_H__
 
-#include "ir/Operation.h"
 #include "ir/InternalType.h"
+#include "ir/Operation.h"
 
 namespace onert::ir::operation
 {
diff --git a/runtime/onert/core/include/ir/operation/Concat.h b/runtime/onert/core/include/ir/operation/Concat.h
index 2a9cdf3df51..732f7be52de 100644
--- a/runtime/onert/core/include/ir/operation/Concat.h
+++ b/runtime/onert/core/include/ir/operation/Concat.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_IR_OPERATION_CONCAT_H__
 #define __ONERT_IR_OPERATION_CONCAT_H__
 
-#include <memory>
-
 #include "ir/Operation.h"
 
+#include <memory>
+
 namespace onert::ir::operation
 {
 
diff --git a/runtime/onert/core/include/ir/operation/Conv2D.h b/runtime/onert/core/include/ir/operation/Conv2D.h
index 53ee1ce092e..76e24037e1e 100644
--- a/runtime/onert/core/include/ir/operation/Conv2D.h
+++ b/runtime/onert/core/include/ir/operation/Conv2D.h
@@ -17,12 +17,12 @@
 #ifndef __ONERT_IR_OPERATION_CONV2D_H__
 #define __ONERT_IR_OPERATION_CONV2D_H__
 
-#include <memory>
-
-#include "ir/Operation.h"
 #include "ir/InternalType.h"
+#include "ir/Operation.h"
 #include "ir/Padding.h"
 
+#include <memory>
+
 namespace onert::ir::operation
 {
 
diff --git a/runtime/onert/core/include/ir/operation/DepthToSpace.h b/runtime/onert/core/include/ir/operation/DepthToSpace.h
index 5128c7a0fa0..b85ce1b637a 100644
--- a/runtime/onert/core/include/ir/operation/DepthToSpace.h
+++ b/runtime/onert/core/include/ir/operation/DepthToSpace.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_IR_OPERATION_DEPTH_TO_SPACE_H__
 #define __ONERT_IR_OPERATION_DEPTH_TO_SPACE_H__
 
-#include <memory>
-
 #include "ir/Operation.h"
 
+#include <memory>
+
 namespace onert::ir::operation
 {
 
diff --git a/runtime/onert/core/include/ir/operation/DepthwiseConv2D.h b/runtime/onert/core/include/ir/operation/DepthwiseConv2D.h
index cf2d93d1490..f77d4ea8a00 100644
--- a/runtime/onert/core/include/ir/operation/DepthwiseConv2D.h
+++ b/runtime/onert/core/include/ir/operation/DepthwiseConv2D.h
@@ -17,12 +17,12 @@
 #ifndef __ONERT_IR_OPERATION_DEPTHWISECONV2D_H__
 #define __ONERT_IR_OPERATION_DEPTHWISECONV2D_H__
 
-#include <memory>
-
-#include "ir/Operation.h"
 #include "ir/InternalType.h"
+#include "ir/Operation.h"
 #include "ir/Padding.h"
 
+#include <memory>
+
 namespace onert::ir::operation
 {
 
diff --git a/runtime/onert/core/include/ir/operation/ExpandDims.h b/runtime/onert/core/include/ir/operation/ExpandDims.h
index 44757fac06b..23514f0babe 100644
--- a/runtime/onert/core/include/ir/operation/ExpandDims.h
+++ b/runtime/onert/core/include/ir/operation/ExpandDims.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_IR_OPERATION_EXPANDDIMS_H__
 #define __ONERT_IR_OPERATION_EXPANDDIMS_H__
 
-#include <memory>
-
 #include "ir/Operation.h"
 
+#include <memory>
+
 namespace onert::ir::operation
 {
 
diff --git a/runtime/onert/core/include/ir/operation/FullyConnected.h b/runtime/onert/core/include/ir/operation/FullyConnected.h
index ba4461254bb..1ed07e75c73 100644
--- a/runtime/onert/core/include/ir/operation/FullyConnected.h
+++ b/runtime/onert/core/include/ir/operation/FullyConnected.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_IR_OPERATION_FULLYCONNECTED_H__
 #define __ONERT_IR_OPERATION_FULLYCONNECTED_H__
 
-#include <memory>
-
-#include "ir/Operation.h"
 #include "ir/InternalType.h"
+#include "ir/Operation.h"
+
+#include <memory>
 
 namespace onert::ir::operation
 {
diff --git a/runtime/onert/core/include/ir/operation/FusedBatchNorm.h b/runtime/onert/core/include/ir/operation/FusedBatchNorm.h
index 838f86c2b69..29b8fc97cdb 100644
--- a/runtime/onert/core/include/ir/operation/FusedBatchNorm.h
+++ b/runtime/onert/core/include/ir/operation/FusedBatchNorm.h
@@ -17,8 +17,8 @@
 #ifndef __ONERT_IR_OPERATION_FUSEDBATCHNORM_H__
 #define __ONERT_IR_OPERATION_FUSEDBATCHNORM_H__
 
-#include "ir/Operation.h"
 #include "ir/InternalType.h"
+#include "ir/Operation.h"
 
 namespace onert::ir::operation
 {
diff --git a/runtime/onert/core/include/ir/operation/Gather.h b/runtime/onert/core/include/ir/operation/Gather.h
index 4e16904a6a5..b3823a00bb4 100644
--- a/runtime/onert/core/include/ir/operation/Gather.h
+++ b/runtime/onert/core/include/ir/operation/Gather.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_IR_OPERATION_GATHER_H__
 #define __ONERT_IR_OPERATION_GATHER_H__
 
-#include <memory>
-
 #include "ir/Operation.h"
 
+#include <memory>
+
 namespace onert::ir::operation
 {
 
diff --git a/runtime/onert/core/include/ir/operation/If.h b/runtime/onert/core/include/ir/operation/If.h
index 3c9f980d8e1..e57a2b3ccc6 100644
--- a/runtime/onert/core/include/ir/operation/If.h
+++ b/runtime/onert/core/include/ir/operation/If.h
@@ -17,8 +17,8 @@
 #ifndef __ONERT_IR_OPERATION_IF_H__
 #define __ONERT_IR_OPERATION_IF_H__
 
-#include "ir/Operation.h"
 #include "ir/InternalType.h"
+#include "ir/Operation.h"
 
 namespace onert::ir::operation
 {
diff --git a/runtime/onert/core/include/ir/operation/InstanceNorm.h b/runtime/onert/core/include/ir/operation/InstanceNorm.h
index 23b3f47fa95..466d42fd70f 100644
--- a/runtime/onert/core/include/ir/operation/InstanceNorm.h
+++ b/runtime/onert/core/include/ir/operation/InstanceNorm.h
@@ -17,8 +17,8 @@
 #ifndef __ONERT_IR_OPERATION_INSTANCE_NORM_H__
 #define __ONERT_IR_OPERATION_INSTANCE_NORM_H__
 
-#include "ir/Operation.h"
 #include "ir/InternalType.h"
+#include "ir/Operation.h"
 
 namespace onert::ir::operation
 {
diff --git a/runtime/onert/core/include/ir/operation/LocalResponseNormalization.h b/runtime/onert/core/include/ir/operation/LocalResponseNormalization.h
index 8b3055b5545..2bce3e497a1 100644
--- a/runtime/onert/core/include/ir/operation/LocalResponseNormalization.h
+++ b/runtime/onert/core/include/ir/operation/LocalResponseNormalization.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_IR_OPERATION_LOCAL_RESPONSE_NORMALIZATION_H__
 #define __ONERT_IR_OPERATION_LOCAL_RESPONSE_NORMALIZATION_H__
 
-#include <memory>
-
 #include "ir/Operation.h"
 
+#include <memory>
+
 namespace onert::ir::operation
 {
 
diff --git a/runtime/onert/core/include/ir/operation/LogSoftmax.h b/runtime/onert/core/include/ir/operation/LogSoftmax.h
index 0ff97febb56..785ba1f753f 100644
--- a/runtime/onert/core/include/ir/operation/LogSoftmax.h
+++ b/runtime/onert/core/include/ir/operation/LogSoftmax.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_IR_OPERATION_LOGSOFTMAX_H__
 #define __ONERT_IR_OPERATION_LOGSOFTMAX_H__
 
-#include <memory>
-
 #include "ir/Operation.h"
 
+#include <memory>
+
 namespace onert::ir::operation
 {
 
diff --git a/runtime/onert/core/include/ir/operation/Pool2D.h b/runtime/onert/core/include/ir/operation/Pool2D.h
index 49e63cd9551..657afc13f49 100644
--- a/runtime/onert/core/include/ir/operation/Pool2D.h
+++ b/runtime/onert/core/include/ir/operation/Pool2D.h
@@ -17,12 +17,12 @@
 #ifndef __ONERT_IR_OPERATION_POOL2D_H__
 #define __ONERT_IR_OPERATION_POOL2D_H__
 
-#include <memory>
-
-#include "ir/Operation.h"
 #include "ir/InternalType.h"
+#include "ir/Operation.h"
 #include "ir/Padding.h"
 
+#include <memory>
+
 namespace onert::ir::operation
 {
 
diff --git a/runtime/onert/core/include/ir/operation/Pow.h b/runtime/onert/core/include/ir/operation/Pow.h
index f261b19d72f..7554f4a5b09 100644
--- a/runtime/onert/core/include/ir/operation/Pow.h
+++ b/runtime/onert/core/include/ir/operation/Pow.h
@@ -17,8 +17,8 @@
 #ifndef __ONERT_IR_OPERATION_POW_H__
 #define __ONERT_IR_OPERATION_POW_H__
 
-#include "ir/Operation.h"
 #include "ir/InternalType.h"
+#include "ir/Operation.h"
 
 namespace onert::ir::operation
 {
diff --git a/runtime/onert/core/include/ir/operation/Rank.h b/runtime/onert/core/include/ir/operation/Rank.h
index 5759b5a410d..80df3326a63 100644
--- a/runtime/onert/core/include/ir/operation/Rank.h
+++ b/runtime/onert/core/include/ir/operation/Rank.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_IR_OPERATION_RANK_H__
 #define __ONERT_IR_OPERATION_RANK_H__
 
-#include <memory>
-
 #include "ir/Operation.h"
 
+#include <memory>
+
 namespace onert::ir::operation
 {
 
diff --git a/runtime/onert/core/include/ir/operation/Reduce.h b/runtime/onert/core/include/ir/operation/Reduce.h
index bbb90a9b461..83cf926a4c5 100644
--- a/runtime/onert/core/include/ir/operation/Reduce.h
+++ b/runtime/onert/core/include/ir/operation/Reduce.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_IR_OPERATION_REDUCE_H__
 #define __ONERT_IR_OPERATION_REDUCE_H__
 
-#include <memory>
-
 #include "ir/Operation.h"
 
+#include <memory>
+
 namespace onert::ir::operation
 {
 
diff --git a/runtime/onert/core/include/ir/operation/Reshape.h b/runtime/onert/core/include/ir/operation/Reshape.h
index 341166bde7c..4b19d2fcaef 100644
--- a/runtime/onert/core/include/ir/operation/Reshape.h
+++ b/runtime/onert/core/include/ir/operation/Reshape.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_IR_OPERATION_RESHAPE_H__
 #define __ONERT_IR_OPERATION_RESHAPE_H__
 
-#include <memory>
-
 #include "ir/Operation.h"
 
+#include <memory>
+
 namespace onert::ir::operation
 {
 
diff --git a/runtime/onert/core/include/ir/operation/ResizeBilinear.h b/runtime/onert/core/include/ir/operation/ResizeBilinear.h
index bbcab7ddb12..4c7cabd17b3 100644
--- a/runtime/onert/core/include/ir/operation/ResizeBilinear.h
+++ b/runtime/onert/core/include/ir/operation/ResizeBilinear.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_IR_OPERATION_RESIZE_BILINEAR_H__
 #define __ONERT_IR_OPERATION_RESIZE_BILINEAR_H__
 
-#include <memory>
-
 #include "ir/Operation.h"
 
+#include <memory>
+
 namespace onert::ir::operation
 {
 
diff --git a/runtime/onert/core/include/ir/operation/ResizeNearestNeighbor.h b/runtime/onert/core/include/ir/operation/ResizeNearestNeighbor.h
index 25ed00134cb..15950fe9605 100644
--- a/runtime/onert/core/include/ir/operation/ResizeNearestNeighbor.h
+++ b/runtime/onert/core/include/ir/operation/ResizeNearestNeighbor.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_IR_OPERATION_RESIZE_NEAREST_NEIGHBOR_H__
 #define __ONERT_IR_OPERATION_RESIZE_NEAREST_NEIGHBOR_H__
 
-#include <memory>
-
 #include "ir/Operation.h"
 
+#include <memory>
+
 namespace onert::ir::operation
 {
 
diff --git a/runtime/onert/core/include/ir/operation/RmsNorm.h b/runtime/onert/core/include/ir/operation/RmsNorm.h
index c1be9614bbc..a02833dac7f 100644
--- a/runtime/onert/core/include/ir/operation/RmsNorm.h
+++ b/runtime/onert/core/include/ir/operation/RmsNorm.h
@@ -17,8 +17,8 @@
 #ifndef __ONERT_IR_OPERATION_RMS_NORM_H__
 #define __ONERT_IR_OPERATION_RMS_NORM_H__
 
-#include "ir/Operation.h"
 #include "ir/InternalType.h"
+#include "ir/Operation.h"
 
 namespace onert::ir::operation
 {
diff --git a/runtime/onert/core/include/ir/operation/Shape.h b/runtime/onert/core/include/ir/operation/Shape.h
index e29651e4f16..17d125875de 100644
--- a/runtime/onert/core/include/ir/operation/Shape.h
+++ b/runtime/onert/core/include/ir/operation/Shape.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_IR_OPERATION_SHAPE_H__
 #define __ONERT_IR_OPERATION_SHAPE_H__
 
-#include <memory>
-
 #include "ir/Operation.h"
 
+#include <memory>
+
 namespace onert::ir::operation
 {
 
diff --git a/runtime/onert/core/include/ir/operation/Softmax.h b/runtime/onert/core/include/ir/operation/Softmax.h
index d266b850328..5873cdc0cb1 100644
--- a/runtime/onert/core/include/ir/operation/Softmax.h
+++ b/runtime/onert/core/include/ir/operation/Softmax.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_IR_OPERATION_SOFTMAX_H__
 #define __ONERT_IR_OPERATION_SOFTMAX_H__
 
-#include <memory>
-
 #include "ir/Operation.h"
 
+#include <memory>
+
 namespace onert::ir::operation
 {
 
diff --git a/runtime/onert/core/include/ir/operation/SpaceToBatchND.h b/runtime/onert/core/include/ir/operation/SpaceToBatchND.h
index e85450532b3..72bbd1ea89e 100644
--- a/runtime/onert/core/include/ir/operation/SpaceToBatchND.h
+++ b/runtime/onert/core/include/ir/operation/SpaceToBatchND.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_IR_OPERATION_SPACE_TO_BATCH_ND_H__
 #define __ONERT_IR_OPERATION_SPACE_TO_BATCH_ND_H__
 
-#include <memory>
-
 #include "ir/Operation.h"
 
+#include <memory>
+
 namespace onert::ir::operation
 {
 
diff --git a/runtime/onert/core/include/ir/operation/SpaceToDepth.h b/runtime/onert/core/include/ir/operation/SpaceToDepth.h
index 68f21da46a5..d5c72bd56ee 100644
--- a/runtime/onert/core/include/ir/operation/SpaceToDepth.h
+++ b/runtime/onert/core/include/ir/operation/SpaceToDepth.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_IR_OPERATION_SPACE_TO_DEPTH_H__
 #define __ONERT_IR_OPERATION_SPACE_TO_DEPTH_H__
 
-#include <memory>
-
 #include "ir/Operation.h"
 
+#include <memory>
+
 namespace onert::ir::operation
 {
 
diff --git a/runtime/onert/core/include/ir/operation/StatelessRandomUniform.h b/runtime/onert/core/include/ir/operation/StatelessRandomUniform.h
index 45d8785f4cf..d7ded8b1b51 100644
--- a/runtime/onert/core/include/ir/operation/StatelessRandomUniform.h
+++ b/runtime/onert/core/include/ir/operation/StatelessRandomUniform.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_IR_OPERATION_STATELESS_RANDOM_UNIFORM_H__
 #define __ONERT_IR_OPERATION_STATELESS_RANDOM_UNIFORM_H__
 
-#include <memory>
-
 #include "ir/Operation.h"
 
+#include <memory>
+
 namespace onert::ir::operation
 {
 
diff --git a/runtime/onert/core/include/ir/operation/StridedSlice.h b/runtime/onert/core/include/ir/operation/StridedSlice.h
index 8257c662cdb..02901fb17d7 100644
--- a/runtime/onert/core/include/ir/operation/StridedSlice.h
+++ b/runtime/onert/core/include/ir/operation/StridedSlice.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_IR_OPERATION_STRIDED_SLICE_H__
 #define __ONERT_IR_OPERATION_STRIDED_SLICE_H__
 
-#include <memory>
-
 #include "ir/Operation.h"
 
+#include <memory>
+
 namespace onert::ir::operation
 {
 
diff --git a/runtime/onert/core/include/ir/operation/Tile.h b/runtime/onert/core/include/ir/operation/Tile.h
index 3d02b6371e2..745ddc0c414 100644
--- a/runtime/onert/core/include/ir/operation/Tile.h
+++ b/runtime/onert/core/include/ir/operation/Tile.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_IR_OPERATION_TILE_H__
 #define __ONERT_IR_OPERATION_TILE_H__
 
-#include <memory>
-
 #include "ir/Operation.h"
 
+#include <memory>
+
 namespace onert::ir::operation
 {
 
diff --git a/runtime/onert/core/include/ir/operation/TopKV2.h b/runtime/onert/core/include/ir/operation/TopKV2.h
index 477f10d4b06..eb8c5ece451 100644
--- a/runtime/onert/core/include/ir/operation/TopKV2.h
+++ b/runtime/onert/core/include/ir/operation/TopKV2.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_IR_OPERATION_TOPK_V2_H__
 #define __ONERT_IR_OPERATION_TOPK_V2_H__
 
-#include <memory>
-
 #include "ir/Operation.h"
 
+#include <memory>
+
 namespace onert::ir::operation
 {
 
diff --git a/runtime/onert/core/include/ir/operation/TransposeConv.h b/runtime/onert/core/include/ir/operation/TransposeConv.h
index cfa4cc6c550..fd1923d4649 100644
--- a/runtime/onert/core/include/ir/operation/TransposeConv.h
+++ b/runtime/onert/core/include/ir/operation/TransposeConv.h
@@ -17,12 +17,12 @@
 #ifndef __ONERT_IR_OPERATION_TRANSPOSE_CONV_H__
 #define __ONERT_IR_OPERATION_TRANSPOSE_CONV_H__
 
-#include <memory>
-
-#include "ir/Operation.h"
 #include "ir/InternalType.h"
+#include "ir/Operation.h"
 #include "ir/Padding.h"
 
+#include <memory>
+
 namespace onert::ir::operation
 {
 
diff --git a/runtime/onert/core/include/ir/operation/While.h b/runtime/onert/core/include/ir/operation/While.h
index 729d520b37d..a1e434bf943 100644
--- a/runtime/onert/core/include/ir/operation/While.h
+++ b/runtime/onert/core/include/ir/operation/While.h
@@ -17,8 +17,8 @@
 #ifndef __ONERT_IR_OPERATION_WHILE_H__
 #define __ONERT_IR_OPERATION_WHILE_H__
 
-#include "ir/Operation.h"
 #include "ir/InternalType.h"
+#include "ir/Operation.h"
 
 namespace onert::ir::operation
 {
diff --git a/runtime/onert/core/include/ir/train/LossInfo.h b/runtime/onert/core/include/ir/train/LossInfo.h
index 5b24a1f4e5b..0aa0e7de67c 100644
--- a/runtime/onert/core/include/ir/train/LossInfo.h
+++ b/runtime/onert/core/include/ir/train/LossInfo.h
@@ -19,8 +19,8 @@
 
 #include "LossCode.h"
 
-#include <variant>
 #include <utility>
+#include <variant>
 
 namespace onert::ir::train
 {
diff --git a/runtime/onert/core/include/ir/train/OptimizerCode.h b/runtime/onert/core/include/ir/train/OptimizerCode.h
index 7b45719fef8..e1fcae91ad8 100644
--- a/runtime/onert/core/include/ir/train/OptimizerCode.h
+++ b/runtime/onert/core/include/ir/train/OptimizerCode.h
@@ -17,8 +17,9 @@
 #ifndef __ONERT_IR_TRAIN_OPTIMIZER_CODE_H__
 #define __ONERT_IR_TRAIN_OPTIMIZER_CODE_H__
 
-#include <functional>
 #include <stdint.h>
+
+#include <functional>
 #include <string>
 
 namespace onert::ir::train
diff --git a/runtime/onert/core/include/ir/train/TrainableGraph.h b/runtime/onert/core/include/ir/train/TrainableGraph.h
index aa0a8e1f32a..8873be5449c 100644
--- a/runtime/onert/core/include/ir/train/TrainableGraph.h
+++ b/runtime/onert/core/include/ir/train/TrainableGraph.h
@@ -17,13 +17,13 @@
 #ifndef __ONERT_IR_TRAIN_TRAINABLE_GRAPH_H__
 #define __ONERT_IR_TRAIN_TRAINABLE_GRAPH_H__
 
-#include <functional>
-#include <unordered_map>
-
 #include "ir/Graph.h"
 #include "ir/train/ITrainableOperation.h"
 #include "ir/train/UseDefChains.h"
 
+#include <functional>
+#include <unordered_map>
+
 namespace onert::ir::train
 {
 
diff --git a/runtime/onert/core/include/ir/train/TrainingInfo.h b/runtime/onert/core/include/ir/train/TrainingInfo.h
index c870fd43fb5..71ee0fa1476 100644
--- a/runtime/onert/core/include/ir/train/TrainingInfo.h
+++ b/runtime/onert/core/include/ir/train/TrainingInfo.h
@@ -19,9 +19,9 @@
 #define __ONERT_IR_TRAIN_TRAINING_INFO_H__
 
 #include "ir/Index.h"
+#include "ir/train/LossInfo.h"
 #include "ir/train/OptimizerCode.h"
 #include "ir/train/OptimizerInfo.h"
-#include "ir/train/LossInfo.h"
 
 #include <set>
 
diff --git a/runtime/onert/core/include/ir/train/UseDefChains.h b/runtime/onert/core/include/ir/train/UseDefChains.h
index b7cae6383dd..138b0faabe8 100644
--- a/runtime/onert/core/include/ir/train/UseDefChains.h
+++ b/runtime/onert/core/include/ir/train/UseDefChains.h
@@ -17,8 +17,8 @@
 #ifndef __ONERT_IR_TRAIN_USEDEFCHAINS_H__
 #define __ONERT_IR_TRAIN_USEDEFCHAINS_H__
 
-#include "ir/train/UseDefChain.h"
 #include "ir/train/Index.h"
+#include "ir/train/UseDefChain.h"
 
 #include <unordered_map>
 
diff --git a/runtime/onert/core/include/ir/train/operation/Loss.h b/runtime/onert/core/include/ir/train/operation/Loss.h
index 6eeac94df0b..90fe2b5660d 100644
--- a/runtime/onert/core/include/ir/train/operation/Loss.h
+++ b/runtime/onert/core/include/ir/train/operation/Loss.h
@@ -18,10 +18,9 @@
 #define __ONERT_IR_TRAIN_OPERATION_LOSS_H__
 
 #include "ir/operation/Loss.h"
-#include "ir/train/TrainableOperation.h"
-
 #include "ir/train/LossCode.h"
 #include "ir/train/LossInfo.h"
+#include "ir/train/TrainableOperation.h"
 
 namespace onert::ir::train::operation
 {
diff --git a/runtime/onert/core/include/ir/train/operation/UntrainableOperation.h b/runtime/onert/core/include/ir/train/operation/UntrainableOperation.h
index c06ec7595c2..47fe0a5a39f 100644
--- a/runtime/onert/core/include/ir/train/operation/UntrainableOperation.h
+++ b/runtime/onert/core/include/ir/train/operation/UntrainableOperation.h
@@ -17,9 +17,8 @@
 #ifndef __ONERT_IR_TRAIN_OPERATION_UNTRAINABLE_OPERATION_H__
 #define __ONERT_IR_TRAIN_OPERATION_UNTRAINABLE_OPERATION_H__
 
-#include "ir/train/TrainableOperation.h"
-
 #include "ir/OperationVisitor.h"
+#include "ir/train/TrainableOperation.h"
 #include "ir/train/TrainableOperationVisitor.h"
 
 #include <type_traits>
diff --git a/runtime/onert/core/include/loader/train/CheckpointLoader.h b/runtime/onert/core/include/loader/train/CheckpointLoader.h
index f84695b427b..b0ed31fc0a8 100644
--- a/runtime/onert/core/include/loader/train/CheckpointLoader.h
+++ b/runtime/onert/core/include/loader/train/CheckpointLoader.h
@@ -17,8 +17,8 @@
 #ifndef __ONERT_LOADER_TRAIN_CHECKPOINT_LOADER_H__
 #define __ONERT_LOADER_TRAIN_CHECKPOINT_LOADER_H__
 
-#include <string>
 #include <memory>
+#include <string>
 
 namespace onert::exec
 {
diff --git a/runtime/onert/core/include/odc/IQuantizer.h b/runtime/onert/core/include/odc/IQuantizer.h
index b060dd24893..09f94fb8f16 100644
--- a/runtime/onert/core/include/odc/IQuantizer.h
+++ b/runtime/onert/core/include/odc/IQuantizer.h
@@ -18,6 +18,7 @@
 #define __ONERT_ODC_IQUANTIZER_H__
 
 #include "odc/QuantizeType.h"
+
 #include <cstdint>
 
 namespace onert::odc
diff --git a/runtime/onert/core/include/util/CalculateActivationRange.h b/runtime/onert/core/include/util/CalculateActivationRange.h
index 3ce8d3cb929..1c7f9bd4d78 100644
--- a/runtime/onert/core/include/util/CalculateActivationRange.h
+++ b/runtime/onert/core/include/util/CalculateActivationRange.h
@@ -17,10 +17,10 @@
 #ifndef __ONERT_UTIL_CALCULATE_ACTIVATION_RANGE_H__
 #define __ONERT_UTIL_CALCULATE_ACTIVATION_RANGE_H__
 
-#include <limits>
-
 #include "ir/InternalType.h"
 
+#include <limits>
+
 namespace onert::util
 {
 
diff --git a/runtime/onert/core/include/util/Index.h b/runtime/onert/core/include/util/Index.h
index 8ceb27e1403..b6e384f55b5 100644
--- a/runtime/onert/core/include/util/Index.h
+++ b/runtime/onert/core/include/util/Index.h
@@ -17,9 +17,10 @@
 #ifndef __ONERT_UTIL_INDEX_H__
 #define __ONERT_UTIL_INDEX_H__
 
+#include <stdint.h>
+
 #include <functional>
 #include <limits>
-#include <stdint.h>
 #include <string>
 
 namespace onert::util
diff --git a/runtime/onert/core/include/util/ShapeInference.h b/runtime/onert/core/include/util/ShapeInference.h
index a284b443a20..794c4f203fe 100644
--- a/runtime/onert/core/include/util/ShapeInference.h
+++ b/runtime/onert/core/include/util/ShapeInference.h
@@ -18,18 +18,17 @@
 #define __ONERT_GRAPH_SHAPE_INFERENCE_H__
 
 #include "Utils.h"
-
+#include "backend/ITensor.h"
+#include "backend/ITensorRegistry.h"
+#include "compiler/LoweredGraph.h"
+#include "ir/Index.h"
+#include "ir/OperationVisitor.h"
 #include "ir/operation/Concat.h"
 #include "ir/operation/Conv2D.h"
 #include "ir/operation/DepthwiseConv2D.h"
 #include "ir/operation/Pool2D.h"
 #include "ir/operation/Reshape.h"
 #include "ir/operation/StridedSlice.h"
-#include "compiler/LoweredGraph.h"
-#include "ir/Index.h"
-#include "ir/OperationVisitor.h"
-#include "backend/ITensor.h"
-#include "backend/ITensorRegistry.h"
 
 namespace onert::shape_inference
 {
diff --git a/runtime/onert/core/include/util/TracingCtx.h b/runtime/onert/core/include/util/TracingCtx.h
index e3a5a363480..a3c5ae6ff7f 100644
--- a/runtime/onert/core/include/util/TracingCtx.h
+++ b/runtime/onert/core/include/util/TracingCtx.h
@@ -21,8 +21,8 @@
 #include "ir/Index.h"
 #include "ir/Model.h"
 
-#include <unordered_map>
 #include <mutex>
+#include <unordered_map>
 
 namespace onert::util
 {
diff --git a/runtime/onert/core/include/util/logging.h b/runtime/onert/core/include/util/logging.h
index 1e2dc380022..f0a42f7d72c 100644
--- a/runtime/onert/core/include/util/logging.h
+++ b/runtime/onert/core/include/util/logging.h
@@ -17,11 +17,11 @@
 #ifndef __ONERT_UTIL_LOGGING_H__
 #define __ONERT_UTIL_LOGGING_H__
 
-#include <iostream>
-#include <cstring>
-
 #include "util/ConfigSource.h"
 
+#include <cstring>
+#include <iostream>
+
 namespace onert::util::logging
 {
 
diff --git a/runtime/onert/core/src/backend/basic/DynamicTensorManager.cc b/runtime/onert/core/src/backend/basic/DynamicTensorManager.cc
index bfb7cd8aaf9..b41324d2e41 100644
--- a/runtime/onert/core/src/backend/basic/DynamicTensorManager.cc
+++ b/runtime/onert/core/src/backend/basic/DynamicTensorManager.cc
@@ -16,8 +16,8 @@
 
 #include "backend/basic/DynamicTensorManager.h"
 
-#include "util/logging.h"
 #include "misc/polymorphic_downcast.h"
+#include "util/logging.h"
 
 namespace onert::backend::basic
 {
diff --git a/runtime/onert/core/src/backend/basic/MemoryManager.cc b/runtime/onert/core/src/backend/basic/MemoryManager.cc
index d6345ba7ae4..5c3230b76e8 100644
--- a/runtime/onert/core/src/backend/basic/MemoryManager.cc
+++ b/runtime/onert/core/src/backend/basic/MemoryManager.cc
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#include <backend/basic/MemoryManager.h>
-
-#include <cassert>
-
 #include "MemoryPlannerFactory.h"
 #include "util/ConfigSource.h"
 #include "util/logging.h"
 
+#include <backend/basic/MemoryManager.h>
+
+#include <cassert>
+
 namespace onert::backend::basic
 {
 
diff --git a/runtime/onert/core/src/backend/basic/MemoryPlanner.cc b/runtime/onert/core/src/backend/basic/MemoryPlanner.cc
index 141510bb809..3b9bacfae60 100644
--- a/runtime/onert/core/src/backend/basic/MemoryPlanner.cc
+++ b/runtime/onert/core/src/backend/basic/MemoryPlanner.cc
@@ -15,7 +15,9 @@
  */
 
 #include "MemoryPlanner.h"
+
 #include "util/logging.h"
+
 #include <cassert>
 
 namespace onert::backend::basic
diff --git a/runtime/onert/core/src/backend/basic/MemoryPlanner.h b/runtime/onert/core/src/backend/basic/MemoryPlanner.h
index 0a71b4685ad..9900f5cff3e 100644
--- a/runtime/onert/core/src/backend/basic/MemoryPlanner.h
+++ b/runtime/onert/core/src/backend/basic/MemoryPlanner.h
@@ -22,15 +22,15 @@
 #ifndef __ONERT_BACKEND_BASIC_MEMORY_PLANNER_H__
 #define __ONERT_BACKEND_BASIC_MEMORY_PLANNER_H__
 
-#include <map>
-#include <vector>
-#include <unordered_set>
-#include <memory>
-
 #include "backend/basic/Allocator.h"
 #include "backend/basic/IMemoryPlanner.h"
 #include "ir/OperandIndexMap.h"
 
+#include <map>
+#include <memory>
+#include <unordered_set>
+#include <vector>
+
 namespace onert::backend::basic
 {
 
diff --git a/runtime/onert/core/src/backend/basic/MemoryPlanner.test.cc b/runtime/onert/core/src/backend/basic/MemoryPlanner.test.cc
index a32228cbeea..232958962a2 100644
--- a/runtime/onert/core/src/backend/basic/MemoryPlanner.test.cc
+++ b/runtime/onert/core/src/backend/basic/MemoryPlanner.test.cc
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
-
 #include "MemoryPlanner.h"
+
 #include "ir/Index.h"
 
+#include <gtest/gtest.h>
+
 TEST(Allocator, allocate_test)
 {
   ::onert::backend::basic::Allocator allocator(1024);
diff --git a/runtime/onert/core/src/backend/basic/MemoryPlannerFactory.h b/runtime/onert/core/src/backend/basic/MemoryPlannerFactory.h
index be9a49e0c7b..1decfe07837 100644
--- a/runtime/onert/core/src/backend/basic/MemoryPlannerFactory.h
+++ b/runtime/onert/core/src/backend/basic/MemoryPlannerFactory.h
@@ -17,8 +17,8 @@
 #ifndef __ONERT_BACKEND_BASIC_MEMORY_PLANNER_FACTORY_H__
 #define __ONERT_BACKEND_BASIC_MEMORY_PLANNER_FACTORY_H__
 
-#include "backend/basic/IMemoryPlanner.h"
 #include "MemoryPlanner.h"
+#include "backend/basic/IMemoryPlanner.h"
 
 #include <string>
 
diff --git a/runtime/onert/core/src/backend/basic/StaticTensorManager.cc b/runtime/onert/core/src/backend/basic/StaticTensorManager.cc
index a3b6cf18272..6deee85ca45 100644
--- a/runtime/onert/core/src/backend/basic/StaticTensorManager.cc
+++ b/runtime/onert/core/src/backend/basic/StaticTensorManager.cc
@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-#include <algorithm>
-
 #include "backend/basic/StaticTensorManager.h"
 
 #include "backend/basic/DynamicTensorManager.h"
 #include "backend/basic/Tensor.h"
+
 #include <util/logging.h>
 
+#include <algorithm>
+
 namespace onert::backend::basic
 {
 
diff --git a/runtime/onert/core/src/backend/basic/Tensor.cc b/runtime/onert/core/src/backend/basic/Tensor.cc
index 990e35e0836..3be86149287 100644
--- a/runtime/onert/core/src/backend/basic/Tensor.cc
+++ b/runtime/onert/core/src/backend/basic/Tensor.cc
@@ -16,8 +16,8 @@
 
 #include "backend/basic/Tensor.h"
 
-#include "ir/DataType.h"
 #include "backend/basic/MemoryManager.h"
+#include "ir/DataType.h"
 
 namespace onert::backend::basic
 {
diff --git a/runtime/onert/core/src/backend/basic/TensorBuilder.cc b/runtime/onert/core/src/backend/basic/TensorBuilder.cc
index 1246a5cfea1..a608b95587b 100644
--- a/runtime/onert/core/src/backend/basic/TensorBuilder.cc
+++ b/runtime/onert/core/src/backend/basic/TensorBuilder.cc
@@ -15,7 +15,6 @@
  */
 
 #include <backend/basic/TensorBuilder.h>
-
 #include <util/logging.h>
 
 #include <cassert>
diff --git a/runtime/onert/core/src/backend/builtin/Backend.h b/runtime/onert/core/src/backend/builtin/Backend.h
index ee51eab1f10..8529e3b8e3c 100644
--- a/runtime/onert/core/src/backend/builtin/Backend.h
+++ b/runtime/onert/core/src/backend/builtin/Backend.h
@@ -20,8 +20,8 @@
 #include "BackendContext.h"
 #include "Config.h"
 #include "KernelGenerator.h"
-#include "TensorBuilder.h"
 #include "Tensor.h"
+#include "TensorBuilder.h"
 #include "train/BackendContext.h"
 #include "train/KernelGenerator.h"
 #include "train/TensorRegistry.h"
diff --git a/runtime/onert/core/src/backend/builtin/Config.h b/runtime/onert/core/src/backend/builtin/Config.h
index d0259600f85..b88101164a0 100644
--- a/runtime/onert/core/src/backend/builtin/Config.h
+++ b/runtime/onert/core/src/backend/builtin/Config.h
@@ -18,9 +18,10 @@
 #define __ONERT_BACKEND_BUILTIN_CONFIG_H__
 
 #include <backend/IConfig.h>
-#include <memory>
 #include <util/ITimer.h>
 
+#include <memory>
+
 namespace onert::backend::builtin
 {
 
diff --git a/runtime/onert/core/src/backend/builtin/DynamicTensorManager.h b/runtime/onert/core/src/backend/builtin/DynamicTensorManager.h
index 18c2559d382..3ae90e9dc49 100644
--- a/runtime/onert/core/src/backend/builtin/DynamicTensorManager.h
+++ b/runtime/onert/core/src/backend/builtin/DynamicTensorManager.h
@@ -17,8 +17,8 @@
 #ifndef __ONERT_BACKEND_BUILTIN_DYNAMICTENSOR_MANAGER_H__
 #define __ONERT_BACKEND_BUILTIN_DYNAMICTENSOR_MANAGER_H__
 
-#include "TensorRegistry.h"
 #include "Tensor.h"
+#include "TensorRegistry.h"
 
 #include <backend/basic/DynamicTensorManager.h>
 
diff --git a/runtime/onert/core/src/backend/builtin/IOTensor.h b/runtime/onert/core/src/backend/builtin/IOTensor.h
index 6af12ab9d32..541b9fa0af6 100644
--- a/runtime/onert/core/src/backend/builtin/IOTensor.h
+++ b/runtime/onert/core/src/backend/builtin/IOTensor.h
@@ -17,8 +17,8 @@
 #ifndef __ONERT_BACKEND_BUILTIN_IO_TENSOR_H__
 #define __ONERT_BACKEND_BUILTIN_IO_TENSOR_H__
 
-#include "backend/IPortableTensor.h"
 #include "UserTensor.h"
+#include "backend/IPortableTensor.h"
 
 namespace onert::backend::builtin
 {
diff --git a/runtime/onert/core/src/backend/builtin/KernelGenerator.cc b/runtime/onert/core/src/backend/builtin/KernelGenerator.cc
index 017dcd12fc3..3bbbde11e02 100644
--- a/runtime/onert/core/src/backend/builtin/KernelGenerator.cc
+++ b/runtime/onert/core/src/backend/builtin/KernelGenerator.cc
@@ -16,13 +16,12 @@
 
 #include "KernelGenerator.h"
 
+#include "exec/FunctionSequence.h"
 #include "kernel/CallLayer.h"
 #include "kernel/IfLayer.h"
 #include "kernel/PermuteLayer.h"
 #include "kernel/WhileLayer.h"
 
-#include "exec/FunctionSequence.h"
-
 namespace onert::backend::builtin
 {
 
diff --git a/runtime/onert/core/src/backend/builtin/KernelGenerator.h b/runtime/onert/core/src/backend/builtin/KernelGenerator.h
index 71670f35eb5..e24fb5b5474 100644
--- a/runtime/onert/core/src/backend/builtin/KernelGenerator.h
+++ b/runtime/onert/core/src/backend/builtin/KernelGenerator.h
@@ -17,13 +17,12 @@
 #ifndef __ONERT_BACKEND_BUILTIN_KERNEL_GENERATOR_H__
 #define __ONERT_BACKEND_BUILTIN_KERNEL_GENERATOR_H__
 
+#include "../../compiler/TensorRegistries.h"
 #include "DynamicTensorManager.h"
 #include "ExternalContext.h"
 #include "TensorRegistry.h"
-#include "../../compiler/TensorRegistries.h"
-
-#include "backend/basic/KernelGeneratorBase.h"
 #include "backend/CustomKernelBuilder.h"
+#include "backend/basic/KernelGeneratorBase.h"
 #include "exec/IExecutors.h"
 #include "ir/Graph.h"
 
diff --git a/runtime/onert/core/src/backend/builtin/TensorBuilder.h b/runtime/onert/core/src/backend/builtin/TensorBuilder.h
index 93e7f2b37da..adbd5e23c53 100644
--- a/runtime/onert/core/src/backend/builtin/TensorBuilder.h
+++ b/runtime/onert/core/src/backend/builtin/TensorBuilder.h
@@ -17,16 +17,15 @@
 #ifndef __ONERT_BACKEND_BUILTIN_TENSOR_BUILDER_H__
 #define __ONERT_BACKEND_BUILTIN_TENSOR_BUILDER_H__
 
+#include "DynamicTensorManager.h"
+
 #include <backend/basic/StaticTensorManager.h>
-#include <backend/basic/TensorRegistry.h>
 #include <backend/basic/Tensor.h>
-
+#include <backend/basic/TensorRegistry.h>
 #include <ir/OperandIndexMap.h>
 
 #include <unordered_map>
 
-#include "DynamicTensorManager.h"
-
 namespace onert::backend::builtin
 {
 
diff --git a/runtime/onert/core/src/backend/builtin/TensorRegistry.h b/runtime/onert/core/src/backend/builtin/TensorRegistry.h
index df37d4b9370..c239959945a 100644
--- a/runtime/onert/core/src/backend/builtin/TensorRegistry.h
+++ b/runtime/onert/core/src/backend/builtin/TensorRegistry.h
@@ -17,10 +17,11 @@
 #ifndef __ONERT_BACKEND_BUILTIN_TENSOR_REGISTRY_H__
 #define __ONERT_BACKEND_BUILTIN_TENSOR_REGISTRY_H__
 
-#include "backend/basic/TensorRegistry.h"
-#include "backend/ITensorRegistry.h"
-#include "Tensor.h"
 #include "IOTensor.h"
+#include "Tensor.h"
+#include "backend/ITensorRegistry.h"
+#include "backend/basic/TensorRegistry.h"
+
 #include <assert.h>
 
 namespace onert::backend::builtin
diff --git a/runtime/onert/core/src/backend/builtin/UserTensor.cc b/runtime/onert/core/src/backend/builtin/UserTensor.cc
index 1d202fa90e0..0834eb3cfd6 100644
--- a/runtime/onert/core/src/backend/builtin/UserTensor.cc
+++ b/runtime/onert/core/src/backend/builtin/UserTensor.cc
@@ -16,8 +16,8 @@
 
 #include "UserTensor.h"
 
-#include "util/Exceptions.h"
 #include "ir/DataType.h"
+#include "util/Exceptions.h"
 
 namespace onert::backend::builtin
 {
diff --git a/runtime/onert/core/src/backend/builtin/UserTensor.h b/runtime/onert/core/src/backend/builtin/UserTensor.h
index 0202e54716d..a0514183cce 100644
--- a/runtime/onert/core/src/backend/builtin/UserTensor.h
+++ b/runtime/onert/core/src/backend/builtin/UserTensor.h
@@ -17,8 +17,8 @@
 #ifndef __ONERT_BACKEND_BUILTIN_USER_TENSOR_H__
 #define __ONERT_BACKEND_BUILTIN_USER_TENSOR_H__
 
-#include "ir/OperandInfo.h"
 #include "backend/IPortableTensor.h"
+#include "ir/OperandInfo.h"
 
 namespace onert::backend::builtin
 {
diff --git a/runtime/onert/core/src/backend/builtin/kernel/CallLayer.h b/runtime/onert/core/src/backend/builtin/kernel/CallLayer.h
index 2b189c160b6..cb28225e502 100644
--- a/runtime/onert/core/src/backend/builtin/kernel/CallLayer.h
+++ b/runtime/onert/core/src/backend/builtin/kernel/CallLayer.h
@@ -17,10 +17,11 @@
 #ifndef __ONERT_BACKEND_BUILTIN_KERNEL_CALL_LAYER_H__
 #define __ONERT_BACKEND_BUILTIN_KERNEL_CALL_LAYER_H__
 
+#include "../ExternalContext.h"
+
 #include <backend/IPortableTensor.h>
 #include <exec/IExecutors.h>
 #include <exec/IFunction.h>
-#include "../ExternalContext.h"
 
 namespace onert::backend::builtin::kernel
 {
diff --git a/runtime/onert/core/src/backend/builtin/kernel/IfLayer.h b/runtime/onert/core/src/backend/builtin/kernel/IfLayer.h
index 9a6a3146018..dca44a3da8c 100644
--- a/runtime/onert/core/src/backend/builtin/kernel/IfLayer.h
+++ b/runtime/onert/core/src/backend/builtin/kernel/IfLayer.h
@@ -17,10 +17,11 @@
 #ifndef __ONERT_BACKEND_BUILTIN_KERNEL_IF_LAYER_H__
 #define __ONERT_BACKEND_BUILTIN_KERNEL_IF_LAYER_H__
 
+#include "../ExternalContext.h"
+
 #include <backend/IPortableTensor.h>
 #include <exec/IExecutors.h>
 #include <exec/IFunction.h>
-#include "../ExternalContext.h"
 
 namespace onert::backend::builtin::kernel
 {
diff --git a/runtime/onert/core/src/backend/builtin/kernel/PermuteLayer.h b/runtime/onert/core/src/backend/builtin/kernel/PermuteLayer.h
index 507c530f8ae..6b51c76c444 100644
--- a/runtime/onert/core/src/backend/builtin/kernel/PermuteLayer.h
+++ b/runtime/onert/core/src/backend/builtin/kernel/PermuteLayer.h
@@ -17,8 +17,8 @@
 #ifndef __ONERT_BACKEND_BUILTIN_KERNEL_PERMUTELAYER_H__
 #define __ONERT_BACKEND_BUILTIN_KERNEL_PERMUTELAYER_H__
 
-#include "../ExternalContext.h"
 #include "../../../exec/IPermuteFunction.h"
+#include "../ExternalContext.h"
 
 #include <ruy/thread_pool.h> // from @ruy
 
diff --git a/runtime/onert/core/src/backend/builtin/kernel/WhileLayer.cc b/runtime/onert/core/src/backend/builtin/kernel/WhileLayer.cc
index 9eea2431cc4..7b6c8b6b12d 100644
--- a/runtime/onert/core/src/backend/builtin/kernel/WhileLayer.cc
+++ b/runtime/onert/core/src/backend/builtin/kernel/WhileLayer.cc
@@ -16,8 +16,8 @@
 
 #include "WhileLayer.h"
 
-#include "PermuteLayer.h"
 #include "../../../exec/ExecutorBase.h"
+#include "PermuteLayer.h"
 
 #include <misc/polymorphic_downcast.h>
 
diff --git a/runtime/onert/core/src/backend/builtin/kernel/WhileLayer.h b/runtime/onert/core/src/backend/builtin/kernel/WhileLayer.h
index 4b8834686db..0363d8abf51 100644
--- a/runtime/onert/core/src/backend/builtin/kernel/WhileLayer.h
+++ b/runtime/onert/core/src/backend/builtin/kernel/WhileLayer.h
@@ -17,14 +17,14 @@
 #ifndef __ONERT_BACKEND_BUILTIN_KERNEL_WHILE_LAYER_H__
 #define __ONERT_BACKEND_BUILTIN_KERNEL_WHILE_LAYER_H__
 
+#include "../ExternalContext.h"
+#include "backend/basic/MemoryManager.h"
+
 #include <backend/IPortableTensor.h>
 #include <exec/IExecutors.h>
 #include <exec/IFunction.h>
-#include <ir/OperandIndexSequence.h>
 #include <ir/Graph.h>
-#include "../ExternalContext.h"
-
-#include "backend/basic/MemoryManager.h"
+#include <ir/OperandIndexSequence.h>
 
 namespace onert::backend::builtin::kernel
 {
diff --git a/runtime/onert/core/src/backend/builtin/train/BackendContext.h b/runtime/onert/core/src/backend/builtin/train/BackendContext.h
index b6e81880b39..afbb1221ce5 100644
--- a/runtime/onert/core/src/backend/builtin/train/BackendContext.h
+++ b/runtime/onert/core/src/backend/builtin/train/BackendContext.h
@@ -17,11 +17,11 @@
 #ifndef __ONERT_BACKEND_BUILTIN_TRAIN_BACKEND_CONTEXT_H__
 #define __ONERT_BACKEND_BUILTIN_TRAIN_BACKEND_CONTEXT_H__
 
-#include <backend/train/TrainableBackendContext.h>
-
-#include "KernelGenerator.h"
 #include "../ExternalContext.h"
 #include "../TensorBuilder.h"
+#include "KernelGenerator.h"
+
+#include <backend/train/TrainableBackendContext.h>
 
 namespace onert::backend::builtin::train
 {
diff --git a/runtime/onert/core/src/backend/builtin/train/KernelGenerator.h b/runtime/onert/core/src/backend/builtin/train/KernelGenerator.h
index eaf46ef48b1..58a6af13c3c 100644
--- a/runtime/onert/core/src/backend/builtin/train/KernelGenerator.h
+++ b/runtime/onert/core/src/backend/builtin/train/KernelGenerator.h
@@ -17,9 +17,9 @@
 #ifndef __ONERT_BACKEND_BUTIN_TRAIN_KERNEL_GENERATOR_H__
 #define __ONERT_BACKEND_BUTIN_TRAIN_KERNEL_GENERATOR_H__
 
+#include "../../../compiler/train/TensorRegistries.h"
 #include "../ExternalContext.h"
 #include "../train/TensorRegistry.h"
-#include "../../../compiler/train/TensorRegistries.h"
 
 #include <backend/train/KernelGeneratorBase.h>
 #include <exec/train/TrainableFnSequence.h>
diff --git a/runtime/onert/core/src/backend/builtin/train/TensorRegistry.h b/runtime/onert/core/src/backend/builtin/train/TensorRegistry.h
index 858dd07aca5..5f7d9115b23 100644
--- a/runtime/onert/core/src/backend/builtin/train/TensorRegistry.h
+++ b/runtime/onert/core/src/backend/builtin/train/TensorRegistry.h
@@ -17,12 +17,12 @@
 #ifndef __ONERT_BACKEND_BUILTIN_TRAIN_TENSOR_REGISTRY_H__
 #define __ONERT_BACKEND_BUILTIN_TRAIN_TENSOR_REGISTRY_H__
 
-#include <backend/train/ITensorRegistry.h>
-
 #include "../IOTensor.h"
 #include "../Tensor.h"
 #include "Tensor.h"
 
+#include <backend/train/ITensorRegistry.h>
+
 namespace onert::backend::builtin::train
 {
 
diff --git a/runtime/onert/core/src/backend/builtin/train/kernel/PermuteLayer.h b/runtime/onert/core/src/backend/builtin/train/kernel/PermuteLayer.h
index 98f06b56e12..780ac5cb1a0 100644
--- a/runtime/onert/core/src/backend/builtin/train/kernel/PermuteLayer.h
+++ b/runtime/onert/core/src/backend/builtin/train/kernel/PermuteLayer.h
@@ -18,7 +18,6 @@
 #define __ONERT_BACKEND_BUILTIN_TRAIN_KERNEL_PERMUTELAYER_H__
 
 #include "../../kernel/PermuteLayer.h"
-
 #include "exec/train/ITrainableFunction.h"
 
 namespace onert::backend::builtin::train::kernel
diff --git a/runtime/onert/core/src/compiler/BackendManager.cc b/runtime/onert/core/src/compiler/BackendManager.cc
index 3af97730292..0b8baad6d4e 100644
--- a/runtime/onert/core/src/compiler/BackendManager.cc
+++ b/runtime/onert/core/src/compiler/BackendManager.cc
@@ -20,6 +20,7 @@
 #include "../backend/builtin/Config.h"
 
 #include <dlfcn.h>
+
 #include <memory>
 
 static const char *SHARED_LIB_EXT =
diff --git a/runtime/onert/core/src/compiler/Compiler.cc b/runtime/onert/core/src/compiler/Compiler.cc
index 1aa9e39dc53..a5724ed0313 100644
--- a/runtime/onert/core/src/compiler/Compiler.cc
+++ b/runtime/onert/core/src/compiler/Compiler.cc
@@ -16,24 +16,23 @@
 
 #include "Compiler.h"
 
+#include "../dumper/dot/DotDumper.h"
+#include "../exec/MultiModelExecutors.h"
+#include "../exec/SingleModelExecutors.h"
+#include "../ir/OperationDumper.h"
+#include "../ir/verifier/Verifier.h"
 #include "CompilerHelpers.h"
 #include "ExecutorFactory.h"
 #include "ShapeValidator.h"
+#include "compiler/StaticShapeInferer.h"
 #include "pass/ConstantOutputPass.h"
 #include "pass/OddOutputPass.h"
 #include "pass/PassRunner.h"
 #include "pass/PermutationIOPass.h"
 #include "pass/UnusedOperandEliminationPass.h"
-#include "../dumper/dot/DotDumper.h"
-#include "../exec/MultiModelExecutors.h"
-#include "../exec/SingleModelExecutors.h"
-#include "../ir/OperationDumper.h"
-#include "../ir/verifier/Verifier.h"
 
-#include "compiler/StaticShapeInferer.h"
-
-#include <misc/string_helpers.h>
 #include <misc/polymorphic_downcast.h>
+#include <misc/string_helpers.h>
 
 namespace onert::compiler
 {
diff --git a/runtime/onert/core/src/compiler/CompilerOptions.cc b/runtime/onert/core/src/compiler/CompilerOptions.cc
index 82994640b67..ba1d9106600 100644
--- a/runtime/onert/core/src/compiler/CompilerOptions.cc
+++ b/runtime/onert/core/src/compiler/CompilerOptions.cc
@@ -17,7 +17,6 @@
 #include "compiler/CompilerOptions.h"
 
 #include "../backend/builtin/Backend.h"
-
 #include "util/ConfigSource.h"
 #include "util/logging.h"
 
diff --git a/runtime/onert/core/src/compiler/ExecutorFactory.cc b/runtime/onert/core/src/compiler/ExecutorFactory.cc
index db031939a5a..b5b539f555d 100644
--- a/runtime/onert/core/src/compiler/ExecutorFactory.cc
+++ b/runtime/onert/core/src/compiler/ExecutorFactory.cc
@@ -16,7 +16,6 @@
 
 #include "ExecutorFactory.h"
 
-#include "Linear.h"
 #include "../backend/builtin/BackendContext.h"
 #include "../backend/builtin/Config.h"
 #include "../backend/builtin/UserTensor.h"
@@ -30,10 +29,11 @@
 #include "../exec/ParallelExecutor.h"
 #include "../exec/train/TrainableExecutor.h"
 #include "../ir/OperationCloner.h"
+#include "Linear.h"
 
 #include <backend/IPortableTensor.h>
-#include <backend/train/TrainableBackendContext.h>
 #include <backend/train/ITrainableBackend.h>
+#include <backend/train/TrainableBackendContext.h>
 #include <compiler/BackendManager.h>
 #include <compiler/ExecutionBuilder.h>
 #include <util/TracingCtx.h>
diff --git a/runtime/onert/core/src/compiler/ExecutorFactory.h b/runtime/onert/core/src/compiler/ExecutorFactory.h
index d7879b0387b..7f7c275f28e 100644
--- a/runtime/onert/core/src/compiler/ExecutorFactory.h
+++ b/runtime/onert/core/src/compiler/ExecutorFactory.h
@@ -18,7 +18,6 @@
 #define __ONERT_COMPILER_EXECUTOR_FACTORY_H__
 
 #include "TensorRegistries.h"
-
 #include "backend/ITensor.h"
 #include "backend/train/TrainableBackendContext.h"
 #include "compiler/LoweredGraph.h"
diff --git a/runtime/onert/core/src/compiler/Fp32ToFp16Converter.cc b/runtime/onert/core/src/compiler/Fp32ToFp16Converter.cc
index 2363222b59c..6825aa8aa0a 100644
--- a/runtime/onert/core/src/compiler/Fp32ToFp16Converter.cc
+++ b/runtime/onert/core/src/compiler/Fp32ToFp16Converter.cc
@@ -17,8 +17,9 @@
 #if 0 // This file is temporarily unused
 
 #include "Fp32ToFp16Converter.h"
-#include "ir/operation/ConvertFp32ToFp16.h"
+
 #include "ir/operation/ConvertFp16ToFp32.h"
+#include "ir/operation/ConvertFp32ToFp16.h"
 #include "util/logging.h"
 
 #include <Half.h>
diff --git a/runtime/onert/core/src/compiler/HEScheduler.h b/runtime/onert/core/src/compiler/HEScheduler.h
index 649ae21c105..6d11e71f7fe 100644
--- a/runtime/onert/core/src/compiler/HEScheduler.h
+++ b/runtime/onert/core/src/compiler/HEScheduler.h
@@ -23,9 +23,9 @@
 #ifndef __ONERT_COMPILER_H_E_SCHEDULER_H_
 #define __ONERT_COMPILER_H_E_SCHEDULER_H_
 
-#include "IScheduler.h"
 #include "../backend/builtin/Config.h"
 #include "../exec/ExecTime.h"
+#include "IScheduler.h"
 
 #include <backend/Backend.h>
 #include <compiler/BackendManager.h>
diff --git a/runtime/onert/core/src/compiler/HEScheduler.test.cc b/runtime/onert/core/src/compiler/HEScheduler.test.cc
index d1e4b9e2cbc..1db7812f619 100644
--- a/runtime/onert/core/src/compiler/HEScheduler.test.cc
+++ b/runtime/onert/core/src/compiler/HEScheduler.test.cc
@@ -15,6 +15,7 @@
  */
 
 #include "HEScheduler.h"
+
 #include "../exec/ExecTime.h"
 
 #include <ir/DataType.h>
diff --git a/runtime/onert/core/src/compiler/Linear.cc b/runtime/onert/core/src/compiler/Linear.cc
index 70a63794f2c..267a3e4510d 100644
--- a/runtime/onert/core/src/compiler/Linear.cc
+++ b/runtime/onert/core/src/compiler/Linear.cc
@@ -17,7 +17,6 @@
 #include "Linear.h"
 
 #include "../dumper/text/GraphDumper.h"
-
 #include "util/logging.h"
 
 #include <sstream>
diff --git a/runtime/onert/core/src/compiler/Linear.h b/runtime/onert/core/src/compiler/Linear.h
index ac0fe6ef450..54c317f8ee1 100644
--- a/runtime/onert/core/src/compiler/Linear.h
+++ b/runtime/onert/core/src/compiler/Linear.h
@@ -17,11 +17,11 @@
 #ifndef __ONERT_COMPILER_LINEAR_H__
 #define __ONERT_COMPILER_LINEAR_H__
 
-#include <vector>
-#include <memory>
-
-#include "ir/Index.h"
 #include "compiler/ILoweredGraph.h"
+#include "ir/Index.h"
+
+#include <memory>
+#include <vector>
 
 namespace onert::compiler
 {
diff --git a/runtime/onert/core/src/compiler/LoweredGraph.cc b/runtime/onert/core/src/compiler/LoweredGraph.cc
index 4c75e559a92..450bf344269 100644
--- a/runtime/onert/core/src/compiler/LoweredGraph.cc
+++ b/runtime/onert/core/src/compiler/LoweredGraph.cc
@@ -16,18 +16,17 @@
 
 #include "compiler/LoweredGraph.h"
 
+#include "../dumper/text/GraphDumper.h"
+#include "../ir/verifier/Verifier.h"
 #include "HEScheduler.h"
 #include "ManualScheduler.h"
+#include "backend/Backend.h"
+#include "compiler/BackendResolver.h"
 #include "pass/ConstantInsertionPass.h"
 #include "pass/ConstantLoweringPass.h"
 #include "pass/PassRunner.h"
 #include "pass/PermutationEliminationPass.h"
 #include "pass/PermutationInsertionPass.h"
-#include "../dumper/text/GraphDumper.h"
-#include "../ir/verifier/Verifier.h"
-
-#include "backend/Backend.h"
-#include "compiler/BackendResolver.h"
 #include "util/logging.h"
 
 #include <cassert>
diff --git a/runtime/onert/core/src/compiler/ManualScheduler.cc b/runtime/onert/core/src/compiler/ManualScheduler.cc
index ce8a7ba2af7..2350bff9315 100644
--- a/runtime/onert/core/src/compiler/ManualScheduler.cc
+++ b/runtime/onert/core/src/compiler/ManualScheduler.cc
@@ -15,14 +15,15 @@
  */
 
 #include "ManualScheduler.h"
-#include "ir/OpCode.h"
-#include "ir/Operations.Include.h"
+
 #include "backend/Backend.h"
 #include "backend/IConfig.h"
 #include "compiler/BackendManager.h"
+#include "ir/OpCode.h"
+#include "ir/Operations.Include.h"
+#include "misc/string_helpers.h"
 #include "util/ConfigSource.h"
 #include "util/logging.h"
-#include "misc/string_helpers.h"
 
 namespace onert::compiler
 {
diff --git a/runtime/onert/core/src/compiler/ManualScheduler.h b/runtime/onert/core/src/compiler/ManualScheduler.h
index 0311da6b8f2..d8dae17c3d5 100644
--- a/runtime/onert/core/src/compiler/ManualScheduler.h
+++ b/runtime/onert/core/src/compiler/ManualScheduler.h
@@ -17,8 +17,8 @@
 #ifndef __ONERT_CORE_COMPILER_MANUAL_SCHEDULER_H__
 #define __ONERT_CORE_COMPILER_MANUAL_SCHEDULER_H__
 
-#include "compiler/CompilerOptions.h"
 #include "IScheduler.h"
+#include "compiler/CompilerOptions.h"
 
 namespace onert::compiler
 {
diff --git a/runtime/onert/core/src/compiler/ShapeValidator.cc b/runtime/onert/core/src/compiler/ShapeValidator.cc
index 788a4cca4fd..eac6e2094d5 100644
--- a/runtime/onert/core/src/compiler/ShapeValidator.cc
+++ b/runtime/onert/core/src/compiler/ShapeValidator.cc
@@ -17,11 +17,11 @@
 
 #include "ShapeValidator.h"
 
-#include <typeinfo>
-
 #include "ir/Graph.h"
 #include "util/logging.h"
 
+#include <typeinfo>
+
 #define OP_REQUIRES(EXP)                                                                     \
   do                                                                                         \
   {                                                                                          \
diff --git a/runtime/onert/core/src/compiler/StaticShapeInferer.cc b/runtime/onert/core/src/compiler/StaticShapeInferer.cc
index b9f1a7976e9..a3426d67f17 100644
--- a/runtime/onert/core/src/compiler/StaticShapeInferer.cc
+++ b/runtime/onert/core/src/compiler/StaticShapeInferer.cc
@@ -15,6 +15,7 @@
  */
 
 #include "compiler/StaticShapeInferer.h"
+
 #include "util/ShapeInference.h"
 #include "util/logging.h"
 
diff --git a/runtime/onert/core/src/compiler/TensorRegistries.h b/runtime/onert/core/src/compiler/TensorRegistries.h
index c3a131a6fa3..dc7723f853f 100644
--- a/runtime/onert/core/src/compiler/TensorRegistries.h
+++ b/runtime/onert/core/src/compiler/TensorRegistries.h
@@ -19,7 +19,6 @@
 
 #include "../backend/builtin/Config.h"
 #include "../backend/builtin/TensorRegistry.h"
-
 #include "backend/Backend.h"
 #include "backend/BackendContext.h"
 
diff --git a/runtime/onert/core/src/compiler/pass/ConstantLoweringPass.cc b/runtime/onert/core/src/compiler/pass/ConstantLoweringPass.cc
index c0cc685f4b4..ac87452e300 100644
--- a/runtime/onert/core/src/compiler/pass/ConstantLoweringPass.cc
+++ b/runtime/onert/core/src/compiler/pass/ConstantLoweringPass.cc
@@ -18,8 +18,8 @@
 
 #include "backend/Backend.h"
 #include "ir/Graph.h"
-#include "util/logging.h"
 #include "util/Utils.h"
+#include "util/logging.h"
 
 namespace onert::compiler::pass
 {
diff --git a/runtime/onert/core/src/compiler/pass/ConstantLoweringPass.h b/runtime/onert/core/src/compiler/pass/ConstantLoweringPass.h
index 755d4a71b44..859131154e0 100644
--- a/runtime/onert/core/src/compiler/pass/ConstantLoweringPass.h
+++ b/runtime/onert/core/src/compiler/pass/ConstantLoweringPass.h
@@ -17,9 +17,10 @@
 #ifndef __ONERT_COMPILER_PASS_CONSTANT_LOWERING_PASS_H__
 #define __ONERT_COMPILER_PASS_CONSTANT_LOWERING_PASS_H__
 
-#include <ir/Index.h>
 #include "LoweredOperationPass.h"
 
+#include <ir/Index.h>
+
 namespace onert::compiler::pass
 {
 
diff --git a/runtime/onert/core/src/compiler/pass/OddOutputPass.h b/runtime/onert/core/src/compiler/pass/OddOutputPass.h
index 877f44b6f5b..844fce8234a 100644
--- a/runtime/onert/core/src/compiler/pass/OddOutputPass.h
+++ b/runtime/onert/core/src/compiler/pass/OddOutputPass.h
@@ -17,11 +17,11 @@
 #ifndef __ONERT_COMPILER_PASS_ODD_OUTPUT_PASS_H__
 #define __ONERT_COMPILER_PASS_ODD_OUTPUT_PASS_H__
 
-#include <unordered_set>
-
 #include "Pass.h"
 #include "ir/Index.h"
 
+#include <unordered_set>
+
 namespace onert::compiler::pass
 {
 
diff --git a/runtime/onert/core/src/compiler/pass/OperationPass.cc b/runtime/onert/core/src/compiler/pass/OperationPass.cc
index e62d09ef773..8899172ea77 100644
--- a/runtime/onert/core/src/compiler/pass/OperationPass.cc
+++ b/runtime/onert/core/src/compiler/pass/OperationPass.cc
@@ -16,9 +16,9 @@
 
 #include "OperationPass.h"
 
-#include "ir/Index.h"
-#include "ir/IOperation.h"
 #include "ir/Graph.h"
+#include "ir/IOperation.h"
+#include "ir/Index.h"
 
 namespace onert::compiler::pass
 {
diff --git a/runtime/onert/core/src/compiler/pass/PassRunner.h b/runtime/onert/core/src/compiler/pass/PassRunner.h
index f3d761b26f1..b28606db947 100644
--- a/runtime/onert/core/src/compiler/pass/PassRunner.h
+++ b/runtime/onert/core/src/compiler/pass/PassRunner.h
@@ -17,13 +17,13 @@
 #ifndef __ONERT_COMPILER_PASS_PASS_RUNNER_H__
 #define __ONERT_COMPILER_PASS_PASS_RUNNER_H__
 
+#include "IPass.h"
+#include "util/logging.h"
+
 #include <initializer_list>
 #include <memory>
 #include <vector>
 
-#include "IPass.h"
-#include "util/logging.h"
-
 namespace onert::compiler::pass
 {
 
diff --git a/runtime/onert/core/src/compiler/pass/PermutationEliminationPass.h b/runtime/onert/core/src/compiler/pass/PermutationEliminationPass.h
index 2f0f22e0040..a9a4745222b 100644
--- a/runtime/onert/core/src/compiler/pass/PermutationEliminationPass.h
+++ b/runtime/onert/core/src/compiler/pass/PermutationEliminationPass.h
@@ -17,8 +17,8 @@
 #ifndef __ONERT_COMPILER_PASS_PERMUTATION_ELIMINATION_PASS_H__
 #define __ONERT_COMPILER_PASS_PERMUTATION_ELIMINATION_PASS_H__
 
-#include "ir/OperationVisitor.h"
 #include "LoweredOperationPass.h"
+#include "ir/OperationVisitor.h"
 
 namespace onert::compiler::pass
 {
diff --git a/runtime/onert/core/src/compiler/pass/PermutationIOPass.h b/runtime/onert/core/src/compiler/pass/PermutationIOPass.h
index 65c506dabd6..30b0e8c6010 100644
--- a/runtime/onert/core/src/compiler/pass/PermutationIOPass.h
+++ b/runtime/onert/core/src/compiler/pass/PermutationIOPass.h
@@ -18,8 +18,8 @@
 #define __ONERT_COMPILER_PASS_PERMUTATION_IO_PASS_H__
 
 #include "Pass.h"
-#include "compiler/ILoweredGraph.h"
 #include "compiler/CompilerOptions.h"
+#include "compiler/ILoweredGraph.h"
 
 namespace onert
 {
diff --git a/runtime/onert/core/src/compiler/pass/PermutationInsertionPass.cc b/runtime/onert/core/src/compiler/pass/PermutationInsertionPass.cc
index 8dca7af3c2f..aa1a6473a2f 100644
--- a/runtime/onert/core/src/compiler/pass/PermutationInsertionPass.cc
+++ b/runtime/onert/core/src/compiler/pass/PermutationInsertionPass.cc
@@ -18,7 +18,6 @@
 #include "PermutationInsertionPass.h"
 
 #include "../../backend/builtin/Config.h"
-
 #include "ir/operation/Permute.h"
 #include "util/logging.h"
 
diff --git a/runtime/onert/core/src/compiler/pass/UnusedOperandEliminationPass.cc b/runtime/onert/core/src/compiler/pass/UnusedOperandEliminationPass.cc
index a98c0166ee4..9f9908ec7b2 100644
--- a/runtime/onert/core/src/compiler/pass/UnusedOperandEliminationPass.cc
+++ b/runtime/onert/core/src/compiler/pass/UnusedOperandEliminationPass.cc
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include "Pass.h"
-
 #include "UnusedOperandEliminationPass.h"
+
+#include "Pass.h"
+#include "ir/Graph.h"
 #include "ir/Index.h"
 #include "util/Set.h"
-#include "ir/Graph.h"
 
 /**
  * @file  UnusedOperandEliminationPass.cc
diff --git a/runtime/onert/core/src/compiler/train/LoweredTrainableGraph.cc b/runtime/onert/core/src/compiler/train/LoweredTrainableGraph.cc
index be267eda0a7..bea5b86831e 100644
--- a/runtime/onert/core/src/compiler/train/LoweredTrainableGraph.cc
+++ b/runtime/onert/core/src/compiler/train/LoweredTrainableGraph.cc
@@ -16,21 +16,20 @@
 
 #include "compiler/train/LoweredTrainableGraph.h"
 
+#include "../../backend/builtin/Config.h"
+#include "../../dumper/text/GraphDumper.h"
+#include "../../ir/verifier/Verifier.h"
 #include "../ManualScheduler.h"
 #include "../pass/ConstantInsertionPass.h"
 #include "../pass/ConstantLoweringPass.h"
 #include "../pass/PassRunner.h"
 #include "../pass/PermutationEliminationPass.h"
 #include "../pass/PermutationInsertionPass.h"
-#include "../../backend/builtin/Config.h"
-#include "../../dumper/text/GraphDumper.h"
-#include "../../ir/verifier/Verifier.h"
-#include "pass/TrainableConstantInsertionPass.h"
 #include "TrainableOperationConverter.h"
-
 #include "backend/Backend.h"
 #include "backend/train/ITrainableBackend.h"
 #include "compiler/BackendResolver.h"
+#include "pass/TrainableConstantInsertionPass.h"
 #include "util/logging.h"
 
 #include <cassert>
diff --git a/runtime/onert/core/src/compiler/train/StaticBackwardShapeInferer.cc b/runtime/onert/core/src/compiler/train/StaticBackwardShapeInferer.cc
index cb8441eaa71..c676a3da942 100644
--- a/runtime/onert/core/src/compiler/train/StaticBackwardShapeInferer.cc
+++ b/runtime/onert/core/src/compiler/train/StaticBackwardShapeInferer.cc
@@ -15,6 +15,7 @@
  */
 
 #include "StaticBackwardShapeInferer.h"
+
 #include "util/ShapeInference.h"
 #include "util/logging.h"
 
diff --git a/runtime/onert/core/src/compiler/train/StaticBackwardShapeInferer.h b/runtime/onert/core/src/compiler/train/StaticBackwardShapeInferer.h
index 8a70ebcfaa1..405070eb813 100644
--- a/runtime/onert/core/src/compiler/train/StaticBackwardShapeInferer.h
+++ b/runtime/onert/core/src/compiler/train/StaticBackwardShapeInferer.h
@@ -17,10 +17,9 @@
 #ifndef __ONERT_COMPILER_TRAIN_STATIC_BACKWARD_SHAPE_INFERER_H__
 #define __ONERT_COMPILER_TRAIN_STATIC_BACKWARD_SHAPE_INFERER_H__
 
-#include "ir/train/TrainableOperationVisitor.h"
-
 #include "compiler/train/LoweredTrainableGraph.h"
 #include "ir/Index.h"
+#include "ir/train/TrainableOperationVisitor.h"
 
 #include <memory>
 #include <unordered_map>
diff --git a/runtime/onert/core/src/compiler/train/TrainableOperationConverter.h b/runtime/onert/core/src/compiler/train/TrainableOperationConverter.h
index 78a1f5fe3de..a269eb54a8e 100644
--- a/runtime/onert/core/src/compiler/train/TrainableOperationConverter.h
+++ b/runtime/onert/core/src/compiler/train/TrainableOperationConverter.h
@@ -18,7 +18,6 @@
 #define __ONERT_COMPILER_TRAIN_TRAINABLE_OPERATION_CONVERTER_H__
 
 #include "UntrainableOperationConverter.h"
-
 #include "ir/train/TrainingInfo.h"
 
 namespace onert::compiler::train
diff --git a/runtime/onert/core/src/compiler/train/TrainingCompiler.cc b/runtime/onert/core/src/compiler/train/TrainingCompiler.cc
index b2b2a03180c..199e3a0d967 100644
--- a/runtime/onert/core/src/compiler/train/TrainingCompiler.cc
+++ b/runtime/onert/core/src/compiler/train/TrainingCompiler.cc
@@ -16,25 +16,24 @@
 
 #include "TrainingCompiler.h"
 
-#include "StaticBackwardShapeInferer.h"
-#include "TrainableOperationConverter.h"
-#include "pass/LossInsertionPass.h"
+#include "../../dumper/dot/DotDumper.h"
+#include "../../exec/train/TrainableExecutors.h"
+#include "../../ir/OperationDumper.h"
+#include "../../ir/verifier/Verifier.h"
 #include "../CompilerHelpers.h"
 #include "../ExecutorFactory.h"
+#include "../ShapeValidator.h"
 #include "../pass/ConstantOutputPass.h"
 #include "../pass/OddOutputPass.h"
 #include "../pass/PassRunner.h"
 #include "../pass/UnusedOperandEliminationPass.h"
-#include "../ShapeValidator.h"
-#include "../../dumper/dot/DotDumper.h"
-#include "../../exec/train/TrainableExecutors.h"
-#include "../../ir/OperationDumper.h"
-#include "../../ir/verifier/Verifier.h"
+#include "StaticBackwardShapeInferer.h"
+#include "TrainableOperationConverter.h"
+#include "pass/LossInsertionPass.h"
 
 #include <compiler/StaticShapeInferer.h>
 #include <compiler/train/LoweredTrainableGraph.h>
 #include <ir/train/TrainableGraph.h>
-
 #include <misc/polymorphic_downcast.h>
 #include <misc/string_helpers.h>
 
diff --git a/runtime/onert/core/src/compiler/train/UntrainableOperationConverter.h b/runtime/onert/core/src/compiler/train/UntrainableOperationConverter.h
index ddf20ed66f7..fd691aedbbc 100644
--- a/runtime/onert/core/src/compiler/train/UntrainableOperationConverter.h
+++ b/runtime/onert/core/src/compiler/train/UntrainableOperationConverter.h
@@ -17,8 +17,8 @@
 #ifndef __ONERT_COMPILER_TRAIN_UNTRAINABLE_OPERATION_CONVERTER_H__
 #define __ONERT_COMPILER_TRAIN_UNTRAINABLE_OPERATION_CONVERTER_H__
 
-#include "ir/Operations.Include.h"
 #include "ir/OperationVisitor.h"
+#include "ir/Operations.Include.h"
 #include "ir/train/TrainableGraph.h"
 
 #include <memory>
diff --git a/runtime/onert/core/src/compiler/train/pass/LossInsertionPass.h b/runtime/onert/core/src/compiler/train/pass/LossInsertionPass.h
index 7593642d151..ff2eab83f4b 100644
--- a/runtime/onert/core/src/compiler/train/pass/LossInsertionPass.h
+++ b/runtime/onert/core/src/compiler/train/pass/LossInsertionPass.h
@@ -18,7 +18,6 @@
 #define __ONERT_COMPILER_TRAIN_PASS_LOSS_INSERTION_PASS_H__
 
 #include "Pass.h"
-
 #include "ir/Index.h"
 
 namespace onert::compiler::train::pass
diff --git a/runtime/onert/core/src/dumper/dot/DotBuilder.h b/runtime/onert/core/src/dumper/dot/DotBuilder.h
index 3402df91407..e75b37e464a 100644
--- a/runtime/onert/core/src/dumper/dot/DotBuilder.h
+++ b/runtime/onert/core/src/dumper/dot/DotBuilder.h
@@ -17,14 +17,13 @@
 #ifndef __ONERT_DUMPER_DOT_DOT_BUILDER_H__
 #define __ONERT_DUMPER_DOT_DOT_BUILDER_H__
 
-#include <sstream>
-
+#include "OperandNode.h"
+#include "OperationNode.h"
 #include "ir/Index.h"
-#include "ir/Operation.h"
 #include "ir/Operand.h"
+#include "ir/Operation.h"
 
-#include "OperationNode.h"
-#include "OperandNode.h"
+#include <sstream>
 
 using Operation = onert::ir::Operation;
 using Object = onert::ir::Operand;
diff --git a/runtime/onert/core/src/dumper/dot/DotDumper.cc b/runtime/onert/core/src/dumper/dot/DotDumper.cc
index 848736c111a..5a9b12b1b57 100644
--- a/runtime/onert/core/src/dumper/dot/DotDumper.cc
+++ b/runtime/onert/core/src/dumper/dot/DotDumper.cc
@@ -14,16 +14,17 @@
  * limitations under the License.
  */
 
-#include <fstream>
-#include <unordered_map>
-
 #include "DotDumper.h"
+
 #include "DotBuilder.h"
-#include "ir/OperandIndexMap.h"
-#include "ir/OperationIndexMap.h"
 #include "backend/Backend.h"
 #include "backend/IConfig.h"
 #include "compiler/BackendManager.h"
+#include "ir/OperandIndexMap.h"
+#include "ir/OperationIndexMap.h"
+
+#include <fstream>
+#include <unordered_map>
 
 namespace onert::dumper::dot
 {
diff --git a/runtime/onert/core/src/dumper/dot/DotDumper.h b/runtime/onert/core/src/dumper/dot/DotDumper.h
index 85cf6e223cf..bc6807036b8 100644
--- a/runtime/onert/core/src/dumper/dot/DotDumper.h
+++ b/runtime/onert/core/src/dumper/dot/DotDumper.h
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+#include "compiler/ILoweredGraph.h"
 #include "ir/Graph.h"
 #include "ir/train/TrainableGraph.h"
-#include "compiler/ILoweredGraph.h"
 
 #ifndef __ONERT_DUMPER_DOT_DOT_DUMPER_H__
 #define __ONERT_DUMPER_DOT_DOT_DUMPER_H__
diff --git a/runtime/onert/core/src/dumper/dot/Node.h b/runtime/onert/core/src/dumper/dot/Node.h
index e7f8fb6d49a..da5c6b58de7 100644
--- a/runtime/onert/core/src/dumper/dot/Node.h
+++ b/runtime/onert/core/src/dumper/dot/Node.h
@@ -24,10 +24,10 @@
 #ifndef __ONERT_DUMPER_DOT_NODE_H__
 #define __ONERT_DUMPER_DOT_NODE_H__
 
-#include <string>
 #include <memory>
-#include <vector>
+#include <string>
 #include <unordered_map>
+#include <vector>
 
 namespace onert::dumper::dot
 {
diff --git a/runtime/onert/core/src/dumper/dot/OperandNode.cc b/runtime/onert/core/src/dumper/dot/OperandNode.cc
index 57a7c4064a9..1fae392ca4a 100644
--- a/runtime/onert/core/src/dumper/dot/OperandNode.cc
+++ b/runtime/onert/core/src/dumper/dot/OperandNode.cc
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-#include <sstream>
-
 #include "OperandNode.h"
+
 #include "ir/Graph.h"
 
+#include <sstream>
+
 namespace onert::dumper::dot
 {
 
diff --git a/runtime/onert/core/src/dumper/dot/OperandNode.h b/runtime/onert/core/src/dumper/dot/OperandNode.h
index 023041e69d9..869fb6ed57d 100644
--- a/runtime/onert/core/src/dumper/dot/OperandNode.h
+++ b/runtime/onert/core/src/dumper/dot/OperandNode.h
@@ -24,11 +24,11 @@
 #ifndef __ONERT_DUMPER_DOT_DOT_OPERAND_INFO_H__
 #define __ONERT_DUMPER_DOT_DOT_OPERAND_INFO_H__
 
-#include <vector>
-
 #include "Node.h"
-#include "ir/Operand.h"
 #include "ir/Index.h"
+#include "ir/Operand.h"
+
+#include <vector>
 
 namespace onert::dumper::dot
 {
diff --git a/runtime/onert/core/src/dumper/dot/OperationNode.cc b/runtime/onert/core/src/dumper/dot/OperationNode.cc
index 512c6ee8a9f..698f6a5e954 100644
--- a/runtime/onert/core/src/dumper/dot/OperationNode.cc
+++ b/runtime/onert/core/src/dumper/dot/OperationNode.cc
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-#include <sstream>
-
 #include "OperationNode.h"
-#include "ir/Graph.h"
-#include "backend/IConfig.h"
+
 #include "backend/Backend.h"
+#include "backend/IConfig.h"
+#include "ir/Graph.h"
+
+#include <sstream>
 
 namespace onert::dumper::dot
 {
diff --git a/runtime/onert/core/src/dumper/text/GraphDumper.cc b/runtime/onert/core/src/dumper/text/GraphDumper.cc
index 945c495268c..d1b5e62e3aa 100644
--- a/runtime/onert/core/src/dumper/text/GraphDumper.cc
+++ b/runtime/onert/core/src/dumper/text/GraphDumper.cc
@@ -16,11 +16,11 @@
 
 #include "GraphDumper.h"
 
-#include "ir/Graph.h"
 #include "compiler/LoweredGraph.h"
 #include "compiler/train/LoweredTrainableGraph.h"
-#include "util/logging.h"
+#include "ir/Graph.h"
 #include "misc/string_helpers.h"
+#include "util/logging.h"
 
 namespace onert::dumper::text
 {
diff --git a/runtime/onert/core/src/exec/DataflowExecutor.cc b/runtime/onert/core/src/exec/DataflowExecutor.cc
index 4ac1fafd03e..7d4bedb56c5 100644
--- a/runtime/onert/core/src/exec/DataflowExecutor.cc
+++ b/runtime/onert/core/src/exec/DataflowExecutor.cc
@@ -16,10 +16,10 @@
 
 #include "DataflowExecutor.h"
 
-#include <cassert>
-
 #include "util/logging.h"
 
+#include <cassert>
+
 namespace onert::exec
 {
 
diff --git a/runtime/onert/core/src/exec/DataflowExecutor.h b/runtime/onert/core/src/exec/DataflowExecutor.h
index 8ff787705f5..ae3768a4cf3 100644
--- a/runtime/onert/core/src/exec/DataflowExecutor.h
+++ b/runtime/onert/core/src/exec/DataflowExecutor.h
@@ -19,7 +19,6 @@
 
 #include "ExecutorBase.h"
 #include "Job.h"
-
 #include "compiler/CodeMap.h"
 #include "ir/OperandIndexSequence.h"
 #include "util/TracingCtx.h"
diff --git a/runtime/onert/core/src/exec/DynamicShapeInferer.cc b/runtime/onert/core/src/exec/DynamicShapeInferer.cc
index 8bf192264f0..85f2abc095e 100644
--- a/runtime/onert/core/src/exec/DynamicShapeInferer.cc
+++ b/runtime/onert/core/src/exec/DynamicShapeInferer.cc
@@ -15,7 +15,9 @@
  */
 
 #include "exec/DynamicShapeInferer.h"
+
 #include "util/ShapeInference.h"
+
 #include <assert.h>
 
 namespace onert::exec
diff --git a/runtime/onert/core/src/exec/ExecTime.h b/runtime/onert/core/src/exec/ExecTime.h
index 93745895720..27e0c8791d4 100644
--- a/runtime/onert/core/src/exec/ExecTime.h
+++ b/runtime/onert/core/src/exec/ExecTime.h
@@ -17,12 +17,13 @@
 #ifndef __ONERT_EXEC_EXEC_TIME_H__
 #define __ONERT_EXEC_EXEC_TIME_H__
 
+#include "JSONExecTime.h"
 #include "backend/Backend.h"
 #include "backend/IConfig.h"
-#include "JSONExecTime.h"
-#include <memory>
+
 #include <limits>
 #include <map>
+#include <memory>
 #include <unordered_map>
 #include <vector>
 
diff --git a/runtime/onert/core/src/exec/ExecTime.test.cc b/runtime/onert/core/src/exec/ExecTime.test.cc
index 6941d3aa3da..2131337ff69 100644
--- a/runtime/onert/core/src/exec/ExecTime.test.cc
+++ b/runtime/onert/core/src/exec/ExecTime.test.cc
@@ -16,8 +16,8 @@
 
 #include "ExecTime.h"
 
-#include "backend/IConfig.h"
 #include "backend/Backend.h"
+#include "backend/IConfig.h"
 
 #include <gtest/gtest.h>
 
diff --git a/runtime/onert/core/src/exec/Execution.cc b/runtime/onert/core/src/exec/Execution.cc
index 3b5f111b2ee..7b05f529157 100644
--- a/runtime/onert/core/src/exec/Execution.cc
+++ b/runtime/onert/core/src/exec/Execution.cc
@@ -16,8 +16,8 @@
 
 #include "exec/Execution.h"
 
-#include "SignatureExecutors.h"
 #include "../backend/builtin/IOTensor.h"
+#include "SignatureExecutors.h"
 #include "ir/DataType.h"
 #include "train/TrainableExecutors.h"
 #include "util/logging.h"
diff --git a/runtime/onert/core/src/exec/Execution.test.cc b/runtime/onert/core/src/exec/Execution.test.cc
index 278e9be57c0..d3017e828cb 100644
--- a/runtime/onert/core/src/exec/Execution.test.cc
+++ b/runtime/onert/core/src/exec/Execution.test.cc
@@ -22,6 +22,7 @@
 #include "util/TracingCtx.h"
 
 #include <gtest/gtest.h>
+
 #include <thread>
 
 namespace
diff --git a/runtime/onert/core/src/exec/ExecutionObservee.h b/runtime/onert/core/src/exec/ExecutionObservee.h
index 978cc054548..e0a66ffe7a3 100644
--- a/runtime/onert/core/src/exec/ExecutionObservee.h
+++ b/runtime/onert/core/src/exec/ExecutionObservee.h
@@ -18,7 +18,6 @@
 #define __ONERT_EXEC_EXECUTION_OBSERVEE_H__
 
 #include "ExecutionObservers.h"
-
 #include "ir/Index.h"
 
 #include <list>
diff --git a/runtime/onert/core/src/exec/ExecutionObservers.cc b/runtime/onert/core/src/exec/ExecutionObservers.cc
index c7101660ce4..d49bd1cbd38 100644
--- a/runtime/onert/core/src/exec/ExecutionObservers.cc
+++ b/runtime/onert/core/src/exec/ExecutionObservers.cc
@@ -17,13 +17,12 @@
 #include "ExecutionObservers.h"
 
 #include "../util/EventWriter.h"
-
 #include "util/logging.h"
 
 #include <misc/polymorphic_downcast.h>
 
-#include <string>
 #include <sstream>
+#include <string>
 
 namespace
 {
diff --git a/runtime/onert/core/src/exec/ExecutionObservers.h b/runtime/onert/core/src/exec/ExecutionObservers.h
index 959be2900d4..825b71c4457 100644
--- a/runtime/onert/core/src/exec/ExecutionObservers.h
+++ b/runtime/onert/core/src/exec/ExecutionObservers.h
@@ -17,14 +17,13 @@
 #ifndef __ONERT_EXEC_OBSREVERS_H__
 #define __ONERT_EXEC_OBSREVERS_H__
 
-#include "ExecTime.h"
 #include "../util/EventCollector.h"
 #include "../util/EventRecorder.h"
 #include "../util/EventWriter.h"
-
+#include "ExecTime.h"
 #include "exec/IExecutor.h"
-#include "ir/Index.h"
 #include "ir/IOperation.h"
+#include "ir/Index.h"
 #include "util/ITimer.h"
 #include "util/TracingCtx.h"
 
diff --git a/runtime/onert/core/src/exec/ExecutorBase.cc b/runtime/onert/core/src/exec/ExecutorBase.cc
index 02fcf869406..37a5e9bdcce 100644
--- a/runtime/onert/core/src/exec/ExecutorBase.cc
+++ b/runtime/onert/core/src/exec/ExecutorBase.cc
@@ -17,9 +17,11 @@
 #include "ExecutorBase.h"
 
 #include "util/ConfigSource.h"
-#include <algorithm>
+
 #include <misc/polymorphic_downcast.h>
 
+#include <algorithm>
+
 namespace onert::exec
 {
 
diff --git a/runtime/onert/core/src/exec/ExecutorBase.h b/runtime/onert/core/src/exec/ExecutorBase.h
index ba8712efeb5..9de032c0403 100644
--- a/runtime/onert/core/src/exec/ExecutorBase.h
+++ b/runtime/onert/core/src/exec/ExecutorBase.h
@@ -17,13 +17,12 @@
 #ifndef __ONERT_EXEC_EXECUTOR_BASE_H__
 #define __ONERT_EXEC_EXECUTOR_BASE_H__
 
-#include "ExecutionObservee.h"
 #include "../backend/builtin/IOTensor.h"
 #include "../compiler/TensorRegistries.h"
-
+#include "ExecutionObservee.h"
 #include "compiler/LoweredGraph.h"
-#include "exec/IExecutor.h"
 #include "exec/ExecutionContext.h"
+#include "exec/IExecutor.h"
 #include "ir/Graph.h"
 #include "ir/OperationIndexMap.h"
 #include "util/TracingCtx.h"
diff --git a/runtime/onert/core/src/exec/IPermuteFunction.cc b/runtime/onert/core/src/exec/IPermuteFunction.cc
index 2ad47fb340f..7459aabf60a 100644
--- a/runtime/onert/core/src/exec/IPermuteFunction.cc
+++ b/runtime/onert/core/src/exec/IPermuteFunction.cc
@@ -16,18 +16,21 @@
 
 #include "IPermuteFunction.h"
 
-#include <cker/operation/Quantize.h>
-#include <cker/operation/Dequantize.h>
 #include "backend/IPortableTensor.h"
 #include "exec/IFunction.h"
 #include "ir/Index.h"
 #include "ir/Shape.h"
-#include <memory>
+#include "util/Utils.h"
+
 #include <misc/polymorphic_downcast.h>
+
+#include <cker/operation/Dequantize.h>
+#include <cker/operation/Quantize.h>
+
+#include <memory>
 #include <typeinfo>
-#include "util/Utils.h"
-#include <vector>
 #include <unordered_map>
+#include <vector>
 
 namespace
 {
diff --git a/runtime/onert/core/src/exec/IPermuteFunction.h b/runtime/onert/core/src/exec/IPermuteFunction.h
index 9addb70f489..10342403bb8 100644
--- a/runtime/onert/core/src/exec/IPermuteFunction.h
+++ b/runtime/onert/core/src/exec/IPermuteFunction.h
@@ -17,17 +17,17 @@
 #ifndef __ONERT_EXEC_I_PERMUTE_FUNCTION_H__
 #define __ONERT_EXEC_I_PERMUTE_FUNCTION_H__
 
+#include "backend/ITensor.h"
+#include "exec/IFunction.h"
 #include "feature/IndexIterator.h"
 #include "feature/nchw/Reader.h"
 #include "feature/nchw/View.h"
 #include "feature/nhwc/Reader.h"
 #include "feature/nhwc/View.h"
 
-#include "backend/ITensor.h"
-#include "exec/IFunction.h"
 #include <memory>
-#include <vector>
 #include <unordered_map>
+#include <vector>
 
 namespace onert::exec
 {
diff --git a/runtime/onert/core/src/exec/IPermuteFunction.test.cc b/runtime/onert/core/src/exec/IPermuteFunction.test.cc
index 263e1fcf113..4b64dc7b30c 100644
--- a/runtime/onert/core/src/exec/IPermuteFunction.test.cc
+++ b/runtime/onert/core/src/exec/IPermuteFunction.test.cc
@@ -20,9 +20,10 @@
 #include <ir/Shape.h>
 #include <ir/TypeInfo.h>
 
-#include <cmath>
 #include <gtest/gtest.h>
 
+#include <cmath>
+
 namespace
 {
 using namespace onert;
diff --git a/runtime/onert/core/src/exec/JSONExecTime.h b/runtime/onert/core/src/exec/JSONExecTime.h
index 96578788eb1..3fa010c352b 100644
--- a/runtime/onert/core/src/exec/JSONExecTime.h
+++ b/runtime/onert/core/src/exec/JSONExecTime.h
@@ -17,12 +17,13 @@
 #ifndef __ONERT_EXEC_JSON_EXEC_TIME_H__
 #define __ONERT_EXEC_JSON_EXEC_TIME_H__
 
+#include "backend/Backend.h"
+#include "backend/IConfig.h"
+
 #include <fstream>
-#include <unordered_map>
 #include <map>
+#include <unordered_map>
 #include <vector>
-#include "backend/Backend.h"
-#include "backend/IConfig.h"
 
 namespace onert::exec
 {
diff --git a/runtime/onert/core/src/exec/Job.cc b/runtime/onert/core/src/exec/Job.cc
index 76feaa4c947..993fdc33d58 100644
--- a/runtime/onert/core/src/exec/Job.cc
+++ b/runtime/onert/core/src/exec/Job.cc
@@ -16,10 +16,10 @@
 
 #include "Job.h"
 
-#include <cassert>
-
 #include "util/logging.h"
 
+#include <cassert>
+
 namespace onert::exec
 {
 
diff --git a/runtime/onert/core/src/exec/Job.h b/runtime/onert/core/src/exec/Job.h
index 0cfcb8eedc1..18c91015608 100644
--- a/runtime/onert/core/src/exec/Job.h
+++ b/runtime/onert/core/src/exec/Job.h
@@ -17,12 +17,12 @@
 #ifndef __ONERT_EXEC_JOB_H__
 #define __ONERT_EXEC_JOB_H__
 
-#include <unordered_set>
-
+#include "backend/Backend.h"
 #include "exec/FunctionSequence.h"
 #include "ir/Index.h"
 #include "ir/OperandIndexSequence.h"
-#include "backend/Backend.h"
+
+#include <unordered_set>
 
 namespace onert::exec
 {
diff --git a/runtime/onert/core/src/exec/LinearExecutor.h b/runtime/onert/core/src/exec/LinearExecutor.h
index ebaada59a86..7cf078ce865 100644
--- a/runtime/onert/core/src/exec/LinearExecutor.h
+++ b/runtime/onert/core/src/exec/LinearExecutor.h
@@ -23,7 +23,6 @@
 #define __ONERT_EXEC_EXECUTOR_H_
 
 #include "ExecutorBase.h"
-
 #include "compiler/CodeMap.h"
 #include "ir/Index.h"
 #include "util/TracingCtx.h"
diff --git a/runtime/onert/core/src/exec/MinMaxRecorder.cc b/runtime/onert/core/src/exec/MinMaxRecorder.cc
index ed166d49bee..5f512f37cbd 100644
--- a/runtime/onert/core/src/exec/MinMaxRecorder.cc
+++ b/runtime/onert/core/src/exec/MinMaxRecorder.cc
@@ -15,6 +15,7 @@
  */
 
 #include "MinMaxRecorder.h"
+
 #include "MinMaxData.h"
 #include "backend/ITensor.h"
 
diff --git a/runtime/onert/core/src/exec/MinMaxRecorder.h b/runtime/onert/core/src/exec/MinMaxRecorder.h
index f19deb4c9a2..162cc2597ea 100644
--- a/runtime/onert/core/src/exec/MinMaxRecorder.h
+++ b/runtime/onert/core/src/exec/MinMaxRecorder.h
@@ -18,8 +18,8 @@
 #define __ONERT_EXEC_MINMAX_RECORDER__
 
 #include "ExecutionObservers.h"
-#include "ir/Index.h"
 #include "exec/MinMaxMap.h"
+#include "ir/Index.h"
 
 #include <string>
 
diff --git a/runtime/onert/core/src/exec/MultiModelExecutors.h b/runtime/onert/core/src/exec/MultiModelExecutors.h
index 21aa88a31ba..405bcb20c97 100644
--- a/runtime/onert/core/src/exec/MultiModelExecutors.h
+++ b/runtime/onert/core/src/exec/MultiModelExecutors.h
@@ -17,11 +17,11 @@
 #ifndef __ONERT_EXEC_EXECUTORS_H__
 #define __ONERT_EXEC_EXECUTORS_H__
 
+#include "../backend/builtin/UserTensor.h"
+#include "EdgeTensor.h"
+#include "IPermuteFunction.h"
 #include "exec/IExecutors.h"
 #include "ir/NNPkg.h"
-#include "IPermuteFunction.h"
-#include "EdgeTensor.h"
-#include "../backend/builtin/UserTensor.h"
 
 namespace std
 {
diff --git a/runtime/onert/core/src/exec/ParallelExecutor.cc b/runtime/onert/core/src/exec/ParallelExecutor.cc
index f95e6b2affb..d986558d755 100644
--- a/runtime/onert/core/src/exec/ParallelExecutor.cc
+++ b/runtime/onert/core/src/exec/ParallelExecutor.cc
@@ -16,10 +16,10 @@
 
 #include "ParallelExecutor.h"
 
-#include <cassert>
-
-#include "util/logging.h"
 #include "exec/IFunction.h"
+#include "util/logging.h"
+
+#include <cassert>
 
 namespace onert::exec
 {
diff --git a/runtime/onert/core/src/exec/ParallelExecutor.h b/runtime/onert/core/src/exec/ParallelExecutor.h
index 880bf6811c3..2d4f6300d2f 100644
--- a/runtime/onert/core/src/exec/ParallelExecutor.h
+++ b/runtime/onert/core/src/exec/ParallelExecutor.h
@@ -19,7 +19,6 @@
 
 #include "DataflowExecutor.h"
 #include "ParallelScheduler.h"
-
 #include "util/TracingCtx.h"
 
 #include <memory>
diff --git a/runtime/onert/core/src/exec/ParallelScheduler.cc b/runtime/onert/core/src/exec/ParallelScheduler.cc
index 492fa3f4abd..af1b66fc5c3 100644
--- a/runtime/onert/core/src/exec/ParallelScheduler.cc
+++ b/runtime/onert/core/src/exec/ParallelScheduler.cc
@@ -16,10 +16,10 @@
 
 #include "ParallelScheduler.h"
 
-#include <cassert>
+#include "util/logging.h"
 
+#include <cassert>
 #include <memory>
-#include "util/logging.h"
 
 namespace onert::exec
 {
diff --git a/runtime/onert/core/src/exec/ParallelScheduler.h b/runtime/onert/core/src/exec/ParallelScheduler.h
index f0d47d6dd16..69f364b81d7 100644
--- a/runtime/onert/core/src/exec/ParallelScheduler.h
+++ b/runtime/onert/core/src/exec/ParallelScheduler.h
@@ -17,12 +17,12 @@
 #ifndef __ONERT_EXEC_PARALLEL_SCHEDULER_H__
 #define __ONERT_EXEC_PARALLEL_SCHEDULER_H__
 
-#include <unordered_map>
-#include <memory>
-
-#include "exec/IFunction.h"
 #include "BackendSet.h"
 #include "ThreadPool.h"
+#include "exec/IFunction.h"
+
+#include <memory>
+#include <unordered_map>
 
 namespace onert::exec
 {
diff --git a/runtime/onert/core/src/exec/SignatureExecutors.h b/runtime/onert/core/src/exec/SignatureExecutors.h
index 5a357e1ce2f..71c7e731b56 100644
--- a/runtime/onert/core/src/exec/SignatureExecutors.h
+++ b/runtime/onert/core/src/exec/SignatureExecutors.h
@@ -17,11 +17,10 @@
 #ifndef __ONERT_EXEC_SIGNATURE_EXECUTORS_H__
 #define __ONERT_EXEC_SIGNATURE_EXECUTORS_H__
 
+#include "SingleModelExecutors.h"
 #include "exec/IExecutors.h"
 #include "ir/NNPkg.h"
 
-#include "SingleModelExecutors.h"
-
 namespace onert::exec
 {
 
diff --git a/runtime/onert/core/src/exec/SingleModelExecutors.cc b/runtime/onert/core/src/exec/SingleModelExecutors.cc
index 9fe390b4eb0..6f439c6c58a 100644
--- a/runtime/onert/core/src/exec/SingleModelExecutors.cc
+++ b/runtime/onert/core/src/exec/SingleModelExecutors.cc
@@ -16,10 +16,10 @@
 
 #include "SingleModelExecutors.h"
 
+#include "../backend/builtin/IOTensor.h"
+#include "../backend/builtin/UserTensor.h"
 #include "EdgeTensor.h"
 #include "IPermuteFunction.h"
-#include "../backend/builtin/UserTensor.h"
-#include "../backend/builtin/IOTensor.h"
 
 namespace onert::exec
 {
diff --git a/runtime/onert/core/src/exec/ThreadPool.h b/runtime/onert/core/src/exec/ThreadPool.h
index e52f12b07a0..692073621bc 100644
--- a/runtime/onert/core/src/exec/ThreadPool.h
+++ b/runtime/onert/core/src/exec/ThreadPool.h
@@ -17,12 +17,12 @@
 #ifndef __ONERT_EXEC_THREAD_POOL_H__
 #define __ONERT_EXEC_THREAD_POOL_H__
 
-#include <thread>
+#include "WorkQueue.h"
+
 #include <memory>
+#include <thread>
 #include <vector>
 
-#include "WorkQueue.h"
-
 namespace onert::exec
 {
 
diff --git a/runtime/onert/core/src/exec/WorkQueue.h b/runtime/onert/core/src/exec/WorkQueue.h
index c501635bb26..9408d73db5d 100644
--- a/runtime/onert/core/src/exec/WorkQueue.h
+++ b/runtime/onert/core/src/exec/WorkQueue.h
@@ -17,13 +17,13 @@
 #ifndef __ONERT_EXEC_WORK_QUEUE_H__
 #define __ONERT_EXEC_WORK_QUEUE_H__
 
+#include "exec/IFunction.h"
+
 #include <condition_variable>
 #include <memory>
 #include <mutex>
 #include <queue>
 
-#include "exec/IFunction.h"
-
 namespace onert::exec
 {
 
diff --git a/runtime/onert/core/src/exec/feature/nchw/Reader.h b/runtime/onert/core/src/exec/feature/nchw/Reader.h
index 6445a48c571..ca9b90df703 100644
--- a/runtime/onert/core/src/exec/feature/nchw/Reader.h
+++ b/runtime/onert/core/src/exec/feature/nchw/Reader.h
@@ -18,12 +18,11 @@
 #define __ONERT_EXEC_FEATURE_NCHW_READER_H__
 
 #include "../Reader.h"
-
-#include <cassert>
-
 #include "backend/ITensor.h"
 #include "ir/Shape.h"
 
+#include <cassert>
+
 namespace onert::exec::feature::nchw
 {
 
diff --git a/runtime/onert/core/src/exec/feature/nchw/View.h b/runtime/onert/core/src/exec/feature/nchw/View.h
index 65938525120..1ce8dcb6dc9 100644
--- a/runtime/onert/core/src/exec/feature/nchw/View.h
+++ b/runtime/onert/core/src/exec/feature/nchw/View.h
@@ -18,7 +18,6 @@
 #define __ONERT_EXEC_FEATURE_NCHW_VIEW_H__
 
 #include "Reader.h"
-
 #include "backend/ITensor.h"
 #include "ir/Shape.h"
 #include "util/logging.h"
diff --git a/runtime/onert/core/src/exec/feature/nhwc/Reader.h b/runtime/onert/core/src/exec/feature/nhwc/Reader.h
index 885fc3042b1..1a7d4994b0d 100644
--- a/runtime/onert/core/src/exec/feature/nhwc/Reader.h
+++ b/runtime/onert/core/src/exec/feature/nhwc/Reader.h
@@ -18,12 +18,11 @@
 #define __ONERT_EXEC_FEATURE_NHWC_READER_H__
 
 #include "../Reader.h"
-
-#include <cassert>
-
 #include "backend/ITensor.h"
 #include "ir/Shape.h"
 
+#include <cassert>
+
 namespace onert::exec::feature::nhwc
 {
 
diff --git a/runtime/onert/core/src/exec/feature/nhwc/View.h b/runtime/onert/core/src/exec/feature/nhwc/View.h
index 37291f4f96d..39d8778ece6 100644
--- a/runtime/onert/core/src/exec/feature/nhwc/View.h
+++ b/runtime/onert/core/src/exec/feature/nhwc/View.h
@@ -18,14 +18,13 @@
 #define __ONERT_EXEC_FEATURE_NHWC_VIEW_H__
 
 #include "Reader.h"
-
-#include <cassert>
-#include <cstddef>
-
 #include "backend/ITensor.h"
 #include "ir/Shape.h"
 #include "util/Utils.h"
 
+#include <cassert>
+#include <cstddef>
+
 namespace onert::exec::feature::nhwc
 {
 
diff --git a/runtime/onert/core/src/exec/train/TrainableExecutor.h b/runtime/onert/core/src/exec/train/TrainableExecutor.h
index 377469aab2e..11330b553e2 100644
--- a/runtime/onert/core/src/exec/train/TrainableExecutor.h
+++ b/runtime/onert/core/src/exec/train/TrainableExecutor.h
@@ -17,16 +17,14 @@
 #ifndef __ONERT_EXEC_TRAIN_TRAINABLE_EXECUTOR_H_
 #define __ONERT_EXEC_TRAIN_TRAINABLE_EXECUTOR_H_
 
-#include "exec/IExecutor.h"
-
-#include "../ExecutionObservee.h"
 #include "../../compiler/train/TensorRegistries.h"
-
+#include "../ExecutionObservee.h"
 #include "backend/train/TrainableBackendContext.h"
-#include "compiler/train/TrainableCodeMap.h"
 #include "compiler/train/LoweredTrainableGraph.h"
-#include "ir/train/LossInfo.h"
+#include "compiler/train/TrainableCodeMap.h"
+#include "exec/IExecutor.h"
 #include "ir/Index.h"
+#include "ir/train/LossInfo.h"
 #include "util/TracingCtx.h"
 
 namespace onert::exec::train
diff --git a/runtime/onert/core/src/exporter/CircleExporter.cc b/runtime/onert/core/src/exporter/CircleExporter.cc
index a8b94ad9899..3a6c969b7c9 100644
--- a/runtime/onert/core/src/exporter/CircleExporter.cc
+++ b/runtime/onert/core/src/exporter/CircleExporter.cc
@@ -16,11 +16,11 @@
 
 #include "exporter/CircleExporter.h"
 
+#include "TrainInfoBuilder.h"
+#include "circle_schema_generated.h"
 #include "exec/Execution.h"
 #include "ir/train/TrainingInfo.h"
 #include "loader/TrainInfoLoader.h"
-#include "circle_schema_generated.h"
-#include "TrainInfoBuilder.h"
 
 #include <fstream>
 #include <iostream>
diff --git a/runtime/onert/core/src/exporter/TrainInfoBuilder.h b/runtime/onert/core/src/exporter/TrainInfoBuilder.h
index 08fd7b66d04..f0047475133 100644
--- a/runtime/onert/core/src/exporter/TrainInfoBuilder.h
+++ b/runtime/onert/core/src/exporter/TrainInfoBuilder.h
@@ -17,9 +17,9 @@
 #ifndef __ONERT_EXPORTER_TRAININFO_BUILDER_H__
 #define __ONERT_EXPORTER_TRAININFO_BUILDER_H__
 
-#include "ir/train/TrainingInfo.h"
 #include "circle_schema_generated.h"
 #include "circle_traininfo_generated.h"
+#include "ir/train/TrainingInfo.h"
 
 namespace onert::exporter
 {
diff --git a/runtime/onert/core/src/exporter/train/CheckpointExporter.cc b/runtime/onert/core/src/exporter/train/CheckpointExporter.cc
index 1c99bd9c02f..f7565e9d733 100644
--- a/runtime/onert/core/src/exporter/train/CheckpointExporter.cc
+++ b/runtime/onert/core/src/exporter/train/CheckpointExporter.cc
@@ -17,8 +17,8 @@
 #include "exporter/train/CheckpointExporter.h"
 
 #include "exec/Execution.h"
-#include "ir/train/TrainingInfo.h"
 #include "ir/train/Checkpoint.h"
+#include "ir/train/TrainingInfo.h"
 
 #include <fstream>
 #include <iostream>
diff --git a/runtime/onert/core/src/ir/DataType.cc b/runtime/onert/core/src/ir/DataType.cc
index a4ce84a98bf..79d670a49b7 100644
--- a/runtime/onert/core/src/ir/DataType.cc
+++ b/runtime/onert/core/src/ir/DataType.cc
@@ -16,9 +16,10 @@
 
 #include "ir/DataType.h"
 
-#include <stdexcept>
 #include <Half.h>
 
+#include <stdexcept>
+
 using float16 = Half;
 
 namespace onert::ir
diff --git a/runtime/onert/core/src/ir/Graph.cc b/runtime/onert/core/src/ir/Graph.cc
index 484644d657b..d19a6596d35 100644
--- a/runtime/onert/core/src/ir/Graph.cc
+++ b/runtime/onert/core/src/ir/Graph.cc
@@ -17,9 +17,8 @@
 #include "ir/Graph.h"
 
 #include "OperationValidator.h"
-#include "verifier/Verifier.h"
-
 #include "util/Set.h"
+#include "verifier/Verifier.h"
 
 namespace onert::ir
 {
diff --git a/runtime/onert/core/src/ir/Graph.test.cc b/runtime/onert/core/src/ir/Graph.test.cc
index 14450074534..fd320e99143 100644
--- a/runtime/onert/core/src/ir/Graph.test.cc
+++ b/runtime/onert/core/src/ir/Graph.test.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/Graph.h"
+
 #include "ir/operation/BinaryArithmetic.h"
 
 #include <gtest/gtest.h>
diff --git a/runtime/onert/core/src/ir/LayoutSet.h b/runtime/onert/core/src/ir/LayoutSet.h
index 3f60e836b74..c6e70adb011 100644
--- a/runtime/onert/core/src/ir/LayoutSet.h
+++ b/runtime/onert/core/src/ir/LayoutSet.h
@@ -17,12 +17,12 @@
 #ifndef __ONERT_IR_LAYOUT_SET_H__
 #define __ONERT_IR_LAYOUT_SET_H__
 
+#include "ir/Layout.h"
+
 #include <cstdint>
 #include <initializer_list>
 #include <unordered_set>
 
-#include "ir/Layout.h"
-
 namespace onert::ir
 {
 
diff --git a/runtime/onert/core/src/ir/MockNode.h b/runtime/onert/core/src/ir/MockNode.h
index 95fd49f2804..25b787222ba 100644
--- a/runtime/onert/core/src/ir/MockNode.h
+++ b/runtime/onert/core/src/ir/MockNode.h
@@ -17,8 +17,8 @@
 #ifndef __ONERT_TEST_GRAPH_MOCK_NODE_H__
 #define __ONERT_TEST_GRAPH_MOCK_NODE_H__
 
-#include "ir/Operation.h"
 #include "ir/OperandIndexSequence.h"
+#include "ir/Operation.h"
 
 namespace onert_test::ir
 {
diff --git a/runtime/onert/core/src/ir/Operand.test.cc b/runtime/onert/core/src/ir/Operand.test.cc
index 0b858792ae7..5b43fc9d94f 100644
--- a/runtime/onert/core/src/ir/Operand.test.cc
+++ b/runtime/onert/core/src/ir/Operand.test.cc
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-#include "ir/Graph.h"
-
 #include "MockNode.h"
+#include "ir/Graph.h"
 #include "verifier/Verifier.h"
 
 #include <gtest/gtest.h>
diff --git a/runtime/onert/core/src/ir/Operands.cc b/runtime/onert/core/src/ir/Operands.cc
index 06b7c702eb0..25450243338 100644
--- a/runtime/onert/core/src/ir/Operands.cc
+++ b/runtime/onert/core/src/ir/Operands.cc
@@ -16,9 +16,10 @@
 
 #include "ir/Operands.h"
 
-#include <memory>
 #include "util/logging.h"
 
+#include <memory>
+
 namespace onert::ir
 {
 
diff --git a/runtime/onert/core/src/ir/OperationCloner.h b/runtime/onert/core/src/ir/OperationCloner.h
index 85d09586d9d..40e765f0455 100644
--- a/runtime/onert/core/src/ir/OperationCloner.h
+++ b/runtime/onert/core/src/ir/OperationCloner.h
@@ -17,9 +17,10 @@
 #ifndef __ONERT_IR_OPERATION_CLONER_H__
 #define __ONERT_IR_OPERATION_CLONER_H__
 
-#include <memory>
-#include "ir/OperationVisitor.h"
 #include "ir/Operation.h"
+#include "ir/OperationVisitor.h"
+
+#include <memory>
 
 namespace onert::ir
 {
diff --git a/runtime/onert/core/src/ir/OperationDumper.cc b/runtime/onert/core/src/ir/OperationDumper.cc
index a65092d40e4..65d486117a4 100644
--- a/runtime/onert/core/src/ir/OperationDumper.cc
+++ b/runtime/onert/core/src/ir/OperationDumper.cc
@@ -16,10 +16,10 @@
 
 #include "OperationDumper.h"
 
-#include <string>
-
 #include "util/logging.h"
 
+#include <string>
+
 namespace onert::ir
 {
 
diff --git a/runtime/onert/core/src/ir/OperationDumper.h b/runtime/onert/core/src/ir/OperationDumper.h
index 95e940c7e8e..dd9f55de559 100644
--- a/runtime/onert/core/src/ir/OperationDumper.h
+++ b/runtime/onert/core/src/ir/OperationDumper.h
@@ -18,6 +18,7 @@
 #define __ONERT_OPERATION_DUMPER_H__
 
 #include "ir/OperationVisitor.h"
+
 #include <string>
 
 namespace onert::ir
diff --git a/runtime/onert/core/src/ir/OperationValidator.h b/runtime/onert/core/src/ir/OperationValidator.h
index d8424b531b8..5e2db8c9edf 100644
--- a/runtime/onert/core/src/ir/OperationValidator.h
+++ b/runtime/onert/core/src/ir/OperationValidator.h
@@ -17,9 +17,9 @@
 #ifndef __ONERT_IR_OPERATION_VALIDATOR_H__
 #define __ONERT_IR_OPERATION_VALIDATOR_H__
 
+#include "ir/Operands.h"
 #include "ir/OperationVisitor.h"
 #include "ir/Operations.h"
-#include "ir/Operands.h"
 
 namespace onert::ir
 {
diff --git a/runtime/onert/core/src/ir/Padding.cc b/runtime/onert/core/src/ir/Padding.cc
index c6e5bb43664..3889199bc3e 100644
--- a/runtime/onert/core/src/ir/Padding.cc
+++ b/runtime/onert/core/src/ir/Padding.cc
@@ -16,8 +16,8 @@
 
 #include "ir/Padding.h"
 
-#include <stdexcept>
 #include <cassert>
+#include <stdexcept>
 
 namespace onert::ir
 {
diff --git a/runtime/onert/core/src/ir/Shape.cc b/runtime/onert/core/src/ir/Shape.cc
index 3199423096e..eaf49966f2a 100644
--- a/runtime/onert/core/src/ir/Shape.cc
+++ b/runtime/onert/core/src/ir/Shape.cc
@@ -16,10 +16,10 @@
 
 #include "ir/Shape.h"
 
+#include <algorithm>
 #include <cassert>
 #include <functional>
 #include <numeric>
-#include <algorithm>
 
 namespace onert::ir
 {
diff --git a/runtime/onert/core/src/ir/operation/AddN.cc b/runtime/onert/core/src/ir/operation/AddN.cc
index 76a4b6e9cf5..93a44153574 100644
--- a/runtime/onert/core/src/ir/operation/AddN.cc
+++ b/runtime/onert/core/src/ir/operation/AddN.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/AddN.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/ArgMinMax.cc b/runtime/onert/core/src/ir/operation/ArgMinMax.cc
index 9531bb60df2..579cd77a6ca 100644
--- a/runtime/onert/core/src/ir/operation/ArgMinMax.cc
+++ b/runtime/onert/core/src/ir/operation/ArgMinMax.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/ArgMinMax.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/BCQFullyConnected.cc b/runtime/onert/core/src/ir/operation/BCQFullyConnected.cc
index 64a999bb366..c5b267a1e98 100644
--- a/runtime/onert/core/src/ir/operation/BCQFullyConnected.cc
+++ b/runtime/onert/core/src/ir/operation/BCQFullyConnected.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/BCQFullyConnected.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/BCQGather.cc b/runtime/onert/core/src/ir/operation/BCQGather.cc
index a3d59338efb..d6da3dfdcc9 100644
--- a/runtime/onert/core/src/ir/operation/BCQGather.cc
+++ b/runtime/onert/core/src/ir/operation/BCQGather.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/BCQGather.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/BatchMatMul.cc b/runtime/onert/core/src/ir/operation/BatchMatMul.cc
index d5ee535533b..a09cd749dbc 100644
--- a/runtime/onert/core/src/ir/operation/BatchMatMul.cc
+++ b/runtime/onert/core/src/ir/operation/BatchMatMul.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/BatchMatMul.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/BatchToSpaceND.cc b/runtime/onert/core/src/ir/operation/BatchToSpaceND.cc
index 155be605a1e..0d353f69b26 100644
--- a/runtime/onert/core/src/ir/operation/BatchToSpaceND.cc
+++ b/runtime/onert/core/src/ir/operation/BatchToSpaceND.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/BatchToSpaceND.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/BinaryArithmetic.cc b/runtime/onert/core/src/ir/operation/BinaryArithmetic.cc
index 29a5e267d89..939e3051304 100644
--- a/runtime/onert/core/src/ir/operation/BinaryArithmetic.cc
+++ b/runtime/onert/core/src/ir/operation/BinaryArithmetic.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/BinaryArithmetic.h"
+
 #include "ir/OperationVisitor.h"
 
 #include <unordered_map>
diff --git a/runtime/onert/core/src/ir/operation/BroadcastTo.cc b/runtime/onert/core/src/ir/operation/BroadcastTo.cc
index e6a9647b660..af596f52587 100644
--- a/runtime/onert/core/src/ir/operation/BroadcastTo.cc
+++ b/runtime/onert/core/src/ir/operation/BroadcastTo.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/BroadcastTo.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/Bulk.cc b/runtime/onert/core/src/ir/operation/Bulk.cc
index 454dc081c61..76d866774c1 100644
--- a/runtime/onert/core/src/ir/operation/Bulk.cc
+++ b/runtime/onert/core/src/ir/operation/Bulk.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/Bulk.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/Call.cc b/runtime/onert/core/src/ir/operation/Call.cc
index fb58c3e8501..478a27beed6 100644
--- a/runtime/onert/core/src/ir/operation/Call.cc
+++ b/runtime/onert/core/src/ir/operation/Call.cc
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 #include "ir/operation/Call.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/Comparison.cc b/runtime/onert/core/src/ir/operation/Comparison.cc
index 32490021e6f..e29dd945deb 100644
--- a/runtime/onert/core/src/ir/operation/Comparison.cc
+++ b/runtime/onert/core/src/ir/operation/Comparison.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/Comparison.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/Concat.cc b/runtime/onert/core/src/ir/operation/Concat.cc
index da2035ec721..eb48309ae31 100644
--- a/runtime/onert/core/src/ir/operation/Concat.cc
+++ b/runtime/onert/core/src/ir/operation/Concat.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/Concat.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/Conv2D.cc b/runtime/onert/core/src/ir/operation/Conv2D.cc
index 57d48e09014..c68d97d0b16 100644
--- a/runtime/onert/core/src/ir/operation/Conv2D.cc
+++ b/runtime/onert/core/src/ir/operation/Conv2D.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/Conv2D.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/ConvertFp16ToFp32.cc b/runtime/onert/core/src/ir/operation/ConvertFp16ToFp32.cc
index bb55e2f2ecf..771feb262e9 100644
--- a/runtime/onert/core/src/ir/operation/ConvertFp16ToFp32.cc
+++ b/runtime/onert/core/src/ir/operation/ConvertFp16ToFp32.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/ConvertFp16ToFp32.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/ConvertFp32ToFp16.cc b/runtime/onert/core/src/ir/operation/ConvertFp32ToFp16.cc
index 2a4b69fde75..6f0ab8d3cc3 100644
--- a/runtime/onert/core/src/ir/operation/ConvertFp32ToFp16.cc
+++ b/runtime/onert/core/src/ir/operation/ConvertFp32ToFp16.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/ConvertFp32ToFp16.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/DepthToSpace.cc b/runtime/onert/core/src/ir/operation/DepthToSpace.cc
index 1fc67d08f47..2ce9dab0fed 100644
--- a/runtime/onert/core/src/ir/operation/DepthToSpace.cc
+++ b/runtime/onert/core/src/ir/operation/DepthToSpace.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/DepthToSpace.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/DepthwiseConv2D.cc b/runtime/onert/core/src/ir/operation/DepthwiseConv2D.cc
index 75f60f7c635..8ea90dd86d6 100644
--- a/runtime/onert/core/src/ir/operation/DepthwiseConv2D.cc
+++ b/runtime/onert/core/src/ir/operation/DepthwiseConv2D.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/DepthwiseConv2D.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/DetectionPostProcess.cc b/runtime/onert/core/src/ir/operation/DetectionPostProcess.cc
index ab6f1f4c209..4fa9e578296 100644
--- a/runtime/onert/core/src/ir/operation/DetectionPostProcess.cc
+++ b/runtime/onert/core/src/ir/operation/DetectionPostProcess.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/DetectionPostProcess.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/DynamicUpdateSlice.cc b/runtime/onert/core/src/ir/operation/DynamicUpdateSlice.cc
index ff3b5bcfa7e..3a97eac05a6 100644
--- a/runtime/onert/core/src/ir/operation/DynamicUpdateSlice.cc
+++ b/runtime/onert/core/src/ir/operation/DynamicUpdateSlice.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/DynamicUpdateSlice.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/ElementwiseActivation.cc b/runtime/onert/core/src/ir/operation/ElementwiseActivation.cc
index 62ffc66c07b..2a708267066 100644
--- a/runtime/onert/core/src/ir/operation/ElementwiseActivation.cc
+++ b/runtime/onert/core/src/ir/operation/ElementwiseActivation.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/ElementwiseActivation.h"
+
 #include "ir/OperationVisitor.h"
 
 #include <unordered_map>
diff --git a/runtime/onert/core/src/ir/operation/ElementwiseBinary.cc b/runtime/onert/core/src/ir/operation/ElementwiseBinary.cc
index ca80543affa..2a628e17842 100644
--- a/runtime/onert/core/src/ir/operation/ElementwiseBinary.cc
+++ b/runtime/onert/core/src/ir/operation/ElementwiseBinary.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/ElementwiseBinary.h"
+
 #include "ir/OperationVisitor.h"
 
 #include <unordered_map>
diff --git a/runtime/onert/core/src/ir/operation/ElementwiseUnary.cc b/runtime/onert/core/src/ir/operation/ElementwiseUnary.cc
index 316cbe7151a..4aaefe225a2 100644
--- a/runtime/onert/core/src/ir/operation/ElementwiseUnary.cc
+++ b/runtime/onert/core/src/ir/operation/ElementwiseUnary.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/ElementwiseUnary.h"
+
 #include "ir/OperationVisitor.h"
 
 #include <unordered_map>
diff --git a/runtime/onert/core/src/ir/operation/EmbeddingLookup.cc b/runtime/onert/core/src/ir/operation/EmbeddingLookup.cc
index a76c0a52dfa..3d3e57dbd99 100644
--- a/runtime/onert/core/src/ir/operation/EmbeddingLookup.cc
+++ b/runtime/onert/core/src/ir/operation/EmbeddingLookup.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/EmbeddingLookup.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/ExpandDims.cc b/runtime/onert/core/src/ir/operation/ExpandDims.cc
index a55931124d4..9a06f9510d3 100644
--- a/runtime/onert/core/src/ir/operation/ExpandDims.cc
+++ b/runtime/onert/core/src/ir/operation/ExpandDims.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/ExpandDims.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/Fill.cc b/runtime/onert/core/src/ir/operation/Fill.cc
index a876fe048a3..b4fb1c5a486 100644
--- a/runtime/onert/core/src/ir/operation/Fill.cc
+++ b/runtime/onert/core/src/ir/operation/Fill.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/Fill.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/FullyConnected.cc b/runtime/onert/core/src/ir/operation/FullyConnected.cc
index 375cbe57480..ccc50c2bf8b 100644
--- a/runtime/onert/core/src/ir/operation/FullyConnected.cc
+++ b/runtime/onert/core/src/ir/operation/FullyConnected.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/FullyConnected.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/FusedBatchNorm.cc b/runtime/onert/core/src/ir/operation/FusedBatchNorm.cc
index df42125878c..76067f8b080 100644
--- a/runtime/onert/core/src/ir/operation/FusedBatchNorm.cc
+++ b/runtime/onert/core/src/ir/operation/FusedBatchNorm.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/FusedBatchNorm.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/Gather.cc b/runtime/onert/core/src/ir/operation/Gather.cc
index 47aff5d0122..0a1fde6e966 100644
--- a/runtime/onert/core/src/ir/operation/Gather.cc
+++ b/runtime/onert/core/src/ir/operation/Gather.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/Gather.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/HashtableLookup.cc b/runtime/onert/core/src/ir/operation/HashtableLookup.cc
index f153a6a49f2..717057e3ace 100644
--- a/runtime/onert/core/src/ir/operation/HashtableLookup.cc
+++ b/runtime/onert/core/src/ir/operation/HashtableLookup.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/HashtableLookup.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/If.cc b/runtime/onert/core/src/ir/operation/If.cc
index c05c6db73a6..c1791f707cf 100644
--- a/runtime/onert/core/src/ir/operation/If.cc
+++ b/runtime/onert/core/src/ir/operation/If.cc
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 #include "ir/operation/If.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/InstanceNorm.cc b/runtime/onert/core/src/ir/operation/InstanceNorm.cc
index 3c44f1b3efc..92127ce6b42 100644
--- a/runtime/onert/core/src/ir/operation/InstanceNorm.cc
+++ b/runtime/onert/core/src/ir/operation/InstanceNorm.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/InstanceNorm.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/L2Normalization.cc b/runtime/onert/core/src/ir/operation/L2Normalization.cc
index 8cf3825b254..cad4ad2a6a4 100644
--- a/runtime/onert/core/src/ir/operation/L2Normalization.cc
+++ b/runtime/onert/core/src/ir/operation/L2Normalization.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/L2Normalization.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/LSTM.cc b/runtime/onert/core/src/ir/operation/LSTM.cc
index 903499e9952..ace0b1c41fc 100644
--- a/runtime/onert/core/src/ir/operation/LSTM.cc
+++ b/runtime/onert/core/src/ir/operation/LSTM.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/LSTM.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/LocalResponseNormalization.cc b/runtime/onert/core/src/ir/operation/LocalResponseNormalization.cc
index 04e228959a8..f8a4235a524 100644
--- a/runtime/onert/core/src/ir/operation/LocalResponseNormalization.cc
+++ b/runtime/onert/core/src/ir/operation/LocalResponseNormalization.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/LocalResponseNormalization.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/LogSoftmax.cc b/runtime/onert/core/src/ir/operation/LogSoftmax.cc
index 75a72cbbcda..a2679069884 100644
--- a/runtime/onert/core/src/ir/operation/LogSoftmax.cc
+++ b/runtime/onert/core/src/ir/operation/LogSoftmax.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/LogSoftmax.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/Loss.cc b/runtime/onert/core/src/ir/operation/Loss.cc
index dde28f56c32..6af7617b430 100644
--- a/runtime/onert/core/src/ir/operation/Loss.cc
+++ b/runtime/onert/core/src/ir/operation/Loss.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/Loss.h"
+
 #include "ir/OperationVisitor.h"
 
 #include <unordered_map>
diff --git a/runtime/onert/core/src/ir/operation/OneHot.cc b/runtime/onert/core/src/ir/operation/OneHot.cc
index ae4df6140ef..ab09862f1e3 100644
--- a/runtime/onert/core/src/ir/operation/OneHot.cc
+++ b/runtime/onert/core/src/ir/operation/OneHot.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/OneHot.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/PReLU.cc b/runtime/onert/core/src/ir/operation/PReLU.cc
index 43bc0624dd7..5fcb002e363 100644
--- a/runtime/onert/core/src/ir/operation/PReLU.cc
+++ b/runtime/onert/core/src/ir/operation/PReLU.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/PReLU.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/Pack.cc b/runtime/onert/core/src/ir/operation/Pack.cc
index 48d3accee7a..5eb8276c3ce 100644
--- a/runtime/onert/core/src/ir/operation/Pack.cc
+++ b/runtime/onert/core/src/ir/operation/Pack.cc
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 #include "ir/operation/Pack.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/Permute.cc b/runtime/onert/core/src/ir/operation/Permute.cc
index eba75c6ae71..309c44e2033 100644
--- a/runtime/onert/core/src/ir/operation/Permute.cc
+++ b/runtime/onert/core/src/ir/operation/Permute.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/Permute.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/Pool2D.cc b/runtime/onert/core/src/ir/operation/Pool2D.cc
index 57ade050ea5..83657cd7db2 100644
--- a/runtime/onert/core/src/ir/operation/Pool2D.cc
+++ b/runtime/onert/core/src/ir/operation/Pool2D.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/Pool2D.h"
+
 #include "ir/OperationVisitor.h"
 
 #include <unordered_map>
diff --git a/runtime/onert/core/src/ir/operation/Pow.cc b/runtime/onert/core/src/ir/operation/Pow.cc
index 2ecd71c864f..6f28adde544 100644
--- a/runtime/onert/core/src/ir/operation/Pow.cc
+++ b/runtime/onert/core/src/ir/operation/Pow.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/Pow.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/RNN.cc b/runtime/onert/core/src/ir/operation/RNN.cc
index 718eb78c968..c877e0a5c35 100644
--- a/runtime/onert/core/src/ir/operation/RNN.cc
+++ b/runtime/onert/core/src/ir/operation/RNN.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/RNN.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/Range.cc b/runtime/onert/core/src/ir/operation/Range.cc
index f561be70d95..fe487577911 100644
--- a/runtime/onert/core/src/ir/operation/Range.cc
+++ b/runtime/onert/core/src/ir/operation/Range.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/Range.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/Rank.cc b/runtime/onert/core/src/ir/operation/Rank.cc
index b286d25d323..10259471903 100644
--- a/runtime/onert/core/src/ir/operation/Rank.cc
+++ b/runtime/onert/core/src/ir/operation/Rank.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/Rank.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/Reduce.cc b/runtime/onert/core/src/ir/operation/Reduce.cc
index 4d05f6fbdea..266520ed10f 100644
--- a/runtime/onert/core/src/ir/operation/Reduce.cc
+++ b/runtime/onert/core/src/ir/operation/Reduce.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/Reduce.h"
+
 #include "ir/OperationVisitor.h"
 
 #include <unordered_map>
diff --git a/runtime/onert/core/src/ir/operation/Reshape.cc b/runtime/onert/core/src/ir/operation/Reshape.cc
index c39aa76d6bd..159566be771 100644
--- a/runtime/onert/core/src/ir/operation/Reshape.cc
+++ b/runtime/onert/core/src/ir/operation/Reshape.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/Reshape.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/ResizeBilinear.cc b/runtime/onert/core/src/ir/operation/ResizeBilinear.cc
index 9c9ca93c0f2..e6b3f8b0075 100644
--- a/runtime/onert/core/src/ir/operation/ResizeBilinear.cc
+++ b/runtime/onert/core/src/ir/operation/ResizeBilinear.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/ResizeBilinear.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/ResizeNearestNeighbor.cc b/runtime/onert/core/src/ir/operation/ResizeNearestNeighbor.cc
index de2393fbe77..5348953d78d 100644
--- a/runtime/onert/core/src/ir/operation/ResizeNearestNeighbor.cc
+++ b/runtime/onert/core/src/ir/operation/ResizeNearestNeighbor.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/ResizeNearestNeighbor.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/Reverse.cc b/runtime/onert/core/src/ir/operation/Reverse.cc
index bffcf5513b8..b95122cb40d 100644
--- a/runtime/onert/core/src/ir/operation/Reverse.cc
+++ b/runtime/onert/core/src/ir/operation/Reverse.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/Reverse.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/RmsNorm.cc b/runtime/onert/core/src/ir/operation/RmsNorm.cc
index 141e1e48ecd..b266153f6a0 100644
--- a/runtime/onert/core/src/ir/operation/RmsNorm.cc
+++ b/runtime/onert/core/src/ir/operation/RmsNorm.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/RmsNorm.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/RoPE.cc b/runtime/onert/core/src/ir/operation/RoPE.cc
index 92ba906a6ee..172d26e3e1e 100644
--- a/runtime/onert/core/src/ir/operation/RoPE.cc
+++ b/runtime/onert/core/src/ir/operation/RoPE.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/RoPE.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/Shape.cc b/runtime/onert/core/src/ir/operation/Shape.cc
index 4767964c3d5..74294d8d429 100644
--- a/runtime/onert/core/src/ir/operation/Shape.cc
+++ b/runtime/onert/core/src/ir/operation/Shape.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/Shape.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/Slice.cc b/runtime/onert/core/src/ir/operation/Slice.cc
index 6f040728958..a7f5f422944 100644
--- a/runtime/onert/core/src/ir/operation/Slice.cc
+++ b/runtime/onert/core/src/ir/operation/Slice.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/Slice.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/Softmax.cc b/runtime/onert/core/src/ir/operation/Softmax.cc
index 54ab0fcf939..6818be310a1 100644
--- a/runtime/onert/core/src/ir/operation/Softmax.cc
+++ b/runtime/onert/core/src/ir/operation/Softmax.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/Softmax.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/SpaceToBatchND.cc b/runtime/onert/core/src/ir/operation/SpaceToBatchND.cc
index abf5ff538b4..45af566bcf9 100644
--- a/runtime/onert/core/src/ir/operation/SpaceToBatchND.cc
+++ b/runtime/onert/core/src/ir/operation/SpaceToBatchND.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/SpaceToBatchND.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/SpaceToDepth.cc b/runtime/onert/core/src/ir/operation/SpaceToDepth.cc
index ccb6045fe1b..bc6b5b06618 100644
--- a/runtime/onert/core/src/ir/operation/SpaceToDepth.cc
+++ b/runtime/onert/core/src/ir/operation/SpaceToDepth.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/SpaceToDepth.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/Split.cc b/runtime/onert/core/src/ir/operation/Split.cc
index ac462f5a3ab..820572157da 100644
--- a/runtime/onert/core/src/ir/operation/Split.cc
+++ b/runtime/onert/core/src/ir/operation/Split.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/Split.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/SplitV.cc b/runtime/onert/core/src/ir/operation/SplitV.cc
index 1ffecb3ab26..7fac6c8aa3d 100644
--- a/runtime/onert/core/src/ir/operation/SplitV.cc
+++ b/runtime/onert/core/src/ir/operation/SplitV.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/SplitV.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/SquaredDifference.cc b/runtime/onert/core/src/ir/operation/SquaredDifference.cc
index 905f69dbbe9..d48808e672e 100644
--- a/runtime/onert/core/src/ir/operation/SquaredDifference.cc
+++ b/runtime/onert/core/src/ir/operation/SquaredDifference.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/SquaredDifference.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/Squeeze.cc b/runtime/onert/core/src/ir/operation/Squeeze.cc
index 7656d009a84..3c30d7f443b 100644
--- a/runtime/onert/core/src/ir/operation/Squeeze.cc
+++ b/runtime/onert/core/src/ir/operation/Squeeze.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/Squeeze.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/StatelessRandomUniform.cc b/runtime/onert/core/src/ir/operation/StatelessRandomUniform.cc
index 3cccfbaa9e7..7affb1ce169 100644
--- a/runtime/onert/core/src/ir/operation/StatelessRandomUniform.cc
+++ b/runtime/onert/core/src/ir/operation/StatelessRandomUniform.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/StatelessRandomUniform.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/StridedSlice.cc b/runtime/onert/core/src/ir/operation/StridedSlice.cc
index bdff5303060..96435af8b57 100644
--- a/runtime/onert/core/src/ir/operation/StridedSlice.cc
+++ b/runtime/onert/core/src/ir/operation/StridedSlice.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/StridedSlice.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/Tile.cc b/runtime/onert/core/src/ir/operation/Tile.cc
index 143db220833..8a26e72a35e 100644
--- a/runtime/onert/core/src/ir/operation/Tile.cc
+++ b/runtime/onert/core/src/ir/operation/Tile.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/Tile.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/TopKV2.cc b/runtime/onert/core/src/ir/operation/TopKV2.cc
index a73536092a2..682511a39fa 100644
--- a/runtime/onert/core/src/ir/operation/TopKV2.cc
+++ b/runtime/onert/core/src/ir/operation/TopKV2.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/TopKV2.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/Transpose.cc b/runtime/onert/core/src/ir/operation/Transpose.cc
index 5a28dae9d2a..feb2d5a1c73 100644
--- a/runtime/onert/core/src/ir/operation/Transpose.cc
+++ b/runtime/onert/core/src/ir/operation/Transpose.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/Transpose.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/TransposeConv.cc b/runtime/onert/core/src/ir/operation/TransposeConv.cc
index cc2f3c5599e..c7fa288e48a 100644
--- a/runtime/onert/core/src/ir/operation/TransposeConv.cc
+++ b/runtime/onert/core/src/ir/operation/TransposeConv.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/TransposeConv.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/Unpack.cc b/runtime/onert/core/src/ir/operation/Unpack.cc
index 4e51f074667..189be575456 100644
--- a/runtime/onert/core/src/ir/operation/Unpack.cc
+++ b/runtime/onert/core/src/ir/operation/Unpack.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/Unpack.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/operation/While.cc b/runtime/onert/core/src/ir/operation/While.cc
index 474637d5e2e..7ae0808513d 100644
--- a/runtime/onert/core/src/ir/operation/While.cc
+++ b/runtime/onert/core/src/ir/operation/While.cc
@@ -15,6 +15,7 @@
  */
 
 #include "ir/operation/While.h"
+
 #include "ir/OperationVisitor.h"
 
 namespace onert::ir::operation
diff --git a/runtime/onert/core/src/ir/train/TrainableGraph.cc b/runtime/onert/core/src/ir/train/TrainableGraph.cc
index 67707d37061..32f27d0eb2b 100644
--- a/runtime/onert/core/src/ir/train/TrainableGraph.cc
+++ b/runtime/onert/core/src/ir/train/TrainableGraph.cc
@@ -16,15 +16,16 @@
 
 #include "ir/train/TrainableGraph.h"
 
-#include "ir/OperandIndexMap.h"
+#include "../verifier/Verifier.h"
 #include "UseDefGenerator.h"
+#include "ir/OperandIndexMap.h"
 #include "util/Set.h"
-#include "../verifier/Verifier.h"
+
+#include <misc/polymorphic_downcast.h>
 
 #include <algorithm>
-#include <set>
 #include <map>
-#include <misc/polymorphic_downcast.h>
+#include <set>
 
 namespace
 {
diff --git a/runtime/onert/core/src/ir/train/TrainableGraph.test.cc b/runtime/onert/core/src/ir/train/TrainableGraph.test.cc
index 08ab97f6fdd..48c1de7b9a1 100644
--- a/runtime/onert/core/src/ir/train/TrainableGraph.test.cc
+++ b/runtime/onert/core/src/ir/train/TrainableGraph.test.cc
@@ -15,11 +15,12 @@
  */
 
 #include "ir/train/TrainableGraph.h"
+
+#include "ir/train/LossInfo.h"
 #include "ir/train/operation/BinaryArithmetic.h"
 #include "ir/train/operation/ElementwiseActivation.h"
 #include "ir/train/operation/FullyConnected.h"
 #include "ir/train/operation/Loss.h"
-#include "ir/train/LossInfo.h"
 
 #include <gtest/gtest.h>
 
diff --git a/runtime/onert/core/src/ir/train/UseDefGenerator.cc b/runtime/onert/core/src/ir/train/UseDefGenerator.cc
index a91c9130c99..71a97680d54 100644
--- a/runtime/onert/core/src/ir/train/UseDefGenerator.cc
+++ b/runtime/onert/core/src/ir/train/UseDefGenerator.cc
@@ -16,9 +16,9 @@
 
 #include "UseDefGenerator.h"
 
-#include "ir/train/TrainableGraph.h"
-#include "ir/train/Index.h"
 #include "../verifier/Verifier.h"
+#include "ir/train/Index.h"
+#include "ir/train/TrainableGraph.h"
 
 #include <cassert>
 #include <memory>
diff --git a/runtime/onert/core/src/ir/train/UseDefGenerator.h b/runtime/onert/core/src/ir/train/UseDefGenerator.h
index e15b30af147..e0487f4e5fc 100644
--- a/runtime/onert/core/src/ir/train/UseDefGenerator.h
+++ b/runtime/onert/core/src/ir/train/UseDefGenerator.h
@@ -17,10 +17,9 @@
 #ifndef __ONERT_IR_TRAIN_USEDEFINITIALIZER_H__
 #define __ONERT_IR_TRAIN_USEDEFINITIALIZER_H__
 
+#include "ir/train/Operations.Include.h"
 #include "ir/train/TrainableOperationVisitor.h"
-
 #include "ir/train/UseDefChains.h"
-#include "ir/train/Operations.Include.h"
 
 namespace onert::ir::train
 {
diff --git a/runtime/onert/core/src/ir/train/UseDefGenerator.test.cc b/runtime/onert/core/src/ir/train/UseDefGenerator.test.cc
index 9216a92fdb0..d25f85db34c 100644
--- a/runtime/onert/core/src/ir/train/UseDefGenerator.test.cc
+++ b/runtime/onert/core/src/ir/train/UseDefGenerator.test.cc
@@ -16,8 +16,8 @@
 
 #include "UseDefGenerator.h"
 
-#include "ir/train/TrainableGraph.h"
 #include "ir/train/Operations.Include.h"
+#include "ir/train/TrainableGraph.h"
 
 #include <gtest/gtest.h>
 
diff --git a/runtime/onert/core/src/ir/verifier/Verifier.cc b/runtime/onert/core/src/ir/verifier/Verifier.cc
index d45581d6289..20ad98eab4d 100644
--- a/runtime/onert/core/src/ir/verifier/Verifier.cc
+++ b/runtime/onert/core/src/ir/verifier/Verifier.cc
@@ -18,7 +18,6 @@
 
 #include "ir/Graph.h"
 #include "ir/OperationIndexMap.h"
-
 #include "util/logging.h"
 
 namespace
diff --git a/runtime/onert/core/src/ir/verifier/Verifier.test.cc b/runtime/onert/core/src/ir/verifier/Verifier.test.cc
index 22de6819a8e..c31c12478c3 100644
--- a/runtime/onert/core/src/ir/verifier/Verifier.test.cc
+++ b/runtime/onert/core/src/ir/verifier/Verifier.test.cc
@@ -17,7 +17,6 @@
 #include "Verifier.h"
 
 #include "../MockNode.h"
-
 #include "ir/Graph.h"
 
 #include <gtest/gtest.h>
diff --git a/runtime/onert/core/src/loader/BaseLoader.h b/runtime/onert/core/src/loader/BaseLoader.h
index cdec278d6ac..0e8d9c9b164 100644
--- a/runtime/onert/core/src/loader/BaseLoader.h
+++ b/runtime/onert/core/src/loader/BaseLoader.h
@@ -19,21 +19,22 @@
 #define __ONERT_LOADER_BASE_LOADER_H__
 
 #include "ir/Graph.h"
-#include "ir/Shape.h"
 #include "ir/Operations.Include.h"
+#include "ir/Shape.h"
 
-#include "flatbuffers/flexbuffers.h"
-
-#include <map>
-#include <memory>
-#include <fstream>
-#include <limits>
 #include <fcntl.h>
-#include <sys/stat.h>
 #include <sys/mman.h>
+#include <sys/stat.h>
 #include <unistd.h>
 #include <util/logging.h>
 
+#include "flatbuffers/flexbuffers.h"
+
+#include <fstream>
+#include <limits>
+#include <map>
+#include <memory>
+
 namespace onert::loader
 {
 
diff --git a/runtime/onert/core/src/loader/CircleLoader.cc b/runtime/onert/core/src/loader/CircleLoader.cc
index d2001a86478..6c555145fff 100644
--- a/runtime/onert/core/src/loader/CircleLoader.cc
+++ b/runtime/onert/core/src/loader/CircleLoader.cc
@@ -15,10 +15,10 @@
  */
 
 #include "loader/CircleLoader.h"
-#include "loader/ModelLoader.h"
 
 #include "BaseLoader.h"
 #include "circle_schema_generated.h"
+#include "loader/ModelLoader.h"
 
 #include <filesystem>
 
diff --git a/runtime/onert/core/src/loader/TrainInfoLoader.cc b/runtime/onert/core/src/loader/TrainInfoLoader.cc
index 2bb6e606e4d..12260d88e7e 100644
--- a/runtime/onert/core/src/loader/TrainInfoLoader.cc
+++ b/runtime/onert/core/src/loader/TrainInfoLoader.cc
@@ -17,6 +17,7 @@
 #include "loader/TrainInfoLoader.h"
 
 #include "circle_traininfo_generated.h"
+
 #include "flatbuffers/flatbuffers.h"
 
 namespace onert::loader
diff --git a/runtime/onert/core/src/loader/train/CheckpointLoader.cc b/runtime/onert/core/src/loader/train/CheckpointLoader.cc
index c6f546bdc96..5127bd2f80c 100644
--- a/runtime/onert/core/src/loader/train/CheckpointLoader.cc
+++ b/runtime/onert/core/src/loader/train/CheckpointLoader.cc
@@ -20,8 +20,8 @@
 #include "ir/train/Checkpoint.h"
 #include "ir/train/TrainingInfo.h"
 
-#include <fstream>
 #include <filesystem>
+#include <fstream>
 
 namespace
 {
diff --git a/runtime/onert/core/src/odc/CodegenLoader.cc b/runtime/onert/core/src/odc/CodegenLoader.cc
index c55e70d6da2..1d11f2ce1d7 100644
--- a/runtime/onert/core/src/odc/CodegenLoader.cc
+++ b/runtime/onert/core/src/odc/CodegenLoader.cc
@@ -17,6 +17,7 @@
 #include "CodegenLoader.h"
 
 #include <dlfcn.h>
+
 #include <iostream>
 #include <memory>
 
diff --git a/runtime/onert/core/src/odc/CodegenManager.cc b/runtime/onert/core/src/odc/CodegenManager.cc
index 61ff94ea78d..950de1dfc68 100644
--- a/runtime/onert/core/src/odc/CodegenManager.cc
+++ b/runtime/onert/core/src/odc/CodegenManager.cc
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-#include "CodegenLoader.h"
 #include "odc/CodegenManager.h"
 
+#include "CodegenLoader.h"
+
 #include <mutex>
 #include <stdexcept>
 
diff --git a/runtime/onert/core/src/odc/QuantizeManager.cc b/runtime/onert/core/src/odc/QuantizeManager.cc
index 51f867eeea0..40008e20e53 100644
--- a/runtime/onert/core/src/odc/QuantizeManager.cc
+++ b/runtime/onert/core/src/odc/QuantizeManager.cc
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-#include "QuantizerLoader.h"
 #include "odc/QuantizeManager.h"
 
+#include "QuantizerLoader.h"
+
 #include <iostream>
 #include <mutex>
 
diff --git a/runtime/onert/core/src/odc/QuantizerLoader.cc b/runtime/onert/core/src/odc/QuantizerLoader.cc
index 0d6d314ea10..ea4a4751700 100644
--- a/runtime/onert/core/src/odc/QuantizerLoader.cc
+++ b/runtime/onert/core/src/odc/QuantizerLoader.cc
@@ -17,6 +17,7 @@
 #include "QuantizerLoader.h"
 
 #include <dlfcn.h>
+
 #include <iostream>
 #include <string>
 
diff --git a/runtime/onert/core/src/util/ConfigSource.cc b/runtime/onert/core/src/util/ConfigSource.cc
index 5a8168f1901..4af2eecae25 100644
--- a/runtime/onert/core/src/util/ConfigSource.cc
+++ b/runtime/onert/core/src/util/ConfigSource.cc
@@ -15,6 +15,7 @@
  */
 
 #include "util/ConfigSource.h"
+
 #include "util/logging.h"
 
 #include <misc/EnvConfigSource.h>
diff --git a/runtime/onert/core/src/util/EventCollector.cc b/runtime/onert/core/src/util/EventCollector.cc
index 29f6c94f25d..ee9ef6497f2 100644
--- a/runtime/onert/core/src/util/EventCollector.cc
+++ b/runtime/onert/core/src/util/EventCollector.cc
@@ -20,8 +20,8 @@
 #include <chrono>
 
 // POSIX standard libraries
-#include <sys/time.h>
 #include <sys/resource.h>
+#include <sys/time.h>
 
 namespace
 {
diff --git a/runtime/onert/core/src/util/EventCollector.h b/runtime/onert/core/src/util/EventCollector.h
index fc6d4c983ed..c952a3556a3 100644
--- a/runtime/onert/core/src/util/EventCollector.h
+++ b/runtime/onert/core/src/util/EventCollector.h
@@ -18,7 +18,6 @@
 #define __ONERT_UTIL_EVENT_COLLECTOR_H__
 
 #include "EventRecorder.h"
-
 #include "util/TracingCtx.h"
 
 #include <string>
diff --git a/runtime/onert/core/src/util/EventRecorder.h b/runtime/onert/core/src/util/EventRecorder.h
index 10bd8ed1884..4a100b53fea 100644
--- a/runtime/onert/core/src/util/EventRecorder.h
+++ b/runtime/onert/core/src/util/EventRecorder.h
@@ -22,7 +22,6 @@
 #include <map>
 #include <memory>
 #include <mutex>
-
 #include <vector>
 
 // refer to https://docs.google.com/document/d/1CvAClvFfyA5R-PhYUmn5OOQtYMH4h6I0nSsKchNAySU/edit#
diff --git a/runtime/onert/core/src/util/EventWriter.h b/runtime/onert/core/src/util/EventWriter.h
index 25cc4b00ce0..f1adcc3084c 100644
--- a/runtime/onert/core/src/util/EventWriter.h
+++ b/runtime/onert/core/src/util/EventWriter.h
@@ -19,11 +19,11 @@
 
 #include "EventRecorder.h"
 
+#include <fstream>
+#include <mutex>
 #include <string>
-#include <vector>
 #include <unordered_map>
-#include <mutex>
-#include <fstream>
+#include <vector>
 
 class EventFormatWriter
 {
diff --git a/runtime/onert/core/src/util/MDTableEventWriter.cc b/runtime/onert/core/src/util/MDTableEventWriter.cc
index 37eb0188361..02c3d2cd8ca 100644
--- a/runtime/onert/core/src/util/MDTableEventWriter.cc
+++ b/runtime/onert/core/src/util/MDTableEventWriter.cc
@@ -16,11 +16,12 @@
 
 #include "EventWriter.h"
 
+#include <stdint.h>
+
 #include <cassert>
 #include <map>
 #include <set>
 #include <sstream>
-#include <stdint.h>
 #include <unordered_map>
 #include <utility>
 #include <vector>
diff --git a/runtime/onert/core/src/util/ObjectManager.test.cc b/runtime/onert/core/src/util/ObjectManager.test.cc
index 0cd8499563a..d6b7c91b900 100644
--- a/runtime/onert/core/src/util/ObjectManager.test.cc
+++ b/runtime/onert/core/src/util/ObjectManager.test.cc
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-#include "util/Index.h"
 #include "util/ObjectManager.h"
 
+#include "util/Index.h"
+
 #include <gtest/gtest.h>
 
 using namespace onert;
diff --git a/runtime/onert/core/src/util/ShapeInference.cc b/runtime/onert/core/src/util/ShapeInference.cc
index f56cfa195c3..87cc0c254b5 100644
--- a/runtime/onert/core/src/util/ShapeInference.cc
+++ b/runtime/onert/core/src/util/ShapeInference.cc
@@ -15,15 +15,16 @@
  * limitations under the License.
  */
 
+#include "util/ShapeInference.h"
+
 #include "ir/InternalType.h"
 #include "ir/Shape.h"
-#include "util/ShapeInference.h"
 #include "util/logging.h"
 
 #include <cassert>
+#include <cmath>
 #include <numeric>
 #include <sstream>
-#include <cmath>
 
 namespace onert::shape_inference
 {
diff --git a/runtime/onert/odc/Embedder.cc b/runtime/onert/odc/Embedder.cc
index ac45df5fce5..7522aa27057 100644
--- a/runtime/onert/odc/Embedder.cc
+++ b/runtime/onert/odc/Embedder.cc
@@ -15,6 +15,7 @@
  */
 
 #include "Embedder.h"
+
 #include "MinMaxReader.h"
 
 #include <luci/IR/CircleNode.h>
diff --git a/runtime/onert/odc/MinMaxReader.cc b/runtime/onert/odc/MinMaxReader.cc
index e715444b116..fc724c7c0d8 100644
--- a/runtime/onert/odc/MinMaxReader.cc
+++ b/runtime/onert/odc/MinMaxReader.cc
@@ -17,8 +17,8 @@
 #include "MinMaxReader.h"
 
 #include <cstdio>
-#include <stdexcept>
 #include <limits>
+#include <stdexcept>
 
 namespace
 {
diff --git a/runtime/onert/odc/Quantizer.cc b/runtime/onert/odc/Quantizer.cc
index e2d90535027..e60cc73a38e 100644
--- a/runtime/onert/odc/Quantizer.cc
+++ b/runtime/onert/odc/Quantizer.cc
@@ -19,11 +19,11 @@
 #include "Embedder.h"
 #include "MinMaxReader.h"
 
-#include <util/ConfigSource.h>
-#include <luci/ImporterEx.h>
-#include <luci/CircleQuantizer.h>
 #include <luci/CircleExporter.h>
 #include <luci/CircleFileExpContract.h>
+#include <luci/CircleQuantizer.h>
+#include <luci/ImporterEx.h>
+#include <util/ConfigSource.h>
 
 #include <iostream>
 
diff --git a/runtime/onert/sample/minimal/src/minimal.cc b/runtime/onert/sample/minimal/src/minimal.cc
index fa03bf7cb49..33dc8ea57e1 100644
--- a/runtime/onert/sample/minimal/src/minimal.cc
+++ b/runtime/onert/sample/minimal/src/minimal.cc
@@ -15,8 +15,9 @@
  */
 
 #include "nnfw.h"
-#include <vector>
+
 #include <iostream>
+#include <vector>
 
 uint64_t num_elems(const nnfw_tensorinfo *ti)
 {