diff --git a/ChangeLog b/ChangeLog
index 2d8ca1180..e3f3a8a6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-06-17  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
+	
+	Removed visit(const MetaEntry*)
+	* src/MetaEntryVisitor.h:
+	Added visit(const Data*),visit(const Dictionary*),visit(const List*)
+	and made them virtual.
+	* src/BencodeVisitor.h
+	* src/BencodeVisitor.cc
+
 2008-06-17  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
 
 	Updated po files.
diff --git a/src/BencodeVisitor.cc b/src/BencodeVisitor.cc
index 237133997..e9cfd66f5 100644
--- a/src/BencodeVisitor.cc
+++ b/src/BencodeVisitor.cc
@@ -76,15 +76,4 @@ void BencodeVisitor::visit(const Dictionary* d)
   _bencodedData += "e";
 }
 
-void BencodeVisitor::visit(const MetaEntry* e)
-{
-  if(dynamic_cast<const Data*>(e) != 0) {
-    visit(reinterpret_cast<const Data*>(e));
-  } else if(dynamic_cast<const List*>(e) != 0) {
-    visit(reinterpret_cast<const List*>(e));
-  } else if(dynamic_cast<const Dictionary*>(e) != 0) {
-    visit(reinterpret_cast<const Dictionary*>(e));
-  }
-}
-
 } // namespace aria2
diff --git a/src/BencodeVisitor.h b/src/BencodeVisitor.h
index 3e04bbf9e..8818b3df6 100644
--- a/src/BencodeVisitor.h
+++ b/src/BencodeVisitor.h
@@ -52,11 +52,11 @@ public:
   BencodeVisitor();
   ~BencodeVisitor();
 
-  void visit(const Data* d);
-  void visit(const Dictionary* d);
-  void visit(const List* l);
+  virtual void visit(const Data* d);
 
-  virtual void visit(const MetaEntry* e);
+  virtual void visit(const Dictionary* d);
+
+  virtual void visit(const List* l);
 
   const std::string& getBencodedData() const
   {
diff --git a/src/MetaEntryVisitor.h b/src/MetaEntryVisitor.h
index 589a57477..bc23b4fea 100644
--- a/src/MetaEntryVisitor.h
+++ b/src/MetaEntryVisitor.h
@@ -39,13 +39,19 @@
 
 namespace aria2 {
 
-class MetaEntry;
+class Data;
+class Dictionary;
+class List;
 
 class MetaEntryVisitor {
 public:
   virtual ~MetaEntryVisitor() {}
 
-  virtual void visit(const MetaEntry* e) = 0;
+  virtual void visit(const Data* d) = 0;
+
+  virtual void visit(const Dictionary* d) = 0;
+  
+  virtual void visit(const List* l) = 0;
 };
 
 } // namespace aria2