diff --git a/lib/EAPBase/include/EAPXML.h b/lib/EAPBase/include/EAPXML.h
index 4e77c2a..5f8baf7 100644
--- a/lib/EAPBase/include/EAPXML.h
+++ b/lib/EAPBase/include/EAPXML.h
@@ -544,7 +544,7 @@ namespace eapxml
 
 #pragma once
 
-#include <WinStd/Hex.h>
+#include <stdex/hex>
 #include <stdex/base64>
 
 #include <assert.h>
@@ -726,7 +726,7 @@ namespace eapxml
         winstd::bstr bstr;
         HRESULT hr = get_element_value(pXmlParent, bstrElementName, bstr, ppXmlElement);
         if (SUCCEEDED(hr)) {
-            winstd::hex_dec dec;
+            stdex::hex_dec dec;
             bool is_last;
             dec.decode(aValue, is_last, (BSTR)bstr, bstr.length());
         }
@@ -875,7 +875,7 @@ namespace eapxml
     inline HRESULT put_element_hex(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pCurrentDOMNode, _In_z_ const BSTR bstrElementName, _In_opt_z_ const BSTR bstrNamespace, _In_bytecount_(nValueLen) LPCVOID pValue, _In_ SIZE_T nValueLen, _Out_opt_ winstd::com_obj<IXMLDOMElement> *ppXmlElement)
     {
         std::wstring sHex;
-        winstd::hex_enc enc;
+        stdex::hex_enc enc;
         enc.encode(sHex, pValue, nValueLen);
         return put_element_value(pDoc, pCurrentDOMNode, bstrElementName, bstrNamespace, winstd::bstr(sHex), ppXmlElement);
     }
@@ -960,7 +960,7 @@ namespace eapxml
         winstd::bstr bstr;
         HRESULT hr = get_attrib_value(pXmlParent, bstrAttributeName, &bstr);
         if (SUCCEEDED(hr)) {
-            winstd::hex_dec dec;
+            stdex::hex_dec dec;
             bool is_last;
             dec.decode(aValue, is_last, (BSTR)bstr, bstr.length());
         }
@@ -1007,7 +1007,7 @@ namespace eapxml
     inline HRESULT put_attrib_hex(_In_ IXMLDOMNode *pCurrentDOMNode, _In_z_ const BSTR bstrAttributeName, _In_bytecount_(nValueLen) LPCVOID pValue, _In_ SIZE_T nValueLen)
     {
         std::wstring sHex;
-        winstd::hex_enc enc;
+        stdex::hex_enc enc;
         enc.encode(sHex, pValue, nValueLen);
         return put_attrib_value(pCurrentDOMNode, bstrAttributeName, winstd::bstr(sHex));
     }
diff --git a/lib/GTC/src/PCH.h b/lib/GTC/src/PCH.h
index c63f60a..e7664cc 100644
--- a/lib/GTC/src/PCH.h
+++ b/lib/GTC/src/PCH.h
@@ -11,7 +11,7 @@
 
 #include "../../EAPBase/include/Module.h"
 
-#include <WinStd/Hex.h>
+#include <stdex/hex>
 
 #include <Windows.h>
 #include <EapHostError.h> // include after Windows.h
diff --git a/lib/MSCHAPv2/src/Method.cpp b/lib/MSCHAPv2/src/Method.cpp
index ff4c929..2984372 100644
--- a/lib/MSCHAPv2/src/Method.cpp
+++ b/lib/MSCHAPv2/src/Method.cpp
@@ -7,6 +7,7 @@
 #include "PCH.h"
 
 using namespace std;
+using namespace stdex;
 using namespace winstd;
 
 
diff --git a/lib/MSCHAPv2/src/PCH.h b/lib/MSCHAPv2/src/PCH.h
index eed58b4..110b1bb 100644
--- a/lib/MSCHAPv2/src/PCH.h
+++ b/lib/MSCHAPv2/src/PCH.h
@@ -12,7 +12,7 @@
 
 #include "../../EAPBase/include/Module.h"
 
-#include <WinStd/Hex.h>
+#include <stdex/hex>
 
 #include <Windows.h>
 #include <EapHostError.h> // include after Windows.h
diff --git a/lib/TLS/src/Method.cpp b/lib/TLS/src/Method.cpp
index 131b01f..8f6e79c 100644
--- a/lib/TLS/src/Method.cpp
+++ b/lib/TLS/src/Method.cpp
@@ -9,6 +9,7 @@
 #pragma comment(lib, "Secur32.lib")
 
 using namespace std;
+using namespace stdex;
 using namespace winstd;
 
 
diff --git a/lib/TLS/src/Module.cpp b/lib/TLS/src/Module.cpp
index 9bde80a..0658430 100644
--- a/lib/TLS/src/Module.cpp
+++ b/lib/TLS/src/Module.cpp
@@ -7,6 +7,7 @@
 #include "PCH.h"
 
 using namespace std;
+using namespace stdex;
 using namespace winstd;
 
 
diff --git a/lib/WinStd b/lib/WinStd
index 880fd34..cd025b4 160000
--- a/lib/WinStd
+++ b/lib/WinStd
@@ -1 +1 @@
-Subproject commit 880fd34e16d7f6624b7aab64b29a958c6a7ab388
+Subproject commit cd025b449a31cebde7f8b2ac85330f127f7e383d
diff --git a/lib/stdex b/lib/stdex
index 4521ea8..f76ece6 160000
--- a/lib/stdex
+++ b/lib/stdex
@@ -1 +1 @@
-Subproject commit 4521ea8f00379099888884bc8aa3c7a3894d6b9f
+Subproject commit f76ece6ca5c6f91276c2845ec7c677fc9773d452