diff --git a/.gitignore b/.gitignore
index 6cd853e..b10dcff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /sdk/src/signaling_device/src/version.cpp
 scratch.md
 perf.data*
+sdk/CMakeUserPresets.json
diff --git a/sdk/src/signaling_util/message_transport/src/message_signer.hpp b/sdk/src/signaling_util/message_transport/src/message_signer.hpp
index 98d5947..caf27ba 100644
--- a/sdk/src/signaling_util/message_transport/src/message_signer.hpp
+++ b/sdk/src/signaling_util/message_transport/src/message_signer.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <nlohmann/json.hpp>
-
 #include <memory>
 #include <string>
 
+#include "nlohmann/json.hpp"
+
 namespace nabto {
 namespace webrtc {
 namespace util {
diff --git a/sdk/src/signaling_util/message_transport/src/message_transport.cpp b/sdk/src/signaling_util/message_transport/src/message_transport.cpp
index cd67d3a..e8bdb19 100644
--- a/sdk/src/signaling_util/message_transport/src/message_transport.cpp
+++ b/sdk/src/signaling_util/message_transport/src/message_transport.cpp
@@ -1,16 +1,15 @@
 #include "message_transport_impl.hpp"
 
-#include <nabto/webrtc/device.hpp>
-#include <nabto/webrtc/util/message_transport.hpp>
-
-#include <nlohmann/json.hpp>
-#include <nlohmann/json_fwd.hpp>
-
 #include <memory>
 #include <stdexcept>
 #include <string>
 #include <utility>
 
+#include "nabto/webrtc/device.hpp"
+#include "nabto/webrtc/util/message_transport.hpp"
+#include "nlohmann/json.hpp"
+#include "nlohmann/json_fwd.hpp"
+
 namespace nabto {
 namespace webrtc {
 namespace util {
diff --git a/sdk/src/signaling_util/message_transport/src/message_transport_impl.cpp b/sdk/src/signaling_util/message_transport/src/message_transport_impl.cpp
index 5f0c81e..3921345 100644
--- a/sdk/src/signaling_util/message_transport/src/message_transport_impl.cpp
+++ b/sdk/src/signaling_util/message_transport/src/message_transport_impl.cpp
@@ -1,15 +1,5 @@
 #include "message_transport_impl.hpp"
 
-#include "message_signer.hpp"
-#include "none_message_signer.hpp"
-#include "shared_secret_message_signer.hpp"
-
-#include <nabto/webrtc/device.hpp>
-#include <nabto/webrtc/util/logging.hpp>
-#include <nabto/webrtc/util/message_transport.hpp>
-
-#include <nlohmann/json.hpp>
-
 #include <exception>
 #include <functional>
 #include <map>
@@ -19,6 +9,14 @@
 #include <utility>
 #include <vector>
 
+#include "message_signer.hpp"
+#include "nabto/webrtc/device.hpp"
+#include "nabto/webrtc/util/logging.hpp"
+#include "nabto/webrtc/util/message_transport.hpp"
+#include "nlohmann/json.hpp"
+#include "none_message_signer.hpp"
+#include "shared_secret_message_signer.hpp"
+
 namespace nabto {
 namespace webrtc {
 namespace util {
diff --git a/sdk/src/signaling_util/message_transport/src/message_transport_impl.hpp b/sdk/src/signaling_util/message_transport/src/message_transport_impl.hpp
index 2ef074c..9b4982c 100644
--- a/sdk/src/signaling_util/message_transport/src/message_transport_impl.hpp
+++ b/sdk/src/signaling_util/message_transport/src/message_transport_impl.hpp
@@ -1,10 +1,10 @@
 #include "message_signer.hpp"
 
-#include <nabto/webrtc/util/message_transport.hpp>
-
 #include <map>
 #include <mutex>
 
+#include "nabto/webrtc/util/message_transport.hpp"
+
 namespace nabto {
 namespace webrtc {
 namespace util {
diff --git a/sdk/src/signaling_util/message_transport/src/none_message_signer.hpp b/sdk/src/signaling_util/message_transport/src/none_message_signer.hpp
index 30fb93d..2a209d7 100644
--- a/sdk/src/signaling_util/message_transport/src/none_message_signer.hpp
+++ b/sdk/src/signaling_util/message_transport/src/none_message_signer.hpp
@@ -1,15 +1,14 @@
 #pragma once
 
 #include "message_signer.hpp"
-#include <jwt-cpp/jwt.h>
-
-#include <nabto/webrtc/device.hpp>
-#include <nabto/webrtc/util/logging.hpp>
-
-#include <nlohmann/json.hpp>
 
 #include <memory>
 
+#include "jwt-cpp/jwt.h"
+#include "nabto/webrtc/device.hpp"
+#include "nabto/webrtc/util/logging.hpp"
+#include "nlohmann/json.hpp"
+
 namespace nabto {
 namespace webrtc {
 namespace util {
diff --git a/sdk/src/signaling_util/message_transport/src/shared_secret_message_signer.hpp b/sdk/src/signaling_util/message_transport/src/shared_secret_message_signer.hpp
index 1b7fac3..36fbc4b 100644
--- a/sdk/src/signaling_util/message_transport/src/shared_secret_message_signer.hpp
+++ b/sdk/src/signaling_util/message_transport/src/shared_secret_message_signer.hpp
@@ -1,16 +1,15 @@
 #pragma once
 
 #include "message_signer.hpp"
-#include <jwt-cpp/traits/nlohmann-json/traits.h>
-
-#include <nabto/webrtc/device.hpp>
-#include <nabto/webrtc/util/logging.hpp>
-#include <nabto/webrtc/util/uuid.hpp>
-
-#include <nlohmann/json.hpp>
 
 #include <memory>
 
+#include "jwt-cpp/traits/nlohmann-json/traits.h"
+#include "nabto/webrtc/device.hpp"
+#include "nabto/webrtc/util/logging.hpp"
+#include "nabto/webrtc/util/uuid.hpp"
+#include "nlohmann/json.hpp"
+
 namespace nabto {
 namespace webrtc {
 namespace util {