diff --git a/openair2/COMMON/messages_def.h b/openair2/COMMON/messages_def.h
index 9c9bc2456c00d406e08595375e78a62e22325745..a3871916fc799855f56d761a3d2ea3b5f5decb6e 100644
--- a/openair2/COMMON/messages_def.h
+++ b/openair2/COMMON/messages_def.h
@@ -3,3 +3,4 @@
 #include "timer_messages_def.h"
 
 // Messages files used between tasks
+#include "rrc_messages_def.h"
diff --git a/openair2/COMMON/messages_types.h b/openair2/COMMON/messages_types.h
index 04f4b1a1aef9c8aa940d0f2941b9757426dbfca5..102915f25383f51e6a8e872a875f9f46a60b5a8f 100644
--- a/openair2/COMMON/messages_types.h
+++ b/openair2/COMMON/messages_types.h
@@ -10,5 +10,6 @@
 
 #include "timer_messages_types.h"
 
+#include "rrc_messages_types.h"
 
 #endif /* MESSAGES_TYPES_H_ */
diff --git a/openair2/COMMON/rrc_messages_def.h b/openair2/COMMON/rrc_messages_def.h
new file mode 100644
index 0000000000000000000000000000000000000000..b48bc3c927a550e8dc1280874d4c7f789cebb2c4
--- /dev/null
+++ b/openair2/COMMON/rrc_messages_def.h
@@ -0,0 +1,21 @@
+/*
+ * rrc_messages_def.h
+ *
+ *  Created on: Oct 24, 2013
+ *      Author: winckel
+ */
+
+MESSAGE_DEF(RRC_UE_EUTRA_CAPABILITY,    MESSAGE_PRIORITY_MED_PLUS, RrcUeEutraCapability,        rrc_ue_eutra_capability)
+
+//-------------------------------------------------------------------------------------------//
+// Messages from MAC layer
+MESSAGE_DEF(RRC_MAC_SYNC_IND,           MESSAGE_PRIORITY_MED_PLUS, RrcMacSyncInd,               rrc_mac_sync_ind)
+MESSAGE_DEF(RRC_MAC_IN_SYNC_IND,        MESSAGE_PRIORITY_MED_PLUS, RrcMacInSyncInd,             rrc_mac_in_sync_ind)
+MESSAGE_DEF(RRC_MAC_OUT_OF_SYNC_IND,    MESSAGE_PRIORITY_MED_PLUS, RrcMacOutOfSyncInd,          rrc_mac_out_of_sync_ind)
+MESSAGE_DEF(RRC_MAC_BCCH_DATA_IND,      MESSAGE_PRIORITY_MED_PLUS, RrcMacBcchDataInd,           rrc_mac_bcch_data_ind)
+MESSAGE_DEF(RRC_MAC_CCCH_DATA_IND,      MESSAGE_PRIORITY_MED_PLUS, RrcMacCcchDataInd,           rrc_mac_ccch_data_ind)
+MESSAGE_DEF(RRC_MAC_MCCH_DATA_IND,      MESSAGE_PRIORITY_MED_PLUS, RrcMacMcchDataInd,           rrc_mac_mcch_data_ind)
+
+//-------------------------------------------------------------------------------------------//
+// Messages from PDCP layer
+MESSAGE_DEF(RRC_DCCH_DATA_IND,          MESSAGE_PRIORITY_MED_PLUS, RrcDcchDataInd,              rrc_dcch_data_ind)
diff --git a/openair2/COMMON/rrc_messages_types.h b/openair2/COMMON/rrc_messages_types.h
new file mode 100644
index 0000000000000000000000000000000000000000..528d97f37fcf26f0c291277731c0e459389fd8c6
--- /dev/null
+++ b/openair2/COMMON/rrc_messages_types.h
@@ -0,0 +1,69 @@
+/*
+ * rrc_messages_types.h
+ *
+ *  Created on: Oct 24, 2013
+ *      Author: winckel
+ */
+
+#ifndef RRC_MESSAGES_TYPES_H_
+#define RRC_MESSAGES_TYPES_H_
+
+#include "UE-EUTRA-Capability.h"
+
+//-------------------------------------------------------------------------------------------//
+// Defines to access message fields.
+
+#define RRC_MAC_SYNC_IND(mSGpTR)        (mSGpTR)->msg.rrc_mac_sync_ind
+#define RRC_MAC_IN_SYNC_IND(mSGpTR)     (mSGpTR)->msg.rrc_mac_in_sync_ind
+#define RRC_MAC_OUT_OF_SYNC_IND(mSGpTR) (mSGpTR)->msg.rrc_mac_out_of_sync_ind
+#define RRC_MAC_BCCH_DATA_IND(mSGpTR)   (mSGpTR)->msg.rrc_mac_bcch_data_ind
+#define RRC_MAC_CCCH_DATA_IND(mSGpTR)   (mSGpTR)->msg.rrc_mac_ccch_data_ind
+#define RRC_MAC_MCCH_DATA_IND(mSGpTR)   (mSGpTR)->msg.rrc_mac_mcch_data_ind
+
+#define RRC_DCCH_DATA_IND(mSGpTR)       (mSGpTR)->msg.rrc_dcch_data_ind
+
+typedef UE_EUTRA_Capability_t RrcUeEutraCapability;
+
+//-------------------------------------------------------------------------------------------//
+// Messages from MAC layer
+
+typedef struct {
+  uint8_t status;
+} RrcMacSyncInd;
+
+typedef struct {
+  uint32_t frame;
+  uint16_t enb_index;
+} RrcMacInSyncInd;
+
+typedef RrcMacInSyncInd RrcMacOutOfSyncInd;
+
+typedef struct {
+  uint32_t frame;
+  uint32_t sdu_size;
+  uint8_t *sdu_p;
+  uint8_t enb_index;
+} RrcMacBcchDataInd;
+
+typedef RrcMacBcchDataInd RrcMacCcchDataInd;
+
+typedef struct {
+  uint32_t frame;
+  uint32_t sdu_size;
+  uint8_t *sdu_p;
+  uint8_t ue_index;
+  uint8_t mbsfn_sync_area;
+} RrcMacMcchDataInd;
+
+//-------------------------------------------------------------------------------------------//
+// Messages from PDCP layer
+
+typedef struct {
+  uint32_t frame;
+  uint8_t dcch_index;
+  uint32_t sdu_size;
+  uint8_t *sdu_p;
+  uint8_t ue_index;
+} RrcDcchDataInd;
+
+#endif /* RRC_MESSAGES_TYPES_H_ */