diff --git a/crypto/asn1/a_gentm.c b/crypto/asn1/a_gentm.c
index 09e4f171..ee6b3db5 100644
--- a/crypto/asn1/a_gentm.c
+++ b/crypto/asn1/a_gentm.c
@@ -63,6 +63,8 @@
 #include <openssl/mem.h>
 #include <openssl/time_support.h>
 
+#include "asn1_locl.h"
+
 int asn1_generalizedtime_to_tm(struct tm *tm, const ASN1_GENERALIZEDTIME *d)
 {
     static const int min[9] = { 0, 0, 1, 1, 0, 0, 0, 0, 0 };
diff --git a/crypto/asn1/a_utctm.c b/crypto/asn1/a_utctm.c
index 35eb1c9b..5a55bd24 100644
--- a/crypto/asn1/a_utctm.c
+++ b/crypto/asn1/a_utctm.c
@@ -63,6 +63,8 @@
 #include <openssl/mem.h>
 #include <openssl/time_support.h>
 
+#include "asn1_locl.h"
+
 #if 0
 int i2d_ASN1_UTCTIME(ASN1_UTCTIME *a, unsigned char **pp)
 {
diff --git a/crypto/bio/fd.c b/crypto/bio/fd.c
index 0b3484c9..12e6a72b 100644
--- a/crypto/bio/fd.c
+++ b/crypto/bio/fd.c
@@ -72,6 +72,8 @@
 #include <openssl/err.h>
 #include <openssl/mem.h>
 
+#include "internal.h"
+
 
 static int bio_fd_non_fatal_error(int err) {
   if (
diff --git a/crypto/cipher/tls_cbc.c b/crypto/cipher/tls_cbc.c
index e6aaabc8..c0d566dd 100644
--- a/crypto/cipher/tls_cbc.c
+++ b/crypto/cipher/tls_cbc.c
@@ -58,6 +58,7 @@
 #include <openssl/sha.h>
 
 #include "../internal.h"
+#include "internal.h"
 
 
 /* TODO(davidben): unsigned should be size_t. The various constant_time
diff --git a/crypto/conf/conf.c b/crypto/conf/conf.c
index eed07e6d..e4fc428b 100644
--- a/crypto/conf/conf.c
+++ b/crypto/conf/conf.c
@@ -65,6 +65,7 @@
 #include <openssl/mem.h>
 
 #include "conf_def.h"
+#include "internal.h"
 
 
 static uint32_t conf_value_hash(const CONF_VALUE *v) {
diff --git a/crypto/cpu-arm.c b/crypto/cpu-arm.c
index a42484db..20bf0ff7 100644
--- a/crypto/cpu-arm.c
+++ b/crypto/cpu-arm.c
@@ -25,6 +25,8 @@
 
 #include <openssl/arm_arch.h>
 
+#include "internal.h"
+
 
 /* We can't include <sys/auxv.h> because the Android SDK version against which
  * Chromium builds is too old to have it. Instead we define all the constants
diff --git a/crypto/cpu-intel.c b/crypto/cpu-intel.c
index e717e1f6..431e1e15 100644
--- a/crypto/cpu-intel.c
+++ b/crypto/cpu-intel.c
@@ -75,6 +75,8 @@
 #pragma warning(pop)
 #endif
 
+#include "internal.h"
+
 
 /* OPENSSL_cpuid runs the cpuid instruction. |leaf| is passed in as EAX and ECX
  * is set to zero. It writes EAX, EBX, ECX, and EDX to |*out_eax| through
diff --git a/tool/digest.cc b/tool/digest.cc
index 7cd88278..012202ce 100644
--- a/tool/digest.cc
+++ b/tool/digest.cc
@@ -41,6 +41,8 @@ typedef int ssize_t;
 
 #include <openssl/digest.h>
 
+#include "internal.h"
+
 
 struct close_delete {
   void operator()(int *fd) {
diff --git a/tool/transport_common.cc b/tool/transport_common.cc
index 2c15c00b..7fa1a64e 100644
--- a/tool/transport_common.cc
+++ b/tool/transport_common.cc
@@ -46,6 +46,7 @@ typedef int ssize_t;
 #include <openssl/ssl.h>
 
 #include "internal.h"
+#include "transport_common.h"
 
 
 #if !defined(OPENSSL_WINDOWS)