diff --git a/contrib/include/wx/plot/plot.h b/contrib/include/wx/plot/plot.h
index f805a22a7d..5c51df8f26 100644
--- a/contrib/include/wx/plot/plot.h
+++ b/contrib/include/wx/plot/plot.h
@@ -49,28 +49,29 @@ class WXDLLIMPEXP_PLOT wxPlotWindow;
 // consts
 //-----------------------------------------------------------------------------
 
-extern const int wxEVT_PLOT_SEL_CHANGING;
-extern const int wxEVT_PLOT_SEL_CHANGED;
-extern const int wxEVT_PLOT_CLICKED;
-extern const int wxEVT_PLOT_DOUBLECLICKED;
-extern const int wxEVT_PLOT_ZOOM_IN;
-extern const int wxEVT_PLOT_ZOOM_OUT;
-extern const int wxEVT_PLOT_VALUE_SEL_CREATING;
-extern const int wxEVT_PLOT_VALUE_SEL_CREATED;
-extern const int wxEVT_PLOT_VALUE_SEL_CHANGING;
-extern const int wxEVT_PLOT_VALUE_SEL_CHANGED;
-extern const int wxEVT_PLOT_AREA_SEL_CREATING;
-extern const int wxEVT_PLOT_AREA_SEL_CREATED;
-extern const int wxEVT_PLOT_AREA_SEL_CHANGING;
-extern const int wxEVT_PLOT_AREA_SEL_CHANGED;
-extern const int wxEVT_PLOT_BEGIN_X_LABEL_EDIT;
-extern const int wxEVT_PLOT_END_X_LABEL_EDIT;
-extern const int wxEVT_PLOT_BEGIN_Y_LABEL_EDIT;
-extern const int wxEVT_PLOT_END_Y_LABEL_EDIT;
-extern const int wxEVT_PLOT_BEGIN_TITLE_EDIT;
-extern const int wxEVT_PLOT_END_TITLE_EDIT;
-extern const int wxEVT_PLOT_AREA_CREATE;
-
+BEGIN_DECLARE_EVENT_TYPES()
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_SEL_CHANGING,  0)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_SEL_CHANGED, 0)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_CLICKED, 0)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_DOUBLECLICKED, 0)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_ZOOM_IN, 0)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_ZOOM_OUT, 0)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_VALUE_SEL_CREATING, 0)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_VALUE_SEL_CREATED, 0)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_VALUE_SEL_CHANGING, 0)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_VALUE_SEL_CHANGED, 0)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_AREA_SEL_CREATING, 0)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_AREA_SEL_CREATED, 0)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_AREA_SEL_CHANGING, 0)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_AREA_SEL_CHANGED, 0)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_BEGIN_X_LABEL_EDIT, 0)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_END_X_LABEL_EDIT, 0)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_BEGIN_Y_LABEL_EDIT, 0)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_END_Y_LABEL_EDIT, 0)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_BEGIN_TITLE_EDIT, 0)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_END_TITLE_EDIT, 0)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_PLOT, wxEVT_PLOT_AREA_CREATE, 0)
+END_DECLARE_EVENT_TYPES()
 
 #define wxPLOT_X_AXIS          0x0004
 #define wxPLOT_Y_AXIS          0x0008