From 23a3d0b20f551ec6d986de3d06a0d2650aeae720 Mon Sep 17 00:00:00 2001
From: Rafael Kitover <rkitover@gmail.com>
Date: Fri, 18 Jul 2025 01:30:16 +0000
Subject: [PATCH] build: fix include paths for bundled SFML

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
---
 src/core/CMakeLists.txt                       |  4 +--
 src/core/gba/gbaLink.cpp                      |  2 +-
 src/core/gba/internal/gbaSockClient.h         |  2 +-
 third_party/sfml/include/SFML/Network.hpp     | 22 +++++++--------
 .../sfml/include/SFML/Network/Export.hpp      |  2 +-
 third_party/sfml/include/SFML/Network/Ftp.hpp |  6 ++--
 .../sfml/include/SFML/Network/Http.hpp        |  8 +++---
 .../sfml/include/SFML/Network/IpAddress.hpp   |  4 +--
 .../sfml/include/SFML/Network/Packet.hpp      |  2 +-
 .../sfml/include/SFML/Network/Socket.hpp      |  4 +--
 .../include/SFML/Network/SocketHandle.hpp     |  2 +-
 .../include/SFML/Network/SocketSelector.hpp   |  4 +--
 .../sfml/include/SFML/Network/TcpListener.hpp |  6 ++--
 .../sfml/include/SFML/Network/TcpSocket.hpp   |  6 ++--
 .../sfml/include/SFML/Network/UdpSocket.hpp   |  6 ++--
 third_party/sfml/include/SFML/System.hpp      | 28 +++++++++----------
 .../sfml/include/SFML/System/Angle.hpp        |  2 +-
 .../sfml/include/SFML/System/Angle.inl        |  2 +-
 .../sfml/include/SFML/System/Clock.hpp        |  4 +--
 third_party/sfml/include/SFML/System/Err.hpp  |  2 +-
 .../sfml/include/SFML/System/Exception.hpp    |  2 +-
 .../sfml/include/SFML/System/Export.hpp       |  2 +-
 .../include/SFML/System/FileInputStream.hpp   |  8 ++++--
 .../sfml/include/SFML/System/InputStream.hpp  |  4 +--
 .../include/SFML/System/MemoryInputStream.hpp |  7 +++--
 .../include/SFML/System/NativeActivity.hpp    |  2 +-
 .../sfml/include/SFML/System/Sleep.hpp        |  2 +-
 .../sfml/include/SFML/System/String.hpp       |  6 ++--
 .../sfml/include/SFML/System/String.inl       |  2 +-
 .../include/SFML/System/SuspendAwareClock.hpp |  2 +-
 third_party/sfml/include/SFML/System/Time.hpp |  2 +-
 third_party/sfml/include/SFML/System/Time.inl |  2 +-
 third_party/sfml/include/SFML/System/Utf.hpp  |  4 +--
 third_party/sfml/include/SFML/System/Utf.inl  |  2 +-
 .../sfml/include/SFML/System/Vector2.hpp      |  6 ++--
 .../sfml/include/SFML/System/Vector2.inl      |  2 +-
 .../sfml/include/SFML/System/Vector3.hpp      |  4 +--
 .../sfml/include/SFML/System/Vector3.inl      |  2 +-
 .../sfml/src/SFML/Network/CMakeLists.txt      |  3 +-
 third_party/sfml/src/SFML/Network/Ftp.cpp     |  6 ++--
 third_party/sfml/src/SFML/Network/Http.cpp    |  6 ++--
 .../sfml/src/SFML/Network/IpAddress.cpp       |  8 +++---
 third_party/sfml/src/SFML/Network/Packet.cpp  |  8 +++---
 third_party/sfml/src/SFML/Network/Socket.cpp  |  6 ++--
 .../sfml/src/SFML/Network/SocketImpl.hpp      |  6 ++--
 .../sfml/src/SFML/Network/SocketSelector.cpp  |  8 +++---
 .../sfml/src/SFML/Network/TcpListener.cpp     |  8 +++---
 .../sfml/src/SFML/Network/TcpSocket.cpp       | 10 +++----
 .../sfml/src/SFML/Network/UdpSocket.cpp       | 10 +++----
 .../sfml/src/SFML/Network/Unix/SocketImpl.cpp |  4 +--
 .../src/SFML/Network/Win32/SocketImpl.cpp     |  2 +-
 .../sfml/src/SFML/System/Android/Activity.cpp |  2 +-
 .../sfml/src/SFML/System/Android/Activity.hpp |  6 ++--
 .../SFML/System/Android/NativeActivity.cpp    |  4 +--
 .../SFML/System/Android/ResourceStream.cpp    |  4 +--
 .../SFML/System/Android/ResourceStream.hpp    |  4 +--
 .../SFML/System/Android/SuspendAwareClock.cpp |  2 +-
 .../sfml/src/SFML/System/CMakeLists.txt       |  3 +-
 third_party/sfml/src/SFML/System/Clock.cpp    |  4 +--
 third_party/sfml/src/SFML/System/Err.cpp      |  2 +-
 .../sfml/src/SFML/System/FileInputStream.cpp  | 12 ++++----
 .../src/SFML/System/MemoryInputStream.cpp     |  4 +--
 third_party/sfml/src/SFML/System/Sleep.cpp    |  8 +++---
 third_party/sfml/src/SFML/System/String.cpp   |  4 +--
 .../sfml/src/SFML/System/Unix/SleepImpl.cpp   |  4 +--
 .../sfml/src/SFML/System/Unix/SleepImpl.hpp   |  2 +-
 third_party/sfml/src/SFML/System/Utils.cpp    |  2 +-
 third_party/sfml/src/SFML/System/Utils.hpp    |  2 +-
 third_party/sfml/src/SFML/System/Vector2.cpp  |  2 +-
 third_party/sfml/src/SFML/System/Vector3.cpp  |  2 +-
 .../sfml/src/SFML/System/Win32/SleepImpl.cpp  |  6 ++--
 .../sfml/src/SFML/System/Win32/SleepImpl.hpp  |  2 +-
 72 files changed, 172 insertions(+), 173 deletions(-)

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index f24df861..9042f246 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -120,9 +120,7 @@ if(ENABLE_LINK)
         gba/gbaLink.h
     )
 
