diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b7ebea9..2e798f63 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,10 +72,10 @@ ENDIF(SEMS_USE_LIBSAMPLERATE)
 
 # ZRTP support? (see zfoneproject.com)
 IF(SEMS_USE_ZRTP)
+	# TODO
 	SET(ZRTP_FOUND TRUE)
 	MESSAGE(STATUS "Using libzrtp: YES")
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWITH_ZRTP -DBUILD_ZRTP_MUTEXES -DBUILD_DEFAULT_CACHE -DBUILD_DEFAULT_TIMER -DUNIX -DBUILD_ZRTP_MUTEXES")
-	SET(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -DWITH_ZRTP -DBUILD_ZRTP_MUTEXES -DBUILD_DEFAULT_CACHE -DBUILD_DEFAULT_TIMER -DUNIX -DBUILD_ZRTP_MUTEXES")
+	ADD_DEFINITIONS(-DWITH_ZRTP -DBUILD_ZRTP_MUTEXES -DBUILD_DEFAULT_CACHE -DBUILD_DEFAULT_TIMER -DUNIX -DBUILD_ZRTP_MUTEXES)
 ELSE(SEMS_USE_ZRTP)
 	SET(ZRTP_FOUND FALSE)
 	MESSAGE(STATUS "Using libzrtp: NO (default)")
@@ -102,8 +102,7 @@ ENDIF(SEMS_USE_LAME)
 # build in support for monitoring?
 IF(SEMS_USE_MONITORING)
 	MESSAGE(STATUS "Enable monitoring: YES")
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_MONITORING")
-	SET(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -DUSE_MONITORING")
+	ADD_DEFINITIONS(-DUSE_MONITORING)
 ELSE(SEMS_USE_MONITORING)
 	MESSAGE(STATUS "Enable monitoring: NO (default)")
 ENDIF(SEMS_USE_MONITORING)
diff --git a/apps/auth_b2b/CMakeLists.txt b/apps/auth_b2b/CMakeLists.txt
index 029731e3..0dd916e8 100644
--- a/apps/auth_b2b/CMakeLists.txt
+++ b/apps/auth_b2b/CMakeLists.txt
@@ -2,13 +2,7 @@ set (auth_b2b_SRCS
 AuthB2B.cpp
 )
 
-IF(CMAKE_COMPILER_IS_GNUCC)
-	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMOD_NAME=\"auth_b2b\"")
-ENDIF(CMAKE_COMPILER_IS_GNUCC)
-
-IF(CMAKE_COMPILER_IS_GNUCXX)
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMOD_NAME='\"auth_b2b\"'")
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+ADD_DEFINITIONS(-DMOD_NAME="auth_b2b")
 
 ADD_LIBRARY(auth_b2b SHARED ${auth_b2b_SRCS})
 SET_TARGET_PROPERTIES(auth_b2b PROPERTIES OUTPUT_NAME "auth_b2b")
diff --git a/apps/call_timer/CMakeLists.txt b/apps/call_timer/CMakeLists.txt
index fe393aa1..d8127b13 100644
--- a/apps/call_timer/CMakeLists.txt
+++ b/apps/call_timer/CMakeLists.txt
@@ -2,13 +2,7 @@ set (call_timer_SRCS
 CallTimer.cpp
 )
 
-IF(CMAKE_COMPILER_IS_GNUCC)
-	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMOD_NAME=\"call_timer\"")
-ENDIF(CMAKE_COMPILER_IS_GNUCC)
-
-IF(CMAKE_COMPILER_IS_GNUCXX)
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMOD_NAME='\"call_timer\"'")
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+ADD_DEFINITIONS(-DMOD_NAME="call_timer")
 
 ADD_LIBRARY(call_timer SHARED ${call_timer_SRCS})
 SET_TARGET_PROPERTIES(call_timer PROPERTIES OUTPUT_NAME "call_timer")
diff --git a/apps/callback/CMakeLists.txt b/apps/callback/CMakeLists.txt
index 8b2c42cb..7b4df621 100644
--- a/apps/callback/CMakeLists.txt
+++ b/apps/callback/CMakeLists.txt
@@ -2,13 +2,7 @@ set (callback_SRCS
 CallBack.cpp
 )
 
