From 5768b9f954f944e0c8c31a85a284b7e72a7ce3ee Mon Sep 17 00:00:00 2001
From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Fri, 16 Nov 2007 00:31:55 +0000
Subject: [PATCH] Do not include C files. Instead, add them to the project
 file. Hopefully, this will allow to have threads but no java

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5050 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 src/Makefile.am               |  10 ++-
 src/Makefile.in               | 136 +++++++++++++++++++++++++++++-----
 src/java/jmsg.c               |   5 +-
 src/java/jmsg_parallel_task.c |   2 +
 src/java/jmsg_process.c       |   1 +
 src/xbt/xbt_context.c         |  24 +-----
 src/xbt/xbt_context_factory.h |   5 --
 src/xbt/xbt_context_private.h |  26 ++++---
 src/xbt/xbt_jcontext.c        |  11 +--
 src/xbt/xbt_jcontext.h        |  19 +----
 src/xbt/xbt_thread_context.c  |   2 +
 src/xbt/xbt_thread_context.h  |  13 ----
 src/xbt/xbt_ucontext.h        |   8 --
 13 files changed, 159 insertions(+), 103 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 25a45affa4..82a306619d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -173,9 +173,11 @@ SURF_SRC= \
   surf/workstation_KCCFLN05.c   surf/workstation_ptask_L07.c
 
 if CONTEXT_THREADS
-  SURF_SRC += xbt/xbt_os_thread.c
+  SURF_SRC += xbt/xbt_os_thread.c        \
+              xbt/xbt_thread_context.c  
 else  
-  SURF_SRC += xbt/xbt_os_thread_stubs.c
+  SURF_SRC += xbt/xbt_os_thread_stubs.c  \
+              xbt/xbt_ucontext.c
 endif
 
 GTNETS_SRC= \
@@ -212,6 +214,7 @@ MSG_SRC=  msg/msg_config.c \
   msg/global.c msg/environment.c msg/deployment.c 
 
 JMSG_C_SRC = \
+  xbt/xbt_jcontext.c \
   java/jxbt_utilities.c     java/jxbt_utilities.h      \
   java/jmsg.c               java/jmsg.h                \
   java/jmsg_channel.c       java/jmsg_channel.h        \
@@ -337,7 +340,10 @@ endif
 ## Java cruft
 
 EXTRA_DIST+=$(JMSG_JAVA_SRC)
+
 if HAVE_JAVA
+libsimgrid_la_SOURCES += $(JMSG_C_SRC) # add the binding support to the library
+
 clean-local:
 	-rm -rf .classes
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 93200389ae..710093bf50 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -52,8 +52,12 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-@CONTEXT_THREADS_TRUE@am__append_1 = xbt/xbt_os_thread.c
-@CONTEXT_THREADS_FALSE@am__append_2 = xbt/xbt_os_thread_stubs.c
+@CONTEXT_THREADS_TRUE@am__append_1 = xbt/xbt_os_thread.c        \
+@CONTEXT_THREADS_TRUE@              xbt/xbt_thread_context.c  
+
+@CONTEXT_THREADS_FALSE@am__append_2 = xbt/xbt_os_thread_stubs.c  \
+@CONTEXT_THREADS_FALSE@              xbt/xbt_ucontext.c
+
 @HAVE_GTNETS_FALSE@am__append_3 = $(GTNETS_SRC)
 @HAVE_SDP_FALSE@am__append_4 = surf/sdp.c
 
@@ -61,10 +65,11 @@ target_triplet = @target@
 @IS_WINDOWS_TRUE@am__append_5 = -Wl,--output-def,libgras.def
 @IS_WINDOWS_TRUE@am__append_6 = -Wl,--output-def,libsimgrid.def
 @IS_WINDOWS_TRUE@am__append_7 = -Wl,--output-def,libsmpi.def
-@HAVE_JAVA_FALSE@am__append_8 = $(JMSG_C_SRC) $(MSG_SRC)
+@HAVE_JAVA_TRUE@am__append_8 = $(JMSG_C_SRC) # add the binding support to the library
+@HAVE_JAVA_FALSE@am__append_9 = $(JMSG_C_SRC) $(MSG_SRC)
 @GRAMINE_MODE_FALSE@noinst_PROGRAMS = testall$(EXEEXT)
 @GRAMINE_MODE_FALSE@TESTS = testall$(EXEEXT)