-    target_include_directories(vbam-core
-        PRIVATE ${SFML_INCLUDE_DIR}
-    )
+    target_include_directories(vbam-core PRIVATE ${SFML_INCLUDE_DIR} ${SFML_INCLUDE_DIR}/SFML/Network ${SFML_INCLUDE_DIR}/SFML/System)
 
     target_link_libraries(vbam-core
         PRIVATE ${SFML_LIBRARIES}
diff --git a/src/core/gba/gbaLink.cpp b/src/core/gba/gbaLink.cpp
index de873a97..584411c8 100644
--- a/src/core/gba/gbaLink.cpp
+++ b/src/core/gba/gbaLink.cpp
@@ -26,7 +26,7 @@
 #include <cstring>
 #include <string>
 
-#include "SFML/Network.hpp"
+#include "../../../third_party/sfml/include/SFML/Network.hpp"
 
 #include <libintl.h>
 #define _(x) gettext(x)
diff --git a/src/core/gba/internal/gbaSockClient.h b/src/core/gba/internal/gbaSockClient.h
index 42b966ba..68c7e847 100644
--- a/src/core/gba/internal/gbaSockClient.h
+++ b/src/core/gba/internal/gbaSockClient.h
@@ -7,7 +7,7 @@
 
 #include <cstdint>
 
-#include "SFML/Network.hpp"
+#include "../../../../third_party/sfml/include/SFML/Network.hpp"
 
 class GBASockClient {
 public:
diff --git a/third_party/sfml/include/SFML/Network.hpp b/third_party/sfml/include/SFML/Network.hpp
index ff4990f0..66ccc3bc 100644
--- a/third_party/sfml/include/SFML/Network.hpp
+++ b/third_party/sfml/include/SFML/Network.hpp
@@ -28,18 +28,18 @@
 // Headers
 ////////////////////////////////////////////////////////////
 
-#include <SFML/Network/Ftp.hpp>
-#include <SFML/Network/Http.hpp>
-#include <SFML/Network/IpAddress.hpp>
-#include <SFML/Network/Packet.hpp>
-#include <SFML/Network/Socket.hpp>
-#include <SFML/Network/SocketHandle.hpp>
-#include <SFML/Network/SocketSelector.hpp>
-#include <SFML/Network/TcpListener.hpp>
-#include <SFML/Network/TcpSocket.hpp>
-#include <SFML/Network/UdpSocket.hpp>
+#include "../../SFML/Network/Ftp.hpp"
+#include "../../SFML/Network/Http.hpp"
+#include "../../SFML/Network/IpAddress.hpp"
+#include "../../SFML/Network/Packet.hpp"
+#include "../../SFML/Network/Socket.hpp"
+#include "../../SFML/Network/SocketHandle.hpp"
+#include "../../SFML/Network/SocketSelector.hpp"
+#include "../../SFML/Network/TcpListener.hpp"
+#include "../../SFML/Network/TcpSocket.hpp"
+#include "../../SFML/Network/UdpSocket.hpp"
 
-#include <SFML/System.hpp>
+#include "../../SFML/System.hpp"
 
 
 ////////////////////////////////////////////////////////////
diff --git a/third_party/sfml/include/SFML/Network/Export.hpp b/third_party/sfml/include/SFML/Network/Export.hpp
index edcc6e55..9b151ba4 100644
--- a/third_party/sfml/include/SFML/Network/Export.hpp
+++ b/third_party/sfml/include/SFML/Network/Export.hpp
@@ -27,7 +27,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Config.hpp>
+#include "../../SFML/Config.hpp"
 
 
 ////////////////////////////////////////////////////////////
diff --git a/third_party/sfml/include/SFML/Network/Ftp.hpp b/third_party/sfml/include/SFML/Network/Ftp.hpp
index 23d70d3b..2c61eef7 100644
--- a/third_party/sfml/include/SFML/Network/Ftp.hpp
+++ b/third_party/sfml/include/SFML/Network/Ftp.hpp
@@ -27,11 +27,11 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Network/Export.hpp>
+#include "../../SFML/Network/Export.hpp"
 
-#include <SFML/Network/TcpSocket.hpp>
+#include "../../SFML/Network/TcpSocket.hpp"
 
-#include <SFML/System/Time.hpp>
+#include "../../SFML/System/Time.hpp"
 
 #include "filesystem.hpp"
 #include <string>
diff --git a/third_party/sfml/include/SFML/Network/Http.hpp b/third_party/sfml/include/SFML/Network/Http.hpp
index ca26f292..af244846 100644
--- a/third_party/sfml/include/SFML/Network/Http.hpp
+++ b/third_party/sfml/include/SFML/Network/Http.hpp
@@ -27,12 +27,12 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Network/Export.hpp>
+#include "../../SFML/Network/Export.hpp"
 
-#include <SFML/Network/IpAddress.hpp>
-#include <SFML/Network/TcpSocket.hpp>
+#include "../../SFML/Network/IpAddress.hpp"
+#include "../../SFML/Network/TcpSocket.hpp"
 
-#include <SFML/System/Time.hpp>
+#include "../../SFML/System/Time.hpp"
 
 #include <iosfwd>
 #include <map>
diff --git a/third_party/sfml/include/SFML/Network/IpAddress.hpp b/third_party/sfml/include/SFML/Network/IpAddress.hpp
index 3f3da53e..421b395e 100644
--- a/third_party/sfml/include/SFML/Network/IpAddress.hpp
+++ b/third_party/sfml/include/SFML/Network/IpAddress.hpp
@@ -27,9 +27,9 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Network/Export.hpp>
+#include "../../SFML/Network/Export.hpp"
 
-#include <SFML/System/Time.hpp>
+#include "../../SFML/System/Time.hpp"
 
 #include <iosfwd>
 #include "optional.hpp"
diff --git a/third_party/sfml/include/SFML/Network/Packet.hpp b/third_party/sfml/include/SFML/Network/Packet.hpp
index aba1a32d..3e4bbb25 100644
--- a/third_party/sfml/include/SFML/Network/Packet.hpp
+++ b/third_party/sfml/include/SFML/Network/Packet.hpp
@@ -27,7 +27,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Network/Export.hpp>
+#include "../../SFML/Network/Export.hpp"
 
 #include <string>
 #include <vector>
diff --git a/third_party/sfml/include/SFML/Network/Socket.hpp b/third_party/sfml/include/SFML/Network/Socket.hpp
index 2b7b79fa..fe8ada57 100644
--- a/third_party/sfml/include/SFML/Network/Socket.hpp
+++ b/third_party/sfml/include/SFML/Network/Socket.hpp
@@ -27,9 +27,9 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Network/Export.hpp>
+#include "../../SFML/Network/Export.hpp"
 
-#include <SFML/Network/SocketHandle.hpp>
+#include "../../SFML/Network/SocketHandle.hpp"
 
 
 namespace sf
diff --git a/third_party/sfml/include/SFML/Network/SocketHandle.hpp b/third_party/sfml/include/SFML/Network/SocketHandle.hpp
index 70250693..4afd046c 100644
--- a/third_party/sfml/include/SFML/Network/SocketHandle.hpp
+++ b/third_party/sfml/include/SFML/Network/SocketHandle.hpp
@@ -27,7 +27,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Config.hpp>
+#include "../../SFML/Config.hpp"
 
 #if defined(SFML_SYSTEM_WINDOWS)
 #include <basetsd.h>
diff --git a/third_party/sfml/include/SFML/Network/SocketSelector.hpp b/third_party/sfml/include/SFML/Network/SocketSelector.hpp
index ac80a870..b8f9a927 100644
--- a/third_party/sfml/include/SFML/Network/SocketSelector.hpp
+++ b/third_party/sfml/include/SFML/Network/SocketSelector.hpp
@@ -27,9 +27,9 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Network/Export.hpp>
+#include "../../SFML/Network/Export.hpp"
 
-#include <SFML/System/Time.hpp>
+#include "../../SFML/System/Time.hpp"
 
 #include <memory>
 
diff --git a/third_party/sfml/include/SFML/Network/TcpListener.hpp b/third_party/sfml/include/SFML/Network/TcpListener.hpp
index 54cd6e60..3d4435bd 100644
--- a/third_party/sfml/include/SFML/Network/TcpListener.hpp
+++ b/third_party/sfml/include/SFML/Network/TcpListener.hpp
@@ -27,10 +27,10 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Network/Export.hpp>
+#include "../../SFML/Network/Export.hpp"
 
-#include <SFML/Network/IpAddress.hpp>
-#include <SFML/Network/Socket.hpp>
+#include "../../SFML/Network/IpAddress.hpp"
+#include "../../SFML/Network/Socket.hpp"
 
 
 namespace sf
diff --git a/third_party/sfml/include/SFML/Network/TcpSocket.hpp b/third_party/sfml/include/SFML/Network/TcpSocket.hpp
index 7b0d563f..43b6de67 100644
--- a/third_party/sfml/include/SFML/Network/TcpSocket.hpp
+++ b/third_party/sfml/include/SFML/Network/TcpSocket.hpp
@@ -27,11 +27,11 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Network/Export.hpp>
+#include "../../SFML/Network/Export.hpp"
 
-#include <SFML/Network/Socket.hpp>
+#include "../../SFML/Network/Socket.hpp"
 
-#include <SFML/System/Time.hpp>
+#include "../../SFML/System/Time.hpp"
 
 #include "optional.hpp"
 #include <vector>
diff --git a/third_party/sfml/include/SFML/Network/UdpSocket.hpp b/third_party/sfml/include/SFML/Network/UdpSocket.hpp
index 1a93a14f..ef12622d 100644
--- a/third_party/sfml/include/SFML/Network/UdpSocket.hpp
+++ b/third_party/sfml/include/SFML/Network/UdpSocket.hpp
@@ -27,10 +27,10 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Network/Export.hpp>
+#include "../../SFML/Network/Export.hpp"
 
-#include <SFML/Network/IpAddress.hpp>
-#include <SFML/Network/Socket.hpp>
+#include "../../SFML/Network/IpAddress.hpp"
+#include "../../SFML/Network/Socket.hpp"
 
 #include <optional.hpp>
 #include <vector>
diff --git a/third_party/sfml/include/SFML/System.hpp b/third_party/sfml/include/SFML/System.hpp
index 36599db6..55c72dda 100644
--- a/third_party/sfml/include/SFML/System.hpp
+++ b/third_party/sfml/include/SFML/System.hpp
@@ -28,21 +28,21 @@
 // Headers
 ////////////////////////////////////////////////////////////
 
-#include <SFML/Config.hpp>
+#include "../../SFML/Config.hpp"
 
-#include <SFML/System/Angle.hpp>
-#include <SFML/System/Clock.hpp>
-#include <SFML/System/Err.hpp>
-#include <SFML/System/Exception.hpp>
-#include <SFML/System/FileInputStream.hpp>
-#include <SFML/System/InputStream.hpp>
-#include <SFML/System/MemoryInputStream.hpp>
-#include <SFML/System/Sleep.hpp>
-#include <SFML/System/String.hpp>
-#include <SFML/System/Time.hpp>
-#include <SFML/System/Utf.hpp>
-#include <SFML/System/Vector2.hpp>
-#include <SFML/System/Vector3.hpp>
+#include "../../SFML/System/Angle.hpp"
+#include "../../SFML/System/Clock.hpp"
+#include "../../SFML/System/Err.hpp"
+#include "../../SFML/System/Exception.hpp"
+#include "../../SFML/System/FileInputStream.hpp"
+#include "../../SFML/System/InputStream.hpp"
+#include "../../SFML/System/MemoryInputStream.hpp"
+#include "../../SFML/System/Sleep.hpp"
+#include "../../SFML/System/String.hpp"
+#include "../../SFML/System/Time.hpp"
+#include "../../SFML/System/Utf.hpp"
+#include "../../SFML/System/Vector2.hpp"
+#include "../../SFML/System/Vector3.hpp"
 
 
 ////////////////////////////////////////////////////////////
diff --git a/third_party/sfml/include/SFML/System/Angle.hpp b/third_party/sfml/include/SFML/System/Angle.hpp
index 09d88761..573f16b0 100644
--- a/third_party/sfml/include/SFML/System/Angle.hpp
+++ b/third_party/sfml/include/SFML/System/Angle.hpp
@@ -472,7 +472,7 @@ namespace Literals
 } // namespace Literals
 } // namespace sf
 
