diff --git a/openair2/COMMON/messages_def.h b/openair2/COMMON/messages_def.h
new file mode 100644
index 0000000000..9c9bc2456c
--- /dev/null
+++ b/openair2/COMMON/messages_def.h
@@ -0,0 +1,5 @@
+// These messages files are mandatory and must always be placed in first position
+#include "intertask_messages_def.h"
+#include "timer_messages_def.h"
+
+// Messages files used between tasks
diff --git a/openair2/COMMON/messages_types.h b/openair2/COMMON/messages_types.h
new file mode 100644
index 0000000000..04f4b1a1ae
--- /dev/null
+++ b/openair2/COMMON/messages_types.h
@@ -0,0 +1,14 @@
+/*
+ * messages_types.h
+ *
+ *  Created on: Oct 14, 2013
+ *      Author: winckel
+ */
+
+#ifndef MESSAGES_TYPES_H_
+#define MESSAGES_TYPES_H_
+
+#include "timer_messages_types.h"
+
+
+#endif /* MESSAGES_TYPES_H_ */
diff --git a/openair2/COMMON/tasks_def.h b/openair2/COMMON/tasks_def.h
new file mode 100644
index 0000000000..b3823923ba
--- /dev/null
+++ b/openair2/COMMON/tasks_def.h
@@ -0,0 +1,26 @@
+// This task is mandatory and must always be placed in first position
+TASK_DEF(TASK_TIMER, TASK_PRIORITY_MAX)
+
+// Other possible tasks in the process
+
+/// Layer 2 and Layer 1 task supporting all the synchronous processing
+TASK_DEF(TASK_L2L1, TASK_PRIORITY_MAX_LEAST)
+//// Layer 2 and Layer 1 sub-tasks
+SUB_TASK_DEF(TASK_L2L1, TASK_PDCP)
+SUB_TASK_DEF(TASK_L2L1, TASK_RLC)
+SUB_TASK_DEF(TASK_L2L1, TASK_MAC)
+SUB_TASK_DEF(TASK_L2L1, TASK_PHY)
+
+/// Radio Resource Control task for UE
+TASK_DEF(TASK_RRC_UE, TASK_PRIORITY_MED)
+/// Radio Resource Control task for eNodeB
+TASK_DEF(TASK_RRC_ENB, TASK_PRIORITY_MED)
+
+/// Bearers Manager task
+TASK_DEF(TASK_BM, TASK_PRIORITY_MED)
+
+/// Non Access Stratum task for UE
+TASK_DEF(TASK_NAS_UE, TASK_PRIORITY_MED)
+
+/// S1ap task for eNodeB
+TASK_DEF(TASK_S1AP, TASK_PRIORITY_MED)