-@GRAMINE_MODE_FALSE@am__append_9 = $(testall_SOURCES)
+@GRAMINE_MODE_FALSE@am__append_10 = $(testall_SOURCES)
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/gras_config.h.in $(srcdir)/ucontext_stack.h.in \
 	$(top_srcdir)/acmacro/dist-files.mk
@@ -132,7 +137,8 @@ am__libsimgrid_la_SOURCES_DIST = xbt/snprintf.c xbt/xbt_str.c \
 	surf/surf.c surf/surfxml_parse.c surf/cpu.c surf/network.c \
 	surf/workstation.c surf/surf_timer.c \
 	surf/workstation_KCCFLN05.c surf/workstation_ptask_L07.c \
-	xbt/xbt_os_thread.c xbt/xbt_os_thread_stubs.c \
+	xbt/xbt_os_thread.c xbt/xbt_thread_context.c \
+	xbt/xbt_os_thread_stubs.c xbt/xbt_ucontext.c \
 	surf/gtnets/gtnets_simulator.cc surf/gtnets/gtnets_topology.cc \
 	surf/gtnets/gtnets_interface.cc surf/network_gtnets.c \
 	surf/sdp.c simix/smx_global.c simix/smx_deployment.c \
@@ -158,9 +164,16 @@ am__libsimgrid_la_SOURCES_DIST = xbt/snprintf.c xbt/xbt_str.c \
 	gras/Virtu/sg_process.c gras/Virtu/sg_dns.c gras/Msg/sg_msg.c \
 	xbt/xbt_sg_synchro.c xbt/xbt_sg_time.c amok/amok_base.c \
 	amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c \
-	amok/PeerManagement/peermanagement.c
-@CONTEXT_THREADS_TRUE@am__objects_6 = xbt_os_thread.lo
-@CONTEXT_THREADS_FALSE@am__objects_7 = xbt_os_thread_stubs.lo
+	amok/PeerManagement/peermanagement.c xbt/xbt_jcontext.c \
+	java/jxbt_utilities.c java/jxbt_utilities.h java/jmsg.c \
+	java/jmsg.h java/jmsg_channel.c java/jmsg_channel.h \
+	java/jmsg_host.c java/jmsg_host.h java/jmsg_parallel_task.c \
+	java/jmsg_parallel_task.h java/jmsg_process.c \
+	java/jmsg_process.h java/jmsg_task.c java/jmsg_task.h
+@CONTEXT_THREADS_TRUE@am__objects_6 = xbt_os_thread.lo \
+@CONTEXT_THREADS_TRUE@	xbt_thread_context.lo
+@CONTEXT_THREADS_FALSE@am__objects_7 = xbt_os_thread_stubs.lo \
+@CONTEXT_THREADS_FALSE@	xbt_ucontext.lo
 am__objects_8 = maxmin.lo fair_bottleneck.lo lagrange.lo trace_mgr.lo \
 	surf.lo surfxml_parse.lo cpu.lo network.lo workstation.lo \
 	surf_timer.lo workstation_KCCFLN05.lo workstation_ptask_L07.lo \
@@ -179,18 +192,23 @@ am__objects_15 = sd_global.lo sd_link.lo sd_task.lo sd_workstation.lo
 am__objects_16 = xbt_sg_synchro.lo xbt_sg_time.lo
 am__objects_17 = sg_transport.lo transport_plugin_sg.lo sg_emul.lo \
 	sg_process.lo sg_dns.lo sg_msg.lo $(am__objects_16)
+am__objects_18 = xbt_jcontext.lo jxbt_utilities.lo jmsg.lo \
+	jmsg_channel.lo jmsg_host.lo jmsg_parallel_task.lo \
+	jmsg_process.lo jmsg_task.lo
+@HAVE_JAVA_TRUE@am__objects_19 = $(am__objects_18)
 am_libsimgrid_la_OBJECTS = $(am__objects_1) $(am__objects_8) \
 	$(am__objects_10) $(am__objects_11) $(am__objects_12) \
 	$(am__objects_13) $(am__objects_14) $(am__objects_15) \