-#include <SFML/System/Angle.inl>
+#include "../../SFML/System/Angle.inl"
 
 
 ////////////////////////////////////////////////////////////
diff --git a/third_party/sfml/include/SFML/System/Angle.inl b/third_party/sfml/include/SFML/System/Angle.inl
index a3cf6794..ab17b1ee 100644
--- a/third_party/sfml/include/SFML/System/Angle.inl
+++ b/third_party/sfml/include/SFML/System/Angle.inl
@@ -25,7 +25,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Angle.hpp> // NOLINT(misc-header-include-cycle)
+#include "../../SFML/System/Angle.hpp" // NOLINT(misc-header-include-cycle)
 
 #include <cassert>
 
diff --git a/third_party/sfml/include/SFML/System/Clock.hpp b/third_party/sfml/include/SFML/System/Clock.hpp
index 8ecadb17..05864c21 100644
--- a/third_party/sfml/include/SFML/System/Clock.hpp
+++ b/third_party/sfml/include/SFML/System/Clock.hpp
@@ -27,14 +27,14 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Export.hpp>
+#include "../../SFML/System/Export.hpp"
 
 #include <chrono>
 #include <ratio>
 #include <type_traits>
 
 #ifdef SFML_SYSTEM_ANDROID
-#include <SFML/System/SuspendAwareClock.hpp>
+#include "../../SFML/System/SuspendAwareClock.hpp"
 #endif
 
 
diff --git a/third_party/sfml/include/SFML/System/Err.hpp b/third_party/sfml/include/SFML/System/Err.hpp
index ea59da44..4fd43f22 100644
--- a/third_party/sfml/include/SFML/System/Err.hpp
+++ b/third_party/sfml/include/SFML/System/Err.hpp
@@ -27,7 +27,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Export.hpp>
+#include "../../SFML/System/Export.hpp"
 
 #include <iosfwd>
 
diff --git a/third_party/sfml/include/SFML/System/Exception.hpp b/third_party/sfml/include/SFML/System/Exception.hpp
index bee07e46..749c6a05 100644
--- a/third_party/sfml/include/SFML/System/Exception.hpp
+++ b/third_party/sfml/include/SFML/System/Exception.hpp
@@ -27,7 +27,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Export.hpp>
+#include "../../SFML/System/Export.hpp"
 
 #include <stdexcept>
 
