From c1a0189f5026850de088ee9c02cc40bfc121a7df Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Wed, 23 Jul 2008 09:40:42 -0700
Subject: [PATCH] simplify includes

---
 src/mds/AnchorClient.h    |  3 ---
 src/mds/MDCache.h         |  6 ------
 src/mds/MDS.h             | 10 ----------
 src/msg/SimpleMessenger.h |  4 +---
 src/osdc/Filer.h          |  7 -------
 src/osdc/ObjectCacher.h   |  2 --
 6 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/src/mds/AnchorClient.h b/src/mds/AnchorClient.h
index c437cb41d5f2e..aa511b82d252b 100644
--- a/src/mds/AnchorClient.h
+++ b/src/mds/AnchorClient.h
@@ -15,9 +15,6 @@
 #ifndef __ANCHORCLIENT_H
 #define __ANCHORCLIENT_H
 
-#include <ext/hash_map>
-using __gnu_cxx::hash_map;
-
 #include "MDSTableClient.h"
 #include "Anchor.h"
 
diff --git a/src/mds/MDCache.h b/src/mds/MDCache.h
index 1e51ce043ebea..27e89236a0d65 100644
--- a/src/mds/MDCache.h
+++ b/src/mds/MDCache.h
@@ -17,12 +17,6 @@
 #ifndef __MDCACHE_H
 #define __MDCACHE_H
 
-#include <string>
-#include <vector>
-#include <map>
-#include <set>
-#include <ext/hash_map>
-
 #include "include/types.h"
 #include "include/filepath.h"
 
diff --git a/src/mds/MDS.h b/src/mds/MDS.h
index ed71152a57fbf..4b85a0611599e 100644
--- a/src/mds/MDS.h
+++ b/src/mds/MDS.h
@@ -17,16 +17,6 @@
 #ifndef __MDS_H
 #define __MDS_H
 
-#include <list>
-#include <vector>
-#include <set>
-#include <map>
-#include <ostream>
-using namespace std;
-
-#include <ext/hash_map>
-using namespace __gnu_cxx;
-
 #include "mdstypes.h"
 
 #include "msg/Dispatcher.h"
diff --git a/src/msg/SimpleMessenger.h b/src/msg/SimpleMessenger.h
index f85f676d48593..2784dd2e5201f 100644
--- a/src/msg/SimpleMessenger.h
+++ b/src/msg/SimpleMessenger.h
@@ -15,6 +15,7 @@
 #ifndef __SIMPLEMESSENGER_H
 #define __SIMPLEMESSENGER_H
 
+#include "include/types.h"
 
 #include <list>
 #include <map>
@@ -23,9 +24,6 @@ using namespace std;
 #include <ext/hash_set>
 using namespace __gnu_cxx;
 
-
-#include "include/types.h"
-
 #include "common/Mutex.h"
 #include "common/Cond.h"
 #include "common/Thread.h"
diff --git a/src/osdc/Filer.h b/src/osdc/Filer.h
index 62d286352c1a3..6b4329125f28d 100644
--- a/src/osdc/Filer.h
+++ b/src/osdc/Filer.h
@@ -26,13 +26,6 @@
  * "files" are identified by ino. 
  */
 
-#include <set>
-#include <map>
-using namespace std;
-
-#include <ext/hash_map>
-using namespace __gnu_cxx;
-
 #include "include/types.h"
 
 #include "osd/OSDMap.h"
diff --git a/src/osdc/ObjectCacher.h b/src/osdc/ObjectCacher.h
index 452e4df2e4c59..60cecc105354a 100644
--- a/src/osdc/ObjectCacher.h
+++ b/src/osdc/ObjectCacher.h
@@ -14,8 +14,6 @@
 #include "Filer.h"
 
 class Objecter;
-class Objecter::OSDRead;
-class Objecter::OSDWrite;
 
 class ObjectCacher {
  public:
-- 
2.39.5