diff --git a/objectivec/GPBDescriptor_PackagePrivate.h b/objectivec/GPBDescriptor_PackagePrivate.h
index 3c431db10b..739b44d133 100644
--- a/objectivec/GPBDescriptor_PackagePrivate.h
+++ b/objectivec/GPBDescriptor_PackagePrivate.h
@@ -227,8 +227,12 @@ typedef NS_OPTIONS(uint32_t, GPBDescriptorInitializationFlags) {
                                   flags:(GPBDescriptorInitializationFlags)flags
     __attribute__((deprecated("Please use a newer version of protoc to regenerate your sources. "
                               "Support for this version will go away in the future.")));
-- (void)setupContainingMessageClassName:(const char *)msgClassName;
-- (void)setupMessageClassNameSuffix:(NSString *)suffix;
+- (void)setupContainingMessageClassName:(const char *)msgClassName
+    __attribute__((deprecated("Please use a newer version of protoc to regenerate your sources. "
+                              "Support for this version will go away in the future.")));
+- (void)setupMessageClassNameSuffix:(NSString *)suffix
+    __attribute__((deprecated("Please use a newer version of protoc to regenerate your sources. "
+                              "Support for this version will go away in the future.")));
 
 @end
 
diff --git a/objectivec/GPBUtilities_PackagePrivate.h b/objectivec/GPBUtilities_PackagePrivate.h
index be43cbf1ed..b977f4ec32 100644
--- a/objectivec/GPBUtilities_PackagePrivate.h
+++ b/objectivec/GPBUtilities_PackagePrivate.h
@@ -51,8 +51,12 @@ void GPBRuntimeMatchFailure(void);
 
 // Legacy version of the checks, remove when GOOGLE_PROTOBUF_OBJC_GEN_VERSION
 // goes away (see more info in GPBBootstrap.h).
-void GPBCheckRuntimeVersionInternal(int32_t version);
-GPB_INLINE void GPBDebugCheckRuntimeVersion(void) {
+void GPBCheckRuntimeVersionInternal(int32_t version)
+    __attribute__((deprecated("Please use a newer version of protoc to regenerate your sources. "
+                              "Support for this version will go away in the future.")));
+__attribute__((deprecated("Please use a newer version of protoc to regenerate your sources. "
+                          "Support for this version will go away in the future."))) GPB_INLINE void
+GPBDebugCheckRuntimeVersion(void) {
 #if defined(DEBUG) && DEBUG
   GPBCheckRuntimeVersionInternal(GOOGLE_PROTOBUF_OBJC_GEN_VERSION);
 #endif