diff --git a/src/google/protobuf/compiler/objectivec/objectivec_helpers.h b/src/google/protobuf/compiler/objectivec/objectivec_helpers.h
index c5f948c84ee1..13a105240662 100644
--- a/src/google/protobuf/compiler/objectivec/objectivec_helpers.h
+++ b/src/google/protobuf/compiler/objectivec/objectivec_helpers.h
@@ -263,7 +263,7 @@ class PROTOC_EXPORT TextFormatDecodeData {
   TextFormatDecodeData(const TextFormatDecodeData&) = delete;
   TextFormatDecodeData& operator=(const TextFormatDecodeData&) = delete;
 
-  void AddString(int32 key, const std::string& input_for_decode,
+  void AddString(int32_t key, const std::string& input_for_decode,
                  const std::string& desired_output);
   size_t num_entries() const { return entries_.size(); }
   std::string Data() const;
@@ -272,7 +272,7 @@ class PROTOC_EXPORT TextFormatDecodeData {
                                          const std::string& desired_output);
 
  private:
-  typedef std::pair<int32, std::string> DataEntry;
+  typedef std::pair<int32_t, std::string> DataEntry;
   std::vector<DataEntry> entries_;
 };