From 195873e1cc29c0a75367cdcc6f1d51024ed62370 Mon Sep 17 00:00:00 2001
From: sfc-gh-tclinkenbeard <trevor.clinkenbeard@snowflake.com>
Date: Fri, 23 Oct 2020 23:27:13 -0700
Subject: [PATCH] Cleaned up unnecessary backup container includes

---
 fdbclient/BackupContainerAzureBlobStore.h     |  1 +
 fdbclient/BackupContainerFileSystem.actor.cpp |  7 ++++++-
 fdbclient/BackupContainerFileSystem.h         | 20 -------------------
 .../BackupContainerLocalDirectory.actor.cpp   |  6 +++++-
 fdbclient/BackupContainerLocalDirectory.h     |  1 +
 .../BackupContainerS3BlobStore.actor.cpp      |  3 ++-
 fdbclient/BackupContainerS3BlobStore.h        |  1 +
 7 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/fdbclient/BackupContainerAzureBlobStore.h b/fdbclient/BackupContainerAzureBlobStore.h
index bb73c63aca..9551a678e6 100644
--- a/fdbclient/BackupContainerAzureBlobStore.h
+++ b/fdbclient/BackupContainerAzureBlobStore.h
@@ -22,6 +22,7 @@
 #define FDBCLIENT_BACKUP_CONTAINER_AZURE_BLOBSTORE_H
 #pragma once
 
+#include "fdbclient/AsyncTaskThread.h"
 #include "fdbclient/BackupContainerFileSystem.h"
 
 #include "storage_credential.h"
diff --git a/fdbclient/BackupContainerFileSystem.actor.cpp b/fdbclient/BackupContainerFileSystem.actor.cpp
index 06a85684bd..176edafd90 100644
--- a/fdbclient/BackupContainerFileSystem.actor.cpp
+++ b/fdbclient/BackupContainerFileSystem.actor.cpp
@@ -18,10 +18,15 @@
  * limitations under the License.
  */
 
+#include "fdbclient/BackupAgent.actor.h"
 #include "fdbclient/BackupContainerAzureBlobStore.h"
 #include "fdbclient/BackupContainerFileSystem.h"
 #include "fdbclient/BackupContainerLocalDirectory.h"
-#include "fdbclient/FDBTypes.h"
+#include "fdbclient/JsonBuilder.h"
+#include "flow/UnitTest.h"
+
+#include <algorithm>
+#include <cinttypes>
 
 #include "flow/actorcompiler.h" // This must be the last #include.
 
diff --git a/fdbclient/BackupContainerFileSystem.h b/fdbclient/BackupContainerFileSystem.h
index dd59ceedd6..7e52a15b3b 100644
--- a/fdbclient/BackupContainerFileSystem.h
+++ b/fdbclient/BackupContainerFileSystem.h
@@ -22,29 +22,9 @@
 #define FDBCLIENT_BACKUP_CONTAINER_FILESYSTEM_H
 #pragma once
 
-// FIXME: Trim this down
-#include "flow/Platform.actor.h"
-#include "fdbclient/AsyncTaskThread.h"
 #include "fdbclient/BackupContainer.h"
-#include "fdbclient/BackupAgent.actor.h"
 #include "fdbclient/FDBTypes.h"
-#include "fdbclient/JsonBuilder.h"
-#include "flow/Arena.h"
 #include "flow/Trace.h"
-#include "flow/UnitTest.h"
-#include "flow/Hash3.h"
-#include "fdbrpc/AsyncFileReadAhead.actor.h"
-#include "fdbrpc/simulator.h"
-#include "flow/Platform.h"
-#include "fdbclient/AsyncFileBlobStore.actor.h"
-#include "fdbclient/Status.h"
-#include "fdbclient/SystemData.h"
-#include "fdbclient/ReadYourWrites.h"
-#include "fdbclient/KeyBackedTypes.h"
-#include "fdbclient/RunTransaction.actor.h"
-#include <algorithm>
-#include <cinttypes>
-#include <time.h>
 
 #include "fdbclient/BackupContainer.h"
 
diff --git a/fdbclient/BackupContainerLocalDirectory.actor.cpp b/fdbclient/BackupContainerLocalDirectory.actor.cpp
index d76dcd18cd..7b5504b16c 100644
--- a/fdbclient/BackupContainerLocalDirectory.actor.cpp
+++ b/fdbclient/BackupContainerLocalDirectory.actor.cpp
@@ -19,7 +19,11 @@
  */
 
 #include "fdbclient/BackupContainerLocalDirectory.h"
-
+#include "fdbrpc/AsyncFileReadAhead.actor.h"
+#include "fdbrpc/IAsyncFile.h"
+#include "flow/Platform.actor.h"
+#include "flow/Platform.h"
+#include "fdbrpc/simulator.h"
 #include "flow/actorcompiler.h" // This must be the last #include.
 
 namespace {
diff --git a/fdbclient/BackupContainerLocalDirectory.h b/fdbclient/BackupContainerLocalDirectory.h
index 4bb8c2cb78..9db8e07aef 100644
--- a/fdbclient/BackupContainerLocalDirectory.h
+++ b/fdbclient/BackupContainerLocalDirectory.h
@@ -23,6 +23,7 @@
 #pragma once
 
 #include "fdbclient/BackupContainerFileSystem.h"
+#include "flow/flow.h"
 
 class BackupContainerLocalDirectory : public BackupContainerFileSystem,
                                       ReferenceCounted<BackupContainerLocalDirectory> {
diff --git a/fdbclient/BackupContainerS3BlobStore.actor.cpp b/fdbclient/BackupContainerS3BlobStore.actor.cpp
index 80ae5577a2..400b3ba829 100644
--- a/fdbclient/BackupContainerS3BlobStore.actor.cpp
+++ b/fdbclient/BackupContainerS3BlobStore.actor.cpp
@@ -18,8 +18,9 @@
  * limitations under the License.
  */
 
+#include "fdbclient/AsyncFileBlobStore.actor.h"
 #include "fdbclient/BackupContainerS3BlobStore.h"
-
+#include "fdbrpc/AsyncFileReadAhead.actor.h"
 #include "flow/actorcompiler.h" // This must be the last #include.
 
 class BackupContainerS3BlobStoreImpl {
diff --git a/fdbclient/BackupContainerS3BlobStore.h b/fdbclient/BackupContainerS3BlobStore.h
index 0d5f8ae8a9..52f70bf654 100644
--- a/fdbclient/BackupContainerS3BlobStore.h
+++ b/fdbclient/BackupContainerS3BlobStore.h
@@ -22,6 +22,7 @@
 #define FDBCLIENT_BACKUP_CONTAINER_S3_BLOBSTORE_H
 #pragma once
 
+#include "fdbclient/AsyncFileBlobStore.actor.h"
 #include "fdbclient/BackupContainerFileSystem.h"
 
 class BackupContainerS3BlobStore final : public BackupContainerFileSystem,