-IF(CMAKE_COMPILER_IS_GNUCC)
-	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMOD_NAME=\"callback\"")
-ENDIF(CMAKE_COMPILER_IS_GNUCC)
-
-IF(CMAKE_COMPILER_IS_GNUCXX)
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMOD_NAME='\"callback\"'")
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+ADD_DEFINITIONS(-DMOD_NAME="callback")
 
 ADD_LIBRARY(callback SHARED ${callback_SRCS})
 SET_TARGET_PROPERTIES(callback PROPERTIES OUTPUT_NAME "callback")
diff --git a/apps/conference/CMakeLists.txt b/apps/conference/CMakeLists.txt
index 1f14ea03..adcefa42 100644
--- a/apps/conference/CMakeLists.txt
+++ b/apps/conference/CMakeLists.txt
@@ -8,22 +8,24 @@ TARGET_LINK_LIBRARIES(conference ${CMAKE_DL_LIBS} pthread m)
 
 IF(FLITE_FOUND AND ZRTP_FOUND)
 	IF(CMAKE_COMPILER_IS_GNUCC)
-		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWITH_SAS_TTS -I${FLITE_INCLUDE_DIR}/flite")
+		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${FLITE_INCLUDE_DIR}/flite")
 	ENDIF(CMAKE_COMPILER_IS_GNUCC)
 
 	IF(CMAKE_COMPILER_IS_GNUCXX)
-		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWITH_SAS_TTS -I${FLITE_INCLUDE_DIR}/flite")
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${FLITE_INCLUDE_DIR}/flite")
 	ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+	ADD_DEFINITIONS(-DWITH_SAS_TTS)
 	TARGET_LINK_LIBRARIES(conference ${CMAKE_DL_LIBS} flite_cmu_us_kal flite_usenglish flite_cmulex flite)
 ENDIF(FLITE_FOUND AND ZRTP_FOUND)
 
 IF(MYSQLPP_FOUND)
 	IF(CMAKE_COMPILER_IS_GNUCC)
-		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_MYSQL -I${MYSQLPP_INCLUDE_DIR}/mysql++ -I/usr/include/mysql")
+		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${MYSQLPP_INCLUDE_DIR}/mysql++ -I/usr/include/mysql")
 	ENDIF(CMAKE_COMPILER_IS_GNUCC)
 
 	IF(CMAKE_COMPILER_IS_GNUCXX)
-		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_MYSQL -I${MYSQLPP_INCLUDE_DIR}/mysql++ -I/usr/include/mysql")
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${MYSQLPP_INCLUDE_DIR}/mysql++ -I/usr/include/mysql")
 	ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+	ADD_DEFINITIONS(-DUSE_MYSQL)
 	TARGET_LINK_LIBRARIES(conference ${CMAKE_DL_LIBS} mysqlpp)
 ENDIF(MYSQLPP_FOUND)
diff --git a/apps/diameter_client/CMakeLists.txt b/apps/diameter_client/CMakeLists.txt
index c857915d..3e20afd4 100644
--- a/apps/diameter_client/CMakeLists.txt
+++ b/apps/diameter_client/CMakeLists.txt
@@ -13,12 +13,6 @@ SET_TARGET_PROPERTIES(diameter_client PROPERTIES OUTPUT_NAME "diameter_client")
 TARGET_LINK_LIBRARIES(diameter_client ${CMAKE_DL_LIBS} pthread m libdbase)
 
 IF(OPENSSL_FOUND)
-	IF(CMAKE_COMPILER_IS_GNUCC)
-		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWITH_OPENSSL")
-	ENDIF(CMAKE_COMPILER_IS_GNUCC)
-
-	IF(CMAKE_COMPILER_IS_GNUCXX)
-		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWITH_OPENSSL")
-	ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+	ADD_DEFINITIONS(-DWITH_OPENSSL)
 	TARGET_LINK_LIBRARIES(diameter_client ${CMAKE_DL_LIBS} ssl crypto)
 ENDIF(OPENSSL_FOUND)
diff --git a/apps/diameter_client/lib_dbase/CMakeLists.txt b/apps/diameter_client/lib_dbase/CMakeLists.txt
index 1affd1da..be4ace2a 100644
--- a/apps/diameter_client/lib_dbase/CMakeLists.txt
+++ b/apps/diameter_client/lib_dbase/CMakeLists.txt
@@ -7,13 +7,7 @@ tcp_comm.c
 SET(CMAKE_VERBOSE_MAKEFILE ON)
 
 IF(OPENSSL_FOUND)
