diff --git a/src/msw/textentry.cpp b/src/msw/textentry.cpp
index a8a12a5c7f..b865051d74 100644
--- a/src/msw/textentry.cpp
+++ b/src/msw/textentry.cpp
@@ -34,8 +34,6 @@
 #include "wx/textcompleter.h"
 #include "wx/dynlib.h"
 
-#include <initguid.h>
-
 #include "wx/msw/private.h"
 
 #if wxUSE_UXTHEME
@@ -79,6 +77,11 @@
     #define SHACF_FILESYS_DIRS 0x00000020
 #endif
 
+// This must be the last header included to only affect the DEFINE_GUID()
+// occurrences below but not any GUIDs declared in the standard files included
+// above.
+#include <initguid.h>
+
 namespace
 {