diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
new file mode 100644
index 00000000..094a1536
--- /dev/null
+++ b/.git-blame-ignore-revs
@@ -0,0 +1,11 @@
+# When making commits that are strictly formatting/style changes, add the
+# commit hash here, so git blame can ignore the change. See docs for more
+# details:
+# https://git-scm.com/docs/git-config#Documentation/git-config.txt-blameignoreRevsFile
+#
+#
+# Example entries:
+#
+# <full commit hash>  # Formating changes 
+# <full commit hash>  # rename something internal
+4352a86efc9a0270ecd0c1712c9f470a9bd8fb75 # Format all c++ files
\ No newline at end of file
diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml
index 70c1e37b..63a04409 100644
--- a/.github/workflows/clang-format-check.yml
+++ b/.github/workflows/clang-format-check.yml
@@ -25,5 +25,6 @@ jobs:
       uses: jidicula/clang-format-action@v4.14.0
       with:
         clang-format-version: 19
+        fallback-style: none
         check-path: ${{ matrix.path }}
-        exclude-regex: '(?:(?:Bindings|CLI)\/)|(?:CppParser\/(?:Parse)?(?:Expr|Stmt))'
+        exclude-regex: '(Bindings|CLI)/|(CppParser/(Parse)?(Expr|Stmt))'
diff --git a/.gitignore b/.gitignore
index 4d06c6b3..c6a831cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,6 @@ src/generator/generator
 .DS_Store
 *.user
 *.suo
-*.DotSettings
 *.sdf
 *.opensdf
 *.pdb
diff --git a/CppSharp.sln.DotSettings b/CppSharp.sln.DotSettings
new file mode 100644
index 00000000..68fb4a1a
--- /dev/null
+++ b/CppSharp.sln.DotSettings
@@ -0,0 +1,5 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CLI/@EntryIndexedValue">CLI</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MSVC/@EntryIndexedValue">MSVC</s:String>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=diag/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=undefine/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/src/Generator.Tests/AST/TestAST.cs b/src/Generator.Tests/AST/TestAST.cs
index 62a0f6d9..b1a4f00b 100644
--- a/src/Generator.Tests/AST/TestAST.cs
+++ b/src/Generator.Tests/AST/TestAST.cs
@@ -332,13 +332,13 @@ namespace CppSharp.Generator.Tests.AST
         [Test]
         public void TestLineNumber()
         {
-            Assert.AreEqual(70, AstContext.FindClass("HiddenInNamespace").First().LineNumberStart);
+            Assert.AreEqual(93, AstContext.FindClass("HiddenInNamespace").First().LineNumberStart);
         }
 
         [Test]
         public void TestLineNumberOfFriend()
         {
-            Assert.AreEqual(93, AstContext.FindFunction("operator+").First().LineNumberStart);
+            Assert.AreEqual(116, AstContext.FindFunction("operator+").First().LineNumberStart);
         }
 
         static string StripWindowsNewLines(string text)
@@ -379,7 +379,7 @@ namespace CppSharp.Generator.Tests.AST
         [Test]
         public void TestMacroLineNumber()
         {
-            Assert.AreEqual(103, AstContext.FindClass("HasAmbiguousFunctions").First().Specifiers.Last().LineNumberStart);
+            Assert.AreEqual(126, AstContext.FindClass("HasAmbiguousFunctions").First().Specifiers.Last().LineNumberStart);
         }
 
         [Test]