diff --git a/configure.ac b/configure.ac
index 2f8f134a7..884583ae8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8720,7 +8720,11 @@ if test "$ENABLED_OPENSSLEXTRA" = "yes" && test "$ENABLED_LINUXKM" = "no"
 then
     SAVE_CFLAGS=$CFLAGS
     CFLAGS="$CFLAGS -I$srcdir"
-    for header in "${srcdir}"/wolfssl/openssl/*.h
+    build_pwd="$(pwd)"
+    cd "$srcdir"
+    openssl_headers=$(echo wolfssl/openssl/*.h)
+    cd "$build_pwd"
+    for header in $openssl_headers
     do
         AC_CHECK_HEADER([$header], [], [
                 AC_MSG_ERROR([Error including $header. Possible circular dependency introduced or missing include.])
diff --git a/wolfssl/openssl/bn.h b/wolfssl/openssl/bn.h
index 91a844413..4cad216e9 100644
--- a/wolfssl/openssl/bn.h
+++ b/wolfssl/openssl/bn.h
@@ -66,7 +66,7 @@ typedef struct WOLFSSL_BIGNUM {
     #endif
 #endif
 
-#define WOLFSSL_BN_RAND_TOP_ANY     -1
+#define WOLFSSL_BN_RAND_TOP_ANY     (-1)
 #define WOLFSSL_BN_RAND_TOP_ONE     0
 #define WOLFSSL_BN_RAND_TOP_TWO     1