-	$(am__objects_2) $(am__objects_17) $(am__objects_5)
+	$(am__objects_2) $(am__objects_17) $(am__objects_5) \
+	$(am__objects_19)
 libsimgrid_la_OBJECTS = $(am_libsimgrid_la_OBJECTS)
 libsimgrid_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(libsimgrid_la_LDFLAGS) $(LDFLAGS) -o $@
 libsmpi_la_DEPENDENCIES = libsimgrid.la
-am__objects_18 = smpi_base.lo smpi_bench.lo smpi_global.lo smpi_mpi.lo \
+am__objects_20 = smpi_base.lo smpi_bench.lo smpi_global.lo smpi_mpi.lo \
 	smpi_sender.lo smpi_receiver.lo smpi_util.lo
-am_libsmpi_la_OBJECTS = $(am__objects_18)
+am_libsmpi_la_OBJECTS = $(am__objects_20)
 libsmpi_la_OBJECTS = $(am_libsmpi_la_OBJECTS)
 libsmpi_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -201,12 +219,12 @@ am__testall_SOURCES_DIST = @builddir@/cunit_unit.c \
 	@builddir@/dict_unit.c @builddir@/set_unit.c \
 	@builddir@/swag_unit.c @builddir@/xbt_str_unit.c \
 	@builddir@/config_unit.c @builddir@/simgrid_units_main.c
-@GRAMINE_MODE_FALSE@am__objects_19 = cunit_unit.$(OBJEXT) \
+@GRAMINE_MODE_FALSE@am__objects_21 = cunit_unit.$(OBJEXT) \
 @GRAMINE_MODE_FALSE@	ex_unit.$(OBJEXT) dynar_unit.$(OBJEXT) \
 @GRAMINE_MODE_FALSE@	dict_unit.$(OBJEXT) set_unit.$(OBJEXT) \
 @GRAMINE_MODE_FALSE@	swag_unit.$(OBJEXT) xbt_str_unit.$(OBJEXT) \
 @GRAMINE_MODE_FALSE@	config_unit.$(OBJEXT)
-@GRAMINE_MODE_FALSE@am_testall_OBJECTS = $(am__objects_19) \
+@GRAMINE_MODE_FALSE@am_testall_OBJECTS = $(am__objects_21) \
 @GRAMINE_MODE_FALSE@	simgrid_units_main.$(OBJEXT)
 testall_OBJECTS = $(am_testall_OBJECTS)
 @GRAMINE_MODE_FALSE@testall_DEPENDENCIES = libgras.la
@@ -402,7 +420,7 @@ EXTRA_DIST = portable.h xbt/mallocator_private.h xbt/dynar_private.h \
 	amok/Bandwidth/bandwidth_private.h amok/amok_modinter.h \
 	include/simix/simix.h include/simix/datatypes.h \
 	simix/private.h smpi/private.h $(am__append_3) $(am__append_4) \
-	$(JMSG_JAVA_SRC) $(am__append_8) $(am__append_9)
+	$(JMSG_JAVA_SRC) $(am__append_9) $(am__append_10)
 
 #LIBRARY_VERSION= 0:0:0
 #                 | | |
@@ -524,6 +542,7 @@ MSG_SRC = msg/msg_config.c \
   msg/global.c msg/environment.c msg/deployment.c 
 
 JMSG_C_SRC = \
+  xbt/xbt_jcontext.c \
   java/jxbt_utilities.c     java/jxbt_utilities.h      \
   java/jmsg.c               java/jmsg.h                \
   java/jmsg_channel.c       java/jmsg_channel.h        \
@@ -598,11 +617,9 @@ lib_LTLIBRARIES = libsimgrid.la libgras.la libsmpi.la
 libgras_la_SOURCES = $(XBT_SRC) $(GRAS_COMMON_SRC) $(GRAS_RL_SRC) $(AMOK_SRC)
 libgras_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GRAS_DEP@ \
 	@LD_DYNAMIC_FLAGS@ -lm $(am__append_5)
-libsimgrid_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \
-                        $(SIMIX_SRC) $(CTX_SRC) \
-                        $(MSG_SRC) $(SIMDAG_SRC) \
-			$(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC)
-
+libsimgrid_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) \
+	$(SDP_SRC) $(SIMIX_SRC) $(CTX_SRC) $(MSG_SRC) $(SIMDAG_SRC) \
+	$(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC) $(am__append_8)
 libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ \
 	@LD_DYNAMIC_FLAGS@ -lm $(am__append_6)
 
