diff --git a/action.c b/action.c
index 304a6b5e705..67ed56ae9b1 100644
--- a/action.c
+++ b/action.c
@@ -623,7 +623,7 @@ int do_action(struct action* a, struct sip_msg* msg)
 	struct timeval start;
 	int end_time;
 	const cmd_export_t *cmd = NULL;
-	acmd_export_t *acmd;
+	const acmd_export_t *acmd;
 	void* cmdp[MAX_CMD_PARAMS];
 	pv_value_t tmp_vals[MAX_CMD_PARAMS];
 	pv_value_t *route_p;
@@ -1026,7 +1026,7 @@ int do_action(struct action* a, struct sip_msg* msg)
 			break;
 		case CMD_T:
 			if (a->elem[0].type != CMD_ST ||
-				((cmd = (const cmd_export_t*)a->elem[0].u.data) == NULL)) {
+				((cmd = (const cmd_export_t*)a->elem[0].u.data_const) == NULL)) {
 				LM_ALERT("BUG in module call\n");
 				break;
 			}
@@ -1057,7 +1057,7 @@ int do_action(struct action* a, struct sip_msg* msg)
 			 * second param - a NUMBER_ST pointing to resume route
 			 * third param - an optional NUMBER_ST with a timeout */
 			aitem = (struct action *)(a->elem[0].u.data);
-			acmd = (acmd_export_t *)aitem->elem[0].u.data;
+			acmd = (const acmd_export_t *)aitem->elem[0].u.data_const;
 
 			if (async_script_start_f==NULL || a->elem[0].type!=ACTIONS_ST ||
 			a->elem[1].type!=NUMBER_ST || aitem->type!=AMODULE_T) {
@@ -1090,7 +1090,7 @@ int do_action(struct action* a, struct sip_msg* msg)
 			/* first param - an ACTIONS_ST containing an ACMD_ST
 			 * second param - an optional NUMBER_ST pointing to an end route */
 			aitem = (struct action *)(a->elem[0].u.data);
-			acmd = (acmd_export_t *)aitem->elem[0].u.data;
+			acmd = (const acmd_export_t *)aitem->elem[0].u.data_const;
 
 			if (async_script_start_f==NULL || a->elem[0].type!=ACTIONS_ST ||
 			a->elem[1].type!=NUMBER_ST || aitem->type!=AMODULE_T) {
@@ -1228,8 +1228,8 @@ static int for_each_handler(struct sip_msg *msg, struct action *a)
  * @msg - mandatory, sip message
  * @line - line in script
  */
-void __script_trace(char *class, char *action, struct sip_msg *msg,
-														char *file, int line)
+void __script_trace(const char *class, const char *action, struct sip_msg *msg,
+  const char *file, int line)
 {
 	str val;
 
diff --git a/action.h b/action.h
index d3c7ffdbf64..0360f4a9bf8 100644
--- a/action.h
+++ b/action.h
@@ -72,8 +72,8 @@ void run_error_route(struct sip_msg* msg, int force_reset);
 			__script_trace(class, action, msg, file, line); \
 	} while (0)
 
-void __script_trace(char *class, char *action, struct sip_msg *msg,
-		char *file, int line);
+void __script_trace(const char *class, const char *action, struct sip_msg *msg,
+		const char *file, int line);
 
 typedef int (*param_getf_t)(struct sip_msg*, pv_param_t*, pv_value_t*, void *, void *);
 
diff --git a/async.c b/async.c
index ed1ee19e227..068ca4e0cd7 100644
--- a/async.c
+++ b/async.c
@@ -294,7 +294,7 @@ int async_script_launch(struct sip_msg *msg, struct action* a,
 
 	async_status = ASYNC_NO_IO; /*assume defauly status "no IO done" */
 
-	return_code = ((acmd_export_t*)(a->elem[0].u.data))->function(msg,
+	return_code = ((const acmd_export_t*)(a->elem[0].u.data_const))->function(msg,
 			(async_ctx*)ctx,
 			params[0], params[1], params[2],
 			params[3], params[4], params[5],
diff --git a/blacklists.c b/blacklists.c
index 2457cc48162..3d31e22a204 100644
--- a/blacklists.c
+++ b/blacklists.c
@@ -62,7 +62,7 @@ static mi_response_t *mi_del_blacklist_rule(const mi_params_t *params,
 											struct mi_handler *async_hdl);
 
 
-static mi_export_t mi_bl_cmds[] = {
+static const mi_export_t mi_bl_cmds[] = {
 	{ "list_blacklists", "lists all the defined (static or learned) blacklists", 0, 0, {
 		{mi_print_blacklists, {0}},
 		{mi_print_blacklists, {"name", 0}},
diff --git a/cachedb/example/example_cachedb.c b/cachedb/example/example_cachedb.c
index 7685b448b79..ab2d0596212 100644
--- a/cachedb/example/example_cachedb.c
+++ b/cachedb/example/example_cachedb.c
@@ -56,13 +56,13 @@ cachedb_funcs cdbf;
 /* Actual connection to the Cache/DB back-end */
 cachedb_con *con;
 
-static cmd_export_t cmds[]=
+static const cmd_export_t cmds[]=
 {
 	{"process_msg",  (cmd_function)process_msg,  0, 0, 0, REQUEST_ROUTE},
 	{0,0,0,0,0,0}
 };
 
-static param_export_t params[]={
+static const param_export_t params[]={
 	{ "cachedb_url",                 STR_PARAM, &cachedb_url.s},
 	{0,0,0}
 };
diff --git a/cfg.y b/cfg.y
index 0104a097876..7746968b484 100644
--- a/cfg.y
+++ b/cfg.y
@@ -132,7 +132,6 @@ static void yyerror(char* s);
 static void yyerrorf(char* fmt, ...);
 static char* tmp;
 static int i_tmp, rc;
-static void* cmd_tmp;
 static struct socket_id* lst_tmp;
 static int rt;  /* Type of route block for find_export */
 static str s_tmp;
@@ -2148,31 +2147,31 @@ route_param: STRING {
 	;
 
 async_func: ID LPAREN RPAREN {
-				cmd_tmp=(void*)find_mod_acmd_export_t($1);
-				if (cmd_tmp==0){
+				const acmd_export_t* acmd_tmp=find_mod_acmd_export_t($1);
+				if (acmd_tmp==0){
 					yyerrorf("unknown async command <%s>, "
 						"missing loadmodule?", $1);
 					$$=0;
 				}else{
-					if (check_acmd_call_params(cmd_tmp,elems,0)<0) {
+					if (check_acmd_call_params(acmd_tmp,elems,0)<0) {
 						yyerrorf("too few parameters "
 							"for command <%s>\n", $1);
 						$$=0;
 					} else {
 						elems[0].type = ACMD_ST;
-						elems[0].u.data = cmd_tmp;
+						elems[0].u.data_const = acmd_tmp;
 						mk_action_($$, AMODULE_T, 1, elems);
 					}
 				}
 			}
 			| ID LPAREN func_param RPAREN {
-				cmd_tmp=(void*)find_mod_acmd_export_t($1);
-				if (cmd_tmp==0){
+				const acmd_export_t* acmd_tmp=find_mod_acmd_export_t($1);
+				if (acmd_tmp==0){
 					yyerrorf("unknown async command <%s>, "
 						"missing loadmodule?", $1);
 					$$=0;
 				}else{
-					rc = check_acmd_call_params(cmd_tmp,elems,$3);
+					rc = check_acmd_call_params(acmd_tmp,elems,$3);
 					switch (rc) {
 					case -1:
 						yyerrorf("too few parameters "
@@ -2191,7 +2190,7 @@ async_func: ID LPAREN RPAREN {
 						break;
 					default:
 						elems[0].type = ACMD_ST;
-						elems[0].u.data = cmd_tmp;
+						elems[0].u.data_const = acmd_tmp;
 						mk_action_($$, AMODULE_T, $3+1, elems);
 					}
 				}
@@ -2272,7 +2271,7 @@ cmd:	 ASSERT LPAREN exp COMMA STRING RPAREN	 {
 		| ROUTE LPAREN error RPAREN { $$=0; yyerror("bad route"
 						"argument"); }
 		| ID LPAREN RPAREN	{
-								cmd_tmp=(void*)find_cmd_export_t($1, rt);
+								const cmd_export_t* cmd_tmp=find_cmd_export_t($1, rt);
 								if (cmd_tmp==0){
 									if (find_cmd_export_t($1, 0)) {
 										yyerrorf("Command <%s> cannot be "
@@ -2289,13 +2288,13 @@ cmd:	 ASSERT LPAREN exp COMMA STRING RPAREN	 {
 										$$=0;
 									} else {
 										elems[0].type = CMD_ST;
-										elems[0].u.data = cmd_tmp;
+										elems[0].u.data_const = cmd_tmp;
 										mk_action_($$, CMD_T, 1, elems);
 									}
 								}
 							}
 		| ID LPAREN func_param RPAREN	{
-								cmd_tmp=(void*)find_cmd_export_t($1, rt);
+								const cmd_export_t* cmd_tmp=find_cmd_export_t($1, rt);
 								if (cmd_tmp==0){
 									if (find_cmd_export_t($1, 0)) {
 										yyerrorf("Command <%s> cannot be "
@@ -2325,7 +2324,7 @@ cmd:	 ASSERT LPAREN exp COMMA STRING RPAREN	 {
 										break;
 									default:
 										elems[0].type = CMD_ST;
-										elems[0].u.data = cmd_tmp;
+										elems[0].u.data_const = cmd_tmp;
 										mk_action_($$, CMD_T, $3+1, elems);
 									}
 								}
diff --git a/cmds.c b/cmds.c
index 4bfea6d1681..89ef27906e3 100644
--- a/cmds.c
+++ b/cmds.c
@@ -63,9 +63,9 @@ int check_cmd_call_params(const cmd_export_t *cmd, action_elem_t *elems, int no_
 }
 
 /* simillar function to check_cmd_call_params but for async cmds */
-int check_acmd_call_params(acmd_export_t *acmd, action_elem_t *elems, int no_params)
+int check_acmd_call_params(const acmd_export_t *acmd, action_elem_t *elems, int no_params)
 {
-	struct cmd_param *param;
+	const struct cmd_param *param;
 	int n=0, m=0, i;
 
 	for (param=acmd->params; param->flags; param++, n++)
diff --git a/cmds.h b/cmds.h
index 62253780ce8..04b4260f672 100644
--- a/cmds.h
+++ b/cmds.h
@@ -56,7 +56,7 @@ struct cmd_param {
 };
 
 struct cmd_export_ {
-	char* name;                 /* null terminated command name */
+	const char* name;           /* null terminated command name */
 	cmd_function function;      /* pointer to the corresponding function */
 	struct cmd_param
 		params[MAX_CMD_PARAMS+1]; /* array of parameters */
@@ -65,7 +65,7 @@ struct cmd_export_ {
 
 
 struct acmd_export_ {
-	char* name;                 /* null terminated command name */
+	const char* name;           /* null terminated command name */
 	acmd_function function;     /* pointer to the corresponding function */
 	struct cmd_param
 		params[MAX_CMD_PARAMS+1]; /* array of parameters */
@@ -76,7 +76,7 @@ typedef struct acmd_export_ acmd_export_t;
 
 const cmd_export_t* find_cmd_export_t(const char* name, int flags);
 int check_cmd_call_params(const cmd_export_t *cmd, action_elem_t *elems, int no_params);
-int check_acmd_call_params(acmd_export_t *acmd, action_elem_t *elems, int no_params);
+int check_acmd_call_params(const acmd_export_t *acmd, action_elem_t *elems, int no_params);
 
 const cmd_export_t* find_core_cmd_export_t(const char* name, int flags);
 const cmd_export_t* find_mod_cmd_export_t(const char* name, int flags);
diff --git a/core_stats.c b/core_stats.c
index c4f2422370d..739a5207006 100644
--- a/core_stats.c
+++ b/core_stats.c
@@ -59,7 +59,7 @@ stat_var* bad_msg_hdr;
 stat_var* slow_msgs;
 
 
-stat_export_t core_stats[] = {
+const stat_export_t core_stats[] = {
 	{"rcv_requests" ,         0,  &rcv_reqs              },
 	{"rcv_replies" ,          0,  &rcv_rpls              },
 	{"fwd_requests" ,         0,  &fwd_reqs              },
@@ -94,7 +94,7 @@ static unsigned long net_get_wb_tls(unsigned short foo)
 	return get_total_bytes_waiting(PROTO_TLS);
 }
 
-stat_export_t net_stats[] = {
+const stat_export_t net_stats[] = {
 	{"waiting_udp" ,    STAT_IS_FUNC,  (stat_var**)net_get_wb_udp    },
 	{"waiting_tcp" ,    STAT_IS_FUNC,  (stat_var**)net_get_wb_tcp    },
 	{"waiting_tls" ,    STAT_IS_FUNC,  (stat_var**)net_get_wb_tls    },
diff --git a/evi/event_interface.c b/evi/event_interface.c
index 87c8cf60f6e..414a917af4a 100644
--- a/evi/event_interface.c
+++ b/evi/event_interface.c
@@ -309,7 +309,7 @@ int evi_event_subscribe(str event_name,
 {
 	evi_subs_t *subscriber = NULL;
 	evi_event_p event;
-	evi_export_t *trans_mod = NULL;
+	const evi_export_t *trans_mod = NULL;
 	evi_reply_sock *sock;
 
 	event = evi_get_event(&event_name);
@@ -648,7 +648,7 @@ static int evi_print_event(mi_item_t *ev_obj, evi_event_t *ev, evi_subs_p subs)
 
 static evi_subs_p evi_get_subscriber(evi_event_p event, str sock_str)
 {
-	evi_export_t * trans_mod;
+	const evi_export_t * trans_mod;
 	evi_subs_p subscriber = NULL;
 	evi_reply_sock * sock;
 
diff --git a/evi/event_interface.h b/evi/event_interface.h
index 9731bd4c1bd..7b37a06623e 100644
--- a/evi/event_interface.h
+++ b/evi/event_interface.h
@@ -35,7 +35,7 @@
 #define DEFAULT_EXPIRE	3600
 
 typedef struct evi_subscriber {
-	evi_export_t* trans_mod;			/* transport module */
+	const evi_export_t* trans_mod;		/* transport module */
 	evi_reply_sock* reply_sock;		/* reply socket */
 	struct evi_subscriber *next;		/* next subscriber */
 } evi_subs_t, *evi_subs_p;
@@ -70,7 +70,7 @@ mi_response_t *w_mi_raise_event(const mi_params_t *params,
 								struct mi_handler *async_hdl);
 
 /* returns the transport export */
-evi_export_t* get_trans_mod(str* tran);
+const evi_export_t* get_trans_mod(str* tran);
 
 /* returns the transport modules number */
 int get_trans_mod_no(void);
diff --git a/evi/evi_transport.c b/evi/evi_transport.c
index 7bd00c24b6f..727d4840449 100644
--- a/evi/evi_transport.c
+++ b/evi/evi_transport.c
@@ -36,7 +36,7 @@ static int evi_trans_mods_size = 0;
 
 /* functions used by the transport modules */
 
-int register_event_mod(evi_export_t *ev)
+int register_event_mod(const evi_export_t *ev)
 {
 	evi_trans_t *trans_mod;
 
@@ -108,7 +108,7 @@ int get_trans_mod_no(void)
 }
 
 /* Returns the transport export */
-evi_export_t* get_trans_mod(str* tran)
+const evi_export_t* get_trans_mod(str* tran)
 {
 	str t;
 	char *p;
diff --git a/evi/evi_transport.h b/evi/evi_transport.h
index 30546809369..e2cfdf575d2 100644
--- a/evi/evi_transport.h
+++ b/evi/evi_transport.h
@@ -97,7 +97,7 @@ typedef struct evi_export_ {
 
 /* transport list */
 typedef struct evi_trans_ {
-	evi_export_t *module;
+	const evi_export_t *module;
 	struct evi_trans_ *next;
 } evi_trans_t;
 
@@ -110,7 +110,7 @@ typedef struct evi_trans_ {
  * Returns:
  *  - 0 if successful or negative on error
  */
-int register_event_mod(evi_export_t *ev);
+int register_event_mod(const evi_export_t *ev);
 
 /*
  * Used to build the payload of an event
diff --git a/mi/mi_core.c b/mi/mi_core.c
index 4f4614d8a19..6eac7f7fb95 100644
--- a/mi/mi_core.c
+++ b/mi/mi_core.c
@@ -764,7 +764,7 @@ static mi_response_t *w_reload_routes(const mi_params_t *params,
 
 
 
-static mi_export_t mi_core_cmds[] = {
+static const mi_export_t mi_core_cmds[] = {
 	{ "uptime", "prints various time information about OpenSIPS - "
 		"when it started to run, for how long it runs", 0, init_mi_uptime, {
 		{mi_uptime, {0}},
diff --git a/mod_fix.c b/mod_fix.c
index 7a5143f471b..4466e59e300 100644
--- a/mod_fix.c
+++ b/mod_fix.c
@@ -79,10 +79,10 @@ static inline gparam_p alloc_gp(void)
 	return gp;
 }
 
-int check_cmd(struct cmd_param *params, action_elem_t *elems)
+int check_cmd(const struct cmd_param *params, action_elem_t *elems)
 {
 	int i;
-	struct cmd_param *param;
+	const struct cmd_param *param;
 	pv_elem_t *pve;
 
 	for (param=params, i=1; param->flags; param++, i++) {
diff --git a/mod_fix.h b/mod_fix.h
index ce17af8d85f..73969cecbc0 100644
--- a/mod_fix.h
+++ b/mod_fix.h
@@ -45,7 +45,7 @@ typedef struct _gparam
 
 struct cmd_param;
 
-int check_cmd(struct cmd_param *params, action_elem_t *elems);
+int check_cmd(const struct cmd_param *params, action_elem_t *elems);
 int fix_cmd(const struct cmd_param *params, action_elem_t *elems);
 int get_cmd_fixups(struct sip_msg* msg, const struct cmd_param *params,
 				action_elem_t *elems, void **cmdp, pv_value_t *tmp_val);
diff --git a/modules/aaa_diameter/aaa_diameter.c b/modules/aaa_diameter/aaa_diameter.c
index e63f51459e7..e9593823d34 100644
--- a/modules/aaa_diameter/aaa_diameter.c
+++ b/modules/aaa_diameter/aaa_diameter.c
@@ -44,7 +44,7 @@ str dm_realm = str_init("diameter.test");
 str dm_peer_identity = str_init("server"); /* a.k.a. server.diameter.test */
 int dm_answer_timeout = 2000; /* ms */
 
-static cmd_export_t cmds[]= {
+static const cmd_export_t cmds[]= {
 	{"dm_send_request", (cmd_function)dm_send_request, {
 		{CMD_PARAM_INT,0,0},
 		{CMD_PARAM_INT,0,0},
@@ -56,12 +56,12 @@ static cmd_export_t cmds[]= {
 	{0,0,{{0,0,0}},0}
 };
 
-static proc_export_t procs[] = {
+static const proc_export_t procs[] = {
 	{ "diameter-peer", NULL, NULL, diameter_peer_loop, 1, 0 },
 	{ 0, 0, 0, 0, 0, 0 },
 };
 
-static param_export_t params[] =
+static const param_export_t params[] =
 {
 	{ "fd_log_level",    INT_PARAM, &fd_log_level     },
 	{ "realm",           STR_PARAM, &dm_realm.s       },
@@ -70,7 +70,7 @@ static param_export_t params[] =
 	{ NULL, 0, NULL },
 };
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "fd_log_level", 0, 0, 0, {
 		{NULL, {"log_level", 0}},
 		{EMPTY_MI_RECIPE}}
@@ -78,7 +78,7 @@ static mi_export_t mi_cmds[] = {
 	{EMPTY_MI_EXPORT}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_NULL, NULL, 0 },
 	},
diff --git a/modules/aaa_radius/aaa_radius.c b/modules/aaa_radius/aaa_radius.c
index 64c0a8ad180..5a5a233adac 100644
--- a/modules/aaa_radius/aaa_radius.c
+++ b/modules/aaa_radius/aaa_radius.c
@@ -100,7 +100,7 @@ struct rad_ctx {
 };
 #endif
 
-static acmd_export_t acmds[] = {
+static const acmd_export_t acmds[] = {
 #ifdef RADIUS_ASYNC_SUPPORT
 	{"radius_send_auth", (acmd_function) send_auth_func_async, {
 		{CMD_PARAM_STR, radius_hdl_fixup, 0},
@@ -111,7 +111,7 @@ static acmd_export_t acmds[] = {
 	{0,0,{{0,0,0}}}
 };
 
-static cmd_export_t cmds[]= {
+static const cmd_export_t cmds[]= {
 	{"aaa_bind_api", (cmd_function) aaa_radius_bind_api, {{0, 0, 0}}, 0},
 	{"radius_send_auth", (cmd_function) send_auth_func, {
 		{CMD_PARAM_STR, radius_hdl_fixup, 0},
@@ -126,7 +126,7 @@ static cmd_export_t cmds[]= {
 };
 
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"sets",             STR_PARAM|USE_FUNC_PARAM, parse_sets_func},
 	{"radius_config",    STR_PARAM,                &config_file},
 	{"syslog_name",      STR_PARAM,                &syslog_name},
diff --git a/modules/acc/acc_mod.c b/modules/acc/acc_mod.c
index 872a7576192..76f4431c204 100644
--- a/modules/acc/acc_mod.c
+++ b/modules/acc/acc_mod.c
@@ -149,7 +149,7 @@ static int fixup_init_dburl(void **param);
 /**
  * pseudo-variables exported by acc module
  */
-static pv_export_t mod_items[] = {
+static const pv_export_t mod_items[] = {
 	{ {"acc_extra", sizeof("acc_extra") - 1}, 2001, pv_get_acc_extra,
 		pv_set_acc_extra, pv_parse_acc_extra_name,
 		0 /* parse index(won't use here) */, 0, 0},
@@ -161,7 +161,7 @@ static pv_export_t mod_items[] = {
 	{ {0, 0}, 0, 0, 0, 0, 0, 0, 0 }
 };
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"acc_log_request", (cmd_function)w_acc_log_request, {
 		{CMD_PARAM_STR, 0, 0}, {0,0,0}},
 		REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE},
@@ -200,7 +200,7 @@ static cmd_export_t cmds[] = {
 	{0,0,{{0,0,0}},0}
 };
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"early_media",             INT_PARAM, &early_media               },
 	{"report_cancels",          INT_PARAM, &report_cancels            },
 	{"detect_direction",        INT_PARAM, &detect_direction          },
@@ -248,7 +248,7 @@ static module_dependency_t *get_deps_detect_dir(const param_export_t *param)
 	return alloc_module_dep(MOD_TYPE_DEFAULT, "rr", DEP_ABORT);
 }
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "tm", DEP_ABORT  },
 		{ MOD_TYPE_DEFAULT, "dialog", DEP_SILENT  },
diff --git a/modules/alias_db/alias_db.c b/modules/alias_db/alias_db.c
index e33c7692ac8..2a324826d1a 100644
--- a/modules/alias_db/alias_db.c
+++ b/modules/alias_db/alias_db.c
@@ -67,7 +67,7 @@ db_con_t* db_handle;   /* Database connection handle */
 db_func_t adbf;  /* DB functions */
 
 /* Exported functions */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"alias_db_lookup", (cmd_function)alias_db_lookup, {
 		{CMD_PARAM_STR, 0, 0},
 		{CMD_PARAM_STR|CMD_PARAM_OPT, alias_flags_fixup ,0}, {0,0,0}},
@@ -82,7 +82,7 @@ static cmd_export_t cmds[] = {
 };
 
 /* Exported parameters */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"db_url",              STR_PARAM, &db_url.s        },
 	{"user_column",         STR_PARAM, &user_column.s   },
 	{"domain_column",       STR_PARAM, &domain_column.s },
@@ -93,7 +93,7 @@ static param_export_t params[] = {
 	{0, 0, 0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_SQLDB, NULL, DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/auth/auth_mod.c b/modules/auth/auth_mod.c
index 48a94fbc21e..d217adf1ec8 100644
--- a/modules/auth/auth_mod.c
+++ b/modules/auth/auth_mod.c
@@ -119,7 +119,7 @@ int disable_nonce_check = 0;
  * Exported functions
  */
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"www_challenge", (cmd_function)www_challenge, {
 		{CMD_PARAM_STR,0,0},
 		{CMD_PARAM_STR|CMD_PARAM_OPT,fixup_qop,0},
@@ -151,7 +151,7 @@ static cmd_export_t cmds[] = {
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"secret",              STR_PARAM, &sec_param          },
 	{"nonce_expire",        INT_PARAM, &nonce_expire       },
 	{"rpid_prefix",         STR_PARAM, &rpid_prefix.s      },
@@ -165,7 +165,7 @@ static param_export_t params[] = {
 	{0, 0, 0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "signaling", DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/auth_aaa/authaaa_mod.c b/modules/auth_aaa/authaaa_mod.c
index 8ed79e33913..08e97f70857 100644
--- a/modules/auth_aaa/authaaa_mod.c
+++ b/modules/auth_aaa/authaaa_mod.c
@@ -66,7 +66,7 @@ char *use_ruri_flag_str = 0;
  * Exported functions
  */
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"aaa_www_authorize", (cmd_function)aaa_www_authorize, {
 		{CMD_PARAM_STR,0,0},
 		{CMD_PARAM_STR|CMD_PARAM_OPT,0,0}, {0,0,0}},
@@ -87,7 +87,7 @@ static cmd_export_t cmds[] = {
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"aaa_url",            STR_PARAM, &aaa_proto_url       },
 	{"auth_service_type",  INT_PARAM, &auth_service_type   },
 	{"check_service_type", INT_PARAM, &check_service_type  },
@@ -108,7 +108,7 @@ static module_dependency_t *get_deps_aaa_url(const param_export_t *param)
 	return NULL;
 }
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_AAA,     NULL,   DEP_WARN  },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/auth_db/authdb_mod.c b/modules/auth_db/authdb_mod.c
index 2793dd0f3fe..ca176ef5967 100644
--- a/modules/auth_db/authdb_mod.c
+++ b/modules/auth_db/authdb_mod.c
@@ -115,7 +115,7 @@ int skip_version_check      = 0; /* skips version check for custom db */
  * Exported functions
  */
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"www_authorize", (cmd_function)www_authorize, {
 		{CMD_PARAM_STR, 0, 0},
 		{CMD_PARAM_STR, auth_fixup_table, 0}, {0,0,0}},
@@ -146,7 +146,7 @@ static cmd_export_t cmds[] = {
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"db_url",            STR_PARAM, &db_url.s            },
 	{"user_column",       STR_PARAM, &user_column.s       },
 	{"domain_column",     STR_PARAM, &domain_column.s     },
@@ -164,7 +164,7 @@ static param_export_t params[] = {
 };
 
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "auth", DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/auth_jwt/authjwt_mod.c b/modules/auth_jwt/authjwt_mod.c
index e5ee12a8056..75e06fa716b 100644
--- a/modules/auth_jwt/authjwt_mod.c
+++ b/modules/auth_jwt/authjwt_mod.c
@@ -108,7 +108,7 @@ int jwt_credentials_n           = 0; /* Number of credentials in the list */
  * Exported functions
  */
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"jwt_db_authorize", (cmd_function)jwt_db_authorize, {
 		{CMD_PARAM_STR, 0, 0},
 		{CMD_PARAM_VAR, fixup_check_outvar, 0},
@@ -129,7 +129,7 @@ static cmd_export_t cmds[] = {
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"db_mode",           INT_PARAM, &jwt_db_mode                 },
 	{"db_url",            STR_PARAM, &db_url.s                },
 	{"profiles_table",    STR_PARAM, &profiles_table.s        },
@@ -146,7 +146,7 @@ static param_export_t params[] = {
 };
 
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_NULL, NULL, 0 },
 	},
diff --git a/modules/avpops/avpops.c b/modules/avpops/avpops.c
index c501899b596..b8d93f08cd9 100644
--- a/modules/avpops/avpops.c
+++ b/modules/avpops/avpops.c
@@ -129,7 +129,7 @@ static int w_op_avps(struct sip_msg* msg, char* param, char *op);
 static int w_subst(struct sip_msg* msg, char* src, char *subst);
 static int w_is_avp_set(struct sip_msg* msg, char* param, char *foo);
 
-static acmd_export_t acmds[] = {
+static const acmd_export_t acmds[] = {
 	{"avp_db_query", (acmd_function)w_async_dbquery_avps, {
 		{CMD_PARAM_STR, 0, 0},
 		{CMD_PARAM_STR|CMD_PARAM_OPT|CMD_PARAM_NO_EXPAND, fixup_pvname_list, fixup_free_pvname_list},
@@ -140,7 +140,7 @@ static acmd_export_t acmds[] = {
 /*! \brief
  * Exported functions
  */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"avp_print", (cmd_function)w_print_avps, {{0, 0, 0}},
 		REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE|
 		STARTUP_ROUTE|TIMER_ROUTE|EVENT_ROUTE},
@@ -226,7 +226,7 @@ static cmd_export_t cmds[] = {
 /*! \brief
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"db_url",            STR_PARAM|USE_FUNC_PARAM, (void*)add_db_url },
 	{"avp_table",         STR_PARAM, &db_table.s      },
 	{"use_domain",        INT_PARAM, &use_domain      },
@@ -240,7 +240,7 @@ static param_export_t params[] = {
 	{0, 0, 0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_NULL, NULL, 0 },
 	},
diff --git a/modules/b2b_entities/b2b_entities.c b/modules/b2b_entities/b2b_entities.c
index 5faf0096f2f..2f4d04e6e28 100644
--- a/modules/b2b_entities/b2b_entities.c
+++ b/modules/b2b_entities/b2b_entities.c
@@ -95,13 +95,13 @@ struct tm_binds tmb;
 uac_auth_api_t uac_auth_api;
 
 /** Exported functions */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"load_b2b",  (cmd_function)b2b_entities_bind, {{0,0,0}}, 0},
 	{0,0,{{0,0,0}},0}
 };
 
 /** Exported parameters */
-static param_export_t params[]={
+static const param_export_t params[]={
 	{ "server_hsize",          INT_PARAM,    &server_hsize       },
 	{ "client_hsize",          INT_PARAM,    &client_hsize       },
 	{ "script_req_route",      STR_PARAM,    &script_req_route   },
@@ -118,7 +118,7 @@ static param_export_t params[]={
 	{ 0,                       0,            0                   }
 };
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "b2be_list", 0,0,0,{
 		{mi_b2be_list, {0}},
 		{EMPTY_MI_RECIPE}}
@@ -126,7 +126,7 @@ static mi_export_t mi_cmds[] = {
 	{EMPTY_MI_EXPORT}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "tm",       DEP_ABORT },
 		{ MOD_TYPE_DEFAULT, "uac_auth", DEP_WARN  },
diff --git a/modules/b2b_logic/b2b_logic.c b/modules/b2b_logic/b2b_logic.c
index 0819988ff5a..fb88035b45f 100644
--- a/modules/b2b_logic/b2b_logic.c
+++ b/modules/b2b_logic/b2b_logic.c
@@ -187,7 +187,7 @@ b2bl_tuple_t *local_ctx_tuple;
  * MI cmd, when the tuple is not created yet */
 struct b2b_ctx_val *local_ctx_vals;
 
-static cmd_export_t cmds[]=
+static const cmd_export_t cmds[]=
 {
 	{"b2b_init_request", (cmd_function)b2bl_script_init_request, {
 		{CMD_PARAM_STR, fixup_init_id, 0},
@@ -260,7 +260,7 @@ static cmd_export_t cmds[]=
 };
 
 /** Exported parameters */
-static param_export_t params[]=
+static const param_export_t params[]=
 {
 	{"hash_size",       INT_PARAM,                &b2bl_hsize                },
 	{"cleanup_period",  INT_PARAM,                &b2b_clean_period          },
@@ -287,7 +287,7 @@ static param_export_t params[]=
 	{0,                    0,                          0                     }
 };
 
-static pv_export_t mod_items[] = {
+static const pv_export_t mod_items[] = {
 	{{"b2b_logic.key", sizeof("b2b_logic.key") - 1}, 1000, pv_get_b2bl_key,
 		0, 0, 0, 0, 0},
 	{{"b2b_logic.scenario", sizeof("b2b_logic.scenario") - 1}, 1000,
@@ -299,7 +299,7 @@ static pv_export_t mod_items[] = {
 	{ {0, 0}, 0, 0, 0, 0, 0, 0, 0 }
 };
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{"b2b_trigger_scenario", 0, 0, 0, {
 		{mi_trigger_scenario, {"scenario_id", "entity1", "entity2", 0}},
 		{mi_trigger_scenario, {"scenario_id", "entity1", "entity2", "context", 0}},
@@ -323,7 +323,7 @@ static mi_export_t mi_cmds[] = {
 	{EMPTY_MI_EXPORT}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "b2b_entities", DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/b2b_sca/b2b_sca.c b/modules/b2b_sca/b2b_sca.c
index 7b455596646..2e86536ee5e 100644
--- a/modules/b2b_sca/b2b_sca.c
+++ b/modules/b2b_sca/b2b_sca.c
@@ -84,7 +84,7 @@ str presence_server = {NULL, 0};
 
 
 /** Exported functions */
-static cmd_export_t cmds[]=
+static const cmd_export_t cmds[]=
 {
 	{"sca_init_request"  ,(cmd_function)sca_init_request, {
 		{CMD_PARAM_INT,0,0}, {0,0,0}},
@@ -96,7 +96,7 @@ static cmd_export_t cmds[]=
 };
 
 /** Exported parameters */
-static param_export_t params[]=
+static const param_export_t params[]=
 {
 	{"hash_size",				INT_PARAM,&b2b_sca_hsize			},
 	{"presence_server",			STR_PARAM,&presence_server.s			},
@@ -162,7 +162,7 @@ static param_export_t params[]=
 };
 
 /** MI commands */
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "sca_list", 0,0,0,{
 		{mi_sca_list, {0}},
 		{EMPTY_MI_RECIPE}}
@@ -170,7 +170,7 @@ static mi_export_t mi_cmds[] = {
 	{EMPTY_MI_EXPORT}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "pua",       DEP_ABORT },
 		{ MOD_TYPE_DEFAULT, "b2b_logic", DEP_ABORT },
diff --git a/modules/b2b_sdp_demux/b2b_sdp_demux.c b/modules/b2b_sdp_demux/b2b_sdp_demux.c
index 0446ffe92da..6417b68d6c6 100644
--- a/modules/b2b_sdp_demux/b2b_sdp_demux.c
+++ b/modules/b2b_sdp_demux/b2b_sdp_demux.c
@@ -29,7 +29,7 @@
 #include "../../msg_translator.h"
 #include "../../rw_locking.h"
 
-static dep_export_t mod_deps = {
+static const dep_export_t mod_deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "b2b_entities", DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
@@ -66,7 +66,7 @@ static void b2b_sdp_client_event_received(enum b2b_entity_type et, str *key,
 		str *logic_key, void *param, enum b2b_event_type event_type,
 		bin_packet_t *store, int backend);
 
-static cmd_export_t mod_cmds[] = {
+static const cmd_export_t mod_cmds[] = {
 	{"b2b_sdp_demux", (cmd_function)b2b_sdp_demux, {
 		{CMD_PARAM_STR, 0, 0},
 		{CMD_PARAM_VAR|CMD_PARAM_OPT, fixup_check_avp, 0},
@@ -144,7 +144,7 @@ static int b2b_sdp_parse_bye_mode(unsigned int type, void *val)
 	return 0;
 }
 
-static param_export_t mod_params[]={
+static const param_export_t mod_params[]={
 	{ "client_bye_mode", STR_PARAM|USE_FUNC_PARAM, b2b_sdp_parse_bye_mode },
 	{ 0,                 0,                        0                       }
 };
diff --git a/modules/benchmark/benchmark.c b/modules/benchmark/benchmark.c
index 7543898190a..12b7c1e911e 100644
--- a/modules/benchmark/benchmark.c
+++ b/modules/benchmark/benchmark.c
@@ -99,7 +99,7 @@ static inline int fixup_bm_timer(void** param);
 /*
  * Exported functions
  */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"bm_start_timer", (cmd_function)bm_start_timer, {
 		{CMD_PARAM_STR, fixup_bm_timer, 0}, {0,0,0}},
 		REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE|
@@ -116,7 +116,7 @@ static cmd_export_t cmds[] = {
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"enable",      INT_PARAM, &bm_enable_global},
 	{"granularity", INT_PARAM, &bm_granularity},
 	{"loglevel",    INT_PARAM, &bm_loglevel},
@@ -138,7 +138,7 @@ mi_response_t *mi_bm_loglevel(const mi_params_t *params,
 mi_response_t *mi_bm_poll_results(const mi_params_t *params,
 								struct mi_handler *async_hdl);
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "bm_enable_global", 0,0,0, {
 		{mi_bm_enable_global, {"enable", 0}},
 		{EMPTY_MI_RECIPE}}
@@ -165,7 +165,7 @@ static mi_export_t mi_cmds[] = {
 static int bm_get_time_diff(struct sip_msg *msg, pv_param_t *param,
 		pv_value_t *res);
 
-static pv_export_t mod_items[] = {
+static const pv_export_t mod_items[] = {
 	{ {"BM_time_diff", sizeof("BM_time_diff")-1}, 1000, bm_get_time_diff, 0,
 		0, 0, 0, 0 },
 	{ {0, 0}, 0, 0, 0, 0, 0, 0, 0 }
diff --git a/modules/cachedb_cassandra/cachedb_cassandra.c b/modules/cachedb_cassandra/cachedb_cassandra.c
index 9d9891f91f6..0d3f2c5244e 100644
--- a/modules/cachedb_cassandra/cachedb_cassandra.c
+++ b/modules/cachedb_cassandra/cachedb_cassandra.c
@@ -55,7 +55,7 @@ int set_connection(unsigned int type, void *val)
 	return cachedb_store_url(&cassandra_script_urls,(char *)val);
 }
 
-static param_export_t params[]={
+static const param_export_t params[]={
 	{"connect_timeout", INT_PARAM, &cassandra_conn_timeout},
 	{"query_timeout", INT_PARAM, &cassandra_query_timeout},
 	{"exec_threshold", INT_PARAM, &cassandra_exec_threshold},
diff --git a/modules/cachedb_couchbase/cachedb_couchbase.c b/modules/cachedb_couchbase/cachedb_couchbase.c
index 3711ba74aed..e8473544d0d 100644
--- a/modules/cachedb_couchbase/cachedb_couchbase.c
+++ b/modules/cachedb_couchbase/cachedb_couchbase.c
@@ -56,7 +56,7 @@ int set_connection(unsigned int type, void *val)
 	return cachedb_store_url(&couchbase_script_urls,(char *)val);
 }
 
-static param_export_t params[]={
+static const param_export_t params[]={
 	{ "cachedb_url",	STR_PARAM|USE_FUNC_PARAM,	(void *)&set_connection},
 	{ "timeout",		INT_PARAM,					&couch_timeout_usec },
 	{ "lazy_connect",       INT_PARAM,                                      &couch_lazy_connect },
diff --git a/modules/cachedb_local/cachedb_local.c b/modules/cachedb_local/cachedb_local.c
index 88eb3b36da2..08020fe530f 100644
--- a/modules/cachedb_local/cachedb_local.c
+++ b/modules/cachedb_local/cachedb_local.c
@@ -78,7 +78,7 @@ void localcache_clean(unsigned int ticks,void *param);
 static int parse_collections(unsigned int type, void *val);
 static int store_urls(unsigned int type, void *val);
 
-static param_export_t params[]={
+static const param_export_t params[]={
 	{ "cache_clean_period", INT_PARAM, &cache_clean_period },
 	{ "exec_threshold",     INT_PARAM, &local_exec_threshold },
 	{ "cache_collections",  STR_PARAM|USE_FUNC_PARAM, (void *)parse_collections },
@@ -89,7 +89,7 @@ static param_export_t params[]={
 	{0,0,0}
 };
 
-static cmd_export_t cmds[]= {
+static const cmd_export_t cmds[]= {
 	{"cache_remove_chunk",        (cmd_function)remove_chunk_f, {
 		{CMD_PARAM_STR|CMD_PARAM_OPT,0,0},
 		{CMD_PARAM_STR,0,0}, {0,0,0}},
@@ -97,7 +97,7 @@ static cmd_export_t cmds[]= {
 	{0,0,{{0,0,0}},0}
 };
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "cache_remove_chunk", 0, 0, 0, {
 		{mi_cache_remove_chunk_1, {"glob", 0}},
 		{mi_cache_remove_chunk_2, {"glob", "collection", 0}},
@@ -106,7 +106,7 @@ static mi_export_t mi_cmds[] = {
 	{EMPTY_MI_EXPORT}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_NULL, NULL, 0},
 	},
diff --git a/modules/cachedb_memcached/cachedb_memcached.c b/modules/cachedb_memcached/cachedb_memcached.c
index 72b5130116f..9efdfc29616 100644
--- a/modules/cachedb_memcached/cachedb_memcached.c
+++ b/modules/cachedb_memcached/cachedb_memcached.c
@@ -73,7 +73,7 @@ static void destroy(void);
 mem_server * servers;
 
 /** module parameters */
-static param_export_t params[]={
+static const param_export_t params[]={
 	{"cachedb_url",        STR_PARAM|USE_FUNC_PARAM, (void*)&mc_set_connection },
 	{"exec_threshold",     INT_PARAM,                &memcache_exec_threshold  },
 	{0,0,0}
diff --git a/modules/cachedb_mongodb/cachedb_mongodb.c b/modules/cachedb_mongodb/cachedb_mongodb.c
index 24792fce4d1..b32718abcab 100644
--- a/modules/cachedb_mongodb/cachedb_mongodb.c
+++ b/modules/cachedb_mongodb/cachedb_mongodb.c
@@ -56,7 +56,7 @@ int set_connection(unsigned int type, void *val)
 	return cachedb_store_url(&mongodb_script_urls,(char *)val);
 }
 
-static param_export_t params[]={
+static const param_export_t params[]={
 	{ "cachedb_url",   STR_PARAM|USE_FUNC_PARAM, (void *)&set_connection},
 	{ "exec_threshold", INT_PARAM, &mongo_exec_threshold },
 	{ "compat_mode_3.0", INT_PARAM, &compat_mode_30 },
@@ -64,7 +64,7 @@ static param_export_t params[]={
 	{0,0,0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 
 		/* tls_mgm must init TLS first, since it also sets custom alloc func */
diff --git a/modules/cachedb_redis/cachedb_redis.c b/modules/cachedb_redis/cachedb_redis.c
index 539dd3589e9..5728804cd59 100644
--- a/modules/cachedb_redis/cachedb_redis.c
+++ b/modules/cachedb_redis/cachedb_redis.c
@@ -52,7 +52,7 @@ int set_connection(unsigned int type, void *val)
 	return cachedb_store_url(&redis_script_urls,(char *)val);
 }
 
-static param_export_t params[]={
+static const param_export_t params[]={
 	{ "connect_timeout",             INT_PARAM,                &redis_connnection_tout},
 	{ "query_timeout",               INT_PARAM,                &redis_query_tout      },
 	{ "shutdown_on_error",           INT_PARAM,                &shutdown_on_error     },
@@ -77,7 +77,7 @@ static module_dependency_t *get_deps_use_tls_openssl(const param_export_t *param
 	return alloc_module_dep(MOD_TYPE_DEFAULT, "tls_openssl", DEP_ABORT);
 }
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{
 		{ MOD_TYPE_NULL, NULL, 0 },
 	},
diff --git a/modules/cachedb_sql/cachedb_sql.c b/modules/cachedb_sql/cachedb_sql.c
index e4f240047b3..0e6d4a59910 100644
--- a/modules/cachedb_sql/cachedb_sql.c
+++ b/modules/cachedb_sql/cachedb_sql.c
@@ -81,7 +81,7 @@ int set_connection(unsigned int type, void *val)
 	return cachedb_store_url(&sql_script_urls,(char *)val);
 }
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"cachedb_url",         STR_PARAM|USE_FUNC_PARAM, (void *)&set_connection },
 	{"db_table",            STR_PARAM, &db_table.s         },
 	{"key_column",          STR_PARAM, &key_column.s       },
diff --git a/modules/call_center/call_center.c b/modules/call_center/call_center.c
index 2482ec1f608..3f82e68e73d 100644
--- a/modules/call_center/call_center.c
+++ b/modules/call_center/call_center.c
@@ -115,7 +115,7 @@ static int internal_call_dispatching_param = 1;
 int *internal_call_dispatching = NULL;
 
 
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{"cc_handle_call", (cmd_function)w_handle_call,
 		{{CMD_PARAM_STR, 0,0},
 		 {CMD_PARAM_STR|CMD_PARAM_OPT, 0,0},
@@ -130,7 +130,7 @@ static cmd_export_t cmds[]={
 	{0,0,{{0,0,0}},0}
 };
 
-static param_export_t mod_params[]={
+static const param_export_t mod_params[]={
 	{ "db_url",               STR_PARAM, &db_url.s             },
 	{ "acc_db_url",           STR_PARAM, &acc_db_url.s         },
 	{ "rt_db_url",            STR_PARAM, &rt_db_url.s          },
@@ -171,7 +171,7 @@ static param_export_t mod_params[]={
 	{ 0,0,0 }
 };
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{"cc_reload", 0, 0, mi_child_init, {
 		{mi_cc_reload, {0}},
 		{EMPTY_MI_RECIPE}}
@@ -212,7 +212,7 @@ static mi_export_t mi_cmds[] = {
 	{EMPTY_MI_EXPORT}
 };
 
-static stat_export_t mod_stats[] = {
+static const stat_export_t mod_stats[] = {
 	{"ccg_incalls",             0,             &stg_incalls                  },
 	{"ccg_awt",                 STAT_IS_FUNC,  (stat_var**)stg_awt           },
 	{"ccg_load",                STAT_IS_FUNC,  (stat_var**)stg_load          },
@@ -226,7 +226,7 @@ static stat_export_t mod_stats[] = {
 	{0,0,0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "b2b_logic", DEP_ABORT },
 		{ MOD_TYPE_SQLDB,   NULL,        DEP_ABORT },
@@ -237,7 +237,7 @@ static dep_export_t deps = {
 	},
 };
 
-static pv_export_t mod_pvars[] = {
+static const pv_export_t mod_pvars[] = {
 	{ {"cc_state",  sizeof("cc_state")-1},     1000, pv_get_cc_state,
 		0,                 0, 0, 0, 0 },
 	{ {0, 0}, 0, 0, 0, 0, 0, 0, 0 }
diff --git a/modules/call_control/call_control.c b/modules/call_control/call_control.c
index c449b49b999..ea76c8f30bd 100644
--- a/modules/call_control/call_control.c
+++ b/modules/call_control/call_control.c
@@ -160,13 +160,13 @@ AVP_List *init_avps = NULL, *start_avps = NULL, *stop_avps = NULL;
 pv_elem_t *model;
 
 
-static cmd_export_t commands[] = {
+static const cmd_export_t commands[] = {
     {"call_control", (cmd_function)CallControl, {{0, 0, 0}}, REQUEST_ROUTE},
     {0, 0, {{0, 0, 0}}, 0}
 };
 
 
-static param_export_t parameters[] = {
+static const param_export_t parameters[] = {
     {"init",                    STR_PARAM|USE_FUNC_PARAM, (void*)parse_init},
     {"start",                   STR_PARAM|USE_FUNC_PARAM, (void*)parse_start},
     {"stop",                    STR_PARAM|USE_FUNC_PARAM, (void*)parse_stop},
@@ -183,7 +183,7 @@ static param_export_t parameters[] = {
 };
 
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
     // OpenSIPS module dependencies
     {
         {MOD_TYPE_DEFAULT, "dialog", DEP_ABORT},
diff --git a/modules/callops/callops.c b/modules/callops/callops.c
index 0b0942b9a41..836ffad6daf 100644
--- a/modules/callops/callops.c
+++ b/modules/callops/callops.c
@@ -146,7 +146,7 @@ static mi_response_t *mi_call_hold(const mi_params_t *params,
 static mi_response_t *mi_call_unhold(const mi_params_t *params,
 								struct mi_handler *async_hdl);
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "dialog", DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
@@ -156,7 +156,7 @@ static dep_export_t deps = {
 	},
 };
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{ "call_blind_replace", (cmd_function)call_blind_replace, {
 		{CMD_PARAM_STR,0,0}, {CMD_PARAM_STR|CMD_PARAM_OPT,0,0}, {0,0,0}},
 		REQUEST_ROUTE},
@@ -194,13 +194,13 @@ static int calling_mode_func(modparam_t type, void *val)
 	return 0;
 }
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"mode", STR_PARAM|INT_PARAM|USE_FUNC_PARAM, (void*)calling_mode_func},
 	{"match_param", STR_PARAM, &call_match_param.s},
 	{0, 0, 0}
 };
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "call_transfer", 0, 0, 0, {
 		{mi_call_blind_transfer, {"callid", "leg", "destination", 0}},
 		{mi_call_attended_transfer,
diff --git a/modules/carrierroute/carrierroute.c b/modules/carrierroute/carrierroute.c
index d621c3b74b2..de8f9feb4b0 100644
--- a/modules/carrierroute/carrierroute.c
+++ b/modules/carrierroute/carrierroute.c
@@ -139,7 +139,7 @@ static int hash_fixup(void ** param);
 
 
 /************* Module Exports **********************************************/
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{"cr_user_carrier",          (cmd_function)cr_load_user_carrier, {
 		{CMD_PARAM_STR,0,0},
 		{CMD_PARAM_STR,0,0},
@@ -172,7 +172,7 @@ static cmd_export_t cmds[]={
 	{0,0,{{0,0,0}},0}
 };
 
-static param_export_t params[]= {
+static const param_export_t params[]= {
 	{"db_url",                     STR_PARAM, &db_url.s },
 	{"db_table",                   STR_PARAM, &db_table.s },
 	{"db_failure_table",           STR_PARAM, &db_failure_table.s },
@@ -213,7 +213,7 @@ static param_export_t params[]= {
 	{0,0,0}
 };
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "cr_reload_routes", 0, 0, 0, {
 		{reload_fifo, {0}},
 		{EMPTY_MI_RECIPE}}
@@ -245,7 +245,7 @@ static mi_export_t mi_cmds[] = {
 	{EMPTY_MI_EXPORT}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_SQLDB, NULL, DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/cfgutils/cfgutils.c b/modules/cfgutils/cfgutils.c
index 2c4aa89a77a..2b7fd0b9799 100644
--- a/modules/cfgutils/cfgutils.c
+++ b/modules/cfgutils/cfgutils.c
@@ -130,7 +130,7 @@ static char* hash_file = NULL;
 int lock_pool_size = 32;
 
 
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{"rand_set_prob", (cmd_function)set_prob, {
 		{CMD_PARAM_INT, 0, 0}, {0,0,0}},
 		REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE|
@@ -212,7 +212,7 @@ static cmd_export_t cmds[]={
 	{0,0,{{0,0,0}},0}
 };
 
-static acmd_export_t acmds[] = {
+static const acmd_export_t acmds[] = {
 #ifdef HAVE_TIMER_FD
 	{"sleep", (acmd_function)async_sleep, {
 		{CMD_PARAM_INT, 0, 0}, {0,0,0}}},
@@ -223,7 +223,7 @@ static acmd_export_t acmds[] = {
 };
 
 
-static param_export_t params[]={
+static const param_export_t params[]={
 	{"initial_probability", INT_PARAM, &initial},
 	{"hash_file",           STR_PARAM, &hash_file},
 	{"shv_hash_size",       INT_PARAM, &shv_hash_size},
@@ -233,7 +233,7 @@ static param_export_t params[]={
 	{0,0,0}
 };
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ FIFO_SET_PROB, 0, 0, 0, {
 		{mi_set_prob, {"prob_proc", 0}},
 		{EMPTY_MI_RECIPE}}
@@ -266,7 +266,7 @@ static mi_export_t mi_cmds[] = {
 	{EMPTY_MI_EXPORT}
 };
 
-static pv_export_t mod_items[] = {
+static const pv_export_t mod_items[] = {
 	{ {"RANDOM", sizeof("RANDOM")-1}, 1000, pv_get_random_val, 0,
 		0, 0, 0, 0 },
 	{ {"shv", (sizeof("shv")-1)}, 1001, pv_get_shvar,
diff --git a/modules/cgrates/cgrates.c b/modules/cgrates/cgrates.c
index 7b554cdae48..df72f44f012 100644
--- a/modules/cgrates/cgrates.c
+++ b/modules/cgrates/cgrates.c
@@ -82,7 +82,7 @@ static int pv_get_cgr_reply(struct sip_msg *msg, pv_param_t *param,
 
 OSIPS_LIST_HEAD(cgrates_engines);
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"cgrates_acc", (cmd_function)w_cgr_acc, {
 		{CMD_PARAM_STR|CMD_PARAM_OPT, fixup_flags, 0},
 		{CMD_PARAM_STR|CMD_PARAM_OPT, fixup_dlg_loaded, 0},
@@ -101,7 +101,7 @@ static cmd_export_t cmds[] = {
 	{0,0,{{0,0,0}},0}
 };
 
-static pv_export_t pvars[] = {
+static const pv_export_t pvars[] = {
 	{ str_init("cgr"), 2003, w_pv_get_cgr, w_pv_set_cgr,
 		pv_parse_cgr, pv_parse_idx_cgr, 0, 0},
 	{ str_init("cgr_opt"), 2004, w_pv_get_cgr_opt, w_pv_set_cgr_opt,
@@ -111,7 +111,7 @@ static pv_export_t pvars[] = {
 	{ {0, 0}, 0, 0, 0, 0, 0, 0, 0 }
 };
 
-static acmd_export_t acmds[] = {
+static const acmd_export_t acmds[] = {
 	{"cgrates_auth", (acmd_function)w_acgr_auth, {
 		{CMD_PARAM_STR|CMD_PARAM_OPT, 0, 0},
 		{CMD_PARAM_STR|CMD_PARAM_OPT, 0, 0},
@@ -122,7 +122,7 @@ static acmd_export_t acmds[] = {
 	{0,0,{{0,0,0}}}
 };
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"cgrates_engine", STR_PARAM|USE_FUNC_PARAM,
 		(void*)cgrates_set_engine },
 	{"bind_ip", STR_PARAM, &cgre_bind_ip.s },
@@ -132,7 +132,7 @@ static param_export_t params[] = {
 	{0, 0, 0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "dialog", DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/clusterer/clusterer_mod.c b/modules/clusterer/clusterer_mod.c
index eea485f20f9..60b4a0080ea 100644
--- a/modules/clusterer/clusterer_mod.c
+++ b/modules/clusterer/clusterer_mod.c
@@ -112,7 +112,7 @@ int cmd_check_addr(struct sip_msg *msg, int *cluster_id, str *ip_str,
  * Exported functionsu
  */
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"load_clusterer",  (cmd_function)load_clusterer, {{0,0,0}}, 0},
 	{"cluster_broadcast_req", (cmd_function)cmd_broadcast_req, {
 		{CMD_PARAM_INT,0,0},
@@ -142,7 +142,7 @@ static cmd_export_t cmds[] = {
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"enable_stats",		INT_PARAM,  &clusterer_enable_stats	},
 	{"db_url",				STR_PARAM,	&clusterer_db_url.s	},
 	{"db_table",			STR_PARAM,	&db_table.s			},
@@ -177,7 +177,7 @@ static param_export_t params[] = {
 /*
  * Exported MI functions
  */	
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "clusterer_reload", "reloads stored data from the database", 0,0,{
 		{clusterer_reload, {0}},
 		{EMPTY_MI_RECIPE}}
@@ -229,7 +229,7 @@ static mi_export_t mi_cmds[] = {
 };
 
 
-static pv_export_t mod_vars[] = {
+static const pv_export_t mod_vars[] = {
 	{ {"cluster.sh_tag", sizeof("cluster.sh_tag")-1}, 1000, var_get_sh_tag,
 		var_set_sh_tag,  var_parse_sh_tag_name , 0, 0, 0 },
 	{ {0, 0}, 0, 0, 0, 0, 0, 0, 0 }
@@ -246,7 +246,7 @@ static module_dependency_t *get_deps_db_mode(const param_export_t *param)
 	return alloc_module_dep(MOD_TYPE_SQLDB, NULL, DEP_ABORT);
 }
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "proto_bin",  DEP_SILENT },
 		{ MOD_TYPE_DEFAULT, "proto_bins", DEP_SILENT },
@@ -276,7 +276,7 @@ static unsigned long clusterer_get_num_nodes_down(unsigned short foo)
 	return clusterer_get_num_nodes(-1) - clusterer_get_num_nodes(LS_UP);
 }
 
-static stat_export_t mod_stats[] = {
+static const stat_export_t mod_stats[] = {
 	{"clusterer_nodes",       STAT_IS_FUNC,  (stat_var**)clusterer_get_num_nodes_total },
 	{"clusterer_nodes_up",    STAT_IS_FUNC,  (stat_var**)clusterer_get_num_nodes_up },
 	{"clusterer_nodes_down",  STAT_IS_FUNC,  (stat_var**)clusterer_get_num_nodes_down },
diff --git a/modules/compression/compression.c b/modules/compression/compression.c
index 1be82c01536..e797736c06d 100644
--- a/modules/compression/compression.c
+++ b/modules/compression/compression.c
@@ -155,12 +155,12 @@ static str body_in  = {NULL, 0},
 	   hdr_out  = {NULL, 0},
 	   buf_out  = {NULL, 0};
 
-static param_export_t mod_params[]={
+static const param_export_t mod_params[]={
 	{ "compression_level", INT_PARAM, &mc_level},
 	{0,0,0}
 };
 
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{"mc_compact",	  (cmd_function)mc_compact, {
 		{CMD_PARAM_STR|CMD_PARAM_OPT|CMD_PARAM_FIX_NULL,
 			fixup_whitelist_compact, fixup_whitelist_free},
diff --git a/modules/cpl_c/cpl.c b/modules/cpl_c/cpl.c
index 72f043718cd..550d289bfcb 100644
--- a/modules/cpl_c/cpl.c
+++ b/modules/cpl_c/cpl.c
@@ -108,7 +108,7 @@ static void cpl_process(int rank);
 /*
  * Exported processes
  */
-static proc_export_t cpl_procs[] = {
+static const proc_export_t cpl_procs[] = {
 	{"CPL Aux",  0,  0,  cpl_process, 1, 0 },
 	{0,0,0,0,0,0}
 };
@@ -118,7 +118,7 @@ static proc_export_t cpl_procs[] = {
  * Exported functions
  */
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"cpl_run_script", (cmd_function)cpl_invoke_script, {
 		{CMD_PARAM_STR,fixup_cpl_run_script_1,0},
 		{CMD_PARAM_STR,fixup_cpl_run_script_2,0}, {0,0,0}},
@@ -133,7 +133,7 @@ static cmd_export_t cmds[] = {
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"db_url",         STR_PARAM, &db_url.s                          },
 	{"db_table",       STR_PARAM, &db_table.s                        },
 	{"cpl_dtd_file",   STR_PARAM, &dtd_file                          },
@@ -156,7 +156,7 @@ static param_export_t params[] = {
 /*
  * Exported MI functions
  */
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "LOAD_CPL", 0, 0, 0, {
 		{mi_cpl_load, {"username", "cpl_filename", 0}},
 		{EMPTY_MI_RECIPE}}
@@ -181,7 +181,7 @@ static module_dependency_t *get_deps_lookup_domain(const param_export_t *param)
 	return alloc_module_dep(MOD_TYPE_DEFAULT, "usrloc", DEP_ABORT);
 }
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "tm",        DEP_ABORT },
 		{ MOD_TYPE_DEFAULT, "signaling", DEP_ABORT },
diff --git a/modules/db_berkeley/db_berkeley.c b/modules/db_berkeley/db_berkeley.c
index 47692bc9ce8..9cb463cbf77 100644
--- a/modules/db_berkeley/db_berkeley.c
+++ b/modules/db_berkeley/db_berkeley.c
@@ -67,7 +67,7 @@ int bdb_bind_api(const str* mod, db_func_t *dbb);
 /*
  * Exported functions
  */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"db_bind_api",    (cmd_function)bdb_bind_api, {{0,0,0}},0},
 	{0,0,{{0,0,0}},0}
 };
@@ -75,7 +75,7 @@ static cmd_export_t cmds[] = {
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"auto_reload",        INT_PARAM, &auto_reload },
 	{"log_enable",         INT_PARAM, &log_enable  },
 	{"journal_roll_interval", INT_PARAM, &journal_roll_interval  },
@@ -85,7 +85,7 @@ static param_export_t params[] = {
 /*
  * Exported MI functions
  */
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ MI_BDB_RELOAD, 0, 0, 0, {
 		{mi_bdb_reload, {"table_path", 0}},
 		{EMPTY_MI_RECIPE}}
diff --git a/modules/db_cachedb/db_cachedb.c b/modules/db_cachedb/db_cachedb.c
index 3f2fab19507..5b395fcd9c6 100644
--- a/modules/db_cachedb/db_cachedb.c
+++ b/modules/db_cachedb/db_cachedb.c
@@ -47,7 +47,7 @@ int set_connection(unsigned int type, void *val)
 /*
  * Virtual database module interface
  */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"db_bind_api", (cmd_function)db_cachedb_bind_api, {{0,0,0}},0},
 	{0,0,{{0,0,0}},0}
 };
@@ -55,12 +55,12 @@ static cmd_export_t cmds[] = {
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"cachedb_url",     STR_PARAM|USE_FUNC_PARAM,(void*)&set_connection},
 	{0, 0, 0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_CACHEDB, NULL, DEP_SILENT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/db_flatstore/flatstore_mod.c b/modules/db_flatstore/flatstore_mod.c
index 795def63de5..c8bd9e196dc 100644
--- a/modules/db_flatstore/flatstore_mod.c
+++ b/modules/db_flatstore/flatstore_mod.c
@@ -81,7 +81,7 @@ unsigned long long my_rotate;
 /*
  * Flatstore database module interface
  */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"db_bind_api",    (cmd_function)db_flat_bind_api, {{0,0,0}},0},
 	{0,0,{{0,0,0}},0}
 };
@@ -89,7 +89,7 @@ static cmd_export_t cmds[] = {
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"flush", INT_PARAM, &flat_flush},
 	{"delimiter", STR_PARAM, &flat_delimiter},
 	{"suffix", STR_PARAM, &flat_suffix_s.s},
@@ -100,7 +100,7 @@ static param_export_t params[] = {
 
 
 #define MI_FLAT_HELP "Params: none ; Rotates the logging file."
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ MI_FLAT_ROTATE, MI_FLAT_HELP, 0, 0, {
 		{mi_flat_rotate_cmd, {0}},
 		{EMPTY_MI_RECIPE}}
diff --git a/modules/db_http/db_http.c b/modules/db_http/db_http.c
index 814ea11d6aa..2a7a0de9290 100644
--- a/modules/db_http/db_http.c
+++ b/modules/db_http/db_http.c
@@ -56,7 +56,7 @@ unsigned int db_http_timeout = 30000; /* Default is 30 seconds */
 /*
  * MySQL database module interface
  */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"db_bind_api",         (cmd_function)db_http_bind_api, {{0,0,0}},0},
 	{0,0,{{0,0,0}},0}
 };
@@ -64,7 +64,7 @@ static cmd_export_t cmds[] = {
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"SSL", INT_PARAM  ,&use_ssl},
 	{"cap_raw_query", INT_PARAM  ,&cap_raw_query},
 	{"cap_replace", INT_PARAM  , &cap_replace},
diff --git a/modules/db_mysql/db_mysql.c b/modules/db_mysql/db_mysql.c
index a3e2804b12c..3bb28fce969 100644
--- a/modules/db_mysql/db_mysql.c
+++ b/modules/db_mysql/db_mysql.c
@@ -58,7 +58,7 @@ int db_mysql_bind_api(const str* mod, db_func_t *dbb);
 /*
  * MySQL database module interface
  */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"db_bind_api",         (cmd_function)db_mysql_bind_api,      {{0, 0, 0}}, 0},
 	{0, 0, {{0, 0, 0}}, 0}
 };
@@ -70,7 +70,7 @@ int use_tls;
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"timeout_interval", INT_PARAM, &db_mysql_timeout_interval},
 	{"exec_query_threshold", INT_PARAM, &db_mysql_exec_query_threshold},
 	{"max_db_retries", INT_PARAM, &max_db_retries},
@@ -88,7 +88,7 @@ static module_dependency_t *get_deps_use_tls(const param_export_t *param)
 	return alloc_module_dep(MOD_TYPE_DEFAULT, "tls_mgm", DEP_ABORT);
 }
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{
 		{ MOD_TYPE_NULL, NULL, 0 },
 	},
diff --git a/modules/db_oracle/db_oracle.c b/modules/db_oracle/db_oracle.c
index cbdfe7aa2e4..cbe780c422f 100644
--- a/modules/db_oracle/db_oracle.c
+++ b/modules/db_oracle/db_oracle.c
@@ -41,7 +41,7 @@ static int db_oracle_bind_api(const str* mod, db_func_t *dbb);
 /*
  * Oracle database module interface
  */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"db_bind_api",         (cmd_function)db_oracle_bind_api, {{0,0,0}},0},
 	{0,0,{{0,0,0}},0}
 };
@@ -49,7 +49,7 @@ static cmd_export_t cmds[] = {
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"timeout",	STR_PARAM|USE_FUNC_PARAM, (void*)&set_timeout },
 	{"reconnect",	STR_PARAM|USE_FUNC_PARAM, (void*)&set_reconnect },
 	{0, 0, 0}
diff --git a/modules/db_perlvdb/perlvdb.c b/modules/db_perlvdb/perlvdb.c
index 64dae7bb4eb..13eb3469725 100644
--- a/modules/db_perlvdb/perlvdb.c
+++ b/modules/db_perlvdb/perlvdb.c
@@ -38,7 +38,7 @@ SV* vdbmod;
 /*
  * Perl virtual database module interface
  */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"db_use_table",	(cmd_function)perlvdb_use_table, {{0,0,0}},0},
 	{"db_init",			(cmd_function)perlvdb_db_init, {{0,0,0}},0},
 	{"db_close",		(cmd_function)perlvdb_db_close, {{0,0,0}},0},
@@ -53,11 +53,11 @@ static cmd_export_t cmds[] = {
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{0, 0, 0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "perl", DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/db_postgres/db_postgres.c b/modules/db_postgres/db_postgres.c
index 18d1838e4c0..041d9fb307d 100644
--- a/modules/db_postgres/db_postgres.c
+++ b/modules/db_postgres/db_postgres.c
@@ -47,7 +47,7 @@ static int mod_init(void);
 /*
  * PostgreSQL database module interface
  */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"db_bind_api",     (cmd_function)db_postgres_bind_api, {{0,0,0}},0},
 	{0,0,{{0,0,0}},0}
 };
@@ -59,7 +59,7 @@ int use_tls = 0;
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"exec_query_threshold", INT_PARAM, &db_postgres_exec_query_threshold},
 	{"max_db_queries", INT_PARAM, &max_db_queries},
 	{"timeout", INT_PARAM, &pq_timeout},
@@ -75,7 +75,7 @@ static module_dependency_t *get_deps_use_tls(const param_export_t *param)
 	return alloc_module_dep(MOD_TYPE_DEFAULT, "tls_mgm", DEP_ABORT);
 }
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_NULL, NULL, 0 },
 	},
diff --git a/modules/db_sqlite/db_sqlite.c b/modules/db_sqlite/db_sqlite.c
index a53debcf61c..301316aa1d0 100644
--- a/modules/db_sqlite/db_sqlite.c
+++ b/modules/db_sqlite/db_sqlite.c
@@ -48,7 +48,7 @@ struct db_sqlite_extension_list *extension_list=0;
 /*
  * MySQL database module interface
  */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"db_bind_api", (cmd_function)db_sqlite_bind_api, {{0,0,0}},0},
 	{0,0,{{0,0,0}},0}
 };
@@ -56,7 +56,7 @@ static cmd_export_t cmds[] = {
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"alloc_limit", INT_PARAM, &db_sqlite_alloc_limit},
 	{"load_extension", STR_PARAM|USE_FUNC_PARAM,
 								(void *)db_sqlite_add_extension},
diff --git a/modules/db_text/dbtext.c b/modules/db_text/dbtext.c
index 516acb8cb34..ffce2509580 100644
--- a/modules/db_text/dbtext.c
+++ b/modules/db_text/dbtext.c
@@ -60,7 +60,7 @@ int dbt_bind_api(const str* mod, db_func_t *dbb);
 /*
  * Exported functions
  */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"db_bind_api", (cmd_function)dbt_bind_api, {{0,0,0}}, 0},
 	{0,0,{{0,0,0}},0}
 };
@@ -68,14 +68,14 @@ static cmd_export_t cmds[] = {
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"db_mode", INT_PARAM, &db_mode},
 	{0, 0, 0}
 };
 
 
 /** MI commands */
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{"dbt_dump", 0, 0, 0, {
 		{mi_dbt_dump, {0}},
 		{EMPTY_MI_RECIPE}}
diff --git a/modules/db_unixodbc/db_unixodbc.c b/modules/db_unixodbc/db_unixodbc.c
index 1d5210aa3f4..8cb59812758 100644
--- a/modules/db_unixodbc/db_unixodbc.c
+++ b/modules/db_unixodbc/db_unixodbc.c
@@ -41,7 +41,7 @@ int db_unixodbc_bind_api(const str* mod, db_func_t *dbb);
 /*
  * MySQL database module interface
  */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"db_bind_api",    (cmd_function)db_unixodbc_bind_api, {{0,0,0}},0},
 	{0,0,{{0,0,0}},0}
 };
@@ -49,7 +49,7 @@ static cmd_export_t cmds[] = {
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"auto_reconnect",    INT_PARAM, &auto_reconnect},
 	{"use_escape_common", INT_PARAM, &use_escape_common},
 	{0, 0, 0}
diff --git a/modules/db_virtual/db_virtual.c b/modules/db_virtual/db_virtual.c
index 4f7043bbb9b..5343f943812 100644
--- a/modules/db_virtual/db_virtual.c
+++ b/modules/db_virtual/db_virtual.c
@@ -84,7 +84,7 @@ static int store_urls( modparam_t type, void* val);
 /*
  * Virtual database module interface
  */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
     {"db_bind_api", (cmd_function)db_virtual_bind_api, {{0,0,0}},0},
     {0,0,{{0,0,0}},0}
 };
@@ -92,7 +92,7 @@ static cmd_export_t cmds[] = {
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
         //{"db_file",                 STR_PARAM, &db_file.s},
         {"db_probe_time",           INT_PARAM, &db_probe_time},
         {"db_max_consec_retrys",    INT_PARAM, &db_max_consec_retrys},
@@ -102,7 +102,7 @@ static param_export_t params[] = {
 /*
  * MI
  */
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
     {"db_get", 0, 0, 0, {
         {db_get_info, {0}},
         {EMPTY_MI_RECIPE}}
@@ -116,7 +116,7 @@ static mi_export_t mi_cmds[] = {
     {EMPTY_MI_EXPORT}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_SQLDB, NULL, DEP_SILENT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/dialog/dialog.c b/modules/dialog/dialog.c
index 955b68d3f6e..889517655fe 100644
--- a/modules/dialog/dialog.c
+++ b/modules/dialog/dialog.c
@@ -177,7 +177,7 @@ int pv_get_dlg_json(struct sip_msg *msg, pv_param_t *param,
 int pv_get_dlg_ctx_json(struct sip_msg *msg, pv_param_t *param,
 		pv_value_t *res);
 
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{"create_dialog", (cmd_function)w_create_dialog, {
 		{CMD_PARAM_STR|CMD_PARAM_OPT,0,0}, {0,0,0}},
 		REQUEST_ROUTE},
@@ -279,7 +279,7 @@ static cmd_export_t cmds[]={
 	{0,0,{{0,0,0}},0}
 };
 
-static param_export_t mod_params[]={
+static const param_export_t mod_params[]={
 	{ "enable_stats",          INT_PARAM, &dlg_enable_stats         },
 	{ "hash_size",             INT_PARAM, &dlg_hash_size            },
 	{ "log_profile_hash_size", INT_PARAM, &log_profile_hash_size    },
@@ -339,7 +339,7 @@ static param_export_t mod_params[]={
 };
 
 
-static stat_export_t mod_stats[] = {
+static const stat_export_t mod_stats[] = {
 	{"active_dialogs" ,     STAT_NO_RESET,  &active_dlgs       },
 	{"early_dialogs",       STAT_NO_RESET,  &early_dlgs        },
 	{"processed_dialogs" ,  0,              &processed_dlgs    },
@@ -355,7 +355,7 @@ static stat_export_t mod_stats[] = {
 };
 
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "dlg_list", 0, MI_NAMED_PARAMS_ONLY, 0, {
 		{mi_print_dlgs, {0}},
 		{mi_print_dlgs_1, {"callid", 0}},
@@ -431,7 +431,7 @@ static mi_export_t mi_cmds[] = {
 	{EMPTY_MI_EXPORT}
 };
 
-static pv_export_t mod_items[] = {
+static const pv_export_t mod_items[] = {
 	{ {"DLG_count",  sizeof("DLG_count")-1},     1000, pv_get_dlg_count,
 		0,                 0, 0, 0, 0 },
 	{ {"DLG_lifetime",sizeof("DLG_lifetime")-1}, 1000, pv_get_dlg_lifetime,
@@ -470,7 +470,7 @@ static module_dependency_t *get_deps_db_mode(const param_export_t *param)
 	return alloc_module_dep(MOD_TYPE_SQLDB, NULL, DEP_ABORT);
 }
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		/* since dialog registers a tm "unref" callback, tm must destroy 1st */
 		{ MOD_TYPE_DEFAULT, "tm", DEP_ABORT|DEP_REVERSE_DESTROY },
diff --git a/modules/dialplan/dialplan.c b/modules/dialplan/dialplan.c
index fc2a39a2cfc..8c008d78e55 100644
--- a/modules/dialplan/dialplan.c
+++ b/modules/dialplan/dialplan.c
@@ -88,7 +88,7 @@ static str database_url = {NULL, 0};
 void *dp_srg = NULL;
 
 
-static param_export_t mod_params[]={
+static const param_export_t mod_params[]={
 	{ "partition",		STR_PARAM|USE_FUNC_PARAM,
 				(void*)dp_set_partition},
 	{ "db_url",		STR_PARAM,	&default_dp_db_url.s},
@@ -106,7 +106,7 @@ static param_export_t mod_params[]={
 	{0,0,0}
 };
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "dp_reload", 0, 0, mi_child_init, {
 		{mi_reload_rules, {0}},
 		{mi_reload_rules_1, {"partition", 0}},
@@ -125,7 +125,7 @@ static mi_export_t mi_cmds[] = {
 	{EMPTY_MI_EXPORT}
 };
 
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{"dp_translate", (cmd_function)dp_translate_f,
 		{ {CMD_PARAM_INT, NULL, NULL},
 		  {CMD_PARAM_STR, NULL, NULL},
@@ -140,7 +140,7 @@ static cmd_export_t cmds[]={
 	{0,0,{{0,0,0}},0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_SQLDB, NULL, DEP_WARN },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/dispatcher/dispatcher.c b/modules/dispatcher/dispatcher.c
index b6698a26280..d015550659a 100644
--- a/modules/dispatcher/dispatcher.c
+++ b/modules/dispatcher/dispatcher.c
@@ -206,7 +206,7 @@ static int mi_child_init(void);
 static int set_partition_arguments(unsigned int type, void * val);
 static int set_probing_list(unsigned int type, void * val);
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"ds_select_dst",    (cmd_function)w_ds_select_dst, {
 		{CMD_PARAM_INT, 0, 0},
 		{CMD_PARAM_INT, 0, 0},
@@ -274,7 +274,7 @@ static cmd_export_t cmds[] = {
 };
 
 
-static param_export_t params[]={
+static const param_export_t params[]={
 	{"partition",       STR_PARAM | USE_FUNC_PARAM, (void*)&set_partition_arguments},
 	{"db_url",          STR_PARAM, &default_db_head.db_url.s},
 	{"table_name",      STR_PARAM, &default_db_head.table_name.s},
@@ -334,7 +334,7 @@ static module_dependency_t *get_deps_fetch_fs_load(const param_export_t *param)
 	return alloc_module_dep(MOD_TYPE_DEFAULT, "freeswitch", DEP_ABORT);
 }
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "ds_set_state", 0, 0, 0, {
 		{ds_mi_set, {"state", "group", "address", 0}},
 		{EMPTY_MI_RECIPE}}
@@ -359,7 +359,7 @@ static mi_export_t mi_cmds[] = {
 	{EMPTY_MI_EXPORT}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_SQLDB, NULL, DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/diversion/diversion.c b/modules/diversion/diversion.c
index 5d9262b5911..e798fa61cd8 100644
--- a/modules/diversion/diversion.c
+++ b/modules/diversion/diversion.c
@@ -62,7 +62,7 @@ static int mod_init(void);
 /*
  * Exported functions
  */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"add_diversion",    (cmd_function)add_diversion, {
 		{CMD_PARAM_STR,0,0},
 		{CMD_PARAM_STR|CMD_PARAM_OPT,0,0},
@@ -74,7 +74,7 @@ static cmd_export_t cmds[] = {
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"suffix", STR_PARAM, &suffix.s},
 	{0, 0, 0}
 };
diff --git a/modules/dns_cache/dns_cache.c b/modules/dns_cache/dns_cache.c
index 324dc80701d..423e2542b78 100644
--- a/modules/dns_cache/dns_cache.c
+++ b/modules/dns_cache/dns_cache.c
@@ -54,13 +54,13 @@ static cachedb_con *cdbc = 0;
 static int blacklist_timeout=3600; /* seconds */
 static str cachedb_url = {0,0};
 
-static param_export_t params[]={
+static const param_export_t params[]={
 	{ "cachedb_url",                 STR_PARAM, &cachedb_url.s},
 	{ "blacklist_timeout",           INT_PARAM, &blacklist_timeout},
 	{0,0,0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_CACHEDB, NULL, DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/domain/domain_mod.c b/modules/domain/domain_mod.c
index b727af23d39..344544c161e 100644
--- a/modules/domain/domain_mod.c
+++ b/modules/domain/domain_mod.c
@@ -96,7 +96,7 @@ static int fixup_wpvar(void **param);
 /*
  * Exported functions
  */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"is_from_local", (cmd_function)is_from_local, {
 		{CMD_PARAM_VAR|CMD_PARAM_OPT, fixup_wpvar, 0}, {0,0,0}},
 		REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE},
@@ -115,7 +115,7 @@ static cmd_export_t cmds[] = {
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"db_url",         STR_PARAM, &db_url.s      },
 	{"db_mode",        INT_PARAM, &db_mode       },
 	{"domain_table",   STR_PARAM, &domain_table.s},
@@ -128,7 +128,7 @@ static param_export_t params[] = {
 /*
  * Exported MI functions
  */
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ MI_DOMAIN_RELOAD, 0, 0, mi_child_init, {
 		{mi_domain_reload, {0}},
 		{EMPTY_MI_RECIPE}}
diff --git a/modules/domainpolicy/domainpolicy_mod.c b/modules/domainpolicy/domainpolicy_mod.c
index d07a2604f10..c1c0f271cf7 100644
--- a/modules/domainpolicy/domainpolicy_mod.c
+++ b/modules/domainpolicy/domainpolicy_mod.c
@@ -95,7 +95,7 @@ int port_override_name, transport_override_name, domain_prefix_name,
 /*
  * Exported functions
  */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"dp_can_connect",  (cmd_function)dp_can_connect, {{0,0,0}},
 		REQUEST_ROUTE},
 	{"dp_apply_policy", (cmd_function)dp_apply_policy, {{0,0,0}},
@@ -106,7 +106,7 @@ static cmd_export_t cmds[] = {
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"db_url",                    STR_PARAM, &db_url.s                   },
 	{"dp_table",                  STR_PARAM, &domainpolicy_table.s       },
 	{"dp_col_rule",               STR_PARAM, &domainpolicy_col_rule.s    },
@@ -122,7 +122,7 @@ static param_export_t params[] = {
 	{0, 0, 0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_SQLDB, NULL, DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/drouting/drouting.c b/modules/drouting/drouting.c
index ca5f20ccd7f..82fef9332c3 100644
--- a/modules/drouting/drouting.c
+++ b/modules/drouting/drouting.c
@@ -368,7 +368,7 @@ static event_id_t dr_evi_id;
 /*
  * Exported functions
  */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"do_routing", (cmd_function)w_do_routing,
 		{ {CMD_PARAM_INT|CMD_PARAM_OPT, NULL, NULL},
 		  {CMD_PARAM_STR|CMD_PARAM_OPT, fix_flags, NULL},
@@ -467,7 +467,7 @@ static cmd_export_t cmds[] = {
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"use_partitions",    INT_PARAM, &use_partitions    },
 	{"db_partitions_url",    STR_PARAM, &db_partitions_url.s },
 	{"db_partitions_table", STR_PARAM, &db_partitions_table.s },
@@ -532,7 +532,7 @@ static param_export_t params[] = {
 	"value greater than 0. Disables probing of gateways if parameter"\
 "value is 0. With no parameter, returns current probing status"
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "dr_reload", HLP1, 0, 0, {
 		{dr_reload_cmd, {0}},
 		{dr_reload_cmd_1, {"partition_name", 0}},
@@ -584,7 +584,7 @@ static module_dependency_t *get_deps_probing_interval(const param_export_t *para
 	return alloc_module_dep(MOD_TYPE_DEFAULT, "tm", DEP_ABORT);
 }
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_SQLDB, NULL, DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/emergency/emergency_methods.c b/modules/emergency/emergency_methods.c
index 6b5b5e2d81b..9dc15e2d895 100644
--- a/modules/emergency/emergency_methods.c
+++ b/modules/emergency/emergency_methods.c
@@ -75,7 +75,7 @@ struct subs_htable *subs_htable;
 /*
  * Exported functions
  */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"emergency_call", (cmd_function) emergency_call, {{0, 0, 0}},
 		REQUEST_ROUTE | BRANCH_ROUTE },
 	{"failure", (cmd_function) failure, {{0, 0, 0}},
@@ -88,7 +88,7 @@ static cmd_export_t cmds[] = {
  * Exported parameters
  */
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{ "emergency_codes", STR_PARAM | USE_FUNC_PARAM, (void *) &set_codes},
 	{ "timer_interval", INT_PARAM, &timer_interval},
 	{ "db_url", STR_PARAM, &db_url.s},
@@ -109,7 +109,7 @@ static param_export_t params[] = {
 /*
  * Module parameter variables
  */
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_SQLDB, NULL, DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/enum/enum_mod.c b/modules/enum/enum_mod.c
index a626245bbc3..afc53f825eb 100644
--- a/modules/enum/enum_mod.c
+++ b/modules/enum/enum_mod.c
@@ -77,7 +77,7 @@ str isnsuffix;
  * Exported functions
  */
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"enum_query", (cmd_function)enum_query, {
 		{CMD_PARAM_STR | CMD_PARAM_OPT | CMD_PARAM_FIX_NULL,
 			fixup_enum_suffix, 0},
@@ -109,7 +109,7 @@ static cmd_export_t cmds[] = {
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"domain_suffix", STR_PARAM, &domain_suffix},
 	{"tel_uri_params", STR_PARAM, &tel_uri_params},
 	{"branchlabel", STR_PARAM, &branchlabel},
diff --git a/modules/event_datagram/event_datagram.c b/modules/event_datagram/event_datagram.c
index 028e9a2e6d5..fcc131d40cf 100644
--- a/modules/event_datagram/event_datagram.c
+++ b/modules/event_datagram/event_datagram.c
@@ -91,7 +91,7 @@ struct module_exports exports= {
 /**
  * exported functions for core event interface
  */
-static evi_export_t trans_export_udp = {
+static const evi_export_t trans_export_udp = {
 	UDP_STR,					/* transport module name */
 	datagram_raise,				/* raise function */
 	datagram_parse_udp,			/* parse function */
@@ -101,7 +101,7 @@ static evi_export_t trans_export_udp = {
 	DGRAM_UDP_FLAG				/* flags */
 };
 
-static evi_export_t trans_export_unix = {
+static const evi_export_t trans_export_unix = {
 	UNIX_STR,					/* transport module name */
 	datagram_raise,				/* raise function */
 	datagram_parse_unix,		/* parse function */
diff --git a/modules/event_flatstore/event_flatstore.c b/modules/event_flatstore/event_flatstore.c
index 7bd6c02f19f..13b2d504cb5 100644
--- a/modules/event_flatstore/event_flatstore.c
+++ b/modules/event_flatstore/event_flatstore.c
@@ -71,7 +71,7 @@ static int suppress_event_name = 0;
 static str file_permissions;
 static mode_t file_permissions_oct;
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "evi_flat_rotate", "rotates the files the module dumps events into", 0,0,{
 		{mi_rotate, {"path_to_file", 0}},
 		{EMPTY_MI_RECIPE}}
@@ -79,7 +79,7 @@ static mi_export_t mi_cmds[] = {
 	{EMPTY_MI_EXPORT}
 };
 
-static param_export_t mod_params[] = {
+static const param_export_t mod_params[] = {
 	{"max_open_sockets",INT_PARAM, &initial_capacity},
 	{"delimiter",STR_PARAM, &delimiter.s},
 	{"file_permissions", STR_PARAM, &file_permissions.s},
@@ -110,7 +110,7 @@ struct module_exports exports= {
 	0							/* reload confirm function */
 };
 
-static evi_export_t trans_export_flat = {
+static const evi_export_t trans_export_flat = {
 	FLAT_STR,					/* transport module name */
 	flat_raise,					/* raise function */
 	flat_parse,					/* parse function */
diff --git a/modules/event_kafka/event_kafka.c b/modules/event_kafka/event_kafka.c
index fcf1fbf5270..c938378956b 100644
--- a/modules/event_kafka/event_kafka.c
+++ b/modules/event_kafka/event_kafka.c
@@ -52,17 +52,17 @@ static int kafka_publish(struct sip_msg *sip_msg, kafka_broker_t *broker,
 
 struct list_head *kafka_brokers;
 
-static proc_export_t procs[] = {
+static const proc_export_t procs[] = {
 	{"Kafka worker",  0,  0, kafka_process, 1, 0},
 	{0,0,0,0,0,0}
 };
 
-static param_export_t mod_params[] = {
+static const param_export_t mod_params[] = {
 	{"broker_id", STR_PARAM|USE_FUNC_PARAM, (void *)add_script_broker},
 	{0,0,0}
 };
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"kafka_publish",(cmd_function)kafka_publish, {
 		{CMD_PARAM_STR, fixup_broker, 0},
 		{CMD_PARAM_STR, 0, 0},
@@ -97,7 +97,7 @@ struct module_exports exports = {
 };
 
 /* exported functions for core event interface */
-static evi_export_t trans_export_kafka = {
+static const evi_export_t trans_export_kafka = {
 	KAFKA_STR,					/* transport module name */
 	kafka_evi_raise,			/* raise function */
 	kafka_evi_parse,			/* parse function */
diff --git a/modules/event_rabbitmq/event_rabbitmq.c b/modules/event_rabbitmq/event_rabbitmq.c
index b942850ee5d..2c6bb85f32a 100644
--- a/modules/event_rabbitmq/event_rabbitmq.c
+++ b/modules/event_rabbitmq/event_rabbitmq.c
@@ -61,13 +61,13 @@ static void rmq_free(evi_reply_sock *sock);
 static str rmq_print(evi_reply_sock *sock);
 
 /* sending process */
-static proc_export_t procs[] = {
+static const proc_export_t procs[] = {
 	{"RabbitMQ sender",  0,  0, rmq_process, 1, 0},
 	{0,0,0,0,0,0}
 };
 
 /* module parameters */
-static param_export_t mod_params[] = {
+static const param_export_t mod_params[] = {
 	{"heartbeat",					INT_PARAM, &heartbeat},
 	{"connect_timeout", INT_PARAM, &rmq_connect_timeout},
 	{"use_tls", INT_PARAM, &use_tls},
@@ -83,7 +83,7 @@ static module_dependency_t *get_deps_use_tls(const param_export_t *param)
 }
 
 /* modules dependencies */
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_NULL, NULL, 0 },
 	},
@@ -123,7 +123,7 @@ struct module_exports exports= {
 /**
  * exported functions for core event interface
  */
-static evi_export_t trans_export_rmq = {
+static const evi_export_t trans_export_rmq = {
 	RMQ_STR,					/* transport module name */
 	rmq_raise,					/* raise function */
 	rmq_parse,					/* parse function */
diff --git a/modules/event_route/event_route.c b/modules/event_route/event_route.c
index 51ff13f8c15..6c0e87f5752 100644
--- a/modules/event_route/event_route.c
+++ b/modules/event_route/event_route.c
@@ -55,13 +55,13 @@ static str scriptroute_print(evi_reply_sock *sock);
 /**
  *  * module process
  *   */
-static proc_export_t procs[] = {
+static const proc_export_t procs[] = {
 	{0,0,0,0,0,0}
 };
 /**
  * module exported functions
  */
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{0,0,{{0,0,0}},0}
 };
 
@@ -95,7 +95,7 @@ struct module_exports exports= {
 /**
  * exported functions for core event interface
  */
-static evi_export_t trans_export_scriptroute = {
+static const evi_export_t trans_export_scriptroute = {
 	SCRIPTROUTE_NAME_STR,	/* transport module name */
 	scriptroute_raise,		/* raise function */
 	scriptroute_parse,		/* parse function */
diff --git a/modules/event_routing/event_routing.c b/modules/event_routing/event_routing.c
index 4b185a82d0a..b09e939a908 100644
--- a/modules/event_routing/event_routing.c
+++ b/modules/event_routing/event_routing.c
@@ -70,12 +70,12 @@ struct tm_binds ebr_tmb;
 
 
 /* exported module parameters */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{0, 0, 0}
 };
 
 /* exported module functions (to script) */
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{"notify_on_event", (cmd_function)notify_on_event, {
 		{CMD_PARAM_STR, fix_event_name, 0},
 		{CMD_PARAM_VAR, fixup_check_avp, 0},
@@ -87,7 +87,7 @@ static cmd_export_t cmds[]={
 };
 
 /* exported module async functions (to script) */
-static acmd_export_t acmds[] = {
+static const acmd_export_t acmds[] = {
 	{"wait_for_event",  (acmd_function)wait_for_event, {
 		{CMD_PARAM_STR, fix_event_name, 0},
 		{CMD_PARAM_VAR, fixup_check_avp, 0},
@@ -95,7 +95,7 @@ static acmd_export_t acmds[] = {
 	{0,0,{{0,0,0}}}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "tm",        DEP_SILENT },
 		{ MOD_TYPE_NULL, NULL, 0 },
@@ -154,7 +154,7 @@ struct module_exports exports= {
 /**
  * exported functions for core event interface
  */
-static evi_export_t evi_backend_ebr = {
+static const evi_export_t evi_backend_ebr = {
 	/* the name of the exported EVI backend*/
 	str_init(EVI_ROUTING_NAME),
 	/* function called for dispatching an event via backend */
diff --git a/modules/event_stream/event_stream.c b/modules/event_stream/event_stream.c
index ffae39aa3a9..66fc996f6ac 100644
--- a/modules/event_stream/event_stream.c
+++ b/modules/event_stream/event_stream.c
@@ -50,13 +50,13 @@ static str stream_print(evi_reply_sock *sock);
 /**
  * module process
  */
-static proc_export_t procs[] = {
+static const proc_export_t procs[] = {
 	{"event_stream Sender",  0,  0, stream_process, 1, 0},
 	{0,0,0,0,0,0}
 };
 
 /* module parameters */
-static param_export_t mod_params[] = {
+static const param_export_t mod_params[] = {
 	{"reliable_mode",	INT_PARAM, &stream_reliable_mode},
 	{"event_param",		STR_PARAM, &stream_event_param},
 	{"timeout",			INT_PARAM, &stream_timeout},
@@ -92,7 +92,7 @@ struct module_exports exports = {
 /**
  * exported functions for core event interface
  */
-static evi_export_t trans_export_stream = {
+static const evi_export_t trans_export_stream = {
 	TCP_STR,					/* transport module name */
 	stream_raise,				/* raise function */
 	stream_parse,				/* parse function */
diff --git a/modules/event_virtual/event_virtual.c b/modules/event_virtual/event_virtual.c
index e803f396d42..b7e146a5749 100644
--- a/modules/event_virtual/event_virtual.c
+++ b/modules/event_virtual/event_virtual.c
@@ -50,7 +50,7 @@ static gen_lock_t *global_lock;
 static gen_lock_t *rrobin_lock;
 
 /* module parameters */
-static param_export_t mod_params[] = {
+static const param_export_t mod_params[] = {
 	{"failover_timeout", INT_PARAM, &failover_timeout},
 	{0,0,0}
 };
@@ -78,7 +78,7 @@ struct module_exports exports = {
 	0					/* reload confirm function */
 };
 
-static evi_export_t trans_export_virtual = {
+static const evi_export_t trans_export_virtual = {
 	VIRT_STR,					/* transport module name */
 	virtual_raise,					/* raise function */
 	virtual_parse,					/* parse function */
diff --git a/modules/event_virtual/event_virtual.h b/modules/event_virtual/event_virtual.h
index 30c5dab1ab2..32391d031dc 100644
--- a/modules/event_virtual/event_virtual.h
+++ b/modules/event_virtual/event_virtual.h
@@ -60,7 +60,7 @@ struct virtual_socket {
 
 struct sub_socket {
 	str sock_str;
-	evi_export_t *trans_mod;
+	const evi_export_t *trans_mod;
 	evi_reply_sock *sock;
 
 	gen_lock_t *lock;
diff --git a/modules/event_xmlrpc/event_xmlrpc.c b/modules/event_xmlrpc/event_xmlrpc.c
index 5f255be13f6..4f4fc99c7f2 100644
--- a/modules/event_xmlrpc/event_xmlrpc.c
+++ b/modules/event_xmlrpc/event_xmlrpc.c
@@ -56,13 +56,13 @@ static str xmlrpc_print(evi_reply_sock *sock);
 /**
  * module process
  */
-static proc_export_t procs[] = {
+static const proc_export_t procs[] = {
 	{"XML-RPC sender",  0,  0, xmlrpc_process, 1, 0},
 	{0,0,0,0,0,0}
 };
 
 /* module parameters */
-static param_export_t mod_params[] = {
+static const param_export_t mod_params[] = {
 	{"use_struct_param",		INT_PARAM, &xmlrpc_struct_on},
 	{0,0,0}
 };
@@ -96,7 +96,7 @@ struct module_exports exports = {
 /**
  * exported functions for core event interface
  */
-static evi_export_t trans_export_xmlrpc = {
+static const evi_export_t trans_export_xmlrpc = {
 	XMLRPC_STR,					/* transport module name */
 	xmlrpc_raise,				/* raise function */
 	xmlrpc_parse,				/* parse function */
diff --git a/modules/exec/exec_mod.c b/modules/exec/exec_mod.c
index c3914820792..f8e2ab05942 100644
--- a/modules/exec/exec_mod.c
+++ b/modules/exec/exec_mod.c
@@ -62,7 +62,7 @@ inline static void exec_shutdown(void);
  * Exported functions
  */
 
-static acmd_export_t acmds[] = {
+static const acmd_export_t acmds[] = {
 	{"exec", (acmd_function)w_async_exec, {
 		{CMD_PARAM_STR,0,0},
 		{CMD_PARAM_STR|CMD_PARAM_OPT,0,0},
@@ -72,7 +72,7 @@ static acmd_export_t acmds[] = {
 	{0,0,{{0,0,0}}}
 };
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"exec", (cmd_function)w_exec, {
 		{CMD_PARAM_STR,0,0},
 		{CMD_PARAM_STR|CMD_PARAM_OPT,0,0},
@@ -86,7 +86,7 @@ static cmd_export_t cmds[] = {
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"time_to_kill", INT_PARAM, &time_to_kill},
 	{"setvars",      INT_PARAM, &setvars     },
 	{0, 0, 0}
diff --git a/modules/fraud_detection/fraud_detection.c b/modules/fraud_detection/fraud_detection.c
index d9c501b5248..3e04ec4f7fc 100644
--- a/modules/fraud_detection/fraud_detection.c
+++ b/modules/fraud_detection/fraud_detection.c
@@ -81,7 +81,7 @@ mi_response_t *mi_show_stats(const mi_params_t *params,
 mi_response_t *mi_reload(const mi_params_t *params,
 								struct mi_handler *async_hdl);
 
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{"check_fraud", (cmd_function)check_fraud, {
 		{CMD_PARAM_STR,0,0},
 		{CMD_PARAM_STR,0,0},
@@ -90,7 +90,7 @@ static cmd_export_t cmds[]={
 	{0,0,{{0,0,0}},0}
 };
 
-static param_export_t params[]={
+static const param_export_t params[]={
 	{"db_url",                      STR_PARAM, &db_url.s},
 	{"use_utc_time",                INT_PARAM, &mp_use_utc_time},
 	{"table_name",                  STR_PARAM, &table_name.s},
@@ -113,7 +113,7 @@ static param_export_t params[]={
 	{0,0,0}
 };
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "show_fraud_stats", "print current stats for a particular user", 0, 0, {
 		{mi_show_stats, {"user", "prefix", 0}},
 		{EMPTY_MI_RECIPE}}
@@ -125,7 +125,7 @@ static mi_export_t mi_cmds[] = {
 	{EMPTY_MI_EXPORT}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{
 		{MOD_TYPE_SQLDB, NULL, DEP_ABORT},
 		{MOD_TYPE_DEFAULT, "drouting", DEP_ABORT},
diff --git a/modules/freeswitch/fs_mod.c b/modules/freeswitch/fs_mod.c
index 0c3d3eff271..f0116fd5f02 100644
--- a/modules/freeswitch/fs_mod.c
+++ b/modules/freeswitch/fs_mod.c
@@ -48,12 +48,12 @@ static int mod_init(void);
 extern int fs_api_init(void);
 int fs_api_wait_init(void);
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"fs_bind", (cmd_function)fs_bind, {{0,0,0}}, 0},
 	{0,0,{{0,0,0}},0}
 };
 
-static param_export_t mod_params[] = {
+static const param_export_t mod_params[] = {
 	{"event_heartbeat_interval", INT_PARAM,         &event_heartbeat_interval},
 	{"esl_connect_timeout",      INT_PARAM,               &fs_connect_timeout},
 	{"esl_cmd_timeout",          INT_PARAM,                  &esl_cmd_timeout},
@@ -61,13 +61,13 @@ static param_export_t mod_params[] = {
 	{0, 0, 0}
 };
 
-static proc_export_t procs[] = {
+static const proc_export_t procs[] = {
 	{ "FS Manager", NULL, fs_api_wait_init, fs_conn_mgr_loop, 1,
 		PROC_FLAG_HAS_IPC },
 	{ 0, 0, 0, 0, 0, 0 },
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_NULL, NULL, 0 },
 	},
diff --git a/modules/freeswitch_scripting/fss_mod.c b/modules/freeswitch_scripting/fss_mod.c
index d63c049f006..fdeff7a0138 100644
--- a/modules/freeswitch_scripting/fss_mod.c
+++ b/modules/freeswitch_scripting/fss_mod.c
@@ -59,7 +59,7 @@ mi_response_t *mi_fs_list(const mi_params_t *params,
 mi_response_t *mi_fs_reload(const mi_params_t *params,
 								struct mi_handler *async_hdl);
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"freeswitch_esl", (cmd_function)fs_esl, {
 		{CMD_PARAM_STR,0,0},
 		{CMD_PARAM_STR,0,0},
@@ -68,7 +68,7 @@ static cmd_export_t cmds[] = {
 	{0,0,{{0,0,0}},0}
 };
 
-static param_export_t mod_params[] = {
+static const param_export_t mod_params[] = {
 	{ "db_url",                 STR_PARAM,                       &db_url.s },
 	{ "db_table",               STR_PARAM,                    &fss_table.s },
 	{ "db_col_username",        STR_PARAM,                 &fss_col_user.s },
@@ -81,7 +81,7 @@ static param_export_t mod_params[] = {
 };
 
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "fs_subscribe", 0,0,0,{
 		{mi_fs_subscribe, {"freeswitch_url", "events", 0}},
 		{EMPTY_MI_RECIPE}}
@@ -101,7 +101,7 @@ static mi_export_t mi_cmds[] = {
 	{EMPTY_MI_EXPORT}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "freeswitch", DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/gflags/gflags.c b/modules/gflags/gflags.c
index 449353426ab..a904456a2e4 100644
--- a/modules/gflags/gflags.c
+++ b/modules/gflags/gflags.c
@@ -82,7 +82,7 @@ static void mod_destroy(void);
 static int initial=0;
 static unsigned int *gflags=0;
 
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{"set_gflag",    (cmd_function)set_gflag, {
 		{CMD_PARAM_INT, fixup_gflags, 0}, {0,0,0}}, ALL_ROUTES},
 	{"reset_gflag",  (cmd_function)reset_gflag, {
@@ -92,12 +92,12 @@ static cmd_export_t cmds[]={
 	{0,0,{{0,0,0}},0}
 };
 
-static param_export_t params[]={
+static const param_export_t params[]={
 	{"initial", INT_PARAM, &initial},
 	{0,0,0}
 };
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ FIFO_SET_GFLAG, 0, 0, 0, {
 		{mi_set_gflag, {"bitmask", 0}},
 		{EMPTY_MI_RECIPE}}
diff --git a/modules/group/group_mod.c b/modules/group/group_mod.c
index d702ed4292c..48bcabddd9b 100644
--- a/modules/group/group_mod.c
+++ b/modules/group/group_mod.c
@@ -115,7 +115,7 @@ aaa_map vals[V_MAX];
 /*
  * Exported functions
  */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"aaa_is_user_in", (cmd_function)aaa_is_user_in, {
 		{CMD_PARAM_STR, aaa_is_user_fixup, 0},
 		{CMD_PARAM_STR, check_aaaurl_fixup, 0}, {0,0,0}},
@@ -134,7 +134,7 @@ static cmd_export_t cmds[] = {
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"aaa_url", 	  STR_PARAM, &aaa_proto_url.s},
 	{"db_url",        STR_PARAM, &db_url.s       },
 	{"table",         STR_PARAM, &table.s        },
@@ -149,7 +149,7 @@ static param_export_t params[] = {
 	{0, 0, 0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_AAA, NULL, DEP_SILENT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/h350/h350_mod.c b/modules/h350/h350_mod.c
index d1a6b74f1b8..bd228974d94 100644
--- a/modules/h350/h350_mod.c
+++ b/modules/h350/h350_mod.c
@@ -69,7 +69,7 @@ ldap_api_t ldap_api;
 /*
  * Exported functions
  */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"h350_sipuri_lookup", (cmd_function)w_h350_sipuri_lookup, {
 		{CMD_PARAM_STR, 0, 0}, {0,0,0}},
 		REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ONREPLY_ROUTE|LOCAL_ROUTE},
@@ -90,14 +90,14 @@ static cmd_export_t cmds[] = {
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"ldap_session",     STR_PARAM, &h350_ldap_session.s},
 	{"base_dn",          STR_PARAM, &h350_base_dn.s},
 	{"search_scope",     STR_PARAM, &h350_search_scope.s},
 	{0, 0, 0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "ldap", DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/httpd/httpd.c b/modules/httpd/httpd.c
index 252734154fe..e6a6fec0dd3 100644
--- a/modules/httpd/httpd.c
+++ b/modules/httpd/httpd.c
@@ -66,7 +66,7 @@ int post_buf_size = DEFAULT_POST_BUF_SIZE;
 struct httpd_cb *httpd_cb_list = NULL;
 
 
-static proc_export_t mi_procs[] = {
+static const proc_export_t mi_procs[] = {
 	{"HTTPD",  0,  0, httpd_proc, 1,
 		PROC_FLAG_INITCHILD|PROC_FLAG_HAS_IPC|PROC_FLAG_NEEDS_SCRIPT },
 	{NULL, 0, 0, NULL, 0, 0}
@@ -74,7 +74,7 @@ static proc_export_t mi_procs[] = {
 
 
 /** Module parameters */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"port",          INT_PARAM, &port},
 	{"ip",            STR_PARAM, &ip.s},
 	{"buf_size",      INT_PARAM, &buffer.len},
@@ -86,13 +86,13 @@ static param_export_t params[] = {
 };
 
 /** Exported functions */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"httpd_bind",	(cmd_function)httpd_bind, {{0,0,0}}, 0},
 	{0,0,{{0,0,0}},0}
 };
 
 /** MI commands */
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "httpd_list_root_path", 0, 0, 0, {
 		{mi_list_root_path, {0}},
 		{EMPTY_MI_RECIPE}}
diff --git a/modules/identity/identity.c b/modules/identity/identity.c
index 05da406234e..c0b2c6b1e57 100644
--- a/modules/identity/identity.c
+++ b/modules/identity/identity.c
@@ -125,7 +125,7 @@ static X509_STORE * store = NULL;
 /* needed for certificate verification */
 static X509_STORE_CTX * verify_ctx = NULL;
 
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{"authservice",(cmd_function)authservice_, {{0,0,0}},
 		REQUEST_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE},
 	{"verifier",(cmd_function)verifier_, {{0,0,0}},
@@ -133,7 +133,7 @@ static cmd_export_t cmds[]={
 	{0,0,{{0,0,0}},0}
 };
 
-static param_export_t params[]={
+static const param_export_t params[]={
 	{"authCert", STR_PARAM, &authCert},
 	{"privKey", STR_PARAM, &privKey},
 	{"certUri", STR_PARAM, &certUri},
diff --git a/modules/imc/imc.c b/modules/imc/imc.c
index feefe1c44cc..bfc89b703bd 100644
--- a/modules/imc/imc.c
+++ b/modules/imc/imc.c
@@ -96,13 +96,13 @@ struct tm_binds tmb;
 /** TM callback function */
 void inv_callback( struct cell *t, int type, struct tmcb_params *ps);
 
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{"imc_manager",(cmd_function)imc_manager, {{0,0,0}},
 		REQUEST_ROUTE},
 	{0,0,{{0,0,0}},0}
 };
 
-static param_export_t params[]={
+static const param_export_t params[]={
 	{"db_url",				STR_PARAM, &db_url.s},
 	{"hash_size",			INT_PARAM, &imc_hash_size},
 	{"imc_cmd_start_char",	STR_PARAM, &imc_cmd_start_str.s},
@@ -117,14 +117,14 @@ static param_export_t params[]={
 
 stat_var* imc_active_rooms;
 
-static stat_export_t imc_stats[] = {
+static const stat_export_t imc_stats[] = {
 	{"active_rooms" ,  0,  &imc_active_rooms  },
 	{0,0,0}
 };
 
 #endif
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "imc_list_rooms", 0, 0, 0, {
 		{imc_mi_list_rooms, {0}},
 		{EMPTY_MI_RECIPE}}
@@ -136,7 +136,7 @@ static mi_export_t mi_cmds[] = {
 	{EMPTY_MI_EXPORT}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_SQLDB, NULL, DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/jabber/jabber.c b/modules/jabber/jabber.c
index ead5c31de8f..117f8b98d62 100644
--- a/modules/jabber/jabber.c
+++ b/modules/jabber/jabber.c
@@ -132,7 +132,7 @@ void destroy(void);
  * Exported functions
  */
 /*
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"jab_send_message",       (cmd_function)xj_send_message,
 			0, 0, 0, REQUEST_ROUTE},
 	{"jab_join_jconf",         (cmd_function)xj_join_jconf,
@@ -153,7 +153,7 @@ static cmd_export_t cmds[] = {
 };
 */
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"jab_send_message",(cmd_function)xj_send_message, {{0,0,0}},
 		REQUEST_ROUTE},
 	{"jab_join_jconf",(cmd_function)xj_join_jconf, {{0,0,0}},
@@ -176,7 +176,7 @@ static cmd_export_t cmds[] = {
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"db_url",     STR_PARAM, &db_url.s  },
 	{"jaddress",   STR_PARAM, &jaddress  },
 	{"aliases",    STR_PARAM, &jaliases  },
@@ -194,7 +194,7 @@ static param_export_t params[] = {
 	{0, 0, 0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "tm", DEP_ABORT },
 		{ MOD_TYPE_SQLDB,   NULL, DEP_ABORT },
diff --git a/modules/json/json.c b/modules/json/json.c
index 05e93f6429a..41d1a8e8ede 100644
--- a/modules/json/json.c
+++ b/modules/json/json.c
@@ -119,7 +119,7 @@ static int pv_add_json ( pv_param_t* , json_t * );
 static int expand_tag_list( struct sip_msg*, json_tag *);
 
 
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{"json_link",    (cmd_function)json_bind, {
 		{CMD_PARAM_VAR, fixup_json_bind, 0},
 		{CMD_PARAM_VAR, fixup_json_bind, 0}, {0,0,0}},
@@ -128,7 +128,7 @@ static cmd_export_t cmds[]={
 	{0,0,{{0,0,0}},0}
 };
 
-static pv_export_t mod_items[] = {
+static const pv_export_t mod_items[] = {
 	{ {"json",  sizeof("json")-1},    PVT_JSON, pv_get_json,
 		pv_set_json, pv_parse_json_name, pv_parse_json_index, 0, 0},
 	{ {"json_compact",  sizeof("json_compact")-1}, PVT_JSON, pv_get_json_compact,
diff --git a/modules/jsonrpc/jsonrpc.c b/modules/jsonrpc/jsonrpc.c
index 250ad1d717b..f9e63fbdbe1 100644
--- a/modules/jsonrpc/jsonrpc.c
+++ b/modules/jsonrpc/jsonrpc.c
@@ -53,7 +53,7 @@ static int jrpc_connect_timeout = JSONRPC_DEFAULT_TIMEOUT;
 static int jrpc_write_timeout = JSONRPC_DEFAULT_TIMEOUT;
 static int jrpc_read_timeout = JSONRPC_DEFAULT_TIMEOUT;
 
-static param_export_t params[]={
+static const param_export_t params[]={
 	{ "connect_timeout",	INT_PARAM,	&jrpc_connect_timeout },
 	{ "write_timeout",		INT_PARAM,	&jrpc_write_timeout },
 	{ "read_timeout",		INT_PARAM,	&jrpc_read_timeout },
@@ -61,7 +61,7 @@ static param_export_t params[]={
 };
 
 /* modules dependencies */
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_NULL, NULL, 0 },
 	},
@@ -71,7 +71,7 @@ static dep_export_t deps = {
 };
 
 /* exported commands */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"jsonrpc_request",			(cmd_function)jrpc_request, {
 		{CMD_PARAM_STR, fixup_jsonrpc_dest, 0},
 		{CMD_PARAM_STR,0,0},
diff --git a/modules/ldap/ldap_mod.c b/modules/ldap/ldap_mod.c
index 523f2877c94..f81da7f07ba 100644
--- a/modules/ldap/ldap_mod.c
+++ b/modules/ldap/ldap_mod.c
@@ -87,13 +87,13 @@ static int w_ldap_result_check(struct sip_msg* msg, str* attr_name,
 str ldap_config = str_init(DEF_LDAP_CONFIG);
 static dictionary* config_vals = NULL;
 
-static acmd_export_t acmds[] = {
+static const acmd_export_t acmds[] = {
 	{"ldap_search", (acmd_function)w_ldap_search_async, {
 		{CMD_PARAM_STR, 0, 0}, {0,0,0}}},
 	{0,0,{{0,0,0}}}
 };
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"ldap_search", (cmd_function)w_ldap_search, {
 		{CMD_PARAM_STR, 0, 0}, {0,0,0}},
 		REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|
@@ -127,7 +127,7 @@ static cmd_export_t cmds[] = {
 /*
 * Exported parameters
 */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 
 	{"config_file",                    STR_PARAM, &ldap_config.s},
 	{"max_async_connections",          INT_PARAM, &max_async_connections},
diff --git a/modules/load_balancer/load_balancer.c b/modules/load_balancer/load_balancer.c
index cd17694025b..c90da66f14f 100644
--- a/modules/load_balancer/load_balancer.c
+++ b/modules/load_balancer/load_balancer.c
@@ -116,7 +116,7 @@ static void lb_prob_handler(unsigned int ticks, void* param);
 
 static void lb_update_max_loads(unsigned int ticks, void *param);
 
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{"lb_start", (cmd_function)w_lb_start, {
 		{CMD_PARAM_INT,0,0},
 		{CMD_PARAM_STR, fixup_resources, fixup_free_resources},
@@ -161,7 +161,7 @@ static cmd_export_t cmds[]={
 	{0,0,{{0,0,0}},0}
 };
 
-static param_export_t mod_params[]={
+static const param_export_t mod_params[]={
 	{ "db_url",                STR_PARAM, &db_url.s                 },
 	{ "db_table",              STR_PARAM, &table_name               },
 	{ "probing_interval",      INT_PARAM, &lb_prob_interval         },
@@ -178,7 +178,7 @@ static param_export_t mod_params[]={
 };
 
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "lb_reload", 0, 0, mi_child_init, {
 		{mi_lb_reload, {0}},
 		{EMPTY_MI_RECIPE}}
@@ -215,7 +215,7 @@ static module_dependency_t *get_deps_fetch_fs_load(const param_export_t *param)
 	return alloc_module_dep(MOD_TYPE_DEFAULT, "freeswitch", DEP_ABORT);
 }
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "dialog", DEP_ABORT },
 		{ MOD_TYPE_SQLDB,   NULL,     DEP_ABORT },
diff --git a/modules/lua/siplua.c b/modules/lua/siplua.c
index 76851e7c291..713ccbd36b0 100644
--- a/modules/lua/siplua.c
+++ b/modules/lua/siplua.c
@@ -55,7 +55,7 @@ static const cmd_export_t cmds[] = {
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
   { "luafilename", STR_PARAM, &luafilename},
   { "lua_user_debug", INT_PARAM, &lua_user_debug},
   { "lua_allocator", STR_PARAM, &lua_allocator},
@@ -63,7 +63,7 @@ static param_export_t params[] = {
   { 0, 0, 0 }
 };
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
   { "watch", 0,0,0, {
     {siplua_mi_watch, {0}},
     {siplua_mi_watch_2, {"action", "extension", 0}},
diff --git a/modules/mangler/mangler.c b/modules/mangler/mangler.c
index 7dd7e53ef8e..c41a908be45 100644
--- a/modules/mangler/mangler.c
+++ b/modules/mangler/mangler.c
@@ -72,7 +72,7 @@ char *contact_flds_separator = DEFAULT_SEPARATOR;
 
 
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"contact_flds_separator",STR_PARAM,&contact_flds_separator},
 	{0, 0, 0}
 };	/* perhaps I should add pre-compiled expressions */
@@ -83,7 +83,7 @@ static param_export_t params[] = {
  * Exported functions
  */
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"sdp_mangle_ip",   (cmd_function)sdp_mangle_ip, {
 		{CMD_PARAM_STR,0,0},
 		{CMD_PARAM_STR,0,0}, {0,0,0}},
diff --git a/modules/mathops/mathops.c b/modules/mathops/mathops.c
index 81f22335bae..461f5d32072 100644
--- a/modules/mathops/mathops.c
+++ b/modules/mathops/mathops.c
@@ -78,7 +78,7 @@ static int w_compare_exp(struct sip_msg *msg, str *exp1, str *exp2, pv_spec_t *r
  * Exported functions
  */
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"math_eval", (cmd_function)w_evaluate_exp, {
 		{CMD_PARAM_STR,0,0},
 		{CMD_PARAM_VAR,0,0}, {0,0,0}},
@@ -120,7 +120,7 @@ static cmd_export_t cmds[] = {
 /**
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"decimal_digits", INT_PARAM, &decimal_digits},
 	{0, 0, 0}
 };
diff --git a/modules/maxfwd/maxfwd.c b/modules/maxfwd/maxfwd.c
index 1470218b048..434460642b9 100644
--- a/modules/maxfwd/maxfwd.c
+++ b/modules/maxfwd/maxfwd.c
@@ -56,7 +56,7 @@ static int is_maxfwd_lt(struct sip_msg *msg, char *slimit, char *foo);
 static int mod_init(void);
 
 
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{"mf_process_maxfwd_header", (cmd_function)w_process_maxfwd_header, {
 		{CMD_PARAM_INT, fixup_maxfwd_header, 0}, {0,0,0}},
 		REQUEST_ROUTE},
@@ -66,7 +66,7 @@ static cmd_export_t cmds[]={
 	{0,0,{{0,0,0}},0}
 };
 
-static param_export_t params[]={
+static const param_export_t params[]={
 	{"max_limit",    INT_PARAM,  &max_limit},
 	{0,0,0}
 };
diff --git a/modules/media_exchange/media_exchange.c b/modules/media_exchange/media_exchange.c
index 39a2071c7e6..b778243f0f0 100644
--- a/modules/media_exchange/media_exchange.c
+++ b/modules/media_exchange/media_exchange.c
@@ -63,7 +63,7 @@ static int media_send_ok(struct cell *t, struct dlg_cell *dlg,
 static int media_send_fail(struct cell *t, struct dlg_cell *dlg, int leg);
 
 /* modules dependencies */
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "tm", DEP_ABORT },
 		{ MOD_TYPE_DEFAULT, "dialog", DEP_ABORT },
@@ -77,7 +77,7 @@ static dep_export_t deps = {
 };
 
 /* exported commands */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"media_exchange_from_uri",(cmd_function)media_exchange_from_uri, {
 		{CMD_PARAM_STR,0,0}, /* uri */
 		{CMD_PARAM_STR|CMD_PARAM_OPT,fixup_media_leg,0}, /* leg */
@@ -122,11 +122,11 @@ static cmd_export_t cmds[] = {
 };
 
 /* exported parameters */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{0, 0, 0}
 };
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "media_fork_from_call_to_uri", 0, 0, 0, {
 		{mi_media_fork_from_call_to_uri, {"callid", "uri", 0}},
 		{mi_media_fork_from_call_to_uri, {"callid", "uri", "leg", 0}},
diff --git a/modules/mediaproxy/mediaproxy.c b/modules/mediaproxy/mediaproxy.c
index d1c9db93246..4786615015f 100644
--- a/modules/mediaproxy/mediaproxy.c
+++ b/modules/mediaproxy/mediaproxy.c
@@ -198,14 +198,14 @@ static AVP_Param media_relay_avp = {str_init(MEDIA_RELAY_AVP_SPEC), -1, 0};
 // The AVP where the ICE candidate priority is stored (if defined)
 static AVP_Param ice_candidate_avp = {str_init(ICE_CANDIDATE_AVP_SPEC), -1, 0};
 
-static cmd_export_t commands[] = {
+static const cmd_export_t commands[] = {
     {"engage_media_proxy", (cmd_function)EngageMediaProxy, {{0, 0, 0}}, REQUEST_ROUTE},
     {"use_media_proxy",    (cmd_function)UseMediaProxy,    {{0, 0, 0}}, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE},
     {"end_media_session",  (cmd_function)EndMediaSession,  {{0, 0, 0}}, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE},
     {0, 0, {{0, 0, 0}}, 0}
 };
 
-static param_export_t parameters[] = {
+static const param_export_t parameters[] = {
     {"disable",            INT_PARAM, &mediaproxy_disabled},
     {"mediaproxy_socket",  STR_PARAM, &(mediaproxy_socket.name)},
     {"mediaproxy_timeout", INT_PARAM, &(mediaproxy_socket.timeout)},
@@ -216,7 +216,7 @@ static param_export_t parameters[] = {
     {0, 0, 0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
     // OpenSIPS module dependencies
     {
         {MOD_TYPE_DEFAULT, "tm",     DEP_SILENT},
diff --git a/modules/mi_datagram/mi_datagram.c b/modules/mi_datagram/mi_datagram.c
index 8921bc72a97..5cecc1a4c0e 100644
--- a/modules/mi_datagram/mi_datagram.c
+++ b/modules/mi_datagram/mi_datagram.c
@@ -99,7 +99,7 @@ static proc_export_t mi_procs[] = {
 };
 
 
-static param_export_t mi_params[] = {
+static const param_export_t mi_params[] = {
 	{"children_count",      INT_PARAM,    &mi_procs[0].no           },
 	{"socket_name",         STR_PARAM,    &mi_socket                },
 	{"socket_timeout",      INT_PARAM,    &mi_socket_timeout        },
diff --git a/modules/mi_fifo/mi_fifo.c b/modules/mi_fifo/mi_fifo.c
index edd03b040c9..d7ea6143fa8 100644
--- a/modules/mi_fifo/mi_fifo.c
+++ b/modules/mi_fifo/mi_fifo.c
@@ -66,7 +66,7 @@ int mi_trace_mod_id = -1;
 char* mi_trace_bwlist_s;
 
 
-static param_export_t mi_params[] = {
+static const param_export_t mi_params[] = {
 	{"fifo_name",             STR_PARAM, &mi_fifo},
 	{"fifo_mode",             INT_PARAM, &mi_fifo_mode},
 	{"fifo_group",            STR_PARAM, &mi_fifo_gid_s},
@@ -81,7 +81,7 @@ static param_export_t mi_params[] = {
 };
 
 
-static proc_export_t mi_procs[] = {
+static const proc_export_t mi_procs[] = {
 	{"MI FIFO",  0,  0,  fifo_process,  1 ,
 		PROC_FLAG_INITCHILD|PROC_FLAG_HAS_IPC|PROC_FLAG_NEEDS_SCRIPT },
 	{0,0,0,0,0,0}
diff --git a/modules/mi_html/mi_html.c b/modules/mi_html/mi_html.c
index 09a0b6b92b3..4b0d69491bc 100644
--- a/modules/mi_html/mi_html.c
+++ b/modules/mi_html/mi_html.c
@@ -70,7 +70,7 @@ static str MI_HTTP_U_METHOD_REASON = str_init("500 Unexpected method! Only GET i
 
 
 /* module parameters */
-static param_export_t mi_params[] = {
+static const param_export_t mi_params[] = {
 	{"root",   STR_PARAM, &http_root.s},
 	{"http_method", INT_PARAM, &http_method},
 	{"trace_destination", STR_PARAM, &trace_destination_name.s},
@@ -78,7 +78,7 @@ static param_export_t mi_params[] = {
 	{0,0,0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "httpd", DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/mi_http/mi_http.c b/modules/mi_http/mi_http.c
index a40d8214c5f..1f9dffc72e2 100644
--- a/modules/mi_http/mi_http.c
+++ b/modules/mi_http/mi_http.c
@@ -69,7 +69,7 @@ static union sockaddr_union* sv_socket = NULL;
 
 
 /* module parameters */
-static param_export_t mi_params[] = {
+static const param_export_t mi_params[] = {
 	{"root",      STR_PARAM, &http_root.s},
 	{"trace_destination", STR_PARAM, &trace_destination_name.s},
 	{"trace_bwlist",        STR_PARAM,    &mi_trace_bwlist_s  },
@@ -77,7 +77,7 @@ static param_export_t mi_params[] = {
 	{0,0,0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "httpd", DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/mi_script/mi_script.c b/modules/mi_script/mi_script.c
index fe24ee51b2d..741502dd914 100644
--- a/modules/mi_script/mi_script.c
+++ b/modules/mi_script/mi_script.c
@@ -48,7 +48,7 @@ static int mi_script_func(struct sip_msg *msg, str *m,
 static int mi_script_async_func(struct sip_msg *msg, async_ctx *ctx,
 		str *m, pv_spec_p r, pv_spec_p p, pv_spec_p v);
 
-static param_export_t mi_params[] = {
+static const param_export_t mi_params[] = {
 	{"trace_destination",	STR_PARAM,	&trace_destination_name.s},
 	{"trace_bwlist",		STR_PARAM,	&mi_trace_bwlist_s},
 	{"pretty_printing",		INT_PARAM,	&mi_script_pp},
@@ -65,7 +65,7 @@ static int fixup_check_avp(void** param)
 	return 0;
 }
 
-static cmd_export_t mod_cmds[] = {
+static const cmd_export_t mod_cmds[] = {
 	{"mi", (cmd_function)mi_script_func, {
 		{CMD_PARAM_STR, 0, 0},
 		{CMD_PARAM_VAR|CMD_PARAM_OPT, 0, 0},
@@ -76,7 +76,7 @@ static cmd_export_t mod_cmds[] = {
 	{0,0,{{0,0,0}},0}
 };
 
-static acmd_export_t mod_acmds[] = {
+static const acmd_export_t mod_acmds[] = {
 	{"mi", (acmd_function)mi_script_async_func, {
 		{CMD_PARAM_STR, 0, 0},
 		{CMD_PARAM_VAR|CMD_PARAM_OPT, 0, 0},
diff --git a/modules/mi_xmlrpc_ng/mi_xmlrpc_http.c b/modules/mi_xmlrpc_ng/mi_xmlrpc_http.c
index e68be6fe500..f99fcb8634f 100644
--- a/modules/mi_xmlrpc_ng/mi_xmlrpc_http.c
+++ b/modules/mi_xmlrpc_ng/mi_xmlrpc_http.c
@@ -73,14 +73,14 @@ int mi_trace_mod_id = -1;
 char* mi_trace_bwlist_s;
 
 /* module parameters */
-static param_export_t mi_params[] = {
+static const param_export_t mi_params[] = {
 	{"http_root",        STR_PARAM, &http_root.s},
 	{"trace_destination", STR_PARAM, &trace_destination_name.s},
 	{"trace_bwlist",        STR_PARAM,    &mi_trace_bwlist_s  },
 	{0,0,0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "httpd", DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/mid_registrar/mid_registrar.c b/modules/mid_registrar/mid_registrar.c
index 11ded09ec9f..5aa30b33893 100644
--- a/modules/mid_registrar/mid_registrar.c
+++ b/modules/mid_registrar/mid_registrar.c
@@ -127,7 +127,7 @@ char *mp_ctid_insertion = "ct-param";
 str ctid_param = str_init("ctid");
 str at_escape_str = str_init("%40");
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"mid_registrar_save", (cmd_function)mid_reg_save, {
 		{CMD_PARAM_STR|CMD_PARAM_STATIC, domain_fixup, 0},
 		{CMD_PARAM_STR|CMD_PARAM_OPT, 0 ,0},
@@ -143,12 +143,12 @@ static cmd_export_t cmds[] = {
 	{0,0,{{0,0,0}},0}
 };
 
-static acmd_export_t acmds[] = {
+static const acmd_export_t acmds[] = {
 	pn_async_cmds,
 	{0,0,{{0,0,0}}}
 };
 
-static param_export_t mod_params[] = {
+static const param_export_t mod_params[] = {
 	{ "mode",                 INT_PARAM, &reg_mode },
 	{ "default_expires",      INT_PARAM, &default_expires },
 	{ "min_expires",          INT_PARAM, &min_expires },
@@ -178,7 +178,7 @@ static param_export_t mod_params[] = {
 	{ 0,0,0 }
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "usrloc",    DEP_ABORT  },
 		{ MOD_TYPE_DEFAULT, "signaling", DEP_ABORT  },
diff --git a/modules/mmgeoip/mmgeoip.c b/modules/mmgeoip/mmgeoip.c
index 34134258f7e..f4b3b864d21 100644
--- a/modules/mmgeoip/mmgeoip.c
+++ b/modules/mmgeoip/mmgeoip.c
@@ -159,13 +159,13 @@ static int mmg_lookup_cmd(struct sip_msg *msg, str *_fields, str *ipaddr_str,
 /*
  * wire module pieces together.
  */
-static param_export_t mod_params[]={
+static const param_export_t mod_params[]={
 	{"mmgeoip_city_db_path",   STR_PARAM, &MMG_city_db_path.s},
 	{"cache_type", STR_PARAM|USE_FUNC_PARAM, parse_mem_option},
 	{ 0,0,0 }
 };
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"mmg_lookup",  (cmd_function)mmg_lookup_cmd, {
 		{CMD_PARAM_STR|CMD_PARAM_OPT,0,0},
 		{CMD_PARAM_STR,0,0},
diff --git a/modules/msilo/msilo.c b/modules/msilo/msilo.c
index e51adc3b14d..82b897388e1 100644
--- a/modules/msilo/msilo.c
+++ b/modules/msilo/msilo.c
@@ -169,7 +169,7 @@ static void m_tm_callback( struct cell *t, int type, struct tmcb_params *ps);
 
 /* commands wrappers and fixups */
 
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{"m_store",  (cmd_function)m_store, {
 		{CMD_PARAM_STR|CMD_PARAM_OPT,0,0}, {0,0,0}},
 		REQUEST_ROUTE | FAILURE_ROUTE},
@@ -181,7 +181,7 @@ static cmd_export_t cmds[]={
 	{0,0,{{0,0,0}},0}
 };
 
-static param_export_t params[]={
+static const param_export_t params[]={
 	{ "db_url",           STR_PARAM, &ms_db_url.s             },
 	{ "db_table",         STR_PARAM, &ms_db_table.s           },
 	{ "from_address",     STR_PARAM, &ms_from.s                 },
@@ -220,7 +220,7 @@ stat_var* ms_failed_msgs;
 stat_var* ms_dumped_rmds;
 stat_var* ms_failed_rmds;
 
-static stat_export_t msilo_stats[] = {
+static const stat_export_t msilo_stats[] = {
 	{"stored_messages" ,  0,  &ms_stored_msgs  },
 	{"dumped_messages" ,  0,  &ms_dumped_msgs  },
 	{"failed_messages" ,  0,  &ms_failed_msgs  },
@@ -230,7 +230,7 @@ static stat_export_t msilo_stats[] = {
 };
 #endif
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "tm", DEP_ABORT },
 		{ MOD_TYPE_SQLDB,   NULL, DEP_ABORT },
diff --git a/modules/msrp_gateway/msrp_gateway.c b/modules/msrp_gateway/msrp_gateway.c
index 85f9335da2d..b1398a71794 100644
--- a/modules/msrp_gateway/msrp_gateway.c
+++ b/modules/msrp_gateway/msrp_gateway.c
@@ -85,7 +85,7 @@ static str evi_ruri_pname = str_init("ruri");
 static str evi_code_pname = str_init("code");
 static str evi_reason_pname = str_init("reason");
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "msrp_ua", DEP_ABORT },
 		{ MOD_TYPE_DEFAULT, "tm", DEP_ABORT },
@@ -96,14 +96,14 @@ static dep_export_t deps = {
 	},
 };
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"hash_size", INT_PARAM, &msrpgw_sessions_hsize},
 	{"cleanup_interval", INT_PARAM, &cleanup_interval},
 	{"session_timeout", INT_PARAM, &session_timeout},
 	{"message_timeout", INT_PARAM, &message_timeout},
 };
 
-static cmd_export_t cmds[]=
+static const cmd_export_t cmds[]=
 {
 	{"msrp_gw_answer", (cmd_function)msrpgw_answer, {
 		{CMD_PARAM_STR, 0, 0},
@@ -121,7 +121,7 @@ static cmd_export_t cmds[]=
 	{0,0,{{0,0,0}},0}
 };
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "msrp_gw_end_session", 0, 0, 0, {
 		{msrpgw_mi_end, {"key", 0}},
 		{EMPTY_MI_RECIPE}}
diff --git a/modules/msrp_relay/msrp_relay.c b/modules/msrp_relay/msrp_relay.c
index 1fe073a5665..1cbf4f12c5c 100644
--- a/modules/msrp_relay/msrp_relay.c
+++ b/modules/msrp_relay/msrp_relay.c
@@ -80,7 +80,7 @@ pv_spec_t dhost_spec;
 
 static int parse_my_uri_param(unsigned int type, void *val);
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"hash_size", INT_PARAM, &msrp_sessions_hsize},
 	{"cleanup_interval", INT_PARAM, &cleanup_interval},
 	{"auth_route", STR_PARAM, &msrp_auth_route},
diff --git a/modules/msrp_ua/msrp_ua.c b/modules/msrp_ua/msrp_ua.c
index 2445001b1b6..864127b5aeb 100644
--- a/modules/msrp_ua/msrp_ua.c
+++ b/modules/msrp_ua/msrp_ua.c
@@ -128,7 +128,7 @@ static str evi_report_msgid_pname = str_init("message_id");
 static str evi_report_status_pname = str_init("status");
 static str evi_report_brange_pname = str_init("byte_range");
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"hash_size", INT_PARAM, &msrpua_sessions_hsize},
 	{"cleanup_interval", INT_PARAM, &cleanup_interval},
 	{"max_duration", INT_PARAM, &max_duration},
@@ -137,7 +137,7 @@ static param_export_t params[] = {
 	{"relay_uri", STR_PARAM, &relay_uri_str.s},
 };
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "msrp_ua_send_message", 0, 0, 0, {
 		{msrpua_mi_send_msg, {"session_id", 0}},
 		{msrpua_mi_send_msg, {"session_id", "failure_report", 0}},
@@ -167,7 +167,7 @@ static mi_export_t mi_cmds[] = {
 
 static int msrpua_answer(struct sip_msg *msg, str *content_types);
 
-static cmd_export_t cmds[]=
+static const cmd_export_t cmds[]=
 {
 	{"msrp_ua_answer", (cmd_function)msrpua_answer, {
 		{CMD_PARAM_STR, 0, 0},
@@ -185,7 +185,7 @@ static module_dependency_t *get_deps_relay_uri(const param_export_t *param)
 	return alloc_module_dep(MOD_TYPE_DEFAULT, "uac_auth", DEP_ABORT);
 }
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "proto_msrp"  , DEP_ABORT  },
 		{ MOD_TYPE_DEFAULT, "b2b_entities", DEP_ABORT },
diff --git a/modules/nat_traversal/nat_traversal.c b/modules/nat_traversal/nat_traversal.c
index 55ee082d120..dee4c1a644b 100644
--- a/modules/nat_traversal/nat_traversal.c
+++ b/modules/nat_traversal/nat_traversal.c
@@ -223,14 +223,14 @@ static NatTest NAT_Tests[] = {
     {NTNone,           NULL}
 };
 
-static cmd_export_t commands[] = {
+static const cmd_export_t commands[] = {
     {"nat_keepalive",   (cmd_function)NAT_Keepalive, {{0, 0, 0}}, REQUEST_ROUTE},
     {"fix_contact",     (cmd_function)FixContact,    {{0, 0, 0}}, REQUEST_ROUTE | ONREPLY_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE},
     {"client_nat_test", (cmd_function)ClientNatTest, {{CMD_PARAM_INT, 0, 0}, {0, 0, 0}}, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE},
     {0, 0, {{0, 0, 0}}, 0}
 };
 
-static param_export_t parameters[] = {
+static const param_export_t parameters[] = {
     {"keepalive_interval",       INT_PARAM, &keepalive_interval},
     {"keepalive_method",         STR_PARAM, &keepalive_params.method},
     {"keepalive_from",           STR_PARAM, &keepalive_params.from},
@@ -241,7 +241,7 @@ static param_export_t parameters[] = {
     {0, 0, 0}
 };
 
-static pv_export_t pvars[] = {
+static const pv_export_t pvars[] = {
     {str_init("keepalive.socket"), 1000, pv_get_keepalive_socket, NULL, pv_parse_nat_contact_name, NULL, NULL, 0},
     {str_init("source_uri"), 1000, pv_get_source_uri, NULL, NULL, NULL, NULL, 0},
     {str_init("nat_traversal.track_dialog"), 1000, pv_get_track_dialog, pv_set_track_dialog, NULL, NULL, NULL, 0},
@@ -249,7 +249,7 @@ static pv_export_t pvars[] = {
 };
 
 #ifdef STATISTICS
-static stat_export_t statistics[] = {
+static const stat_export_t statistics[] = {
     {"keepalive_endpoints",  STAT_NO_RESET, &keepalive_endpoints},
     {"registered_endpoints", STAT_NO_RESET, &registered_endpoints},
     {"subscribed_endpoints", STAT_NO_RESET, &subscribed_endpoints},
@@ -258,7 +258,7 @@ static stat_export_t statistics[] = {
 };
 #endif
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
     // OpenSIPS module dependencies
     {
         {MOD_TYPE_DEFAULT, "sl",     DEP_ABORT},
diff --git a/modules/nathelper/nathelper.c b/modules/nathelper/nathelper.c
index ca2d15b5489..c0a33c9fe57 100644
--- a/modules/nathelper/nathelper.c
+++ b/modules/nathelper/nathelper.c
@@ -236,7 +236,7 @@ static const cmd_export_t cmds[] = {
 	{0,0,{{0,0,0}},0}
 };
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"natping_interval",		 INT_PARAM, &natping_interval      },
 	{"ping_nated_only",          INT_PARAM, &ping_nated_only       },
 	{"nortpproxy_str",           STR_PARAM, &nortpproxy_str.s      },
@@ -260,7 +260,7 @@ static param_export_t params[] = {
 	{0, 0, 0}
 };
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{MI_SET_NATPING_STATE, 0, 0, 0, {
 		{mi_enable_natping, {0}},
 		{mi_enable_natping_1, {"status", 0}},
@@ -277,7 +277,7 @@ static module_dependency_t *get_deps_natping_interval(const param_export_t *para
 	return alloc_module_dep(MOD_TYPE_DEFAULT, "usrloc", DEP_ABORT);
 }
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_NULL, NULL, 0 },
 	},
diff --git a/modules/options/mod_options.c b/modules/options/mod_options.c
index 4aa2b579eb5..dccfd948b58 100644
--- a/modules/options/mod_options.c
+++ b/modules/options/mod_options.c
@@ -58,7 +58,7 @@ static int opt_reply(struct sip_msg* _msg);
  * Exported functions
  */
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"options_reply", (cmd_function)opt_reply, {{0,0,0}},
 		REQUEST_ROUTE},
 	{0,0,{{0,0,0}},0}
@@ -67,7 +67,7 @@ static cmd_export_t cmds[] = {
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"accept",     STR_PARAM, &acpt_s.s},
 	{"accept_encoding", STR_PARAM, &acpt_enc_s.s},
 	{"accept_language", STR_PARAM, &acpt_lan_s.s},
@@ -75,7 +75,7 @@ static param_export_t params[] = {
 	{0, 0, 0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "signaling", DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/osp/osp_mod.c b/modules/osp/osp_mod.c
index 1858d886316..deae695c783 100644
--- a/modules/osp/osp_mod.c
+++ b/modules/osp/osp_mod.c
@@ -148,7 +148,7 @@ static int ospVerifyParameters(void);
 static void ospDumpParameters(void);
 
 
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
     {"checkospheader",(cmd_function)ospCheckHeader, {{0,0,0}},
         REQUEST_ROUTE},
     {"validateospheader",(cmd_function)ospValidateHeader, {{0,0,0}},
@@ -178,7 +178,7 @@ static cmd_export_t cmds[]={
     {0,0,{{0,0,0}},0}
 };
 
-static param_export_t params[]={
+static const param_export_t params[]={
     { "enable_crypto_hardware_support",   INT_PARAM, &_osp_crypto_hw },
     { "validate_callid",                  INT_PARAM, &_osp_validate_callid },
     { "ssl_lifetime",                     INT_PARAM, &_osp_ssl_lifetime },
@@ -259,7 +259,7 @@ static param_export_t params[]={
     { 0,0,0 }
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
     { /* OpenSIPS module dependencies */
         { MOD_TYPE_DEFAULT, "auth", DEP_ABORT },
         { MOD_TYPE_DEFAULT, "rr",   DEP_ABORT },
diff --git a/modules/path/path_mod.c b/modules/path/path_mod.c
index c446d233fe7..11f05ec137d 100644
--- a/modules/path/path_mod.c
+++ b/modules/path/path_mod.c
@@ -66,7 +66,7 @@ struct rr_binds path_rrb;
 /*
  * Exported functions
  */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"add_path", (cmd_function)add_path, {
 		{CMD_PARAM_STR|CMD_PARAM_OPT,0,0}, {0,0,0}},
 		REQUEST_ROUTE},
@@ -79,7 +79,7 @@ static cmd_export_t cmds[] = {
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"use_received", INT_PARAM, &use_received },
 	{"enable_double_path", INT_PARAM, &enable_double_path },
 	{ 0, 0, 0 }
@@ -93,7 +93,7 @@ static module_dependency_t *get_deps_use_received(const param_export_t *param)
 	return alloc_module_dep(MOD_TYPE_DEFAULT, "rr", DEP_ABORT);
 }
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_NULL, NULL, 0 },
 	},
diff --git a/modules/peering/peering.c b/modules/peering/peering.c
index c1e76c0ba1a..fd31afd7916 100644
--- a/modules/peering/peering.c
+++ b/modules/peering/peering.c
@@ -50,7 +50,7 @@ int verify_source_service_type = -1;
 /*
  * Exported functions
  */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
     {"verify_destination", (cmd_function)verify_destination, {{0,0,0}},
         REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE},
     {"verify_source", (cmd_function)verify_source, {{0,0,0}},
@@ -61,7 +61,7 @@ static cmd_export_t cmds[] = {
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
     {"aaa_url", STR_PARAM, &aaa_proto_url},
     {"verify_destination_service_type", INT_PARAM,
      &verify_destination_service_type},
@@ -70,7 +70,7 @@ static param_export_t params[] = {
     {0, 0, 0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_AAA, NULL, DEP_WARN },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/perl/perl.c b/modules/perl/perl.c
index b6c31d14ab7..554c719c441 100644
--- a/modules/perl/perl.c
+++ b/modules/perl/perl.c
@@ -102,7 +102,7 @@ static const cmd_export_t cmds[] = {
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"filename", STR_PARAM, &filename},
 	{"modpath", STR_PARAM, &modpath},
 	{ 0, 0, 0 }
@@ -112,7 +112,7 @@ static param_export_t params[] = {
 /*
  * Exported MI functions
  */
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	/* FIXME This does not yet work...
 	{ "perl_reload", 0,0,0, {
 		{perl_mi_reload, {0}},
@@ -122,7 +122,7 @@ static mi_export_t mi_cmds[] = {
 	{EMPTY_MI_EXPORT}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "signaling", DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/permissions/permissions.c b/modules/permissions/permissions.c
index aff17103ee2..55012c4db64 100644
--- a/modules/permissions/permissions.c
+++ b/modules/permissions/permissions.c
@@ -90,7 +90,7 @@ static int child_init(int rank);
 static int mi_address_child_init();
 
 /* Exported functions */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"check_address", (cmd_function)check_addr,
 		{ {CMD_PARAM_INT, NULL, NULL},
 		  {CMD_PARAM_STR, NULL, NULL},
@@ -145,7 +145,7 @@ static cmd_export_t cmds[] = {
 
 
 /* Exported parameters */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"default_allow_file", STR_PARAM, &default_allow_file},
 	{"default_deny_file",  STR_PARAM, &default_deny_file },
 	{"check_all_branches", INT_PARAM, &check_all_branches},
@@ -168,7 +168,7 @@ static param_export_t params[] = {
 /*
  * Exported MI functions
  */
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ MI_ADDRESS_RELOAD, 0, 0, mi_address_child_init, {
 		{mi_address_reload, {0}},
 		{mi_address_reload_1, {"partition", 0}},
diff --git a/modules/pi_http/pi_http.c b/modules/pi_http/pi_http.c
index 36bee94bdbb..e8027e4aea7 100644
--- a/modules/pi_http/pi_http.c
+++ b/modules/pi_http/pi_http.c
@@ -68,7 +68,7 @@ static const str PI_HTTP_U_METHOD = str_init("<html><body>"
 
 
 /* module parameters */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"pi_http_root",   STR_PARAM, &http_root.s},
 	{"pi_http_method", INT_PARAM, &http_method},
 	{"framework",      STR_PARAM, &filename.s},
@@ -76,7 +76,7 @@ static param_export_t params[] = {
 };
 
 /** MI commands */
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "pi_reload_tbls_and_cmds", 0, 0, 0, {
 		{mi_framework_reload, {0}},
 		{EMPTY_MI_RECIPE}}
@@ -84,7 +84,7 @@ static mi_export_t mi_cmds[] = {
 	{EMPTY_MI_EXPORT}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "httpd", DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/pike/pike.c b/modules/pike/pike.c
index 5248a6ece72..e43f8e8b7ae 100644
--- a/modules/pike/pike.c
+++ b/modules/pike/pike.c
@@ -78,13 +78,13 @@ event_id_t pike_event_id = EVI_ERROR;
 /* status/repport group */
 void *pike_srg;
 
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{"pike_check_req", (cmd_function)pike_check_req, {{0,0,0}},
 		REQUEST_ROUTE},
 	{0,0,{{0,0,0}},0}
 };
 
-static param_export_t params[]={
+static const param_export_t params[]={
 	{"sampling_time_unit",    INT_PARAM,  &time_unit},
 	{"reqs_density_per_unit", INT_PARAM,  &max_reqs},
 	{"remove_latency",        INT_PARAM,  &timeout},
@@ -93,7 +93,7 @@ static param_export_t params[]={
 	{0,0,0}
 };
 
-static mi_export_t mi_cmds [] = {
+static const mi_export_t mi_cmds [] = {
 	{MI_PIKE_LIST, "lists the nodes in the pike tree", 0, 0, {
 		{mi_pike_list, {0}},
 		{EMPTY_MI_RECIPE}}
diff --git a/modules/presence/presence.c b/modules/presence/presence.c
index aeb4dadb01f..4b50ac9c264 100644
--- a/modules/presence/presence.c
+++ b/modules/presence/presence.c
@@ -150,7 +150,7 @@ static str presence_exposed_event = str_init("E_PRESENCE_EXPOSED");
 event_id_t presence_event_id = EVI_ERROR;
 event_id_t exposed_event_id = EVI_ERROR;
 
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{"handle_publish",  (cmd_function)handle_publish, {
 		{CMD_PARAM_STR|CMD_PARAM_OPT,fixup_presence,0}, {0,0,0}},
 		REQUEST_ROUTE},
@@ -163,7 +163,7 @@ static cmd_export_t cmds[]={
 	{0,0,{{0,0,0}},0}
 };
 
-static param_export_t params[]={
+static const param_export_t params[]={
 	{ "db_url",                 STR_PARAM, &db_url.s},
 	{ "presentity_table",       STR_PARAM, &presentity_table.s},
 	{ "active_watchers_table",  STR_PARAM, &active_watchers_table.s},
@@ -190,7 +190,7 @@ static param_export_t params[]={
 	{0,0,0}
 };
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	// refreshWatchers is a deprecated alias for refresh_watchers. To be removed later.
 	{ "refreshWatchers", 0,0,0, {
 		{mi_refresh_watchers, {"presentity_uri", "event", "refresh_type", 0}},
@@ -221,7 +221,7 @@ static mi_export_t mi_cmds[] = {
 	{EMPTY_MI_EXPORT}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "tm",        DEP_ABORT },
 		{ MOD_TYPE_DEFAULT, "signaling", DEP_ABORT },
diff --git a/modules/presence_callinfo/presence_callinfo.c b/modules/presence_callinfo/presence_callinfo.c
index 09912ec393a..00dac0054e0 100644
--- a/modules/presence_callinfo/presence_callinfo.c
+++ b/modules/presence_callinfo/presence_callinfo.c
@@ -65,7 +65,7 @@ int sca_set_called_line(struct sip_msg *msg, str *line);
 
 
 /* module exported commands */
-static cmd_export_t cmds[] ={
+static const cmd_export_t cmds[] ={
 	{"sca_set_calling_line", (cmd_function)sca_set_calling_line, {
 		{CMD_PARAM_STR,0,0}, {0,0,0}},
 		REQUEST_ROUTE},
@@ -76,7 +76,7 @@ static cmd_export_t cmds[] ={
 };
 
 /* module exported parameters */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"line_hash_size",                  INT_PARAM, &hash_size},
 	{"disable_dialog_support_for_sca",  INT_PARAM, &no_dialog_support},
 	{"call_info_timeout_notification",  INT_PARAM, &call_info_timeout_notification},
@@ -94,7 +94,7 @@ static module_dependency_t *get_deps_dialog_support(const param_export_t *param)
 	return alloc_module_dep(MOD_TYPE_DEFAULT, "dialog", DEP_ABORT);
 }
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "presence", DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/presence_dfks/presence_dfks.c b/modules/presence_dfks/presence_dfks.c
index 1349004c48b..62c07a23cff 100644
--- a/modules/presence_dfks/presence_dfks.c
+++ b/modules/presence_dfks/presence_dfks.c
@@ -108,19 +108,19 @@ static char *type_nodes[MAX_FEATURES_NO] = {NULL,
 static char *type_values[MAX_FEATURES_NO] = {NULL,
 	TYPE_VAL_FWD_CFA, TYPE_VAL_FWD_CFB, TYPE_VAL_FWD_CFNA};
 
-static pv_export_t mod_items[] = {
+static const pv_export_t mod_items[] = {
 	{ {"dfks", sizeof("dfks")-1}, 1000, pv_get_dfks, pv_set_dfks,
 		pv_parse_dfks_name, 0, 0, 0},
 	  { {0, 0}, 0, 0, 0, 0, 0, 0, 0 }
 };
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"get_route", STR_PARAM, &dfks_get_route},
 	{"set_route", STR_PARAM, &dfks_set_route},
 	{0, 0, 0}
 };
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "dfks_set_feature", 0, 0, 0, {
 		{mi_dfks_set, {"presentity", "feature", "status", 0}},
 		{mi_dfks_set, {"presentity", "feature", "status", "values", 0}},
@@ -131,7 +131,7 @@ static mi_export_t mi_cmds[] = {
 	{EMPTY_MI_EXPORT}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "presence", DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/presence_dialoginfo/presence_dialoginfo.c b/modules/presence_dialoginfo/presence_dialoginfo.c
index 62a21fce7d7..d48dcf3fc89 100644
--- a/modules/presence_dialoginfo/presence_dialoginfo.c
+++ b/modules/presence_dialoginfo/presence_dialoginfo.c
@@ -54,18 +54,18 @@ pres_contains_presence_t pres_contains_presence;
 int force_single_dialog = 0;
 
 /* module exported commands */
-static cmd_export_t cmds[] =
+static const cmd_export_t cmds[] =
 {
     {0, 0, {{0, 0, 0}}, 0}
 };
 
 /* module exported parameters */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{ "force_single_dialog", INT_PARAM, &force_single_dialog },
 	{0, 0, 0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "presence", DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/presence_mwi/presence_mwi.c b/modules/presence_mwi/presence_mwi.c
index fd16847a2bf..9bf94eac0cf 100644
--- a/modules/presence_mwi/presence_mwi.c
+++ b/modules/presence_mwi/presence_mwi.c
@@ -51,17 +51,17 @@ static void destroy(void);
 add_event_t pres_add_event;
 
 /* module exported commands */
-static cmd_export_t cmds[] =
+static const cmd_export_t cmds[] =
 {
     {0, 0, {{0, 0, 0}}, 0}
 };
 
 /* module exported parameters */
-static param_export_t params[] = {
+static const param_export_t params[] = {
     {0, 0, 0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "presence", DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/presence_xcapdiff/presence_xcapdiff.c b/modules/presence_xcapdiff/presence_xcapdiff.c
index c9a05cd359a..9432fe15bc6 100644
--- a/modules/presence_xcapdiff/presence_xcapdiff.c
+++ b/modules/presence_xcapdiff/presence_xcapdiff.c
@@ -30,11 +30,11 @@ str s_content_type = str_init("application/xcap-diff+xml");
 
 static int mod_init(void);
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
     {0, 0, 0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "presence", DEP_SILENT },
 		{ MOD_TYPE_DEFAULT, "pua",      DEP_SILENT },
diff --git a/modules/presence_xml/presence_xml.c b/modules/presence_xml/presence_xml.c
index d1cfdf6c1ad..7010fa0dbf6 100644
--- a/modules/presence_xml/presence_xml.c
+++ b/modules/presence_xml/presence_xml.c
@@ -95,7 +95,7 @@ db_func_t pxml_dbf;
 
 xcapGetNewDoc_t xcap_GetNewDoc;
 
-static param_export_t params[]={
+static const param_export_t params[]={
 	{ "force_active",           INT_PARAM,                     &force_active },
 	{ "pidf_manipulation",      INT_PARAM,                 &pidf_manipulation},
 	{ "xcap_server",     STR_PARAM|USE_FUNC_PARAM,(void*)pxml_add_xcap_server},
@@ -105,7 +105,7 @@ static param_export_t params[]={
 	{  0,                       0,                                          0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "xcap",      DEP_ABORT },
 		{ MOD_TYPE_DEFAULT, "signaling", DEP_ABORT },
diff --git a/modules/prometheus/prometheus.c b/modules/prometheus/prometheus.c
index 3a459adae2c..436d82e2c52 100644
--- a/modules/prometheus/prometheus.c
+++ b/modules/prometheus/prometheus.c
@@ -60,7 +60,7 @@ static int prom_stats_param( modparam_t type, void* val);
 static int prom_labels_param( modparam_t type, void* val);
 
 /* module parameters */
-static param_export_t mi_params[] = {
+static const param_export_t mi_params[] = {
 	{"root",        STR_PARAM, &prom_http_root.s},
 	{"prefix",      STR_PARAM, &prom_prefix.s},
 	{"delimiter",   STR_PARAM, &prom_delimiter.s},
@@ -72,7 +72,7 @@ static param_export_t mi_params[] = {
 	{0,0,0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "httpd", DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/proto_bin/proto_bin.c b/modules/proto_bin/proto_bin.c
index d9554b1361a..312696f4421 100644
--- a/modules/proto_bin/proto_bin.c
+++ b/modules/proto_bin/proto_bin.c
@@ -63,12 +63,12 @@ static int bin_async_local_write_timeout = 10;
 #define _bin_common_current_req  bin_current_req
 #include "bin_common.h"
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"proto_init", (cmd_function)proto_bin_init, {{0,0,0}},0},
 	{0,0,{{0,0,0}},0}
 };
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{ "bin_port",                        INT_PARAM, &bin_port               },
 	{ "bin_send_timeout",                INT_PARAM, &bin_send_timeout       },
 	{ "bin_max_msg_chunks",              INT_PARAM, &bin_max_msg_chunks     },
diff --git a/modules/proto_bins/proto_bins.c b/modules/proto_bins/proto_bins.c
index faa73d97a76..3861593317b 100644
--- a/modules/proto_bins/proto_bins.c
+++ b/modules/proto_bins/proto_bins.c
@@ -85,12 +85,12 @@ trace_proto_t tprot;
 
 static int *trace_is_on;
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"proto_init", (cmd_function)proto_bins_init, {{0,0,0}},0},
 	{0,0,{{0,0,0}},0}
 };
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "tls_trace", 0, 0, 0, {
 		{tls_trace_mi, {0}},
 		{tls_trace_mi_1, {"trace_mode", 0}},
@@ -100,7 +100,7 @@ static mi_export_t mi_cmds[] = {
 	{EMPTY_MI_EXPORT}
 };
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{ "bins_port",                       INT_PARAM, &bins_port              },
 	{ "bins_send_timeout",               INT_PARAM, &bins_send_tout         },
 	{ "bins_max_msg_chunks",             INT_PARAM, &bins_max_msg_chunks    },
@@ -117,7 +117,7 @@ static param_export_t params[] = {
 	{0, 0, 0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "tls_mgm", DEP_ABORT },
 		{ MOD_TYPE_DEFAULT, "proto_hep", DEP_SILENT },
diff --git a/modules/proto_hep/proto_hep.c b/modules/proto_hep/proto_hep.c
index f33ef59de4b..a396577ab63 100644
--- a/modules/proto_hep/proto_hep.c
+++ b/modules/proto_hep/proto_hep.c
@@ -91,7 +91,7 @@ static int hep_current_proto;
 
 union sockaddr_union local_su;
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"proto_init", (cmd_function)proto_hep_init_udp, {{0,0,0}}, 0},
 	{"proto_init", (cmd_function)proto_hep_init_tcp, {{0,0,0}}, 0},
 	{"load_hep", (cmd_function)bind_proto_hep, {{0,0,0}}, 0},
@@ -106,7 +106,7 @@ static cmd_export_t cmds[] = {
 	{0,0,{{0,0,0}},0}
 };
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{ "hep_port",                        INT_PARAM, &hep_port				},
 	{ "hep_send_timeout",                INT_PARAM, &hep_send_timeout		},
 	{ "hep_max_msg_chunks",              INT_PARAM, &hep_max_msg_chunks     },
@@ -138,7 +138,7 @@ static module_dependency_t *get_deps_compression(const param_export_t *param)
 
 }
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_NULL, NULL, 0 },
 	},
diff --git a/modules/proto_msrp/proto_msrp.c b/modules/proto_msrp/proto_msrp.c
index 35f42b40512..4f96f55948c 100644
--- a/modules/proto_msrp/proto_msrp.c
+++ b/modules/proto_msrp/proto_msrp.c
@@ -68,7 +68,7 @@ int msrp_check_cert_on_reusage = 0;
 
 
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"proto_init", (cmd_function)proto_msrp_init, {{0, 0, 0}}, 0},
 	{"proto_init", (cmd_function)proto_msrps_init, {{0, 0, 0}}, 0},
 	{"load_msrp", (cmd_function)load_msrp, {{0,0,0}}, 0},
@@ -76,7 +76,7 @@ static cmd_export_t cmds[] = {
 };
 
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{ "send_timeout",			INT_PARAM, &msrp_send_timeout       },
 	{ "tls_handshake_timeout",	INT_PARAM, &msrp_tls_handshake_timeout  },
 	{ "max_msg_chunks",			INT_PARAM, &msrp_max_msg_chunks },
@@ -87,7 +87,7 @@ static param_export_t params[] = {
 	{0, 0, 0}
 };
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "msrp_trace", 0, 0, 0, {
 		{w_msrp_trace_mi, {0}},
 		{w_msrp_trace_mi_1, {"trace_mode", 0}},
@@ -98,7 +98,7 @@ static mi_export_t mi_cmds[] = {
 };
 
 /* module dependencies */
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "proto_hep", DEP_SILENT },
 		{ MOD_TYPE_NULL, NULL, 0 }
diff --git a/modules/proto_sctp/proto_sctp.c b/modules/proto_sctp/proto_sctp.c
index aade87ce3a5..4877fc1bd73 100644
--- a/modules/proto_sctp/proto_sctp.c
+++ b/modules/proto_sctp/proto_sctp.c
@@ -35,13 +35,13 @@ static int sctp_port = SIP_PORT;
 
 static int proto_sctp_init(struct proto_info *pi);
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"proto_init", (cmd_function)proto_sctp_init, {{0, 0, 0}}, 0},
 	{0,0,{{0,0,0}},0}
 };
 
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{ "sctp_port",    INT_PARAM,    &sctp_port },
 	{0, 0, 0}
 };
diff --git a/modules/proto_smpp/proto_smpp.c b/modules/proto_smpp/proto_smpp.c
index 23b4edaed11..f2aa3fbf695 100644
--- a/modules/proto_smpp/proto_smpp.c
+++ b/modules/proto_smpp/proto_smpp.c
@@ -75,7 +75,7 @@ extern int smpp_send_timeout;
 
 str db_url = {NULL, 0};
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"proto_init", (cmd_function)smpp_init, {{0,0,0}},
 		REQUEST_ROUTE},
 	{"send_smpp_message", (cmd_function)send_smpp_msg, {
@@ -89,7 +89,7 @@ static cmd_export_t cmds[] = {
 	{0,0,{{0,0,0}},0}
 };
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"smpp_port", INT_PARAM, &smpp_port},
 	{"smpp_max_msg_chunks", INT_PARAM, &smpp_max_msg_chunks},
 	{"smpp_send_timeout", INT_PARAM, &smpp_send_timeout},
diff --git a/modules/proto_tls/proto_tls.c b/modules/proto_tls/proto_tls.c
index d4b9844ca15..c75861e8d60 100644
--- a/modules/proto_tls/proto_tls.c
+++ b/modules/proto_tls/proto_tls.c
@@ -210,13 +210,13 @@ static int tls_async_write(struct tcp_connection* con,int fd);
 static int proto_tls_conn_init(struct tcp_connection* c);
 static void proto_tls_conn_clean(struct tcp_connection* c);
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"proto_init", (cmd_function)proto_tls_init, {{0, 0, 0}}, 0},
 	{ 0, 0, {{0, 0, 0}}, 0}
 };
 
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{ "tls_port",              INT_PARAM,         &tls_port_no               },
 	{ "tls_crlf_pingpong",     INT_PARAM,         &tls_crlf_pingpong         },
 	{ "tls_crlf_drop",         INT_PARAM,         &tls_crlf_drop             },
@@ -237,7 +237,7 @@ static param_export_t params[] = {
 	{0, 0, 0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "tls_mgm"  , DEP_ABORT  },
 		{ MOD_TYPE_DEFAULT, "proto_hep", DEP_SILENT },
@@ -248,7 +248,7 @@ static dep_export_t deps = {
 	},
 };
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "tls_trace", 0, 0, 0, {
 		{tls_trace_mi, {0}},
 		{tls_trace_mi_1, {"trace_mode", 0}},
diff --git a/modules/proto_ws/proto_ws.c b/modules/proto_ws/proto_ws.c
index 893595f534f..e4ffc93d75d 100644
--- a/modules/proto_ws/proto_ws.c
+++ b/modules/proto_ws/proto_ws.c
@@ -111,12 +111,12 @@ static mi_response_t *ws_trace_mi_1(const mi_params_t *params,
 static int ws_port = WS_DEFAULT_PORT;
 
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"proto_init", (cmd_function)proto_ws_init, {{0,0,0}},0},
 	{0,0,{{0,0,0}},0}
 };
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	/* XXX: should we drop the ws prefix? */
 	{ "ws_port",           INT_PARAM, &ws_port           },
 	{ "ws_max_msg_chunks", INT_PARAM, &ws_max_msg_chunks },
@@ -130,7 +130,7 @@ static param_export_t params[] = {
 	{0, 0, 0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "proto_hep", DEP_SILENT },
 		{ MOD_TYPE_NULL, NULL, 0 },
@@ -140,7 +140,7 @@ static dep_export_t deps = {
 	},
 };
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "ws_trace", 0, 0, 0, {
 		{ws_trace_mi, {0}},
 		{ws_trace_mi_1, {"trace_mode", 0}},
diff --git a/modules/proto_wss/proto_wss.c b/modules/proto_wss/proto_wss.c
index 8b204fe8929..f3df9b07485 100644
--- a/modules/proto_wss/proto_wss.c
+++ b/modules/proto_wss/proto_wss.c
@@ -125,12 +125,12 @@ static mi_response_t *wss_trace_mi_1(const mi_params_t *params,
 
 static int wss_port = WSS_DEFAULT_PORT;
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"proto_init", (cmd_function)proto_wss_init, {{0,0,0}},0},
 	{0,0,{{0,0,0}},0}
 };
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	/* XXX: should we drop the ws prefix? */
 	{ "wss_port",           INT_PARAM, &wss_port           },
 	{ "wss_max_msg_chunks", INT_PARAM, &wss_max_msg_chunks },
@@ -146,7 +146,7 @@ static param_export_t params[] = {
 	{0, 0, 0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "proto_hep", DEP_SILENT },
 		{ MOD_TYPE_NULL, NULL, 0 },
@@ -156,7 +156,7 @@ static dep_export_t deps = {
 	},
 };
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "wss_trace", 0, 0, 0, {
 		{wss_trace_mi, {0}},
 		{wss_trace_mi_1, {"trace_mode", 0}},
diff --git a/modules/pua/pua.c b/modules/pua/pua.c
index aeb713520f0..7987b7d4f32 100644
--- a/modules/pua/pua.c
+++ b/modules/pua/pua.c
@@ -102,7 +102,7 @@ static int update_pua(ua_pres_t* p, unsigned int hash_code, unsigned int final);
 static void db_update(unsigned int ticks,void *param);
 static void hashT_clean(unsigned int ticks,void *param);
 
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{"pua_update_contact",(cmd_function)update_contact, {{0,0,0}},
 		REQUEST_ROUTE},
 	{"bind_libxml_api", (cmd_function)bind_libxml_api, {{0,0,0}}, 0},
@@ -110,7 +110,7 @@ static cmd_export_t cmds[]={
 	{0,0,{{0,0,0}},0}
 };
 
-static param_export_t params[]={
+static const param_export_t params[]={
 	{"hash_size" ,          INT_PARAM, &HASH_SIZE          },
 	{"db_url" ,             STR_PARAM, &db_url.s           },
 	{"db_table" ,           STR_PARAM, &db_table.s         },
@@ -122,7 +122,7 @@ static param_export_t params[]={
 	{0, 0, 0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_SQLDB, NULL, DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/pua_bla/pua_bla.c b/modules/pua_bla/pua_bla.c
index 72520a9f59f..97eb604a30c 100644
--- a/modules/pua_bla/pua_bla.c
+++ b/modules/pua_bla/pua_bla.c
@@ -55,7 +55,7 @@ int bla_set_flag(struct sip_msg* , char*, char*);
 str server_address= {0, 0};
 str presence_server= {0, 0};
 
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{"bla_set_flag", (cmd_function)bla_set_flag, {{0,0,0}},
 		REQUEST_ROUTE},
 	{"bla_handle_notify", (cmd_function)bla_handle_notify, {{0,0,0}},
@@ -63,7 +63,7 @@ static cmd_export_t cmds[]={
 	{0,0,{{0,0,0}},0}
 };
 
-static param_export_t params[]=
+static const param_export_t params[]=
 {
 	{"server_address",	 STR_PARAM, &server_address.s    },
 	{"default_domain",	 STR_PARAM, &default_domain.s    },
@@ -73,7 +73,7 @@ static param_export_t params[]=
 	{0,                  0,                 0            }
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "pua",    DEP_ABORT },
 		{ MOD_TYPE_DEFAULT, "usrloc", DEP_ABORT },
diff --git a/modules/pua_dialoginfo/pua_dialoginfo.c b/modules/pua_dialoginfo/pua_dialoginfo.c
index 0f688261346..2db85ff5c41 100644
--- a/modules/pua_dialoginfo/pua_dialoginfo.c
+++ b/modules/pua_dialoginfo/pua_dialoginfo.c
@@ -109,7 +109,7 @@ static struct dlginfo_cb_params * build_cb_param(int flags,
 		struct to_body *entity_p, struct to_body *peer_p);
 
 
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{"dialoginfo_set", (cmd_function)dialoginfo_set, {
 		{CMD_PARAM_STR|CMD_PARAM_OPT,0,0}, {0,0,0}},
 		REQUEST_ROUTE},
@@ -122,7 +122,7 @@ static cmd_export_t cmds[]={
 	{0,0,{{0,0,0}},0}
 };
 
-static param_export_t params[]={
+static const param_export_t params[]={
 	{"include_callid",      INT_PARAM, &include_callid },
 	{"include_localremote", INT_PARAM, &include_localremote },
 	{"include_tags",        INT_PARAM, &include_tags },
@@ -136,7 +136,7 @@ static param_export_t params[]={
 	{0, 0, 0 }
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "pua",    DEP_ABORT },
 		{ MOD_TYPE_DEFAULT, "dialog", DEP_ABORT },
diff --git a/modules/pua_mi/pua_mi.c b/modules/pua_mi/pua_mi.c
index 0298b91b70f..822a819bf19 100644
--- a/modules/pua_mi/pua_mi.c
+++ b/modules/pua_mi/pua_mi.c
@@ -59,7 +59,7 @@ str presence_server= {0, 0};
 /*
  * Exported MI functions
  */
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "pua_publish", 0,MI_ASYNC_RPL_FLAG,0,{
 		{mi_pua_publish_1, {"presentity_uri", "expires", "event_package", 0}},	
 		{mi_pua_publish_2, {"presentity_uri", "expires", "event_package",
@@ -89,12 +89,12 @@ static mi_export_t mi_cmds[] = {
 /*
  * Exported parameters
  */
-static param_export_t params[]={
+static const param_export_t params[]={
 	{"presence_server",	 STR_PARAM, &presence_server.s	},
 	{0,							 0,			0			}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "pua", DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/pua_usrloc/pua_usrloc.c b/modules/pua_usrloc/pua_usrloc.c
index d62bb68dca1..c02251b79e2 100644
--- a/modules/pua_usrloc/pua_usrloc.c
+++ b/modules/pua_usrloc/pua_usrloc.c
@@ -63,26 +63,26 @@ static void destroy(void);
 
 
 
-// static cmd_export_t cmds[]=
+// static const cmd_export_t cmds[]=
 // {
 // 	{"pua_set_publish", (cmd_function)pua_set_publish, 0, 0, 0, REQUEST_ROUTE},
 // 	{0, 0, 0, 0, 0, 0}
 // };
 
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{"pua_set_publish", (cmd_function)pua_set_publish, {{0,0,0}},
 		REQUEST_ROUTE},
 	{0,0,{{0,0,0}},0}
 };
 
-static param_export_t params[]={
+static const param_export_t params[]={
 	{"default_domain",   STR_PARAM, &default_domain.s   },
 	{"entity_prefix",    STR_PARAM, &pres_prefix.s      },
 	{"presence_server",  STR_PARAM, &presence_server.s  },
 	{0,                  0,         0                   }
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "pua",    DEP_ABORT },
 		{ MOD_TYPE_DEFAULT, "usrloc", DEP_ABORT },
diff --git a/modules/pua_xmpp/pua_xmpp.c b/modules/pua_xmpp/pua_xmpp.c
index 89fe3e9d7ca..b3bf81ab740 100644
--- a/modules/pua_xmpp/pua_xmpp.c
+++ b/modules/pua_xmpp/pua_xmpp.c
@@ -79,7 +79,7 @@ str presence_server= {0, 0};
 static int mod_init(void);
 static int child_init(int);
 
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{"pua_xmpp_notify", (cmd_function)Notify2Xmpp, {{0,0,0}},
 		REQUEST_ROUTE},
 	{"pua_xmpp_req_winfo", (cmd_function)request_winfo, {
@@ -89,13 +89,13 @@ static cmd_export_t cmds[]={
 	{0,0,{{0,0,0}},0}
 };
 
-static param_export_t params[]={
+static const param_export_t params[]={
 	{"server_address",		STR_PARAM,	&server_address.s},
 	{"presence_server",		STR_PARAM,	&presence_server},
 	{0,						0,			0				}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "tm",   DEP_ABORT },
 		{ MOD_TYPE_DEFAULT, "xmpp", DEP_ABORT },
diff --git a/modules/python/python_mod.c b/modules/python/python_mod.c
index c0227c31a61..0dc4cf855ab 100644
--- a/modules/python/python_mod.c
+++ b/modules/python/python_mod.c
@@ -45,7 +45,7 @@ PyObject *format_exc_obj;
 PyThreadState *myThreadState;
 
 /** module parameters */
-static param_export_t params[]={
+static const param_export_t params[]={
     {"script_name",        STR_PARAM, &script_name.s },
     {"mod_init_function",  STR_PARAM, &mod_init_fname.s },
     {"child_init_method",  STR_PARAM, &child_init_mname.s },
diff --git a/modules/qos/qos.c b/modules/qos/qos.c
index 826ade2f185..f0a2f3e6117 100644
--- a/modules/qos/qos.c
+++ b/modules/qos/qos.c
@@ -52,7 +52,7 @@ struct dlg_binds dialog_st;
 struct dlg_binds *dlg_binds = &dialog_st;
 
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"load_qos", (cmd_function)load_qos, {{0,0,0}},0},
 	{0,0,{{0,0,0}},0}
 };
@@ -60,12 +60,12 @@ static cmd_export_t cmds[] = {
 /*
  * Script parameters
  */
-static param_export_t mod_params[]={
+static const param_export_t mod_params[]={
 	{ "qos_flag",		STR_PARAM, &qos_flag_str},
 	{ 0,0,0 }
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "dialog", DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/qrouting/qrouting.c b/modules/qrouting/qrouting.c
index 825cc28aa3a..1a51e3bae49 100644
--- a/modules/qrouting/qrouting.c
+++ b/modules/qrouting/qrouting.c
@@ -111,7 +111,7 @@ static int w_qr_enable_dst(struct sip_msg *_,
 
 static int qr_fix_xstat(void **param);
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"qr_set_xstat", (cmd_function)w_qr_set_xstat,
 		{ {CMD_PARAM_INT, NULL, NULL},
 		  {CMD_PARAM_STR, NULL, NULL},
@@ -142,7 +142,7 @@ static cmd_export_t cmds[] = {
 	{0,0,{{0,0,0}},0}
 };
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"db_url",                  STR_PARAM, &db_url.s},
 	{"table_name",              STR_PARAM, &qr_profiles_table.s},
 	{"algorithm",               STR_PARAM, &qr_algorithm_s},
@@ -162,7 +162,7 @@ static param_export_t params[] = {
 #define HLP1 "Params: [partition [, rule_id [, dst_name]]]; List QR statistics"
 #define HLP2 "Params: [partition] rule_id dst_name; Remove a gateway/carrier from routing"
 #define HLP3 "Params: [partition] rule_id dst_name; Re-introduce a gateway/carrier into routing"
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "qr_status", HLP1, 0, NULL, {
 		{mi_qr_status_0, {NULL}},
 		{mi_qr_status_1, {QR_PARAM_PART, NULL}},
@@ -190,7 +190,7 @@ static mi_export_t mi_cmds[] = {
 	{EMPTY_MI_EXPORT}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_SQLDB, NULL, DEP_ABORT },
 		{ MOD_TYPE_DEFAULT, "tm", DEP_ABORT },
diff --git a/modules/rabbitmq/rabbitmq.c b/modules/rabbitmq/rabbitmq.c
index f108cbb8d6b..364f532dbe8 100644
--- a/modules/rabbitmq/rabbitmq.c
+++ b/modules/rabbitmq/rabbitmq.c
@@ -49,7 +49,7 @@ struct tls_mgm_binds tls_api;
 gen_lock_t *ssl_lock;
 #endif
 
-static param_export_t params[]={
+static const param_export_t params[]={
 	{ "server_id",			STR_PARAM|USE_FUNC_PARAM,
 		(void *)rmq_server_add},
 	{"use_tls", INT_PARAM, &use_tls},
@@ -72,7 +72,7 @@ static module_dependency_t *get_deps_use_tls_openssl(const param_export_t *param
 }
 
 /* modules dependencies */
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_NULL, NULL, 0 },
 	},
@@ -84,7 +84,7 @@ static dep_export_t deps = {
 };
 
 /* exported commands */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"rabbitmq_publish",(cmd_function)rmq_publish, {
 		{CMD_PARAM_STR, fixup_rmq_server, 0},
 		{CMD_PARAM_STR, 0, 0},
diff --git a/modules/rabbitmq_consumer/rabbitmq_consumer.c b/modules/rabbitmq_consumer/rabbitmq_consumer.c
index 311b6c34017..c4bbcdc2b88 100644
--- a/modules/rabbitmq_consumer/rabbitmq_consumer.c
+++ b/modules/rabbitmq_consumer/rabbitmq_consumer.c
@@ -32,7 +32,7 @@ static void mod_destroy(void);
 int use_tls;
 struct tls_mgm_binds tls_api;
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"connection_id", STR_PARAM|USE_FUNC_PARAM, (void *)rmq_conn_add},
 	{"connect_timeout", INT_PARAM, &rmq_connect_timeout},
 	{"retry_timeout", INT_PARAM, &rmq_retry_timeout},
@@ -40,7 +40,7 @@ static param_export_t params[] = {
 	{0,0,0}
 };
 
-static proc_export_t procs[] = {
+static const proc_export_t procs[] = {
 	{ "RabbitMQ Consumer", 0, 0, rmq_cons_process, 1,
 		PROC_FLAG_HAS_IPC },
 	{ 0, 0, 0, 0, 0, 0 },
@@ -55,7 +55,7 @@ static module_dependency_t *get_deps_use_tls(const param_export_t *param)
 }
 
 /* modules dependencies */
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_NULL, NULL, 0 },
 	},
diff --git a/modules/rate_cacher/rate_cacher.c b/modules/rate_cacher/rate_cacher.c
index 4b472cb0241..61efb1dba7b 100644
--- a/modules/rate_cacher/rate_cacher.c
+++ b/modules/rate_cacher/rate_cacher.c
@@ -112,7 +112,7 @@ static int acc_hash_size = 256;
 static int add_carrier(str *carrier,int safe);
 static int add_client(str *accountid,int safe);
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_NULL, NULL, 0 },
 	},
@@ -124,7 +124,7 @@ static dep_export_t deps = {
 	},
 };
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{ "vendors_db_url",		STR_PARAM,	&carriers_db_url.s},
 	{ "vendors_db_table",		STR_PARAM,	&carr_db_table.s},
 	{ "vendors_hash_size",		INT_PARAM,	&carr_hash_size},
@@ -136,7 +136,7 @@ static param_export_t params[] = {
 	{ 0,				0,		0}
 };
 
-static mi_export_t mi_cmds [] = {
+static const mi_export_t mi_cmds [] = {
 	{ "rc_addVendor",             0, 0, 0, {
 		{mi_add_carrier, {"name",  0}},
 		{EMPTY_MI_RECIPE}}
@@ -180,7 +180,7 @@ static mi_export_t mi_cmds [] = {
 	{EMPTY_MI_EXPORT}
 };
 
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{"get_client_price", (cmd_function)script_get_client_price, {
 		{CMD_PARAM_STR, 0, 0},
 		{CMD_PARAM_INT, 0, 0},
diff --git a/modules/ratelimit/ratelimit.c b/modules/ratelimit/ratelimit.c
index 0d0cea4f18f..22be29fc26c 100644
--- a/modules/ratelimit/ratelimit.c
+++ b/modules/ratelimit/ratelimit.c
@@ -122,7 +122,7 @@ static int pv_get_rl_count(struct sip_msg *msg, pv_param_t *param,
 		pv_value_t *res);
 static int pv_parse_rl_count(pv_spec_p sp, const str *in);
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"rl_check", (cmd_function)w_rl_check, {
 		{CMD_PARAM_STR,0,0},
 		{CMD_PARAM_INT,0,0},
@@ -140,7 +140,7 @@ static cmd_export_t cmds[] = {
 	{0,0,{{0,0,0}},0}
 };
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{ "timer_interval",		INT_PARAM,	&rl_timer_interval		},
 	{ "expire_time",		INT_PARAM,	&rl_expire_time			},
 	{ "hash_size",			INT_PARAM,	&rl_hash_size			},
@@ -166,7 +166,7 @@ static param_export_t params[] = {
 #define RLH5 "Params: none ; Shows the status of the other SIP instances."
 #define RLH6 "Params: pipe ; Dumps the details of a (SBT) pipe. "
 
-static mi_export_t mi_cmds [] = {
+static const mi_export_t mi_cmds [] = {
 	{"rl_list", RLH1, 0, 0, {
 		{mi_stats, {0}},
 		{mi_stats_1, {"pipe", 0}},
@@ -193,13 +193,13 @@ static mi_export_t mi_cmds [] = {
 	{EMPTY_MI_EXPORT}
 };
 
-static pv_export_t mod_items[] = {
+static const pv_export_t mod_items[] = {
 	{ {"rl_count", sizeof("rl_count")-1}, 1010, pv_get_rl_count, 0,
 		 pv_parse_rl_count, 0, 0, 0 },
 	{ {0, 0}, 0, 0, 0, 0, 0, 0, 0 }
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_NULL, NULL, 0 },
 	},
diff --git a/modules/regex/regex_mod.c b/modules/regex/regex_mod.c
index a9b0524103c..52ff43dcdbb 100644
--- a/modules/regex/regex_mod.c
+++ b/modules/regex/regex_mod.c
@@ -115,7 +115,7 @@ mi_response_t *mi_pcres_reload(const mi_params_t *params,
 /*
  * Exported functions
  */
-static cmd_export_t cmds[] =
+static const cmd_export_t cmds[] =
 {
 	{"pcre_match", (cmd_function)w_pcre_match, {
 		{CMD_PARAM_STR,0,0},
@@ -133,7 +133,7 @@ static cmd_export_t cmds[] =
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"file",                STR_PARAM,  &file                },
 	{"max_groups",          INT_PARAM,  &max_groups          },
 	{"group_max_size",      INT_PARAM,  &group_max_size      },
@@ -148,7 +148,7 @@ static param_export_t params[] = {
 /*
  * Exported MI functions
  */
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "regex_reload", 0, 0, 0, {
 		{mi_pcres_reload, {0}},
 		{EMPTY_MI_RECIPE}}
diff --git a/modules/registrar/reg_mod.c b/modules/registrar/reg_mod.c
index 29c0d4f6036..3e58ed8fd4c 100644
--- a/modules/registrar/reg_mod.c
+++ b/modules/registrar/reg_mod.c
@@ -138,7 +138,7 @@ struct sig_binds sigb;
 struct tm_binds tmb;
 
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"save", (cmd_function)save, {
 		{CMD_PARAM_STR|CMD_PARAM_STATIC, domain_fixup, 0},
 		{CMD_PARAM_STR|CMD_PARAM_OPT,0,0},
@@ -185,7 +185,7 @@ static cmd_export_t cmds[] = {
 	{0,0,{{0,0,0}},0}
 };
 
-static acmd_export_t acmds[] = {
+static const acmd_export_t acmds[] = {
 	pn_async_cmds,
 	{0,0,{{0,0,0}}}
 };
@@ -193,7 +193,7 @@ static acmd_export_t acmds[] = {
 /*! \brief
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"default_expires",    INT_PARAM, &default_expires       },
 	{"default_q",          INT_PARAM, &default_q             },
 	{"case_sensitive",     INT_PARAM, &case_sensitive        },
@@ -221,7 +221,7 @@ static param_export_t params[] = {
 
 
 /*! \brief We expose internal variables via the statistic framework below.*/
-static stat_export_t mod_stats[] = {
+static const stat_export_t mod_stats[] = {
 	{"max_expires",       STAT_NO_RESET, &max_expires_stat        },
 	{"max_contacts",      STAT_NO_RESET, &max_contacts_stat       },
 	{"default_expire",    STAT_NO_RESET, &default_expire_stat     },
@@ -230,7 +230,7 @@ static stat_export_t mod_stats[] = {
 	{0, 0, 0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "usrloc",    DEP_ABORT  },
 		{ MOD_TYPE_DEFAULT, "signaling", DEP_ABORT  },
diff --git a/modules/rest_client/rest_client.c b/modules/rest_client/rest_client.c
index fa2b610f921..a7542a9bae9 100644
--- a/modules/rest_client/rest_client.c
+++ b/modules/rest_client/rest_client.c
@@ -108,7 +108,7 @@ static int w_rest_init_client_tls(struct sip_msg *msg, str *tls_client_dom);
 int validate_curl_http_version(const int *http_version);
 
 /* module dependencies */
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "tracer", DEP_SILENT },
 		{ MOD_TYPE_NULL, NULL, 0 }
@@ -118,7 +118,7 @@ static dep_export_t deps = {
 	}
 };
 
-static acmd_export_t acmds[] = {
+static const acmd_export_t acmds[] = {
 	{"rest_get",(acmd_function)w_async_rest_get, {
 		{CMD_PARAM_STR,0,0},
 		{CMD_PARAM_VAR,0,0},
@@ -145,7 +145,7 @@ static acmd_export_t acmds[] = {
  * Exported functions
  */
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"rest_get",(cmd_function)w_rest_get, {
 		{CMD_PARAM_STR,0,0},
 		{CMD_PARAM_VAR,0,0},
@@ -184,15 +184,15 @@ int tr_rest_parse(str* in, trans_t *t);
 int tr_rest_eval(struct sip_msg *msg, tr_param_t *tp, int subtype,
 		pv_value_t *val);
 
-static trans_export_t trans[] = {
-	{str_init("rest"), tr_rest_parse, tr_rest_eval},
+static const trans_export_t trans[] = {
+	{str_const_init("rest"), tr_rest_parse, tr_rest_eval},
 	{{0,0},0,0}
 };
 
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{ "connection_timeout",	INT_PARAM, &connection_timeout	},
 	{ "connect_poll_interval", INT_PARAM, &connect_poll_interval },
 	{ "max_async_transfers", INT_PARAM, &max_async_transfers },
diff --git a/modules/rls/rls.c b/modules/rls/rls.c
index ff830a20741..631052c9693 100644
--- a/modules/rls/rls.c
+++ b/modules/rls/rls.c
@@ -169,7 +169,7 @@ mi_response_t *mi_update_subscriptions(const mi_params_t *params,
 								struct mi_handler *async_hdl);
 
 
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{"rls_handle_subscribe",     (cmd_function)rls_handle_subscribe, {{0,0,0}},
 		REQUEST_ROUTE},
 	{"rls_handle_notify",        (cmd_function)rls_handle_notify, {{0,0,0}},
@@ -177,7 +177,7 @@ static cmd_export_t cmds[]={
 	{0,0,{{0,0,0}},0}
 };
 
-static param_export_t params[]={
+static const param_export_t params[]={
 	{ "contact_user",           STR_PARAM, &contact_user.s             },
 	{ "presence_server",        STR_PARAM, &presence_server.s          },
 	{ "rlsubs_table",           STR_PARAM, &rlsubs_table.s             },
@@ -193,7 +193,7 @@ static param_export_t params[]={
 	{  0,                       0,              0                       }
 };
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "rls_update_subscriptions", 0, 0, 0, {
 		{mi_update_subscriptions, {"presentity_uri", 0}},
 		{EMPTY_MI_RECIPE}}
@@ -201,7 +201,7 @@ static mi_export_t mi_cmds[] = {
 	{EMPTY_MI_EXPORT}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "tm",        DEP_ABORT },
 		{ MOD_TYPE_DEFAULT, "signaling", DEP_ABORT },
diff --git a/modules/rr/rr_mod.c b/modules/rr/rr_mod.c
index 1b5486d7cc4..9c46adc4914 100644
--- a/modules/rr/rr_mod.c
+++ b/modules/rr/rr_mod.c
@@ -93,7 +93,7 @@ static int pv_get_rr_params(struct sip_msg *msg, pv_param_t *param,
 /*! \brief
  * Exported functions
  */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"loose_route", (cmd_function)loose_route, {{0,0,0}},
 		REQUEST_ROUTE},
 	{"record_route", (cmd_function)w_record_route, {
@@ -119,7 +119,7 @@ static cmd_export_t cmds[] = {
 /*! \brief
  * Exported parameters
  */
-static param_export_t params[] ={
+static const param_export_t params[] ={
 	{"append_fromtag",                 INT_PARAM, &append_fromtag                },
 	{"enable_double_rr",               INT_PARAM, &enable_double_rr              },
 #ifdef ENABLE_USER_CHECK
@@ -134,7 +134,7 @@ static param_export_t params[] ={
 /**
  * pseudo-variables exported by RR module
  */
-static pv_export_t mod_items[] = {
+static const pv_export_t mod_items[] = {
 	{ {"rr_params", sizeof("rr_params")-1}, 900, pv_get_rr_params, 0,
 		0, 0, 0, 0 },
 	{ {0, 0}, 0, 0, 0, 0, 0, 0, 0 }
diff --git a/modules/rtp_relay/rtp_relay.c b/modules/rtp_relay/rtp_relay.c
index 4c9936acfbc..95533c52c63 100644
--- a/modules/rtp_relay/rtp_relay.c
+++ b/modules/rtp_relay/rtp_relay.c
@@ -49,7 +49,7 @@ static int fixup_rtp_relay(void **param);
 static int mod_preinit(void);
 static int mod_init(void);
 
-static dep_export_t mod_deps = {
+static const dep_export_t mod_deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "tm", DEP_ABORT },
 		{ MOD_TYPE_DEFAULT, "dialog", DEP_SILENT },
@@ -60,7 +60,7 @@ static dep_export_t mod_deps = {
 	},
 };
 
-static cmd_export_t mod_cmds[] = {
+static const cmd_export_t mod_cmds[] = {
 	{"rtp_relay_engage", (cmd_function)rtp_relay_engage, {
 		{CMD_PARAM_STR, fixup_rtp_relay, 0},
 		{CMD_PARAM_INT|CMD_PARAM_OPT, 0, 0},
@@ -73,7 +73,7 @@ static cmd_export_t mod_cmds[] = {
 	{0,0,{{0,0,0}},0}
 };
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "rtp_relay_list", 0, 0, 0, {
 		{mi_rtp_relay_list, {0}},
 		{mi_rtp_relay_list, {"engine", 0}},
@@ -114,11 +114,11 @@ static mi_export_t mi_cmds[] = {
 };
 
 
-static param_export_t mod_params[] = {
+static const param_export_t mod_params[] = {
 	{0, 0, 0}
 };
 
-static pv_export_t mod_pvars[] = {
+static const pv_export_t mod_pvars[] = {
 	{ str_init("rtp_relay"), 2004, pv_get_rtp_relay_var, pv_set_rtp_relay_var,
 		pv_parse_rtp_relay_var, pv_parse_rtp_relay_index, 0, 0},
 	{ str_init("rtp_relay_peer"), 2005, pv_get_rtp_relay_var,
diff --git a/modules/rtpengine/rtpengine.c b/modules/rtpengine/rtpengine.c
index 9a611cdfda8..cbea67e5414 100644
--- a/modules/rtpengine/rtpengine.c
+++ b/modules/rtpengine/rtpengine.c
@@ -415,7 +415,7 @@ static struct dlg_binds dlgb;
 
 static pv_elem_t *extra_id_pv = NULL;
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"rtpengine_use_set", (cmd_function)set_rtpengine_set_f, {
 		{CMD_PARAM_INT, fixup_set_id, fixup_free_set_id}, {0,0,0}},
 		ALL_ROUTES},
@@ -666,7 +666,7 @@ static int pv_rtpengine_index(pv_spec_p sp, const str *in)
 	return 0;
 }
 
-static pv_export_t mod_pvs[] = {
+static const pv_export_t mod_pvs[] = {
 	{{"rtpstat", (sizeof("rtpstat")-1)}, /* RTP-Statistics */
 		1000, pv_get_rtpstat_f, 0, pv_parse_rtpstat,
 		pv_rtpengine_index, pv_rtpengine_stats_used, 0},
@@ -675,7 +675,7 @@ static pv_export_t mod_pvs[] = {
 	{{0, 0}, 0, 0, 0, 0, 0, 0, 0}
 };
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"rtpengine_sock",         STR_PARAM|USE_FUNC_PARAM,
 				 (void*)rtpengine_set_store          },
 	{"rtpengine_disable_tout", INT_PARAM, &rtpengine_disable_tout },
@@ -694,7 +694,7 @@ static param_export_t params[] = {
 	{0, 0, 0}
 };
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ MI_ENABLE_RTP_ENGINE, 0, 0, 0, {
 		{mi_enable_rtp_proxy, {"url", "enable", 0}},
 		{mi_enable_rtp_proxy, {"url", "enable", "setid", 0}},
@@ -716,7 +716,7 @@ static mi_export_t mi_cmds[] = {
 	{EMPTY_MI_EXPORT}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "tm", DEP_SILENT },
 		{ MOD_TYPE_DEFAULT, "dialog", DEP_SILENT },
@@ -729,7 +729,7 @@ static dep_export_t deps = {
 	},
 };
 
-static proc_export_t procs[] = {
+static const proc_export_t procs[] = {
 	{"RTPEngine notification receiver",  0,  0, rtpengine_notify_process, 1,
 		PROC_FLAG_INITCHILD},
 	{0,0,0,0,0,0}
diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c
index b953ec169f8..41bcb56caba 100644
--- a/modules/rtpproxy/rtpproxy.c
+++ b/modules/rtpproxy/rtpproxy.c
@@ -426,7 +426,7 @@ static event_id_t rtpproxy_dtmf_event = EVI_ERROR;
 
 rw_lock_t *nh_lock=NULL;
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"rtpproxy_unforce", (cmd_function)unforce_rtp_proxy_f, {
 		{CMD_PARAM_INT | CMD_PARAM_OPT, fixup_set_id, fixup_free_set_id},
 		{CMD_PARAM_VAR | CMD_PARAM_OPT, 0, 0}, {0,0,0}},
@@ -500,7 +500,7 @@ static cmd_export_t cmds[] = {
 	{0,0,{{0,0,0}},0}
 };
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"nortpproxy_str",        STR_PARAM, &nortpproxy_str.s        },
 	{"rtpproxy_sock",         STR_PARAM|USE_FUNC_PARAM,
 	                         (void*)rtpproxy_set_store            },
@@ -521,7 +521,7 @@ static param_export_t params[] = {
 	{0, 0, 0}
 };
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ MI_ENABLE_RTP_PROXY, 0, 0, 0, {
 		{mi_enable_rtp_proxy_1, {"url", "enable", 0}},
 		{mi_enable_rtp_proxy_2, {"url", "enable", "setid", 0}},
@@ -538,13 +538,13 @@ static mi_export_t mi_cmds[] = {
 	{EMPTY_MI_EXPORT}
 };
 
-static proc_export_t procs[] = {
+static const proc_export_t procs[] = {
 	{"RTPP notification receiver",  0,  0, notification_listener_process, 1,
 		PROC_FLAG_INITCHILD|PROC_FLAG_HAS_IPC|PROC_FLAG_NEEDS_SCRIPT},
 	{0,0,0,0,0,0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "tm",     DEP_ABORT },
 		{ MOD_TYPE_DEFAULT, "dialog", DEP_SILENT },
diff --git a/modules/script_helper/script_helper.c b/modules/script_helper/script_helper.c
index c871ed7d5ea..f84d255a9b8 100644
--- a/modules/script_helper/script_helper.c
+++ b/modules/script_helper/script_helper.c
@@ -52,7 +52,7 @@ int parse_dlg_flags(modparam_t type, void *val);
 
 int mod_init(void);
 
-static param_export_t params[] =
+static const param_export_t params[] =
 {
 	{ "sequential_route", STR_PARAM, &seq_route },
 	{ "use_dialog", INT_PARAM, &use_dialog },
@@ -68,7 +68,7 @@ static module_dependency_t *get_deps_use_dialog(const param_export_t *param)
 	return alloc_module_dep(MOD_TYPE_DEFAULT, "dialog", DEP_ABORT);
 }
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "rr", DEP_ABORT },
 		{ MOD_TYPE_DEFAULT, "sl", DEP_ABORT },
diff --git a/modules/signaling/signaling.c b/modules/signaling/signaling.c
index 973a2cc39df..e69bb342395 100644
--- a/modules/signaling/signaling.c
+++ b/modules/signaling/signaling.c
@@ -56,7 +56,7 @@ static int pv_get_local_totag(struct sip_msg *msg, pv_param_t *param,
 
 
 /** exported commands */
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{"send_reply",(cmd_function)sig_send_reply, {	
 		{CMD_PARAM_INT,fixup_sig_send_reply,0},
 		{CMD_PARAM_STR,0,0}, {0,0,0}},
@@ -66,13 +66,13 @@ static cmd_export_t cmds[]={
 };
 
 /** pseudo-variables exported by the module */
-static pv_export_t mod_pvars[] = {
+static const pv_export_t mod_pvars[] = {
 	{ {"sig_local_totag", sizeof("sig_local_totag") - 1}, 5003,
 		pv_get_local_totag, 0, 0, 0, 0, 0},
 	{ {0, 0}, 0, 0, 0, 0, 0, 0, 0 }
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "tm", DEP_SILENT },
 		{ MOD_TYPE_DEFAULT, "sl", DEP_SILENT },
diff --git a/modules/sip_i/sip_i.c b/modules/sip_i/sip_i.c
index 7713978551b..bbd774b194b 100644
--- a/modules/sip_i/sip_i.c
+++ b/modules/sip_i/sip_i.c
@@ -59,12 +59,12 @@ int tr_isup_parse(str* in, trans_t *t);
 int tr_isup_eval(struct sip_msg *msg, tr_param_t *tp, int subtype,
 		pv_value_t *val);
 
-static trans_export_t trans[] = {
-	{str_init("isup"), tr_isup_parse, tr_isup_eval},
+static const trans_export_t trans[] = {
+	{str_const_init("isup"), tr_isup_parse, tr_isup_eval},
 	{{0,0},0,0}
 };
 
-static pv_export_t mod_items[] = {
+static const pv_export_t mod_items[] = {
 	{{"isup_msg_type", sizeof("isup_msg_type") - 1}, 1000, pv_get_isup_msg_type,
 		0, 0, 0, 0, 0},
 	{{"isup_param", sizeof("isup_param") - 1}, 1000, pv_get_isup_param,
@@ -74,7 +74,7 @@ static pv_export_t mod_items[] = {
 	{ {0, 0}, 0, 0, 0, 0, 0, 0, 0 }
 };
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"add_isup_part", (cmd_function)add_isup_part_cmd, {
 		{CMD_PARAM_STR|CMD_PARAM_OPT,0,0},
 		{CMD_PARAM_STR|CMD_PARAM_OPT,0,0}, {0,0,0}},
@@ -87,7 +87,7 @@ static str isup_mime = str_init(ISUP_MIME_S);
 static str country_code = str_init(DEFAULT_COUNTRY_CODE);
 static str default_part_headers = str_init(DEFAULT_PART_HEADERS);
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"param_subfield_separator", STR_PARAM, &param_subf_sep.s},
 	{"isup_mime_str", STR_PARAM, &isup_mime.s},
 	{"country_code", STR_PARAM, &country_code.s},
diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c
index e7aaafa4454..871da2d6243 100644
--- a/modules/sipcapture/sipcapture.c
+++ b/modules/sipcapture/sipcapture.c
@@ -490,7 +490,7 @@ static str hep_str={hepbuf, 0};
 /*! \brief
  * Exported functions
  */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"sip_capture", (cmd_function)sip_capture, {
 		{CMD_PARAM_STR | CMD_PARAM_OPT, sip_capture_fix_table, 0},
 		{CMD_PARAM_STR | CMD_PARAM_OPT, 0, 0},
@@ -524,7 +524,7 @@ static cmd_export_t cmds[] = {
 	{0, 0, {{0, 0, 0}}, 0}
 };
 
-static acmd_export_t acmds[] = {
+static const acmd_export_t acmds[] = {
 	{"sip_capture",    (acmd_function)async_sip_capture, {
 		{CMD_PARAM_STR | CMD_PARAM_OPT, sip_capture_async_fix_table, 0},
 		{CMD_PARAM_STR | CMD_PARAM_OPT, 0, 0},
@@ -546,7 +546,7 @@ static proc_export_t procs[] = {
 /*! \brief
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"db_url",			STR_PARAM, &db_url.s            },
 	{"table_name",       		STR_PARAM, &table_name.s	},
 	{"rtcp_table_name",			STR_PARAM, &rtcp_table_name.s	},
@@ -608,7 +608,7 @@ static param_export_t params[] = {
 /*! \brief
  * MI commands
  */
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "sip_capture", 0, 0, 0, {
 		{sip_capture_mi, {0}},
 		{sip_capture_mi_1, {"capture_mode", 0}},
@@ -622,7 +622,7 @@ static mi_export_t mi_cmds[] = {
 stat_var* sipcapture_req;
 stat_var* sipcapture_rpl;
 
-stat_export_t sipcapture_stats[] = {
+static const stat_export_t sipcapture_stats[] = {
 	{"captured_requests" ,  0,  &sipcapture_req  },
 	{"captured_replies"  ,  0,  &sipcapture_rpl  },
 	{0,0,0}
@@ -641,7 +641,7 @@ static module_dependency_t *get_deps_hep(const param_export_t *param)
 
 
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_SQLDB, NULL, DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
@@ -655,7 +655,7 @@ static dep_export_t deps = {
  /**
  * pseudo-variables
  */
-static pv_export_t mod_items[] = {
+static const pv_export_t mod_items[] = {
 	{{"hep_net", sizeof("hep_net")-1}, 1201, pv_get_hep_net, 0,
 		pv_parse_hep_net_name, 0, 0, 0},
 	{{"HEPVERSION", sizeof("HEPVERSION")-1}, 1202, pv_get_hep_version, 0,
diff --git a/modules/sipmsgops/sipmsgops.c b/modules/sipmsgops/sipmsgops.c
index 95d7ee74d07..07a51fa98da 100644
--- a/modules/sipmsgops/sipmsgops.c
+++ b/modules/sipmsgops/sipmsgops.c
@@ -116,7 +116,7 @@ static int change_reply_status_f(struct sip_msg* msg, int* code, str* reason);
 
 static int mod_init(void);
 
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{"append_to_reply",  (cmd_function)append_to_reply_f, {
 		{CMD_PARAM_STR, 0, 0}, {0, 0, 0}},
 		REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|ERROR_ROUTE},
diff --git a/modules/siprec/siprec.c b/modules/siprec/siprec.c
index f0777db685d..097a420f016 100644
--- a/modules/siprec/siprec.c
+++ b/modules/siprec/siprec.c
@@ -44,7 +44,7 @@ static int siprec_pause_rec(struct sip_msg *msg);
 static int siprec_resume_rec(struct sip_msg *msg);
 
 /* modules dependencies */
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "tm", DEP_ABORT },
 		{ MOD_TYPE_DEFAULT, "dialog", DEP_ABORT },
@@ -59,7 +59,7 @@ static dep_export_t deps = {
 };
 
 /* exported commands */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"siprec_start_recording",(cmd_function)siprec_start_rec, {
 		{CMD_PARAM_STR,0,0}, {0,0,0}},
 		REQUEST_ROUTE|ONREPLY_ROUTE},
@@ -71,12 +71,12 @@ static cmd_export_t cmds[] = {
 };
 
 /* exported parameters */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"skip_failover_codes",	STR_PARAM, &skip_failover_codes.s },
 	{0, 0, 0}
 };
 
-static pv_export_t vars[] = {
+static const pv_export_t vars[] = {
 	{ {"siprec", sizeof("siprec")-1}, 1000,
 		pv_get_siprec, pv_set_siprec, pv_parse_siprec,
 		0, 0, 0 },
diff --git a/modules/sl/sl.c b/modules/sl/sl.c
index ca1768528af..09197fdcaab 100644
--- a/modules/sl/sl.c
+++ b/modules/sl/sl.c
@@ -66,7 +66,7 @@ stat_var *sent_rpls;
 stat_var *sent_err_rpls;
 stat_var *rcv_acks;
 
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{"sl_send_reply",(cmd_function)w_sl_send_reply, {	
 		{CMD_PARAM_INT,fixup_sl_send_reply,0},
 		{CMD_PARAM_STR,0,0}, {0,0,0}},
@@ -78,13 +78,13 @@ static cmd_export_t cmds[]={
 	{0,0,{{0,0,0}},0}
 };
 
-static param_export_t mod_params[]={
+static const param_export_t mod_params[]={
 	{ "enable_stats",  INT_PARAM, &sl_enable_stats },
 	{ 0,0,0 }
 };
 
 
-static stat_export_t mod_stats[] = {
+static const stat_export_t mod_stats[] = {
 	{"1xx_replies" ,       0,  &tx_1xx_rpls    },
 	{"2xx_replies" ,       0,  &tx_2xx_rpls    },
 	{"3xx_replies" ,       0,  &tx_3xx_rpls    },
diff --git a/modules/sngtc/sngtc.c b/modules/sngtc/sngtc.c
index 45c8dbef378..3429f720d00 100644
--- a/modules/sngtc/sngtc.c
+++ b/modules/sngtc/sngtc.c
@@ -124,16 +124,16 @@ static int sngtc_caller_answer(struct sip_msg *msg);
 
 static int sng_logger(int level, char *fmt, ...);
 
-static proc_export_t procs[] = {
+static const proc_export_t procs[] = {
 	{ "sangoma_worker", NULL, NULL, sangoma_worker_loop, 1, 0 },
 	{ 0, 0, 0, 0, 0, 0 },
 };
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{ 0, 0, 0 }
 };
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"sngtc_offer", (cmd_function)sngtc_offer, {{0,0,0}},
 		REQUEST_ROUTE|ONREPLY_ROUTE},
 	{"sngtc_caller_answer", (cmd_function)sngtc_caller_answer, {{0,0,0}},
@@ -145,7 +145,7 @@ static cmd_export_t cmds[] = {
 	{0,0,{{0,0,0}},0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "dialog", DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/snmpstats/snmpstats.h b/modules/snmpstats/snmpstats.h
index ad9b927e527..98d3bd95a00 100644
--- a/modules/snmpstats/snmpstats.h
+++ b/modules/snmpstats/snmpstats.h
@@ -87,7 +87,7 @@ static int  mod_child_init(int rank);
 static void mod_destroy(void);
 
 
-static proc_export_t mod_procs[] = {
+static const proc_export_t mod_procs[] = {
 	{"SNMP AgentX",  0,  0, agentx_child, 1 , 0},
 	{0,0,0,0,0,0}
 };
@@ -97,7 +97,7 @@ static proc_export_t mod_procs[] = {
  * This structure defines the SNMPStats parameters that can be configured
  * through the opensips.cfg configuration file.
  */
-static param_export_t mod_params[] =
+static const param_export_t mod_params[] =
 {
 	{ "sipEntityType",          STR_PARAM|USE_FUNC_PARAM,
 			(void *)handleSipEntityType       },
@@ -116,7 +116,7 @@ static param_export_t mod_params[] =
 	{ 0,0,0 }
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "usrloc", DEP_SILENT },
 		{ MOD_TYPE_DEFAULT, "dialog", DEP_SILENT },
diff --git a/modules/speeddial/speeddial.c b/modules/speeddial/speeddial.c
index 79e67733f29..2b59e4baa2e 100644
--- a/modules/speeddial/speeddial.c
+++ b/modules/speeddial/speeddial.c
@@ -66,7 +66,7 @@ db_con_t* db_handle=0;   /* Database connection handle */
 
 
 /* Exported functions */
-// static cmd_export_t cmds[] = {
+// static const cmd_export_t cmds[] = {
 // 	{"sd_lookup", (cmd_function)sd_lookup, 1, fixup_spve_null, 0,
 // 		REQUEST_ROUTE},
 // 	{"sd_lookup", (cmd_function)sd_lookup, 2, fixup_spve_spve, 0,
@@ -74,7 +74,7 @@ db_con_t* db_handle=0;   /* Database connection handle */
 // 	{0, 0, 0, 0, 0, 0}
 // };
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"sd_lookup", (cmd_function)sd_lookup, {
 		{CMD_PARAM_STR,0,0},
 		{CMD_PARAM_STR|CMD_PARAM_OPT,0,0}, {0,0,0}},
@@ -83,7 +83,7 @@ static cmd_export_t cmds[] = {
 };
 
 /* Exported parameters */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"db_url",           STR_PARAM, &db_url.s             },
 	{"user_column",      STR_PARAM, &user_column.s        },
 	{"domain_column",    STR_PARAM, &domain_column.s      },
@@ -95,7 +95,7 @@ static param_export_t params[] = {
 	{0, 0, 0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_SQLDB, NULL, DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/sql_cacher/sql_cacher.c b/modules/sql_cacher/sql_cacher.c
index 07f17d4c358..94e4c956fc7 100644
--- a/modules/sql_cacher/sql_cacher.c
+++ b/modules/sql_cacher/sql_cacher.c
@@ -69,7 +69,7 @@ gen_lock_t *queries_lock;
 void *sql_srg = NULL;
 
 /* module parameters */
-static param_export_t mod_params[] = {
+static const param_export_t mod_params[] = {
 	{"spec_delimiter", STR_PARAM, &spec_delimiter.s},
 	{"pvar_delimiter", STR_PARAM, &pvar_delimiter.s},
 	{"columns_delimiter", STR_PARAM, &columns_delimiter.s},
@@ -80,13 +80,13 @@ static param_export_t mod_params[] = {
 	{0,0,0}
 };
 
-static pv_export_t mod_items[] = {
+static const pv_export_t mod_items[] = {
 	{{"sql_cached_value", sizeof("sql_cached_value") - 1}, 1000,
 		pv_get_sql_cached_value, 0, pv_parse_name, 0, 0, 0},
 	{ {0, 0}, 0, 0, 0, 0, 0, 0, 0 }
 };
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "sql_cacher_reload", "reload the SQL database into the cache", 0, 0, {
 		{mi_reload_1, {"id", 0}},
 		{mi_reload_2, {"id", "key", 0}},
@@ -95,7 +95,7 @@ static mi_export_t mi_cmds[] = {
 	{EMPTY_MI_EXPORT}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_SQLDB, NULL, DEP_ABORT },
 		{ MOD_TYPE_CACHEDB, NULL, DEP_ABORT },
diff --git a/modules/sst/sst.c b/modules/sst/sst.c
index 60801c9614d..03c96767c3e 100644
--- a/modules/sst/sst.c
+++ b/modules/sst/sst.c
@@ -85,7 +85,7 @@ struct dlg_binds *dlg_binds = &dialog_st;
 /*
  * Script commands we export.
  */
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{"sstCheckMin", (cmd_function)sst_check_min, {
 		{CMD_PARAM_INT|CMD_PARAM_OPT,0,0}, {0,0,0}},
 		REQUEST_ROUTE | ONREPLY_ROUTE},
@@ -95,7 +95,7 @@ static cmd_export_t cmds[]={
 /*
  * Script parameters
  */
-static param_export_t mod_params[]={
+static const param_export_t mod_params[]={
 	{ "enable_stats", INT_PARAM, &sst_enable_stats			},
 	{ "min_se", INT_PARAM, &sst_minSE						},
 	{ "reject_to_small",		INT_PARAM, &sst_reject 		},
@@ -107,12 +107,12 @@ static param_export_t mod_params[]={
 /*
  * Export the statistics we have
  */
-static stat_export_t mod_stats[] = {
+static const stat_export_t mod_stats[] = {
 	{"expired_sst", 0,  &expired_sst},
 	{0,0,0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "signaling", DEP_ABORT },
 		{ MOD_TYPE_DEFAULT, "dialog",    DEP_ABORT },
diff --git a/modules/statistics/statistics.c b/modules/statistics/statistics.c
index 5aa9db29347..05a446d5a2d 100644
--- a/modules/statistics/statistics.c
+++ b/modules/statistics/statistics.c
@@ -140,7 +140,7 @@ static int w_stat_iter_next(struct sip_msg *msg, pv_spec_t *key, pv_spec_t *val,
 struct list_head script_iters;
 static OSIPS_LIST_HEAD(series_profiles);
 
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{"update_stat", (cmd_function)w_update_stat, {
 		{CMD_PARAM_STR, fixup_stat, fixup_free_stat},
 		{CMD_PARAM_INT, 0, 0}, {0,0,0}},
@@ -169,7 +169,7 @@ static cmd_export_t cmds[]={
 	{0,0,{{0,0,0}},0}
 };
 
-static param_export_t mod_params[]={
+static const param_export_t mod_params[]={
 	{ "variable",  STR_PARAM|USE_FUNC_PARAM, (void*)reg_param_stat },
 	{ "stat_groups",  STR_PARAM|USE_FUNC_PARAM, (void*)reg_stat_group },
 	{ "stat_series_profile",  STR_PARAM|USE_FUNC_PARAM, (void*)reg_stat_series_profile },
@@ -177,7 +177,7 @@ static param_export_t mod_params[]={
 };
 
 
-static pv_export_t mod_items[] = {
+static const pv_export_t mod_items[] = {
 	{ {"stat",     sizeof("stat")-1},      1100, pv_get_stat,
 		pv_set_stat,    pv_parse_name, 0, 0, 0},
 	{ {0, 0}, 0, 0, 0, 0, 0, 0, 0 }
diff --git a/modules/status_report/status_report.c b/modules/status_report/status_report.c
index 5298569ec49..e7bce3b150f 100644
--- a/modules/status_report/status_report.c
+++ b/modules/status_report/status_report.c
@@ -35,7 +35,7 @@ static int w_add_report(struct sip_msg *msg, void *srg,
 	str *report);
 
 
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{"sr_set_status", (cmd_function)w_set_status, {
 		{CMD_PARAM_STR, fixup_sr_group, 0},
 		{CMD_PARAM_INT, 0, 0}, {0,0,0},
@@ -48,7 +48,7 @@ static cmd_export_t cmds[]={
 	{0,0,{{0,0,0}},0}
 };
 
-static param_export_t mod_params[]={
+static const param_export_t mod_params[]={
 	{ "script_sr_group",  STR_PARAM|USE_FUNC_PARAM, (void*)add_sr_group },
 	{ 0,0,0 }
 };
diff --git a/modules/stir_shaken/stir_shaken.c b/modules/stir_shaken/stir_shaken.c
index 55e81188676..cc541b11e57 100644
--- a/modules/stir_shaken/stir_shaken.c
+++ b/modules/stir_shaken/stir_shaken.c
@@ -118,7 +118,7 @@ static int parsed_ctx_idx =-1;
 
 static X509_STORE *store;
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"auth_date_freshness", INT_PARAM, &auth_date_freshness},
 	{"verify_date_freshness", INT_PARAM, &verify_date_freshness},
 	{"ca_list", STR_PARAM, &ca_list},
@@ -130,13 +130,13 @@ static param_export_t params[] = {
 	{0, 0, 0}
 };
 
-static pv_export_t mod_items[] = {
+static const pv_export_t mod_items[] = {
 	{{"identity", sizeof("identity") - 1}, 1000, pv_get_identity,
 		0, pv_parse_identity_name, 0, 0, 0},
 	{ {0, 0}, 0, 0, 0, 0, 0, 0, 0 }
 };
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"stir_shaken_auth", (cmd_function)w_stir_auth, {
 		{CMD_PARAM_STR, fixup_attest, 0},
 		{CMD_PARAM_STR, 0, 0},
diff --git a/modules/stun/stun.c b/modules/stun/stun.c
index 9be8f2c2b06..cddbb5739bb 100644
--- a/modules/stun/stun.c
+++ b/modules/stun/stun.c
@@ -68,7 +68,7 @@ int parse_alternate_port(modparam_t type, void *val);
 /*
  * Exported parameters ip, port
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"primary_ip",      STR_PARAM | USE_FUNC_PARAM,  parse_primary_ip     },
 	{"primary_port",    STR_PARAM | USE_FUNC_PARAM,  parse_primary_port   },
 	{"alternate_ip",    STR_PARAM | USE_FUNC_PARAM,  parse_alternate_ip   },
@@ -78,7 +78,7 @@ static param_export_t params[] = {
 };
 
 /* Extra proces for listening loop */
-static proc_export_t mod_procs[] = {
+static const proc_export_t mod_procs[] = {
 	{"Stun loop",  0,  0, stun_loop, 1 , 0},
 	{0,0,0,0,0,0}
 };
diff --git a/modules/tcp_mgm/tcp_mgm.c b/modules/tcp_mgm/tcp_mgm.c
index 6ad303da826..bb04cc4a6ca 100644
--- a/modules/tcp_mgm/tcp_mgm.c
+++ b/modules/tcp_mgm/tcp_mgm.c
@@ -35,7 +35,7 @@ static int mod_init(void);
 static int child_init(int rank);
 static void mod_destroy(void);
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"db_url",   STR_PARAM, &tcp_db_url.s},
 	{"db_table", STR_PARAM, &tcp_db_table.s},
 	{"id_col",              STR_PARAM, &tcp_mgm_cols[0].name.s},
@@ -61,14 +61,14 @@ static param_export_t params[] = {
 	{0, 0, 0}
 };
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{0,0,{{0,0,0}},0}
 };
 
 /*
  * Exported MI functions
  */
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "tcp_reload", "re-cache all TCP profiles from the database", 0, 0, {
 		{tcp_mi_reload, {0}},
 		{EMPTY_MI_RECIPE}}
@@ -80,7 +80,7 @@ static mi_export_t mi_cmds[] = {
 	{EMPTY_MI_EXPORT}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_SQLDB, NULL, DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/textops/textops.c b/modules/textops/textops.c
index 8d742aab16f..263c3813c4e 100644
--- a/modules/textops/textops.c
+++ b/modules/textops/textops.c
@@ -85,7 +85,7 @@ static int fixup_free_substre(void** param);
 
 static int mod_init(void);
 
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{"search", (cmd_function)search_f, {
 		{CMD_PARAM_REGEX, 0, 0}, {0,0,0}},
 		REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE},
diff --git a/modules/tls_mgm/tls_mgm.c b/modules/tls_mgm/tls_mgm.c
index 4c43f5e0487..6b0ba092642 100644
--- a/modules/tls_mgm/tls_mgm.c
+++ b/modules/tls_mgm/tls_mgm.c
@@ -113,7 +113,7 @@ static db_con_t *db_hdl = 0;
 /* DB functions */
 static db_func_t dr_dbf;
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{ "tls_library",	STR_PARAM,  &tls_library_param.s },
 	{ "client_tls_domain_avp",     STR_PARAM,         &tls_domain_avp        },
 	{ "client_sip_domain_avp",     STR_PARAM,         &sip_domain_avp        },
@@ -153,7 +153,7 @@ static param_export_t params[] = {
 	{0, 0, 0}
 };
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"is_peer_verified", (cmd_function)tls_is_peer_verified, {{0,0,0}},
 		REQUEST_ROUTE},
 	{"load_tls_mgm", (cmd_function)load_tls_mgm,
@@ -164,7 +164,7 @@ static cmd_export_t cmds[] = {
 /*
  * Exported MI functions
  */
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "tls_reload", "reloads stored data from the database", 0, 0, {
 		{tls_reload, {0}},
 		{EMPTY_MI_RECIPE}}
@@ -179,7 +179,7 @@ static mi_export_t mi_cmds[] = {
 /*
  *  pseudo variables
  */
-static pv_export_t mod_items[] = {
+static const pv_export_t mod_items[] = {
 	/* TLS session parameters */
 	{{"tls_version", sizeof("tls_version")-1},
 		850, tlsops_version, 0,
@@ -346,7 +346,7 @@ static pv_export_t mod_items[] = {
 
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "tls_openssl", DEP_SILENT },
 		{ MOD_TYPE_DEFAULT, "tls_wolfssl", DEP_SILENT },
diff --git a/modules/tls_openssl/openssl.c b/modules/tls_openssl/openssl.c
index 4748fde0de7..522b6825852 100644
--- a/modules/tls_openssl/openssl.c
+++ b/modules/tls_openssl/openssl.c
@@ -98,7 +98,7 @@ int tls_ctx_set_pkey_file(void *ctx, char *pkey_file);
 gen_lock_t *tls_global_lock;
 #endif
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"load_tls_openssl", (cmd_function)load_tls_openssl,
 		{{0,0,0}}, ALL_ROUTES},
 	{0,0,{{0,0,0}},0}
diff --git a/modules/tls_wolfssl/wolfssl.c b/modules/tls_wolfssl/wolfssl.c
index f13c362c35a..b1df27f36f2 100644
--- a/modules/tls_wolfssl/wolfssl.c
+++ b/modules/tls_wolfssl/wolfssl.c
@@ -91,7 +91,7 @@ int _wolfssl_tls_var_validity(int ind, void *ssl, str *res);
 
 int ssl_versions[SSL_VERSIONS_SIZE];
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"load_tls_wolfssl", (cmd_function)load_tls_wolfssl,
 		{{0,0,0}}, ALL_ROUTES},
 	{0,0,{{0,0,0}},0}
diff --git a/modules/tm/async.c b/modules/tm/async.c
index 9049973e675..b466b5936ca 100644
--- a/modules/tm/async.c
+++ b/modules/tm/async.c
@@ -259,7 +259,7 @@ int t_handle_async(struct sip_msg *msg, struct action* a , int resume_route,
 	}
 
 	async_status = ASYNC_NO_IO; /*assume default status "no IO done" */
-	return_code = ((acmd_export_t*)(a->elem[0].u.data))->function(msg,
+	return_code = ((const acmd_export_t*)(a->elem[0].u.data_const))->function(msg,
 			(async_ctx*)ctx,
 			params[0], params[1], params[2],
 			params[3], params[4], params[5],
diff --git a/modules/tm/tm.c b/modules/tm/tm.c
index d335cc2093b..b6e006cb26e 100644
--- a/modules/tm/tm.c
+++ b/modules/tm/tm.c
@@ -182,7 +182,7 @@ stat_var *tm_cluster_reply_rx;
 stat_var *tm_cluster_request_rx;
 stat_var *tm_cluster_cancel_rx;
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_NULL, NULL, 0 },
 	},
@@ -193,7 +193,7 @@ static dep_export_t deps = {
 };
 
 
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{"t_newtran", (cmd_function)w_t_newtran, {{0,0,0}},
 		REQUEST_ROUTE},
 	{"t_reply", (cmd_function)w_pv_t_reply, {
@@ -276,7 +276,7 @@ static cmd_export_t cmds[]={
 	{0,0,{{0,0,0}},0}
 };
 
-static param_export_t params[]={
+static const param_export_t params[]={
 	{"ruri_matching",             INT_PARAM,
 		&ruri_matching},
 	{"via1_matching",             INT_PARAM,
@@ -325,7 +325,7 @@ static param_export_t params[]={
 };
 
 
-static stat_export_t mod_stats[] = {
+static const stat_export_t mod_stats[] = {
 	{"received_replies" ,    0,              &tm_rcv_rpls    },
 	{"relayed_replies" ,     0,              &tm_rld_rpls    },
 	{"local_replies" ,       0,              &tm_loc_rpls    },
@@ -350,7 +350,7 @@ static stat_export_t mod_stats[] = {
 /**
  * pseudo-variables exported by TM module
  */
-static pv_export_t mod_items[] = {
+static const pv_export_t mod_items[] = {
 	{ {"T_branch_idx", sizeof("T_branch_idx")-1}, 900,
 		pv_get_tm_branch_idx, NULL, NULL, NULL, NULL, 0 },
 	{ {"T_reply_code", sizeof("T_reply_code")-1}, 901,
@@ -372,7 +372,7 @@ static pv_export_t mod_items[] = {
 };
 
 
-static mi_export_t mi_cmds [] = {
+static const mi_export_t mi_cmds [] = {
 	{ MI_TM_UAC, 0, MI_ASYNC_RPL_FLAG|MI_NAMED_PARAMS_ONLY, 0, {
 		{mi_tm_uac_dlg_1, {"method", "ruri", "headers", 0}},
 		{mi_tm_uac_dlg_2, {"method", "ruri", "headers", "next_hop", 0}},
diff --git a/modules/topology_hiding/topology_hiding.c b/modules/topology_hiding/topology_hiding.c
index 19e1022eff2..7807dea8345 100644
--- a/modules/topology_hiding/topology_hiding.c
+++ b/modules/topology_hiding/topology_hiding.c
@@ -51,7 +51,7 @@ int w_topology_hiding(struct sip_msg *req, str *flags_s);
 int w_topology_hiding_match(struct sip_msg *req, void *seq_match_mode_val);
 static int pv_topo_callee_callid(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);
 
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{"topology_hiding",(cmd_function)w_topology_hiding, {
 		{CMD_PARAM_STR|CMD_PARAM_OPT,0,0}, {0,0,0}},
 		REQUEST_ROUTE},
@@ -62,7 +62,7 @@ static cmd_export_t cmds[]={
 };
 
 /* Exported parameters */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{ "force_dialog",                INT_PARAM, &force_dialog                },
 	{ "th_passed_contact_uri_params",STR_PARAM, &topo_hiding_ct_params.s     },
 	{ "th_passed_contact_params",    STR_PARAM, &topo_hiding_ct_hdr_params.s },
@@ -74,7 +74,7 @@ static param_export_t params[] = {
 	{0, 0, 0}
 };
 
-static pv_export_t pvars[] = {
+static const pv_export_t pvars[] = {
 	{ {"TH_callee_callid",  sizeof("TH_callee_callid")-1}, 1000,
 		pv_topo_callee_callid,0,0, 0, 0, 0},
 	{ {0, 0}, 0, 0, 0, 0, 0, 0, 0 }
@@ -90,7 +90,7 @@ static module_dependency_t *get_deps_dialog(const param_export_t *param)
 	return alloc_module_dep(MOD_TYPE_DEFAULT, "dialog", DEP_ABORT);
 }
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "tm", DEP_ABORT },
 		{ MOD_TYPE_DEFAULT, "dialog", DEP_SILENT },
diff --git a/modules/tracer/tracer.c b/modules/tracer/tracer.c
index 55d905e7e67..c7a23df2090 100644
--- a/modules/tracer/tracer.c
+++ b/modules/tracer/tracer.c
@@ -212,7 +212,7 @@ static int process_dyn_tracing(struct sip_msg *msg, void *param);
 /*
  * Exported functions
  */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"trace", (cmd_function)trace_w, {
 		{CMD_PARAM_STR, fixup_tid, 0},
 		{CMD_PARAM_STR|CMD_PARAM_OPT, fixup_sflags, 0},
@@ -228,7 +228,7 @@ static cmd_export_t cmds[] = {
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"trace_id",           STR_PARAM|USE_FUNC_PARAM, parse_trace_id},
 	{"date_column",        STR_PARAM, &date_column.s        },
 	{"callid_column",      STR_PARAM, &callid_column.s      },
@@ -253,7 +253,7 @@ static param_export_t params[] = {
 	{0, 0, 0}
 };
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "trace", 0, MI_NAMED_PARAMS_ONLY, 0, {
 		{sip_trace_mi, {0}},
 		{sip_trace_mi_tid,  {"id", 0}},
@@ -283,7 +283,7 @@ static mi_export_t mi_cmds[] = {
 stat_var* siptrace_req;
 stat_var* siptrace_rpl;
 
-static stat_export_t siptrace_stats[] = {
+static const stat_export_t siptrace_stats[] = {
 	{"traced_requests" ,  0,  &siptrace_req  },
 	{"traced_replies"  ,  0,  &siptrace_rpl  },
 	{0,0,0}
@@ -304,7 +304,7 @@ static module_dependency_t *get_deps_hep(const param_export_t *param)
 }
 
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_NULL, NULL, 0 },
 	},
diff --git a/modules/uac/uac.c b/modules/uac/uac.c
index fd775fc7734..549f215b437 100644
--- a/modules/uac/uac.c
+++ b/modules/uac/uac.c
@@ -94,7 +94,7 @@ static int cfg_validate(void);
 static int uac_does_replace = 0;
 
 /* Exported functions */
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{"uac_replace_from",  (cmd_function)w_replace_from, {
 		{CMD_PARAM_STR|CMD_PARAM_OPT, fixup_replace_disp_uri, fixup_free_s},
 		{CMD_PARAM_STR, 0, 0},
@@ -117,7 +117,7 @@ static cmd_export_t cmds[]={
 
 
 /* Exported parameters */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"rr_from_store_param", STR_PARAM,                &rr_from_param.s       },
 	{"rr_to_store_param",   STR_PARAM,                &rr_to_param.s         },
 	{"restore_mode",        STR_PARAM,                &restore_mode_str      },
@@ -139,7 +139,7 @@ static module_dependency_t *get_deps_restore_mode(const param_export_t *param)
 	return NULL;
 }
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "tm",       DEP_ABORT  },
 		{ MOD_TYPE_DEFAULT, "dialog",   DEP_SILENT },
diff --git a/modules/uac_auth/uac_auth.c b/modules/uac_auth/uac_auth.c
index f71ea4136f1..bd5ac9bd7fd 100644
--- a/modules/uac_auth/uac_auth.c
+++ b/modules/uac_auth/uac_auth.c
@@ -54,13 +54,13 @@ unsigned short pwd_avp_type=0;
 
 
 /** Exported functions */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"load_uac_auth", (cmd_function)uac_auth_bind, {{0,0,0}},0},
 	{0,0,{{0,0,0}},0}
 };
 
 /** Exported parameters */
-static param_export_t params[]= {
+static const param_export_t params[]= {
 	{"credential",          STR_PARAM|USE_FUNC_PARAM, (void*)&add_credential },
 	{"auth_username_avp",   STR_PARAM,                &auth_username_avp     },
 	{"auth_realm_avp",      STR_PARAM,                &auth_realm_avp        },
diff --git a/modules/uac_redirect/redirect.c b/modules/uac_redirect/redirect.c
index fa5e5a99d9a..567c4fea3a5 100644
--- a/modules/uac_redirect/redirect.c
+++ b/modules/uac_redirect/redirect.c
@@ -60,7 +60,7 @@ static int fix_reset_flags(void **pflags);
 static int fix_contact_count(void** param);
 
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"set_deny_filter",   (cmd_function)w_set_deny,
 		{ {CMD_PARAM_REGEX, NULL, NULL},
 		  {CMD_PARAM_STR, fix_reset_flags, NULL},
@@ -82,14 +82,14 @@ static cmd_export_t cmds[] = {
 	{0, 0, {{0, 0, 0}}, 0}
 };
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"deny_filter",     STR_PARAM,  &deny_filter_s    },
 	{"accept_filter",   STR_PARAM,  &accept_filter_s  },
 	{"default_filter",  STR_PARAM,  &def_filter_s     },
 	{0, 0, 0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "tm",  DEP_ABORT   },
 		{ MOD_TYPE_DEFAULT, "acc", DEP_SILENT  },
diff --git a/modules/uac_registrant/registrant.c b/modules/uac_registrant/registrant.c
index 51f42d593b8..80d5eba3b02 100644
--- a/modules/uac_registrant/registrant.c
+++ b/modules/uac_registrant/registrant.c
@@ -135,7 +135,7 @@ typedef struct reg_tm_cb {
 }reg_tm_cb_t;
 
 /** Exported parameters */
-static param_export_t params[]= {
+static const param_export_t params[]= {
 	{"hash_size",		INT_PARAM,			&reg_hsize},
 	{"default_expires",	INT_PARAM,			&default_expires},
 	{"timer_interval",	INT_PARAM,			&timer_interval},
@@ -159,7 +159,7 @@ static param_export_t params[]= {
 
 
 /** MI commands */
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "reg_list", 0, 0, 0, {
 		{mi_reg_list, {0}},
 		{mi_reg_list_record, {"aor", "contact", "registrar", 0}},
@@ -181,7 +181,7 @@ static mi_export_t mi_cmds[] = {
 	{EMPTY_MI_EXPORT}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "tm",       DEP_ABORT },
 		{ MOD_TYPE_DEFAULT, "uac_auth", DEP_ABORT },
diff --git a/modules/userblacklist/userblacklist.c b/modules/userblacklist/userblacklist.c
index 43d9523c852..ad5e7939a1f 100644
--- a/modules/userblacklist/userblacklist.c
+++ b/modules/userblacklist/userblacklist.c
@@ -78,7 +78,7 @@ mi_response_t *mi_reload_blacklist(const mi_params_t *params,
 								struct mi_handler *async_hdl);
 
 
-static cmd_export_t cmds[]={
+static const cmd_export_t cmds[]={
 	{"check_user_blacklist", (cmd_function)check_user_blacklist, {
 		{CMD_PARAM_STR,0,0},
 		{CMD_PARAM_STR,0,0},
@@ -91,7 +91,7 @@ static cmd_export_t cmds[]={
 	{0,0,{{0,0,0}},0}
 };
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{ "db_url",          STR_PARAM, &db_url.s },
 	{ "db_table",        STR_PARAM, &db_table.s },
 	{ "use_domain",      INT_PARAM, &use_domain },
@@ -100,7 +100,7 @@ static param_export_t params[] = {
 
 
 /* Exported MI functions */
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "reload_blacklist", 0, 0, 0, {
 		{mi_reload_blacklist, {0}},
 		{EMPTY_MI_RECIPE}}
@@ -108,7 +108,7 @@ static mi_export_t mi_cmds[] = {
 	{EMPTY_MI_EXPORT}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_SQLDB, NULL, DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/usrloc/ul_mod.c b/modules/usrloc/ul_mod.c
index 9bf9a2caf6d..8ab0278e206 100644
--- a/modules/usrloc/ul_mod.c
+++ b/modules/usrloc/ul_mod.c
@@ -185,7 +185,7 @@ int latency_event_min_us;
 /*! \brief
  * Exported functions
  */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"ul_bind_usrloc", (cmd_function)bind_usrloc, {{0,0,0}},0},
 	{0,0,{{0,0,0}},0}
 };
@@ -193,7 +193,7 @@ static cmd_export_t cmds[] = {
 /*! \brief
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{"contact_id_column",   STR_PARAM,&contactid_col.s   },
 	{"user_column",        STR_PARAM, &user_col.s        },
 	{"domain_column",      STR_PARAM, &domain_col.s      },
@@ -246,12 +246,12 @@ static param_export_t params[] = {
 };
 
 
-static stat_export_t mod_stats[] = {
+static const stat_export_t mod_stats[] = {
 	{"registered_users" ,  STAT_IS_FUNC, (stat_var**)get_number_of_users  },
 	{0,0,0}
 };
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ MI_USRLOC_RM, 0, 0, mi_child_init, {
 		{mi_usrloc_rm_aor, {"table_name", "aor", 0}},
 		{EMPTY_MI_RECIPE}}
@@ -319,7 +319,7 @@ static module_dependency_t *get_deps_rr_persist(const param_export_t *param)
 	return NULL;
 }
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_NULL, NULL, 0 },
 	},
diff --git a/modules/uuid/uuid.c b/modules/uuid/uuid.c
index fb6808bf425..b526ef36bf4 100644
--- a/modules/uuid/uuid.c
+++ b/modules/uuid/uuid.c
@@ -48,12 +48,12 @@ static int w_uuid(struct sip_msg *msg, pv_spec_t *out_var, int *vers_param, str
 static int pv_get_uuid(struct sip_msg *msg, pv_param_t *param,
 						pv_value_t *res);
 
-static pv_export_t mod_items[] = {
+static const pv_export_t mod_items[] = {
 	{{"uuid", sizeof("uuid")-1}, 1000, pv_get_uuid, 0, 0, 0, 0, 0},
 	{{0, 0}, 0, 0, 0, 0, 0, 0, 0}
 };
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"uuid", (cmd_function)w_uuid, {
 		{CMD_PARAM_VAR, fixup_check_var,0},
 		{CMD_PARAM_INT|CMD_PARAM_OPT,0,0},
diff --git a/modules/xcap/xcap_mod.c b/modules/xcap/xcap_mod.c
index 300f2cb4bfa..8bab9539af7 100644
--- a/modules/xcap/xcap_mod.c
+++ b/modules/xcap/xcap_mod.c
@@ -51,20 +51,20 @@ static int mod_init(void);
 static int child_init(int);
 void destroy(void);
 
-static cmd_export_t cmds[]=
+static const cmd_export_t cmds[]=
 {
 	{ "bind_xcap", (cmd_function)bind_xcap, {{0, 0, 0}}, 0},
 	{ 0, 0, {{0, 0, 0}}, 0}
 };
 
-static param_export_t params[]={
+static const param_export_t params[]={
 	{ "db_url",                 STR_PARAM, &xcap_db_url.s          },
 	{ "xcap_table",             STR_PARAM, &xcap_table.s           },
 	{ "integrated_xcap_server", INT_PARAM, &integrated_xcap_server },
 	{ 0, 0, 0 }
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_SQLDB, NULL, DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/modules/xcap_client/xcap_client.c b/modules/xcap_client/xcap_client.c
index 64da0dfa193..1e9bfd5dee8 100644
--- a/modules/xcap_client/xcap_client.c
+++ b/modules/xcap_client/xcap_client.c
@@ -83,20 +83,20 @@ str xcap_db_table = {NULL, 0};
 
 void query_xcap_update(unsigned int ticks, void* param);
 
-static param_export_t params[]={
+static const param_export_t params[]={
 	{ "periodical_query",       INT_PARAM,         &periodical_query },
 	{ "query_period",           INT_PARAM,         &query_period     },
 	{    0,                     0,                      0            }
 };
 
 
-static cmd_export_t  cmds[]=
+static const cmd_export_t cmds[]=
 {
 	{"bind_xcap_client",  (cmd_function)bind_xcap_client,  {{0, 0, 0}},        0},
 	{ 0, 0, {{0, 0, 0}}, 0}
 };
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "refreshXcapDoc", 0, 0, 0, {
 		{refreshXcapDoc, {"doc_uri", "port", 0}},
 		{EMPTY_MI_RECIPE}}
@@ -104,7 +104,7 @@ static mi_export_t mi_cmds[] = {
 	{EMPTY_MI_EXPORT}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "xcap", DEP_ABORT },
 		{ MOD_TYPE_SQLDB,   NULL,   DEP_SILENT },
diff --git a/modules/xml/xml.c b/modules/xml/xml.c
index a7556116422..876fa3f5bed 100644
--- a/modules/xml/xml.c
+++ b/modules/xml/xml.c
@@ -80,7 +80,7 @@ static int pv_get_xml(struct sip_msg*,  pv_param_t*, pv_value_t*);
 static int pv_parse_xml_name(pv_spec_p , const str *);
 
 
-static pv_export_t mod_items[] = {
+static const pv_export_t mod_items[] = {
 	{ {"xml", sizeof("xml")-1}, PVT_XML, pv_get_xml, pv_set_xml,
 		pv_parse_xml_name, 0, 0, 0},
 	  { {0, 0}, 0, 0, 0, 0, 0, 0, 0 }
diff --git a/modules/xmpp/xmpp.c b/modules/xmpp/xmpp.c
index 94dcd77c30f..0320f5c1f15 100644
--- a/modules/xmpp/xmpp.c
+++ b/modules/xmpp/xmpp.c
@@ -120,7 +120,7 @@ int* xmpp_pid;
 #define DEFAULT_COMPONENT_PORT 5347
 #define DEFAULT_SERVER_PORT 5269
 
-static proc_export_t procs[] = {
+static const proc_export_t procs[] = {
 	{"XMPP receiver",  0,  0, xmpp_process, 1, 0},
 	{0,0,0,0,0,0}
 };
@@ -129,7 +129,7 @@ static proc_export_t procs[] = {
 /*
  * Exported functions
  */
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"xmpp_send_message", (cmd_function)cmd_send_message, {{0,0,0}},
 		REQUEST_ROUTE},
 	{"bind_xmpp",         (cmd_function)bind_xmpp,
@@ -140,7 +140,7 @@ static cmd_export_t cmds[] = {
 /*
  * Exported parameters
  */
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{ "backend",            STR_PARAM, &backend         },
 	{ "xmpp_domain",        STR_PARAM, &xmpp_domain     },
 	{ "xmpp_host",          STR_PARAM, &xmpp_host       },
@@ -151,7 +151,7 @@ static param_export_t params[] = {
 	{0, 0, 0}
 };
 
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "tm", DEP_ABORT },
 		{ MOD_TYPE_NULL, NULL, 0 },
diff --git a/net/proto_tcp/proto_tcp.c b/net/proto_tcp/proto_tcp.c
index c36fd05de4a..e4f303308b9 100644
--- a/net/proto_tcp/proto_tcp.c
+++ b/net/proto_tcp/proto_tcp.c
@@ -125,13 +125,13 @@ static int tcp_crlf_drop = 0;
 static int tcp_parallel_handling = 0;
 
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"proto_init", (cmd_function)proto_tcp_init, {{0, 0, 0}}, 0},
 	{0,0,{{0,0,0}},0}
 };
 
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{ "tcp_port",                        INT_PARAM, &tcp_port               },
 	{ "tcp_send_timeout",                INT_PARAM, &tcp_send_timeout       },
 	{ "tcp_max_msg_chunks",              INT_PARAM, &tcp_max_msg_chunks     },
@@ -152,7 +152,7 @@ static param_export_t params[] = {
 	{0, 0, 0}
 };
 
-static mi_export_t mi_cmds[] = {
+static const mi_export_t mi_cmds[] = {
 	{ "tcp_trace", 0, 0, 0, {
 		{w_tcp_trace_mi, {0}},
 		{w_tcp_trace_mi_1, {"trace_mode", 0}},
@@ -163,7 +163,7 @@ static mi_export_t mi_cmds[] = {
 };
 
 /* module dependencies */
-static dep_export_t deps = {
+static const dep_export_t deps = {
 	{ /* OpenSIPS module dependencies */
 		{ MOD_TYPE_DEFAULT, "proto_hep", DEP_SILENT },
 		{ MOD_TYPE_NULL, NULL, 0 }
diff --git a/net/proto_udp/proto_udp.c b/net/proto_udp/proto_udp.c
index 8f2c4cabdd7..bc7ed56d4ed 100644
--- a/net/proto_udp/proto_udp.c
+++ b/net/proto_udp/proto_udp.c
@@ -54,13 +54,13 @@ static callback_list* cb_list = NULL;
 static int udp_port = SIP_PORT;
 
 
-static cmd_export_t cmds[] = {
+static const cmd_export_t cmds[] = {
 	{"proto_init", (cmd_function)proto_udp_init, {{0,0,0}}, 0},
 	{0,0,{{0,0,0}},0}
 };
 
 
-static param_export_t params[] = {
+static const param_export_t params[] = {
 	{ "udp_port",    INT_PARAM,   &udp_port   },
 	{0, 0, 0}
 };
diff --git a/pt.c b/pt.c
index 0a9e7ebb4a9..177cc4659ac 100644
--- a/pt.c
+++ b/pt.c
@@ -170,7 +170,7 @@ int init_multi_proc_support(void)
 }
 
 
-void set_proc_attrs( char *fmt, ...)
+void set_proc_attrs(const char *fmt, ...)
 {
 	va_list ap;
 
@@ -233,7 +233,7 @@ void reset_process_slot( int p_id )
  * Returns, on success, the ID (non zero) in the process table of the
  * newly forked procees.
  * */
-int internal_fork(char *proc_desc, unsigned int flags,
+int internal_fork(const char *proc_desc, unsigned int flags,
 												enum process_type type)
 {
 	int new_idx;
diff --git a/pt.h b/pt.h
index f74fe5bdbf6..f26e2627662 100644
--- a/pt.h
+++ b/pt.h
@@ -97,7 +97,7 @@ extern unsigned int counted_max_processes;
 extern int _termination_in_progress;
 
 int   init_multi_proc_support();
-void  set_proc_attrs( char *fmt, ...);
+void  set_proc_attrs(const char *fmt, ...);
 int   count_init_child_processes(void);
 int   count_child_processes(void);
 
@@ -114,7 +114,7 @@ int   count_child_processes(void);
 #define is_process_running(_idx) \
 	( (pt[_idx].flags&OSS_PROC_IS_RUNNING)?1:0 )
 
-pid_t internal_fork(char *proc_desc, unsigned int flags,
+pid_t internal_fork(const char *proc_desc, unsigned int flags,
 		enum process_type type);
 
 /* return processes pid */
diff --git a/route.c b/route.c
index 77156770707..2170f7c2c1d 100644
--- a/route.c
+++ b/route.c
@@ -1107,8 +1107,8 @@ static int fix_actions(struct action* a)
 {
 	struct action *t;
 	int ret;
-	cmd_export_t* cmd;
-	acmd_export_t* acmd;
+	const cmd_export_t* cmd;
+	const acmd_export_t* acmd;
 	str s;
 	pv_elem_t *model=NULL;
 	xl_level_p xlp;
@@ -1262,7 +1262,7 @@ static int fix_actions(struct action* a)
 				}
 				break;
 			case CMD_T:
-				cmd = (cmd_export_t*)t->elem[0].u.data;
+				cmd = (const cmd_export_t*)t->elem[0].u.data_const;
 				LM_DBG("fixing %s, %s:%d\n", cmd->name, t->file, t->line);
 
 				if ((ret = fix_cmd(cmd->params, t->elem)) < 0) {
@@ -1295,7 +1295,7 @@ static int fix_actions(struct action* a)
 				}
 				break;
 			case AMODULE_T:
-				acmd = (acmd_export_t*)t->elem[0].u.data;
+				acmd = (const acmd_export_t*)t->elem[0].u.data_const;
 				LM_DBG("fixing async %s, %s:%d\n", acmd->name, t->file, t->line);
 
 				if ((ret = fix_cmd(acmd->params, t->elem)) < 0) {
@@ -1522,7 +1522,7 @@ static int check_expr(struct expr* exp, int r_type);
 static int check_actions(struct action *a, int r_type)
 {
 	struct action *aitem;
-	cmd_export_t  *fct;
+	const cmd_export_t  *fct;
 	int n;
 
 	for( ; a ; a=a->next ) {
@@ -1571,7 +1571,7 @@ static int check_actions(struct action *a, int r_type)
 				break;
 			case CMD_T:
 				/* do check :D */
-				fct = (cmd_export_t*)(a->elem[0].u.data);
+				fct = (const cmd_export_t*)(a->elem[0].u.data_const);
 				if ( (fct->flags&r_type)!=r_type ) {
 					rcheck_status = -1;
 					LM_ERR("script function "
@@ -1859,7 +1859,7 @@ void get_route_name(int idx, str *name)
 }
 
 
-int is_script_func_used( char *name, int param_no)
+int is_script_func_used(const char *name, int param_no)
 {
 	unsigned int i;
 
@@ -1908,7 +1908,7 @@ int is_script_func_used( char *name, int param_no)
 	return 0;
 }
 
-int is_script_async_func_used( char *name, int param_no)
+int is_script_async_func_used(const char *name, int param_no)
 {
 	unsigned int i;
 
diff --git a/route.h b/route.h
index 629fbed627e..263a694a94b 100644
--- a/route.h
+++ b/route.h
@@ -140,9 +140,9 @@ int get_script_route_ID_by_name(char *name,
 int get_script_route_ID_by_name_str(str *name,
 		struct script_route *sr, int size);
 
-int is_script_func_used( char *name, int param_no);
+int is_script_func_used(const char *name, int param_no);
 
-int is_script_async_func_used( char *name, int param_no);
+int is_script_async_func_used(const char *name, int param_no);
 
 
 void push(struct action* a, struct action** head);
diff --git a/route_struct.c b/route_struct.c
index 1e91591f2d8..e80f74ebb2a 100644
--- a/route_struct.c
+++ b/route_struct.c
@@ -524,7 +524,7 @@ void print_action(struct action* t)
 				print_actions((struct action*)t->elem[0].u.data);
 				break;
 		case CMD_ST:
-				LM_GEN1(L_DBG, "f<%s>",((cmd_export_t*)t->elem[0].u.data)->name);
+				LM_GEN1(L_DBG, "f<%s>",((const cmd_export_t*)t->elem[0].u.data_const)->name);
 				break;
 		case SOCKID_ST:
 				LM_GEN1(L_DBG, "%d:%s:%d",
@@ -602,7 +602,7 @@ void print_actions(struct action* a)
 }
 
 
-static int is_mod_func_in_expr(struct expr *e, char *name, int param_no)
+static int is_mod_func_in_expr(struct expr *e, const char *name, int param_no)
 {
 	if (e->type==ELEM_T) {
 		if (e->left.type==ACTION_O)
@@ -618,13 +618,13 @@ static int is_mod_func_in_expr(struct expr *e, char *name, int param_no)
 }
 
 
-int is_mod_func_used(struct action *a, char *name, int param_no)
+int is_mod_func_used(struct action *a, const char *name, int param_no)
 {
-	cmd_export_t *cmd;
+	const cmd_export_t *cmd;
 	while(a) {
 		if (a->type==CMD_T) {
 			/* first param is the name of the function */
-			cmd = (cmd_export_t*)a->elem[0].u.data;
+			cmd = (const cmd_export_t*)a->elem[0].u.data_const;
 			if (strcasecmp(cmd->name, name)==0) {
 				if (param_no==-1 ||
 					(a->elem[param_no].type != NOSUBTYPE &&
@@ -671,13 +671,13 @@ int is_mod_func_used(struct action *a, char *name, int param_no)
 	return 0;
 }
 
-int is_mod_async_func_used(struct action *a, char *name, int param_no)
+int is_mod_async_func_used(struct action *a, const char *name, int param_no)
 {
-	acmd_export_t *acmd;
+	const acmd_export_t *acmd;
 
 	for (; a; a=a->next) {
 		if (a->type==ASYNC_T || a->type==LAUNCH_T) {
-			acmd = ((struct action *)(a->elem[0].u.data))->elem[0].u.data;
+			acmd = ((struct action *)(a->elem[0].u.data))->elem[0].u.data_const;
 
 			if (strcasecmp(acmd->name, name)==0) {
 				if (param_no==-1 ||
diff --git a/route_struct.h b/route_struct.h
index f747c3b8dac..20924359240 100644
--- a/route_struct.h
+++ b/route_struct.h
@@ -144,7 +144,7 @@ void free_action_list( struct action *a);
 void print_action(struct action* a);
 void print_expr(struct expr* exp);
 void print_actions(struct action* a);
-int is_mod_func_used(struct action *a, char *name, int param_no);
-int is_mod_async_func_used(struct action *a, char *name, int param_no);
+int is_mod_func_used(struct action *a, const char *name, int param_no);
+int is_mod_async_func_used(struct action *a, const char *name, int param_no);
 
 #endif
diff --git a/sr_module.h b/sr_module.h
index b27f4c7b658..2b302490189 100644
--- a/sr_module.h
+++ b/sr_module.h
@@ -108,14 +108,14 @@ typedef int (*mod_proc_wrapper)();
 
 
 struct param_export_ {
-	char* name;             /*!< null terminated param. name */
+	const char* name;       /*!< null terminated param. name */
 	modparam_t type;        /*!< param. type */
 	void* param_pointer;    /*!< pointer to the param. memory location */
 };
 
 
 struct proc_export_ {
-	char *name;
+	const char *name;
 	mod_proc_wrapper pre_fork_function;
 	mod_proc_wrapper post_fork_function;
 	mod_proc function;
@@ -124,14 +124,14 @@ struct proc_export_ {
 };
 
 typedef struct dep_export_ {
-	module_dependency_t md[MAX_MOD_DEPS];
-	modparam_dependency_t mpd[];
+	const module_dependency_t md[MAX_MOD_DEPS];
+	const modparam_dependency_t mpd[];
 } dep_export_t;
 
 typedef struct proc_export_ proc_export_t;
 
 struct sr_module{
-	char* path;
+	const char* path;
 	void* handle;
 	int init_done;
 	int init_child_done;
diff --git a/sr_module_deps.c b/sr_module_deps.c
index 47dd220b5d3..18fdda0cd7d 100644
--- a/sr_module_deps.c
+++ b/sr_module_deps.c
@@ -121,7 +121,7 @@ module_dependency_t *get_deps_cachedb_url(const param_export_t *param)
 
 
 static int add_module_dependency(struct sr_module *mod, const module_dependency_t *dep,
-								 char *script_param)
+								 const char *script_param)
 {
 	struct sr_module_dep *md;
 	int len;
diff --git a/sr_module_deps.h b/sr_module_deps.h
index 0ca2f117d2e..2501dccc351 100644
--- a/sr_module_deps.h
+++ b/sr_module_deps.h
@@ -119,7 +119,7 @@ module_dependency_t *get_deps_cachedb_url(const param_export_t *param);
 /* core level structures and functions */
 struct sr_module_dep {
 	struct sr_module *mod;
-	char *script_param;
+	const char *script_param;
 	enum module_type mod_type;
 	unsigned int type;
 	str dep;
diff --git a/statistics.c b/statistics.c
index cd5ec02ff54..27a81636f9f 100644
--- a/statistics.c
+++ b/statistics.c
@@ -67,7 +67,7 @@ static mi_response_t *w_mi_list_stats_1(const mi_params_t *params,
 static mi_response_t *mi_reset_stats(const mi_params_t *params,
 								struct mi_handler *async_hdl);
 
-static mi_export_t mi_stat_cmds[] = {
+static const mi_export_t mi_stat_cmds[] = {
 	{ "get_statistics",
 		"prints the statistics (all, group or one) realtime values.", 0, 0, {
 		{mi_get_stats, {"statistics", 0}},
diff --git a/transformations.c b/transformations.c
index 6a923d54d68..e2221f61178 100644
--- a/transformations.c
+++ b/transformations.c
@@ -70,16 +70,16 @@ static int __crt_tr_bufs, __crt_tr_link;
 
 trans_extra_t *tr_extra_list;
 
-static trans_export_t core_trans[] = {
-	{str_init("s"), tr_parse_string, tr_eval_string},
-	{str_init("uri"), tr_parse_uri, tr_eval_uri},
-	{str_init("via"), tr_parse_via, tr_eval_via},
-	{str_init("param"), tr_parse_paramlist, tr_eval_paramlist},
-	{str_init("nameaddr"), tr_parse_nameaddr, tr_eval_nameaddr},
-	{str_init("ip"), tr_parse_ip, tr_eval_ip},
-	{str_init("csv"), tr_parse_csv, tr_eval_csv},
-	{str_init("sdp"), tr_parse_sdp, tr_eval_sdp},
-	{str_init("re"), tr_parse_re, tr_eval_re},
+static const trans_export_t core_trans[] = {
+	{str_const_init("s"), tr_parse_string, tr_eval_string},
+	{str_const_init("uri"), tr_parse_uri, tr_eval_uri},
+	{str_const_init("via"), tr_parse_via, tr_eval_via},
+	{str_const_init("param"), tr_parse_paramlist, tr_eval_paramlist},
+	{str_const_init("nameaddr"), tr_parse_nameaddr, tr_eval_nameaddr},
+	{str_const_init("ip"), tr_parse_ip, tr_eval_ip},
+	{str_const_init("csv"), tr_parse_csv, tr_eval_csv},
+	{str_const_init("sdp"), tr_parse_sdp, tr_eval_sdp},
+	{str_const_init("re"), tr_parse_re, tr_eval_re},
 	{{0,0}, 0, 0}
 };
 
@@ -2603,7 +2603,7 @@ char* parse_transformation(str *in, trans_t **tr)
 	trans_t *t = NULL;
 	trans_t *t0 = NULL;
 	str s;
-	trans_export_t *tr_export;
+	const trans_export_t *tr_export;
 	trans_extra_t *tr_extra;
 	int i, nesting_level = 0;
 
diff --git a/transformations.h b/transformations.h
index cb5c6975bec..c97dcb70490 100644
--- a/transformations.h
+++ b/transformations.h
@@ -98,7 +98,7 @@ typedef struct trans_ {
 typedef int (*tr_parse_f)(str *in, trans_t *t);
 
 typedef struct trans_export_ {
-	str name;
+	str_const name;
 	tr_parse_f parse_func;
 	tr_eval_f eval_func;
 } trans_export_t;