diff --git a/programs/ssl/ssl_context_info.c b/programs/ssl/ssl_context_info.c
index 929a0f2..4a7c773 100644
--- a/programs/ssl/ssl_context_info.c
+++ b/programs/ssl/ssl_context_info.c
@@ -48,7 +48,6 @@
 #include "mbedtls/error.h"
 #include "mbedtls/base64.h"
 #include "mbedtls/md.h"
-#include "../../library/md_wrap.h"
 #include "mbedtls/x509_crt.h"
 #include "mbedtls/ssl_ciphersuites.h"
 
@@ -638,7 +637,7 @@
         }
         else
         {
-            printf( "\tMessage-Digest : %s\n", md_info->name );
+            printf( "\tMessage-Digest : %s\n", mbedtls_md_get_name( md_info ) );
         }
     }
 
diff --git a/programs/test/selftest.c b/programs/test/selftest.c
index 02e1d12..26c1997 100644
--- a/programs/test/selftest.c
+++ b/programs/test/selftest.c
@@ -55,7 +55,6 @@
 #include "mbedtls/ecjpake.h"
 #include "mbedtls/timing.h"
 #include "mbedtls/nist_kw.h"
-#include "../library/entropy_poll.h"
 
 #include <string.h>