diff --git a/library/cipher_wrap.c b/library/cipher_wrap.c
index b623b3c59..7b597d614 100644
--- a/library/cipher_wrap.c
+++ b/library/cipher_wrap.c
@@ -62,6 +62,10 @@
 #include "polarssl/ccm.h"
 #endif
 
+#if defined(POLARSSL_CIPHER_NULL_CIPHER)
+#include <string.h>
+#endif
+
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
diff --git a/library/md2.c b/library/md2.c
index 180a25b2e..43c129fb9 100644
--- a/library/md2.c
+++ b/library/md2.c
@@ -36,6 +36,8 @@
 
 #include "polarssl/md2.h"
 
+#include <string.h>
+
 #if defined(POLARSSL_FS_IO)
 #include <stdio.h>
 #endif