diff --git a/modules/you_done_it/client_node.h b/modules/you_done_it/client_node.h
index 717a1362..649ea14a 100644
--- a/modules/you_done_it/client_node.h
+++ b/modules/you_done_it/client_node.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "ydi_networking.h"
-#include <scene/main/node.h>
+#include "scene/main/node.h"
+#include "you_done_it/ydi_networking.h"
 
 class ClientNode : Node {
 	GDCLASS(ClientNode, Node);
diff --git a/modules/you_done_it/clue_data.cpp b/modules/you_done_it/clue_data.cpp
index 8be71c2b..45a53305 100644
--- a/modules/you_done_it/clue_data.cpp
+++ b/modules/you_done_it/clue_data.cpp
@@ -1,7 +1,7 @@
 #include "clue_data.h"
+#include "core/config/engine.h"
 #include "you_done_it/macros.h"
 #include "you_done_it/ydi_client.h"
-#include <core/config/engine.h>
 
 void ClueData::_bind_methods() {
 	BIND_HPROPERTY(Variant::INT, id, PROPERTY_HINT_ENUM, NetworkData::ClueID_hint());
diff --git a/modules/you_done_it/clue_data.h b/modules/you_done_it/clue_data.h
index 62547959..8acd1f8b 100644
--- a/modules/you_done_it/clue_data.h
+++ b/modules/you_done_it/clue_data.h
@@ -1,8 +1,8 @@
 #pragma once
 
+#include "core/io/image.h"
+#include "core/io/resource.h"
 #include "you_done_it/ydi_networking.h"
-#include <core/io/image.h>
-#include <core/io/resource.h>
 
 class ClueData : public Resource {
 	GDCLASS(ClueData, Resource);
diff --git a/modules/you_done_it/clue_finder.cpp b/modules/you_done_it/clue_finder.cpp
index 62a30fc1..5a44bfb0 100644
--- a/modules/you_done_it/clue_finder.cpp
+++ b/modules/you_done_it/clue_finder.cpp
@@ -1,10 +1,7 @@
 #include "clue_finder.h"
+#include "core/config/engine.h"
 #include "scene/3d/xr/xr_nodes.h"
-#include "ydi_client.h"
-#include "you_done_it/client_node.h"
-#include "you_done_it/clue_db.h"
-#include <core/config/engine.h>
-#include <scene/main/node.h>
+#include "scene/main/node.h"
 
 ClueFinder *ClueFinder::singleton_instance{ nullptr };
 
diff --git a/modules/you_done_it/clue_finder.h b/modules/you_done_it/clue_finder.h
index f0609bd0..34eeda27 100644
--- a/modules/you_done_it/clue_finder.h
+++ b/modules/you_done_it/clue_finder.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "clue_marker.h"
-#include <core/templates/hash_set.h>
-#include <scene/3d/node_3d.h>
+#include "core/templates/hash_set.h"
+#include "scene/3d/node_3d.h"
+#include "you_done_it/clue_marker.h"
 
 class ClueFinder : public Node3D {
 	GDCLASS(ClueFinder, Node3D);
diff --git a/modules/you_done_it/clue_marker.cpp b/modules/you_done_it/clue_marker.cpp
index 96dd26fa..a6c29e16 100644
--- a/modules/you_done_it/clue_marker.cpp
+++ b/modules/you_done_it/clue_marker.cpp
@@ -1,7 +1,7 @@
 #include "clue_marker.h"
 #include "core/config/engine.h"
-#include "macros.h"
 #include "you_done_it/clue_finder.h"
+#include "you_done_it/macros.h"
 #include "you_done_it/ydi_networking.h"
 
 void ClueMarker::_bind_methods() {
diff --git a/modules/you_done_it/clue_marker.h b/modules/you_done_it/clue_marker.h
index 0a6493a1..22f9cb0e 100644
--- a/modules/you_done_it/clue_marker.h
+++ b/modules/you_done_it/clue_marker.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "clue_db.h"
-#include "ydi_networking.h"
-#include <scene/3d/marker_3d.h>
+#include "scene/3d/marker_3d.h"
+#include "you_done_it/clue_db.h"
+#include "you_done_it/ydi_networking.h"
 
 class ClueMarker : public Marker3D {
 	GDCLASS(ClueMarker, Marker3D);
diff --git a/modules/you_done_it/register_types.cpp b/modules/you_done_it/register_types.cpp
index 12e163c1..84e49e03 100644
--- a/modules/you_done_it/register_types.cpp
+++ b/modules/you_done_it/register_types.cpp
@@ -1,13 +1,13 @@
 #include "register_types.h"
 
 #include "client_node.h"
+#include "core/object/class_db.h"
 #include "you_done_it/clue_data.h"
 #include "you_done_it/clue_finder.h"
 #include "you_done_it/clue_marker.h"
 #include "you_done_it/server_node.h"
 #include "you_done_it/ydi_networking.h"
 #include "you_done_it/ydi_vr_origin.h"
-#include <core/object/class_db.h>
 
 void initialize_you_done_it_module(ModuleInitializationLevel p_level) {
 	if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) {
diff --git a/modules/you_done_it/server_node.cpp b/modules/you_done_it/server_node.cpp
index 02a16de7..1db8473f 100644
--- a/modules/you_done_it/server_node.cpp
+++ b/modules/you_done_it/server_node.cpp
@@ -1,6 +1,6 @@
 #include "server_node.h"
-#include "ydi_server.h"
-#include <core/config/engine.h>
+#include "core/config/engine.h"
+#include "you_done_it/ydi_server.h"
 
 ServerNode *ServerNode::singleton_instance{ nullptr };
 String const ServerNode::sig_clue_revealed{ "clue_revealed" };
diff --git a/modules/you_done_it/server_node.h b/modules/you_done_it/server_node.h
index c2b7ad63..8f1b31e9 100644
--- a/modules/you_done_it/server_node.h
+++ b/modules/you_done_it/server_node.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <scene/main/node.h>
+#include "scene/main/node.h"
 
 class ServerNode : public Node {
 	GDCLASS(ServerNode, Node);
diff --git a/modules/you_done_it/ydi_client.cpp b/modules/you_done_it/ydi_client.cpp
index d30652e1..d5b51cfc 100644
--- a/modules/you_done_it/ydi_client.cpp
+++ b/modules/you_done_it/ydi_client.cpp
@@ -1,12 +1,12 @@
 #include "ydi_client.h"
 #include "core/string/print_string.h"
 #include "you_done_it/ydi_networking.h"
+#include "zmq.hpp"
+#include "zmq_addon.hpp"
 #include <atomic>
 #include <mutex>
 #include <optional>
 #include <thread>
-#include <zmq.hpp>
-#include <zmq_addon.hpp>
 
 namespace ydi::client {
 struct Connection {
diff --git a/modules/you_done_it/ydi_client.h b/modules/you_done_it/ydi_client.h
index b8f48b72..e0eba9b7 100644
--- a/modules/you_done_it/ydi_client.h
+++ b/modules/you_done_it/ydi_client.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "ydi_networking.h"
-#include <core/string/ustring.h>
+#include "core/string/ustring.h"
+#include "you_done_it/ydi_networking.h"
 
 namespace ydi::client {
 void connect(String const &url);
diff --git a/modules/you_done_it/ydi_networking.cpp b/modules/you_done_it/ydi_networking.cpp
index 901326b0..bba15f32 100644
--- a/modules/you_done_it/ydi_networking.cpp
+++ b/modules/you_done_it/ydi_networking.cpp
@@ -1,7 +1,7 @@
 #include "ydi_networking.h"
+#include "core/core_bind.h"
+#include "core/object/class_db.h"
 #include "core/string/print_string.h"
-#include <core/core_bind.h>
-#include <core/object/class_db.h>
 
 void NetworkData::_bind_methods() {
 	BIND_ENUM_CONSTANT(CLUE_FIRST);
diff --git a/modules/you_done_it/ydi_networking.h b/modules/you_done_it/ydi_networking.h
index b3d9ab44..fc08d487 100644
--- a/modules/you_done_it/ydi_networking.h
+++ b/modules/you_done_it/ydi_networking.h
@@ -1,13 +1,12 @@
 #pragma once
 
-#include "macros.h"
-#include <core/object/class_db.h>
-#include <core/object/object.h>
-#include <zmq.h>
+#include "core/object/class_db.h"
+#include "core/object/object.h"
+#include "you_done_it/macros.h"
+#include "zmq.hpp"
+#include "zmq_addon.hpp"
 #include <string>
 #include <string_view>
-#include <zmq.hpp>
-#include <zmq_addon.hpp>
 
 class NetworkData : Object {
 	GDCLASS(NetworkData, Object);
diff --git a/modules/you_done_it/ydi_server.cpp b/modules/you_done_it/ydi_server.cpp
index 1afdf451..160b2602 100644
--- a/modules/you_done_it/ydi_server.cpp
+++ b/modules/you_done_it/ydi_server.cpp
@@ -1,14 +1,14 @@
 #include "ydi_server.h"
-#include "ydi_networking.h"
-#include <core/os/time.h>
-#include <core/templates/vector.h>
+#include "core/os/time.h"
+#include "core/templates/vector.h"
+#include "you_done_it/ydi_networking.h"
+#include "zmq.hpp"
+#include "zmq_addon.hpp"
 #include <atomic>
 #include <mutex>
 #include <optional>
 #include <thread>
 #include <unordered_set>
-#include <zmq.hpp>
-#include <zmq_addon.hpp>
 
 namespace ydi::server {
 struct Service {
diff --git a/modules/you_done_it/ydi_server.h b/modules/you_done_it/ydi_server.h
index 7e019e9a..56940f14 100644
--- a/modules/you_done_it/ydi_server.h
+++ b/modules/you_done_it/ydi_server.h
@@ -1,10 +1,7 @@
 #pragma once
 
-#include "ydi_networking.h"
-#include <core/io/image.h>
-#include <core/object/ref_counted.h>
-#include <core/string/ustring.h>
-#include <core/templates/vector.h>
+#include "core/templates/vector.h"
+#include "you_done_it/ydi_networking.h"
 #include <cassert>
 
 namespace ydi::server {
diff --git a/modules/you_done_it/ydi_vr_origin.cpp b/modules/you_done_it/ydi_vr_origin.cpp
index 86d31561..4f7ae9ef 100644
--- a/modules/you_done_it/ydi_vr_origin.cpp
+++ b/modules/you_done_it/ydi_vr_origin.cpp
@@ -1,8 +1,8 @@
 #include "ydi_vr_origin.h"
-#include <core/config/engine.h>
-#include <scene/main/viewport.h>
-#include <servers/xr/xr_interface.h>
-#include <servers/xr_server.h>
+#include "core/config/engine.h"
+#include "scene/main/viewport.h"
+#include "servers/xr/xr_interface.h"
+#include "servers/xr_server.h"
 
 void VROrigin::_bind_methods() {}
 
diff --git a/modules/you_done_it/ydi_vr_origin.h b/modules/you_done_it/ydi_vr_origin.h
index 75879f26..2480f7d3 100644
--- a/modules/you_done_it/ydi_vr_origin.h
+++ b/modules/you_done_it/ydi_vr_origin.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <scene/3d/xr/xr_nodes.h>
-#include <servers/xr/xr_interface.h>
+#include "scene/3d/xr/xr_nodes.h"
+#include "servers/xr/xr_interface.h"
 
 class VROrigin : public XROrigin3D {
 	GDCLASS(VROrigin, XROrigin3D);