diff --git a/modules/ims_auth/api.h b/modules/ims_auth/api.h
index c8409d69163..6bdf459805c 100644
--- a/modules/ims_auth/api.h
+++ b/modules/ims_auth/api.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2012 Smile Communications, jason.penton@smilecoms.com
  * Copyright (C) 2012 Smile Communications, richard.good@smilecoms.com
  * 
diff --git a/modules/ims_auth/authims_mod.c b/modules/ims_auth/authims_mod.c
index 9b8d6238fba..31242785c05 100644
--- a/modules/ims_auth/authims_mod.c
+++ b/modules/ims_auth/authims_mod.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2012 Smile Communications, jason.penton@smilecoms.com
  * Copyright (C) 2012 Smile Communications, richard.good@smilecoms.com
  * 
diff --git a/modules/ims_auth/authims_mod.h b/modules/ims_auth/authims_mod.h
index dd693282141..dc5a60dd767 100644
--- a/modules/ims_auth/authims_mod.h
+++ b/modules/ims_auth/authims_mod.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2012 Smile Communications, jason.penton@smilecoms.com
  * Copyright (C) 2012 Smile Communications, richard.good@smilecoms.com
  * 
diff --git a/modules/ims_auth/authorize.c b/modules/ims_auth/authorize.c
index a89b15e3143..4facbb934bd 100644
--- a/modules/ims_auth/authorize.c
+++ b/modules/ims_auth/authorize.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2012 Smile Communications, jason.penton@smilecoms.com
  * Copyright (C) 2012 Smile Communications, richard.good@smilecoms.com
  * 
@@ -157,7 +155,7 @@ unsigned char get_auth_scheme_type(str scheme) {
     return AUTH_UNKNOWN;
 }
 
