diff --git a/include/wx/event.h b/include/wx/event.h
index b46c8fe8f0..6617b829d9 100644
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -2819,15 +2819,8 @@ typedef void (wxEvtHandler::*wxMouseCaptureChangedEventFunction)(wxMouseCaptureC
 // present in the source code and macros are enough to maintain source
 // backwards compatibility, but that we have to ensure that we also have
 // wxEVT_SCROLL_ENDSCROLL inside the library for binary backwards compatibility
-// and this can't be done with a macro
-#if wxCHECK_VERSION(2, 7, 0)
-    // replace the line below with simply
-    //      #define wxEVT_SCROLL_ENDSCROLL wxEVT_SCROLL_CHANGED
-    // in 2.7
-    #error "Remove wxEVT_SCROLL_ENDSCROLL binary compatibility hack, not needed"
-#endif
-extern WXDLLIMPEXP_CORE const wxEventType wxEVT_SCROLL_ENDSCROLL;
-
+// and this is done in event.cpp
+#define wxEVT_SCROLL_ENDSCROLL wxEVT_SCROLL_CHANGED
 #define EVT_COMMAND_SCROLL_ENDSCROLL EVT_COMMAND_SCROLL_CHANGED
 #define EVT_SCROLL_ENDSCROLL EVT_SCROLL_CHANGED
 
diff --git a/src/common/event.cpp b/src/common/event.cpp
index 7af4275db2..3d4ee35534 100644
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -249,8 +249,10 @@ DEFINE_EVENT_TYPE(wxEVT_SCROLL_CHANGED)
 
 // see comments in wx/event.h, near wxEVT_SCROLL_ENDSCROLL declaration
 #if wxCHECK_VERSION(2, 7, 0)
-    #error "Remove the line below, not needed any more"
+    #error "Remove the lines below, not needed any more"
 #endif
+#undef wxEVT_SCROLL_ENDSCROLL
+extern WXDLLIMPEXP_CORE const wxEventType wxEVT_SCROLL_ENDSCROLL;
 const wxEventType wxEVT_SCROLL_ENDSCROLL = wxEVT_SCROLL_CHANGED;
 
 // Scroll events from wxWindow