diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c
index c9ca2ab1a8..64a5a6d7f5 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c
@@ -120,9 +120,7 @@ EAPI int ECORE_X_EVENT_STARTUP_SEQUENCE_NEW = 0;
 EAPI int ECORE_X_EVENT_STARTUP_SEQUENCE_CHANGE = 0;
 EAPI int ECORE_X_EVENT_STARTUP_SEQUENCE_REMOVE = 0;
 
-#if 1 //def USE_XI
 EAPI int ECORE_X_EVENT_GENERIC = 0;
-#endif
 
 int ECORE_X_MODIFIER_SHIFT = 0;
 int ECORE_X_MODIFIER_CTRL = 0;
@@ -277,9 +275,10 @@ ecore_x_init(const char *name)
    _ecore_x_event_handlers[ColormapNotify]   = _ecore_x_event_handle_colormap_notify;
    _ecore_x_event_handlers[ClientMessage]    = _ecore_x_event_handle_client_message;
    _ecore_x_event_handlers[MappingNotify]    = _ecore_x_event_handle_mapping_notify;
-#if 1 //def USE_XI
+#ifdef GenericEvent
   _ecore_x_event_handlers[GenericEvent]    = _ecore_x_event_handle_generic_event;	
 #endif
+   
    if (_ecore_x_event_shape_id)
      _ecore_x_event_handlers[_ecore_x_event_shape_id] = _ecore_x_event_handle_shape_change;
    if (_ecore_x_event_screensaver_id)
@@ -380,9 +379,7 @@ ecore_x_init(const char *name)
 	ECORE_X_EVENT_STARTUP_SEQUENCE_CHANGE  = ecore_event_type_new();
 	ECORE_X_EVENT_STARTUP_SEQUENCE_REMOVE  = ecore_event_type_new();
 
-#if 1 //def USE_XI
-	ECORE_X_EVENT_GENERIC     = ecore_event_type_new();
-#endif
+	ECORE_X_EVENT_GENERIC                  = ecore_event_type_new();
      }
    
    /* everything has these... unless its like a pda... :) */