diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..7b9a2ce4
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,20 @@
+# By default, enforce CRLF line-endings on all text files
+* text=auto eol=crlf
+*.c text eol=crlf
+*.cc text eol=crlf
+*.cpp text eol=crlf
+*.cxx text eol=crlf
+*.h text eol=crlf
+*.hpp text eol=crlf
+*.hxx text eol=crlf
+*.txt text eol=crlf
+
+# Visual Studio
+*.sln eol=crlf
+*.slnx eol=crlf
+*.vcxproj eol=crlf
+*.vcxproj.filters eol=crlf
+*.rc eol=crlf
+*.rc2 eol=crlf
+*.props eol=crlf
+*.natvis eol=crlf
diff --git a/.gitignore b/.gitignore
index d6c310f2..49f00914 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,28 +1,27 @@
-obj/
-Debug/
-Debug (Unicode)/
-Release/
-Release (Unicode)/
-Win32/
-x64/
-*.vcxproj.user
-*.*sdf
-*.suo
-ipch/
-setup/vld-*-setup.exe
-setup/Output/
-setup/version.h
-build_x86/
-build_x64/
-build_arm64/
-lib/gtest/msvc/bin/
-_ReSharper.Caches/
-lib/cppformat/bin/
-src/bin/vld.ini
-/src/tests/vld_ComTest/ComTest_i.h
-/src/tests/vld_ComTest/ComTest_p.c
-/src/tests/vld_ComTest/ComTest_i.c
-*.VC.opendb
-*.VC.db
-*.aps
-.vs/
\ No newline at end of file
+obj/
+Debug/
+Debug (Unicode)/
+Release/
+Release (Unicode)/
+Win32/
+x64/
+*.vcxproj.user
+*.*sdf
+*.suo
+ipch/
+setup/vld-*-setup.exe
+setup/Output/
+setup/version.h
+build_*/
+build.*/
+lib/gtest/msvc/bin/
+_ReSharper.Caches/
+lib/cppformat/bin/
+src/bin/vld.ini
+/src/tests/vld_ComTest/ComTest_i.h
+/src/tests/vld_ComTest/ComTest_p.c
+/src/tests/vld_ComTest/ComTest_i.c
+*.VC.opendb
+*.VC.db
+*.aps
+.vs/