diff --git a/third_party/sfml/include/SFML/System/Export.hpp b/third_party/sfml/include/SFML/System/Export.hpp
index 2362d3a2..6f950d57 100644
--- a/third_party/sfml/include/SFML/System/Export.hpp
+++ b/third_party/sfml/include/SFML/System/Export.hpp
@@ -27,7 +27,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Config.hpp>
+#include "../../SFML/Config.hpp"
 
 
 ////////////////////////////////////////////////////////////
diff --git a/third_party/sfml/include/SFML/System/FileInputStream.hpp b/third_party/sfml/include/SFML/System/FileInputStream.hpp
index 86aadda0..ee44f455 100644
--- a/third_party/sfml/include/SFML/System/FileInputStream.hpp
+++ b/third_party/sfml/include/SFML/System/FileInputStream.hpp
@@ -27,11 +27,11 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Config.hpp>
+#include "../../SFML/Config.hpp"
 
-#include <SFML/System/Export.hpp>
+#include "../../SFML/System/Export.hpp"
 
-#include <SFML/System/InputStream.hpp>
+#include "../../SFML/System/InputStream.hpp"
 
 #include "filesystem.hpp"
 #include <memory>
@@ -39,6 +39,8 @@
 #include <cstdint>
 #include <cstdio>
 
+#include "optional.hpp"
+
 #ifdef SFML_SYSTEM_ANDROID
 namespace sf
 {
diff --git a/third_party/sfml/include/SFML/System/InputStream.hpp b/third_party/sfml/include/SFML/System/InputStream.hpp
index 1bc2b177..8e9c2a8e 100644
--- a/third_party/sfml/include/SFML/System/InputStream.hpp
+++ b/third_party/sfml/include/SFML/System/InputStream.hpp
@@ -27,9 +27,9 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Config.hpp>
+#include "../../SFML/Config.hpp"
 
-#include <SFML/System/Export.hpp>
+#include "../../SFML/System/Export.hpp"
 
 #include "optional.hpp"
 
diff --git a/third_party/sfml/include/SFML/System/MemoryInputStream.hpp b/third_party/sfml/include/SFML/System/MemoryInputStream.hpp
index 3726e017..b6edb2b9 100644
--- a/third_party/sfml/include/SFML/System/MemoryInputStream.hpp
+++ b/third_party/sfml/include/SFML/System/MemoryInputStream.hpp
@@ -27,15 +27,16 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Config.hpp>
+#include "../../SFML/Config.hpp"
 
-#include <SFML/System/Export.hpp>
+#include "../../SFML/System/Export.hpp"
 
-#include <SFML/System/InputStream.hpp>
+#include "../../SFML/System/InputStream.hpp"
 
 #include <cstddef>
 #include <cstdint>
 
+#include "optional.hpp"
 
 namespace sf
 {
diff --git a/third_party/sfml/include/SFML/System/NativeActivity.hpp b/third_party/sfml/include/SFML/System/NativeActivity.hpp
index 207f4682..ad0438dd 100644
--- a/third_party/sfml/include/SFML/System/NativeActivity.hpp
+++ b/third_party/sfml/include/SFML/System/NativeActivity.hpp
@@ -28,7 +28,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Export.hpp>
+#include "../../SFML/System/Export.hpp"
 
 
 #if !defined(SFML_SYSTEM_ANDROID)
diff --git a/third_party/sfml/include/SFML/System/Sleep.hpp b/third_party/sfml/include/SFML/System/Sleep.hpp
index 7aaa0ab9..b13a64ee 100644
--- a/third_party/sfml/include/SFML/System/Sleep.hpp
+++ b/third_party/sfml/include/SFML/System/Sleep.hpp
@@ -27,7 +27,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Export.hpp>
+#include "../../SFML/System/Export.hpp"
 
 
 namespace sf
diff --git a/third_party/sfml/include/SFML/System/String.hpp b/third_party/sfml/include/SFML/System/String.hpp
index a13503f5..95378cf2 100644
--- a/third_party/sfml/include/SFML/System/String.hpp
+++ b/third_party/sfml/include/SFML/System/String.hpp
@@ -27,9 +27,9 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Export.hpp>
+#include "../../SFML/System/Export.hpp"
 
-#include <SFML/System/Utf.hpp>
+#include "../../SFML/System/Utf.hpp"
 
 #include <locale>
 #include <string>
@@ -647,7 +647,7 @@ private:
 
 } // namespace sf
 
-#include <SFML/System/String.inl>
+#include "../../SFML/System/String.inl"
 
 
 ////////////////////////////////////////////////////////////
diff --git a/third_party/sfml/include/SFML/System/String.inl b/third_party/sfml/include/SFML/System/String.inl
index eb22d989..e1658c33 100644
--- a/third_party/sfml/include/SFML/System/String.inl
+++ b/third_party/sfml/include/SFML/System/String.inl
@@ -25,7 +25,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/String.hpp> // NOLINT(misc-header-include-cycle)
+#include "../../SFML/System/String.hpp" // NOLINT(misc-header-include-cycle)
 
 #include <iterator>
 
diff --git a/third_party/sfml/include/SFML/System/SuspendAwareClock.hpp b/third_party/sfml/include/SFML/System/SuspendAwareClock.hpp
index 4a1cfd29..1dbbd62c 100644
--- a/third_party/sfml/include/SFML/System/SuspendAwareClock.hpp
+++ b/third_party/sfml/include/SFML/System/SuspendAwareClock.hpp
@@ -28,7 +28,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Export.hpp>
+#include "../../SFML/System/Export.hpp"
 
 #include <chrono>
 
diff --git a/third_party/sfml/include/SFML/System/Time.hpp b/third_party/sfml/include/SFML/System/Time.hpp
index bca73834..db16fc44 100644
--- a/third_party/sfml/include/SFML/System/Time.hpp
+++ b/third_party/sfml/include/SFML/System/Time.hpp
@@ -444,7 +444,7 @@ constexpr Time& operator%=(Time& left, Time right);
 
 } // namespace sf
 
-#include <SFML/System/Time.inl>
+#include "../../SFML/System/Time.inl"
 
 
 ////////////////////////////////////////////////////////////
diff --git a/third_party/sfml/include/SFML/System/Time.inl b/third_party/sfml/include/SFML/System/Time.inl
index 9f75783b..5be3a3c6 100644
--- a/third_party/sfml/include/SFML/System/Time.inl
+++ b/third_party/sfml/include/SFML/System/Time.inl
@@ -25,7 +25,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Time.hpp> // NOLINT(misc-header-include-cycle)
+#include "../../SFML/System/Time.hpp" // NOLINT(misc-header-include-cycle)
 
 #include <ratio>
 
diff --git a/third_party/sfml/include/SFML/System/Utf.hpp b/third_party/sfml/include/SFML/System/Utf.hpp
index 6e5edb20..553bd8bc 100644
--- a/third_party/sfml/include/SFML/System/Utf.hpp
+++ b/third_party/sfml/include/SFML/System/Utf.hpp
@@ -27,7 +27,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Config.hpp>
+#include "../../SFML/Config.hpp"
 
 #include <array>
 #include <locale>
@@ -733,7 +733,7 @@ using Utf32 = Utf<32>;
 
 } // namespace sf
 
