simplify includes

Conflicts:

	src/mds/AnchorClient.h

diff --git a/src/mds/AnchorClient.h b/src/mds/AnchorClient.h
index fd790f39c399d783c5230e2f8f2fea627d738ccd..f39c87581309849d436fbdc255005ed6db3ea8c1 100644 (file)
--- 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 997d495a561a5d485a85db1e8418332c976008ce..ec6ce386c5e6a4cece23dab7700189d92b38e839 100644 (file)
--- 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 1afe25dfb2b10610c9aac1f3bf19f80b956734dc..c1a07bd7510f872ee385e86adac347ed6bf08ae1 100644 (file)
--- 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 f85f676d48593e1cc3d8e1f8b1267753f90259ad..2784dd2e5201f5afbfb45595a85977d9317c10f3 100644 (file)
--- 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 043b62f18cbcdf1e46a0b876ef920d0f44ca69f5..e41d784f2a3958201b4ca43eb0070d5d226f6141 100644 (file)
--- 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 52ee46c8eb2b3b91c87e226c5bd16280459bb8b9..9476cb188318f2b4395dc21aadd5b2de40f205c6 100644 (file)
--- 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: