diff --git a/legacy/ecore/src/lib/ecore_x/Makefile.am b/legacy/ecore/src/lib/ecore_x/Makefile.am
index 510b4f37cc..47de70a342 100644
--- a/legacy/ecore/src/lib/ecore_x/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_x/Makefile.am
@@ -13,15 +13,12 @@ INCLUDES = \
 @x_cflags@ \
 -I$(top_srcdir)/src/lib/ecore \
 -I$(top_srcdir)/src/lib/ecore_txt \
--I$(top_srcdir)/src/lib/ecore_job \
 -I$(top_builddir)/src/lib/ecore \
--I$(top_builddir)/src/lib/ecore_txt \
--I$(top_builddir)/src/lib/ecore_job
+-I$(top_builddir)/src/lib/ecore_txt
 
 libecore_x_la_LDFLAGS = -version-info 1:0:0 \
 -L$(top_builddir)/src/lib/ecore/.libs \
--L$(top_builddir)/src/lib/ecore_txt/.libs \
--L$(top_builddir)/src/lib/ecore_job/.libs
+-L$(top_builddir)/src/lib/ecore_txt/.libs
 
 if BUILD_ECORE_X
 
@@ -69,13 +66,11 @@ libecore_x_la_LIBADD = \
 @XSS_LIBS@ \
 @x_libs@ \
 $(top_builddir)/src/lib/ecore/libecore.la \
-$(top_builddir)/src/lib/ecore_txt/libecore_txt.la \
-$(top_builddir)/src/lib/ecore_job/libecore_job.la
+$(top_builddir)/src/lib/ecore_txt/libecore_txt.la
 
 libecore_x_la_DEPENDENCIES = \
 $(top_builddir)/src/lib/ecore/libecore.la \
-$(top_builddir)/src/lib/ecore_txt/libecore_txt.la \
-$(top_builddir)/src/lib/ecore_job/libecore_job.la
+$(top_builddir)/src/lib/ecore_txt/libecore_txt.la
 
 endif
 
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 9bf33db0df..ec19b20479 100644
--- a/legacy/ecore/src/lib/ecore_x/ecore_x_private.h
+++ b/legacy/ecore/src/lib/ecore_x/ecore_x_private.h
@@ -51,23 +51,8 @@
 #include "Ecore_X.h"
 
 /* FIXME: this is for simulation only */
-#include "Ecore_Job.h"
 #include "Ecore_Txt.h"
 
-typedef struct _Ecore_X_Reply Ecore_X_Reply;
-
-struct _Ecore_X_Reply
-{
-/* FIXME: this is for simulation only */
-   Ecore_Job *job;
-   
-   void *reply_data;
-   void (*reply_data_free) (void *reply_data);
-   
-   void (*func) (void *data, Ecore_X_Reply *reply, void *reply_data);   
-   void *data;
-};
-
 typedef struct _Ecore_X_Selection_Intern Ecore_X_Selection_Intern;
 
 struct _Ecore_X_Selection_Intern