diff --git a/src/google/protobuf/json/internal/parser_traits.h b/src/google/protobuf/json/internal/parser_traits.h
index 22e6efe2e85b..9d2745b1a2dc 100644
--- a/src/google/protobuf/json/internal/parser_traits.h
+++ b/src/google/protobuf/json/internal/parser_traits.h
@@ -173,7 +173,7 @@ struct ParseProto2Descriptor : Proto2Descriptor {
     }
   }
 
-  static void SetInt32(Field f, Msg& msg, int32 x) {
+  static void SetInt32(Field f, Msg& msg, int32_t x) {
     RecordAsSeen(f, msg);
     if (f->is_repeated()) {
       msg.msg_->GetReflection()->AddInt32(msg.msg_, f, x);
@@ -182,7 +182,7 @@ struct ParseProto2Descriptor : Proto2Descriptor {
     }
   }
 
-  static void SetUInt32(Field f, Msg& msg, uint32 x) {
+  static void SetUInt32(Field f, Msg& msg, uint32_t x) {
     RecordAsSeen(f, msg);
     if (f->is_repeated()) {
       msg.msg_->GetReflection()->AddUInt32(msg.msg_, f, x);