diff --git a/include/WinStd/EAP.h b/include/WinStd/EAP.h
index aeb74e40..42b5b487 100644
--- a/include/WinStd/EAP.h
+++ b/include/WinStd/EAP.h
@@ -20,7 +20,8 @@
 
 #include "Common.h"
 
-#include <eaptypes.h>
+#include <Windows.h>
+#include <eaptypes.h> // Must include after <Windows.h>
 
 namespace winstd
 {
diff --git a/src/Crypt.cpp b/src/Crypt.cpp
index 02256121..039a7b23 100644
--- a/src/Crypt.cpp
+++ b/src/Crypt.cpp
@@ -20,6 +20,8 @@
 
 #include "StdAfx.h"
 
+#pragma comment(lib, "Crypt32.lib")
+
 
 //////////////////////////////////////////////////////////////////////
 // winstd::cert_context