diff --git a/openbsc/src/libmsc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c
index 376106f..89108e4 100644
--- a/openbsc/src/libmsc/gsm_04_08.c
+++ b/openbsc/src/libmsc/gsm_04_08.c
@@ -618,8 +618,8 @@
 
 static void schedule_reject(struct gsm_subscriber_connection *conn)
 {
-	conn->loc_operation->updating_timer.cb = loc_upd_rej_cb;
-	conn->loc_operation->updating_timer.data = conn;
+	osmo_timer_setup(&conn->loc_operation->updating_timer, loc_upd_rej_cb,
+			 conn);
 	osmo_timer_schedule(&conn->loc_operation->updating_timer, 5, 0);
 }
 
@@ -2224,8 +2224,7 @@
 				 int sec, int micro)
 {
 	DEBUGP(DCC, "starting timer T%x with %d seconds\n", current, sec);
-	trans->cc.timer.cb = gsm48_cc_timeout;
-	trans->cc.timer.data = trans;
+	osmo_timer_setup(&trans->cc.timer, gsm48_cc_timeout, trans);
 	osmo_timer_schedule(&trans->cc.timer, sec, micro);
 	trans->cc.Tcurrent = current;
 }
@@ -3955,8 +3954,7 @@
 	if (!conn->anch_operation)
 		return -1;
 
-	conn->anch_operation->timeout.data = conn;
-	conn->anch_operation->timeout.cb = anchor_timeout;
+	osmo_timer_setup(&conn->anch_operation->timeout, anchor_timeout, conn);
 	osmo_timer_schedule(&conn->anch_operation->timeout, 5, 0);
 	return 0;
 }
diff --git a/openbsc/src/libmsc/smpp_openbsc.c b/openbsc/src/libmsc/smpp_openbsc.c
index 8f1a96c..8111d92 100644
--- a/openbsc/src/libmsc/smpp_openbsc.c
+++ b/openbsc/src/libmsc/smpp_openbsc.c
@@ -549,8 +549,7 @@
 	 * lchan keeps busy until we get a reply to this SMPP command. Too high
 	 * value may exhaust resources.
 	 */
-	cmd->response_timer.cb	= smpp_deliver_sm_cb;
-	cmd->response_timer.data = cmd;
+	osmo_timer_setup(&cmd->response_timer, smpp_deliver_sm_cb, cmd);
 	osmo_timer_schedule(&cmd->response_timer, 5, 0);
 	llist_add_tail(&cmd->list, &esme->smpp_cmd_list);
 	*deferred = true;
diff --git a/openbsc/src/libmsc/sms_queue.c b/openbsc/src/libmsc/sms_queue.c
index ebc53c2..dc7f6e8 100644
--- a/openbsc/src/libmsc/sms_queue.c
+++ b/openbsc/src/libmsc/sms_queue.c
@@ -354,10 +354,8 @@
 	sms->max_fail = 1;
 	sms->network = network;
 	sms->max_pending = max_pending;
-	sms->push_queue.data = sms;
-	sms->push_queue.cb = sms_submit_pending;
-	sms->resend_pending.data = sms;
-	sms->resend_pending.cb = sms_resend_pending;
+	osmo_timer_setup(&sms->push_queue, sms_submit_pending, sms);
+	osmo_timer_setup(&sms->resend_pending, sms_resend_pending, sms);
 
 	sms_submit_pending(sms);