diff --git a/buildheader/make_tdb.cc b/buildheader/make_tdb.cc
index e748185599f..ce8d710efe2 100644
--- a/buildheader/make_tdb.cc
+++ b/buildheader/make_tdb.cc
@@ -12,6 +12,7 @@
 // Don't include toku_assert.h.   Just use assert.h
 #include <assert.h>
 #include <string.h>
+#include <sys/types.h>
 
 #define VISIBLE "__attribute__((__visibility__(\"default\")))"
 
diff --git a/ft/ftdump.cc b/ft/ftdump.cc
index e7c4ab60359..7ba1687e66e 100644
--- a/ft/ftdump.cc
+++ b/ft/ftdump.cc
@@ -7,7 +7,9 @@
 /* Tell me the diff between two brt files. */
 
 #include "includes.h"
+#include <stdlib.h>
 #include <inttypes.h>
+#include <limits.h>
 
 static void
 format_time(const uint64_t time_int, char *buf) {
diff --git a/src/ydb.cc b/src/ydb.cc
index 55ef7e4ffc6..9b611e5482c 100644
--- a/src/ydb.cc
+++ b/src/ydb.cc
@@ -2089,7 +2089,7 @@ toku_maybe_get_engine_status_text (char * buff, int buffsize) {
         r = env_get_engine_status_text(env, buff, buffsize);
     }
     else {
-        r = ENODATA;
+        r = EOPNOTSUPP;
         snprintf(buff, buffsize, "Engine status not available: disabled by user.  This should only happen in test programs.\n");
     }
     return r;