diff --git a/programs/ssl/ssl_pthread_server.c b/programs/ssl/ssl_pthread_server.c
index 3f7d2cd70..96e872a60 100644
--- a/programs/ssl/ssl_pthread_server.c
+++ b/programs/ssl/ssl_pthread_server.c
@@ -48,7 +48,7 @@
 #endif
 
 #if defined(POLARSSL_MEMORY_BUFFER_ALLOC_C)
-#include "polarssl/memory.h"
+#include "polarssl/memory_buffer_alloc.h"
 #endif
 
 #if !defined(POLARSSL_BIGNUM_C) || !defined(POLARSSL_CERTS_C) ||            \
diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
index 0126b4ce5..7e0af496d 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -79,7 +79,7 @@ int main( int argc, char *argv[] )
 #endif
 
 #if defined(POLARSSL_MEMORY_BUFFER_ALLOC_C)
-#include "polarssl/memory.h"
+#include "polarssl/memory_buffer_alloc.h"
 #endif
 
 #define DFL_SERVER_ADDR         NULL
diff --git a/programs/test/selftest.c b/programs/test/selftest.c
index aa4410d0d..15a63d004 100644
--- a/programs/test/selftest.c
+++ b/programs/test/selftest.c
@@ -57,7 +57,7 @@
 #include "polarssl/timing.h"
 
 #if defined(POLARSSL_MEMORY_BUFFER_ALLOC_C)
-#include "polarssl/memory.h"
+#include "polarssl/memory_buffer_alloc.h"
 #endif
 
 int main( int argc, char *argv[] )
diff --git a/tests/suites/helpers.function b/tests/suites/helpers.function
index b00642946..2cc129a52 100644
--- a/tests/suites/helpers.function
+++ b/tests/suites/helpers.function
@@ -1,7 +1,3 @@
-#if defined(POLARSSL_MEMORY_BUFFER_ALLOC_C)
-#include "polarssl/memory.h"
-#endif
-
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else