diff --git a/CouchbaseLite.xcodeproj/project.pbxproj b/CouchbaseLite.xcodeproj/project.pbxproj
index 849d63a9b..43559f3f7 100644
--- a/CouchbaseLite.xcodeproj/project.pbxproj
+++ b/CouchbaseLite.xcodeproj/project.pbxproj
@@ -5566,7 +5566,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "source \"$SCRIPT_INPUT_FILE_0\"\n";
+			shellScript = "source \"$SCRIPT_INPUT_FILE_0\"\necho \"Private headers removed\"\n";
 		};
 		93CED8D52048B3D600E6F0A4 /* Remove private headers */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -5581,7 +5581,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "source \"$SCRIPT_INPUT_FILE_0\"";
+			shellScript = "source \"$SCRIPT_INPUT_FILE_0\"\necho \"Private headers removed\"\n";
 		};
 		93D118ED1F560232000F6D3E /* Check Git Commit */ = {
 			isa = PBXShellScriptBuildPhase;
diff --git a/xcconfigs/Project.xcconfig b/xcconfigs/Project.xcconfig
index 72f9b27ed..fe70f0ff9 100644
--- a/xcconfigs/Project.xcconfig
+++ b/xcconfigs/Project.xcconfig
@@ -85,7 +85,7 @@ CLANG_WARN_ENUM_CONVERSION                                 = YES
 CLANG_WARN_INFINITE_RECURSION                              = YES
 CLANG_WARN_INT_CONVERSION                                  = YES
 CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES                 = YES
-CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF                       = NO         // TODO: Switch this to YES
+CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF                       = YES
 CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS                 = YES
 CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK                       = YES
 CLANG_WARN_OBJC_ROOT_CLASS                                 = YES_ERROR