diff --git a/cpu.h b/cpu.h
index 3c96457e..7c27c145 100644
--- a/cpu.h
+++ b/cpu.h
@@ -22,7 +22,7 @@
 # if defined(__GNUC__)
 #  include <stdint.h>
 # endif
-# if defined(__ARM_NEON)
+# if defined(__ARM_NEON) || defined(_MSC_VER)
 #  include <arm_neon.h>
 # endif
 # if defined(__GNUC__) && !defined(__apple_build_version__)
diff --git a/cryptest.nmake b/cryptest.nmake
index b350476d..d072e91e 100644
--- a/cryptest.nmake
+++ b/cryptest.nmake
@@ -78,6 +78,8 @@ CXXFLAGS = $(CXXFLAGS) /FI sdkddkver.h
 !ENDIF
 !IF "$(WINDOWSPHONEKITDIR)" != "" || "$(UNIVERSALCRTSDKDIR)" != "" || "$(UCRTVERSION)" != ""
 CXXFLAGS = $(CXXFLAGS) /FI winapifamily.h
+!ELSEIF "$(PLATFORM)" == "ARM" || "$(PLATFORM)" == "arm" || "$(PLATFORM)" == "ARM64" || "$(PLATFORM)" == "arm64"
+CXXFLAGS = $(CXXFLAGS) /FI winapifamily.h
 !ENDIF
 
 # Check for empty Platform and Processor
@@ -122,7 +124,8 @@ LDFLAGS = $(LDFLAGS) /MACHINE:X64
 LDLIBS = $(LDLIBS) ws2_32.lib kernel32.lib
 !ENDIF
 
-!IF "$(PLATFORM)" == "ARM" || "$(PLATFORM)" == "arm"
+# We still don't know what we need for ARM64 on Windows. ARM64 and arm64 may be incorrect
+!IF "$(PLATFORM)" == "ARM" || "$(PLATFORM)" == "arm" || "$(PLATFORM)" == "ARM64" || "$(PLATFORM)" == "arm64"
 # CXXFLAGS = $(CXXFLAGS) /D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 /DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP
 CXXFLAGS = $(CXXFLAGS) /DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP
 # CXXFLAGS = $(CXXFLAGS) /DWINAPI_FAMILY=WINAPI_FAMILY_APP