diff --git a/legacy/ecore/src/lib/ecore_x/Ecore_X.h b/legacy/ecore/src/lib/ecore_x/Ecore_X.h
index b33a589e88..ea4f941a0d 100644
--- a/legacy/ecore/src/lib/ecore_x/Ecore_X.h
+++ b/legacy/ecore/src/lib/ecore_x/Ecore_X.h
@@ -334,7 +334,6 @@ typedef struct _Ecore_X_Event_Xdnd_Status         Ecore_X_Event_Xdnd_Status;
 typedef struct _Ecore_X_Event_Xdnd_Leave          Ecore_X_Event_Xdnd_Leave;
 typedef struct _Ecore_X_Event_Xdnd_Drop           Ecore_X_Event_Xdnd_Drop;
 typedef struct _Ecore_X_Event_Xdnd_Finished       Ecore_X_Event_Xdnd_Finished;
-typedef struct _Ecore_X_Xdnd_Position		  Ecore_X_Xdnd_Position;
 typedef struct _Ecore_X_Event_Client_Message      Ecore_X_Event_Client_Message;
 typedef struct _Ecore_X_Event_Window_Shape        Ecore_X_Event_Window_Shape;
 typedef struct _Ecore_X_Event_Screensaver_Notify  Ecore_X_Event_Screensaver_Notify;
@@ -380,6 +379,8 @@ typedef struct _Ecore_X_Event_Generic            Ecore_X_Event_Generic;
 typedef struct _Ecore_X_Randr_Screen_Size        Ecore_X_Randr_Screen_Size;
 typedef struct _Ecore_X_Randr_Screen_Size_MM     Ecore_X_Randr_Screen_Size_MM;
 
+typedef struct _Ecore_X_Xdnd_Position		  Ecore_X_Xdnd_Position;
+
 struct _Ecore_X_Event_Mouse_In
 {
    int                  modifiers;
@@ -1237,6 +1238,8 @@ EAPI void                ecore_x_dnd_send_status(int               will_accept,
 EAPI void                ecore_x_dnd_send_finished(void);
 EAPI void                ecore_x_dnd_source_action_set(Ecore_X_Atom action);
 EAPI Ecore_X_Atom        ecore_x_dnd_source_action_get(void);
+EAPI void                ecore_x_dnd_callback_pos_update_set(void (*cb)(void *, Ecore_X_Xdnd_Position *data),
+			                                     const void *data)
 
 EAPI Ecore_X_Window      ecore_x_window_new(Ecore_X_Window parent,
                                             int            x,
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_dnd.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_dnd.c
index 5099094909..a1c7a7a768 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_dnd.c
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_dnd.c
@@ -356,12 +356,12 @@ ecore_x_dnd_actions_set(Ecore_X_Window win,
  * @param data User data.
  */
 EAPI void
-ecore_x_dnd_position_update_cb_set(
+ecore_x_dnd_callback_pos_update_set(
                            void (*cb)(void *, Ecore_X_Xdnd_Position *data),
-			   void *data)
+			   const void *data)
 {
    _posupdatecb = cb;
-   _posupdatedata = data;
+   _posupdatedata = (void *)data; /* Discard the const early */
 }
 
 Ecore_X_DND_Source *