diff --git a/callback_dispatcher.cc b/callback_dispatcher.cc
index c90cf0f..16b066f 100644
--- a/callback_dispatcher.cc
+++ b/callback_dispatcher.cc
@@ -2,7 +2,7 @@
 #include <stdexcept>
 #include <cassert>
 
-pEp::CallbackDispatcher callback_dispatcher;
+pEp::CallbackDispatcher pEp::callback_dispatcher;
 
 namespace pEp {
     bool CallbackDispatcher::once = true;
diff --git a/callback_dispatcher.hh b/callback_dispatcher.hh
index f858403..785eec9 100644
--- a/callback_dispatcher.hh
+++ b/callback_dispatcher.hh
@@ -50,6 +50,6 @@ namespace pEp {
                 ::pEp_identity *partner, ::sync_handshake_signal signal);
     };
 
+    extern CallbackDispatcher callback_dispatcher;
 };
 
-extern pEp::CallbackDispatcher callback_dispatcher;