diff --git a/library/dhm.c b/library/dhm.c
index bcad7fcb3..4b78722d0 100644
--- a/library/dhm.c
+++ b/library/dhm.c
@@ -131,7 +131,7 @@ int dhm_make_params( dhm_context *ctx, int x_size,
                      unsigned char *output, int *olen,
                      int (*f_rng)(void *), void *p_rng )
 {
-    int i, ret, n, n1, n2, n3;
+    int ret, n, n1, n2, n3;
     unsigned char *p;
 
     /*
@@ -206,8 +206,7 @@ int dhm_make_public( dhm_context *ctx, int x_size,
                      unsigned char *output, int olen,
                      int (*f_rng)(void *), void *p_rng )
 {
-    int ret, i, n;
-    unsigned char *p;
+    int ret, n;
 
     if( ctx == NULL || olen < 1 || olen > ctx->len )
         return( POLARSSL_ERR_DHM_BAD_INPUT_DATA );
diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index 3d15ad624..4b04efa43 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -625,7 +625,7 @@ static int ssl_write_client_key_exchange( ssl_context *ssl )
 
 static int ssl_write_certificate_verify( ssl_context *ssl )
 {
-    int ret, n;
+    int ret = 0, n = 0;
     unsigned char hash[36];
 
     SSL_DEBUG_MSG( 2, ( "=> write certificate verify" ) );
diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index baf23015d..f875fbfe7 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -681,7 +681,7 @@ static int ssl_write_server_hello_done( ssl_context *ssl )
 
 static int ssl_parse_client_key_exchange( ssl_context *ssl )
 {
-    int ret, i, n;
+    int ret, i, n = 0;
 
     SSL_DEBUG_MSG( 2, ( "=> parse client key exchange" ) );