diff --git a/openair2/RRC/LTE/rrc_eNB.c b/openair2/RRC/LTE/rrc_eNB.c
index e3e60184455826112a72816f8ef6500c3435c373..aa4a27644c43f197fcd56e2619ec9e4a95ff3189 100644
--- a/openair2/RRC/LTE/rrc_eNB.c
+++ b/openair2/RRC/LTE/rrc_eNB.c
@@ -35,6 +35,7 @@
 #include "assertions.h"
 #include "common/ran_context.h"
 #include "asn1_conversions.h"
+#include "asn_internal.h"
 #include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h"
 #include "LAYER2/RLC/rlc.h"
 #include "LAYER2/MAC/mac_proto.h"
diff --git a/targets/RT/USER/lte-softmodem.h b/targets/RT/USER/lte-softmodem.h
index a109b1cee8ccf5fa2d5b8e0e087e14ebd1cfb7fa..3888c46e847df711e74f7e48f7ff56e55bfe0543 100644
--- a/targets/RT/USER/lte-softmodem.h
+++ b/targets/RT/USER/lte-softmodem.h
@@ -24,7 +24,7 @@
 #include <sys/sysinfo.h>
 #include "rt_wrapper.h"
 #include "../../ARCH/COMMON/common_lib.h"
-#undef MALLOC
+//#undef MALLOC
 #include "assertions.h"
 #include "msc.h"
 #include "PHY/types.h"
diff --git a/targets/RT/USER/rfsim.h b/targets/RT/USER/rfsim.h
index 47c542ce8192aa809478baaf473148712320af6d..c5361724c92b77d37f866973c6d0c7feeeb7ea60 100644
--- a/targets/RT/USER/rfsim.h
+++ b/targets/RT/USER/rfsim.h
@@ -18,8 +18,8 @@
  * For more information about the OpenAirInterface (OAI) Software Alliance:
  *      contact@openairinterface.org
  */
-#ifndef __SIM__H__
-#define __SIM__H__
+#ifndef __RFSIM__H__
+#define __RFSIM__H__
 #include "lte-softmodem.h"
 #include "openair1/SIMULATION/TOOLS/sim.h"
 #include "platform_constants.h"