diff --git a/openair2/COMMON/messages_def.h b/openair2/COMMON/messages_def.h
index 7df0cdfc10..0257c92ad1 100644
--- a/openair2/COMMON/messages_def.h
+++ b/openair2/COMMON/messages_def.h
@@ -5,4 +5,5 @@
 // Messages files used between tasks
 #include "rrc_messages_def.h"
 #include "s1ap_messages_def.h"
-#include "sctp_messages_def.h"
\ No newline at end of file
+#include "sctp_messages_def.h"
+#include "x2ap_messages_def.h"
\ No newline at end of file
diff --git a/openair2/COMMON/messages_types.h b/openair2/COMMON/messages_types.h
index 0b1f67bb8e..2916ff21a5 100644
--- a/openair2/COMMON/messages_types.h
+++ b/openair2/COMMON/messages_types.h
@@ -13,5 +13,6 @@
 #include "rrc_messages_types.h"
 #include "s1ap_messages_types.h"
 #include "sctp_messages_types.h"
+#include "x2ap_messages_types.h"
 
 #endif /* MESSAGES_TYPES_H_ */
diff --git a/openair2/COMMON/tasks_def.h b/openair2/COMMON/tasks_def.h
index 0240673682..ad84186609 100644
--- a/openair2/COMMON/tasks_def.h
+++ b/openair2/COMMON/tasks_def.h
@@ -34,3 +34,6 @@ TASK_DEF(TASK_S1AP, TASK_PRIORITY_MED, 200)
 
 /// Sctp task for eNodeB (Used by both S1AP and X2AP)
 TASK_DEF(TASK_SCTP, TASK_PRIORITY_MED, 200)
+
+/// X2ap task for eNodeB, acts as both source and target
+TASK_DEF(TASK_X2AP, TASK_PRIORITY_MED, 200)
diff --git a/openair2/COMMON/x2ap_messages_def.h b/openair2/COMMON/x2ap_messages_def.h
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/openair2/COMMON/x2ap_messages_types.h b/openair2/COMMON/x2ap_messages_types.h
new file mode 100644
index 0000000000..e69de29bb2