diff --git a/Source/Tools/CMakeLists.txt b/Source/Tools/CMakeLists.txt
index ab2c5fcde..357d16cd0 100644
--- a/Source/Tools/CMakeLists.txt
+++ b/Source/Tools/CMakeLists.txt
@@ -17,15 +17,6 @@ if (NOT MINGW_BUILD)
   add_subdirectory(FEXGetConfig/)
   add_subdirectory(FEXServer/)
   add_subdirectory(FEXBash/)
-
-  set(NAME Opt)
-  set(SRCS Opt.cpp)
-
-  add_executable(${NAME} ${SRCS})
-  target_include_directories(${NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Source/)
-
-  target_link_libraries(${NAME} FEXCore Common pthread)
-
   add_subdirectory(CodeSizeValidation/)
 endif()
 
diff --git a/Source/Tools/CodeSizeValidation/Main.cpp b/Source/Tools/CodeSizeValidation/Main.cpp
index bcc0bdb14..6cabcb55d 100644
--- a/Source/Tools/CodeSizeValidation/Main.cpp
+++ b/Source/Tools/CodeSizeValidation/Main.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #include "DummyHandlers.h"
 #include "FEXCore/Core/Context.h"
 #include "FEXCore/Debug/InternalThreadState.h"
diff --git a/Source/Tools/CommonGUI/IMGui.h b/Source/Tools/CommonGUI/IMGui.h
index 4c7fee754..78a95c078 100644
--- a/Source/Tools/CommonGUI/IMGui.h
+++ b/Source/Tools/CommonGUI/IMGui.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #pragma once
 
 #include <FEXCore/fextl/string.h>
diff --git a/Source/Tools/CommonTools/DummyHandlers.cpp b/Source/Tools/CommonTools/DummyHandlers.cpp
index 0c6107566..db5b58c17 100644
--- a/Source/Tools/CommonTools/DummyHandlers.cpp
+++ b/Source/Tools/CommonTools/DummyHandlers.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #include "DummyHandlers.h"
 
 namespace FEX::DummyHandlers {
diff --git a/Source/Tools/CommonTools/DummyHandlers.h b/Source/Tools/CommonTools/DummyHandlers.h
index 5e2ba24a3..3d673e3f4 100644
--- a/Source/Tools/CommonTools/DummyHandlers.h
+++ b/Source/Tools/CommonTools/DummyHandlers.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #pragma once
 #include <FEXCore/Core/SignalDelegator.h>
 #include <FEXCore/HLE/SyscallHandler.h>
diff --git a/Source/Tools/FEXBash/FEXBash.cpp b/Source/Tools/FEXBash/FEXBash.cpp
index fc7133684..a8bee5960 100644
--- a/Source/Tools/FEXBash/FEXBash.cpp
+++ b/Source/Tools/FEXBash/FEXBash.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: Bin|FEXBash
diff --git a/Source/Tools/FEXConfig/Main.cpp b/Source/Tools/FEXConfig/Main.cpp
index 094f29d2d..7b35c174f 100644
--- a/Source/Tools/FEXConfig/Main.cpp
+++ b/Source/Tools/FEXConfig/Main.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #include "Common/Config.h"
 #include "Common/FileFormatCheck.h"
 #include "FEXCore/Config/Config.h"
diff --git a/Source/Tools/FEXGDBReader/FEXGDBReader.cpp b/Source/Tools/FEXGDBReader/FEXGDBReader.cpp
index e7b412ecd..36e909bd0 100644
--- a/Source/Tools/FEXGDBReader/FEXGDBReader.cpp
+++ b/Source/Tools/FEXGDBReader/FEXGDBReader.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #include <cstddef>
 #include <cstdio>
 #include <unordered_map>
diff --git a/Source/Tools/FEXGetConfig/Main.cpp b/Source/Tools/FEXGetConfig/Main.cpp
index 73396b5c4..fe6ebc427 100644
--- a/Source/Tools/FEXGetConfig/Main.cpp
+++ b/Source/Tools/FEXGetConfig/Main.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #include "ConfigDefines.h"
 #include "Common/cpp-optparse/OptionParser.h"
 #include "Common/Config.h"
diff --git a/Source/Tools/FEXLoader/AOT/AOTGenerator.cpp b/Source/Tools/FEXLoader/AOT/AOTGenerator.cpp
index fbdc436a7..416e60634 100644
--- a/Source/Tools/FEXLoader/AOT/AOTGenerator.cpp
+++ b/Source/Tools/FEXLoader/AOT/AOTGenerator.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #include "ELFCodeLoader.h"
 #include "Linux/Utils/ELFContainer.h"
 
diff --git a/Source/Tools/FEXLoader/AOT/AOTGenerator.h b/Source/Tools/FEXLoader/AOT/AOTGenerator.h
index bfe4f1cce..32cde0d49 100644
--- a/Source/Tools/FEXLoader/AOT/AOTGenerator.h
+++ b/Source/Tools/FEXLoader/AOT/AOTGenerator.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #pragma once
 
 #include "ELFCodeLoader.h"
diff --git a/Source/Tools/FEXLoader/ArchHelpers/MContext.h b/Source/Tools/FEXLoader/ArchHelpers/MContext.h
index 7c9b39ba1..8a2b3b703 100644
--- a/Source/Tools/FEXLoader/ArchHelpers/MContext.h
+++ b/Source/Tools/FEXLoader/ArchHelpers/MContext.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #pragma once
 
 #include "UContext.h"
diff --git a/Source/Tools/FEXLoader/ArchHelpers/UContext.h b/Source/Tools/FEXLoader/ArchHelpers/UContext.h
index 662fb6f4e..89bd25557 100644
--- a/Source/Tools/FEXLoader/ArchHelpers/UContext.h
+++ b/Source/Tools/FEXLoader/ArchHelpers/UContext.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #pragma once
 
 #include <FEXCore/Utils/CompilerDefs.h>
diff --git a/Source/Tools/FEXLoader/ArchHelpers/WinContext.h b/Source/Tools/FEXLoader/ArchHelpers/WinContext.h
index b7ab21b1a..56283460f 100644
--- a/Source/Tools/FEXLoader/ArchHelpers/WinContext.h
+++ b/Source/Tools/FEXLoader/ArchHelpers/WinContext.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #pragma once
 #ifdef _WIN32
 #include <FEXCore/Utils/LogManager.h>
diff --git a/Source/Tools/FEXLoader/ELFCodeLoader.h b/Source/Tools/FEXLoader/ELFCodeLoader.h
index df0562631..03ff0fa34 100644
--- a/Source/Tools/FEXLoader/ELFCodeLoader.h
+++ b/Source/Tools/FEXLoader/ELFCodeLoader.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 
 #pragma once
 
diff --git a/Source/Tools/FEXLoader/FEXLoader.cpp b/Source/Tools/FEXLoader/FEXLoader.cpp
index 4bae21062..685bdaa95 100644
--- a/Source/Tools/FEXLoader/FEXLoader.cpp
+++ b/Source/Tools/FEXLoader/FEXLoader.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: Bin|FEXLoader
diff --git a/Source/Tools/FEXLoader/HarnessHelpers.h b/Source/Tools/FEXLoader/HarnessHelpers.h
index a60b5262e..489ebd5e1 100644
--- a/Source/Tools/FEXLoader/HarnessHelpers.h
+++ b/Source/Tools/FEXLoader/HarnessHelpers.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #pragma once
 
 #include "Common/Config.h"
diff --git a/Source/Tools/FEXLoader/IRLoader.cpp b/Source/Tools/FEXLoader/IRLoader.cpp
index bc847426c..f4e7b99ea 100644
--- a/Source/Tools/FEXLoader/IRLoader.cpp
+++ b/Source/Tools/FEXLoader/IRLoader.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: Bin|IRLoader
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Arm64/SyscallsEnum.h b/Source/Tools/FEXLoader/LinuxSyscalls/Arm64/SyscallsEnum.h
index 80c7b62aa..099d65097 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/Arm64/SyscallsEnum.h
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/Arm64/SyscallsEnum.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-arm64
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/EmulatedFiles/EmulatedFiles.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/EmulatedFiles/EmulatedFiles.cpp
index 6718177d8..20af6021d 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/EmulatedFiles/EmulatedFiles.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/EmulatedFiles/EmulatedFiles.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|common
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/EmulatedFiles/EmulatedFiles.h b/Source/Tools/FEXLoader/LinuxSyscalls/EmulatedFiles/EmulatedFiles.h
index 6a851f946..c6fa89bf3 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/EmulatedFiles/EmulatedFiles.h
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/EmulatedFiles/EmulatedFiles.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|common
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/FileManagement.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/FileManagement.cpp
index d9584c226..456c35499 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/FileManagement.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/FileManagement.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|common
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/FileManagement.h b/Source/Tools/FEXLoader/LinuxSyscalls/FileManagement.h
index 12b95654c..42e59f767 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/FileManagement.h
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/FileManagement.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|common
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/LinuxAllocator.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/LinuxAllocator.cpp
index e1210cb7d..d78211dd3 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/LinuxAllocator.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/LinuxAllocator.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #include "LinuxSyscalls/LinuxAllocator.h"
 #include "LinuxSyscalls/Syscalls.h"
 
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/LinuxAllocator.h b/Source/Tools/FEXLoader/LinuxSyscalls/LinuxAllocator.h
index dd47aecf3..01ffecda5 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/LinuxAllocator.h
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/LinuxAllocator.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #pragma once
 
 #include <FEXCore/fextl/memory.h>
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/SignalDelegator.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/SignalDelegator.cpp
index a7575c563..271a96156 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/SignalDelegator.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/SignalDelegator.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|common
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/SignalDelegator.h b/Source/Tools/FEXLoader/LinuxSyscalls/SignalDelegator.h
index a9ea549af..3a5e7b0a3 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/SignalDelegator.h
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/SignalDelegator.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|common
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls.cpp
index bf6c014fb..431eca4df 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 category: LinuxSyscalls ~ Linux syscall emulation, marshaling and passthrough
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls.h b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls.h
index ea6b333ee..a641b8a4d 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls.h
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|common
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/EPoll.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/EPoll.cpp
index 1ce53c0e8..e214bfb0f 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/EPoll.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/EPoll.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 meta: LinuxSyscalls|syscalls-shared ~ Syscall implementations shared between x86 and x86-64
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/FD.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/FD.cpp
index f7b1356a4..16f11a2ec 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/FD.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/FD.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-shared
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/FS.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/FS.cpp
index d0f9cedec..dba921aa2 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/FS.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/FS.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-shared
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/IO.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/IO.cpp
index dd6dbc12d..7e4c57c8a 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/IO.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/IO.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-shared
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/IOUring.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/IOUring.cpp
index 00ba50ad4..302d107fd 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/IOUring.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/IOUring.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-shared
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Info.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Info.cpp
index 626a9aeb9..5e4c4f64e 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Info.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Info.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-shared
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Key.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Key.cpp
index d3c2955af..32bd64c70 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Key.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Key.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-shared
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Memory.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Memory.cpp
index 32bdc9064..245adf317 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Memory.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Memory.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-shared
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Msg.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Msg.cpp
index 12246b733..f6dfdc979 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Msg.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Msg.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-shared
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Namespace.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Namespace.cpp
index 20804d624..48196b67d 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Namespace.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Namespace.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-shared
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/NotImplemented.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/NotImplemented.cpp
index 256dd2ca0..311403ce6 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/NotImplemented.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/NotImplemented.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-shared
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/SHM.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/SHM.cpp
index f5c5fa51a..54fcca1d7 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/SHM.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/SHM.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-shared
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Sched.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Sched.cpp
index 380de7b44..971bcd99b 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Sched.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Sched.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-shared
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Semaphore.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Semaphore.cpp
index a3d02558a..ea90b97e6 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Semaphore.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Semaphore.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-shared
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Signals.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Signals.cpp
index 41dca8900..988675d9d 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Signals.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Signals.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-shared
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Socket.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Socket.cpp
index cfd41149d..7c6f95499 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Socket.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Socket.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-shared
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Stubs.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Stubs.cpp
index d9ff07eba..c82d806cb 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Stubs.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Stubs.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-shared
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Thread.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Thread.cpp
index 1342f27d1..e5d47dfec 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Thread.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Thread.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-shared
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Thread.h b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Thread.h
index b6cc142c2..db5609d0f 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Thread.h
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Thread.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-shared
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Time.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Time.cpp
index 81c080964..3a465bfe6 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Time.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Time.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-shared
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Timer.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Timer.cpp
index 35c7ad89f..6953a9577 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Timer.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/Syscalls/Timer.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-shared
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/SyscallsSMCTracking.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/SyscallsSMCTracking.cpp
index e029269c7..de0a57a22 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/SyscallsSMCTracking.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/SyscallsSMCTracking.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 category: LinuxSyscalls ~ Linux syscall emulation, marshaling and passthrough
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/SyscallsVMATracking.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/SyscallsVMATracking.cpp
index 6ed0a7e77..f60940ede 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/SyscallsVMATracking.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/SyscallsVMATracking.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 category: LinuxSyscalls ~ Linux syscall emulation, marshaling and passthrough
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Types.h b/Source/Tools/FEXLoader/LinuxSyscalls/Types.h
index 2b24a9982..afacab531 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/Types.h
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/Types.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #pragma once
 
 #include <FEXCore/Utils/CompilerDefs.h>
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Utils/Threads.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/Utils/Threads.cpp
index c4761b0d7..2574a30a9 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/Utils/Threads.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/Utils/Threads.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #include "LinuxSyscalls/Utils/Threads.h"
 
 #include <FEXCore/Core/Context.h>
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/Utils/Threads.h b/Source/Tools/FEXLoader/LinuxSyscalls/Utils/Threads.h
index c4ceeffe2..23f8c4c88 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/Utils/Threads.h
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/Utils/Threads.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #pragma once
 
 #include <cstddef>
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/EPoll.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/x32/EPoll.cpp
index f70aed625..569bff88a 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x32/EPoll.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x32/EPoll.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 meta: LinuxSyscalls|syscalls-x86-32 ~ x86-32 specific syscall implementations
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/FD.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/x32/FD.cpp
index f7c2a72e4..d407223b4 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x32/FD.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x32/FD.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-32
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/FS.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/x32/FS.cpp
index d23f516af..dab1539b7 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x32/FS.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x32/FS.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-32
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/IO.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/x32/IO.cpp
index d715687ad..df9d93633 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x32/IO.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x32/IO.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-32
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Info.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/x32/Info.cpp
index 2afd94dd6..27256304b 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Info.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x32/Info.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-32
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/IoctlEmulation.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/x32/IoctlEmulation.cpp
index 850b54aaa..5e4a6364f 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x32/IoctlEmulation.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x32/IoctlEmulation.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #include "Ioctl/drm.h"
 #include "LinuxSyscalls/Syscalls.h"
 #include "LinuxSyscalls/x32/Syscalls.h"
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/IoctlEmulation.h b/Source/Tools/FEXLoader/LinuxSyscalls/x32/IoctlEmulation.h
index 946d25185..6349e5bc5 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x32/IoctlEmulation.h
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x32/IoctlEmulation.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #pragma once
 #include <cstdint>
 
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Memory.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/x32/Memory.cpp
index e64d40640..36973a053 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Memory.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x32/Memory.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-32
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Msg.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/x32/Msg.cpp
index 557cb253e..3ba511a7b 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Msg.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x32/Msg.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-32
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/NotImplemented.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/x32/NotImplemented.cpp
index 4c10ec9ab..e7f35d72e 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x32/NotImplemented.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x32/NotImplemented.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-32
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Sched.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/x32/Sched.cpp
index 573232381..359c69f4f 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Sched.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x32/Sched.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-32
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Semaphore.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/x32/Semaphore.cpp
index 1180ee562..579fe305c 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Semaphore.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x32/Semaphore.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-32
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Signals.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/x32/Signals.cpp
index c31b51636..99443f6a1 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Signals.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x32/Signals.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-32
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Socket.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/x32/Socket.cpp
index 76befaa59..3ec6a2a55 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Socket.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x32/Socket.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-32
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Stubs.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/x32/Stubs.cpp
index 550eac788..f276211db 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Stubs.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x32/Stubs.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-32
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Syscalls.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/x32/Syscalls.cpp
index 792b74842..73aa82140 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Syscalls.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x32/Syscalls.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-32
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Syscalls.h b/Source/Tools/FEXLoader/LinuxSyscalls/x32/Syscalls.h
index 57d427efc..334417272 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Syscalls.h
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x32/Syscalls.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-32
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/SyscallsEnum.h b/Source/Tools/FEXLoader/LinuxSyscalls/x32/SyscallsEnum.h
index d28f55a77..5b9216ad8 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x32/SyscallsEnum.h
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x32/SyscallsEnum.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-32
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Thread.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/x32/Thread.cpp
index 8ccd03c27..9bbfbdfef 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Thread.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x32/Thread.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-32
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Thread.h b/Source/Tools/FEXLoader/LinuxSyscalls/x32/Thread.h
index 62c51ae60..302aa405c 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Thread.h
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x32/Thread.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-32
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Time.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/x32/Time.cpp
index ca5bea1de..96b0e4baa 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Time.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x32/Time.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-32
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Timer.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/x32/Timer.cpp
index 3241539d1..9acac543c 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Timer.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x32/Timer.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-32
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Types.h b/Source/Tools/FEXLoader/LinuxSyscalls/x32/Types.h
index 651fc254e..5da48510f 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x32/Types.h
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x32/Types.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-32
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/EPoll.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/x64/EPoll.cpp
index 96f63748f..86f3b4065 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x64/EPoll.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x64/EPoll.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 meta: LinuxSyscalls|syscalls-x86-64 ~ x86-64 specific syscall implementations
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/FD.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/x64/FD.cpp
index 6cabc7b09..8c3d64af5 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x64/FD.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x64/FD.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-64
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/IO.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/x64/IO.cpp
index 29e728f41..5859310aa 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x64/IO.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x64/IO.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-64
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Info.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/x64/Info.cpp
index 3ef02c64f..0a193d589 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Info.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x64/Info.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-64
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl.cpp
index afc2151c3..d2dc68bda 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x64/Ioctl.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-64
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Memory.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/x64/Memory.cpp
index d702a1e8c..99ac8dfa9 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Memory.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x64/Memory.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-64
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Msg.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/x64/Msg.cpp
index fc278ded4..dd17eb70b 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Msg.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x64/Msg.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-64
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/NotImplemented.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/x64/NotImplemented.cpp
index ad404a218..4e7e80d74 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x64/NotImplemented.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x64/NotImplemented.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-64
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Sched.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/x64/Sched.cpp
index e866b4ba0..d1ef574fe 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Sched.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x64/Sched.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-64
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Semaphore.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/x64/Semaphore.cpp
index 438d12080..415391d9f 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Semaphore.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x64/Semaphore.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-64
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Signals.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/x64/Signals.cpp
index 1d58310ad..4c68ffb50 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Signals.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x64/Signals.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-64
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Socket.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/x64/Socket.cpp
index 24fada125..7de85cae1 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Socket.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x64/Socket.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-64
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Syscalls.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/x64/Syscalls.cpp
index 858b910eb..2e6ebbef0 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Syscalls.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x64/Syscalls.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-64
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Syscalls.h b/Source/Tools/FEXLoader/LinuxSyscalls/x64/Syscalls.h
index 1d9bb60ee..a773aa935 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Syscalls.h
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x64/Syscalls.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-64
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/SyscallsEnum.h b/Source/Tools/FEXLoader/LinuxSyscalls/x64/SyscallsEnum.h
index 1973ff1b3..2e231ce84 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x64/SyscallsEnum.h
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x64/SyscallsEnum.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-64
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Thread.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/x64/Thread.cpp
index 8da155df3..1947d2da3 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Thread.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x64/Thread.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-64
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Thread.h b/Source/Tools/FEXLoader/LinuxSyscalls/x64/Thread.h
index 9fc013dd8..64032f90e 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Thread.h
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x64/Thread.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-64
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Time.cpp b/Source/Tools/FEXLoader/LinuxSyscalls/x64/Time.cpp
index 5e6fc2dbd..4df537c67 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Time.cpp
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x64/Time.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-64
diff --git a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Types.h b/Source/Tools/FEXLoader/LinuxSyscalls/x64/Types.h
index 2f8de54c1..6917158c1 100644
--- a/Source/Tools/FEXLoader/LinuxSyscalls/x64/Types.h
+++ b/Source/Tools/FEXLoader/LinuxSyscalls/x64/Types.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: LinuxSyscalls|syscalls-x86-64
diff --git a/Source/Tools/FEXLoader/TestHarnessRunner.cpp b/Source/Tools/FEXLoader/TestHarnessRunner.cpp
index e3fc64da9..891939829 100644
--- a/Source/Tools/FEXLoader/TestHarnessRunner.cpp
+++ b/Source/Tools/FEXLoader/TestHarnessRunner.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 /*
 $info$
 tags: Bin|TestHarnessRunner
diff --git a/Source/Tools/FEXLoader/TestHarnessRunner/HostRunner.cpp b/Source/Tools/FEXLoader/TestHarnessRunner/HostRunner.cpp
index 5ffa80bb0..1929838cf 100644
--- a/Source/Tools/FEXLoader/TestHarnessRunner/HostRunner.cpp
+++ b/Source/Tools/FEXLoader/TestHarnessRunner/HostRunner.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #include "ArchHelpers/UContext.h"
 #include "LinuxSyscalls/SignalDelegator.h"
 #include <FEXCore/Config/Config.h>
diff --git a/Source/Tools/FEXLoader/TestHarnessRunner/HostRunner.h b/Source/Tools/FEXLoader/TestHarnessRunner/HostRunner.h
index 0206b6351..08181ad9f 100644
--- a/Source/Tools/FEXLoader/TestHarnessRunner/HostRunner.h
+++ b/Source/Tools/FEXLoader/TestHarnessRunner/HostRunner.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #pragma once
 
 #include <FEXCore/fextl/memory.h>
diff --git a/Source/Tools/FEXLoader/VDSO_Emulation.cpp b/Source/Tools/FEXLoader/VDSO_Emulation.cpp
index 2031d88c0..0572ec148 100644
--- a/Source/Tools/FEXLoader/VDSO_Emulation.cpp
+++ b/Source/Tools/FEXLoader/VDSO_Emulation.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #include "VDSO_Emulation.h"
 #include "FEXCore/IR/IR.h"
 #include "LinuxSyscalls/x32/Types.h"
diff --git a/Source/Tools/FEXLoader/VDSO_Emulation.h b/Source/Tools/FEXLoader/VDSO_Emulation.h
index f82ffd462..68d730f7c 100644
--- a/Source/Tools/FEXLoader/VDSO_Emulation.h
+++ b/Source/Tools/FEXLoader/VDSO_Emulation.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #pragma once
 #include <FEXCore/IR/IR.h>
 #include <FEXCore/fextl/vector.h>
diff --git a/Source/Tools/FEXRootFSFetcher/Main.cpp b/Source/Tools/FEXRootFSFetcher/Main.cpp
index 31edfb6fb..8303b1d03 100644
--- a/Source/Tools/FEXRootFSFetcher/Main.cpp
+++ b/Source/Tools/FEXRootFSFetcher/Main.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #include <FEXCore/fextl/fmt.h>
 #include <FEXCore/fextl/string.h>
 
diff --git a/Source/Tools/FEXRootFSFetcher/XXFileHash.cpp b/Source/Tools/FEXRootFSFetcher/XXFileHash.cpp
index a0118528b..93f7a37b5 100644
--- a/Source/Tools/FEXRootFSFetcher/XXFileHash.cpp
+++ b/Source/Tools/FEXRootFSFetcher/XXFileHash.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #include "XXFileHash.h"
 
 #include <chrono>
diff --git a/Source/Tools/FEXRootFSFetcher/XXFileHash.h b/Source/Tools/FEXRootFSFetcher/XXFileHash.h
index 072b3fe82..fa4c34046 100644
--- a/Source/Tools/FEXRootFSFetcher/XXFileHash.h
+++ b/Source/Tools/FEXRootFSFetcher/XXFileHash.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #pragma once
 #include <FEXCore/fextl/string.h>
 
diff --git a/Source/Tools/FEXServer/ArgumentLoader.cpp b/Source/Tools/FEXServer/ArgumentLoader.cpp
index 6815395e0..b27540299 100644
--- a/Source/Tools/FEXServer/ArgumentLoader.cpp
+++ b/Source/Tools/FEXServer/ArgumentLoader.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #include "ArgumentLoader.h"
 #include "Common/cpp-optparse/OptionParser.h"
 
diff --git a/Source/Tools/FEXServer/ArgumentLoader.h b/Source/Tools/FEXServer/ArgumentLoader.h
index a47d8dd1d..e8c8f5b12 100644
--- a/Source/Tools/FEXServer/ArgumentLoader.h
+++ b/Source/Tools/FEXServer/ArgumentLoader.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #pragma once
 #include <cstdint>
 
diff --git a/Source/Tools/FEXServer/Logger.cpp b/Source/Tools/FEXServer/Logger.cpp
index dbd2c274e..644909651 100644
--- a/Source/Tools/FEXServer/Logger.cpp
+++ b/Source/Tools/FEXServer/Logger.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #include "Common/FEXServerClient.h"
 
 #include <atomic>
diff --git a/Source/Tools/FEXServer/Logger.h b/Source/Tools/FEXServer/Logger.h
index c25e1dfc7..fb0228623 100644
--- a/Source/Tools/FEXServer/Logger.h
+++ b/Source/Tools/FEXServer/Logger.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #pragma once
 
 namespace Logger {
diff --git a/Source/Tools/FEXServer/Main.cpp b/Source/Tools/FEXServer/Main.cpp
index cfbaf50df..fae923822 100644
--- a/Source/Tools/FEXServer/Main.cpp
+++ b/Source/Tools/FEXServer/Main.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #include "ArgumentLoader.h"
 #include "Logger.h"
 #include "PipeScanner.h"
diff --git a/Source/Tools/FEXServer/PipeScanner.cpp b/Source/Tools/FEXServer/PipeScanner.cpp
index 3e908583d..15dd72d41 100644
--- a/Source/Tools/FEXServer/PipeScanner.cpp
+++ b/Source/Tools/FEXServer/PipeScanner.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #include <cstdlib>
 #include <dirent.h>
 #include <sys/types.h>
diff --git a/Source/Tools/FEXServer/PipeScanner.h b/Source/Tools/FEXServer/PipeScanner.h
index dd363ca55..1f74e3f37 100644
--- a/Source/Tools/FEXServer/PipeScanner.h
+++ b/Source/Tools/FEXServer/PipeScanner.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #pragma once
 namespace PipeScanner {
   void ScanForPipes();
diff --git a/Source/Tools/FEXServer/ProcessPipe.cpp b/Source/Tools/FEXServer/ProcessPipe.cpp
index 204921f92..2be8cd271 100644
--- a/Source/Tools/FEXServer/ProcessPipe.cpp
+++ b/Source/Tools/FEXServer/ProcessPipe.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #include "FEXHeaderUtils/Syscalls.h"
 #include "Logger.h"
 #include "SquashFS.h"
diff --git a/Source/Tools/FEXServer/ProcessPipe.h b/Source/Tools/FEXServer/ProcessPipe.h
index 8d648e6c4..f8900ae36 100644
--- a/Source/Tools/FEXServer/ProcessPipe.h
+++ b/Source/Tools/FEXServer/ProcessPipe.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #pragma once
 #include <cstdint>
 
diff --git a/Source/Tools/FEXServer/SquashFS.cpp b/Source/Tools/FEXServer/SquashFS.cpp
index 369810d27..430ad3883 100644
--- a/Source/Tools/FEXServer/SquashFS.cpp
+++ b/Source/Tools/FEXServer/SquashFS.cpp
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #include "Common/FEXServerClient.h"
 #include "Common/FileFormatCheck.h"
 
diff --git a/Source/Tools/FEXServer/SquashFS.h b/Source/Tools/FEXServer/SquashFS.h
index da2fb3d14..8d3cf0c9a 100644
--- a/Source/Tools/FEXServer/SquashFS.h
+++ b/Source/Tools/FEXServer/SquashFS.h
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: MIT
 #pragma once
 #include <FEXCore/fextl/string.h>
 
diff --git a/Source/Tools/Opt.cpp b/Source/Tools/Opt.cpp
deleted file mode 100644
index 8c0db9d9f..000000000
--- a/Source/Tools/Opt.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-$info$
-tags: Bin|Opt
-desc: Unused
-$end_info$
-*/
-
-#include <FEXCore/Config/Config.h>
-#include "Common/Config.h"
-#include "Common/ArgumentLoader.h"
-
-#include <memory>
-
-int main(int argc, char **argv, char **const envp) {
-  FEXCore::Config::Initialize();
-  FEXCore::Config::AddLayer(FEX::Config::CreateMainLayer());
-  FEXCore::Config::AddLayer(fextl::make_unique<FEX::ArgLoader::ArgLoader>(argc, argv));
-  FEXCore::Config::AddLayer(FEX::Config::CreateEnvironmentLayer(envp));
-  FEXCore::Config::Load();
-
-}