-#include <SFML/System/Utf.inl>
+#include "../../SFML/System/Utf.inl"
 
 
 ////////////////////////////////////////////////////////////
diff --git a/third_party/sfml/include/SFML/System/Utf.inl b/third_party/sfml/include/SFML/System/Utf.inl
index 5657be9e..adf31259 100644
--- a/third_party/sfml/include/SFML/System/Utf.inl
+++ b/third_party/sfml/include/SFML/System/Utf.inl
@@ -25,7 +25,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Utf.hpp> // NOLINT(misc-header-include-cycle)
+#include "../../SFML/System/Utf.hpp" // NOLINT(misc-header-include-cycle)
 
 #include <iterator>
 
diff --git a/third_party/sfml/include/SFML/System/Vector2.hpp b/third_party/sfml/include/SFML/System/Vector2.hpp
index f71d41b6..c61a0e24 100644
--- a/third_party/sfml/include/SFML/System/Vector2.hpp
+++ b/third_party/sfml/include/SFML/System/Vector2.hpp
@@ -24,9 +24,9 @@
 
 #pragma once
 
-#include <SFML/System/Export.hpp>
+#include "../../SFML/System/Export.hpp"
 
-#include <SFML/System/Angle.hpp>
+#include "../../SFML/System/Angle.hpp"
 
 
 namespace sf
@@ -382,7 +382,7 @@ template <typename T>
 
 } // namespace sf
 
-#include <SFML/System/Vector2.inl>
+#include "../../SFML/System/Vector2.inl"
 
 
 ////////////////////////////////////////////////////////////
diff --git a/third_party/sfml/include/SFML/System/Vector2.inl b/third_party/sfml/include/SFML/System/Vector2.inl
index 6a0ce697..e882abab 100644
--- a/third_party/sfml/include/SFML/System/Vector2.inl
+++ b/third_party/sfml/include/SFML/System/Vector2.inl
@@ -25,7 +25,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Vector2.hpp> // NOLINT(misc-header-include-cycle)
+#include "../../SFML/System/Vector2.hpp" // NOLINT(misc-header-include-cycle)
 
 #include <cassert>
 
diff --git a/third_party/sfml/include/SFML/System/Vector3.hpp b/third_party/sfml/include/SFML/System/Vector3.hpp
index 8fa5308f..e23c6350 100644
--- a/third_party/sfml/include/SFML/System/Vector3.hpp
+++ b/third_party/sfml/include/SFML/System/Vector3.hpp
@@ -24,7 +24,7 @@
 
 #pragma once
 
-#include <SFML/System/Export.hpp>
+#include "../../SFML/System/Export.hpp"
 
 
 namespace sf
@@ -307,7 +307,7 @@ using Vector3f = Vector3<float>;
 
 } // namespace sf
 
-#include <SFML/System/Vector3.inl>
+#include "../../SFML/System/Vector3.inl"
 
 
 ////////////////////////////////////////////////////////////
diff --git a/third_party/sfml/include/SFML/System/Vector3.inl b/third_party/sfml/include/SFML/System/Vector3.inl
index e24b9a8f..9eb9322e 100644
--- a/third_party/sfml/include/SFML/System/Vector3.inl
+++ b/third_party/sfml/include/SFML/System/Vector3.inl
@@ -25,7 +25,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Vector3.hpp> // NOLINT(misc-header-include-cycle)
+#include "../../SFML/System/Vector3.hpp" // NOLINT(misc-header-include-cycle)
 
 #include <cassert>
 
diff --git a/third_party/sfml/src/SFML/Network/CMakeLists.txt b/third_party/sfml/src/SFML/Network/CMakeLists.txt
index 4b378230..333a21d8 100644
--- a/third_party/sfml/src/SFML/Network/CMakeLists.txt
+++ b/third_party/sfml/src/SFML/Network/CMakeLists.txt
@@ -47,7 +47,8 @@ source_group("" FILES ${SRC})
 # define the sfml-network target
 add_library(sfml-network ${SRC})
 
-target_include_directories(sfml-network SYSTEM BEFORE PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../.. ${CMAKE_CURRENT_SOURCE_DIR}/../../../include)
+target_include_directories(sfml-network SYSTEM BEFORE PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../../include)
+target_include_directories(sfml-network PRIVATE              ${CMAKE_CURRENT_SOURCE_DIR}/../..)
 
 target_compile_definitions(sfml-network PRIVATE   SFML_STATIC)
 target_compile_definitions(sfml-network INTERFACE SFML_STATIC)
diff --git a/third_party/sfml/src/SFML/Network/Ftp.cpp b/third_party/sfml/src/SFML/Network/Ftp.cpp
index 9aa82084..46ca42b6 100644
--- a/third_party/sfml/src/SFML/Network/Ftp.cpp
+++ b/third_party/sfml/src/SFML/Network/Ftp.cpp
@@ -25,10 +25,10 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Network/Ftp.hpp>
-#include <SFML/Network/IpAddress.hpp>
+#include "../../../include/SFML/Network/Ftp.hpp"
+#include "../../../include/SFML/Network/IpAddress.hpp"
 
-#include <SFML/System/Err.hpp>
+#include "../../../include/SFML/System/Err.hpp"
 
 #include <algorithm>
 #include <array>
diff --git a/third_party/sfml/src/SFML/Network/Http.cpp b/third_party/sfml/src/SFML/Network/Http.cpp
index c2e6e720..11eecb69 100644
--- a/third_party/sfml/src/SFML/Network/Http.cpp
+++ b/third_party/sfml/src/SFML/Network/Http.cpp
@@ -25,10 +25,10 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Network/Http.hpp>
+#include "../../../include/SFML/Network/Http.hpp"
 
-#include <SFML/System/Err.hpp>
-#include <SFML/System/Utils.hpp>
+#include "../../../include/SFML/System/Err.hpp"
+#include "../../SFML/System/Utils.hpp"
 
 #include <algorithm>
 #include <array>
diff --git a/third_party/sfml/src/SFML/Network/IpAddress.cpp b/third_party/sfml/src/SFML/Network/IpAddress.cpp
index a278389a..825824be 100644
--- a/third_party/sfml/src/SFML/Network/IpAddress.cpp
+++ b/third_party/sfml/src/SFML/Network/IpAddress.cpp
@@ -25,11 +25,11 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Network/Http.hpp>
-#include <SFML/Network/IpAddress.hpp>
-#include <SFML/Network/SocketImpl.hpp>
+#include "../../../include/SFML/Network/Http.hpp"
+#include "../../../include/SFML/Network/IpAddress.hpp"
+#include "../../SFML/Network/SocketImpl.hpp"
 
-#include <SFML/System/Err.hpp>
+#include "../../../include/SFML/System/Err.hpp"
 
 #include <istream>
 #include <ostream>
diff --git a/third_party/sfml/src/SFML/Network/Packet.cpp b/third_party/sfml/src/SFML/Network/Packet.cpp
index 99d9e9b7..a30976e1 100644
--- a/third_party/sfml/src/SFML/Network/Packet.cpp
+++ b/third_party/sfml/src/SFML/Network/Packet.cpp
@@ -25,11 +25,11 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Network/Packet.hpp>
-#include <SFML/Network/SocketImpl.hpp>
+#include "../../../include/SFML/Network/Packet.hpp"
+#include "../../SFML/Network/SocketImpl.hpp"
 
