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

Conflicts:

	src/mds/AnchorClient.h
---
 src/mds/AnchorClient.h    |  5 -----
 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(+), 33 deletions(-)

diff --git a/src/mds/AnchorClient.h b/src/mds/AnchorClient.h
index fd790f39c399d..f39c875813098 100644
--- a/src/mds/AnchorClient.h
+++ b/src/mds/AnchorClient.h
@@ -15,11 +15,6 @@
 #ifndef __ANCHORCLIENT_H
 #define __ANCHORCLIENT_H
 
-#include <vector>
-using std::vector;
-#include <ext/hash_map>
-using __gnu_cxx::hash_map;
-
 #include "include/types.h"
 #include "msg/Dispatcher.h"
 
diff --git a/src/mds/MDCache.h b/src/mds/MDCache.h
index 997d495a561a5..ec6ce386c5e6a 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 1afe25dfb2b10..c1a07bd7510f8 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 043b62f18cbcd..e41d784f2a395 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 52ee46c8eb2b3..9476cb188318f 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