-static inline int get_ha1(struct username* _username, str* _domain,
+static int get_ha1(struct username* _username, str* _domain,
         const str* _table, char* _ha1, db1_res_t** res) {
 
     return 0;
@@ -175,7 +173,7 @@ static int digest_authenticate(struct sip_msg* msg, str *realm,
  * Starts the reg_await_timer for an authentication vector.
  * @param av - the authentication vector
  */
-inline void start_reg_await_timer(auth_vector *av) {
+void start_reg_await_timer(auth_vector *av) {
     av->expires = get_ticks() + auth_vector_timeout;
     av->status = AUTH_VECTOR_SENT;
 }
@@ -1087,7 +1085,7 @@ auth_vector * get_auth_vector(str private_identity, str public_identity, int sta
  * Locks the required slot of the auth_data.
  * @param hash - the index of the slot
  */
-inline void auth_data_lock(unsigned int hash) {
+void auth_data_lock(unsigned int hash) {
     lock_get(auth_data[(hash)].lock);
 }
 
@@ -1095,7 +1093,7 @@ inline void auth_data_lock(unsigned int hash) {
  * UnLocks the required slot of the auth_data
  * @param hash - the index of the slot
  */
-inline void auth_data_unlock(unsigned int hash) {
+void auth_data_unlock(unsigned int hash) {
     lock_release(auth_data[(hash)].lock);
 }
 
@@ -1397,7 +1395,7 @@ void free_auth_userdata(auth_userdata * aud) {
  * @param public_identity - the public identity
  * @returns the hash % Auth_data->size
  */
-inline unsigned int get_hash_auth(str private_identity, str public_identity) {
+unsigned int get_hash_auth(str private_identity, str public_identity) {
 if (av_check_only_impu)
 	return core_hash(&public_identity, 0, act_auth_data_hash_size);
 else
diff --git a/modules/ims_auth/authorize.h b/modules/ims_auth/authorize.h
index 41360b77b8f..357542d91f2 100644
--- a/modules/ims_auth/authorize.h
+++ b/modules/ims_auth/authorize.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2012 Smile Communications, jason.penton@smilecoms.com
  * Copyright (C) 2012 Smile Communications, richard.good@smilecoms.com
  * 
@@ -154,8 +152,8 @@ auth_vector* get_auth_vector(str private_identity,str public_identity,int status
  * Storage of authentication vectors
  */
 
-inline void auth_data_lock(unsigned int hash);
-inline void auth_data_unlock(unsigned int hash);
+void auth_data_lock(unsigned int hash);
+void auth_data_unlock(unsigned int hash);
  
 int auth_data_init(int size);
 
@@ -168,7 +166,7 @@ void free_auth_vector(auth_vector *av);
 auth_userdata *new_auth_userdata(str private_identity,str public_identity);
 void free_auth_userdata(auth_userdata *aud);					
 
-inline unsigned int get_hash_auth(str private_identity,str public_identity);
+unsigned int get_hash_auth(str private_identity,str public_identity);
 
 int add_auth_vector(str private_identity,str public_identity,auth_vector *av);
 auth_vector* get_auth_vector(str private_identity,str public_identity,int status,str *nonce,unsigned int *hash);
@@ -184,7 +182,7 @@ int multimedia_auth_request(struct sip_msg *msg, str public_identity, str privat
 int pack_challenge(struct sip_msg *msg,str realm,auth_vector *av, int is_proxy_auth);
 int add_authinfo_resp_hdr(struct sip_msg *msg, str nextnonce, str qop, HASHHEX rspauth, str cnonce, str nc);
 
-inline void start_reg_await_timer(auth_vector *av);
+void start_reg_await_timer(auth_vector *av);
 void reg_await_timer(unsigned int ticks, void* param);
 
 unsigned char get_algorithm_type(str algorithm);
diff --git a/modules/ims_auth/conversion.c b/modules/ims_auth/conversion.c
index 5d27797bb2d..8fa129304cf 100644
--- a/modules/ims_auth/conversion.c
+++ b/modules/ims_auth/conversion.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2012 Smile Communications, jason.penton@smilecoms.com
  * Copyright (C) 2012 Smile Communications, richard.good@smilecoms.com
  * 
@@ -96,7 +94,7 @@ int base16_to_bin(char *from,int len, char *to)
  * @param x - characted to convert
  * @returns the int value or -1 if terminal character ('=')
  */ 
-static inline int base64_val(char x)\
+static int base64_val(char x)\
 {
 	switch(x){
 		case '=': return -1;
diff --git a/modules/ims_auth/conversion.h b/modules/ims_auth/conversion.h
index e4f38d29061..a162ef5391e 100644
--- a/modules/ims_auth/conversion.h
+++ b/modules/ims_auth/conversion.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2012 Smile Communications, jason.penton@smilecoms.com
  * Copyright (C) 2012 Smile Communications, richard.good@smilecoms.com
  * 
diff --git a/modules/ims_auth/cxdx_avp.c b/modules/ims_auth/cxdx_avp.c
index bd4031c8406..f786c1fa896 100644
--- a/modules/ims_auth/cxdx_avp.c
+++ b/modules/ims_auth/cxdx_avp.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2012 Smile Communications, jason.penton@smilecoms.com
  * Copyright (C) 2012 Smile Communications, richard.good@smilecoms.com
  * 
@@ -65,7 +63,7 @@ static str s_empty = {0, 0};
  * @param func - the name of the calling function, for debugging purposes
  * @returns 1 on success or 0 on failure
  */
-static inline int cxdx_add_avp(AAAMessage *m,char *d,int len,int avp_code,
+static int cxdx_add_avp(AAAMessage *m,char *d,int len,int avp_code,
 	int flags,int vendorid,int data_do,const char *func)
 {
 	AAA_AVP *avp;
@@ -95,7 +93,7 @@ static inline int cxdx_add_avp(AAAMessage *m,char *d,int len,int avp_code,
  * @param func - the name of the calling function, for debugging purposes
  * @returns 1 on success or 0 on failure
  */
-static inline int cxdx_add_avp_list(AAA_AVP_LIST *list,char *d,int len,int avp_code,
+static int cxdx_add_avp_list(AAA_AVP_LIST *list,char *d,int len,int avp_code,
 	int flags,int vendorid,int data_do,const char *func)
 {
 	AAA_AVP *avp;
@@ -128,7 +126,7 @@ static inline int cxdx_add_avp_list(AAA_AVP_LIST *list,char *d,int len,int avp_c
  * @param func - the name of the calling function, for debugging purposes
  * @returns the str with the payload on success or an empty string on failure
  */
-static inline str cxdx_get_avp(AAAMessage *msg,int avp_code,int vendor_id,
+static str cxdx_get_avp(AAAMessage *msg,int avp_code,int vendor_id,
 							const char *func)
 {
 	AAA_AVP *avp;
@@ -149,7 +147,7 @@ static inline str cxdx_get_avp(AAAMessage *msg,int avp_code,int vendor_id,
  * @param data - the value for the AVP payload
  * @returns 1 on success or 0 on error
  */
-inline int cxdx_add_destination_realm(AAAMessage *msg,str data)
+int cxdx_add_destination_realm(AAAMessage *msg,str data)
 {
 	return 
 	cxdx_add_avp(msg,data.s,data.len,
@@ -166,7 +164,7 @@ inline int cxdx_add_destination_realm(AAAMessage *msg,str data)
  * @param data - the value for the AVP payload
  * @returns 1 on success or 0 on error
  */
-inline int cxdx_add_destination_host(AAAMessage *msg,str data)
+int cxdx_add_destination_host(AAAMessage *msg,str data)
 {
 	return 
 	cxdx_add_avp(msg,data.s,data.len,
@@ -185,7 +183,7 @@ inline int cxdx_add_destination_host(AAAMessage *msg,str data)
  * @param acct_id - the accounting application id
  * @returns 1 on success or 0 on error
  */
-inline int cxdx_add_vendor_specific_appid(AAAMessage *msg,unsigned int vendor_id,
+int cxdx_add_vendor_specific_appid(AAAMessage *msg,unsigned int vendor_id,
 	unsigned int auth_id,unsigned int acct_id)
 {
 	AAA_AVP_LIST list;
@@ -243,7 +241,7 @@ inline int cxdx_add_vendor_specific_appid(AAAMessage *msg,unsigned int vendor_id
  * @param data - the value for the AVP payload
  * @returns 1 on success or 0 on error
  */
-inline int cxdx_add_auth_session_state(AAAMessage *msg,unsigned int data)
+int cxdx_add_auth_session_state(AAAMessage *msg,unsigned int data)
 {
 	char x[4];
 	set_4bytes(x,data);
@@ -262,7 +260,7 @@ inline int cxdx_add_auth_session_state(AAAMessage *msg,unsigned int data)
  * @param data - the value for the AVP payload
  * @returns 1 on success or 0 on error
  */
-inline int cxdx_add_user_name(AAAMessage *msg,str data)
+int cxdx_add_user_name(AAAMessage *msg,str data)
 {
 	return 
 	cxdx_add_avp(msg,data.s,data.len,
@@ -279,7 +277,7 @@ inline int cxdx_add_user_name(AAAMessage *msg,str data)
  * @param data - the value for the AVP payload
  * @returns 1 on success or 0 on error
  */
-inline int cxdx_add_public_identity(AAAMessage *msg,str data)
+int cxdx_add_public_identity(AAAMessage *msg,str data)
 {
 	return 
 	cxdx_add_avp(msg,data.s,data.len,
@@ -296,7 +294,7 @@ inline int cxdx_add_public_identity(AAAMessage *msg,str data)
  * @param data - the value for the AVP payload
  * @returns 1 on success or 0 on error
  */
-inline int cxdx_add_visited_network_id(AAAMessage *msg,str data)
+int cxdx_add_visited_network_id(AAAMessage *msg,str data)
 {
 	return 
 	cxdx_add_avp(msg,data.s,data.len,
@@ -313,7 +311,7 @@ inline int cxdx_add_visited_network_id(AAAMessage *msg,str data)
  * @param data - the value for the AVP payload
  * @returns 1 on success or 0 on error
  */
-inline int cxdx_add_UAR_flags(AAAMessage *msg, unsigned int sos_reg)
+int cxdx_add_UAR_flags(AAAMessage *msg, unsigned int sos_reg)
 {
 
 	char x[4];
@@ -337,7 +335,7 @@ inline int cxdx_add_UAR_flags(AAAMessage *msg, unsigned int sos_reg)
  * @param data - the value for the AVP payload
  * @returns 1 on success or 0 on error
  */
-inline int cxdx_add_authorization_type(AAAMessage *msg,unsigned int data)
+int cxdx_add_authorization_type(AAAMessage *msg,unsigned int data)
 {
 	char x[4];
 	set_4bytes(x,data);
@@ -355,7 +353,7 @@ inline int cxdx_add_authorization_type(AAAMessage *msg,unsigned int data)
  * @param msg - the Diameter message
  * @returns the AVP payload on success or an empty string on error
  */
-inline int cxdx_get_result_code(AAAMessage *msg, int *data)
+int cxdx_get_result_code(AAAMessage *msg, int *data)
 {
 	str s;
 	s = cxdx_get_avp(msg,
@@ -372,7 +370,7 @@ inline int cxdx_get_result_code(AAAMessage *msg, int *data)
  * @param msg - the Diameter message
  * @returns the AVP payload on success or an empty string on error
  */
-inline int cxdx_get_experimental_result_code(AAAMessage *msg, int *data)
+int cxdx_get_experimental_result_code(AAAMessage *msg, int *data)
 {
 	AAA_AVP_LIST list;
 	AAA_AVP *avp;
@@ -402,7 +400,7 @@ inline int cxdx_get_experimental_result_code(AAAMessage *msg, int *data)
  * @param msg - the Diameter message
  * @returns the AVP payload on success or an empty string on error
  */
-inline str cxdx_get_server_name(AAAMessage *msg)
+str cxdx_get_server_name(AAAMessage *msg)
 {	
 	return cxdx_get_avp(msg,
 		AVP_IMS_Server_Name,
@@ -419,7 +417,7 @@ inline str cxdx_get_server_name(AAAMessage *msg)
  * @param o_cnt - size of the array above to be filled
  * @returns 1 on success 0 on fail
  */
-inline int cxdx_get_capabilities(AAAMessage *msg,int **m,int *m_cnt,int **o,int *o_cnt,
+int cxdx_get_capabilities(AAAMessage *msg,int **m,int *m_cnt,int **o,int *o_cnt,
 	str **p,int *p_cnt)
 {
 	AAA_AVP_LIST list;
@@ -513,7 +511,7 @@ int cscf_reply_transactional(struct sip_msg *msg, int code, char *text)
  * @param data - the value for the AVP payload
  * @returns 1 on success or 0 on error
  */
-inline int cxdx_add_sip_number_auth_items(AAAMessage *msg,unsigned int data)
+int cxdx_add_sip_number_auth_items(AAAMessage *msg,unsigned int data)
 {
 	char x[4];
 	set_4bytes(x,data);
@@ -533,7 +531,7 @@ inline int cxdx_add_sip_number_auth_items(AAAMessage *msg,unsigned int data)
  * @param auth - the value for the authorization AVP
  * @returns 1 on success or 0 on error
  */
-inline int cxdx_add_sip_auth_data_item_request(AAAMessage *msg, str auth_scheme, str auth, str username, str realm,str method, str server_name)
+int cxdx_add_sip_auth_data_item_request(AAAMessage *msg, str auth_scheme, str auth, str username, str realm,str method, str server_name)
 {
 	AAA_AVP_LIST list;
 	str group;
@@ -594,7 +592,7 @@ inline int cxdx_add_sip_auth_data_item_request(AAAMessage *msg, str auth_scheme,
  * @param data - the value for the AVP payload
  * @returns 1 on success or 0 on error
  */
-inline int cxdx_add_server_name(AAAMessage *msg,str data)
+int cxdx_add_server_name(AAAMessage *msg,str data)
 {
 	return 
 	cxdx_add_avp(msg,data.s,data.len,
@@ -610,7 +608,7 @@ inline int cxdx_add_server_name(AAAMessage *msg,str data)
  * @param msg - the Diameter message
  * @returns the number or 0 on error
  */
-inline int cxdx_get_sip_number_auth_items(AAAMessage *msg, int *data)
+int cxdx_get_sip_number_auth_items(AAAMessage *msg, int *data)
 {
 	str s;
 	s = cxdx_get_avp(msg,
@@ -919,7 +917,7 @@ str cxdx_ETSI_sip_authorization(str username, str realm, str nonce, str URI, str
  * @returns the AVP payload on success or an empty string on error
  */
 
-inline str cxdx_get_user_data(AAAMessage *msg)
+str cxdx_get_user_data(AAAMessage *msg)
 {	
 	return cxdx_get_avp(msg,
 		AVP_IMS_User_Data_Cx,
@@ -932,7 +930,7 @@ inline str cxdx_get_user_data(AAAMessage *msg)
  * @param msg - the Diameter message
  * @returns the AVP payload on success or an empty string on error
  */
-inline int cxdx_get_charging_info(AAAMessage *msg,str *ccf1,str *ccf2,str *ecf1,str *ecf2)
+int cxdx_get_charging_info(AAAMessage *msg,str *ccf1,str *ccf2,str *ecf1,str *ecf2)
 {		
 	AAA_AVP_LIST list;
 	AAA_AVP *avp;
@@ -977,7 +975,7 @@ inline int cxdx_get_charging_info(AAAMessage *msg,str *ccf1,str *ccf2,str *ecf1,
  * @param data - the value for the AVP payload
  * @returns 1 on success or 0 on error
  */
-inline int cxdx_add_server_assignment_type(AAAMessage *msg,unsigned int data)
+int cxdx_add_server_assignment_type(AAAMessage *msg,unsigned int data)
 {
 	char x[4];
 	set_4bytes(x,data);
@@ -996,7 +994,7 @@ inline int cxdx_add_server_assignment_type(AAAMessage *msg,unsigned int data)
  * @param data - the value for the AVP payload
  * @returns 1 on success or 0 on error
  */
-inline int cxdx_add_userdata_available(AAAMessage *msg,unsigned int data)
+int cxdx_add_userdata_available(AAAMessage *msg,unsigned int data)
 {
 	char x[4];
 	set_4bytes(x,data);
@@ -1018,7 +1016,7 @@ inline int cxdx_add_userdata_available(AAAMessage *msg,unsigned int data)
  * @param func - the name of the calling function for debugging purposes
  * @returns the AVP payload on success or an empty string on error
  */
-inline AAA_AVP* cxdx_get_next_public_identity(AAAMessage *msg,AAA_AVP* pos,int avp_code,int vendor_id,const char *func)
+AAA_AVP* cxdx_get_next_public_identity(AAAMessage *msg,AAA_AVP* pos,int avp_code,int vendor_id,const char *func)
 {		
 	AAA_AVP *avp;
 	
@@ -1036,7 +1034,7 @@ inline AAA_AVP* cxdx_get_next_public_identity(AAAMessage *msg,AAA_AVP* pos,int a
  * @param msg - the Diameter message
  * @returns the AVP payload on success or an empty string on error
  */
-inline str cxdx_get_user_name(AAAMessage *msg)
+str cxdx_get_user_name(AAAMessage *msg)
 {
 	return cxdx_get_avp(msg,
 		AVP_User_Name,
@@ -1050,7 +1048,7 @@ inline str cxdx_get_user_name(AAAMessage *msg)
  * @param data - the value for the AVP payload
  * @returns 1 on success or 0 on error
  */
-inline int cxdx_add_result_code(AAAMessage *msg,unsigned int data)
+int cxdx_add_result_code(AAAMessage *msg,unsigned int data)
 {
 	char x[4];
 	set_4bytes(x,data);
diff --git a/modules/ims_auth/cxdx_avp.h b/modules/ims_auth/cxdx_avp.h
index c46a9ed16a2..faba8dd10f4 100644
--- a/modules/ims_auth/cxdx_avp.h
+++ b/modules/ims_auth/cxdx_avp.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2012 Smile Communications, jason.penton@smilecoms.com
  * Copyright (C) 2012 Smile Communications, richard.good@smilecoms.com
  * 
@@ -59,7 +57,7 @@ struct sip_msg;
  * @param data - the value for the AVP payload
  * @returns 1 on success or 0 on error
  */
-inline int cxdx_add_destination_realm(AAAMessage *msg, str data);
+int cxdx_add_destination_realm(AAAMessage *msg, str data);
 
 /**
  * Creates and adds a Destination-Host AVP.
@@ -67,7 +65,7 @@ inline int cxdx_add_destination_realm(AAAMessage *msg, str data);
  * @param data - the value for the AVP payload
  * @returns 1 on success or 0 on error
  */
-inline int cxdx_add_destination_host(AAAMessage *msg,str data);
+int cxdx_add_destination_host(AAAMessage *msg,str data);
 
 /**
  * Creates and adds a Vendor-Specifig-Application-ID AVP.
@@ -77,7 +75,7 @@ inline int cxdx_add_destination_host(AAAMessage *msg,str data);
  * @param acct_id - the accounting application id
  * @returns 1 on success or 0 on error
  */
-inline int cxdx_add_vendor_specific_appid(AAAMessage *msg,unsigned int vendor_id,unsigned int auth_id,unsigned int acct_id);
+int cxdx_add_vendor_specific_appid(AAAMessage *msg,unsigned int vendor_id,unsigned int auth_id,unsigned int acct_id);
 
 /**
  * Creates and adds a Auth-Session-State AVP.
@@ -85,7 +83,7 @@ inline int cxdx_add_vendor_specific_appid(AAAMessage *msg,unsigned int vendor_id
  * @param data - the value for the AVP payload
  * @returns 1 on success or 0 on error
  */
-inline int cxdx_add_auth_session_state(AAAMessage *msg,unsigned int data);
+int cxdx_add_auth_session_state(AAAMessage *msg,unsigned int data);
 
 /**
  * Creates and adds a User-Name AVP.
@@ -93,7 +91,7 @@ inline int cxdx_add_auth_session_state(AAAMessage *msg,unsigned int data);
  * @param data - the value for the AVP payload
  * @returns 1 on success or 0 on error
  */
-inline int cxdx_add_user_name(AAAMessage *msg,str data);
+int cxdx_add_user_name(AAAMessage *msg,str data);
 
 /**
  * Creates and adds a Public Identity AVP.
@@ -101,7 +99,7 @@ inline int cxdx_add_user_name(AAAMessage *msg,str data);
  * @param data - the value for the AVP payload
  * @returns 1 on success or 0 on error
  */
-inline int cxdx_add_public_identity(AAAMessage *msg,str data);
+int cxdx_add_public_identity(AAAMessage *msg,str data);
 
 /**
  * Creates and adds a Visited-Network-ID AVP.
@@ -109,7 +107,7 @@ inline int cxdx_add_public_identity(AAAMessage *msg,str data);
  * @param data - the value for the AVP payload
  * @returns 1 on success or 0 on error
  */
-inline int cxdx_add_visited_network_id(AAAMessage *msg,str data);
+int cxdx_add_visited_network_id(AAAMessage *msg,str data);
 
 /**
  * Creates and adds a UAR-Flags AVP.
@@ -117,7 +115,7 @@ inline int cxdx_add_visited_network_id(AAAMessage *msg,str data);
  * @param data - the value for the AVP payload
  * @returns 1 on success or 0 on error
  */
-inline int cxdx_add_UAR_flags(AAAMessage *msg, unsigned int sos_reg);
+int cxdx_add_UAR_flags(AAAMessage *msg, unsigned int sos_reg);
 
 /**
  * Creates and adds a Authorization-Type AVP.
@@ -125,28 +123,28 @@ inline int cxdx_add_UAR_flags(AAAMessage *msg, unsigned int sos_reg);
  * @param data - the value for the AVP payload
  * @returns 1 on success or 0 on error
  */
-inline int cxdx_add_authorization_type(AAAMessage *msg,unsigned int data);
+int cxdx_add_authorization_type(AAAMessage *msg,unsigned int data);
 
 /**
  * Returns the Result-Code AVP from a Diameter message.
  * @param msg - the Diameter message
  * @returns the AVP payload on success or an empty string on error
  */
-inline int cxdx_get_result_code(AAAMessage *msg, int *data);
+int cxdx_get_result_code(AAAMessage *msg, int *data);
 
 /**
  * Returns the Experimental-Result-Code AVP from a Diameter message.
  * @param msg - the Diameter message
  * @returns the AVP payload on success or an empty string on error
  */
-inline int cxdx_get_experimental_result_code(AAAMessage *msg, int *data);
+int cxdx_get_experimental_result_code(AAAMessage *msg, int *data);
 
 /**
  * Returns the Server-Name AVP from a Diameter message.
  * @param msg - the Diameter message
  * @returns the AVP payload on success or an empty string on error
  */
-inline str cxdx_get_server_name(AAAMessage *msg);
+str cxdx_get_server_name(AAAMessage *msg);
 
 /**
  * Returns the Capabilities from the grouped AVP from a Diameter message.
@@ -157,7 +155,7 @@ inline str cxdx_get_server_name(AAAMessage *msg);
  * @param o_cnt - size of the array above to be filled
  * @returns 1 on success 0 on fail
  */
-inline int cxdx_get_capabilities(AAAMessage *msg,int **m,int *m_cnt,int **o,int *o_cnt,	str **p,int *p_cnt);
+int cxdx_get_capabilities(AAAMessage *msg,int **m,int *m_cnt,int **o,int *o_cnt,	str **p,int *p_cnt);
 
 /**
  * Creates and adds a SIP-Number-Auth-Items AVP.
@@ -165,7 +163,7 @@ inline int cxdx_get_capabilities(AAAMessage *msg,int **m,int *m_cnt,int **o,int
  * @param data - the value for the AVP payload
  * @returns 1 on success or 0 on error
  */
-inline int cxdx_add_sip_number_auth_items(AAAMessage *msg,unsigned int data);
+int cxdx_add_sip_number_auth_items(AAAMessage *msg,unsigned int data);
 
 /**
  * Creates and adds a SIP-Auth-Data-Item AVP.
@@ -174,7 +172,7 @@ inline int cxdx_add_sip_number_auth_items(AAAMessage *msg,unsigned int data);
  * @param auth - the value for the authorization AVP
  * @returns 1 on success or 0 on error
  */
-inline int cxdx_add_sip_auth_data_item_request(AAAMessage *msg, str auth_scheme, str auth, str username, str realm,str method, str server_name);
+int cxdx_add_sip_auth_data_item_request(AAAMessage *msg, str auth_scheme, str auth, str username, str realm,str method, str server_name);
 
 /**
  * Creates and adds a Server-Name AVP.
@@ -182,14 +180,14 @@ inline int cxdx_add_sip_auth_data_item_request(AAAMessage *msg, str auth_scheme,
  * @param data - the value for the AVP payload
  * @returns 1 on success or 0 on error
  */
-inline int cxdx_add_server_name(AAAMessage *msg,str data);
+int cxdx_add_server_name(AAAMessage *msg,str data);
 
 /**
  * Returns the SIP-Number-Auth-Items AVP from a Diameter message.
  * @param msg - the Diameter message
  * @returns the number or 0 on error
  */
-inline int cxdx_get_sip_number_auth_items(AAAMessage *msg, int *data);
+int cxdx_get_sip_number_auth_items(AAAMessage *msg, int *data);
 
 /**
  * Returns the Auth-Data-Item from a Diameter answer message.
@@ -230,14 +228,14 @@ str cxdx_ETSI_sip_authorization(str username, str realm, str nonce, str URI, str
  * @returns the AVP payload on success or an empty string on error
  */
 
-inline str cxdx_get_user_data(AAAMessage *msg);
+str cxdx_get_user_data(AAAMessage *msg);
 
 /**
  * Returns the Charging-Information from a Diameter message.
  * @param msg - the Diameter message
  * @returns the AVP payload on success or an empty string on error
  */
-inline int cxdx_get_charging_info(AAAMessage *msg,str *ccf1,str *ccf2,str *ecf1,str *ecf2);
+int cxdx_get_charging_info(AAAMessage *msg,str *ccf1,str *ccf2,str *ecf1,str *ecf2);
 
 /**
  * Creates and adds a Server-Assignment-Type AVP.
@@ -245,7 +243,7 @@ inline int cxdx_get_charging_info(AAAMessage *msg,str *ccf1,str *ccf2,str *ecf1,
  * @param data - the value for the AVP payload
  * @returns 1 on success or 0 on error
  */
-inline int cxdx_add_server_assignment_type(AAAMessage *msg,unsigned int data);
+int cxdx_add_server_assignment_type(AAAMessage *msg,unsigned int data);
 
 /**
  * Creates and adds Userdata-Available AVP.
@@ -253,7 +251,7 @@ inline int cxdx_add_server_assignment_type(AAAMessage *msg,unsigned int data);
  * @param data - the value for the AVP payload
  * @returns 1 on success or 0 on error
  */
-inline int cxdx_add_userdata_available(AAAMessage *msg,unsigned int data);
+int cxdx_add_userdata_available(AAAMessage *msg,unsigned int data);
 
 /**
  * Finds out the next Public-Identity AVP from a Diameter message.
@@ -264,14 +262,14 @@ inline int cxdx_add_userdata_available(AAAMessage *msg,unsigned int data);
  * @param func - the name of the calling function for debugging purposes
  * @returns the AVP payload on success or an empty string on error
  */
-inline AAA_AVP* cxdx_get_next_public_identity(AAAMessage *msg,AAA_AVP* pos,int avp_code,int vendor_id,const char *func);
+AAA_AVP* cxdx_get_next_public_identity(AAAMessage *msg,AAA_AVP* pos,int avp_code,int vendor_id,const char *func);
 
 /**
  * Returns the User-Name AVP from a Diameter message.
  * @param msg - the Diameter message
  * @returns the AVP payload on success or an empty string on error
  */
-inline str cxdx_get_user_name(AAAMessage *msg);
+str cxdx_get_user_name(AAAMessage *msg);
 
 /**
  * Creates and adds a Result-Code AVP.
@@ -279,7 +277,7 @@ inline str cxdx_get_user_name(AAAMessage *msg);
  * @param data - the value for the AVP payload
  * @returns 1 on success or 0 on error
  */
-inline int cxdx_add_result_code(AAAMessage *msg,unsigned int data);
+int cxdx_add_result_code(AAAMessage *msg,unsigned int data);
 
 /**
  * Transactional SIP response - tries to create a transaction if none found.
diff --git a/modules/ims_auth/cxdx_mar.c b/modules/ims_auth/cxdx_mar.c
index a949edd5e25..f33adeb91bf 100644
--- a/modules/ims_auth/cxdx_mar.c
+++ b/modules/ims_auth/cxdx_mar.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2012 Smile Communications, jason.penton@smilecoms.com
  * Copyright (C) 2012 Smile Communications, richard.good@smilecoms.com
  * 
diff --git a/modules/ims_auth/cxdx_mar.h b/modules/ims_auth/cxdx_mar.h
index 62bcb353e3c..7603c5ef237 100644
--- a/modules/ims_auth/cxdx_mar.h
+++ b/modules/ims_auth/cxdx_mar.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2012 Smile Communications, jason.penton@smilecoms.com
  * Copyright (C) 2012 Smile Communications, richard.good@smilecoms.com
  * 
diff --git a/modules/ims_auth/pvt_message.c b/modules/ims_auth/pvt_message.c
index 4c4d056eaa6..120cd045a97 100644
--- a/modules/ims_auth/pvt_message.c
+++ b/modules/ims_auth/pvt_message.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2012 Smile Communications, jason.penton@smilecoms.com
  * Copyright (C) 2012 Smile Communications, richard.good@smilecoms.com
  * 
diff --git a/modules/ims_auth/pvt_message.h b/modules/ims_auth/pvt_message.h
index 9d391d46640..d566ed7b907 100644
--- a/modules/ims_auth/pvt_message.h
+++ b/modules/ims_auth/pvt_message.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2012 Smile Communications, jason.penton@smilecoms.com
  * Copyright (C) 2012 Smile Communications, richard.good@smilecoms.com
  * 
diff --git a/modules/ims_auth/rfc2617.c b/modules/ims_auth/rfc2617.c
index d8c9bee3118..0cfb6567fc2 100644
--- a/modules/ims_auth/rfc2617.c
+++ b/modules/ims_auth/rfc2617.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2012 Smile Communications, jason.penton@smilecoms.com
  * Copyright (C) 2012 Smile Communications, richard.good@smilecoms.com
  * 
@@ -53,7 +51,7 @@
 #include "../../dprint.h"
 
 
-inline void cvt_hex(HASH _b, HASHHEX _h)
+void cvt_hex(HASH _b, HASHHEX _h)
 {
 	unsigned short i;
 	unsigned char j;
diff --git a/modules/ims_auth/rfc2617.h b/modules/ims_auth/rfc2617.h
index defa0eb054e..b92703561b5 100644
--- a/modules/ims_auth/rfc2617.h
+++ b/modules/ims_auth/rfc2617.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2012 Smile Communications, jason.penton@smilecoms.com
  * Copyright (C) 2012 Smile Communications, richard.good@smilecoms.com
  * 
diff --git a/modules/ims_auth/sip_messages.h b/modules/ims_auth/sip_messages.h
index ffc151963dc..f1752c781e2 100644
--- a/modules/ims_auth/sip_messages.h
+++ b/modules/ims_auth/sip_messages.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2012 Smile Communications, jason.penton@smilecoms.com
  * Copyright (C) 2012 Smile Communications, richard.good@smilecoms.com
  * 
diff --git a/modules/ims_auth/stats.c b/modules/ims_auth/stats.c
index e328d963bf3..6b2a41d4610 100644
--- a/modules/ims_auth/stats.c
+++ b/modules/ims_auth/stats.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2012 Smile Communications, jason.penton@smilecoms.com
  * Copyright (C) 2012 Smile Communications, richard.good@smilecoms.com
  * 
diff --git a/modules/ims_auth/stats.h b/modules/ims_auth/stats.h
index 1002e6d2728..bc079cad828 100644
--- a/modules/ims_auth/stats.h
+++ b/modules/ims_auth/stats.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2012 Smile Communications, jason.penton@smilecoms.com
  * Copyright (C) 2012 Smile Communications, richard.good@smilecoms.com
  * 
diff --git a/modules/ims_auth/utils.c b/modules/ims_auth/utils.c
index aca0ca4c1f4..2e40cf8c465 100644
--- a/modules/ims_auth/utils.c
+++ b/modules/ims_auth/utils.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2012 Smile Communications, jason.penton@smilecoms.com
  * Copyright (C) 2012 Smile Communications, richard.good@smilecoms.com
  * 
@@ -49,7 +47,7 @@
 /*
  * Find credentials with given realm in a SIP message header
  */
-inline int ims_find_credentials(struct sip_msg* _m, str* _realm,
+int ims_find_credentials(struct sip_msg* _m, str* _realm,
 		hdr_types_t _hftype, struct hdr_field** _h) {
 	struct hdr_field** hook, *ptr, *prev;
 	hdr_flags_t hdr_flags;
diff --git a/modules/ims_auth/utils.h b/modules/ims_auth/utils.h
index d042f57fc7a..cd2c34da643 100644
--- a/modules/ims_auth/utils.h
+++ b/modules/ims_auth/utils.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2012 Smile Communications, jason.penton@smilecoms.com
  * Copyright (C) 2012 Smile Communications, richard.good@smilecoms.com
  *