diff --git a/targets/Makefile.common b/targets/Makefile.common
index f3b5956844da28d637d68f848483e722df7bc080..7e9833252fff26ded27a90a9736deab9ade70ab2 100644
--- a/targets/Makefile.common
+++ b/targets/Makefile.common
@@ -13,7 +13,12 @@ export UE_NAS_DIR
 export S1AP_DIR
 export SCTP_DIR
 
-COMMON_CFLAGS		= -D'FIRMWARE_VERSION="$(SVN_REV) - $(DATE_REV)"'
+#Export common cflags (between softmodem and oaisim)
+COMMON_CFLAGS		= \
+    -D'FIRMWARE_VERSION="$(SVN_REV) - $(DATE_REV)"' \
+    -Wall                       \
+    -fno-strict-aliasing        \
+    -O2
 
 ITTI_MESSAGES_H		= messages_xml.h
 ITTI_MESSAGES_XML	= messages.xml
@@ -78,7 +83,7 @@ endif
 ifdef ENABLE_ITTI
 SHARED_DEPENDENCIES += $(ITTI_MESSAGES_H)
 
-CFLAGS = $(COMMON_CFLAGS) $(COMMON_MME_CFLAGS) $(TARGETS_COMMON_incl)
+CFLAGS += $(COMMON_CFLAGS) $(COMMON_MME_CFLAGS) $(TARGETS_COMMON_incl)
 
 OBJ += $(TARGETS_COMMON_OBJS)
 endif
diff --git a/targets/Makerules b/targets/Makerules
index 32a0cff832a690edbc55abe8a9d013d032b07d2f..ccbe13ba753537c786977b5498081295ae8c864d 100644
--- a/targets/Makerules
+++ b/targets/Makerules
@@ -55,11 +55,3 @@ LIBS =  \
     $(LIBBLAS_LIBS)     \
     $(LIBXML2_LIBS)     \
     $(XPM_LIBS)
-
-#Export common cflags (between softmodem and oaisim)
-COMMON_CFLAGS =                 \
-    -Wall                       \
-    -fno-strict-aliasing        \
-    -g                          \
-    -ggdb                       \
-    -O2
diff --git a/targets/SIMU/USER/Makefile b/targets/SIMU/USER/Makefile
index c370518b8a600335e714c60e2b677c7debe40ae7..e88ceda9b24ac7e8c02b34f2ce4c5ef67f5a82c3 100644
--- a/targets/SIMU/USER/Makefile
+++ b/targets/SIMU/USER/Makefile
@@ -17,7 +17,8 @@ CPUFLAGS += $(shell if grep --silent ssse3 /proc/cpuinfo ; then echo "-mssse3" ;
 CPUFLAGS += $(shell if grep --silent -w sse4 /proc/cpuinfo ; then echo "-msse4" ; else echo ""; fi)
 linux = $(shell if [ `uname` = "Linux" ] ; then echo "1" ; else echo "0" ; fi)
 
-CFLAGS += $(COMMON_CFLAGS) -DUSER_MODE -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 $(CPUFLAGS) -I/usr/include/X11 #-Wno-packed-bitfield-compat
+CFLAGS += -g -ggdb
+CFLAGS += -DUSER_MODE -DNB_ANTENNAS_RX=2 -DNB_ANTENNAS_TXRX=2 -DNB_ANTENNAS_TX=2 $(CPUFLAGS) -I/usr/include/X11 #-Wno-packed-bitfield-compat
 
 # Check if GCC version is greater or equal to 4.4
 GCCVERSIONGTEQ44 := $(shell expr `gcc -dumpversion | cut -f1,2 -d. --output-delimiter=""` \>= 44)