diff --git a/StepmaniaCore.cmake b/StepmaniaCore.cmake
index b736901ac1..d40280ff06 100644
--- a/StepmaniaCore.cmake
+++ b/StepmaniaCore.cmake
@@ -153,6 +153,12 @@ check_type_size(pid_t SIZEOF_PID_T)
 check_type_size(size_t SIZEOF_SIZE_T)
 check_type_size(ssize_t SIZEOF_SSIZE_T)
 
+if(WIN32 AND SIZEOF_INTPTR_T EQUAL 8)
+  set(SM_WIN32_ARCH "x64")
+else()
+  set(SM_WIN32_ARCH "x86")
+endif()
+
 include(TestBigEndian)
 test_big_endian(BIGENDIAN)
 if(${BIGENDIAN})
@@ -280,11 +286,6 @@ if(WIN32)
     set(HAS_FFMPEG TRUE)
   else()
     # FFMPEG...it can be evil.
-    if(SIZEOF_INTPTR_T EQUAL 8)
-      set(SM_WIN32_ARCH "x64")
-    else()
-      set(SM_WIN32_ARCH "x86")
-    endif()
     find_library(LIB_SWSCALE
                  NAMES "swscale"
                  PATHS "${SM_EXTERN_DIR}/ffmpeg/${SM_WIN32_ARCH}/lib"
diff --git a/extern/CMakeProject-mad.cmake b/extern/CMakeProject-mad.cmake
index aa223391cd..dccb8d575c 100644
--- a/extern/CMakeProject-mad.cmake
+++ b/extern/CMakeProject-mad.cmake
@@ -62,7 +62,7 @@ else()
     # first glance.
     sm_add_compile_definition("mad" ASO_ZEROCHECK)
     sm_add_compile_definition("mad" $<$<CONFIG:Debug>:FPM_DEFAULT>)
-    if(SIZEOF_INTPTR_T EQUAL 8)
+    if(SM_WIN32_ARCH EQUAL "x64")
       sm_add_compile_definition("mad" $<$<CONFIG:Release>:FPM_64BIT>)
       sm_add_compile_definition("mad" $<$<CONFIG:MinSizeRel>:FPM_64BIT>)
       sm_add_compile_definition("mad" $<$<CONFIG:RelWithDebInfo>:FPM_64BIT>)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9bc3169f37..6120bbed86 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -486,7 +486,7 @@ if(WIN32)
   sm_add_link_flag("${SM_EXE_NAME}" "/LIBPATH:\"${DIRECTX_LIBRARY_DIR}\"")
   sm_add_link_flag("${SM_EXE_NAME}" "/LIBPATH:\"${SM_EXTERN_DIR}/ffmpeg/${SM_WIN32_ARCH}/lib\"")
   sm_add_link_flag("${SM_EXE_NAME}"
-                   "/LIBPATH:\"${SM_SRC_DIR}/archutils/Win32/ddk\"")
+                   "/LIBPATH:\"${SM_SRC_DIR}/archutils/Win32/ddk/${SM_WIN32_ARCH}\"")
   sm_add_link_flag("${SM_EXE_NAME}" "/ERRORREPORT:SEND")
   sm_add_link_flag("${SM_EXE_NAME}" "/MAPINFO:EXPORTS")
   sm_add_link_flag("${SM_EXE_NAME}" "/SAFESEH:NO")
diff --git a/src/archutils/Win32/ddk/x64/dbghelp.lib b/src/archutils/Win32/ddk/x64/dbghelp.lib
new file mode 100644
index 0000000000..07608792d4
Binary files /dev/null and b/src/archutils/Win32/ddk/x64/dbghelp.lib differ
diff --git a/src/archutils/Win32/ddk/x64/hid.lib b/src/archutils/Win32/ddk/x64/hid.lib
new file mode 100644
index 0000000000..302cf5a5b5
Binary files /dev/null and b/src/archutils/Win32/ddk/x64/hid.lib differ
diff --git a/src/archutils/Win32/ddk/x64/setupapi.lib b/src/archutils/Win32/ddk/x64/setupapi.lib
new file mode 100644
index 0000000000..02f2981a24
Binary files /dev/null and b/src/archutils/Win32/ddk/x64/setupapi.lib differ
diff --git a/src/archutils/Win32/ddk/dbghelp.lib b/src/archutils/Win32/ddk/x86/dbghelp.lib
similarity index 100%
rename from src/archutils/Win32/ddk/dbghelp.lib
rename to src/archutils/Win32/ddk/x86/dbghelp.lib
diff --git a/src/archutils/Win32/ddk/hid.lib b/src/archutils/Win32/ddk/x86/hid.lib
similarity index 100%
rename from src/archutils/Win32/ddk/hid.lib
rename to src/archutils/Win32/ddk/x86/hid.lib
diff --git a/src/archutils/Win32/ddk/setupapi.lib b/src/archutils/Win32/ddk/x86/setupapi.lib
similarity index 100%
rename from src/archutils/Win32/ddk/setupapi.lib
rename to src/archutils/Win32/ddk/x86/setupapi.lib