-#include <SFML/System/String.hpp>
-#include <SFML/System/Utils.hpp>
+#include "../../../include/SFML/System/String.hpp"
+#include "../../SFML/System/Utils.hpp"
 
 #include <array>
 
diff --git a/third_party/sfml/src/SFML/Network/Socket.cpp b/third_party/sfml/src/SFML/Network/Socket.cpp
index bfa3c590..0f8e5af5 100644
--- a/third_party/sfml/src/SFML/Network/Socket.cpp
+++ b/third_party/sfml/src/SFML/Network/Socket.cpp
@@ -25,10 +25,10 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Network/Socket.hpp>
-#include <SFML/Network/SocketImpl.hpp>
+#include "../../../include/SFML/Network/Socket.hpp"
+#include "../../SFML/Network/SocketImpl.hpp"
 
-#include <SFML/System/Err.hpp>
+#include "../../../include/SFML/System/Err.hpp"
 
 #include <ostream>
 #include <utility>
diff --git a/third_party/sfml/src/SFML/Network/SocketImpl.hpp b/third_party/sfml/src/SFML/Network/SocketImpl.hpp
index 2d7986f8..6fd1a164 100644
--- a/third_party/sfml/src/SFML/Network/SocketImpl.hpp
+++ b/third_party/sfml/src/SFML/Network/SocketImpl.hpp
@@ -27,12 +27,12 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Network/Socket.hpp>
-#include <SFML/Network/SocketHandle.hpp>
+#include "../../../include/SFML/Network/Socket.hpp"
+#include "../../../include/SFML/Network/SocketHandle.hpp"
 
 #if defined(SFML_SYSTEM_WINDOWS)
 
-#include <SFML/System/Win32/WindowsHeader.hpp>
+#include "../../../include/SFML/System/Win32/WindowsHeader.hpp"
 
 #include <winsock2.h>
 #include <ws2tcpip.h>
diff --git a/third_party/sfml/src/SFML/Network/SocketSelector.cpp b/third_party/sfml/src/SFML/Network/SocketSelector.cpp
index 093d74e6..ef51a80e 100644
--- a/third_party/sfml/src/SFML/Network/SocketSelector.cpp
+++ b/third_party/sfml/src/SFML/Network/SocketSelector.cpp
@@ -25,11 +25,11 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Network/Socket.hpp>
-#include <SFML/Network/SocketImpl.hpp>
-#include <SFML/Network/SocketSelector.hpp>
+#include "../../../include/SFML/Network/Socket.hpp"
+#include "../../SFML/Network/SocketImpl.hpp"
+#include "../../../include/SFML/Network/SocketSelector.hpp"
 
-#include <SFML/System/Err.hpp>
+#include "../../../include/SFML/System/Err.hpp"
 
 #include <algorithm>
 #include <memory>
diff --git a/third_party/sfml/src/SFML/Network/TcpListener.cpp b/third_party/sfml/src/SFML/Network/TcpListener.cpp
index 3136353d..175fdc99 100644
--- a/third_party/sfml/src/SFML/Network/TcpListener.cpp
+++ b/third_party/sfml/src/SFML/Network/TcpListener.cpp
@@ -25,11 +25,11 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Network/SocketImpl.hpp>
-#include <SFML/Network/TcpListener.hpp>
-#include <SFML/Network/TcpSocket.hpp>
+#include "../../SFML/Network/SocketImpl.hpp"
+#include "../../../include/SFML/Network/TcpListener.hpp"
+#include "../../../include/SFML/Network/TcpSocket.hpp"
 
-#include <SFML/System/Err.hpp>
+#include "../../../include/SFML/System/Err.hpp"
 
 #include <ostream>
 
diff --git a/third_party/sfml/src/SFML/Network/TcpSocket.cpp b/third_party/sfml/src/SFML/Network/TcpSocket.cpp
index 78e883c4..be475070 100644
--- a/third_party/sfml/src/SFML/Network/TcpSocket.cpp
+++ b/third_party/sfml/src/SFML/Network/TcpSocket.cpp
@@ -25,12 +25,12 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Network/IpAddress.hpp>
-#include <SFML/Network/Packet.hpp>
-#include <SFML/Network/SocketImpl.hpp>
-#include <SFML/Network/TcpSocket.hpp>
+#include "../../../include/SFML/Network/IpAddress.hpp"
+#include "../../../include/SFML/Network/Packet.hpp"
+#include "../../SFML/Network/SocketImpl.hpp"
+#include "../../../include/SFML/Network/TcpSocket.hpp"
 
-#include <SFML/System/Err.hpp>
+#include "../../../include/SFML/System/Err.hpp"
 
 #include <algorithm>
 #include <array>
diff --git a/third_party/sfml/src/SFML/Network/UdpSocket.cpp b/third_party/sfml/src/SFML/Network/UdpSocket.cpp
index 06700706..03ff31f9 100644
--- a/third_party/sfml/src/SFML/Network/UdpSocket.cpp
+++ b/third_party/sfml/src/SFML/Network/UdpSocket.cpp
@@ -25,12 +25,12 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Network/IpAddress.hpp>
-#include <SFML/Network/Packet.hpp>
-#include <SFML/Network/SocketImpl.hpp>
-#include <SFML/Network/UdpSocket.hpp>
+#include "../../../include/SFML/Network/IpAddress.hpp"
+#include "../../../include/SFML/Network/Packet.hpp"
+#include "../../SFML/Network/SocketImpl.hpp"
+#include "../../../include/SFML/Network/UdpSocket.hpp"
 
-#include <SFML/System/Err.hpp>
+#include "../../../include/SFML/System/Err.hpp"
 
 #include <ostream>
 
diff --git a/third_party/sfml/src/SFML/Network/Unix/SocketImpl.cpp b/third_party/sfml/src/SFML/Network/Unix/SocketImpl.cpp
index afb99a4c..5a0f8202 100644
--- a/third_party/sfml/src/SFML/Network/Unix/SocketImpl.cpp
+++ b/third_party/sfml/src/SFML/Network/Unix/SocketImpl.cpp
@@ -25,9 +25,9 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Network/SocketImpl.hpp>
+#include "../SocketImpl.hpp"
 
-#include <SFML/System/Err.hpp>
+#include "../../../../include/SFML/System/Err.hpp"
 
 #include <fcntl.h>
 #include <ostream>
diff --git a/third_party/sfml/src/SFML/Network/Win32/SocketImpl.cpp b/third_party/sfml/src/SFML/Network/Win32/SocketImpl.cpp
index c2bfdc6f..0a12b39c 100644
--- a/third_party/sfml/src/SFML/Network/Win32/SocketImpl.cpp
+++ b/third_party/sfml/src/SFML/Network/Win32/SocketImpl.cpp
@@ -25,7 +25,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Network/SocketImpl.hpp>
+#include "../../SFML/Network/SocketImpl.hpp"
 
 #include <cstdint>
 