-IF(CMAKE_COMPILER_IS_GNUCC)
-	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWITH_OPENSSL")
-ENDIF(CMAKE_COMPILER_IS_GNUCC)
-
-IF(CMAKE_COMPILER_IS_GNUCXX)
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWITH_OPENSSL")
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+	ADD_DEFINITIONS(-DWITH_OPENSSL)
 ENDIF(OPENSSL_FOUND)
 
 add_library(libdbase STATIC ${libdbase_SRCS})
diff --git a/apps/early_announce/CMakeLists.txt b/apps/early_announce/CMakeLists.txt
index 1beae792..ede2bce1 100644
--- a/apps/early_announce/CMakeLists.txt
+++ b/apps/early_announce/CMakeLists.txt
@@ -8,11 +8,12 @@ TARGET_LINK_LIBRARIES(early_announce ${CMAKE_DL_LIBS} pthread m)
 
 IF(MYSQLPP_FOUND)
 	IF(CMAKE_COMPILER_IS_GNUCC)
-		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_MYSQL -I/usr/include/mysql++ -I/usr/include/mysql")
+		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I/usr/include/mysql++ -I/usr/include/mysql")
 	ENDIF(CMAKE_COMPILER_IS_GNUCC)
 
 	IF(CMAKE_COMPILER_IS_GNUCXX)
-		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_MYSQL -I/usr/include/mysql++ -I/usr/include/mysql")
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/usr/include/mysql++ -I/usr/include/mysql")
 	ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+	ADD_DEFINITIONS(-DUSE_MYSQL)
 	TARGET_LINK_LIBRARIES(early_announce ${CMAKE_DL_LIBS} mysqlpp)
 ENDIF(MYSQLPP_FOUND)
diff --git a/apps/gateway/CMakeLists.txt b/apps/gateway/CMakeLists.txt
index 6bb02ed5..19ed108d 100644
--- a/apps/gateway/CMakeLists.txt
+++ b/apps/gateway/CMakeLists.txt
@@ -6,13 +6,7 @@ mISDNNames.cpp
 mISDNStack.cpp
 )
 
-IF(CMAKE_COMPILER_IS_GNUCC)
-	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DGW_VERSION='\"0.1\"'")
-ENDIF(CMAKE_COMPILER_IS_GNUCC)
-
-IF(CMAKE_COMPILER_IS_GNUCXX)
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGW_VERSION='\"0.1\"'")
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+ADD_DEFINITIONS(-DGW_VERSION="0.1")
 
 ADD_LIBRARY(gateway SHARED ${gateway_SRCS})
 SET_TARGET_PROPERTIES(gateway PROPERTIES OUTPUT_NAME "gateway")
diff --git a/apps/ivr/CMakeLists.txt b/apps/ivr/CMakeLists.txt
index 4fa6af1e..078a36f3 100644
--- a/apps/ivr/CMakeLists.txt
+++ b/apps/ivr/CMakeLists.txt
@@ -23,12 +23,13 @@ TARGET_LINK_LIBRARIES(ivr ${CMAKE_DL_LIBS} pthread m)
 
 IF(FLITE_FOUND)
 	IF(CMAKE_COMPILER_IS_GNUCC)
-		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DIVR_WITH_TTS -I${FLITE_INCLUDE_DIR}/flite")
+		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${FLITE_INCLUDE_DIR}/flite")
 	ENDIF(CMAKE_COMPILER_IS_GNUCC)
 
 	IF(CMAKE_COMPILER_IS_GNUCXX)
-		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DIVR_WITH_TTS -I${FLITE_INCLUDE_DIR}/flite")
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${FLITE_INCLUDE_DIR}/flite")
 	ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+	ADD_DEFINITIONS(-DIVR_WITH_TTS)
 	TARGET_LINK_LIBRARIES(ivr ${CMAKE_DL_LIBS} flite_cmu_us_kal flite_usenglish flite_cmulex flite)
 ENDIF(FLITE_FOUND)
 
diff --git a/apps/monitoring/CMakeLists.txt b/apps/monitoring/CMakeLists.txt
index c354db56..529fef58 100644
--- a/apps/monitoring/CMakeLists.txt
+++ b/apps/monitoring/CMakeLists.txt
@@ -2,13 +2,7 @@ set (monitoring_SRCS
 Monitoring.cpp
 )
 
