diff --git a/cores/esp8266/Crypto.cpp b/cores/esp8266/Crypto.cpp
index e51a29b8b9..ae396b7d0b 100644
--- a/cores/esp8266/Crypto.cpp
+++ b/cores/esp8266/Crypto.cpp
@@ -23,10 +23,9 @@
     THE SOFTWARE.
 */
 
-#include <bearssl/bearssl.h>
 #include "Crypto.h"
 #include <TypeConversion.h>
-
+#include <bearssl/bearssl.h>
 #include <assert.h>
 
 namespace TypeCast = experimental::TypeConversion;
diff --git a/cores/esp8266/Crypto.h b/cores/esp8266/Crypto.h
index 435b4836a3..790c916b6c 100644
--- a/cores/esp8266/Crypto.h
+++ b/cores/esp8266/Crypto.h
@@ -27,6 +27,7 @@
 #define __ESP8266_ARDUINO_CRYPTO_H__
 
 #include <Arduino.h>
+#include <bearssl/bearssl_kdf.h>
 
 namespace experimental
 {
@@ -745,8 +746,7 @@ struct HKDF
 
 private:
 
-    // Use an opaque type to avoid #include <bearssl/bearssl.h> which drags the lib declarations into userland. The global scope prefix is required for compilation to succeed, it seems.
-    ::br_hkdf_context hkdfContext;
+    br_hkdf_context hkdfContext;
 };