diff -r 59d6b3ae04f0 -r 6009860b0b1e hotspot/src/share/vm/services/memoryPool.hpp
--- a/hotspot/src/share/vm/services/memoryPool.hpp	Mon Mar 25 11:00:19 2013 +0100
+++ b/hotspot/src/share/vm/services/memoryPool.hpp	Wed Mar 27 10:55:37 2013 +0100
@@ -28,7 +28,6 @@
 #include "gc_implementation/shared/mutableSpace.hpp"
 #include "memory/defNewGeneration.hpp"
 #include "memory/heap.hpp"
-#include "memory/metaspace.hpp"
 #include "memory/space.hpp"
 #include "services/memoryUsage.hpp"
 #include "utilities/macros.hpp"
@@ -223,29 +222,4 @@
   size_t used_in_bytes()            { return _codeHeap->allocated_capacity(); }
 };
 
-class MetaspacePoolBase : public MemoryPool {
-private:
-  Metaspace::MetadataType _md_type;
-protected:
-  static const size_t _undefined_max_size = (size_t) -1;
-public:
-  MetaspacePoolBase(const char *name, Metaspace::MetadataType md_type, size_t max_size);
-  MemoryUsage get_memory_usage();
-  size_t used_in_bytes();
-};
-
-class ClassMetaspacePool : public MetaspacePoolBase {
-private:
-  size_t calculate_max_size();
-public:
-  ClassMetaspacePool();
-};
-
-class MetaspacePool : public MetaspacePoolBase {
-private:
-  size_t calculate_max_size();
-public:
-  MetaspacePool();
-};
-
 #endif // SHARE_VM_SERVICES_MEMORYPOOL_HPP