diff --git a/.gitignore b/.gitignore
index 39cdc4ea5..7665265e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,10 @@ massif-*
 # Microsoft CMake extension for Visual Studio Code generates a build directory by default
 /build/
 
+# Visual Studio automatically generated files
+/visualc/VS2010/mbedTLS.sln
+/visualc/VS2010/*.vcxproj
+
 # Visual Studio artifacts
 /visualc/VS2010/.localhistory/
 /visualc/VS2010/.vs/
diff --git a/library/.gitignore b/library/.gitignore
index 3a63a63a4..6fde1f5e7 100644
--- a/library/.gitignore
+++ b/library/.gitignore
@@ -2,3 +2,7 @@
 libmbed*
 *.sln
 *.vcxproj
+
+# Automatically generated files
+/error.c
+/version_features.c
diff --git a/programs/.gitignore b/programs/.gitignore
index 4e66f4c0f..83521a792 100644
--- a/programs/.gitignore
+++ b/programs/.gitignore
@@ -5,6 +5,10 @@
 *.sln
 *.vcxproj
 
+# Generated source files
+/psa/psa_constant_names_generated.c
+/test/query_config.c
+
 *.o
 *.exe
 
@@ -66,5 +70,5 @@ x509/cert_write
 x509/crl_app
 x509/req_app
 
-# generated files
+# Generated data files
 pkey/keyfile.key
diff --git a/tests/.gitignore b/tests/.gitignore
index d9f4b5178..fa901cbe5 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1,6 +1,11 @@
 *.sln
 *.vcxproj
 
+# Generated source files
+/suites/*.generated.data
+/suites/test_suite_psa_crypto_storage_format.v[0-9]*.data
+/suites/test_suite_psa_crypto_storage_format.current.data
+
 *.log
 /test_suite*
 data_files/mpi_write