[ObjC] Use more complete imports

Import both the public and private header into impls when the
private is needed.

Also update the tests to use more complete imports.

PiperOrigin-RevId: 671388271

objectivec/GPBArray.m

@@ -5,8 +5,10 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#import "GPBArray.h"
 #import "GPBArray_PackagePrivate.h"
 
+#import "GPBMessage.h"
 #import "GPBMessage_PackagePrivate.h"
 
 // Direct access is use for speed, to avoid even internally declaring things

objectivec/GPBCodedInputStream.m

@@ -5,11 +5,16 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#import "GPBCodedInputStream.h"
 #import "GPBCodedInputStream_PackagePrivate.h"
 
+#import "GPBDictionary.h"
 #import "GPBDictionary_PackagePrivate.h"
+#import "GPBMessage.h"
 #import "GPBMessage_PackagePrivate.h"
+#import "GPBUnknownFieldSet.h"
 #import "GPBUnknownFieldSet_PackagePrivate.h"
+#import "GPBUtilities.h"
 #import "GPBUtilities_PackagePrivate.h"
 #import "GPBWireFormat.h"
 

objectivec/GPBCodedOutputStream.m

@@ -5,12 +5,15 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#import "GPBCodedOutputStream.h"
 #import "GPBCodedOutputStream_PackagePrivate.h"
 
 #import <mach/vm_param.h>
 
 #import "GPBArray.h"
+#import "GPBUnknownFieldSet.h"
 #import "GPBUnknownFieldSet_PackagePrivate.h"
+#import "GPBUtilities.h"
 #import "GPBUtilities_PackagePrivate.h"
 
 // TODO: Consider using on other functions to reduce bloat when

objectivec/GPBDescriptor.m

@@ -5,11 +5,14 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#import "GPBDescriptor.h"
 #import "GPBDescriptor_PackagePrivate.h"
 
 #import <objc/runtime.h>
 
+#import "GPBMessage.h"
 #import "GPBMessage_PackagePrivate.h"
+#import "GPBUtilities.h"
 #import "GPBUtilities_PackagePrivate.h"
 #import "GPBWireFormat.h"
 

objectivec/GPBDictionary.m

@@ -5,12 +5,18 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#import "GPBDictionary.h"
 #import "GPBDictionary_PackagePrivate.h"
 
+#import "GPBCodedInputStream.h"
 #import "GPBCodedInputStream_PackagePrivate.h"
+#import "GPBCodedOutputStream.h"
 #import "GPBCodedOutputStream_PackagePrivate.h"
+#import "GPBDescriptor.h"
 #import "GPBDescriptor_PackagePrivate.h"
+#import "GPBMessage.h"
 #import "GPBMessage_PackagePrivate.h"
+#import "GPBUtilities.h"
 #import "GPBUtilities_PackagePrivate.h"
 
 // ------------------------------ NOTE ------------------------------

objectivec/GPBExtensionInternals.m

@@ -9,10 +9,15 @@
 
 #import <objc/runtime.h>
 
+#import "GPBCodedInputStream.h"
 #import "GPBCodedInputStream_PackagePrivate.h"
+#import "GPBCodedOutputStream.h"
 #import "GPBCodedOutputStream_PackagePrivate.h"
+#import "GPBDescriptor.h"
 #import "GPBDescriptor_PackagePrivate.h"
+#import "GPBMessage.h"
 #import "GPBMessage_PackagePrivate.h"
