diff --git a/src/3rdParty/FastSignals/docs/bind_weak.md b/src/3rdParty/FastSignals/docs/bind_weak.md
index e9631361da..297b051a71 100644
--- a/src/3rdParty/FastSignals/docs/bind_weak.md
+++ b/src/3rdParty/FastSignals/docs/bind_weak.md
@@ -54,8 +54,8 @@ int main()
 In the following example, `Entity::print()` method connected to the signal. Signal emmited once before and once after the `Entity` instance destroyed. However, no memory access violation happens: once `Entity` destoryed, no slot will be called because `bind_weak` doesn't call binded method if it cannot lock `std::weak_ptr` to binded object. The second `event()` expression just does nothing.
 
 ```cpp
-#include "fastsignals/signal.h"
-#include "fastsignals/bind_weak.h"
+#include <fastsignals/signal.h>
+#include <fastsignals/bind_weak.h>
 #include <iostream>
 
 using VoidSignal = is::signals::signal<void()>;
diff --git a/src/3rdParty/FastSignals/docs/migration-from-boost-signals2.md b/src/3rdParty/FastSignals/docs/migration-from-boost-signals2.md
index 024716eedd..27116e89bd 100644
--- a/src/3rdParty/FastSignals/docs/migration-from-boost-signals2.md
+++ b/src/3rdParty/FastSignals/docs/migration-from-boost-signals2.md
@@ -117,7 +117,7 @@ int main()
 FastSignals uses another approach: `bind_weak` function:
 
 ```cpp
-#include "fastsignals/bind_weak.h"
+#include <fastsignals/bind_weak.h>
 #include <iostream>
 
 using VoidSignal = is::signals::signal<void()>;
