diff --git a/programs/random/gen_entropy.c b/programs/random/gen_entropy.c
index 29e7e2f46..0ff443f9c 100644
--- a/programs/random/gen_entropy.c
+++ b/programs/random/gen_entropy.c
@@ -87,7 +87,7 @@ int main( int argc, char *argv[] )
     ret = 0;
 
 cleanup:
-    printf( "\n" );
+    polarssl_printf( "\n" );
 
     fclose( f );
     entropy_free( &entropy );
diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
index 3b1f035f2..a98eff8ab 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -1512,7 +1512,7 @@ reset:
 #if !defined(_WIN32)
     if( received_sigterm )
     {
-        printf( " interrupted by SIGTERM\n" );
+        polarssl_printf( " interrupted by SIGTERM\n" );
         ret = 0;
         goto exit;
     }
@@ -1787,7 +1787,6 @@ data_exchange:
     }
 
     buf[written] = '\0';
-    printf( " %d bytes written in %d fragments\n\n%s\n", written, frags, (char *) buf );
     polarssl_printf( " %d bytes written in %d fragments\n\n%s\n", written, frags, (char *) buf );
     ret = 0;
 
@@ -1825,7 +1824,7 @@ exit:
     }
 #endif
 
-    printf( "  . Cleaning up..." );
+    polarssl_printf( "  . Cleaning up..." );
     fflush( stdout );
 
     if( client_fd != -1 )
@@ -1866,7 +1865,7 @@ exit:
     memory_buffer_alloc_free();
 #endif
 
-    printf( " done.\n" );
+    polarssl_printf( " done.\n" );
 
 #if defined(_WIN32)
     polarssl_printf( "  + Press Enter to exit this program.\n" );
diff --git a/scripts/generate_errors.pl b/scripts/generate_errors.pl
index b25e99af8..04591b28b 100755
--- a/scripts/generate_errors.pl
+++ b/scripts/generate_errors.pl
@@ -94,7 +94,7 @@ while (my $line = <GREP>)
     my $found_hl = grep $_ eq $module_name, @high_level_modules;
     if (!$found_ll && !$found_hl)
     {
-        printf("Error: Do not know how to handle: $module_name\n");
+        polarssl_printf("Error: Do not know how to handle: $module_name\n");
         exit 1;
     }