diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc
index 136787f0c4..8931901227 100644
--- a/src/google/protobuf/port_def.inc
+++ b/src/google/protobuf/port_def.inc
@@ -825,6 +825,8 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
 #undef REASON_UNKNOWN
 #pragma push_macro("SERVICE_DISABLED")
 #undef SERVICE_DISABLED
+#pragma push_macro("SERVICE_STOP")
+#undef SERVICE_STOP
 #pragma push_macro("SEVERITY_ERROR")
 #undef SEVERITY_ERROR
 #pragma push_macro("STATUS_PENDING")
diff --git a/src/google/protobuf/port_undef.inc b/src/google/protobuf/port_undef.inc
index e81b42e052..b2d0848873 100644
--- a/src/google/protobuf/port_undef.inc
+++ b/src/google/protobuf/port_undef.inc
@@ -136,6 +136,7 @@
 #pragma pop_macro("NO_ERROR")
 #pragma pop_macro("REASON_UNKNOWN")
 #pragma pop_macro("SERVICE_DISABLED")
+#pragma pop_macro("SERVICE_STOP")
 #pragma pop_macro("SEVERITY_ERROR")
 #pragma pop_macro("STRICT")
 #pragma pop_macro("STATUS_PENDING")