diff --git a/srsue/hdr/upper/rrc.h b/srsue/hdr/upper/rrc.h
index cc1a22fd1..a36fdacc0 100644
--- a/srsue/hdr/upper/rrc.h
+++ b/srsue/hdr/upper/rrc.h
@@ -29,6 +29,7 @@
 
 #include "pthread.h"
 
+#include "rrc_common.h"
 #include "srslte/common/buffer_pool.h"
 #include "srslte/common/log.h"
 #include "srslte/common/common.h"
@@ -41,24 +42,6 @@ using srslte::byte_buffer_t;
 
 namespace srsue {
 
-// RRC states (3GPP 36.331 v10.0.0)
-typedef enum{
-    RRC_STATE_IDLE = 0,
-    RRC_STATE_SIB1_SEARCH,
-    RRC_STATE_SIB2_SEARCH,
-    RRC_STATE_WAIT_FOR_CON_SETUP,
-    RRC_STATE_COMPLETING_SETUP,
-    RRC_STATE_RRC_CONNECTED,
-    RRC_STATE_N_ITEMS,
-}rrc_state_t;
-static const char rrc_state_text[RRC_STATE_N_ITEMS][100] = {"IDLE",
-                                                            "SIB1_SEARCH",
-                                                            "SIB2_SEARCH",
-                                                            "WAIT FOR CON SETUP",
-                                                            "COMPLETING SETUP",
-                                                            "RRC CONNECTED"};
-
-
 class rrc
     :public rrc_interface_nas
     ,public rrc_interface_phy
diff --git a/srsue/hdr/upper/rrc_common.h b/srsue/hdr/upper/rrc_common.h
new file mode 100644
index 000000000..692a20cb3
--- /dev/null
+++ b/srsue/hdr/upper/rrc_common.h
@@ -0,0 +1,52 @@
+/**
+ *
+ * \section COPYRIGHT
+ *
+ * Copyright 2013-2015 Software Radio Systems Limited
+ *
+ * \section LICENSE
+ *
+ * This file is part of the srsUE library.
+ *
+ * srsUE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * srsUE is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * A copy of the GNU Affero General Public License can be found in
+ * the LICENSE file in the top-level directory of this distribution
+ * and at http://www.gnu.org/licenses/.
+ *
+ */
+
+#ifndef RRC_COMMON_H
+#define RRC_COMMON_H
+
+namespace srsue {
+
+// RRC states (3GPP 36.331 v10.0.0)
+typedef enum{
+    RRC_STATE_IDLE = 0,
+    RRC_STATE_SIB1_SEARCH,
+    RRC_STATE_SIB2_SEARCH,
+    RRC_STATE_WAIT_FOR_CON_SETUP,
+    RRC_STATE_COMPLETING_SETUP,
+    RRC_STATE_RRC_CONNECTED,
+    RRC_STATE_N_ITEMS,
+}rrc_state_t;
+static const char rrc_state_text[RRC_STATE_N_ITEMS][100] = {"IDLE",
+                                                            "SIB1_SEARCH",
+                                                            "SIB2_SEARCH",
+                                                            "WAIT FOR CON SETUP",
+                                                            "COMPLETING SETUP",
+                                                            "RRC CONNECTED"};
+
+} // namespace srsue
+
+
+#endif // RRC_COMMON_H