diff --git a/library/camellia.c b/library/camellia.c
index 72d902b8e..f765f1b50 100644
--- a/library/camellia.c
+++ b/library/camellia.c
@@ -36,8 +36,9 @@
 
 #include "polarssl/camellia.h"
 
-#if defined(POLARSSL_SELF_TEST)
 #include <string.h>
+
+#if defined(POLARSSL_SELF_TEST)
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
diff --git a/library/x509_crl.c b/library/x509_crl.c
index 78b925caa..94076e791 100644
--- a/library/x509_crl.c
+++ b/library/x509_crl.c
@@ -51,6 +51,7 @@
 #include "polarssl/platform.h"
 #else
 #include <stdlib.h>
+#include <stdio.h>
 #define polarssl_free       free
 #define polarssl_malloc     malloc
 #define polarssl_snprintf   snprintf
diff --git a/library/x509_csr.c b/library/x509_csr.c
index ad49abc97..826eafd94 100644
--- a/library/x509_csr.c
+++ b/library/x509_csr.c
@@ -51,6 +51,7 @@
 #include "polarssl/platform.h"
 #else
 #include <stdlib.h>
+#include <stdio.h>
 #define polarssl_free       free
 #define polarssl_malloc     malloc
 #define polarssl_snprintf   snprintf