diff --git a/cs_babbler.c b/cs_babbler.c
index 44a3c9a..4af89fd 100644
--- a/cs_babbler.c
+++ b/cs_babbler.c
@@ -44,10 +44,8 @@ DECLARE_MODULE_V1
 );
 
 static void
-on_channel_message(void *p)
+on_channel_message(hook_cmessage_data_t *data)
 {
-	hook_cmessage_data_t *data = p;
-
 	if (data != NULL && data->msg != NULL)
 	{
 		mychan_t *mc = MYCHAN_FROM(data->c);
diff --git a/mlocktweaker.c b/mlocktweaker.c
index 74d111f..79188db 100644
--- a/mlocktweaker.c
+++ b/mlocktweaker.c
@@ -35,9 +35,8 @@ void _moddeinit(module_unload_intent_t intent)
 	hook_del_channel_register(handle_channel_register);
 }
 
-static void handle_channel_register(void *vptr)
+static void handle_channel_register(hook_channel_req_t *hdata)
 {
-	hook_channel_req_t *hdata = vptr;
 	mychan_t *mc = hdata->mc;
 	unsigned int *target;
 	char *it, *str = MLOCK_CHANGE;