diff --git a/src/bcrypt_pbkdf.c b/src/bcrypt_pbkdf.c
index 98470c53..d1b5b3d7 100644
--- a/src/bcrypt_pbkdf.c
+++ b/src/bcrypt_pbkdf.c
@@ -15,10 +15,10 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "libssh2_priv.h"
 
 #ifndef HAVE_BCRYPT_PBKDF
 
-#include "libssh2_priv.h"
 #include <stdlib.h>
 #include <sys/types.h>
 #ifdef HAVE_SYS_PARAM_H
@@ -100,7 +100,7 @@ bcrypt_hash(uint8_t *sha2pass, uint8_t *sha2salt, uint8_t *out)
     _libssh2_explicit_zero(&state, sizeof(state));
 }
 
-int
+static int
 bcrypt_pbkdf(const char *pass, size_t passlen, const uint8_t *salt,
              size_t saltlen,
              uint8_t *key, size_t keylen, unsigned int rounds)
@@ -181,3 +181,22 @@ bcrypt_pbkdf(const char *pass, size_t passlen, const uint8_t *salt,
     return 0;
 }
 #endif /* HAVE_BCRYPT_PBKDF */
+
+/* Wrapper */
+
+int _libssh2_bcrypt_pbkdf(const char *pass,
+                          size_t passlen,
+                          const uint8_t *salt,
+                          size_t saltlen,
+                          uint8_t *key,
+                          size_t keylen,
+                          unsigned int rounds)
+{
+    return bcrypt_pbkdf(pass,
+                        passlen,
+                        salt,
+                        saltlen,
+                        key,
+                        keylen,
+                        rounds);
+}
diff --git a/src/blf.h b/src/blf.h
index cdd089ac..c694d31f 100644
--- a/src/blf.h
+++ b/src/blf.h
@@ -77,10 +77,5 @@ void blf_cbc_decrypt(blf_ctx *, uint8_t *, uint8_t *, uint32_t);
 /* Converts uint8_t to uint32_t */
 uint32_t Blowfish_stream2word(const uint8_t *, uint16_t, uint16_t *);
 
-/* bcrypt with pbkd */
-int bcrypt_pbkdf(const char *pass, size_t passlen, const uint8_t *salt,
-                 size_t saltlen,
-                 uint8_t *key, size_t keylen, unsigned int rounds);
-
 #endif /* !defined(HAVE_BCRYPT_PBKDF) && !defined(HAVE_BLH_H) */
 #endif /* __LIBSSH2_BLF_H */
diff --git a/src/misc.c b/src/misc.c
index a262e09d..a8bebcfc 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -39,7 +39,6 @@
 
 #include "libssh2_priv.h"
 #include "misc.h"
-#include "blf.h"
 
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
@@ -927,23 +926,3 @@ int _libssh2_eob(struct string_buf *buf)
     unsigned char *endp = &buf->data[buf->len];
     return buf->dataptr >= endp;
 }
-
-/* Wrappers */
-
-int _libssh2_bcrypt_pbkdf(const char *pass,
-                          size_t passlen,
-                          const uint8_t *salt,
-                          size_t saltlen,
-                          uint8_t *key,
-                          size_t keylen,
-                          unsigned int rounds)
-{
-    /* defined in bcrypt_pbkdf.c */
-    return bcrypt_pbkdf(pass,
-                        passlen,
-                        salt,
-                        saltlen,
-                        key,
-                        keylen,
-                        rounds);
-}
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index c748e815..485b6fa8 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -230,7 +230,7 @@ foreach(test ${TESTS})
 endforeach()
 
 if(WIN32 AND BUILD_SHARED_LIBS)
-  # Workaround for Visual Studio
+  # Workaround for platforms not exporting internal functions from libssh2 shared lib
   add_executable(test_keyboard_interactive_auth_info_request test_keyboard_interactive_auth_info_request.c ../src/userauth_kbd_packet.c ../src/misc.c)
 else()
   add_executable(test_keyboard_interactive_auth_info_request test_keyboard_interactive_auth_info_request.c ../src/userauth_kbd_packet.c)
diff --git a/tests/test_keyboard_interactive_auth_info_request.c b/tests/test_keyboard_interactive_auth_info_request.c
index fc9e3d6a..96df9556 100644
--- a/tests/test_keyboard_interactive_auth_info_request.c
+++ b/tests/test_keyboard_interactive_auth_info_request.c
@@ -315,22 +315,3 @@ int main(void)
 
     return 0;
 }
-
-/* Workaround for Visual Studio */
-#ifdef _MSC_VER
-int
-bcrypt_pbkdf(const char *pass, size_t passlen, const uint8_t *salt,
-             size_t saltlen,
-             uint8_t *key, size_t keylen, unsigned int rounds)
-{
-    (void)pass;
-    (void)passlen;
-    (void)salt;
-    (void)saltlen;
-    (void)key;
-    (void)keylen;
-    (void)rounds;
-
-    return -1;
-}
-#endif