@@ -221,10 +221,13 @@
  * #ifndef NULL_PTR
  * #define NULL_PTR 0
  * #endif
  */
 
+#ifdef _WIN32
+#pragma pack(push, cryptoki, 1)
+#endif
 
 /* All the various Cryptoki types and #define'd values are in the
  * file pkcs11t.h. */
 #include "pkcs11t.h"
 
@@ -287,10 +290,14 @@
 /* pkcs11f.h has all the information about the Cryptoki
  * function prototypes. */
 #include "pkcs11f.h"
 
 };
+
+#ifdef _WIN32
+#pragma pack(pop, cryptoki)
+#endif
 
 #undef CK_PKCS11_FUNCTION_INFO
 
 
 #undef __PASTE