diff --git a/callback_dispatcher.cc b/callback_dispatcher.cc
index 59e6487..c90cf0f 100644
--- a/callback_dispatcher.cc
+++ b/callback_dispatcher.cc
@@ -2,9 +2,10 @@
 #include <stdexcept>
 #include <cassert>
 
+pEp::CallbackDispatcher callback_dispatcher;
+
 namespace pEp {
     bool CallbackDispatcher::once = true;
-    CallbackDispatcher callback_dispatcher;
 
     CallbackDispatcher::CallbackDispatcher()
     {
diff --git a/callback_dispatcher.hh b/callback_dispatcher.hh
index 785eec9..f858403 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;