diff --git a/.gitignore b/.gitignore
index 37df0a9b58..9845bd52c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,12 @@
+# Existing
+
 compile_commands.json
 vim_rc
 Config.json
 
 [Bb]uild*/
+[Bb]in/
+out/
 .vscode/
+.vs/
+
diff --git a/CMakeSettings.json b/CMakeSettings.json
new file mode 100644
index 0000000000..d6c50eef1b
--- /dev/null
+++ b/CMakeSettings.json
@@ -0,0 +1,132 @@
+{
+	"environments": [
+		{
+			"BuildPath": "${projectDir}\\out\\build\\${name}",
+			"InstallPath": "${projectDir}\\out\\install\\${name}",
+			"clangcl": "clang-cl.exe",
+			"cc": "clang",
+			"cxx": "clang++"
+		}
+	],
+	"configurations": [
+		{
+			"name": "WSL-Clang-Debug",
+			"generator": "Ninja",
+			"configurationType": "Debug",
+			"buildRoot": "${env.BuildPath}",
+			"installRoot": "${env.InstallPath}",
+			"cmakeExecutable": "/usr/bin/cmake",
+			"cmakeCommandArgs": "",
+			"buildCommandArgs": "-v",
+			"ctestCommandArgs": "",
+			"wslPath": "${defaultWSLPath}",
+			"inheritEnvironments": [ "linux_clang_x64" ],
+			"addressSanitizerRuntimeFlags": "detect_leaks=0",
+			"variables": [
+				{
+					"name": "WSL",
+					"type": "BOOL",
+					"value": "TRUE"
+				}
+			]
+		},
+		{
+			"name": "WSL-Clang-Release",
+			"generator": "Ninja",
+			"configurationType": "RelWithDebInfo",
+			"buildRoot": "${env.BuildPath}",
+			"installRoot": "${env.InstallPath}",
+			"cmakeExecutable": "/usr/bin/cmake",
+			"cmakeCommandArgs": "",
+			"buildCommandArgs": "-v",
+			"ctestCommandArgs": "",
+			"wslPath": "${defaultWSLPath}",
+			"inheritEnvironments": [ "linux_clang_x64" ],
+			"addressSanitizerRuntimeFlags": "detect_leaks=0",
+			"variables": [
+				{
+					"name": "WSL",
+					"type": "BOOL",
+					"value": "TRUE"
+				}
+			]
+		},
+		{
+			"name": "x86-Clang-Cross-Debug",
+			"generator": "Ninja",
+			"configurationType": "Debug",
+			"buildRoot": "${env.BuildPath}",
+			"installRoot": "${env.InstallPath}",
+			"cmakeCommandArgs": "",
+			"buildCommandArgs": "-v",
+			"ctestCommandArgs": "",
+			"inheritEnvironments": [ "clang_cl_x86" ],
+			"variables": [
+				{
+					"name": "CMAKE_C_COMPILER",
+					"type": "STRING",
+					"value": "${env.cc}"
+				},
+				{
+					"name": "CMAKE_CXX_COMPILER",
+					"type": "STRING",
+					"value": "${env.cxx}"
+				},
+				{
+					"name": "CMAKE_SYSROOT",
+					"type": "STRING",
+					"value": "${env.fexsysroot}"
+				}
+			]
+		},
+		{
+			"name": "x64-Clang-Cross-Release",
+			"generator": "Ninja",
+			"configurationType": "RelWithDebInfo",
+			"buildRoot": "${env.BuildPath}",
+			"installRoot": "${env.InstallPath}",
+			"cmakeCommandArgs": "",
+			"buildCommandArgs": "-v",
+			"ctestCommandArgs": "",
+			"inheritEnvironments": [ "clang_cl_x86" ],
+			"variables": [
+				{
+					"name": "CMAKE_C_COMPILER",
+					"type": "STRING",
+					"value": "${env.cc}"
+				},
+				{
+					"name": "CMAKE_CXX_COMPILER",
+					"type": "STRING",
+					"value": "${env.cxx}"
+				},
+				{
+					"name": "CMAKE_SYSROOT",
+					"type": "STRING",
+					"value": "${env.fexsysroot}"
+				}
+			]
+		},
+		{
+			"name": "Linux-Clang-Remote-Debug",
+			"generator": "Ninja",
+			"configurationType": "Debug",
+			"cmakeExecutable": "/usr/bin/cmake",
+			"remoteCopySourcesExclusionList": [ ".vs", ".vscode", ".git", ".github", "build", "out", "bin" ],
+			"cmakeCommandArgs": "",
+			"buildCommandArgs": "-v",
+			"ctestCommandArgs": "",
+			"inheritEnvironments": [ "linux_clang_x64" ],
+			"remoteMachineName": "${env.fexremote}",	// string "-662331587;z.port0.org (username=ubuntu, port=22, authentication=PrivateKey)",
+			"remoteCMakeListsRoot": "$HOME/projects/.vs/${projectDirName}/src",
+			"remoteBuildRoot": "$HOME/projects/.vs/${projectDirName}/build/${name}",
+			"remoteInstallRoot": "$HOME/projects/.vs/${projectDirName}/install/${name}",
+			"remoteCopySources": true,
+			"rsyncCommandArgs": "-t --delete --delete-excluded",
+			"remoteCopyBuildOutput": false,
+			"remoteCopySourcesMethod": "rsync",
+			"addressSanitizerRuntimeFlags": "detect_leaks=0",
+			"variables": []
+		}
+	]
+}
\ No newline at end of file
diff --git a/External/FEXCore/Source/Interface/Core/LLVMJIT/LLVMCore.cpp b/External/FEXCore/Source/Interface/Core/LLVMJIT/LLVMCore.cpp
index b2f242b038..0372400be7 100644
--- a/External/FEXCore/Source/Interface/Core/LLVMJIT/LLVMCore.cpp
+++ b/External/FEXCore/Source/Interface/Core/LLVMJIT/LLVMCore.cpp
@@ -13,6 +13,12 @@
 #include <llvm/IR/LLVMContext.h>
 #include <llvm/IR/LegacyPassManager.h>
 #include <llvm/IR/Verifier.h>
