diff --git a/src/lte/model/cqa-ff-mac-scheduler.h b/src/lte/model/cqa-ff-mac-scheduler.h
index e2f854b3e..f3df35765 100644
--- a/src/lte/model/cqa-ff-mac-scheduler.h
+++ b/src/lte/model/cqa-ff-mac-scheduler.h
@@ -45,21 +45,6 @@
 namespace ns3
 {
 
-/// DL HARQ process status vector typedef
-typedef std::vector<uint8_t> DlHarqProcessesStatus_t;
-/// DL HARQ process timer vector typedef
-typedef std::vector<uint8_t> DlHarqProcessesTimer_t;
-/// DL HARQ process DCI buffer vector typedef
-typedef std::vector<DlDciListElement_s> DlHarqProcessesDciBuffer_t;
-/// vector of the LCs and layers per UE
-typedef std::vector<std::vector<RlcPduListElement_s>> RlcPduList_t;
-/// vector of the 8 HARQ processes per UE
-typedef std::vector<RlcPduList_t> DlHarqRlcPduListBuffer_t;
-/// UL HARQ process DCI buffer vector
-typedef std::vector<UlDciListElement_s> UlHarqProcessesDciBuffer_t;
-/// UL HARQ process status vector
-typedef std::vector<uint8_t> UlHarqProcessesStatus_t;
-
 /// CGA Flow Performance structure
 struct CqasFlowPerf_t
 {
diff --git a/src/lte/model/fdbet-ff-mac-scheduler.h b/src/lte/model/fdbet-ff-mac-scheduler.h
index ff6be7df5..fa658498e 100644
--- a/src/lte/model/fdbet-ff-mac-scheduler.h
+++ b/src/lte/model/fdbet-ff-mac-scheduler.h
@@ -42,16 +42,6 @@
 namespace ns3
 {
 
-typedef std::vector<uint8_t> DlHarqProcessesStatus_t;
-typedef std::vector<uint8_t> DlHarqProcessesTimer_t;
-typedef std::vector<DlDciListElement_s> DlHarqProcessesDciBuffer_t;
-typedef std::vector<std::vector<RlcPduListElement_s>>
-    RlcPduList_t;                                           // vector of the LCs and layers per UE
-typedef std::vector<RlcPduList_t> DlHarqRlcPduListBuffer_t; // vector of the 8 HARQ processes per UE
-
-typedef std::vector<UlDciListElement_s> UlHarqProcessesDciBuffer_t;
-typedef std::vector<uint8_t> UlHarqProcessesStatus_t;
-
 /// fdbetsFlowPerf_t structure
 struct fdbetsFlowPerf_t
 {
diff --git a/src/lte/model/fdmt-ff-mac-scheduler.h b/src/lte/model/fdmt-ff-mac-scheduler.h
index 6733b38a0..a16f85390 100644
--- a/src/lte/model/fdmt-ff-mac-scheduler.h
+++ b/src/lte/model/fdmt-ff-mac-scheduler.h
@@ -47,17 +47,6 @@
 namespace ns3
 {
 
-typedef std::vector<uint8_t> DlHarqProcessesStatus_t;
-typedef std::vector<uint8_t> DlHarqProcessesTimer_t;
-typedef std::vector<DlDciListElement_s> DlHarqProcessesDciBuffer_t;
-typedef std::vector<std::vector<RlcPduListElement_s>>
-    RlcPduList_t; ///< vector of the LCs and layers per UE
-typedef std::vector<RlcPduList_t>
-    DlHarqRlcPduListBuffer_t; ///< vector of the 8 HARQ processes per UE
-
-typedef std::vector<UlDciListElement_s> UlHarqProcessesDciBuffer_t;
-typedef std::vector<uint8_t> UlHarqProcessesStatus_t;
-
 /**
  * \ingroup ff-api
  * \brief Implements the SCHED SAP and CSCHED SAP for a Frequency Domain Maximize Throughput
diff --git a/src/lte/model/fdtbfq-ff-mac-scheduler.h b/src/lte/model/fdtbfq-ff-mac-scheduler.h
index 6e5fd2abc..918985716 100644
--- a/src/lte/model/fdtbfq-ff-mac-scheduler.h
+++ b/src/lte/model/fdtbfq-ff-mac-scheduler.h
@@ -46,17 +46,6 @@
 namespace ns3
 {
 
-typedef std::vector<uint8_t> DlHarqProcessesStatus_t;
-typedef std::vector<uint8_t> DlHarqProcessesTimer_t;
-typedef std::vector<DlDciListElement_s> DlHarqProcessesDciBuffer_t;
-typedef std::vector<std::vector<RlcPduListElement_s>>
-    RlcPduList_t; ///< vector of the LCs and layers per UE
-typedef std::vector<RlcPduList_t>
-    DlHarqRlcPduListBuffer_t; ///< vector of the 8 HARQ processes per UE
-
-typedef std::vector<UlDciListElement_s> UlHarqProcessesDciBuffer_t;
-typedef std::vector<uint8_t> UlHarqProcessesStatus_t;
-
 /**
  *  Flow information
  */
diff --git a/src/lte/model/ff-mac-scheduler.h b/src/lte/model/ff-mac-scheduler.h
index 2d9dea43d..661e75985 100644
--- a/src/lte/model/ff-mac-scheduler.h
+++ b/src/lte/model/ff-mac-scheduler.h
@@ -21,6 +21,8 @@
 #ifndef FF_MAC_SCHEDULER_H
 #define FF_MAC_SCHEDULER_H
 
+#include "ff-mac-common.h"
+
 #include <ns3/object.h>
 
 namespace ns3
@@ -38,6 +40,27 @@ class LteFfrSapUser;
  * \defgroup ff-api FF MAC Schedulers
  */
 
+/// DL HARQ process status vector
+using DlHarqProcessesStatus_t = std::vector<uint8_t>;
+
+/// DL HARQ process timer vector
+using DlHarqProcessesTimer_t = std::vector<uint8_t>;
+
+/// DL HARQ process DCI buffer vector
+using DlHarqProcessesDciBuffer_t = std::vector<DlDciListElement_s>;
+
+/// Vector of the LCs and layers per UE
+using RlcPduList_t = std::vector<std::vector<RlcPduListElement_s>>;
+
+/// Vector of the 8 HARQ processes per UE
+using DlHarqRlcPduListBuffer_t = std::vector<RlcPduList_t>;
+
+/// UL HARQ process DCI buffer vector
+using UlHarqProcessesDciBuffer_t = std::vector<UlDciListElement_s>;
+
+/// UL HARQ process status vector
+using UlHarqProcessesStatus_t = std::vector<uint8_t>;
+
 /**
  * \ingroup ff-api
  *
diff --git a/src/lte/model/pf-ff-mac-scheduler.h b/src/lte/model/pf-ff-mac-scheduler.h
index ea9c3df08..962108adb 100644
--- a/src/lte/model/pf-ff-mac-scheduler.h
+++ b/src/lte/model/pf-ff-mac-scheduler.h
@@ -41,16 +41,6 @@
 namespace ns3
 {
 
-typedef std::vector<uint8_t> DlHarqProcessesStatus_t;
-typedef std::vector<uint8_t> DlHarqProcessesTimer_t;
-typedef std::vector<DlDciListElement_s> DlHarqProcessesDciBuffer_t;
-typedef std::vector<std::vector<RlcPduListElement_s>>
-    RlcPduList_t;                                           // vector of the LCs and layers per UE
-typedef std::vector<RlcPduList_t> DlHarqRlcPduListBuffer_t; // vector of the 8 HARQ processes per UE
-
-typedef std::vector<UlDciListElement_s> UlHarqProcessesDciBuffer_t;
-typedef std::vector<uint8_t> UlHarqProcessesStatus_t;
-
 /// pfsFlowPerf_t structure
 struct pfsFlowPerf_t
 {
diff --git a/src/lte/model/pss-ff-mac-scheduler.h b/src/lte/model/pss-ff-mac-scheduler.h
index 087786770..e1aedf15f 100644
--- a/src/lte/model/pss-ff-mac-scheduler.h
+++ b/src/lte/model/pss-ff-mac-scheduler.h
@@ -42,16 +42,6 @@
 namespace ns3
 {
 
-typedef std::vector<uint8_t> DlHarqProcessesStatus_t;
-typedef std::vector<uint8_t> DlHarqProcessesTimer_t;
-typedef std::vector<DlDciListElement_s> DlHarqProcessesDciBuffer_t;
-typedef std::vector<std::vector<RlcPduListElement_s>>
-    RlcPduList_t;                                           // vector of the LCs and layers per UE
-typedef std::vector<RlcPduList_t> DlHarqRlcPduListBuffer_t; // vector of the 8 HARQ processes per UE
-
-typedef std::vector<UlDciListElement_s> UlHarqProcessesDciBuffer_t;
-typedef std::vector<uint8_t> UlHarqProcessesStatus_t;
-
 /**
  *  Flow information
  */
diff --git a/src/lte/model/rr-ff-mac-scheduler.h b/src/lte/model/rr-ff-mac-scheduler.h
index ea529d534..cdf91d285 100644
--- a/src/lte/model/rr-ff-mac-scheduler.h
+++ b/src/lte/model/rr-ff-mac-scheduler.h
@@ -37,16 +37,6 @@
 namespace ns3
 {
 
-typedef std::vector<uint8_t> DlHarqProcessesStatus_t;
-typedef std::vector<uint8_t> DlHarqProcessesTimer_t;
-typedef std::vector<DlDciListElement_s> DlHarqProcessesDciBuffer_t;
-typedef std::vector<std::vector<RlcPduListElement_s>>
-    RlcPduList_t;                                           // vector of the LCs and layers per UE
-typedef std::vector<RlcPduList_t> DlHarqRlcPduListBuffer_t; // vector of the 8 HARQ processes per UE
-
-typedef std::vector<UlDciListElement_s> UlHarqProcessesDciBuffer_t;
-typedef std::vector<uint8_t> UlHarqProcessesStatus_t;
-
 /**
  * \ingroup ff-api
  * \brief Implements the SCHED SAP and CSCHED SAP for a Round Robin scheduler
diff --git a/src/lte/model/tdbet-ff-mac-scheduler.h b/src/lte/model/tdbet-ff-mac-scheduler.h
index 3b6a7fb0e..04cc07f32 100644
--- a/src/lte/model/tdbet-ff-mac-scheduler.h
+++ b/src/lte/model/tdbet-ff-mac-scheduler.h
@@ -42,16 +42,6 @@
 namespace ns3
 {
 
-typedef std::vector<uint8_t> DlHarqProcessesStatus_t;
-typedef std::vector<uint8_t> DlHarqProcessesTimer_t;
-typedef std::vector<DlDciListElement_s> DlHarqProcessesDciBuffer_t;
-typedef std::vector<std::vector<RlcPduListElement_s>>
-    RlcPduList_t;                                           // vector of the LCs and layers per UE
-typedef std::vector<RlcPduList_t> DlHarqRlcPduListBuffer_t; // vector of the 8 HARQ processes per UE
-
-typedef std::vector<UlDciListElement_s> UlHarqProcessesDciBuffer_t;
-typedef std::vector<uint8_t> UlHarqProcessesStatus_t;
-
 /// tdbetsFlowPerf_t structure
 struct tdbetsFlowPerf_t
 {
diff --git a/src/lte/model/tdmt-ff-mac-scheduler.h b/src/lte/model/tdmt-ff-mac-scheduler.h
index 86332194a..6ed658bb8 100644
--- a/src/lte/model/tdmt-ff-mac-scheduler.h
+++ b/src/lte/model/tdmt-ff-mac-scheduler.h
@@ -43,16 +43,6 @@
 namespace ns3
 {
 
-typedef std::vector<uint8_t> DlHarqProcessesStatus_t;
-typedef std::vector<uint8_t> DlHarqProcessesTimer_t;
-typedef std::vector<DlDciListElement_s> DlHarqProcessesDciBuffer_t;
-typedef std::vector<std::vector<RlcPduListElement_s>>
-    RlcPduList_t;                                           // vector of the LCs and layers per UE
-typedef std::vector<RlcPduList_t> DlHarqRlcPduListBuffer_t; // vector of the 8 HARQ processes per UE
-
-typedef std::vector<UlDciListElement_s> UlHarqProcessesDciBuffer_t;
-typedef std::vector<uint8_t> UlHarqProcessesStatus_t;
-
 /**
  * \ingroup ff-api
  * \brief Implements the SCHED SAP and CSCHED SAP for a Time Domain Maximize Throughput scheduler
diff --git a/src/lte/model/tdtbfq-ff-mac-scheduler.h b/src/lte/model/tdtbfq-ff-mac-scheduler.h
index b4dd9e5f3..b11b0039a 100644
--- a/src/lte/model/tdtbfq-ff-mac-scheduler.h
+++ b/src/lte/model/tdtbfq-ff-mac-scheduler.h
@@ -42,16 +42,6 @@
 namespace ns3
 {
 
-typedef std::vector<uint8_t> DlHarqProcessesStatus_t;
-typedef std::vector<uint8_t> DlHarqProcessesTimer_t;
-typedef std::vector<DlDciListElement_s> DlHarqProcessesDciBuffer_t;
-typedef std::vector<std::vector<RlcPduListElement_s>>
-    RlcPduList_t;                                           // vector of the LCs and layers per UE
-typedef std::vector<RlcPduList_t> DlHarqRlcPduListBuffer_t; // vector of the 8 HARQ processes per UE
-
-typedef std::vector<UlDciListElement_s> UlHarqProcessesDciBuffer_t;
-typedef std::vector<uint8_t> UlHarqProcessesStatus_t;
-
 /**
  *  Flow information
  */
diff --git a/src/lte/model/tta-ff-mac-scheduler.h b/src/lte/model/tta-ff-mac-scheduler.h
index e1c111798..fe996e67a 100644
--- a/src/lte/model/tta-ff-mac-scheduler.h
+++ b/src/lte/model/tta-ff-mac-scheduler.h
@@ -43,16 +43,6 @@
 namespace ns3
 {
 
-typedef std::vector<uint8_t> DlHarqProcessesStatus_t;
-typedef std::vector<uint8_t> DlHarqProcessesTimer_t;
-typedef std::vector<DlDciListElement_s> DlHarqProcessesDciBuffer_t;
-typedef std::vector<std::vector<RlcPduListElement_s>>
-    RlcPduList_t;                                           // vector of the LCs and layers per UE
-typedef std::vector<RlcPduList_t> DlHarqRlcPduListBuffer_t; // vector of the 8 HARQ processes per UE
-
-typedef std::vector<UlDciListElement_s> UlHarqProcessesDciBuffer_t;
-typedef std::vector<uint8_t> UlHarqProcessesStatus_t;
-
 /**
  * \ingroup ff-api
  * \brief Implements the SCHED SAP and CSCHED SAP for a Throughput to Average scheduler