snapuserd: remove unused headers
headers should be used in the files that include them. Moving them to
respective locations
Test: th
Change-Id: I02bdb3b51b97a3073ec23ccc2e88cd844b44a532
diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/extractor.h b/fs_mgr/libsnapshot/snapuserd/user-space-merge/extractor.h
index 65285b1..814bc85 100644
--- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/extractor.h
+++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/extractor.h
@@ -14,8 +14,8 @@
#pragma once
+#include <future>
#include <string>
-#include <thread>
#include <android-base/unique_fd.h>
#include "merge_worker.h"
diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.cpp b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.cpp
index c8e40fb..bf12588 100644
--- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.cpp
+++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.cpp
@@ -22,6 +22,8 @@
#include <android-base/strings.h>
#include <snapuserd/dm_user_block_server.h>
+#include <future>
+
#include "merge_worker.h"
#include "read_worker.h"
#include "utility.h"
diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.h b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.h
index 80b85b4..ba32da5 100644
--- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.h
+++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.h
@@ -24,15 +24,11 @@
#include <condition_variable>
#include <cstring>
-#include <future>
#include <iostream>
-#include <limits>
#include <mutex>
#include <ostream>
#include <string>
-#include <thread>
#include <unordered_map>
-#include <unordered_set>
#include <vector>
#include <android-base/file.h>
diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_test.cpp b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_test.cpp
index 48f9ffd..bf55830 100644
--- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_test.cpp
+++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_test.cpp
@@ -24,9 +24,8 @@
#include <unistd.h>
#include <chrono>
-#include <iostream>
+#include <future>
#include <memory>
-#include <string_view>
#include <android-base/file.h>
#include <android-base/properties.h>
@@ -44,7 +43,6 @@
#include "snapuserd_core.h"
#include "testing/dm_user_harness.h"
#include "testing/host_harness.h"
-#include "testing/temp_device.h"
#include "utility.h"
namespace android {
diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_verify.cpp b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_verify.cpp
index 5306209..2dfcc36 100644
--- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_verify.cpp
+++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_verify.cpp
@@ -20,7 +20,8 @@
#include <android-base/scopeguard.h>
#include <android-base/strings.h>
-#include "android-base/properties.h"
+#include <future>
+
#include "snapuserd_core.h"
#include "utility.h"