+
+// This seems to be needed for LLVM-10, and isn't needed/built from IntrinsicsX86.td in LLVM-9?
+#if defined(_M_X86_64) && __has_include (<llvm/IR/IntrinsicsX86.h>)
+ #include <llvm/IR/IntrinsicsX86.h>
+#endif
+
 #include <llvm/Passes/PassBuilder.h>
 #include <llvm/Support/raw_ostream.h>
 #include <llvm/Support/TargetSelect.h>
diff --git a/Source/Tools/Debugger/CMakeLists.txt b/Source/Tools/Debugger/CMakeLists.txt
index 9b095e22a3..3408ecc4a8 100644
--- a/Source/Tools/Debugger/CMakeLists.txt
+++ b/Source/Tools/Debugger/CMakeLists.txt
@@ -3,7 +3,7 @@ set(SRCS Main.cpp
   DebuggerState.cpp
   Context.cpp
   FEXImGui.cpp
-  IMGui.cpp
+  IMGui_I.cpp
   IRLexer.cpp
   GLUtils.cpp
   MainWindow.cpp
diff --git a/Source/Tools/Debugger/IMGui.cpp b/Source/Tools/Debugger/IMGui_I.cpp
similarity index 99%
rename from Source/Tools/Debugger/IMGui.cpp
rename to Source/Tools/Debugger/IMGui_I.cpp
index 12a5794cf9..74b620b731 100644
--- a/Source/Tools/Debugger/IMGui.cpp
+++ b/Source/Tools/Debugger/IMGui_I.cpp
@@ -1,7 +1,7 @@
 #include "DebuggerState.h"
 #include "Disassembler.h"
 #include "FEXImGui.h"
-#include "IMGui.h"
+#include "IMGui_I.h"
 #include "LogManager.h"
 #include "IRLexer.h"
 #include "Common/Config.h"
diff --git a/Source/Tools/Debugger/IMGui.h b/Source/Tools/Debugger/IMGui_I.h
similarity index 100%
rename from Source/Tools/Debugger/IMGui.h
rename to Source/Tools/Debugger/IMGui_I.h
diff --git a/Source/Tools/Debugger/Main.cpp b/Source/Tools/Debugger/Main.cpp
index 179baccb95..47275f2a29 100644
--- a/Source/Tools/Debugger/Main.cpp
+++ b/Source/Tools/Debugger/Main.cpp
@@ -5,7 +5,7 @@
 #include "MainWindow.h"
 #include "Context.h"
 #include "GLUtils.h"
-#include "IMGui.h"
+#include "IMGui_I.h"
 #include "DebuggerState.h"
 #include "LogManager.h"