diff --git a/fdbclient/DatabaseContext.h b/fdbclient/DatabaseContext.h
index bc3d8296c7..3d073d3c45 100644
--- a/fdbclient/DatabaseContext.h
+++ b/fdbclient/DatabaseContext.h
@@ -24,7 +24,6 @@
 #include "flow/FastRef.h"
 #include "fdbclient/StorageServerInterface.h"
 #include "flow/genericactors.actor.h"
-#include <cstdint>
 #include <vector>
 #pragma once
 
@@ -206,9 +205,8 @@ public:
 	Future<Void> switchConnectionFile(Reference<ClusterConnectionFile> standby);
 	Future<Void> connectionFileChanged();
 	bool switchable = false;
-
-	// Management API
-	// Attempt to kill or suspend a process, return 1 if successful
+ 
+	// Management API, Attempt to kill or suspend a process, return 1 for success, 0 for failure
 	Future<int64_t> rebootWorker(StringRef address, bool check = false, int duration = 0);
 
 //private: 
diff --git a/fdbclient/IClientApi.h b/fdbclient/IClientApi.h
index d2e43736fb..cc396a3944 100644
--- a/fdbclient/IClientApi.h
+++ b/fdbclient/IClientApi.h
@@ -85,6 +85,7 @@ public:
 	virtual void addref() = 0;
 	virtual void delref() = 0;
 
+	// Management API, Attempt to kill or suspend a process, return 1 for success, 0 for failure
 	virtual ThreadFuture<int64_t> rebootWorker(const StringRef& address, bool check, int duration) = 0;
 };
 
diff --git a/fdbclient/MultiVersionTransaction.actor.cpp b/fdbclient/MultiVersionTransaction.actor.cpp
index 409b9d383d..5bb2d9d0b9 100644
--- a/fdbclient/MultiVersionTransaction.actor.cpp
+++ b/fdbclient/MultiVersionTransaction.actor.cpp
@@ -29,7 +29,6 @@
 #include "flow/UnitTest.h"
 
 #include "flow/actorcompiler.h" // This must be the last #include.
-#include <cstdint>
 
 void throwIfError(FdbCApi::fdb_error_t e) {
 	if(e) {
diff --git a/fdbclient/MultiVersionTransaction.h b/fdbclient/MultiVersionTransaction.h
index c989a6b06f..3f7f63b579 100644
--- a/fdbclient/MultiVersionTransaction.h
+++ b/fdbclient/MultiVersionTransaction.h
@@ -20,7 +20,6 @@
 
 #ifndef FDBCLIENT_MULTIVERSIONTRANSACTION_H
 #define FDBCLIENT_MULTIVERSIONTRANSACTION_H
-#include <cstdint>
 #pragma once
 
 #include "fdbclient/FDBOptions.g.h"
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 2b06d12866..3b76ce5915 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -21,7 +21,6 @@
 #include "fdbclient/NativeAPI.actor.h"
 
 #include <algorithm>
-#include <cstdint>
 #include <iterator>
 #include <regex>
 #include <unordered_set>
diff --git a/fdbclient/ThreadSafeTransaction.cpp b/fdbclient/ThreadSafeTransaction.cpp
index 37ceaaa2ba..ee79360c56 100644
--- a/fdbclient/ThreadSafeTransaction.cpp
+++ b/fdbclient/ThreadSafeTransaction.cpp
@@ -23,7 +23,6 @@
 #include "fdbclient/DatabaseContext.h"
 #include "fdbclient/versions.h"
 #include "fdbclient/NativeAPI.actor.h"
-#include <cstdint>
 
 // Users of ThreadSafeTransaction might share Reference<ThreadSafe...> between different threads as long as they don't call addRef (e.g. C API follows this).
 // Therefore, it is unsafe to call (explicitly or implicitly) this->addRef in any of these functions.