diff --git a/src/google/protobuf/map_test.cc b/src/google/protobuf/map_test.cc
index cda713f0..cfb3d001 100644
--- a/src/google/protobuf/map_test.cc
+++ b/src/google/protobuf/map_test.cc
@@ -28,6 +28,12 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+// A hack to include windows.h first, which ensures the GetMessage macro can
+// be undefined when we include <google/protobuf/stubs/common.h>
+#if defined(_WIN32)
+#include <windows.h>
+#endif  // _WIN32
+
 #include <algorithm>
 #include <google/protobuf/stubs/hash.h>
 #include <map>