@@ -799,6 +816,13 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtnets_topology.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/heap.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/host.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jmsg.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jmsg_channel.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jmsg_host.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jmsg_parallel_task.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jmsg_process.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jmsg_task.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jxbt_utilities.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lagrange.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m_process.Plo@am__quote@
@@ -862,6 +886,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/workstation_KCCFLN05.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/workstation_ptask_L07.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_context.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_jcontext.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_log_appender_file.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_log_layout_format.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_log_layout_simple.Plo@am__quote@
@@ -879,6 +904,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_str.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_str_unit.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_strbuff.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_thread_context.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_ucontext.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_virtu.Plo@am__quote@
 
 .c.o:
@@ -1413,6 +1440,13 @@ workstation_ptask_L07.lo: surf/workstation_ptask_L07.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o workstation_ptask_L07.lo `test -f 'surf/workstation_ptask_L07.c' || echo '$(srcdir)/'`surf/workstation_ptask_L07.c
 
+xbt_thread_context.lo: xbt/xbt_thread_context.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbt_thread_context.lo -MD -MP -MF $(DEPDIR)/xbt_thread_context.Tpo -c -o xbt_thread_context.lo `test -f 'xbt/xbt_thread_context.c' || echo '$(srcdir)/'`xbt/xbt_thread_context.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xbt_thread_context.Tpo $(DEPDIR)/xbt_thread_context.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xbt/xbt_thread_context.c' object='xbt_thread_context.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbt_thread_context.lo `test -f 'xbt/xbt_thread_context.c' || echo '$(srcdir)/'`xbt/xbt_thread_context.c
+
 xbt_os_thread_stubs.lo: xbt/xbt_os_thread_stubs.c
 @am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbt_os_thread_stubs.lo -MD -MP -MF $(DEPDIR)/xbt_os_thread_stubs.Tpo -c -o xbt_os_thread_stubs.lo `test -f 'xbt/xbt_os_thread_stubs.c' || echo '$(srcdir)/'`xbt/xbt_os_thread_stubs.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xbt_os_thread_stubs.Tpo $(DEPDIR)/xbt_os_thread_stubs.Plo
@@ -1420,6 +1454,13 @@ xbt_os_thread_stubs.lo: xbt/xbt_os_thread_stubs.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbt_os_thread_stubs.lo `test -f 'xbt/xbt_os_thread_stubs.c' || echo '$(srcdir)/'`xbt/xbt_os_thread_stubs.c
 
+xbt_ucontext.lo: xbt/xbt_ucontext.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbt_ucontext.lo -MD -MP -MF $(DEPDIR)/xbt_ucontext.Tpo -c -o xbt_ucontext.lo `test -f 'xbt/xbt_ucontext.c' || echo '$(srcdir)/'`xbt/xbt_ucontext.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xbt_ucontext.Tpo $(DEPDIR)/xbt_ucontext.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xbt/xbt_ucontext.c' object='xbt_ucontext.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbt_ucontext.lo `test -f 'xbt/xbt_ucontext.c' || echo '$(srcdir)/'`xbt/xbt_ucontext.c
+
 network_gtnets.lo: surf/network_gtnets.c
 @am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT network_gtnets.lo -MD -MP -MF $(DEPDIR)/network_gtnets.Tpo -c -o network_gtnets.lo `test -f 'surf/network_gtnets.c' || echo '$(srcdir)/'`surf/network_gtnets.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/network_gtnets.Tpo $(DEPDIR)/network_gtnets.Plo
@@ -1637,6 +1678,62 @@ xbt_sg_time.lo: xbt/xbt_sg_time.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbt_sg_time.lo `test -f 'xbt/xbt_sg_time.c' || echo '$(srcdir)/'`xbt/xbt_sg_time.c
 