-IF(CMAKE_COMPILER_IS_GNUCC)
-	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMOD_NAME=\"monitoring\"")
-ENDIF(CMAKE_COMPILER_IS_GNUCC)
-
-IF(CMAKE_COMPILER_IS_GNUCXX)
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMOD_NAME='\"monitoring\"'")
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+ADD_DEFINITIONS(-DMOD_NAME="monitoring")
 
 ADD_LIBRARY(monitoring SHARED ${monitoring_SRCS})
 SET_TARGET_PROPERTIES(monitoring PROPERTIES OUTPUT_NAME "monitoring")
diff --git a/apps/msg_storage/CMakeLists.txt b/apps/msg_storage/CMakeLists.txt
index b063ce43..47fd08e1 100644
--- a/apps/msg_storage/CMakeLists.txt
+++ b/apps/msg_storage/CMakeLists.txt
@@ -6,13 +6,7 @@ MsgStorage.cpp
 #spooldir: 
 #	mkdir -p $(DESTDIR)/var/spool/voicebox
 
-IF(CMAKE_COMPILER_IS_GNUCC)
-	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMOD_NAME=\"msg_storage\"")
-ENDIF(CMAKE_COMPILER_IS_GNUCC)
-
-IF(CMAKE_COMPILER_IS_GNUCXX)
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMOD_NAME='\"msg_storage\"'")
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+ADD_DEFINITIONS(-DMOD_NAME="msg_storage")
 
 ADD_LIBRARY(msg_storage SHARED ${msg_storage_SRCS})
 SET_TARGET_PROPERTIES(msg_storage PROPERTIES OUTPUT_NAME "msg_storage")
diff --git a/apps/precoded_announce/CMakeLists.txt b/apps/precoded_announce/CMakeLists.txt
index 15eb2a06..32bc678a 100644
--- a/apps/precoded_announce/CMakeLists.txt
+++ b/apps/precoded_announce/CMakeLists.txt
@@ -2,13 +2,7 @@ set (precoded_announce_SRCS
 PrecodedAnnounce.cpp
 )
 
-IF(CMAKE_COMPILER_IS_GNUCC)
-	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMOD_NAME=\"precoded_announce\"")
-ENDIF(CMAKE_COMPILER_IS_GNUCC)
-
-IF(CMAKE_COMPILER_IS_GNUCXX)
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMOD_NAME='\"precoded_announce\"'")
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+ADD_DEFINITIONS(-DMOD_NAME="precoded_announce")
 
 ADD_LIBRARY(precoded_announce SHARED ${precoded_announce_SRCS})
 SET_TARGET_PROPERTIES(precoded_announce PROPERTIES OUTPUT_NAME "precoded_announce")
diff --git a/apps/xmlrpc2di/CMakeLists.txt b/apps/xmlrpc2di/CMakeLists.txt
index 0f9a7629..6da64da9 100644
--- a/apps/xmlrpc2di/CMakeLists.txt
+++ b/apps/xmlrpc2di/CMakeLists.txt
@@ -15,12 +15,6 @@ SET_TARGET_PROPERTIES(xmlrpc2di PROPERTIES OUTPUT_NAME "xmlrpc2di")
 TARGET_LINK_LIBRARIES(xmlrpc2di ${CMAKE_DL_LIBS} pthread m xmlrpcpp)
 
 IF(OPENSSL_FOUND)
