diff --git a/src/google/protobuf/stubs/platform_macros.h b/src/google/protobuf/stubs/platform_macros.h
index 1d1d59a77..021868166 100644
--- a/src/google/protobuf/stubs/platform_macros.h
+++ b/src/google/protobuf/stubs/platform_macros.h
@@ -89,4 +89,6 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR
 #define GOOGLE_PROTOBUF_OS_NACL
 #endif
 
+#undef GOOGLE_PROTOBUF_PLATFORM_ERROR
+
 #endif  // GOOGLE_PROTOBUF_PLATFORM_MACROS_H_