diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h
index 4f1b3e3e98812b989e18e64caa30c4828bcbc606..1f870909a5ee25e77cddf69641051b25d5645279 100644
--- a/crypto/bio/bio.h
+++ b/crypto/bio/bio.h
@@ -63,6 +63,7 @@
 extern "C" {
 #endif
 
+#include <stdio.h>
 #include <openssl/crypto.h>
 
 /* These are the 'types' of BIOs */
diff --git a/crypto/crypto.h b/crypto/crypto.h
index 0b35fc387615df07abc8e7ce5a5eae4034b998ca..0bf74a16554622af6273e749334c7321331bf9eb 100644
--- a/crypto/crypto.h
+++ b/crypto/crypto.h
@@ -63,6 +63,10 @@
 extern "C" {
 #endif
 
+#ifndef NO_FP_API
+#include <stdio.h>
+#endif
+
 #include <openssl/stack.h>
 #include <openssl/opensslv.h>
 
diff --git a/crypto/err/err.h b/crypto/err/err.h
index 52202942daa2bd1271d0859956bdfce3debc3699..617fce7f8377c090f6f98ff6560370d3c558f21b 100644
--- a/crypto/err/err.h
+++ b/crypto/err/err.h
@@ -63,6 +63,10 @@
 extern "C" {
 #endif
 
+#ifndef NO_FP_API
+#include <stdio.h>
+#endif
+
 /* The following is a bit of a trick to help the object files only contain
  * the 'name of the file' string once.  Since 'err.h' is protected by the
  * HEADER_ERR_H stuff, this should be included only once per file. */
diff --git a/crypto/lhash/lhash.h b/crypto/lhash/lhash.h
index e97d39ffc51134496dda9b227125f1663fece1aa..9b1d5ef0589ec5e6fd7f2d14a2e8d7aeb2424938 100644
--- a/crypto/lhash/lhash.h
+++ b/crypto/lhash/lhash.h
@@ -67,6 +67,10 @@
 extern "C" {
 #endif
 
+#ifndef NO_FP_API
+#include <stdio.h>
+#endif
+
 typedef struct lhash_node_st
 	{
 	char *data;
diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h
index 3853ff61a3f68e6d526be6936922fc3d0b87f441..0357487c257d9a95454756027c03245fc4bf971e 100644
--- a/crypto/x509/x509.h
+++ b/crypto/x509/x509.h
@@ -1,4 +1,3 @@
-
 /* crypto/x509/x509.h */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
diff --git a/crypto/x509/x509_vfy.h b/crypto/x509/x509_vfy.h
index 41f65f72755061e64ba91a9b74b339c7201fc6ad..e0476370214d83c08ee411fdcc1ac94bb76fbfab 100644
--- a/crypto/x509/x509_vfy.h
+++ b/crypto/x509/x509_vfy.h
@@ -56,6 +56,12 @@
  * [including the GNU Public Licence.]
  */
 
+#ifndef HEADER_X509_H
+#include <openssl/x509.h>
+/* openssl/x509.h ends up #include-ing this file at about the only
+ * appropriate moment. */
+#endif
+
 #ifndef HEADER_X509_VFY_H
 #define HEADER_X509_VFY_H
 
diff --git a/ssl/ssl3.h b/ssl/ssl3.h
index 23375f16eac64996758908ebc60a428c868492e5..36f135182b5498177895c6dbebeda3e5fff741f0 100644
--- a/ssl/ssl3.h
+++ b/ssl/ssl3.h
@@ -60,6 +60,8 @@
 #define HEADER_SSL3_H 
 
 #include <openssl/buffer.h>
+#include <openssl/evp.h>
+#include <openssl/ssl.h>
 
 #ifdef  __cplusplus
 extern "C" {