+xbt_jcontext.lo: xbt/xbt_jcontext.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbt_jcontext.lo -MD -MP -MF $(DEPDIR)/xbt_jcontext.Tpo -c -o xbt_jcontext.lo `test -f 'xbt/xbt_jcontext.c' || echo '$(srcdir)/'`xbt/xbt_jcontext.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/xbt_jcontext.Tpo $(DEPDIR)/xbt_jcontext.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xbt/xbt_jcontext.c' object='xbt_jcontext.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbt_jcontext.lo `test -f 'xbt/xbt_jcontext.c' || echo '$(srcdir)/'`xbt/xbt_jcontext.c
+
+jxbt_utilities.lo: java/jxbt_utilities.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT jxbt_utilities.lo -MD -MP -MF $(DEPDIR)/jxbt_utilities.Tpo -c -o jxbt_utilities.lo `test -f 'java/jxbt_utilities.c' || echo '$(srcdir)/'`java/jxbt_utilities.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/jxbt_utilities.Tpo $(DEPDIR)/jxbt_utilities.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='java/jxbt_utilities.c' object='jxbt_utilities.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jxbt_utilities.lo `test -f 'java/jxbt_utilities.c' || echo '$(srcdir)/'`java/jxbt_utilities.c
+
+jmsg.lo: java/jmsg.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT jmsg.lo -MD -MP -MF $(DEPDIR)/jmsg.Tpo -c -o jmsg.lo `test -f 'java/jmsg.c' || echo '$(srcdir)/'`java/jmsg.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/jmsg.Tpo $(DEPDIR)/jmsg.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='java/jmsg.c' object='jmsg.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jmsg.lo `test -f 'java/jmsg.c' || echo '$(srcdir)/'`java/jmsg.c
+
+jmsg_channel.lo: java/jmsg_channel.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT jmsg_channel.lo -MD -MP -MF $(DEPDIR)/jmsg_channel.Tpo -c -o jmsg_channel.lo `test -f 'java/jmsg_channel.c' || echo '$(srcdir)/'`java/jmsg_channel.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/jmsg_channel.Tpo $(DEPDIR)/jmsg_channel.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='java/jmsg_channel.c' object='jmsg_channel.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jmsg_channel.lo `test -f 'java/jmsg_channel.c' || echo '$(srcdir)/'`java/jmsg_channel.c
+
+jmsg_host.lo: java/jmsg_host.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT jmsg_host.lo -MD -MP -MF $(DEPDIR)/jmsg_host.Tpo -c -o jmsg_host.lo `test -f 'java/jmsg_host.c' || echo '$(srcdir)/'`java/jmsg_host.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/jmsg_host.Tpo $(DEPDIR)/jmsg_host.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='java/jmsg_host.c' object='jmsg_host.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jmsg_host.lo `test -f 'java/jmsg_host.c' || echo '$(srcdir)/'`java/jmsg_host.c
+
+jmsg_parallel_task.lo: java/jmsg_parallel_task.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT jmsg_parallel_task.lo -MD -MP -MF $(DEPDIR)/jmsg_parallel_task.Tpo -c -o jmsg_parallel_task.lo `test -f 'java/jmsg_parallel_task.c' || echo '$(srcdir)/'`java/jmsg_parallel_task.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/jmsg_parallel_task.Tpo $(DEPDIR)/jmsg_parallel_task.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='java/jmsg_parallel_task.c' object='jmsg_parallel_task.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jmsg_parallel_task.lo `test -f 'java/jmsg_parallel_task.c' || echo '$(srcdir)/'`java/jmsg_parallel_task.c
+
+jmsg_process.lo: java/jmsg_process.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT jmsg_process.lo -MD -MP -MF $(DEPDIR)/jmsg_process.Tpo -c -o jmsg_process.lo `test -f 'java/jmsg_process.c' || echo '$(srcdir)/'`java/jmsg_process.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/jmsg_process.Tpo $(DEPDIR)/jmsg_process.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='java/jmsg_process.c' object='jmsg_process.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jmsg_process.lo `test -f 'java/jmsg_process.c' || echo '$(srcdir)/'`java/jmsg_process.c
+
+jmsg_task.lo: java/jmsg_task.c
+@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT jmsg_task.lo -MD -MP -MF $(DEPDIR)/jmsg_task.Tpo -c -o jmsg_task.lo `test -f 'java/jmsg_task.c' || echo '$(srcdir)/'`java/jmsg_task.c
+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/jmsg_task.Tpo $(DEPDIR)/jmsg_task.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='java/jmsg_task.c' object='jmsg_task.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o jmsg_task.lo `test -f 'java/jmsg_task.c' || echo '$(srcdir)/'`java/jmsg_task.c
+
 smpi_base.lo: smpi/smpi_base.c
 @am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT smpi_base.lo -MD -MP -MF $(DEPDIR)/smpi_base.Tpo -c -o smpi_base.lo `test -f 'smpi/smpi_base.c' || echo '$(srcdir)/'`smpi/smpi_base.c
 @am__fastdepCC_TRUE@	mv -f $(DEPDIR)/smpi_base.Tpo $(DEPDIR)/smpi_base.Plo
