diff --git a/src/google/protobuf/generated_message_reflection.h b/src/google/protobuf/generated_message_reflection.h
index 177312cf..9a2e8e26 100644
--- a/src/google/protobuf/generated_message_reflection.h
+++ b/src/google/protobuf/generated_message_reflection.h
@@ -58,6 +58,8 @@
 #error "You cannot SWIG proto headers"
 #endif

+#undef GetMessage
+
 namespace upb {
 namespace google_opensource {
 class GMR_Handlers;
diff --git a/src/google/protobuf/message.h b/src/google/protobuf/message.h
index 007dafa2..2bbe7456 100644
--- a/src/google/protobuf/message.h
+++ b/src/google/protobuf/message.h
@@ -132,6 +132,8 @@
 #error "You cannot SWIG proto headers"
 #endif

+#undef GetMessage
+
 namespace google {
 namespace protobuf {