diff --git a/Global/Xcode.gitignore b/Global/Xcode.gitignore
index d07b7894..37de8bb4 100644
--- a/Global/Xcode.gitignore
+++ b/Global/Xcode.gitignore
@@ -4,7 +4,7 @@
 
 ## Build generated
 build/
-DerivedData
+DerivedData/
 
 ## Various settings
 *.pbxuser
@@ -15,9 +15,9 @@ DerivedData
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-xcuserdata
+xcuserdata/
 
 ## Other
-*.xccheckout
 *.moved-aside
-*.xcuserstate
+*.xccheckout
+*.xcscmblueprint
diff --git a/Objective-C.gitignore b/Objective-C.gitignore
index 79d9331b..08b55ac6 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
+*.xccheckout
 *.xcscmblueprint
 
 ## Obj-C/Swift specific
diff --git a/Swift.gitignore b/Swift.gitignore
index 5e5d5ceb..9724b3c6 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
+*.xccheckout
 *.xcscmblueprint
 
 ## Obj-C/Swift specific