diff --git a/demo/demo_client.c b/demo/demo_client.c
index c256d9e0..7765e120 100644
--- a/demo/demo_client.c
+++ b/demo/demo_client.c
@@ -25,6 +25,7 @@
 #pragma comment(lib,"ws2_32.lib")
 #pragma comment(lib,"event.lib")
 #pragma comment(lib, "Iphlpapi.lib")
+#pragma comment(lib, "Bcrypt.lib")
 #include "../tests/getopt.h"
 #else
 #include <sys/socket.h>
diff --git a/demo/demo_server.c b/demo/demo_server.c
index b41d6657..caec2382 100644
--- a/demo/demo_server.c
+++ b/demo/demo_server.c
@@ -25,6 +25,7 @@
 #pragma comment(lib,"ws2_32.lib")
 #pragma comment(lib,"event.lib")
 #pragma comment(lib, "Iphlpapi.lib")
+#pragma comment(lib, "Bcrypt.lib")
 #endif
 
 
diff --git a/src/common/xqc_random.h b/src/common/xqc_random.h
index 665dc4fc..9bcb6c1c 100644
--- a/src/common/xqc_random.h
+++ b/src/common/xqc_random.h
@@ -13,6 +13,10 @@
 #include "src/common/xqc_common.h"
 #ifdef XQC_SYS_WINDOWS
 #include <wincrypt.h>
+#undef PKCS7_SIGNER_INFO
+#undef X509_CERT_PAIR
+#undef X509_EXTENSIONS
+#undef X509_NAME
 #endif