diff --git a/src/3rdParty/FastSignals/libfastsignals/CMakeLists.txt b/src/3rdParty/FastSignals/libfastsignals/CMakeLists.txt
index 60719b1fa3..7bdde506ad 100644
--- a/src/3rdParty/FastSignals/libfastsignals/CMakeLists.txt
+++ b/src/3rdParty/FastSignals/libfastsignals/CMakeLists.txt
@@ -2,4 +2,4 @@
 file(GLOB LIBFASTSIGNALS_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h")
 add_library(libfastsignals ${LIBFASTSIGNALS_SRC})
 custom_enable_cxx17(libfastsignals)
-target_include_directories(libfastsignals INTERFACE "${CMAKE_SOURCE_DIR}")
+target_include_directories(libfastsignals INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include")
diff --git a/src/3rdParty/FastSignals/libfastsignals/include/bind_weak.h b/src/3rdParty/FastSignals/libfastsignals/include/fastsignals/bind_weak.h
similarity index 100%
rename from src/3rdParty/FastSignals/libfastsignals/include/bind_weak.h
rename to src/3rdParty/FastSignals/libfastsignals/include/fastsignals/bind_weak.h
diff --git a/src/3rdParty/FastSignals/libfastsignals/include/combiners.h b/src/3rdParty/FastSignals/libfastsignals/include/fastsignals/combiners.h
similarity index 100%
rename from src/3rdParty/FastSignals/libfastsignals/include/combiners.h
rename to src/3rdParty/FastSignals/libfastsignals/include/fastsignals/combiners.h
diff --git a/src/3rdParty/FastSignals/libfastsignals/include/connection.h b/src/3rdParty/FastSignals/libfastsignals/include/fastsignals/connection.h
similarity index 100%
rename from src/3rdParty/FastSignals/libfastsignals/include/connection.h
rename to src/3rdParty/FastSignals/libfastsignals/include/fastsignals/connection.h
diff --git a/src/3rdParty/FastSignals/libfastsignals/include/function.h b/src/3rdParty/FastSignals/libfastsignals/include/fastsignals/function.h
similarity index 100%
rename from src/3rdParty/FastSignals/libfastsignals/include/function.h
rename to src/3rdParty/FastSignals/libfastsignals/include/fastsignals/function.h
diff --git a/src/3rdParty/FastSignals/libfastsignals/include/function_detail.h b/src/3rdParty/FastSignals/libfastsignals/include/fastsignals/function_detail.h
similarity index 100%
rename from src/3rdParty/FastSignals/libfastsignals/include/function_detail.h
rename to src/3rdParty/FastSignals/libfastsignals/include/fastsignals/function_detail.h
diff --git a/src/3rdParty/FastSignals/libfastsignals/include/msvc_autolink.h b/src/3rdParty/FastSignals/libfastsignals/include/fastsignals/msvc_autolink.h
similarity index 100%
rename from src/3rdParty/FastSignals/libfastsignals/include/msvc_autolink.h
rename to src/3rdParty/FastSignals/libfastsignals/include/fastsignals/msvc_autolink.h
diff --git a/src/3rdParty/FastSignals/libfastsignals/include/signal.h b/src/3rdParty/FastSignals/libfastsignals/include/fastsignals/signal.h
similarity index 100%
rename from src/3rdParty/FastSignals/libfastsignals/include/signal.h
rename to src/3rdParty/FastSignals/libfastsignals/include/fastsignals/signal.h
diff --git a/src/3rdParty/FastSignals/libfastsignals/include/signal_impl.h b/src/3rdParty/FastSignals/libfastsignals/include/fastsignals/signal_impl.h
similarity index 100%
rename from src/3rdParty/FastSignals/libfastsignals/include/signal_impl.h
rename to src/3rdParty/FastSignals/libfastsignals/include/fastsignals/signal_impl.h
diff --git a/src/3rdParty/FastSignals/libfastsignals/include/spin_mutex.h b/src/3rdParty/FastSignals/libfastsignals/include/fastsignals/spin_mutex.h
similarity index 100%
rename from src/3rdParty/FastSignals/libfastsignals/include/spin_mutex.h
rename to src/3rdParty/FastSignals/libfastsignals/include/fastsignals/spin_mutex.h
diff --git a/src/3rdParty/FastSignals/libfastsignals/include/type_traits.h b/src/3rdParty/FastSignals/libfastsignals/include/fastsignals/type_traits.h
similarity index 100%
rename from src/3rdParty/FastSignals/libfastsignals/include/type_traits.h
rename to src/3rdParty/FastSignals/libfastsignals/include/fastsignals/type_traits.h
diff --git a/src/3rdParty/FastSignals/libfastsignals/src/connection.cpp b/src/3rdParty/FastSignals/libfastsignals/src/connection.cpp
index 9aa0a080ab..fbce73a321 100644
--- a/src/3rdParty/FastSignals/libfastsignals/src/connection.cpp
+++ b/src/3rdParty/FastSignals/libfastsignals/src/connection.cpp
@@ -1,4 +1,4 @@
-#include "../include/connection.h"
+#include "../include/fastsignals/connection.h"
 
 namespace is::signals
 {
diff --git a/src/3rdParty/FastSignals/libfastsignals/src/function_detail.cpp b/src/3rdParty/FastSignals/libfastsignals/src/function_detail.cpp
index 6303a53d46..c5eada1a8c 100644
--- a/src/3rdParty/FastSignals/libfastsignals/src/function_detail.cpp
+++ b/src/3rdParty/FastSignals/libfastsignals/src/function_detail.cpp
@@ -1,4 +1,4 @@
-#include "../include/function_detail.h"
+#include "../include/fastsignals/function_detail.h"
 #include <cstddef>
 #include <functional>
 
diff --git a/src/3rdParty/FastSignals/libfastsignals/src/signal_impl.cpp b/src/3rdParty/FastSignals/libfastsignals/src/signal_impl.cpp
index 2e51097239..ef8702ad4d 100644
--- a/src/3rdParty/FastSignals/libfastsignals/src/signal_impl.cpp
+++ b/src/3rdParty/FastSignals/libfastsignals/src/signal_impl.cpp
@@ -1,4 +1,4 @@
-#include "../include/signal_impl.h"
+#include "../include/fastsignals/signal_impl.h"
 #include <algorithm>
 #include <mutex>
 
diff --git a/src/3rdParty/FastSignals/tests/libfastsignals_stress_tests/signal_stress_tests.cpp b/src/3rdParty/FastSignals/tests/libfastsignals_stress_tests/signal_stress_tests.cpp
index 8b8ac00cc3..52f7b993f0 100644
--- a/src/3rdParty/FastSignals/tests/libfastsignals_stress_tests/signal_stress_tests.cpp
+++ b/src/3rdParty/FastSignals/tests/libfastsignals_stress_tests/signal_stress_tests.cpp
@@ -1,5 +1,5 @@
 #include "catch2/catch.hpp"
-#include "libfastsignals/include/signal.h"
+#include <fastsignals/signal.h>
 #include <array>
 #include <mutex>
 #include <random>
diff --git a/src/3rdParty/FastSignals/tests/libfastsignals_unit_tests/Function_tests.cpp b/src/3rdParty/FastSignals/tests/libfastsignals_unit_tests/Function_tests.cpp
index 4e04f40701..3ca5dc7a6f 100644
--- a/src/3rdParty/FastSignals/tests/libfastsignals_unit_tests/Function_tests.cpp
+++ b/src/3rdParty/FastSignals/tests/libfastsignals_unit_tests/Function_tests.cpp
@@ -1,5 +1,5 @@
 #include "catch2/catch.hpp"
-#include "libfastsignals/include/function.h"
+#include <fastsignals/function.h>
 #include <array>
 
 using namespace is::signals;
diff --git a/src/3rdParty/FastSignals/tests/libfastsignals_unit_tests/bind_weak_tests.cpp b/src/3rdParty/FastSignals/tests/libfastsignals_unit_tests/bind_weak_tests.cpp
index 9de27216d3..b9f1f2e01e 100644
--- a/src/3rdParty/FastSignals/tests/libfastsignals_unit_tests/bind_weak_tests.cpp
+++ b/src/3rdParty/FastSignals/tests/libfastsignals_unit_tests/bind_weak_tests.cpp
@@ -1,5 +1,5 @@
 #include "catch2/catch.hpp"
-#include "libfastsignals/include/bind_weak.h"
+#include <fastsignals/bind_weak.h>
 
 using namespace is::signals;
 
diff --git a/src/3rdParty/FastSignals/tests/libfastsignals_unit_tests/signal_tests.cpp b/src/3rdParty/FastSignals/tests/libfastsignals_unit_tests/signal_tests.cpp
index a90ad43f02..1d58ee3956 100644
--- a/src/3rdParty/FastSignals/tests/libfastsignals_unit_tests/signal_tests.cpp
+++ b/src/3rdParty/FastSignals/tests/libfastsignals_unit_tests/signal_tests.cpp
@@ -1,5 +1,5 @@
 #include "catch2/catch.hpp"
-#include "libfastsignals/include/signal.h"
+#include <fastsignals/signal.h>
 #include <string>
 
 using namespace is::signals;