diff --git a/Utilities/span.h b/Utilities/span.h
new file mode 100644
index 000000000..6276c0b0b
--- /dev/null
+++ b/Utilities/span.h
@@ -0,0 +1,2 @@
+#define TCB_SPAN_NAMESPACE_NAME gsl
+#include <tcb/span.hpp>
diff --git a/rpcs3/Emu/RSX/Common/BufferUtils.h b/rpcs3/Emu/RSX/Common/BufferUtils.h
index 85ffd9df3..5cf04e413 100644
--- a/rpcs3/Emu/RSX/Common/BufferUtils.h
+++ b/rpcs3/Emu/RSX/Common/BufferUtils.h
@@ -2,9 +2,7 @@
 
 #include <vector>
 
-#define TCB_SPAN_NAMESPACE_NAME gsl
-#include <tcb/span.hpp>
-
+#include "Utilities/span.h"
 #include "../gcm_enums.h"
 
 /**
diff --git a/rpcs3/Emu/RSX/Common/ProgramStateCache.h b/rpcs3/Emu/RSX/Common/ProgramStateCache.h
index fc0b8a080..03ebe4ac5 100644
--- a/rpcs3/Emu/RSX/Common/ProgramStateCache.h
+++ b/rpcs3/Emu/RSX/Common/ProgramStateCache.h
@@ -3,12 +3,10 @@
 #include "Emu/RSX/RSXFragmentProgram.h"
 #include "Emu/RSX/RSXVertexProgram.h"
 
-#define TCB_SPAN_NAMESPACE_NAME gsl
-#include <tcb/span.hpp>
-
 #include "Utilities/hash.h"
 #include "Utilities/mutex.h"
 #include "Utilities/Log.h"
+#include "Utilities/span.h"
 
 #include <deque>
 
diff --git a/rpcs3/Emu/RSX/Common/TextureUtils.h b/rpcs3/Emu/RSX/Common/TextureUtils.h
index e6b146b4a..20bf3d77f 100644
--- a/rpcs3/Emu/RSX/Common/TextureUtils.h
+++ b/rpcs3/Emu/RSX/Common/TextureUtils.h
@@ -1,12 +1,10 @@
 #pragma once
 
 #include "../RSXTexture.h"
+#include "Utilities/span.h"
 
 #include <vector>
 
-#define TCB_SPAN_NAMESPACE_NAME gsl
-#include <tcb/span.hpp>
-
 namespace rsx
 {
 	enum texture_upload_context : u32
diff --git a/rpcs3/Emu/RSX/Common/surface_store.h b/rpcs3/Emu/RSX/Common/surface_store.h
index 2d1ff4462..93529931c 100644
--- a/rpcs3/Emu/RSX/Common/surface_store.h
+++ b/rpcs3/Emu/RSX/Common/surface_store.h
@@ -1,12 +1,10 @@
 #pragma once
 
-#define TCB_SPAN_NAMESPACE_NAME gsl
-#include <tcb/span.hpp>
-
 #include "Emu/Memory/vm.h"
 #include "surface_utils.h"
 #include "../GCM.h"
 #include "../rsx_utils.h"
+#include "Utilities/span.h"
 #include <list>
 
 namespace
diff --git a/rpcs3/Emu/RSX/RSXThread.cpp b/rpcs3/Emu/RSX/RSXThread.cpp
index 52fa1fe41..1c874145d 100644
--- a/rpcs3/Emu/RSX/RSXThread.cpp
+++ b/rpcs3/Emu/RSX/RSXThread.cpp
@@ -15,9 +15,7 @@
 #include "Emu/Cell/lv2/sys_event.h"
 #include "Emu/Cell/Modules/cellGcmSys.h"
 
-#define TCB_SPAN_NAMESPACE_NAME gsl
-#include <tcb/span.hpp>
-
+#include "Utilities/span.h"
 #include "Utilities/StrUtil.h"
 
 #include <cereal/archives/binary.hpp>