diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt
index e1396b639845d60107acfd5415393da4d8353ce6..94f17872b7922e11bca731254951b8bc25598244 100644
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -881,7 +881,7 @@ set(UTIL_SRC
   ${OPENAIR2_DIR}/UTIL/OMG/job.c
   ${OPENAIR2_DIR}/UTIL/OMG/mobility_parser.c
   ${OPENAIR2_DIR}/UTIL/OMG/omg.c
-  ${OPENAIR2_DIR}/UTIL/OMG/omg_hashtable.c
+  #${OPENAIR2_DIR}/UTIL/OMG/omg_hashtable.c
   ${OPENAIR2_DIR}/UTIL/OMG/rwalk.c
   ${OPENAIR2_DIR}/UTIL/OMG/rwp.c
   ${OPENAIR2_DIR}/UTIL/OMG/socket_traci_OMG.c
diff --git a/openair1/PHY/defs.h b/openair1/PHY/defs.h
index e8eae39ad66a7e6f480991e8aaf4d1b99d596dfa..aa398f2fdc19b4deefa7192f1a4c57f5b7b22a2a 100755
--- a/openair1/PHY/defs.h
+++ b/openair1/PHY/defs.h
@@ -132,6 +132,8 @@ static inline void* malloc16_clear( size_t size )
 #include "PHY/TOOLS/defs.h"
 #include "platform_types.h"
 
+#ifdef OPENAIR_LTE
+
 #include "PHY/LTE_TRANSPORT/defs.h"
 #include <pthread.h>
 
@@ -846,5 +848,5 @@ typedef struct {
 #include "PHY/LTE_ESTIMATION/defs.h"
 
 #include "SIMULATION/ETH_TRANSPORT/defs.h"
-
+#endif
 #endif //  __PHY_DEFS__H__