diff --git a/third_party/sfml/src/SFML/System/Android/Activity.cpp b/third_party/sfml/src/SFML/System/Android/Activity.cpp
index ac6d7318..d4658f1d 100644
--- a/third_party/sfml/src/SFML/System/Android/Activity.cpp
+++ b/third_party/sfml/src/SFML/System/Android/Activity.cpp
@@ -27,7 +27,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Android/Activity.hpp>
+#include "../../../include/SFML/System/Android/Activity.hpp"
 
 #include <android/log.h>
 
diff --git a/third_party/sfml/src/SFML/System/Android/Activity.hpp b/third_party/sfml/src/SFML/System/Android/Activity.hpp
index 2c96c2ec..5c33266d 100644
--- a/third_party/sfml/src/SFML/System/Android/Activity.hpp
+++ b/third_party/sfml/src/SFML/System/Android/Activity.hpp
@@ -27,10 +27,10 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Window/EglContext.hpp>
-#include <SFML/Window/Event.hpp>
+#include "../../../include/SFML/Window/EglContext.hpp"
+#include "../../../include/SFML/Window/Event.hpp"
 
-#include <SFML/System/EnumArray.hpp>
+#include "../../../include/SFML/System/EnumArray.hpp"
 
 #include <android/configuration.h>
 #include <android/native_activity.h>
