diff --git a/ChangeLog b/ChangeLog
index e42d95a7c..00c8b2775 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,8 @@
    OpenSSL or if OpenSSL has ECC.
  - (dtucker) [openbsd-compat/arc4random.c] Use explicit_bzero instead of an
    assigment that might get optimized out.  ok djm@
+ - (dtucker) [bufaux.c bufbn.c bufec.c buffer.c] Pull in includes.h for
+   compat stuff, specifically whether or not OpenSSL has ECC.
 
 20140527
  - (djm) [cipher.c] Fix merge botch.
diff --git a/bufaux.c b/bufaux.c
index aa9b892d9..3976896a9 100644
--- a/bufaux.c
+++ b/bufaux.c
@@ -17,6 +17,8 @@
 
 /* Emulation wrappers for legacy OpenSSH buffer API atop sshbuf */
 
+#include "includes.h"
+
 #include <sys/types.h>
 
 #include "buffer.h"
diff --git a/bufbn.c b/bufbn.c
index 0a519ed2d..b7f7cb122 100644
--- a/bufbn.c
+++ b/bufbn.c
@@ -18,6 +18,8 @@
 
 /* Emulation wrappers for legacy OpenSSH buffer API atop sshbuf */
 
+#include "includes.h"
+
 #include <sys/types.h>
 
 #include "buffer.h"
diff --git a/bufec.c b/bufec.c
index b33ede385..127e56d43 100644
--- a/bufec.c
+++ b/bufec.c
@@ -18,6 +18,8 @@
 
 /* Emulation wrappers for legacy OpenSSH buffer API atop sshbuf */
 
+#include "includes.h"
+
 #include <sys/types.h>
 
 #include "buffer.h"
diff --git a/buffer.c b/buffer.c
index 07bc186d0..c5f708ab2 100644
--- a/buffer.c
+++ b/buffer.c
@@ -18,6 +18,8 @@
 
 /* Emulation wrappers for legacy OpenSSH buffer API atop sshbuf */
 
+#include "includes.h"
+
 #include <sys/types.h>
 
 #include "buffer.h"