diff --git a/include/wx/dragimag.h b/include/wx/dragimag.h
index 097edaacd3..39d4a81058 100644
--- a/include/wx/dragimag.h
+++ b/include/wx/dragimag.h
@@ -8,7 +8,7 @@ class WXDLLEXPORT wxMemoryDC;
 class WXDLLEXPORT wxDC;
 
 #if defined(__WXMSW__)
-#ifdef __WIN16__
+#if defined(__WIN16__)  || defined(__WXUNIVERSAL__)
 #include "wx/generic/dragimgg.h"
 #define wxDragImage wxGenericDragImage
 #define sm_classwxDragImage sm_classwxGenericDragImage
diff --git a/include/wx/univ/setup.h b/include/wx/univ/setup.h
index 95baaf18ba..e7bb7a6333 100644
--- a/include/wx/univ/setup.h
+++ b/include/wx/univ/setup.h
@@ -152,6 +152,7 @@
 #define wxUSE_GLCANVAS       0
 #define wxUSE_TREELAYOUT     0
 #define wxUSE_IPC         0
+#define wxUSE_DRAGIMAGE   0
 #define wxUSE_HELP        0
 #define wxUSE_MS_HTML_HELP 0
 #define wxUSE_RESOURCES   0
@@ -302,6 +303,7 @@
 #define wxUSE_GLCANVAS      0
 #define wxUSE_TREELAYOUT    0
 #define wxUSE_IPC           0
+#define wxUSE_DRAGIMAGE   0
 #define wxUSE_HELP          0
 #define wxUSE_MS_HTML_HELP  0
 #define wxUSE_WXHTML_HELP   0
@@ -460,6 +462,7 @@
 #define wxUSE_GLCANVAS       0
 #define wxUSE_TREELAYOUT     0
 #define wxUSE_IPC         0
+#define wxUSE_DRAGIMAGE   0
 #define wxUSE_HELP        0
 #define wxUSE_MS_HTML_HELP 0
 #define wxUSE_WXHTML_HELP 0