diff --git a/.github/workflows/curl.yml b/.github/workflows/curl.yml
new file mode 100644
index 000000000..da2b149a1
--- /dev/null
+++ b/.github/workflows/curl.yml
@@ -0,0 +1,41 @@
+name: curl Test
+
+on:
+  push:
+  workflow_call:
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@master
+    - name: autogen
+      run: ./autogen.sh
+    - name: configure
+      run: ./configure --enable-all
+    - name: make
+      run: make
+    - name: install
+      run: sudo make install
+    - uses: actions/checkout@master
+      with:
+        repository: curl/curl
+        path: curl
+    - name: Install test dependency
+      working-directory: ./curl
+      run: sudo apt-get install nghttp2
+    - name: curl buildconf
+      working-directory: ./curl
+      run: ./buildconf
+    - name: curl configure
+      working-directory: ./curl
+      run: ./configure --with-wolfssl
+    - name: curl make
+      working-directory: ./curl
+      run: make
+    - name: curl unit tests
+      working-directory: ./curl
+      run: make test
+
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 890acce15..081859077 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -32,6 +32,8 @@ jobs:
         uses: ./.github/workflows/zephyr.yml
     hitch:
         uses: ./.github/workflows/hitch.yml
+    curl:
+        uses: ./.github/workflows/curl.yml
 # TODO: Currently this test fails. Enable it once it becomes passing.        
 #    haproxy:
 #        uses: ./.github/workflows/haproxy.yml
diff --git a/configure.ac b/configure.ac
index 7da2e3334..b20f5b7f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1726,7 +1726,8 @@ AC_ARG_ENABLE([error-queue-per-thread],
 
 if test "$ENABLED_ERRORQUEUEPERTHREAD" = "check"
 then
-    AS_IF([test "$thread_ls_on" = "no"],
+    AS_IF([test "$thread_ls_on" = "no" ||
+           test "$ENABLED_SINGLETHREADED" = "yes"],
         [ENABLED_ERRORQUEUEPERTHREAD=no],
         [ENABLED_ERRORQUEUEPERTHREAD=yes])
 fi
diff --git a/src/ocsp.c b/src/ocsp.c
index b1d89a165..d8f291f4a 100644
--- a/src/ocsp.c
+++ b/src/ocsp.c
@@ -1137,7 +1137,7 @@ WOLFSSL_OCSP_ONEREQ* wolfSSL_OCSP_request_add0_id(OcspRequest *req,
         return NULL;
 
     if (req->cid != NULL)
-        wolfSSL_OCSP_CERTID_free(req->cid);
+        wolfSSL_OCSP_CERTID_free((WOLFSSL_OCSP_CERTID*)req->cid);
     /* Keep to free */
     req->cid = (void*)cid;
 
diff --git a/tests/api.c b/tests/api.c
index ada4447ee..1fa2655ae 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -1447,7 +1447,8 @@ static int test_wolfSSL_CTX_load_verify_locations(void)
     /* Get cert cache size */
     ExpectIntGT(cacheSz = wolfSSL_CTX_get_cert_cache_memsize(ctx), 0);
 
-    ExpectNotNull(cache = XMALLOC(cacheSz, NULL, DYNAMIC_TYPE_TMP_BUFFER));
+    ExpectNotNull(cache = (byte*)XMALLOC(cacheSz, NULL,
+                            DYNAMIC_TYPE_TMP_BUFFER));
 
     ExpectIntEQ(wolfSSL_CTX_memsave_cert_cache(NULL, NULL, -1, NULL),
         BAD_FUNC_ARG);
@@ -34728,7 +34729,8 @@ static int test_wolfSSL_Tls13_Key_Logging_test(void)
 #endif /* OPENSSL_EXTRA && HAVE_SECRET_CALLBACK && WOLFSSL_TLS13 */
     return EXPECT_RESULT();
 }
-#if defined(WOLFSSL_TLS13) && defined(HAVE_ECH)
+#if defined(WOLFSSL_TLS13) && defined(HAVE_ECH) && \
+    defined(HAVE_IO_TESTS_DEPENDENCIES)
 static int test_wolfSSL_Tls13_ECH_params(void)
 {
     EXPECT_DECLS;
diff --git a/wolfcrypt/test/test.h b/wolfcrypt/test/test.h
index e1888d212..75f896887 100644
--- a/wolfcrypt/test/test.h
+++ b/wolfcrypt/test/test.h
@@ -35,9 +35,6 @@
     typedef sword32 wc_test_ret_t;
 #endif
 
-#ifdef HAVE_CONFIG_H
-    #include <config.h>
-#endif
 #include <wolfssl/wolfcrypt/settings.h>
 
 #ifdef HAVE_STACK_SIZE
diff --git a/wolfssl/test.h b/wolfssl/test.h
index 89661674b..eb6527e70 100644
--- a/wolfssl/test.h
+++ b/wolfssl/test.h
@@ -28,10 +28,8 @@
 #ifndef wolfSSL_TEST_H
 #define wolfSSL_TEST_H
 
-#ifdef HAVE_CONFIG_H
-    #include <config.h>
-#endif
 #include <wolfssl/wolfcrypt/settings.h>
+#include <wolfssl/wolfcrypt/wc_port.h>
 
 #ifdef FUSION_RTOS
     #include <fclstdio.h>
diff --git a/wolfssl/wolfcrypt/types.h b/wolfssl/wolfcrypt/types.h
index 396b18673..77500382f 100644
--- a/wolfssl/wolfcrypt/types.h
+++ b/wolfssl/wolfcrypt/types.h
@@ -31,9 +31,6 @@ decouple library dependencies with standard string, memory and so on.
 #ifndef WOLF_CRYPT_TYPES_H
 #define WOLF_CRYPT_TYPES_H
 
-    #ifdef HAVE_CONFIG_H
-        #include <config.h>
-    #endif
     #include <wolfssl/wolfcrypt/settings.h>
     #include <wolfssl/wolfcrypt/wc_port.h>