diff --git a/auto_tests/TCP_test.c b/auto_tests/TCP_test.c
index 1f4626db..33bbe0e2 100644
--- a/auto_tests/TCP_test.c
+++ b/auto_tests/TCP_test.c
@@ -49,7 +49,7 @@ static void test_basic(void)
     const Random *rng = system_random();
     ck_assert(rng != nullptr);
     Logger *logger = logger_new();
-    logger_callback_log(logger, (logger_cb *)print_debug_log, nullptr, nullptr);
+    logger_callback_log(logger, print_debug_logger, nullptr, nullptr);
 
     // Attempt to create a new TCP_Server instance.
     uint8_t self_public_key[CRYPTO_PUBLIC_KEY_SIZE];
diff --git a/auto_tests/announce_test.c b/auto_tests/announce_test.c
index 0da3c99f..c31d5ca7 100644
--- a/auto_tests/announce_test.c
+++ b/auto_tests/announce_test.c
@@ -56,7 +56,7 @@ static void test_store_data(void)
     ck_assert(ns != nullptr);
     Logger *log = logger_new();
     ck_assert(log != nullptr);
-    logger_callback_log(log, (logger_cb *)print_debug_log, nullptr, nullptr);
+    logger_callback_log(log, print_debug_logger, nullptr, nullptr);
     Mono_Time *mono_time = mono_time_new(nullptr, nullptr);
     Networking_Core *net = new_networking_no_udp(log, ns);
     DHT *dht = new_dht(log, rng, ns, mono_time, net, true, true);
diff --git a/auto_tests/auto_test_support.c b/auto_tests/auto_test_support.c
index 7afe59d8..bdc700e3 100644
--- a/auto_tests/auto_test_support.c
+++ b/auto_tests/auto_test_support.c
@@ -418,6 +418,12 @@ void print_debug_log(Tox *m, Tox_Log_Level level, const char *file, uint32_t lin
     }
 }
 
+
+void print_debug_logger(void *context, Logger_Level level, const char *file, int line, const char *func, const char *message, void *userdata)
+{
+    print_debug_log(nullptr, (Tox_Log_Level) level, file, (uint32_t) line, func, message, userdata);
+}
+
 Tox *tox_new_log_lan(struct Tox_Options *options, Tox_Err_New *err, void *log_user_data, bool lan_discovery)
 {
     struct Tox_Options *log_options = options;
@@ -449,3 +455,4 @@ Tox *tox_new_log(struct Tox_Options *options, Tox_Err_New *err, void *log_user_d
 {
     return tox_new_log_lan(options, err, log_user_data, false);
 }
+
diff --git a/auto_tests/auto_test_support.h b/auto_tests/auto_test_support.h
index 266d1d50..eab121aa 100644
--- a/auto_tests/auto_test_support.h
+++ b/auto_tests/auto_test_support.h
@@ -51,9 +51,14 @@ void run_auto_test(struct Tox_Options *options, uint32_t tox_count, void test(Au
 
 void bootstrap_tox_live_network(Tox *tox, bool enable_tcp);
 
+// Use this function when setting the log callback on a Tox* object
 void print_debug_log(Tox *m, Tox_Log_Level level, const char *file, uint32_t line, const char *func,
                      const char *message, void *user_data);
 
+// Use this function when setting the log callback on a Logger object
+void print_debug_logger(void *context, Logger_Level level, const char *file, int line,
+                      const char *func, const char *message, void *userdata);
+
 Tox *tox_new_log(struct Tox_Options *options, Tox_Err_New *err, void *log_user_data);
 Tox *tox_new_log_lan(struct Tox_Options *options, Tox_Err_New *err, void *log_user_data, bool lan_discovery);
 
diff --git a/auto_tests/forwarding_test.c b/auto_tests/forwarding_test.c
index a352e936..bc912fb0 100644
--- a/auto_tests/forwarding_test.c
+++ b/auto_tests/forwarding_test.c
@@ -109,7 +109,7 @@ static Forwarding_Subtox *new_forwarding_subtox(bool no_udp, uint32_t *index, ui
 
     subtox->log = logger_new();
     ck_assert(subtox->log != nullptr);
-    logger_callback_log(subtox->log, (logger_cb *)print_debug_log, nullptr, index);
+    logger_callback_log(subtox->log, print_debug_logger, nullptr, index);
     subtox->mono_time = mono_time_new(nullptr, nullptr);
 
     const Random *rng= system_random();
diff --git a/auto_tests/onion_test.c b/auto_tests/onion_test.c
index fcc65975..34f5e21b 100644
--- a/auto_tests/onion_test.c
+++ b/auto_tests/onion_test.c
@@ -191,9 +191,9 @@ static void test_basic(void)
     const Network *ns = system_network();
 
     Logger *log1 = logger_new();
-    logger_callback_log(log1, (logger_cb *)print_debug_log, nullptr, &index[0]);
+    logger_callback_log(log1, print_debug_logger, nullptr, &index[0]);
     Logger *log2 = logger_new();
-    logger_callback_log(log2, (logger_cb *)print_debug_log, nullptr, &index[1]);
+    logger_callback_log(log2, print_debug_logger, nullptr, &index[1]);
 
     const Random *rng = system_random();
     ck_assert(rng != nullptr);
@@ -291,7 +291,7 @@ static void test_basic(void)
 
     c_sleep(1000);
     Logger *log3 = logger_new();
-    logger_callback_log(log3, (logger_cb *)print_debug_log, nullptr, &index[2]);
+    logger_callback_log(log3, print_debug_logger, nullptr, &index[2]);
 
     Mono_Time *mono_time3 = mono_time_new(nullptr, nullptr);
 
@@ -378,7 +378,7 @@ static Onions *new_onions(const Random *rng, uint16_t port, uint32_t *index)
         return nullptr;
     }
 
-    logger_callback_log(on->log, (logger_cb *)print_debug_log, nullptr, index);
+    logger_callback_log(on->log, print_debug_logger, nullptr, index);
 
     on->mono_time = mono_time_new(nullptr, nullptr);