@@ -2142,6 +2239,7 @@ uninstall-am: uninstall-binSCRIPTS uninstall-jarDATA \
 	uninstall-am uninstall-binSCRIPTS uninstall-jarDATA \
 	uninstall-libLTLIBRARIES
 
+
 @HAVE_JAVA_TRUE@clean-local:
 @HAVE_JAVA_TRUE@	-rm -rf .classes
 
diff --git a/src/java/jmsg.c b/src/java/jmsg.c
index 2495f52173..9d7c85adea 100644
--- a/src/java/jmsg.c
+++ b/src/java/jmsg.c
@@ -12,7 +12,8 @@
 #include "msg/msg.h"
 #include "msg/private.h"
 #include "simix/private.h"
-#include "xbt/xbt_context_private.h"
+#include "xbt/xbt_jcontext.h"
+#include "xbt/xbt_context_factory.h"
 
 #include "jmsg_process.h"
 #include "jmsg_host.h"
@@ -23,6 +24,8 @@
 
 #include "jmsg.h"
 
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
+
 static JavaVM * __java_vm = NULL;
 
 static jobject
diff --git a/src/java/jmsg_parallel_task.c b/src/java/jmsg_parallel_task.c
index 7f9b83448c..1af0f30bf8 100644
--- a/src/java/jmsg_parallel_task.c
+++ b/src/java/jmsg_parallel_task.c
@@ -15,6 +15,8 @@
 #include "jmsg_parallel_task.h"
 #include "jxbt_utilities.h"
 
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
+
 jobject
 jparallel_task_ref(JNIEnv* env, jobject jparallel_task) {
   jobject newref = (*env)->NewGlobalRef(env,jparallel_task); 
diff --git a/src/java/jmsg_process.c b/src/java/jmsg_process.c
index 286dbd8933..4121efdec5 100644
--- a/src/java/jmsg_process.c
+++ b/src/java/jmsg_process.c
@@ -16,6 +16,7 @@
 
 #include "xbt/xbt_jcontext.h"
 
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
 
 jobject
 jprocess_new_global_ref(jobject jprocess,JNIEnv* env) {
diff --git a/src/xbt/xbt_context.c b/src/xbt/xbt_context.c
index 418b125820..e7975f1def 100644
--- a/src/xbt/xbt_context.c
+++ b/src/xbt/xbt_context.c
@@ -13,21 +13,17 @@
 #include "xbt_context_factory.h"
 
 /* the context associated with the current process 				*/
-static xbt_context_t 
-current_context = NULL;
+xbt_context_t current_context = NULL;
 
 /* the context associated with the maestro						*/
-static xbt_context_t 
-maestro_context = NULL;
+xbt_context_t  maestro_context = NULL;
 
 
 /* this list contains the contexts to destroy					*/
-static xbt_swag_t 
-context_to_destroy = NULL;
+xbt_swag_t context_to_destroy = NULL;
 
 /* this list contains the contexts in use						*/
-static xbt_swag_t 
-context_living = NULL;
+xbt_swag_t context_living = NULL;
 
 /* the context factory used to create the appropriate context	
  * each context implementation define its own context factory
@@ -42,18 +38,6 @@ context_living = NULL;
 static xbt_context_factory_t
 context_factory = NULL;
 
-/* java implementation of the context */
-#include "xbt_jcontext.c"
-
-#ifdef CONTEXT_THREADS
-/* use the native thread implementation of the context */
-#include "xbt_thread_context.c"
-#elif !defined(WIN32)
-/* use the ucontext	based context		*/
-#  include "xbt_ucontext.c" 
-#endif 
-
-
 /**
  * This function is call by the xbt_init() function to initialize the context module.
  */
diff --git a/src/xbt/xbt_context_factory.h b/src/xbt/xbt_context_factory.h
index b6f1a99ffc..7ad0ad09ba 100644
--- a/src/xbt/xbt_context_factory.h
+++ b/src/xbt/xbt_context_factory.h
@@ -27,11 +27,6 @@ typedef struct s_xbt_context_factory
 	
 }s_xbt_context_factory_t;
 
-#ifndef _XBT_CONTEXT_FACTORY_T_DEFINED
-typedef struct s_xbt_context_factory* xbt_context_factory_t;
-#define _XBT_CONTEXT_FACTORY_T_DEFINED
-#endif /* !_XBT_CONTEXT_FACTORY_T_DEFINED */
-
 /**
  * This function select a context factory associated with the name specified by
  * the parameter name.
diff --git a/src/xbt/xbt_context_private.h b/src/xbt/xbt_context_private.h
index 5e061e4b5a..9f7bf2cde2 100644
--- a/src/xbt/xbt_context_private.h
+++ b/src/xbt/xbt_context_private.h
@@ -3,6 +3,7 @@
 
 #include "xbt/sysdep.h"
 #include "xbt/xbt_context.h"
+#include "xbt/swag.h"
 
 SG_BEGIN_DECL()
 
@@ -41,17 +42,22 @@ typedef struct s_xbt_context
 	XBT_CTX_BASE_T;
 }s_xbt_context_t;
 
-SG_END_DECL()
-	
+/* Important guys */
+extern xbt_context_t current_context;
+extern xbt_context_t maestro_context;
+/* All dudes lists */
+extern xbt_swag_t context_living;
+extern xbt_swag_t context_to_destroy;
+
+
+/* All factories init */
+typedef struct s_xbt_context_factory* xbt_context_factory_t;
 
-#ifdef CONTEXT_THREADS
-#include "xbt_thread_context.h"	/* thread based context declarations 		*/
-#elif !defined(WIN32)
-#include "xbt_ucontext.h"		/* ucontext based context declarations		*/
-#else
-#error ERROR [__FILE__, line __LINE__]: no context based implementation specified.
-#endif
+int xbt_thread_context_factory_init(xbt_context_factory_t* factory);
+int xbt_ucontext_factory_init(xbt_context_factory_t* factory);
+int xbt_jcontext_factory_init(xbt_context_factory_t* factory);
 
-#include "xbt_jcontext.h"		/* java thread based context declarations	*/	
+
+SG_END_DECL()
 
 #endif /* !_XBT_CONTEXT_PRIVATE_H */
diff --git a/src/xbt/xbt_jcontext.c b/src/xbt/xbt_jcontext.c
index b6e92d72af..131c2c3d1f 100644
--- a/src/xbt/xbt_jcontext.c
+++ b/src/xbt/xbt_jcontext.c
@@ -2,18 +2,11 @@
 
 #include "xbt/function_types.h"
 #include "xbt/ex_interface.h"
+#include "xbt/xbt_context_factory.h"
+#include "xbt/xbt_jcontext.h"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(jmsg,"MSG for Java(TM)");
 
-#include "java/jmsg.c"
-#include "java/jmsg_channel.c"
-#include "java/jmsg_host.c"
-#include "java/jmsg_parallel_task.c"
-#include "java/jmsg_task.c"
-#include "java/jxbt_utilities.c"
-#include "java/jmsg_process.c"
-
-
 /* callback: context fetching */
 static ex_ctx_t*
 xbt_jcontext_ex_ctx(void);
diff --git a/src/xbt/xbt_jcontext.h b/src/xbt/xbt_jcontext.h
index f3c1042e0e..a817ec216e 100644
--- a/src/xbt/xbt_jcontext.h
+++ b/src/xbt/xbt_jcontext.h
@@ -1,21 +1,15 @@
 #ifndef _XBT_JCONTEXT_H
 #define _XBT_JCONTEXT_H
 
-#include <jni.h>					/* use java native interface to bind the msg structures to the java instances				*/	
 #include "portable.h"
 #include "xbt/misc.h"
 
-#ifndef _XBT_CONTEXT_PRIVATE_H
-#include "xbt_context_private.h"
-#endif /* _XBT_CONTEXT_PRIVATE_H */
+#include "xbt/xbt_context_private.h"
+#include "java/jmsg.h"
+#include "java/jmsg_process.h"
 
 SG_BEGIN_DECL()
 
-#ifndef _XBT_CONTEXT_FACTORY_T_DEFINED
-typedef struct s_xbt_context_factory* xbt_context_factory_t;
-#define _XBT_CONTEXT_FACTORY_T_DEFINED
-#endif /* !_XBT_CONTEXT_FACTORY_T_DEFINED */
-
 typedef struct s_xbt_jcontext
 {
 	XBT_CTX_BASE_T;
@@ -23,13 +17,6 @@ typedef struct s_xbt_jcontext
 	JNIEnv* jenv;	  				/* jni interface pointer associated to this thread											*/
 }s_xbt_jcontext_t,* xbt_jcontext_t;
 
-int
-xbt_jcontext_factory_init(xbt_context_factory_t* factory);
-
-
 SG_END_DECL()
 
-
-
-
 #endif /* !_XBT_JCONTEXT_H */
diff --git a/src/xbt/xbt_thread_context.c b/src/xbt/xbt_thread_context.c
index fb8307b89e..891a6dd887 100644
--- a/src/xbt/xbt_thread_context.c
+++ b/src/xbt/xbt_thread_context.c
@@ -1,5 +1,7 @@
 
 #include "xbt/function_types.h"
+#include "xbt/xbt_context_factory.h"
+#include "xbt/xbt_thread_context.h"
 
 static xbt_context_t 
 xbt_thread_context_factory_create_context(const char* name, xbt_main_func_t code, void_f_pvoid_t startup_func, void* startup_arg, void_f_pvoid_t cleanup_func, void* cleanup_arg, int argc, char** argv);
diff --git a/src/xbt/xbt_thread_context.h b/src/xbt/xbt_thread_context.h
index fa08f1738f..49ab594a3a 100644
--- a/src/xbt/xbt_thread_context.h
+++ b/src/xbt/xbt_thread_context.h
@@ -5,18 +5,8 @@
 #include "xbt/xbt_os_thread.h"		/* declaration of the xbt native semaphore and native thread								*/
 #include "xbt/swag.h"
 
-
-#ifndef _XBT_CONTEXT_PRIVATE_H
-/*#include "xbt_context_private.h"*/
-#endif /* _XBT_CONTEXT_PRIVATE_H */
-
 SG_BEGIN_DECL()
 
-#ifndef _XBT_CONTEXT_FACTORY_T_DEFINED
-typedef struct s_xbt_context_factory* xbt_context_factory_t;
-#define _XBT_CONTEXT_FACTORY_T_DEFINED
-#endif /* !_XBT_CONTEXT_FACTORY_T_DEFINED */
-
 
 typedef struct s_xbt_thread_context
 {
@@ -26,9 +16,6 @@ typedef struct s_xbt_thread_context
 	xbt_os_sem_t end;				/* this semaphore is used to schedule/unschedule the process								*/
 }s_xbt_thread_context_t,* xbt_thread_context_t;
 
-int
-xbt_thread_context_factory_init(xbt_context_factory_t* factory);
-
 SG_END_DECL()
 
 #endif /* !_XBT_THREAD_CONTEXT_H */
diff --git a/src/xbt/xbt_ucontext.h b/src/xbt/xbt_ucontext.h
index b2ce72fa59..dac3ab0aaf 100644
--- a/src/xbt/xbt_ucontext.h
+++ b/src/xbt/xbt_ucontext.h
@@ -5,11 +5,6 @@
 #include <ucontext.h>			/* context relative declarations															*/				
 #define STACK_SIZE 128*1024		/* lower this if you want to reduce the memory consumption									*/
 
-#ifndef _XBT_CONTEXT_FACTORY_T_DEFINED
-typedef struct s_xbt_context_factory* xbt_context_factory_t;
-#define _XBT_CONTEXT_FACTORY_T_DEFINED
-#endif /* !_XBT_CONTEXT_FACTORY_T_DEFINED */
-
 typedef struct s_xbt_ucontext
 {
 	XBT_CTX_BASE_T;
@@ -19,9 +14,6 @@ typedef struct s_xbt_ucontext
 }s_xbt_ucontext_t,* xbt_ucontext_t;
 
 
-int
-xbt_ucontext_factory_init(xbt_context_factory_t* factory);
-
 SG_END_DECL()
 
 #endif /* !_XBT_UCONTEXT_H */
-- 
2.20.1