diff --git a/include/Makefile.am b/include/Makefile.am
index ec03618069b438c728fd4e81d3787f6f6410fd35..c4ab94e52eab0c85fad1045e9faa8a72dffae268 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -14,6 +14,7 @@ EXTRA_DIST = $(srcdir)/po_hi_common.h \
 	$(srcdir)/po_hi_types.h \
 	$(srcdir)/po_hi_main.h \
 	$(srcdir)/po_hi_simulink.h \
+	$(srcdir)/po_hi_transport_sockets.h \
 	$(srcdir)/po_hi_transport.h
 
 CLEANFILES = *~
diff --git a/include/po_hi_protocols.h b/include/po_hi_protocols.h
index 8306bb831115de773b01b03b5bae48428429b1ea..9b02b7c652e9c51347a03a41475f19f37b791370 100644
--- a/include/po_hi_protocols.h
+++ b/include/po_hi_protocols.h
@@ -17,12 +17,12 @@
 #include <deployment.h>
 #include <request.h>
 
-#define __PO_HI_NOPORT 1
-#define __PO_HI_NOADDR ""
-
 typedef __po_hi_uint16_t __po_hi_inetport_t;
 typedef char*            __po_hi_inetaddr_t;
 
+#define __PO_HI_NOPORT 1
+#define __PO_HI_NOADDR ""
+
 int __po_hi_protocols_send (__po_hi_entity_t from,
 			    __po_hi_entity_t to,
 			    __po_hi_msg_t* msg);
diff --git a/include/po_hi_transport.h b/include/po_hi_transport.h
index a7d6815194c0db8fb49b937cbbd8ee360951108f..d1ea3055ac8c82cf0f224122a026a90c15e74270 100644
--- a/include/po_hi_transport.h
+++ b/include/po_hi_transport.h
@@ -12,6 +12,7 @@
 #define __PO_HI_TRANSPORT__
 
 #include <po_hi_messages.h>
+#include <po_hi_protocols.h>
 #include <deployment.h>
 #include <request.h>
 
@@ -65,4 +66,5 @@ int __po_hi_transport_low_level_send (__po_hi_entity_t from,
  * which is sent.
  */
 
+
 #endif /* __PO_HI_TRANSPORT__ */
diff --git a/share/make/Makefile.common b/share/make/Makefile.common
index dfaa74dc3a11d576072f2930c05b8b0bceebea79..1dba88d872c7add14e6e3f08996766b541f41916 100644
--- a/share/make/Makefile.common
+++ b/share/make/Makefile.common
@@ -31,13 +31,23 @@ CPPFLAGS=$(CFLAGS) $(USER_CPPFLAGS)
 LDFLAGS=$(TARGET_LDFLAGS) $(USER_LDFLAGS)
 
 ifdef TARGET_INCLUDE
-INCLUDE=-I. -I$(USER_SOURCES_DIRS) -I$(RUNTIME_PATH)/include/ $(TARGET_INCLUDE)
+INCLUDE=-I. -I$(RUNTIME_PATH)/include/ $(TARGET_INCLUDE)
 else
 INCLUDE=-I. -I$(RUNTIME_PATH)/include/
 endif
 
+ifdef USER_SOURCES_DIRS
+INCLUDE+=-I$(USER_SOURCES_DIRS) 
+endif
+
 INCLUDE+=$(USER_INCLUDE)
 
+ifndef $(TARGET_NAME)
+TARGET_NAME=$(TARGET)
+endif
+
+INCLUDE+=-DTARGET=$(TARGET_NAME)
+
 ################################################################################
 # Files to be compiled
 
diff --git a/src/po_hi_main.c b/src/po_hi_main.c
index 2f52f6c1b90bfa9f8629e27142344ec4d934fe7f..2d77a27dfd165c2162ab4f8a1c41c441ecfd5897 100644
--- a/src/po_hi_main.c
+++ b/src/po_hi_main.c
@@ -9,19 +9,22 @@
  */
 
 #include <pthread.h>
+/* POSIX files */
 
-/* system-dependent included files */
+#include <deployment.h>
+/* included files from the generated code */
 
 #include <po_hi_config.h>
 #include <po_hi_returns.h>
 #include <po_hi_task.h>
 #include <po_hi_protected.h>
-/* included files from PolyORB-HI-C */
 
-#include <deployment.h>
-/* included files from the generated code */
+#if __PO_HI_NB_NODES > 1
+#include <po_hi_transport.h>
+#include <po_hi_transport_sockets.h>
+#endif
 
-int __po_hi_transport_need_receiver_task();
+/* included files from PolyORB-HI-C */
 void __po_hi_initialize_transport ();
 
 pthread_cond_t cond_init;
@@ -43,7 +46,7 @@ int __po_hi_initialize ()
   nb_tasks_to_init = __PO_HI_NB_TASKS + 1;
 
 #if __PO_HI_NB_NODES > 1
-  if (__po_hi_transport_need_receiver_task())
+  if (__PO_HI_TRANSPORT_SOCKET_NEED_RECEIVER_TASK ())
   {
      nb_tasks_to_init++;
   }
diff --git a/src/po_hi_transport_sockets.c b/src/po_hi_transport_sockets.c
index 1a3b44a403ee52e39cc62cda061799bbe39a9389..cc9aff1fe80ec62d8367b0daac6735ba851e25e5 100644
--- a/src/po_hi_transport_sockets.c
+++ b/src/po_hi_transport_sockets.c
@@ -11,6 +11,7 @@
 #include <po_hi_config.h>
 #include <po_hi_task.h>
 #include <po_hi_transport.h>
+#include <po_hi_transport_sockets.h>
 #include <po_hi_protocols.h>
 #include <po_hi_debug.h>
 #include <po_hi_types.h>
@@ -60,9 +61,6 @@
  * See the files deployment.h and deployment.c.
  */
 
-extern __po_hi_inetport_t node_port[__PO_HI_NB_NODES];
-extern __po_hi_inetaddr_t node_addr[__PO_HI_NB_NODES];
-extern __po_hi_node_t mynode;
 extern __po_hi_node_t entity_table[__PO_HI_NB_ENTITIES];
 
 /*
@@ -473,12 +471,3 @@ void* __po_hi_receiver_task (void)
   return NULL;
 }
 
-int __po_hi_transport_need_receiver_task ()
-{
-   if ((__PO_HI_NB_NODES > 1) && (node_port[mynode] != __PO_HI_NOPORT))
-   {
-      return 1;
-   }
-
-   return 0;
-}