+#import "GPBUtilities.h"
 #import "GPBUtilities_PackagePrivate.h"
 
 GPB_INLINE size_t DataTypeSize(GPBDataType dataType) {

objectivec/GPBMessage.m

@@ -6,6 +6,7 @@
 // https://developers.google.com/open-source/licenses/bsd
 
 #import "GPBMessage.h"
+#import "GPBMessage_PackagePrivate.h"
 
 #import <Foundation/Foundation.h>
 #import <objc/message.h>
@@ -13,19 +14,26 @@
 #import <os/lock.h>
 #import <stdatomic.h>
 
+#import "GPBArray.h"
 #import "GPBArray_PackagePrivate.h"
+#import "GPBCodedInputStream.h"
 #import "GPBCodedInputStream_PackagePrivate.h"
+#import "GPBCodedOutputStream.h"
 #import "GPBCodedOutputStream_PackagePrivate.h"
+#import "GPBDescriptor.h"
 #import "GPBDescriptor_PackagePrivate.h"
+#import "GPBDictionary.h"
 #import "GPBDictionary_PackagePrivate.h"
 #import "GPBExtensionInternals.h"
 #import "GPBExtensionRegistry.h"
-#import "GPBMessage_PackagePrivate.h"
+#import "GPBRootObject.h"
 #import "GPBRootObject_PackagePrivate.h"
 #import "GPBUnknownField.h"
 #import "GPBUnknownFieldSet.h"
 #import "GPBUnknownFieldSet_PackagePrivate.h"
+#import "GPBUnknownFields.h"
 #import "GPBUnknownFields_PackagePrivate.h"
+#import "GPBUtilities.h"
 #import "GPBUtilities_PackagePrivate.h"
 
 // TODO: Consider using on other functions to reduce bloat when

objectivec/GPBRootObject.m

@@ -5,15 +5,16 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#import "GPBRootObject.h"
 #import "GPBRootObject_PackagePrivate.h"
 
+#import <CoreFoundation/CoreFoundation.h>
 #import <objc/runtime.h>
 #import <os/lock.h>
 
-#import <CoreFoundation/CoreFoundation.h>
-
 #import "GPBDescriptor.h"
 #import "GPBExtensionRegistry.h"
+#import "GPBUtilities.h"
 #import "GPBUtilities_PackagePrivate.h"
 
 @interface GPBExtensionDescriptor (GPBRootObject)

objectivec/GPBUnknownField.m

@@ -6,11 +6,13 @@
 // https://developers.google.com/open-source/licenses/bsd
 
 #import "GPBUnknownField.h"
+#import "GPBUnknownField_PackagePrivate.h"
 
 #import "GPBArray.h"
+#import "GPBCodedOutputStream.h"
 #import "GPBCodedOutputStream_PackagePrivate.h"
 #import "GPBUnknownFieldSet.h"
-#import "GPBUnknownField_PackagePrivate.h"
+#import "GPBUnknownFields.h"
 #import "GPBUnknownFields_PackagePrivate.h"
 #import "GPBWireFormat.h"
 

objectivec/GPBUnknownFieldSet.m

@@ -5,10 +5,13 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#import "GPBUnknownFieldSet.h"
 #import "GPBUnknownFieldSet_PackagePrivate.h"
 
+#import "GPBCodedInputStream.h"
 #import "GPBCodedInputStream_PackagePrivate.h"
 #import "GPBCodedOutputStream.h"
+#import "GPBUnknownField.h"
 #import "GPBUnknownField_PackagePrivate.h"
 #import "GPBUtilities.h"
 #import "GPBWireFormat.h"

objectivec/GPBUnknownFields.m

@@ -6,9 +6,11 @@
 // https://developers.google.com/open-source/licenses/bsd
 
 #import "GPBUnknownFields.h"
+#import "GPBUnknownFields_PackagePrivate.h"
 
 #import <Foundation/Foundation.h>
 
+#import "GPBCodedInputStream.h"
 #import "GPBCodedInputStream_PackagePrivate.h"
 #import "GPBCodedOutputStream.h"
 #import "GPBCodedOutputStream_PackagePrivate.h"
@@ -16,9 +18,9 @@
 #import "GPBMessage.h"
 #import "GPBMessage_PackagePrivate.h"
 #import "GPBUnknownField.h"
+#import "GPBUnknownFieldSet.h"
 #import "GPBUnknownFieldSet_PackagePrivate.h"
 #import "GPBUnknownField_PackagePrivate.h"
-#import "GPBUnknownFields_PackagePrivate.h"
 #import "GPBWireFormat.h"
 
 #define CHECK_FIELD_NUMBER(number)                                                      \

objectivec/GPBUtilities.m

@@ -9,14 +9,19 @@
 
 #import <objc/runtime.h>
 
+#import "GPBArray.h"
 #import "GPBArray_PackagePrivate.h"
+#import "GPBDescriptor.h"
 #import "GPBDescriptor_PackagePrivate.h"
+#import "GPBDictionary.h"
 #import "GPBDictionary_PackagePrivate.h"
+#import "GPBMessage.h"
 #import "GPBMessage_PackagePrivate.h"
 #import "GPBUnknownField.h"
 #import "GPBUnknownFieldSet.h"
 #import "GPBUnknownField_PackagePrivate.h"
 #import "GPBUnknownFields.h"
+#import "GPBUtilities.h"
 #import "GPBUtilities_PackagePrivate.h"
 
 // Direct access is use for speed, to avoid even internally declaring things

objectivec/GPBWellKnownTypes.m

@@ -11,6 +11,7 @@
 
 #import "GPBWellKnownTypes.h"
 
+#import "GPBUtilities.h"
 #import "GPBUtilities_PackagePrivate.h"
 
 NSString *const GPBWellKnownTypesErrorDomain = GPBNSStringifySymbol(GPBWellKnownTypesErrorDomain);

objectivec/GPBWireFormat.m

@@ -7,6 +7,7 @@
 
 #import "GPBWireFormat.h"
 
+#import "GPBUtilities.h"
 #import "GPBUtilities_PackagePrivate.h"
 
 enum {

objectivec/Tests/GPBArrayTests.m

@@ -10,7 +10,6 @@
 
 #import "GPBArray.h"
 #import "GPBArray_PackagePrivate.h"
-
 #import "GPBTestUtilities.h"
 
 // To let the testing macros work, add some extra methods to simplify things.

objectivec/Tests/GPBCodedInputStreamTests.m

@@ -14,6 +14,7 @@
 #import "GPBUnknownField.h"
 #import "GPBUnknownFieldSet_PackagePrivate.h"
 #import "GPBUnknownFields.h"
+#import "GPBUtilities.h"
 #import "GPBUtilities_PackagePrivate.h"
 #import "GPBWireFormat.h"
 #import "objectivec/Tests/Unittest.pbobjc.h"

objectivec/Tests/GPBCodedOutputStreamTests.m

@@ -5,10 +5,11 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#import "GPBTestUtilities.h"
-
 #import "GPBCodedInputStream.h"
+#import "GPBCodedOutputStream.h"
 #import "GPBCodedOutputStream_PackagePrivate.h"
+#import "GPBTestUtilities.h"
+#import "GPBUtilities.h"
 #import "GPBUtilities_PackagePrivate.h"
 #import "objectivec/Tests/Unittest.pbobjc.h"
 

objectivec/Tests/GPBDescriptorTests.m

@@ -5,11 +5,11 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#import "GPBTestUtilities.h"
-
 #import <objc/runtime.h>
 
+#import "GPBDescriptor.h"
 #import "GPBDescriptor_PackagePrivate.h"
+#import "GPBTestUtilities.h"
 #import "objectivec/Tests/Unittest.pbobjc.h"
 #import "objectivec/Tests/UnittestObjc.pbobjc.h"
 #import "objectivec/Tests/UnittestObjcOptions.pbobjc.h"

objectivec/Tests/GPBDictionaryTests+Bool.m

@@ -9,7 +9,6 @@
 #import <XCTest/XCTest.h>
 
 #import "GPBDictionary.h"
-
 #import "GPBTestUtilities.h"
 #import "objectivec/Tests/UnittestRuntimeProto2.pbobjc.h"
 

objectivec/Tests/GPBDictionaryTests+Int32.m

@@ -9,7 +9,6 @@
 #import <XCTest/XCTest.h>
 
 #import "GPBDictionary.h"
-
 #import "GPBTestUtilities.h"
 #import "objectivec/Tests/UnittestRuntimeProto2.pbobjc.h"
 

objectivec/Tests/GPBDictionaryTests+Int64.m

@@ -9,7 +9,6 @@
 #import <XCTest/XCTest.h>
 
 #import "GPBDictionary.h"
-
 #import "GPBTestUtilities.h"
 #import "objectivec/Tests/UnittestRuntimeProto2.pbobjc.h"
 

objectivec/Tests/GPBDictionaryTests+String.m

@@ -9,7 +9,6 @@
 #import <XCTest/XCTest.h>
 
 #import "GPBDictionary.h"
-
 #import "GPBTestUtilities.h"
 #import "objectivec/Tests/UnittestRuntimeProto2.pbobjc.h"
 

objectivec/Tests/GPBDictionaryTests+UInt32.m

@@ -9,7 +9,6 @@
 #import <XCTest/XCTest.h>
 
 #import "GPBDictionary.h"
-
 #import "GPBTestUtilities.h"
 #import "objectivec/Tests/UnittestRuntimeProto2.pbobjc.h"
 

objectivec/Tests/GPBDictionaryTests+UInt64.m

@@ -9,7 +9,6 @@
 #import <XCTest/XCTest.h>
 
 #import "GPBDictionary.h"
-
 #import "GPBTestUtilities.h"
 #import "objectivec/Tests/UnittestRuntimeProto2.pbobjc.h"
 

objectivec/Tests/GPBDictionaryTests.m

@@ -10,7 +10,6 @@
 
 #import "GPBDictionary.h"
 #import "GPBDictionary_PackagePrivate.h"
-
 #import "GPBTestUtilities.h"
 
 #pragma mark - GPBAutocreatedDictionary Tests

objectivec/Tests/GPBExtensionRegistryTest.m

@@ -5,9 +5,8 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#import "GPBTestUtilities.h"
-
 #import "GPBExtensionRegistry.h"
+#import "GPBTestUtilities.h"
 #import "objectivec/Tests/Unittest.pbobjc.h"
 
 @interface GPBExtensionRegistryTest : GPBTestCase

objectivec/Tests/GPBMessageTests+ClassNames.m

@@ -5,14 +5,13 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#import "GPBTestUtilities.h"
-
 #import <objc/runtime.h>
 
 #import "GPBDescriptor_PackagePrivate.h"
 #import "GPBExtensionRegistry.h"
 #import "GPBMessage.h"
 #import "GPBRootObject_PackagePrivate.h"
+#import "GPBTestUtilities.h"
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"

objectivec/Tests/GPBMessageTests+Merge.m

@@ -5,12 +5,10 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#import "GPBTestUtilities.h"
-
 #import <objc/runtime.h>
 
 #import "GPBMessage.h"
-
+#import "GPBTestUtilities.h"
 #import "objectivec/Tests/MapUnittest.pbobjc.h"
 #import "objectivec/Tests/Unittest.pbobjc.h"
 #import "objectivec/Tests/UnittestPreserveUnknownEnum.pbobjc.h"

objectivec/Tests/GPBMessageTests+Runtime.m

@@ -5,12 +5,10 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#import "GPBTestUtilities.h"
-
 #import <objc/runtime.h>
 
 #import "GPBMessage.h"
-
+#import "GPBTestUtilities.h"
 #import "objectivec/Tests/MapUnittest.pbobjc.h"
 #import "objectivec/Tests/Unittest.pbobjc.h"
 #import "objectivec/Tests/UnittestCycle.pbobjc.h"

objectivec/Tests/GPBMessageTests+Serialization.m

@@ -5,12 +5,10 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#import "GPBTestUtilities.h"
-
 #import <objc/runtime.h>
 
 #import "GPBMessage.h"
-
+#import "GPBTestUtilities.h"
 #import "objectivec/Tests/MapProto2Unittest.pbobjc.h"
 #import "objectivec/Tests/MapUnittest.pbobjc.h"
 #import "objectivec/Tests/Unittest.pbobjc.h"

objectivec/Tests/GPBMessageTests.m

@@ -10,10 +10,13 @@
 #import "GPBArray.h"
 #import "GPBArray_PackagePrivate.h"
 #import "GPBDescriptor.h"
+#import "GPBDictionary.h"
 #import "GPBDictionary_PackagePrivate.h"
+#import "GPBMessage.h"
 #import "GPBMessage_PackagePrivate.h"
 #import "GPBTestUtilities.h"
 #import "GPBUnknownField.h"
+#import "GPBUnknownFieldSet.h"
 #import "GPBUnknownFieldSet_PackagePrivate.h"
 #import "GPBUnknownField_PackagePrivate.h"
 #import "GPBUnknownFields.h"

objectivec/Tests/GPBTestUtilities.h

@@ -7,14 +7,9 @@
 
 #import <XCTest/XCTest.h>
 
-@class TestAllExtensions;
-@class TestAllTypes;
-@class TestMap;
-@class TestPackedTypes;
-@class TestPackedExtensions;
-@class TestUnpackedTypes;
-@class TestUnpackedExtensions;
-@class GPBExtensionRegistry;
+#import "GPBExtensionRegistry.h"
+#import "objectivec/Tests/MapUnittest.pbobjc.h"
+#import "objectivec/Tests/Unittest.pbobjc.h"
 
 static inline NSData *DataFromCStr(const char *str) {
   return [NSData dataWithBytes:str length:strlen(str)];

objectivec/Tests/GPBTestUtilities.m

@@ -6,7 +6,6 @@
 // https://developers.google.com/open-source/licenses/bsd
 
 #import "GPBTestUtilities.h"
-
 #import "objectivec/Tests/MapUnittest.pbobjc.h"
 #import "objectivec/Tests/Unittest.pbobjc.h"
 #import "objectivec/Tests/UnittestImport.pbobjc.h"

objectivec/Tests/GPBUnknownFieldSetTest.m

@@ -7,7 +7,6 @@
 
 #import "GPBTestUtilities.h"
 #import "GPBUnknownFieldSet.h"
-
 #import "GPBUnknownFieldSet_PackagePrivate.h"
 #import "GPBUnknownField_PackagePrivate.h"
 #import "objectivec/Tests/Unittest.pbobjc.h"

objectivec/Tests/GPBUtilitiesTests.m

@@ -16,7 +16,6 @@
 #import "GPBUnknownField_PackagePrivate.h"
 #import "GPBUtilities.h"
 #import "GPBUtilities_PackagePrivate.h"
-
 #import "objectivec/Tests/MapUnittest.pbobjc.h"
 #import "objectivec/Tests/Unittest.pbobjc.h"
 #import "objectivec/Tests/UnittestObjc.pbobjc.h"

objectivec/Tests/GPBWellKnownTypesTest.m

@@ -5,11 +5,10 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#import "GPBWellKnownTypes.h"
-
 #import <XCTest/XCTest.h>
 
 #import "GPBTestUtilities.h"
+#import "GPBWellKnownTypes.h"
 #import "objectivec/Tests/AnyTest.pbobjc.h"
 
 // Nanosecond time accuracy