diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd9a7487d..51889ebec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2376,7 +2376,8 @@ install(FILES
 # Install the export set
 install(EXPORT wolfssl-targets
         DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/wolfssl
-        FILE wolfssl-config.cmake)
+        FILE wolfssl-targets.cmake
+        NAMESPACE wolfssl::)
 
 # TODO: Distro build + rules for what to include in the distro.
 #       See various include.am files.
diff --git a/wolfssl/wolfio.h b/wolfssl/wolfio.h
index 8c3238405..a7d70e01f 100644
--- a/wolfssl/wolfio.h
+++ b/wolfssl/wolfio.h
@@ -26,6 +26,8 @@
 #ifndef WOLFSSL_IO_H
 #define WOLFSSL_IO_H
 
+#include <wolfssl/ssl.h>
+
 #ifdef __cplusplus
     extern "C" {
 #endif