diff --git a/include/mtx/identifiers.hpp b/include/mtx/identifiers.hpp
index 78858851de5e6554dc73752bab09d05e26348f90..6e05d963010794b27d13c5a2c21e2a98f19ec538 100644
--- a/include/mtx/identifiers.hpp
+++ b/include/mtx/identifiers.hpp
@@ -92,8 +92,8 @@ parse(const std::string &id)
         } else {
                 // V3 event ids don't use ':' at all, don't parse them the same way.
                 identifier.localpart_ = id;
-                identifier.hostname_ = id;
-                identifier.id_ = id;
+                identifier.hostname_  = id;
+                identifier.id_        = id;
         }
 
         return identifier;
diff --git a/include/mtx/requests.hpp b/include/mtx/requests.hpp
index b66842d2ae4f59677deb01e4edb04cf90d42467f..86d8d94560a3b361657c4319c12b0050f8e8eabc 100644
--- a/include/mtx/requests.hpp
+++ b/include/mtx/requests.hpp
@@ -2,8 +2,8 @@
 
 #include <string>
 
-#include <nlohmann/json.hpp>
 #include <mtx/common.hpp>
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/tests/events.cpp b/tests/events.cpp
index 21bd18a2c2408610d7c2e64351f9236f8e8b87ce..a4bc027c096aa417cd2733648af2d1422020f5ae 100644
--- a/tests/events.cpp
+++ b/tests/events.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 
-#include <nlohmann/json.hpp>
 #include <mtx.hpp>
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/tests/messages.cpp b/tests/messages.cpp
index f81f9fcfea2f030d57d8c10cad0981518a980737..a8d4eb1115fdce86750e24966aad90db71ef16bc 100644
--- a/tests/messages.cpp
+++ b/tests/messages.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 
-#include <nlohmann/json.hpp>
 #include <mtx.hpp>
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/tests/utils.cpp b/tests/utils.cpp
index 454aa3ab8c1245bc2a5e58b34c1c61b8c6c12d17..c2e169d8d2660bcbbba5cb0001e00309a6a63207 100644
--- a/tests/utils.cpp
+++ b/tests/utils.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 
-#include <nlohmann/json.hpp>
 #include <mtxclient/crypto/client.hpp>
+#include <nlohmann/json.hpp>
 
 #include <olm/olm.h>