diff --git a/include/wx/display.h b/include/wx/display.h
index 332810d1ea..3bcb0274c4 100644
--- a/include/wx/display.h
+++ b/include/wx/display.h
@@ -21,7 +21,7 @@
     #include "wx/dynarray.h"
     #include "wx/vidmode.h"
 
-    WX_DECLARE_EXPORTED_OBJARRAY(wxVideoMode, wxArrayVideoModes);
+    using wxArrayVideoModes = wxBaseArray<wxVideoMode>;
 
     // default, uninitialized, video mode object
     extern WXDLLIMPEXP_DATA_CORE(const wxVideoMode) wxDefaultVideoMode;
diff --git a/interface/wx/vidmode.h b/interface/wx/vidmode.h
index 9097e67b23..0592e1e803 100644
--- a/interface/wx/vidmode.h
+++ b/interface/wx/vidmode.h
@@ -85,3 +85,11 @@ public:
 */
 const wxVideoMode wxDefaultVideoMode;
 
+/**
+    A vector of video modes.
+
+    This class is actually a legacy container (see @ref overview_container for
+    more details), but it can, and should be, handled as just a vector of
+    wxVideoMode objects in the application code.
+*/
+using wxArrayVideoModes = std::vector<wxVideoMode>;
diff --git a/src/common/dpycmn.cpp b/src/common/dpycmn.cpp
index 24a16b077a..4a9b97871e 100644
--- a/src/common/dpycmn.cpp
+++ b/src/common/dpycmn.cpp
@@ -32,9 +32,6 @@
 
 #if wxUSE_DISPLAY
 
-#include "wx/arrimpl.cpp"
-WX_DEFINE_OBJARRAY(wxArrayVideoModes)
-
 const wxVideoMode wxDefaultVideoMode;
 
 #endif // wxUSE_DISPLAY