diff --git a/libffi/init.lisp b/libffi/init.lisp
index fda59741db5d3f60b028789e09958c6c944db8a3..aed9ad0e70300c04f2525f401264e3b6bc5e87a1 100644
--- a/libffi/init.lisp
+++ b/libffi/init.lisp
@@ -30,7 +30,7 @@
 (cffi:define-foreign-library (libffi)
   (:darwin (:or "libffi.dylib" "libffi32.dylib"))
   (:unix (:or "libffi.so.6" "libffi32.so.6" "libffi.so.5" "libffi32.so.5"))
-  (:windows "libffi.dll")
+  (:windows (:or "libffi-6.dll" "libffi-5.dll" "libffi.dll"))
   (t (:default "libffi")))
 
 (cffi:load-foreign-library 'libffi)
diff --git a/libffi/libffi-win32.lisp b/libffi/libffi-win32.lisp
index d25184b1a5256e4ab466cbd54f4cbd8b48fdd7ac..9fc6e4e5d0f7b0dd357550ae19fcc2d4310e1337 100644
--- a/libffi/libffi-win32.lisp
+++ b/libffi/libffi-win32.lisp
@@ -48,7 +48,7 @@
 (ctype unsigned "unsigned")
 
 (cstruct ffi-type "struct _ffi_type"
-  (size    "size"     :type sizet)
+  (size    "size"     :type :sizet)
   (alignment "alignment"     :type ushort)
   (type    "type"     :type ushort)
   (elements   "elements"   :type :pointer))