diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj
index 31b954b27..47b2a63b3 100644
--- a/src/common/common.vcxproj
+++ b/src/common/common.vcxproj
@@ -74,7 +74,7 @@
   <ItemGroup>
     <MARMASM Include="fastjmp_arm.asm">
       <FileType>Document</FileType>
-      <ExcludedFromBuild Condition="'$(Platform)'!='ARM64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Platform)'!='ARM64' Or $(Configuration.Contains(Clang))">true</ExcludedFromBuild>
     </MARMASM>
     <MASM Include="fastjmp_x86.asm">
       <FileType>Document</FileType>
diff --git a/src/common/fastjmp.cpp b/src/common/fastjmp.cpp
index e7da0a6f0..6c793f919 100644
--- a/src/common/fastjmp.cpp
+++ b/src/common/fastjmp.cpp
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2021 Connor McLaughlin <stenzek@gmail.com>
 // SPDX-License-Identifier: (GPL-3.0 OR CC-BY-NC-ND-4.0)
 
-#ifndef _WIN32
+#if !defined(_MSC_VER) || defined(__clang__)
 
 #include "fastjmp.h"
 
diff --git a/src/common/intrin.h b/src/common/intrin.h
index 2c730f058..b75ea45ba 100644
--- a/src/common/intrin.h
+++ b/src/common/intrin.h
@@ -14,7 +14,7 @@
 #include <emmintrin.h>
 #elif defined(CPU_ARCH_ARM64)
 #define CPU_ARCH_NEON 1
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__clang__)
 #include <arm64_neon.h>
 #else
 #include <arm_neon.h>