merging develop with develop-nr

openair2/UTIL/OMG/defs.h

@@ -36,6 +36,7 @@
 
 //typedef char bool;
 #include <stdbool.h>
+#include "omg_constants.h"
 
 #ifdef STANDALONE
 typedef struct {

openair2/UTIL/OPT/opt.h

@@ -52,7 +52,6 @@ This header file must be included */
 // #include "UTIL/LOG/log_extern.h"
 //#include "PHY/defs.h"
 //#include "PHY/extern.h"
-#include "PHY/impl_defs_lte.h"
 #endif
 
 #define PACKET_MAC_LTE_DEFAULT_UDP_PORT (9999)