diff --git a/Global/Xcode.gitignore b/Global/Xcode.gitignore
index d07b7894..c08bace2 100644
--- a/Global/Xcode.gitignore
+++ b/Global/Xcode.gitignore
@@ -4,7 +4,7 @@
 
 ## Build generated
 build/
-DerivedData
+DerivedData/
 
 ## Various settings
 *.pbxuser
@@ -15,9 +15,8 @@ DerivedData
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-xcuserdata
+xcuserdata/
 
 ## Other
 *.xccheckout
 *.moved-aside
-*.xcuserstate
diff --git a/Objective-C.gitignore b/Objective-C.gitignore
index 7f24b4de..59f6862a 100644
--- a/Objective-C.gitignore
+++ b/Objective-C.gitignore
@@ -4,7 +4,7 @@
 
 ## Build generated
 build/
-DerivedData
+DerivedData/
 
 ## Various settings
 *.pbxuser
@@ -15,12 +15,11 @@ DerivedData
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-xcuserdata
+xcuserdata/
 
 ## Other
 *.xccheckout
 *.moved-aside
-*.xcuserstate
 
 ## Obj-C/Swift specific
 *.hmap
diff --git a/Swift.gitignore b/Swift.gitignore
index 583de456..e278bf19 100644
--- a/Swift.gitignore
+++ b/Swift.gitignore
@@ -4,7 +4,7 @@
 
 ## Build generated
 build/
-DerivedData
+DerivedData/
 
 ## Various settings
 *.pbxuser
@@ -15,12 +15,11 @@ DerivedData
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-xcuserdata
+xcuserdata/
 
 ## Other
 *.xccheckout
 *.moved-aside
-*.xcuserstate
 
 ## Obj-C/Swift specific
 *.hmap