[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
diff --git a/objectivec/GPBArray.m b/objectivec/GPBArray.m
index a2d29dd..50d07b2 100644
--- a/objectivec/GPBArray.m
+++ b/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
diff --git a/objectivec/GPBCodedInputStream.m b/objectivec/GPBCodedInputStream.m
index 6b98ad7..3e33336 100644
--- a/objectivec/GPBCodedInputStream.m
+++ b/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"
diff --git a/objectivec/GPBCodedOutputStream.m b/objectivec/GPBCodedOutputStream.m
index 99af261..122bcd9 100644
--- a/objectivec/GPBCodedOutputStream.m
+++ b/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
diff --git a/objectivec/GPBDescriptor.m b/objectivec/GPBDescriptor.m
index 05d7f75..f48ab06 100644
--- a/objectivec/GPBDescriptor.m
+++ b/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"
diff --git a/objectivec/GPBDictionary.m b/objectivec/GPBDictionary.m
index a07a419..520abf7 100644
--- a/objectivec/GPBDictionary.m
+++ b/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 ------------------------------
diff --git a/objectivec/GPBExtensionInternals.m b/objectivec/GPBExtensionInternals.m
index 3a36e23..1c697f2 100644
--- a/objectivec/GPBExtensionInternals.m
+++ b/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) {
diff --git a/objectivec/GPBMessage.m b/objectivec/GPBMessage.m
index 4b2998f..9dd6ae5 100644
--- a/objectivec/GPBMessage.m
+++ b/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
diff --git a/objectivec/GPBRootObject.m b/objectivec/GPBRootObject.m
index f737e58..a3fb9d3 100644
--- a/objectivec/GPBRootObject.m
+++ b/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)
diff --git a/objectivec/GPBUnknownField.m b/objectivec/GPBUnknownField.m
index f574acf..3614bdf 100644
--- a/objectivec/GPBUnknownField.m
+++ b/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"
diff --git a/objectivec/GPBUnknownFieldSet.m b/objectivec/GPBUnknownFieldSet.m
index bdf6d0b..6a294cd 100644
--- a/objectivec/GPBUnknownFieldSet.m
+++ b/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"
diff --git a/objectivec/GPBUnknownFields.m b/objectivec/GPBUnknownFields.m
index dc004b3..0c53a72 100644
--- a/objectivec/GPBUnknownFields.m
+++ b/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) \
diff --git a/objectivec/GPBUtilities.m b/objectivec/GPBUtilities.m
index dc6e871..56db2f3 100644
--- a/objectivec/GPBUtilities.m
+++ b/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
diff --git a/objectivec/GPBWellKnownTypes.m b/objectivec/GPBWellKnownTypes.m
index b212813..f725bca 100644
--- a/objectivec/GPBWellKnownTypes.m
+++ b/objectivec/GPBWellKnownTypes.m
@@ -11,6 +11,7 @@
#import "GPBWellKnownTypes.h"
+#import "GPBUtilities.h"
#import "GPBUtilities_PackagePrivate.h"
NSString *const GPBWellKnownTypesErrorDomain = GPBNSStringifySymbol(GPBWellKnownTypesErrorDomain);
diff --git a/objectivec/GPBWireFormat.m b/objectivec/GPBWireFormat.m
index 8ebf3e8..021ea75 100644
--- a/objectivec/GPBWireFormat.m
+++ b/objectivec/GPBWireFormat.m
@@ -7,6 +7,7 @@
#import "GPBWireFormat.h"
+#import "GPBUtilities.h"
#import "GPBUtilities_PackagePrivate.h"
enum {
diff --git a/objectivec/Tests/GPBArrayTests.m b/objectivec/Tests/GPBArrayTests.m
index d51d0f6..376e149 100644
--- a/objectivec/Tests/GPBArrayTests.m
+++ b/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.
diff --git a/objectivec/Tests/GPBCodedInputStreamTests.m b/objectivec/Tests/GPBCodedInputStreamTests.m
index c6b019a..013c38f 100644
--- a/objectivec/Tests/GPBCodedInputStreamTests.m
+++ b/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"
diff --git a/objectivec/Tests/GPBCodedOutputStreamTests.m b/objectivec/Tests/GPBCodedOutputStreamTests.m
index 5508649..78a50ba 100644
--- a/objectivec/Tests/GPBCodedOutputStreamTests.m
+++ b/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"
diff --git a/objectivec/Tests/GPBDescriptorTests.m b/objectivec/Tests/GPBDescriptorTests.m
index 7780b1e..def348a 100644
--- a/objectivec/Tests/GPBDescriptorTests.m
+++ b/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"
diff --git a/objectivec/Tests/GPBDictionaryTests+Bool.m b/objectivec/Tests/GPBDictionaryTests+Bool.m
index 1a7e920..2231154 100644
--- a/objectivec/Tests/GPBDictionaryTests+Bool.m
+++ b/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"
diff --git a/objectivec/Tests/GPBDictionaryTests+Int32.m b/objectivec/Tests/GPBDictionaryTests+Int32.m
index 4901cc1..bbf0340 100644
--- a/objectivec/Tests/GPBDictionaryTests+Int32.m
+++ b/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"
diff --git a/objectivec/Tests/GPBDictionaryTests+Int64.m b/objectivec/Tests/GPBDictionaryTests+Int64.m
index c8ac1ea..8ed1042 100644
--- a/objectivec/Tests/GPBDictionaryTests+Int64.m
+++ b/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"
diff --git a/objectivec/Tests/GPBDictionaryTests+String.m b/objectivec/Tests/GPBDictionaryTests+String.m
index 80f6d8d..8ad596a 100644
--- a/objectivec/Tests/GPBDictionaryTests+String.m
+++ b/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"
diff --git a/objectivec/Tests/GPBDictionaryTests+UInt32.m b/objectivec/Tests/GPBDictionaryTests+UInt32.m
index 097efc4..55f35e7 100644
--- a/objectivec/Tests/GPBDictionaryTests+UInt32.m
+++ b/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"
diff --git a/objectivec/Tests/GPBDictionaryTests+UInt64.m b/objectivec/Tests/GPBDictionaryTests+UInt64.m
index 0460f78..877bead 100644
--- a/objectivec/Tests/GPBDictionaryTests+UInt64.m
+++ b/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"
diff --git a/objectivec/Tests/GPBDictionaryTests.m b/objectivec/Tests/GPBDictionaryTests.m
index 5c8a22d..3816957 100644
--- a/objectivec/Tests/GPBDictionaryTests.m
+++ b/objectivec/Tests/GPBDictionaryTests.m
@@ -10,7 +10,6 @@
#import "GPBDictionary.h"
#import "GPBDictionary_PackagePrivate.h"
-
#import "GPBTestUtilities.h"
#pragma mark - GPBAutocreatedDictionary Tests
diff --git a/objectivec/Tests/GPBExtensionRegistryTest.m b/objectivec/Tests/GPBExtensionRegistryTest.m
index 47bdc1e..88473d8 100644
--- a/objectivec/Tests/GPBExtensionRegistryTest.m
+++ b/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
diff --git a/objectivec/Tests/GPBMessageTests+ClassNames.m b/objectivec/Tests/GPBMessageTests+ClassNames.m
index 010fd41..e1b49d8 100644
--- a/objectivec/Tests/GPBMessageTests+ClassNames.m
+++ b/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"
diff --git a/objectivec/Tests/GPBMessageTests+Merge.m b/objectivec/Tests/GPBMessageTests+Merge.m
index 1290ebb..d1aa8f9 100644
--- a/objectivec/Tests/GPBMessageTests+Merge.m
+++ b/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"
diff --git a/objectivec/Tests/GPBMessageTests+Runtime.m b/objectivec/Tests/GPBMessageTests+Runtime.m
index 81e24eb..8c26b63 100644
--- a/objectivec/Tests/GPBMessageTests+Runtime.m
+++ b/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"
diff --git a/objectivec/Tests/GPBMessageTests+Serialization.m b/objectivec/Tests/GPBMessageTests+Serialization.m
index 5f11640..049fcfd 100644
--- a/objectivec/Tests/GPBMessageTests+Serialization.m
+++ b/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"
diff --git a/objectivec/Tests/GPBMessageTests.m b/objectivec/Tests/GPBMessageTests.m
index 45b5c28..d563ef0 100644
--- a/objectivec/Tests/GPBMessageTests.m
+++ b/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"
diff --git a/objectivec/Tests/GPBTestUtilities.h b/objectivec/Tests/GPBTestUtilities.h
index 03ac8f9..0d40937 100644
--- a/objectivec/Tests/GPBTestUtilities.h
+++ b/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)];
diff --git a/objectivec/Tests/GPBTestUtilities.m b/objectivec/Tests/GPBTestUtilities.m
index 88ca3a7..99a270c 100644
--- a/objectivec/Tests/GPBTestUtilities.m
+++ b/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"
diff --git a/objectivec/Tests/GPBUnknownFieldSetTest.m b/objectivec/Tests/GPBUnknownFieldSetTest.m
index 71a375b..e64ff07 100644
--- a/objectivec/Tests/GPBUnknownFieldSetTest.m
+++ b/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"
diff --git a/objectivec/Tests/GPBUtilitiesTests.m b/objectivec/Tests/GPBUtilitiesTests.m
index 66fcad7..08c64f1 100644
--- a/objectivec/Tests/GPBUtilitiesTests.m
+++ b/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"
diff --git a/objectivec/Tests/GPBWellKnownTypesTest.m b/objectivec/Tests/GPBWellKnownTypesTest.m
index 564d40a..b43bed6 100644
--- a/objectivec/Tests/GPBWellKnownTypesTest.m
+++ b/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
