diff --git a/src/events/AliasesEventContent.cc b/src/events/AliasesEventContent.cc
index ccc4f2c1..89754315 100644
--- a/src/events/AliasesEventContent.cc
+++ b/src/events/AliasesEventContent.cc
@@ -19,6 +19,8 @@
#include "AliasesEventContent.h"
+using namespace matrix::events;
+
void AliasesEventContent::deserialize(const QJsonValue &data)
{
if (!data.isObject())
diff --git a/src/events/AvatarEventContent.cc b/src/events/AvatarEventContent.cc
index 51a60a1e..2f88cac2 100644
--- a/src/events/AvatarEventContent.cc
+++ b/src/events/AvatarEventContent.cc
@@ -19,6 +19,8 @@
#include "AvatarEventContent.h"
+using namespace matrix::events;
+
void AvatarEventContent::deserialize(const QJsonValue &data)
{
if (!data.isObject())
diff --git a/src/events/CanonicalAliasEventContent.cc b/src/events/CanonicalAliasEventContent.cc
index 23a32016..89042722 100644
--- a/src/events/CanonicalAliasEventContent.cc
+++ b/src/events/CanonicalAliasEventContent.cc
@@ -17,6 +17,8 @@
#include "CanonicalAliasEventContent.h"
+using namespace matrix::events;
+
void CanonicalAliasEventContent::deserialize(const QJsonValue &data)
{
if (!data.isObject())
diff --git a/src/events/CreateEventContent.cc b/src/events/CreateEventContent.cc
index e44be13e..d43a4cc5 100644
--- a/src/events/CreateEventContent.cc
+++ b/src/events/CreateEventContent.cc
@@ -17,6 +17,8 @@
#include "CreateEventContent.h"
+using namespace matrix::events;
+
void CreateEventContent::deserialize(const QJsonValue &data)
{
if (!data.isObject())
diff --git a/src/events/Event.cc b/src/events/Event.cc
index f9596d18..9a8590e0 100644
--- a/src/events/Event.cc
+++ b/src/events/Event.cc
@@ -29,7 +29,7 @@
#include "PowerLevelsEventContent.h"
#include "TopicEventContent.h"
-EventType extractEventType(const QJsonObject &object)
+matrix::events::EventType matrix::events::extractEventType(const QJsonObject &object)
{
if (!object.contains("type"))
throw DeserializationException("Missing event type");
diff --git a/src/events/HistoryVisibilityEventContent.cc b/src/events/HistoryVisibilityEventContent.cc
index b9eb7ffc..25630aa4 100644
--- a/src/events/HistoryVisibilityEventContent.cc
+++ b/src/events/HistoryVisibilityEventContent.cc
@@ -17,6 +17,8 @@
#include "HistoryVisibilityEventContent.h"
+using namespace matrix::events;
+
void HistoryVisibilityEventContent::deserialize(const QJsonValue &data)
{
if (!data.isObject())
diff --git a/src/events/JoinRulesEventContent.cc b/src/events/JoinRulesEventContent.cc
index ad30a1aa..913aa097 100644
--- a/src/events/JoinRulesEventContent.cc
+++ b/src/events/JoinRulesEventContent.cc
@@ -17,6 +17,8 @@
#include "JoinRulesEventContent.h"
+using namespace matrix::events;
+
void JoinRulesEventContent::deserialize(const QJsonValue &data)
{
if (!data.isObject())
diff --git a/src/events/MemberEventContent.cc b/src/events/MemberEventContent.cc
index e7814e30..4c405f01 100644
--- a/src/events/MemberEventContent.cc
+++ b/src/events/MemberEventContent.cc
@@ -19,6 +19,8 @@
#include "MemberEventContent.h"
+using namespace matrix::events;
+
void MemberEventContent::deserialize(const QJsonValue &data)
{
if (!data.isObject())
diff --git a/src/events/NameEventContent.cc b/src/events/NameEventContent.cc
index 09b655a7..bfb2f878 100644
--- a/src/events/NameEventContent.cc
+++ b/src/events/NameEventContent.cc
@@ -17,6 +17,8 @@
#include "NameEventContent.h"
+using namespace matrix::events;
+
void NameEventContent::deserialize(const QJsonValue &data)
{
if (!data.isObject())
diff --git a/src/events/PowerLevelsEventContent.cc b/src/events/PowerLevelsEventContent.cc
index a6e5846a..048b8e97 100644
--- a/src/events/PowerLevelsEventContent.cc
+++ b/src/events/PowerLevelsEventContent.cc
@@ -20,6 +20,8 @@
#include "Deserializable.h"
#include "PowerLevelsEventContent.h"
+using namespace matrix::events;
+
void PowerLevelsEventContent::deserialize(const QJsonValue &data)
{
if (!data.isObject())
diff --git a/src/events/TopicEventContent.cc b/src/events/TopicEventContent.cc
index 1abda151..e8d99ee9 100644
--- a/src/events/TopicEventContent.cc
+++ b/src/events/TopicEventContent.cc
@@ -17,6 +17,8 @@
#include "TopicEventContent.h"
+using namespace matrix::events;
+
void TopicEventContent::deserialize(const QJsonValue &data)
{
if (!data.isObject())
|