-	IF(CMAKE_COMPILER_IS_GNUCC)
-		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_XMLRPCPP_SSL -DXMLRPCPP_SUPPORT_STRUCT_ACCESS")
-	ENDIF(CMAKE_COMPILER_IS_GNUCC)
-
-	IF(CMAKE_COMPILER_IS_GNUCXX)
-		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_XMLRPCPP_SSL -DXMLRPCPP_SUPPORT_STRUCT_ACCESS")
-	ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+	ADD_DEFINITIONS(-DHAVE_XMLRPCPP_SSL -DXMLRPCPP_SUPPORT_STRUCT_ACCESS)
 	TARGET_LINK_LIBRARIES(xmlrpc2di ${CMAKE_DL_LIBS} ssl)
 ENDIF(OPENSSL_FOUND)
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 6d599bba..3c63cbc3 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 SET (sems_SRCS
  AmAdvancedAudio.cpp
  AmApi.cpp
@@ -59,39 +58,20 @@ IF(NOT MAX_RTP_SESSIONS)
 	SET(MAX_RTP_SESSIONS 2048)
 ENDIF(NOT MAX_RTP_SESSIONS)
 
-IF(CMAKE_COMPILER_IS_GNUCC)
-	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMAX_RTP_SESSIONS=${MAX_RTP_SESSIONS}")
-ENDIF(CMAKE_COMPILER_IS_GNUCC)
-
-IF(CMAKE_COMPILER_IS_GNUCXX)
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMAX_RTP_SESSIONS=${MAX_RTP_SESSIONS}")
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+ADD_DEFINITIONS(-DMAX_RTP_SESSIONS=${MAX_RTP_SESSIONS})
 
 IF(SPANDSP_FOUND)
-	IF(CMAKE_COMPILER_IS_GNUCC)
-		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_SPANDSP -D__STDC_LIMIT_MACROS")
-	ENDIF(CMAKE_COMPILER_IS_GNUCC)
-
-	IF(CMAKE_COMPILER_IS_GNUCXX)
-		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_SPANDSP -D__STDC_LIMIT_MACROS")
-	ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+	ADD_DEFINITIONS(-DUSE_SPANDSP -D__STDC_LIMIT_MACROS)
 	TARGET_LINK_LIBRARIES(sems ${CMAKE_DL_LIBS} spandsp)
 ENDIF(SPANDSP_FOUND)
 
 IF(LIBSAMPLERATE_FOUND)
-	IF(CMAKE_COMPILER_IS_GNUCC)
-		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_LIBSAMPLERATE")
-	ENDIF(CMAKE_COMPILER_IS_GNUCC)
-
-	IF(CMAKE_COMPILER_IS_GNUCXX)
-		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_LIBSAMPLERATE")
-	ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+	ADD_DEFINITIONS(-DUSE_LIBSAMPLERATE)
 	TARGET_LINK_LIBRARIES(sems ${CMAKE_DL_LIBS} samplerate)
 ENDIF(LIBSAMPLERATE_FOUND)
 
 IF(SEMS_USE_IPV6)
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSUPPORT_IPV6")
-	SET(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -DSUPPORT_IPV6")
+	ADD_DEFINITIONS(-DSUPPORT_IPV6)
 ENDIF(SEMS_USE_IPV6)
 
 ADD_SUBDIRECTORY(plug-in)
diff --git a/core/plug-in/binrpcctrl/libbinrpc/src/CMakeLists.txt b/core/plug-in/binrpcctrl/libbinrpc/src/CMakeLists.txt
index a19b7be5..f7f430bb 100644
--- a/core/plug-in/binrpcctrl/libbinrpc/src/CMakeLists.txt
+++ b/core/plug-in/binrpcctrl/libbinrpc/src/CMakeLists.txt
@@ -32,13 +32,7 @@ SET(CMAKE_VERBOSE_MAKEFILE ON)
 # USE_DEFAULT_SYSLOG	:	use syslog as default logger, instead of black
 # 							hole
 #
-IF(CMAKE_COMPILER_IS_GNUCC)
-	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DBINRPC_LIB_VER=\"1.0-1\" -D_LIBBINRPC_BUILD -DNDEBUG")
-ENDIF(CMAKE_COMPILER_IS_GNUCC)
-
-IF(CMAKE_COMPILER_IS_GNUCXX)
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBINRPC_LIB_VER=\"1.0-1\" -D_LIBBINRPC_BUILD -DNDEBUG")
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+ADD_DEFINITIONS(-DBINRPC_LIB_VER="1.0-1" -D_LIBBINRPC_BUILD -DNDEBUG)
 
 ADD_LIBRARY(libbinrpc STATIC ${libbinrpc_SRCS})
 SET_TARGET_PROPERTIES(libbinrpc PROPERTIES OUTPUT_NAME "libbinrpc")
diff --git a/core/plug-in/sipctrl/CMakeLists.txt b/core/plug-in/sipctrl/CMakeLists.txt
index ef7a91d6..a901d08d 100644
--- a/core/plug-in/sipctrl/CMakeLists.txt
+++ b/core/plug-in/sipctrl/CMakeLists.txt
@@ -25,7 +25,6 @@ SET_TARGET_PROPERTIES(sipctrl PROPERTIES OUTPUT_NAME "sipctrl")
 TARGET_LINK_LIBRARIES(sipctrl ${CMAKE_DL_LIBS} pthread m)
 
 IF(SEMS_USE_IPV6)
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSUPPORT_IPV6")
-	SET(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -DSUPPORT_IPV6")
+	ADD_DEFINITIONS(-DSUPPORT_IPV6)
 ENDIF(SEMS_USE_IPV6)