diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index 56fe236fac..7261555233 100644
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -39,6 +39,9 @@
 #include "wx/sysopt.h"
 
 #include "wx/msw/uxtheme.h"
+
+#include <windowsx.h> // needed by GET_X_LPARAM and GET_Y_LPARAM macros
+
 #include "wx/msw/private.h"
 #include "wx/msw/missing.h"
 #include "wx/msw/dc.h"
diff --git a/src/msw/toolbar.cpp b/src/msw/toolbar.cpp
index f03386daee..13222fc1b7 100644
--- a/src/msw/toolbar.cpp
+++ b/src/msw/toolbar.cpp
@@ -48,7 +48,10 @@
 #include "wx/dcclient.h"
 #include "wx/scopedarray.h"
 
+#include <windowsx.h> // needed by GET_X_LPARAM and GET_Y_LPARAM macros
+
 #include "wx/msw/private.h"
+#include "wx/msw/winundef.h"
 #include "wx/msw/dc.h"
 
 #if wxUSE_UXTHEME
diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index a2dc9138b4..1342737342 100644
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -36,7 +36,10 @@
     #include "wx/settings.h"
 #endif
 
+#include <windowsx.h> // needed by GET_X_LPARAM and GET_Y_LPARAM macros
+
 #include "wx/msw/private.h"
+#include "wx/msw/winundef.h"
 
 #include "wx/imaglist.h"
 #include "wx/msw/dragimag.h"