diff --git a/.clang-format b/.clang-format
index 844de44..9909a56 100644
--- a/.clang-format
+++ b/.clang-format
@@ -61,23 +61,6 @@ DerivePointerAlignment: false
 DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
 FixNamespaceComments: true
-ForEachMacros:
-  - foreach
-  - Q_FOREACH
-  - BOOST_FOREACH
-IncludeBlocks:   Preserve
-IncludeCategories:
-  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
-    Priority:        2
-    SortPriority:    0
-  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
-    Priority:        3
-    SortPriority:    0
-  - Regex:           '.*'
-    Priority:        1
-    SortPriority:    0
-IncludeIsMainRegex: '(Test)?$'
-IncludeIsMainSourceRegex: ''
 IndentCaseLabels: false
 IndentGotoLabels: true
 IndentPPDirectives: None
@@ -104,7 +87,7 @@ PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 1000
 PointerAlignment: Right
 ReflowComments:  true
-SortIncludes:    false
+SortIncludes:    true
 SortUsingDeclarations: true
 SpaceAfterCStyleCast: false
 SpaceAfterLogicalNot: false
diff --git a/.clang-tidy b/.clang-tidy
index de848df..69a7a36 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -49,4 +49,5 @@ Checks: "*,\
   -cppcoreguidelines-non-private-member-variables-in-classes,\
   -cppcoreguidelines-pro-type-union-access,\
   -readability-static-accessed-through-instance,\
-  -cppcoreguidelines-special-member-functions"
\ No newline at end of file
+  -cppcoreguidelines-special-member-functions,\
+  -readability-isolate-declaration"
\ No newline at end of file