diff --git a/legacy/ecore/src/lib/ecore_x/ecore_x_events.c b/legacy/ecore/src/lib/ecore_x/ecore_x_events.c
index 8c92bbf607..1169850c97 100644
--- a/legacy/ecore/src/lib/ecore_x/ecore_x_events.c
+++ b/legacy/ecore/src/lib/ecore_x/ecore_x_events.c
@@ -1331,7 +1331,9 @@ _ecore_x_event_handle_client_message(XEvent *xevent)
 	     /* Target successfully performed drop action */
 	     ecore_x_selection_xdnd_clear();
 	     source->state = ECORE_X_DND_SOURCE_IDLE;
-	  } else {
+	  }
+	else
+	  {
 	       completed = 0;
 	       source->state = ECORE_X_DND_SOURCE_CONVERTING;
 
diff --git a/legacy/ecore/src/lib/ecore_x/ecore_x_private.h b/legacy/ecore/src/lib/ecore_x/ecore_x_private.h
index 726267819d..836ad418f6 100644
--- a/legacy/ecore/src/lib/ecore_x/ecore_x_private.h
+++ b/legacy/ecore/src/lib/ecore_x/ecore_x_private.h
@@ -80,7 +80,7 @@ struct _Ecore_X_Selection_Parser
 typedef struct _Ecore_X_DND_Source 
 {
    int version;
-   Window win, dest;
+   Ecore_X_Window win, dest;
    
    enum {
       ECORE_X_DND_SOURCE_IDLE,
@@ -107,7 +107,7 @@ typedef struct _Ecore_X_DND_Source
 typedef struct _Ecore_X_DND_Target 
 {
    int version;
-   Window win, source;
+   Ecore_X_Window win, source;
    
    enum {
       ECORE_X_DND_TARGET_IDLE,
diff --git a/legacy/ecore/src/lib/ecore_x/ecore_x_selection.c b/legacy/ecore/src/lib/ecore_x/ecore_x_selection.c
index 5b2db7aae2..b2c62f7f10 100644
--- a/legacy/ecore/src/lib/ecore_x/ecore_x_selection.c
+++ b/legacy/ecore/src/lib/ecore_x/ecore_x_selection.c
@@ -1,6 +1,7 @@
 /*
  * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
  */
+#include "ecore_private.h"
 #include "Ecore.h"
 #include "ecore_x_private.h"
 #include "Ecore_X.h"
@@ -702,7 +703,7 @@ _ecore_x_selection_data_files_free(void *data)
 }
 
 static void *
-_ecore_x_selection_parser_text(const char *target, unsigned char *data, int size)
+_ecore_x_selection_parser_text(const char *target __UNUSED__, unsigned char *data, int size)
 {
    Ecore_X_Selection_Data_Text *sel;
 
@@ -734,7 +735,7 @@ _ecore_x_selection_data_text_free(void *data)
 }
 
 static void *
-_ecore_x_selection_parser_targets(const char *target, unsigned char *data, int size)
+_ecore_x_selection_parser_targets(const char *target __UNUSED__, unsigned char *data, int size)
 {
    Ecore_X_Selection_Data_Targets *sel;
    unsigned long *targets;