diff --git a/.clang-format b/.clang-format
index a7d9308ce..40900c339 100644
--- a/.clang-format
+++ b/.clang-format
@@ -46,6 +46,7 @@ ObjCSpaceAfterProperty: false
 ObjCSpaceBeforeProtocolList: true
 PointerAlignment: Right
 ReflowComments: false
+SortIncludes: false
 SpaceAfterCStyleCast: true
 SpaceAfterLogicalNot: false
 SpaceAfterTemplateKeyword: false
diff --git a/formatters/cpp.clang-format b/formatters/cpp.clang-format
index a7d9308ce..40900c339 100644
--- a/formatters/cpp.clang-format
+++ b/formatters/cpp.clang-format
@@ -46,6 +46,7 @@ ObjCSpaceAfterProperty: false
 ObjCSpaceBeforeProtocolList: true
 PointerAlignment: Right
 ReflowComments: false
+SortIncludes: false
 SpaceAfterCStyleCast: true
 SpaceAfterLogicalNot: false
 SpaceAfterTemplateKeyword: false
diff --git a/spine-ue4/Plugins/SpinePlugin/Source/SpineEditorPlugin/Public/SpineAtlasImportFactory.h b/spine-ue4/Plugins/SpinePlugin/Source/SpineEditorPlugin/Public/SpineAtlasImportFactory.h
index 1e374b5b9..502b65719 100644
--- a/spine-ue4/Plugins/SpinePlugin/Source/SpineEditorPlugin/Public/SpineAtlasImportFactory.h
+++ b/spine-ue4/Plugins/SpinePlugin/Source/SpineEditorPlugin/Public/SpineAtlasImportFactory.h
@@ -29,9 +29,11 @@
 
 #pragma once
 
+// clang-format off
 #include "SpineAtlasAsset.h"
 #include "UnrealEd.h"
 #include "SpineAtlasImportFactory.generated.h"
+// clang-format on
 
 UCLASS()
 class USpineAtlasAssetFactory : public UFactory, public FReimportHandler {
diff --git a/spine-ue4/Plugins/SpinePlugin/Source/SpineEditorPlugin/Public/SpineSkeletonImportFactory.h b/spine-ue4/Plugins/SpinePlugin/Source/SpineEditorPlugin/Public/SpineSkeletonImportFactory.h
index cb80eeb15..ed3b3eeed 100644
--- a/spine-ue4/Plugins/SpinePlugin/Source/SpineEditorPlugin/Public/SpineSkeletonImportFactory.h
+++ b/spine-ue4/Plugins/SpinePlugin/Source/SpineEditorPlugin/Public/SpineSkeletonImportFactory.h
@@ -29,9 +29,11 @@
 
 #pragma once
 
+// clang-format off
 #include "SpineAtlasAsset.h"
 #include "UnrealEd.h"
 #include "SpineSkeletonImportFactory.generated.h"
+// clang-format on
 
 UCLASS()
 class USpineSkeletonAssetFactory : public UFactory, public FReimportHandler {
diff --git a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineAtlasAsset.h b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineAtlasAsset.h
index 93a19e9f7..5bb5ee4f4 100644
--- a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineAtlasAsset.h
+++ b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineAtlasAsset.h
@@ -29,9 +29,11 @@
 
 #pragma once
 
+// clang-format off
 #include "Engine.h"
 #include "spine/spine.h"
 #include "SpineAtlasAsset.generated.h"
+// clang-format on
 
 UCLASS(BlueprintType, ClassGroup = (Spine))
 class SPINEPLUGIN_API USpineAtlasAsset : public UObject {
diff --git a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineSkeletonAnimationComponent.h b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineSkeletonAnimationComponent.h
index 31b082493..47524bff3 100644
--- a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineSkeletonAnimationComponent.h
+++ b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineSkeletonAnimationComponent.h
@@ -29,10 +29,12 @@
 
 #pragma once
 
+// clang-format off
 #include "Components/ActorComponent.h"
 #include "SpineSkeletonComponent.h"
 #include "spine/spine.h"
 #include "SpineSkeletonAnimationComponent.generated.h"
+// clang-format on
 
 USTRUCT(BlueprintType, Category = "Spine")
 struct SPINEPLUGIN_API FSpineEvent {
diff --git a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineSkeletonComponent.h b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineSkeletonComponent.h
index 368d7c8bc..83678113b 100644
--- a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineSkeletonComponent.h
+++ b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineSkeletonComponent.h
@@ -29,10 +29,12 @@
 
 #pragma once
 
+// clang-format off
 #include "Components/ActorComponent.h"
 #include "SpineSkeletonDataAsset.h"
 #include "spine/spine.h"
 #include "SpineSkeletonComponent.generated.h"
+// clang-format on
 
 class USpineSkeletonComponent;
 
diff --git a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineSkeletonDataAsset.h b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineSkeletonDataAsset.h
index 9dca76b82..81857ab2f 100644
--- a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineSkeletonDataAsset.h
+++ b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineSkeletonDataAsset.h
@@ -29,9 +29,11 @@
 
 #pragma once
 
+// clang-format off
 #include "Engine.h"
 #include "spine/spine.h"
 #include "SpineSkeletonDataAsset.generated.h"
+// clang-format on
 
 USTRUCT(BlueprintType, Category = "Spine")
 struct SPINEPLUGIN_API FSpineAnimationStateMixData {
diff --git a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineWidget.h b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineWidget.h
index 66333c20b..0d9a5824b 100644
--- a/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineWidget.h
+++ b/spine-ue4/Plugins/SpinePlugin/Source/SpinePlugin/Public/SpineWidget.h
@@ -29,11 +29,13 @@
 
 #pragma once
 
+// clang-format off
 #include "Runtime/UMG/Public/UMG.h"
 #include "Runtime/UMG/Public/UMGStyle.h"
 #include "SpineSkeletonDataAsset.h"
 #include "spine/spine.h"
 #include "SpineWidget.generated.h"
+// clang-format on
 
 class SSpineWidget;
 
diff --git a/spine-ue4/Source/SpineUE4/MySceneComponent.h b/spine-ue4/Source/SpineUE4/MySceneComponent.h
index 42a118977..3ded6baf4 100644
--- a/spine-ue4/Source/SpineUE4/MySceneComponent.h
+++ b/spine-ue4/Source/SpineUE4/MySceneComponent.h
@@ -4,8 +4,8 @@
 
 #include "Components/SceneComponent.h"
 #include "CoreMinimal.h"
-#include "SpineSkeletonRendererComponent.h"
 #include "MySceneComponent.generated.h"
+#include "SpineSkeletonRendererComponent.h"
 
 
 UCLASS(ClassGroup = (Custom), meta = (BlueprintSpawnableComponent))