diff --git a/include/mbedtls/dhm.h b/include/mbedtls/dhm.h
index cd056d1b4..d7ab1522e 100644
--- a/include/mbedtls/dhm.h
+++ b/include/mbedtls/dhm.h
@@ -221,7 +221,7 @@ int mbedtls_dhm_read_public( mbedtls_dhm_context *ctx,
  * \param ctx      DHM context
  * \param x_size   private value size in bytes
  * \param output   destination buffer
- * \param olen     must be equal to ctx->P.len
+ * \param olen     must be at least equal to the size of P, ctx->len
  * \param f_rng    RNG function
  * \param p_rng    RNG parameter
  *
diff --git a/library/havege.c b/library/havege.c
index 7623bc067..2b75ef7bd 100644
--- a/library/havege.c
+++ b/library/havege.c
@@ -174,6 +174,8 @@ static void havege_fill( mbedtls_havege_state *hs )
     PTX  = U1 = 0;
     PTY  = U2 = 0;
 
+    (void)PTX;
+
     memset( RES, 0, sizeof( RES ) );
 
     while( n < MBEDTLS_HAVEGE_COLLECT_SIZE * 4 )
diff --git a/library/rsa.c b/library/rsa.c
old mode 100644
new mode 100755
index 9611265be..423a9b1aa
--- a/library/rsa.c
+++ b/library/rsa.c
@@ -804,12 +804,7 @@ int mbedtls_rsa_rsaes_pkcs1_v15_decrypt( mbedtls_rsa_context *ctx,
     int ret;
     size_t ilen, pad_count = 0, i;
     unsigned char *p, bad, pad_done = 0;
-#if defined(__clang_analyzer__)
-    /* Shut up Clang, mbedtls_rsa_public/private writes to this */
-    unsigned char buf[MBEDTLS_MPI_MAX_SIZE] = { };
-#else
     unsigned char buf[MBEDTLS_MPI_MAX_SIZE];
-#endif
 
     if( mode == MBEDTLS_RSA_PRIVATE && ctx->padding != MBEDTLS_RSA_PKCS_V15 )
         return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
@@ -1189,12 +1184,7 @@ int mbedtls_rsa_rsassa_pss_verify_ext( mbedtls_rsa_context *ctx,
     size_t slen, msb;
     const mbedtls_md_info_t *md_info;
     mbedtls_md_context_t md_ctx;
-#if defined(__clang_analyzer__)
-    /* Shut up Clang, mbedtls_rsa_public/private writes to this */
-    unsigned char buf[MBEDTLS_MPI_MAX_SIZE] = { };
-#else
     unsigned char buf[MBEDTLS_MPI_MAX_SIZE];
-#endif
 
     if( mode == MBEDTLS_RSA_PRIVATE && ctx->padding != MBEDTLS_RSA_PKCS_V21 )
         return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
@@ -1336,12 +1326,7 @@ int mbedtls_rsa_rsassa_pkcs1_v15_verify( mbedtls_rsa_context *ctx,
     mbedtls_md_type_t msg_md_alg;
     const mbedtls_md_info_t *md_info;
     mbedtls_asn1_buf oid;
-#if defined(__clang_analyzer__)
-    /* Shut up Clang, mbedtls_rsa_public/private writes to this */
-    unsigned char buf[MBEDTLS_MPI_MAX_SIZE] = { };
-#else
     unsigned char buf[MBEDTLS_MPI_MAX_SIZE];
-#endif
 
     if( mode == MBEDTLS_RSA_PRIVATE && ctx->padding != MBEDTLS_RSA_PKCS_V15 )
         return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
diff --git a/programs/pkey/dh_client.c b/programs/pkey/dh_client.c
index 59c4fa8c2..230bf4d7c 100644
--- a/programs/pkey/dh_client.c
+++ b/programs/pkey/dh_client.c
@@ -30,6 +30,7 @@
 #else
 #include <stdio.h>
 #define mbedtls_printf     printf
+#define mbedtls_time_t     time_t
 #endif
 
 #if defined(MBEDTLS_AES_C) && defined(MBEDTLS_DHM_C) && \
diff --git a/programs/pkey/dh_genprime.c b/programs/pkey/dh_genprime.c
index 6005a62f5..d30c73bf7 100644
--- a/programs/pkey/dh_genprime.c
+++ b/programs/pkey/dh_genprime.c
@@ -30,6 +30,7 @@
 #else
 #include <stdio.h>
 #define mbedtls_printf     printf
+#define mbedtls_time_t     time_t
 #endif
 
 #if !defined(MBEDTLS_BIGNUM_C) || !defined(MBEDTLS_ENTROPY_C) ||   \
diff --git a/programs/pkey/dh_server.c b/programs/pkey/dh_server.c
index 83b0b4456..cb156f79b 100644
--- a/programs/pkey/dh_server.c
+++ b/programs/pkey/dh_server.c
@@ -30,6 +30,7 @@
 #else
 #include <stdio.h>
 #define mbedtls_printf     printf
+#define mbedtls_time_t     time_t
 #endif
 
 #if defined(MBEDTLS_AES_C) && defined(MBEDTLS_DHM_C) && \
diff --git a/programs/ssl/ssl_fork_server.c b/programs/ssl/ssl_fork_server.c
index 545e2fbf3..363f38f73 100644
--- a/programs/ssl/ssl_fork_server.c
+++ b/programs/ssl/ssl_fork_server.c
@@ -31,6 +31,7 @@
 #include <stdio.h>
 #define mbedtls_fprintf    fprintf
 #define mbedtls_printf     printf
+#define mbedtls_time_t     time_t
 #endif
 
 #if !defined(MBEDTLS_BIGNUM_C) || !defined(MBEDTLS_CERTS_C) ||    \
diff --git a/tests/suites/main_test.function b/tests/suites/main_test.function
index f18248578..ac5322e45 100644
--- a/tests/suites/main_test.function
+++ b/tests/suites/main_test.function
@@ -83,6 +83,7 @@ int dep_check( char *str )
         return( 1 );
 
 DEP_CHECK_CODE
+#line !LINE_NO! "main_test.function"
 
     return( DEPENDENCY_NOT_SUPPORTED );
 }
@@ -96,8 +97,12 @@ int dispatch_test(int cnt, char *params[50])
 #if defined(TEST_SUITE_ACTIVE)
     ret = DISPATCH_TEST_SUCCESS;
 
+    // Cast to void to avoid compiler warnings
+    (void)ret;
+
 DISPATCH_FUNCTION
     {
+#line !LINE_NO! "main_test.function"
         mbedtls_fprintf( stdout,
                          "FAILED\nSkipping unknown test function '%s'\n",
                          params[0] );