diff --git a/fdbclient/BlobGranuleCommon.h b/fdbclient/BlobGranuleCommon.h
index 4841ad39f7..76bde814c9 100644
--- a/fdbclient/BlobGranuleCommon.h
+++ b/fdbclient/BlobGranuleCommon.h
@@ -22,6 +22,8 @@
 #define FDBCLIENT_BLOBGRANULECOMMON_H
 #pragma once
 
+#include <sstream>
+
 #include "fdbclient/CommitTransaction.h"
 #include "fdbclient/FDBTypes.h"
 
@@ -129,4 +131,4 @@ struct BlobGranuleHistoryValue {
 	}
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/fdbclient/BlobGranuleReader.actor.cpp b/fdbclient/BlobGranuleReader.actor.cpp
index 626c3d1558..696824084e 100644
--- a/fdbclient/BlobGranuleReader.actor.cpp
+++ b/fdbclient/BlobGranuleReader.actor.cpp
@@ -18,9 +18,15 @@
  * limitations under the License.
  */
 
+#include <map>
+#include <vector>
+
 #include "fdbclient/AsyncFileS3BlobStore.actor.h"
 #include "fdbclient/Atomic.h"
+#include "fdbclient/BlobGranuleCommon.h"
 #include "fdbclient/BlobGranuleReader.actor.h"
+#include "fdbclient/BlobWorkerCommon.h"
+#include "fdbclient/BlobWorkerInterface.h"
 #include "fdbclient/SystemData.h" // for allKeys unit test - could remove
 #include "flow/UnitTest.h"
 #include "flow/actorcompiler.h" // This must be the last #include.
@@ -263,13 +269,13 @@ static void applyDeltas(std::map<KeyRef, ValueRef>* dataMap,
 	}
 }
 
-// TODO: improve the interface of this function so that it doesn't need 
+// TODO: improve the interface of this function so that it doesn't need
 //       to be passed the entire BlobWorkerStats object
 ACTOR Future<RangeResult> readBlobGranule(BlobGranuleChunkRef chunk,
                                           KeyRangeRef keyRange,
                                           Version readVersion,
                                           Reference<BackupContainerFileSystem> bstore,
-                                          Optional<BlobWorkerStats *> stats) {
+                                          Optional<BlobWorkerStats*> stats) {
 
 	// TODO REMOVE with V2 of protocol
 	ASSERT(readVersion == chunk.includedVersion);
diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index fa5eb7c642..ddbf0838b0 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -35,6 +35,7 @@
 #include "fdbclient/ActorLineageProfiler.h"
 #include "fdbclient/AnnotateActor.h"
 #include "fdbclient/Atomic.h"
+#include "fdbclient/BlobGranuleCommon.h"
 #include "fdbclient/ClusterInterface.h"
 #include "fdbclient/CoordinationInterface.h"
 #include "fdbclient/DatabaseContext.h"
diff --git a/fdbclient/NativeAPI.actor.h b/fdbclient/NativeAPI.actor.h
index 085435b535..011dc2e8a9 100644
--- a/fdbclient/NativeAPI.actor.h
+++ b/fdbclient/NativeAPI.actor.h
@@ -31,7 +31,6 @@
 #include "flow/flow.h"
 #include "flow/TDMetric.actor.h"
 #include "fdbclient/FDBTypes.h"
-#include "fdbclient/BlobGranuleCommon.h"
 #include "fdbclient/CommitProxyInterface.h"
 #include "fdbclient/ClientBooleanParams.h"
 #include "fdbclient/FDBOptions.g.h"
diff --git a/fdbserver/BlobManager.actor.cpp b/fdbserver/BlobManager.actor.cpp
index fc136bea24..adaf94589c 100644
--- a/fdbserver/BlobManager.actor.cpp
+++ b/fdbserver/BlobManager.actor.cpp
@@ -21,6 +21,7 @@
 #include <vector>
 #include <unordered_map>
 
+#include "fdbclient/BlobGranuleCommon.h"
 #include "fdbclient/BlobWorkerInterface.h"
 #include "fdbclient/KeyRangeMap.h"
 #include "fdbclient/ReadYourWrites.h"
@@ -33,8 +34,6 @@
 #include "flow/IRandom.h"
 #include "flow/UnitTest.h"
 #include "flow/actorcompiler.h" // has to be last include
-#include "flow/flow.h"
-#include "flow/genericactors.actor.h"
 
 #define BM_DEBUG false
 
diff --git a/fdbserver/BlobWorker.actor.cpp b/fdbserver/BlobWorker.actor.cpp
index 77e68e2501..a9cba3c3ca 100644
--- a/fdbserver/BlobWorker.actor.cpp
+++ b/fdbserver/BlobWorker.actor.cpp
@@ -18,10 +18,14 @@
  * limitations under the License.
  */
 
+#include <tuple>
+#include <utility>
+#include <vector>
+
 #include "fdbclient/FDBTypes.h"
 #include "fdbclient/SystemData.h"
-#include "fdbrpc/simulator.h"
 #include "fdbclient/BackupContainerFileSystem.h"
+#include "fdbclient/BlobGranuleCommon.h"
 #include "fdbclient/BlobGranuleReader.actor.h"
 #include "fdbclient/BlobWorkerCommon.h"
 #include "fdbclient/BlobWorkerInterface.h"
diff --git a/fdbserver/WorkerInterface.actor.h b/fdbserver/WorkerInterface.actor.h
index d94236a74c..5f789216ec 100644
--- a/fdbserver/WorkerInterface.actor.h
+++ b/fdbserver/WorkerInterface.actor.h
@@ -32,6 +32,7 @@
 #include "fdbserver/RatekeeperInterface.h"
 #include "fdbserver/BlobManagerInterface.h"
 #include "fdbserver/ResolverInterface.h"
+#include "fdbclient/BlobWorkerInterface.h"
 #include "fdbclient/ClientBooleanParams.h"
 #include "fdbclient/StorageServerInterface.h"
 #include "fdbserver/TesterInterface.actor.h"
diff --git a/fdbserver/workloads/BlobGranuleVerifier.actor.cpp b/fdbserver/workloads/BlobGranuleVerifier.actor.cpp
index 536a9c4968..fb1e9c6505 100644
--- a/fdbserver/workloads/BlobGranuleVerifier.actor.cpp
+++ b/fdbserver/workloads/BlobGranuleVerifier.actor.cpp
@@ -18,6 +18,10 @@
  * limitations under the License.
  */
 
+#include <map>
+#include <utility>
+#include <vector>
+
 #include "fdbclient/BlobGranuleReader.actor.h"
 #include "fdbclient/NativeAPI.actor.h"
 #include "fdbclient/ReadYourWrites.h"