diff --git a/ostd/algorithm.hh b/ostd/algorithm.hh
index a7c9991..2b1ab51 100644
--- a/ostd/algorithm.hh
+++ b/ostd/algorithm.hh
@@ -18,6 +18,8 @@
 #ifndef OSTD_ALGORITHM_HH
 #define OSTD_ALGORITHM_HH
 
+#include <ostd/unit_test.hh>
+
 #include <cmath>
 #include <utility>
 #include <functional>
@@ -28,9 +30,7 @@
 #include <vector>
 #endif
 
-#include "ostd/unit_test.hh"
-
-#include "ostd/range.hh"
+#include <ostd/range.hh>
 
 #define OSTD_TEST_MODULE libostd_algorithm
 
diff --git a/ostd/argparse.hh b/ostd/argparse.hh
index 36a2be3..2126f8c 100644
--- a/ostd/argparse.hh
+++ b/ostd/argparse.hh
@@ -29,10 +29,10 @@
 #include <functional>
 #include <type_traits>
 
-#include "ostd/algorithm.hh"
-#include "ostd/format.hh"
-#include "ostd/string.hh"
-#include "ostd/io.hh"
+#include <ostd/algorithm.hh>
+#include <ostd/format.hh>
+#include <ostd/string.hh>
+#include <ostd/io.hh>
 
 namespace ostd {
 
diff --git a/ostd/channel.hh b/ostd/channel.hh
index 00be5d9..6750272 100644
--- a/ostd/channel.hh
+++ b/ostd/channel.hh
@@ -24,7 +24,7 @@
 #include <stdexcept>
 #include <memory>
 
-#include "ostd/generic_condvar.hh"
+#include <ostd/generic_condvar.hh>
 
 namespace ostd {
 
diff --git a/ostd/concurrency.hh b/ostd/concurrency.hh
index 33f9f67..f3ab100 100644
--- a/ostd/concurrency.hh
+++ b/ostd/concurrency.hh
@@ -50,10 +50,10 @@
 #include <exception>
 #include <type_traits>
 
-#include "ostd/platform.hh"
-#include "ostd/coroutine.hh"
-#include "ostd/channel.hh"
-#include "ostd/generic_condvar.hh"
+#include <ostd/platform.hh>
+#include <ostd/coroutine.hh>
+#include <ostd/channel.hh>
+#include <ostd/generic_condvar.hh>
 
 namespace ostd {
 
diff --git a/ostd/context_stack.hh b/ostd/context_stack.hh
index a6101eb..71f5f3e 100644
--- a/ostd/context_stack.hh
+++ b/ostd/context_stack.hh
@@ -22,7 +22,7 @@
 #include <new>
 #include <algorithm>
 
-#include "ostd/platform.hh"
+#include <ostd/platform.hh>
 
 #ifdef OSTD_USE_VALGRIND
 #  include <valgrind/valgrind.h>
diff --git a/ostd/coroutine.hh b/ostd/coroutine.hh
index 7a1462a..0b16814 100644
--- a/ostd/coroutine.hh
+++ b/ostd/coroutine.hh
@@ -37,10 +37,10 @@
 #include <type_traits>
 #include <optional>
 
-#include "ostd/platform.hh"
-#include "ostd/range.hh"
+#include <ostd/platform.hh>
+#include <ostd/range.hh>
 
-#include "ostd/context_stack.hh"
+#include <ostd/context_stack.hh>
 
 namespace ostd {
 
diff --git a/ostd/environ.hh b/ostd/environ.hh
index bda4c91..f6b44b4 100644
--- a/ostd/environ.hh
+++ b/ostd/environ.hh
@@ -18,8 +18,8 @@
 #ifndef OSTD_ENVIRON_HH
 #define OSTD_ENVIRON_HH
 
-#include "ostd/platform.hh"
-#include "ostd/string.hh"
+#include <ostd/platform.hh>
+#include <ostd/string.hh>
 
 #include <optional>
 #include <string>
diff --git a/ostd/ext/sdl_rwops.hh b/ostd/ext/sdl_rwops.hh
index 15c4d92..eb571bd 100644
--- a/ostd/ext/sdl_rwops.hh
+++ b/ostd/ext/sdl_rwops.hh
@@ -29,7 +29,7 @@
 #include <SDL2/SDL.h>
 #endif
 
-#include "ostd/stream.hh"
+#include <ostd/stream.hh>
 
 namespace ostd {
 namespace sdl {
diff --git a/ostd/filesystem.hh b/ostd/filesystem.hh
index 21627bc..0a0ced9 100644
--- a/ostd/filesystem.hh
+++ b/ostd/filesystem.hh
@@ -40,9 +40,9 @@ namespace ostd {
 #  error "Unsupported platform"
 #endif
 
-#include "ostd/platform.hh"
-#include "ostd/range.hh"
-#include "ostd/format.hh"
+#include <ostd/platform.hh>
+#include <ostd/range.hh>
+#include <ostd/format.hh>
 
 namespace ostd {
 
diff --git a/ostd/format.hh b/ostd/format.hh
index 445ccbc..9de3d0d 100644
--- a/ostd/format.hh
+++ b/ostd/format.hh
@@ -26,8 +26,8 @@
 #include <locale>
 #include <ios>
 
-#include "ostd/algorithm.hh"
-#include "ostd/string.hh"
+#include <ostd/algorithm.hh>
+#include <ostd/string.hh>
 
 namespace ostd {
 
diff --git a/ostd/io.hh b/ostd/io.hh
index ad9d1bd..ab76bf9 100644
--- a/ostd/io.hh
+++ b/ostd/io.hh
@@ -28,10 +28,10 @@
 #include <cstdio>
 #include <cerrno>
 
-#include "ostd/platform.hh"
-#include "ostd/string.hh"
-#include "ostd/stream.hh"
-#include "ostd/format.hh"
+#include <ostd/platform.hh>
+#include <ostd/string.hh>
+#include <ostd/stream.hh>
+#include <ostd/format.hh>
 
 namespace ostd {
 
diff --git a/ostd/process.hh b/ostd/process.hh
index d0f5d26..14b7734 100644
--- a/ostd/process.hh
+++ b/ostd/process.hh
@@ -20,10 +20,10 @@
 #include <string>
 #include <vector>
 
-#include "ostd/platform.hh"
-#include "ostd/string.hh"
-#include "ostd/range.hh"
-#include "ostd/io.hh"
+#include <ostd/platform.hh>
+#include <ostd/string.hh>
+#include <ostd/range.hh>
+#include <ostd/io.hh>
 
 namespace ostd {
 
diff --git a/ostd/range.hh b/ostd/range.hh
index 9c7be0c..6d2a3d0 100644
--- a/ostd/range.hh
+++ b/ostd/range.hh
@@ -53,7 +53,7 @@
 #ifndef OSTD_RANGE_HH
 #define OSTD_RANGE_HH
 
-#include "ostd/unit_test.hh"
+#include <ostd/unit_test.hh>
 
 #include <cstddef>
 #include <new>
diff --git a/ostd/stream.hh b/ostd/stream.hh
index d348e88..de44cfd 100644
--- a/ostd/stream.hh
+++ b/ostd/stream.hh
@@ -42,15 +42,15 @@
 #include <stdexcept>
 #include <system_error>
 
-#include "ostd/platform.hh"
+#include <ostd/platform.hh>
 
 #ifndef OSTD_PLATFORM_WIN32
 #include <sys/types.h>
 #endif
 
-#include "ostd/range.hh"
-#include "ostd/string.hh"
-#include "ostd/format.hh"
+#include <ostd/range.hh>
+#include <ostd/string.hh>
+#include <ostd/format.hh>
 
 namespace ostd {
 
diff --git a/ostd/string.hh b/ostd/string.hh
index 97b40fa..d2d7fea 100644
--- a/ostd/string.hh
+++ b/ostd/string.hh
@@ -59,8 +59,8 @@
 #include <utility>
 #include <vector>
 
-#include "ostd/range.hh"
-#include "ostd/algorithm.hh"
+#include <ostd/range.hh>
+#include <ostd/algorithm.hh>
 
 namespace ostd {