diff --git a/third_party/sfml/src/SFML/System/Android/NativeActivity.cpp b/third_party/sfml/src/SFML/System/Android/NativeActivity.cpp
index 93f4324d..9342ed94 100644
--- a/third_party/sfml/src/SFML/System/Android/NativeActivity.cpp
+++ b/third_party/sfml/src/SFML/System/Android/NativeActivity.cpp
@@ -25,8 +25,8 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Android/Activity.hpp>
-#include <SFML/System/NativeActivity.hpp>
+#include "../../../include/SFML/System/Android/Activity.hpp"
+#include "../../../include/SFML/System/NativeActivity.hpp"
 
 namespace sf
 {
diff --git a/third_party/sfml/src/SFML/System/Android/ResourceStream.cpp b/third_party/sfml/src/SFML/System/Android/ResourceStream.cpp
index 6fadb54a..5d4b21ab 100644
--- a/third_party/sfml/src/SFML/System/Android/ResourceStream.cpp
+++ b/third_party/sfml/src/SFML/System/Android/ResourceStream.cpp
@@ -26,8 +26,8 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Android/Activity.hpp>
-#include <SFML/System/Android/ResourceStream.hpp>
+#include "../../../include/SFML/System/Android/Activity.hpp"
+#include "../../../include/SFML/System/Android/ResourceStream.hpp"
 
 #include <mutex>
 
diff --git a/third_party/sfml/src/SFML/System/Android/ResourceStream.hpp b/third_party/sfml/src/SFML/System/Android/ResourceStream.hpp
index dce04265..8dcff2b1 100644
--- a/third_party/sfml/src/SFML/System/Android/ResourceStream.hpp
+++ b/third_party/sfml/src/SFML/System/Android/ResourceStream.hpp
@@ -27,9 +27,9 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Export.hpp>
+#include "../../../include/SFML/System/Export.hpp"
 
-#include <SFML/System/InputStream.hpp>
+#include "../../../include/SFML/System/InputStream.hpp"
 
 #include <android/asset_manager.h>
 
diff --git a/third_party/sfml/src/SFML/System/Android/SuspendAwareClock.cpp b/third_party/sfml/src/SFML/System/Android/SuspendAwareClock.cpp
index 10d38390..806f8b73 100644
--- a/third_party/sfml/src/SFML/System/Android/SuspendAwareClock.cpp
+++ b/third_party/sfml/src/SFML/System/Android/SuspendAwareClock.cpp
@@ -25,7 +25,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/SuspendAwareClock.hpp>
+#include "../../../include/SFML/System/SuspendAwareClock.hpp"
 
 #include <ctime>
 
diff --git a/third_party/sfml/src/SFML/System/CMakeLists.txt b/third_party/sfml/src/SFML/System/CMakeLists.txt
index 7c3a873b..52ce7a91 100644
--- a/third_party/sfml/src/SFML/System/CMakeLists.txt
+++ b/third_party/sfml/src/SFML/System/CMakeLists.txt
@@ -73,7 +73,8 @@ endif()
 # define the sfml-system target
 add_library(sfml-system STATIC ${SRC} ${PLATFORM_SRC})
 
-target_include_directories(sfml-system SYSTEM BEFORE PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../.. ${CMAKE_CURRENT_SOURCE_DIR}/../../../include)
+target_include_directories(sfml-system SYSTEM BEFORE PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../../include)
+target_include_directories(sfml-system PRIVATE              ${CMAKE_CURRENT_SOURCE_DIR}/../..)
 
 target_compile_definitions(sfml-system PRIVATE   SFML_STATIC)
 target_compile_definitions(sfml-system INTERFACE SFML_STATIC)
diff --git a/third_party/sfml/src/SFML/System/Clock.cpp b/third_party/sfml/src/SFML/System/Clock.cpp
index a7a573e4..1c9e7f5a 100644
--- a/third_party/sfml/src/SFML/System/Clock.cpp
+++ b/third_party/sfml/src/SFML/System/Clock.cpp
@@ -25,8 +25,8 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Clock.hpp>
-#include <SFML/System/Time.hpp>
+#include "../../../include/SFML/System/Clock.hpp"
+#include "../../../include/SFML/System/Time.hpp"
 
 
 namespace sf
diff --git a/third_party/sfml/src/SFML/System/Err.cpp b/third_party/sfml/src/SFML/System/Err.cpp
index f4136661..e369b248 100644
--- a/third_party/sfml/src/SFML/System/Err.cpp
+++ b/third_party/sfml/src/SFML/System/Err.cpp
@@ -25,7 +25,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Err.hpp>
+#include "../../../include/SFML/System/Err.hpp"
 
 #include <iostream>
 #include <streambuf>
diff --git a/third_party/sfml/src/SFML/System/FileInputStream.cpp b/third_party/sfml/src/SFML/System/FileInputStream.cpp
index 1d476c7d..28dc2eda 100644
--- a/third_party/sfml/src/SFML/System/FileInputStream.cpp
+++ b/third_party/sfml/src/SFML/System/FileInputStream.cpp
@@ -25,19 +25,17 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Exception.hpp>
-#include <SFML/System/FileInputStream.hpp>
-#include <SFML/System/Utils.hpp>
+#include "../../../include/SFML/System/Exception.hpp"
+#include "../../../include/SFML/System/FileInputStream.hpp"
+#include "../../SFML/System/Utils.hpp"
 #ifdef SFML_SYSTEM_ANDROID
-#include <SFML/System/Android/Activity.hpp>
-#include <SFML/System/Android/ResourceStream.hpp>
+#include "../../../include/SFML/System/Android/Activity.hpp"
+#include "../../../include/SFML/System/Android/ResourceStream.hpp"
 #endif
 #include <memory>
 
 #include <cstddef>
 
-#include "optional.hpp"
-
 namespace sf
 {
 ////////////////////////////////////////////////////////////
diff --git a/third_party/sfml/src/SFML/System/MemoryInputStream.cpp b/third_party/sfml/src/SFML/System/MemoryInputStream.cpp
index 4b089bec..65209ab3 100644
--- a/third_party/sfml/src/SFML/System/MemoryInputStream.cpp
+++ b/third_party/sfml/src/SFML/System/MemoryInputStream.cpp
@@ -25,15 +25,13 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/MemoryInputStream.hpp>
+#include "../../../include/SFML/System/MemoryInputStream.hpp"
 
 #include <algorithm>
 
 #include <cstddef>
 #include <cstring>
 
-#include "optional.hpp"
-
 namespace sf
 {
 ////////////////////////////////////////////////////////////
diff --git a/third_party/sfml/src/SFML/System/Sleep.cpp b/third_party/sfml/src/SFML/System/Sleep.cpp
index b2003ff0..155d3b56 100644
--- a/third_party/sfml/src/SFML/System/Sleep.cpp
+++ b/third_party/sfml/src/SFML/System/Sleep.cpp
@@ -25,13 +25,13 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Sleep.hpp>
-#include <SFML/System/Time.hpp>
+#include "../../../include/SFML/System/Sleep.hpp"
+#include "../../../include/SFML/System/Time.hpp"
 
 #if defined(SFML_SYSTEM_WINDOWS)
-#include <SFML/System/Win32/SleepImpl.hpp>
+#include "Win32/SleepImpl.hpp"
 #else
-#include <SFML/System/Unix/SleepImpl.hpp>
+#include "Unix/SleepImpl.hpp"
 #endif
 
 
diff --git a/third_party/sfml/src/SFML/System/String.cpp b/third_party/sfml/src/SFML/System/String.cpp
index a3188d5f..dc124d8d 100644
--- a/third_party/sfml/src/SFML/System/String.cpp
+++ b/third_party/sfml/src/SFML/System/String.cpp
@@ -25,8 +25,8 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/String.hpp>
-#include <SFML/System/Utf.hpp>
+#include "../../../include/SFML/System/String.hpp"
+#include "../../../include/SFML/System/Utf.hpp"
 
 #include <iterator>
 #include <utility>
diff --git a/third_party/sfml/src/SFML/System/Unix/SleepImpl.cpp b/third_party/sfml/src/SFML/System/Unix/SleepImpl.cpp
index 060647fc..79f8896b 100644
--- a/third_party/sfml/src/SFML/System/Unix/SleepImpl.cpp
+++ b/third_party/sfml/src/SFML/System/Unix/SleepImpl.cpp
@@ -25,8 +25,8 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Time.hpp>
-#include <SFML/System/Unix/SleepImpl.hpp>
+#include "../../../../include/SFML/System/Time.hpp"
+#include "SleepImpl.hpp"
 
 #include <cerrno>
 #include <ctime>
diff --git a/third_party/sfml/src/SFML/System/Unix/SleepImpl.hpp b/third_party/sfml/src/SFML/System/Unix/SleepImpl.hpp
index 9b30fc22..bed989d8 100644
--- a/third_party/sfml/src/SFML/System/Unix/SleepImpl.hpp
+++ b/third_party/sfml/src/SFML/System/Unix/SleepImpl.hpp
@@ -27,7 +27,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Config.hpp>
+#include "../../../../include/SFML/Config.hpp"
 
 
 namespace sf
diff --git a/third_party/sfml/src/SFML/System/Utils.cpp b/third_party/sfml/src/SFML/System/Utils.cpp
index 00b8f6e9..18fd7e7b 100644
--- a/third_party/sfml/src/SFML/System/Utils.cpp
+++ b/third_party/sfml/src/SFML/System/Utils.cpp
@@ -25,7 +25,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Utils.hpp>
+#include "../../SFML/System/Utils.hpp"
 
 #include <array>
 #include <sstream>
diff --git a/third_party/sfml/src/SFML/System/Utils.hpp b/third_party/sfml/src/SFML/System/Utils.hpp
index ee2f1ceb..2fe3d4dc 100644
--- a/third_party/sfml/src/SFML/System/Utils.hpp
+++ b/third_party/sfml/src/SFML/System/Utils.hpp
@@ -27,7 +27,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Export.hpp>
+#include "../../../include/SFML/System/Export.hpp"
 
 #include <array>
 #include "filesystem.hpp"
diff --git a/third_party/sfml/src/SFML/System/Vector2.cpp b/third_party/sfml/src/SFML/System/Vector2.cpp
index 5b427fca..bd79dcfa 100644
--- a/third_party/sfml/src/SFML/System/Vector2.cpp
+++ b/third_party/sfml/src/SFML/System/Vector2.cpp
@@ -22,7 +22,7 @@
 //
 ////////////////////////////////////////////////////////////
 
-#include <SFML/System/Vector2.hpp>
+#include "../../../include/SFML/System/Vector2.hpp"
 
 #include <type_traits>
 
diff --git a/third_party/sfml/src/SFML/System/Vector3.cpp b/third_party/sfml/src/SFML/System/Vector3.cpp
index de01b675..971d0743 100644
--- a/third_party/sfml/src/SFML/System/Vector3.cpp
+++ b/third_party/sfml/src/SFML/System/Vector3.cpp
@@ -22,7 +22,7 @@
 //
 ////////////////////////////////////////////////////////////
 
-#include <SFML/System/Vector3.hpp>
+#include "../../../include/SFML/System/Vector3.hpp"
 
 #include <type_traits>
 
diff --git a/third_party/sfml/src/SFML/System/Win32/SleepImpl.cpp b/third_party/sfml/src/SFML/System/Win32/SleepImpl.cpp
index 6db0bc4c..ba01eaef 100644
--- a/third_party/sfml/src/SFML/System/Win32/SleepImpl.cpp
+++ b/third_party/sfml/src/SFML/System/Win32/SleepImpl.cpp
@@ -25,9 +25,9 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/System/Time.hpp>
-#include <SFML/System/Win32/SleepImpl.hpp>
-#include <SFML/System/Win32/WindowsHeader.hpp>
+#include "../../../include/SFML/System/Time.hpp"
+#include "../../../include/SFML/System/Win32/SleepImpl.hpp"
+#include "../../../include/SFML/System/Win32/WindowsHeader.hpp"
 
 #include <mmsystem.h>
 
diff --git a/third_party/sfml/src/SFML/System/Win32/SleepImpl.hpp b/third_party/sfml/src/SFML/System/Win32/SleepImpl.hpp
index 6d1ff703..422da655 100644
--- a/third_party/sfml/src/SFML/System/Win32/SleepImpl.hpp
+++ b/third_party/sfml/src/SFML/System/Win32/SleepImpl.hpp
@@ -27,7 +27,7 @@
 ////////////////////////////////////////////////////////////
 // Headers
 ////////////////////////////////////////////////////////////
-#include <SFML/Config.hpp>
+#include "../../../include/SFML/Config.hpp"
 
 namespace sf
 {