From 0ca2e4f0b3483959ee44f35743a424130f778f10 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max.kellermann@ionos.com>
Date: Fri, 25 Oct 2024 16:31:29 +0200
Subject: [PATCH] mds/Migrator: include cleanup

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>
---
 src/mds/Migrator.cc | 16 +++++++++++++++-
 src/mds/Migrator.h  | 31 +++++++++++++++++--------------
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc
index d1910101c7a76..82950a07c576a 100644
--- a/src/mds/Migrator.cc
+++ b/src/mds/Migrator.cc
@@ -12,12 +12,12 @@
  * 
  */
 
+#include "Migrator.h"
 #include "MDSRank.h"
 #include "MDCache.h"
 #include "CInode.h"
 #include "CDir.h"
 #include "CDentry.h"
-#include "Migrator.h"
 #include "Locker.h"
 #include "Server.h"
 
@@ -27,6 +27,7 @@
 #include "Mutation.h"
 
 #include "include/filepath.h"
+#include "common/debug.h"
 #include "common/likely.h"
 
 #include "events/EExport.h"
@@ -37,6 +38,19 @@
 #include "msg/Messenger.h"
 
 #include "messages/MClientCaps.h"
+#include "messages/MExportCaps.h"
+#include "messages/MExportCapsAck.h"
+#include "messages/MExportDir.h"
+#include "messages/MExportDirAck.h"
+#include "messages/MExportDirCancel.h"
+#include "messages/MExportDirDiscover.h"
+#include "messages/MExportDirDiscoverAck.h"
+#include "messages/MExportDirFinish.h"
+#include "messages/MExportDirNotify.h"
+#include "messages/MExportDirNotifyAck.h"
+#include "messages/MExportDirPrep.h"
+#include "messages/MExportDirPrepAck.h"
+#include "messages/MGatherCaps.h"
 
 /*
  * this is what the dir->dir_auth values look like
diff --git a/src/mds/Migrator.h b/src/mds/Migrator.h
index f733dea76b301..d8e7c8cb41f79 100644
--- a/src/mds/Migrator.h
+++ b/src/mds/Migrator.h
@@ -19,28 +19,31 @@
 
 #include "include/types.h"
 
+#include "Capability.h"
 #include "MDSContext.h"
+#include "Mutation.h" // for MDRequestRef
 
 #include <map>
 #include <list>
 #include <set>
 #include <string_view>
 
-#include "messages/MExportCaps.h"
-#include "messages/MExportCapsAck.h"
-#include "messages/MExportDir.h"
-#include "messages/MExportDirAck.h"
-#include "messages/MExportDirCancel.h"
-#include "messages/MExportDirDiscover.h"
-#include "messages/MExportDirDiscoverAck.h"
-#include "messages/MExportDirFinish.h"
-#include "messages/MExportDirNotify.h"
-#include "messages/MExportDirNotifyAck.h"
-#include "messages/MExportDirPrep.h"
-#include "messages/MExportDirPrepAck.h"
-#include "messages/MGatherCaps.h"
-
+class MDCache;
+class MDSMap;
 class MDSRank;
+class MExportCaps;
+class MExportCapsAck;
+class MExportDir;
+class MExportDirAck;
+class MExportDirCancel;
+class MExportDirDiscover;
+class MExportDirDiscoverAck;
+class MExportDirFinish;
+class MExportDirNotify;
+class MExportDirNotifyAck;
+class MExportDirPrep;
+class MExportDirPrepAck;
+class MGatherCaps;
 class CDir;
 class CInode;
 class CDentry;
-- 
2.39.5