From 1372ac51ade17bc27126449bf29f99c6c2cf7703 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Sun, 14 Nov 2010 07:17:55 +0000
Subject: [PATCH] 2010-11-14  Tatsuhiro Tsujikawa 
 <t-tujikawa@users.sourceforge.net>

	Added .cc file for classes/structs that only provided by header
	file. Defined non-POD classes' ctor, dtor in .cc file.  Moved
	implementation code in header file to .cc file for major
	classes/strucsts.
---
 ChangeLog                                |   7 +
 src/AbstractCommand.cc                   |  39 +-
 src/AbstractCommand.h                    |  45 +-
 src/AbstractProxyRequestCommand.cc       |   7 -
 src/AbstractProxyResponseCommand.cc      |   4 -
 src/AbstractSingleDiskAdaptor.cc         |   4 +-
 src/ActivePeerConnectionCommand.cc       |   4 -
 src/AdaptiveFileAllocationIterator.cc    |  20 +-
 src/AdaptiveFileAllocationIterator.h     |  14 +-
 src/AlphaNumberDecorator.cc              |  82 +++
 src/AlphaNumberDecorator.h               |  43 +-
 src/AnnounceList.cc                      |  10 +-
 src/AnnounceList.h                       |  11 +-
 src/AnnounceTier.cc                      |  79 +++
 src/AnnounceTier.h                       |  45 +-
 src/AuthConfig.cc                        |  17 +
 src/AuthConfig.h                         |  15 +-
 src/AutoSaveCommand.cc                   |  10 +-
 src/BitfieldMan.cc                       |  32 +-
 src/BitfieldMan.h                        |  32 +-
 src/BtAbortOutstandingRequestEvent.cc    |  47 ++
 src/BtAbortOutstandingRequestEvent.h     |   7 +-
 src/BtAnnounce.h                         |   4 +-
 src/BtBitfieldMessageValidator.cc        |  56 ++
 src/BtBitfieldMessageValidator.h         |  16 +-
 src/BtCheckIntegrityEntry.cc             |   3 -
 src/BtDependency.cc                      |   1 +
 src/BtExtendedMessage.cc                 |   2 +
 src/BtExtendedMessage.h                  |   1 +
 src/BtFileAllocationEntry.cc             |   4 +-
 src/BtHandshakeMessageValidator.cc       |  76 +++
 src/BtHandshakeMessageValidator.h        |  34 +-
 src/BtInterestedMessage.cc               |   2 +
 src/BtInterestedMessage.h                |   1 +
 src/BtLeecherStateChoke.cc               |  19 +
 src/BtLeecherStateChoke.h                |   4 +
 src/BtNotInterestedMessage.cc            |   2 +
 src/BtNotInterestedMessage.h             |   1 +
 src/BtPieceMessageValidator.cc           |  56 ++
 src/BtPieceMessageValidator.h            |  17 +-
 src/BtRegistry.cc                        |  51 ++
 src/BtRegistry.h                         |  26 +-
 src/BtRuntime.cc                         |  61 ++
 src/BtRuntime.h                          |  23 +-
 src/BtSeederStateChoke.cc                |  23 +
 src/BtSeederStateChoke.h                 |   4 +
 src/BtSetup.cc                           |   7 +-
 src/BtStopDownloadCommand.cc             |   2 -
 src/ByteArrayDiskWriter.cc               |  11 +-
 src/ByteArrayDiskWriter.h                |  10 +-
 src/CUIDCounter.cc                       |  51 ++
 src/CUIDCounter.h                        |  16 +-
 src/CheckIntegrityCommand.cc             |   3 -
 src/CheckIntegrityDispatcherCommand.cc   |   3 -
 src/CheckIntegrityEntry.cc               |   3 -
 src/Checksum.cc                          |  65 ++
 src/Checksum.h                           |  28 +-
 src/ChecksumCheckIntegrityEntry.cc       |   2 -
 src/ChunkChecksum.cc                     |  91 +++
 src/ChunkChecksum.h                      |  48 +-
 src/Command.h                            |   1 -
 src/ConsoleStatCalc.cc                   |  32 +-
 src/ConsoleStatCalc.h                    |  25 +-
 src/ContextAttribute.h                   |   4 +
 src/Cookie.cc                            |  52 ++
 src/Cookie.h                             |  24 +-
 src/CookieStorage.cc                     |  36 +-
 src/CookieStorage.h                      |  14 +-
 src/CreateRequestCommand.cc              |   4 +-
 src/DHTAutoSaveCommand.cc                |   4 -
 src/DHTBucketRefreshCommand.cc           |   4 -
 src/DHTEntryPointNameResolveCommand.cc   |  10 +-
 src/DHTGetPeersCommand.cc                |   4 -
 src/DHTInteractionCommand.cc             |   4 -
 src/DHTMessageTrackerEntry.cc            |   7 +
 src/DHTMessageTrackerEntry.h             |   7 +-
 src/DHTNode.cc                           |   7 +
 src/DHTNode.h                            |  11 +-
 src/DHTPeerAnnounceCommand.cc            |   4 -
 src/DHTTokenUpdateCommand.cc             |   4 -
 src/DNSCache.cc                          | 209 +++++++
 src/DNSCache.h                           | 133 +----
 src/DiskAdaptor.cc                       |   2 +
 src/DiskAdaptor.h                        |   2 +-
 src/DownloadCommand.cc                   |   3 +-
 src/DownloadCommand.h                    |   2 +
 src/DownloadContext.cc                   |  43 ++
 src/DownloadContext.h                    |  41 +-
 src/DownloadEngine.cc                    |  32 +-
 src/DownloadEngine.h                     |  31 +-
 src/DownloadResult.cc                    |  46 ++
 src/DownloadResult.h                     |  11 +-
 src/Exception.cc                         |   5 +
 src/Exception.h                          |   5 +-
 src/ExtensionMessageRegistry.cc          |  78 +++
 src/ExtensionMessageRegistry.h           |  37 +-
 src/FeatureConfig.cc                     |   2 +
 src/FeatureConfig.h                      |   2 +
 src/File.cc                              |  12 +-
 src/File.h                               |   5 +
 src/FileAllocationCommand.cc             |   2 -
 src/FileAllocationDispatcherCommand.cc   |   3 -
 src/FileEntry.cc                         |  31 +
 src/FileEntry.h                          |  29 +-
 src/FillRequestGroupCommand.cc           |   3 -
 src/FixedWidthNumberDecorator.cc         |  55 ++
 src/FixedWidthNumberDecorator.h          |  14 +-
 src/FtpDownloadCommand.cc                |   6 +-
 src/FtpFinishDownloadCommand.cc          |   8 +-
 src/FtpFinishDownloadCommand.h           |   1 +
 src/FtpInitiateConnectionCommand.cc      |   5 -
 src/FtpNegotiationCommand.cc             |   3 -
 src/FtpNegotiationCommand.h              |   2 +
 src/FtpTunnelResponseCommand.cc          |   1 -
 src/HandshakeExtensionMessage.cc         |   1 +
 src/HaveEraseCommand.cc                  |   4 -
 src/HttpConnection.cc                    |   2 +
 src/HttpConnection.h                     |   1 +
 src/HttpDownloadCommand.cc               |   4 -
 src/HttpHeader.cc                        |   3 +
 src/HttpHeader.h                         |   4 +-
 src/HttpInitiateConnectionCommand.cc     |   6 +-
 src/HttpListenCommand.cc                 |   4 -
 src/HttpProxyRequestCommand.cc           |   1 -
 src/HttpProxyResponseCommand.cc          |   1 -
 src/HttpRequest.cc                       |  74 +++
 src/HttpRequest.h                        |  74 +--
 src/HttpRequestCommand.cc                |   4 -
 src/HttpResponseCommand.cc               |   2 -
 src/HttpServer.cc                        |   7 +
 src/HttpServer.h                         |   6 +-
 src/HttpServerBodyCommand.cc             |   4 -
 src/HttpServerCommand.cc                 |   4 -
 src/HttpServerResponseCommand.cc         |   4 -
 src/HttpSkipResponseCommand.cc           |   4 -
 src/IndexBtMessageValidator.cc           |  54 ++
 src/IndexBtMessageValidator.h            |  15 +-
 src/InitiateConnectionCommand.cc         |   5 -
 src/InitiatorMSEHandshakeCommand.cc      |   4 -
 src/LibgcryptARC4Context.cc              |  84 +++
 src/LibgcryptARC4Context.h               |  44 +-
 src/LibgcryptARC4Decryptor.cc            |  72 +++
 src/LibgcryptARC4Decryptor.h             |  30 +-
 src/LibgcryptARC4Encryptor.cc            |  72 +++
 src/LibgcryptARC4Encryptor.h             |  27 +-
 src/LibgcryptDHKeyExchange.cc            | 165 +++++
 src/LibgcryptDHKeyExchange.h             | 117 +---
 src/LibsslARC4Context.cc                 |  91 +++
 src/LibsslARC4Context.h                  |  47 +-
 src/LibsslARC4Decryptor.cc               |  72 +++
 src/LibsslARC4Decryptor.h                |  27 +-
 src/LibsslARC4Encryptor.cc               |  72 +++
 src/LibsslARC4Encryptor.h                |  27 +-
 src/LibsslDHKeyExchange.cc               | 180 ++++++
 src/LibsslDHKeyExchange.h                | 133 +----
 src/Logger.cc                            |  10 +
 src/Logger.h                             |  10 +-
 src/LpdDispatchMessageCommand.cc         |   7 +-
 src/LpdDispatchMessageCommand.h          |   2 +
 src/LpdMessage.cc                        |  47 ++
 src/LpdMessage.h                         |  11 +-
 src/LpdMessageDispatcher.cc              |   2 +
 src/LpdMessageDispatcher.h               |   2 +
 src/LpdMessageReceiver.cc                |   3 +
 src/LpdMessageReceiver.h                 |   2 +
 src/LpdReceiveMessageCommand.cc          |   3 -
 src/Makefile.am                          |  78 +--
 src/Makefile.in                          | 342 +++++++----
 src/MetadataInfo.cc                      |   8 +
 src/MetadataInfo.h                       |   7 +-
 src/MetalinkEntry.cc                     |  10 +
 src/MetalinkEntry.h                      |  12 +-
 src/MetalinkMetaurl.cc                   |   2 +
 src/MetalinkMetaurl.h                    |   2 +
 src/MetalinkParserState.cc               |  58 ++
 src/MetalinkParserState.h                |   5 +
 src/MetalinkParserStateMachine.cc        |   2 +
 src/MetalinkParserStateMachine.h         |   2 +
 src/MetalinkResource.cc                  |   8 +-
 src/MetalinkResource.h                   |  13 +-
 src/Metalinker.cc                        |   5 +
 src/Metalinker.h                         |  14 +-
 src/MultiDiskAdaptor.cc                  |   2 +
 src/MultiDiskAdaptor.h                   |   1 +
 src/NameMatchOptionHandler.cc            |  91 +++
 src/NameMatchOptionHandler.h             |  48 +-
 src/Netrc.cc                             |  73 +++
 src/Netrc.h                              |  54 +-
 src/NumberDecorator.h                    |   2 -
 src/Option.cc                            |  10 +
 src/Option.h                             |  10 +-
 src/OptionHandlerImpl.cc                 | 728 +++++++++++++++++++++++
 src/OptionHandlerImpl.h                  | 620 +++----------------
 src/OptionParser.cc                      |   3 +
 src/OptionParser.h                       |   2 +-
 src/PStringBuildVisitor.cc               |   5 +
 src/PStringBuildVisitor.h                |   2 +
 src/PStringNumLoop.cc                    |  70 +++
 src/PStringNumLoop.h                     |  26 +-
 src/PStringSelect.cc                     |  68 +++
 src/PStringSelect.h                      |  31 +-
 src/PeerAddrEntry.cc                     |  72 +++
 src/PeerAddrEntry.h                      |  17 +-
 src/PeerConnection.cc                    |   7 +
 src/PeerConnection.h                     |   7 +-
 src/PeerInitiateConnectionCommand.cc     |   5 -
 src/PeerInteractionCommand.cc            |   3 -
 src/PeerListenCommand.cc                 |   4 -
 src/PeerReceiveHandshakeCommand.cc       |   4 -
 src/PeerStat.cc                          | 133 +++++
 src/PeerStat.h                           | 110 ++--
 src/PieceStatMan.cc                      |   2 +
 src/PieceStatMan.h                       |   2 +
 src/ProgressAwareEntry.h                 |   4 +-
 src/Range.cc                             |  84 +++
 src/Range.h                              |  35 +-
 src/RangeBtMessageValidator.cc           |  60 ++
 src/RangeBtMessageValidator.h            |  21 +-
 src/ReceiverMSEHandshakeCommand.cc       |   8 -
 src/Request.cc                           |  27 +-
 src/Request.h                            |  42 +-
 src/RequestGroupMan.cc                   |   3 +
 src/RequestGroupMan.h                    |   2 +
 src/SeedCheckCommand.cc                  |   5 -
 src/Segment.h                            |   1 -
 src/SegmentMan.cc                        |   6 +
 src/SegmentMan.h                         |   9 +-
 src/ShareRatioSeedCriteria.cc            |  76 +++
 src/ShareRatioSeedCriteria.h             |  41 +-
 src/SocketBuffer.h                       |   4 +
 src/StreamFileAllocationEntry.cc         |   2 +
 src/StreamFilter.cc                      |   2 +
 src/StreamFilter.h                       |   2 +-
 src/StringFormat.cc                      |   2 +
 src/StringFormat.h                       |   1 +
 src/TimeBasedCommand.cc                  |   5 -
 src/TimeSeedCriteria.cc                  |  54 ++
 src/TimeSeedCriteria.h                   |  19 +-
 src/TimedHaltCommand.cc                  |   4 -
 src/TorrentAttribute.cc                  |  45 ++
 src/TorrentAttribute.h                   |  13 +-
 src/TrackerWatcherCommand.cc             |   4 -
 src/URIResult.cc                         |   7 +-
 src/URIResult.h                          |   2 +
 src/UTMetadataDataExtensionMessage.cc    |  19 +
 src/UTMetadataDataExtensionMessage.h     |  17 +-
 src/UTMetadataRequestExtensionMessage.cc |  13 +
 src/UTMetadataRequestExtensionMessage.h  |  12 +-
 src/UnionSeedCriteria.cc                 |  81 +++
 src/UnionSeedCriteria.h                  |  40 +-
 src/ValueBase.cc                         |   8 +
 src/ValueBase.h                          |  26 +-
 src/XML2SAXMetalinkProcessor.cc          |   4 +
 src/XML2SAXMetalinkProcessor.h           |   4 +
 src/Xml2XmlRpcRequestProcessor.cc        |   4 +
 src/Xml2XmlRpcRequestProcessor.h         |   4 +
 src/XmlRpcMethod.cc                      |   2 +
 src/XmlRpcMethod.h                       |   2 +-
 src/XmlRpcRequest.cc                     |  20 +
 src/XmlRpcRequest.h                      |   9 +-
 src/XmlRpcResponse.cc                    |  21 +
 src/XmlRpcResponse.h                     |   9 +-
 src/bittorrent_helper.cc                 |   1 +
 src/uri.cc                               |  36 ++
 src/uri.h                                |   7 +-
 test/DownloadHelperTest.cc               |   1 +
 test/LpdMessageReceiverTest.cc           |   1 +
 test/Metalink2RequestGroupTest.cc        |   1 +
 test/OptionHandlerTest.cc                |   1 +
 test/SegmentManTest.cc                   |   2 +
 test/SessionSerializerTest.cc            |   4 +-
 test/XmlRpcMethodTest.cc                 |   8 +-
 272 files changed, 5418 insertions(+), 2483 deletions(-)
 create mode 100644 src/AlphaNumberDecorator.cc
 create mode 100644 src/AnnounceTier.cc
 create mode 100644 src/BtAbortOutstandingRequestEvent.cc
 create mode 100644 src/BtBitfieldMessageValidator.cc
 create mode 100644 src/BtHandshakeMessageValidator.cc
 create mode 100644 src/BtPieceMessageValidator.cc
 create mode 100644 src/BtRuntime.cc
 create mode 100644 src/CUIDCounter.cc
 create mode 100644 src/Checksum.cc
 create mode 100644 src/ChunkChecksum.cc
 create mode 100644 src/DNSCache.cc
 create mode 100644 src/DownloadResult.cc
 create mode 100644 src/ExtensionMessageRegistry.cc
 create mode 100644 src/FixedWidthNumberDecorator.cc
 create mode 100644 src/IndexBtMessageValidator.cc
 create mode 100644 src/LibgcryptARC4Context.cc
 create mode 100644 src/LibgcryptARC4Decryptor.cc
 create mode 100644 src/LibgcryptARC4Encryptor.cc
 create mode 100644 src/LibgcryptDHKeyExchange.cc
 create mode 100644 src/LibsslARC4Context.cc
 create mode 100644 src/LibsslARC4Decryptor.cc
 create mode 100644 src/LibsslARC4Encryptor.cc
 create mode 100644 src/LibsslDHKeyExchange.cc
 create mode 100644 src/LpdMessage.cc
 create mode 100644 src/MetalinkParserState.cc
 create mode 100644 src/NameMatchOptionHandler.cc
 create mode 100644 src/OptionHandlerImpl.cc
 create mode 100644 src/PStringNumLoop.cc
 create mode 100644 src/PStringSelect.cc
 create mode 100644 src/PeerAddrEntry.cc
 create mode 100644 src/PeerStat.cc
 create mode 100644 src/Range.cc
 create mode 100644 src/RangeBtMessageValidator.cc
 create mode 100644 src/ShareRatioSeedCriteria.cc
 create mode 100644 src/TimeSeedCriteria.cc
 create mode 100644 src/TorrentAttribute.cc
 create mode 100644 src/UnionSeedCriteria.cc

diff --git a/ChangeLog b/ChangeLog
index 395e71bb..9b21a117 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-14  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Added .cc file for classes/structs that only provided by header
+	file. Defined non-POD classes' ctor, dtor in .cc file.  Moved
+	implementation code in header file to .cc file for major
+	classes/strucsts.
+
 2010-11-12  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Removed SharedHandle::isNull(). Instead we added operator* and
diff --git a/src/AbstractCommand.cc b/src/AbstractCommand.cc
index aad57e5a..a35d7e25 100644
--- a/src/AbstractCommand.cc
+++ b/src/AbstractCommand.cc
@@ -49,9 +49,6 @@
 #include "CreateRequestCommand.h"
 #include "InitiateConnectionCommandFactory.h"
 #include "SleepCommand.h"
-#ifdef ENABLE_ASYNC_DNS
-#include "AsyncNameResolver.h"
-#endif // ENABLE_ASYNC_DNS
 #include "StreamCheckIntegrityEntry.h"
 #include "PieceStorage.h"
 #include "Socket.h"
@@ -66,9 +63,11 @@
 #include "DownloadContext.h"
 #include "wallclock.h"
 #include "NameResolver.h"
-#include "ServerStatMan.h"
-#include "FileAllocationEntry.h"
 #include "uri.h"
+#include "FileEntry.h"
+#ifdef ENABLE_ASYNC_DNS
+#include "AsyncNameResolver.h"
+#endif // ENABLE_ASYNC_DNS
 #ifdef ENABLE_MESSAGE_DIGEST
 # include "ChecksumCheckIntegrityEntry.h"
 #endif // ENABLE_MESSAGE_DIGEST
@@ -861,4 +860,34 @@ size_t AbstractCommand::calculateMinSplitSize() const
   }
 }
 
+void AbstractCommand::setRequest(const SharedHandle<Request>& request)
+{
+  req_ = request;
+}
+
+void AbstractCommand::setFileEntry(const SharedHandle<FileEntry>& fileEntry)
+{
+  fileEntry_ = fileEntry;
+}
+
+void AbstractCommand::setSocket(const SharedHandle<SocketCore>& s)
+{
+  socket_ = s;
+}
+
+const SharedHandle<DownloadContext>& AbstractCommand::getDownloadContext() const
+{
+  return requestGroup_->getDownloadContext();
+}
+
+const SharedHandle<SegmentMan>& AbstractCommand::getSegmentMan() const
+{
+  return requestGroup_->getSegmentMan();
+}
+
+const SharedHandle<PieceStorage>& AbstractCommand::getPieceStorage() const
+{
+  return requestGroup_->getPieceStorage();
+}
+
 } // namespace aria2
diff --git a/src/AbstractCommand.h b/src/AbstractCommand.h
index cd8b2c7c..687738b9 100644
--- a/src/AbstractCommand.h
+++ b/src/AbstractCommand.h
@@ -36,17 +36,24 @@
 #define D_ABSTRACT_COMMAND_H
 
 #include "Command.h"
+
+#include <vector>
+#include <string>
+
 #include "SharedHandle.h"
 #include "TimerA2.h"
-#include "FileEntry.h"
-#include "RequestGroup.h"
 
 namespace aria2 {
 
+class FileEntry;
+class RequestGroup;
+class CheckIntegrityEntry;
+class DownloadContext;
+class SegmentMan;
+class PieceStorage;
 class Request;
 class DownloadEngine;
 class Segment;
-class Exception;
 class SocketCore;
 class Option;
 #ifdef ENABLE_ASYNC_DNS
@@ -98,20 +105,14 @@ protected:
     return req_;
   }
 
-  void setRequest(const SharedHandle<Request>& request)
-  {
-    req_ = request;
-  }
+  void setRequest(const SharedHandle<Request>& request);
 
   const SharedHandle<FileEntry>& getFileEntry() const
   {
     return fileEntry_;
   }
 
-  void setFileEntry(const SharedHandle<FileEntry>& fileEntry)
-  {
-    fileEntry_ = fileEntry;
-  }
+  void setFileEntry(const SharedHandle<FileEntry>& fileEntry);
 
   DownloadEngine* getDownloadEngine() const
   {
@@ -123,10 +124,7 @@ protected:
     return socket_;
   }
 
-  void setSocket(const SharedHandle<SocketCore>& s)
-  {
-    socket_ = s;
-  }
+  void setSocket(const SharedHandle<SocketCore>& s);
 
   void createSocket();
 
@@ -213,20 +211,9 @@ protected:
 
   const SharedHandle<Option>& getOption() const;
 
-  const SharedHandle<DownloadContext>& getDownloadContext() const
-  {
-    return requestGroup_->getDownloadContext();
-  }
-
-  const SharedHandle<SegmentMan>& getSegmentMan() const
-  {
-    return requestGroup_->getSegmentMan();
-  }
-
-  const SharedHandle<PieceStorage>& getPieceStorage() const
-  {
-    return requestGroup_->getPieceStorage();
-  }
+  const SharedHandle<DownloadContext>& getDownloadContext() const;
+  const SharedHandle<SegmentMan>& getSegmentMan() const;
+  const SharedHandle<PieceStorage>& getPieceStorage() const;
 
   Timer& getCheckPoint()
   {
diff --git a/src/AbstractProxyRequestCommand.cc b/src/AbstractProxyRequestCommand.cc
index 9547a72e..c43e32c8 100644
--- a/src/AbstractProxyRequestCommand.cc
+++ b/src/AbstractProxyRequestCommand.cc
@@ -42,14 +42,7 @@
 #include "Option.h"
 #include "prefs.h"
 #include "Socket.h"
-#include "CookieStorage.h"
-#include "AuthConfigFactory.h"
-#include "AuthConfig.h"
 #include "DownloadContext.h"
-#include "RequestGroupMan.h"
-#include "ServerStatMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
 
 namespace aria2 {
 
diff --git a/src/AbstractProxyResponseCommand.cc b/src/AbstractProxyResponseCommand.cc
index 230dec8a..c0673801 100644
--- a/src/AbstractProxyResponseCommand.cc
+++ b/src/AbstractProxyResponseCommand.cc
@@ -46,10 +46,6 @@
 #include "message.h"
 #include "HttpHeader.h"
 #include "DownloadContext.h"
-#include "RequestGroupMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
-#include "ServerStatMan.h"
 
 namespace aria2 {
 
diff --git a/src/AbstractSingleDiskAdaptor.cc b/src/AbstractSingleDiskAdaptor.cc
index 0dfae344..42448eae 100644
--- a/src/AbstractSingleDiskAdaptor.cc
+++ b/src/AbstractSingleDiskAdaptor.cc
@@ -35,11 +35,11 @@
 #include "AbstractSingleDiskAdaptor.h"
 #include "File.h"
 #include "AdaptiveFileAllocationIterator.h"
+#include "DiskWriter.h"
+#include "FileEntry.h"
 #ifdef HAVE_SOME_FALLOCATE
 # include "FallocFileAllocationIterator.h"
 #endif // HAVE_SOME_FALLOCATE
-#include "DiskWriter.h"
-#include "FileEntry.h"
 
 namespace aria2 {
 
diff --git a/src/ActivePeerConnectionCommand.cc b/src/ActivePeerConnectionCommand.cc
index 97285a49..e718c8bd 100644
--- a/src/ActivePeerConnectionCommand.cc
+++ b/src/ActivePeerConnectionCommand.cc
@@ -51,10 +51,6 @@
 #include "bittorrent_helper.h"
 #include "wallclock.h"
 #include "util.h"
-#include "RequestGroupMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
-#include "ServerStatMan.h"
 
 namespace aria2 {
 
diff --git a/src/AdaptiveFileAllocationIterator.cc b/src/AdaptiveFileAllocationIterator.cc
index cd1fe1e5..347ae0df 100644
--- a/src/AdaptiveFileAllocationIterator.cc
+++ b/src/AdaptiveFileAllocationIterator.cc
@@ -34,13 +34,13 @@
 /* copyright --> */
 #include "AdaptiveFileAllocationIterator.h"
 #include "BinaryStream.h"
-#ifdef HAVE_FALLOCATE
-# include "FallocFileAllocationIterator.h"
-#endif // HAVE_FALLOCATE
 #include "SingleFileAllocationIterator.h"
 #include "RecoverableException.h"
 #include "LogFactory.h"
 #include "Logger.h"
+#ifdef HAVE_FALLOCATE
+# include "FallocFileAllocationIterator.h"
+#endif // HAVE_FALLOCATE
 
 namespace aria2 {
 
@@ -99,4 +99,18 @@ bool AdaptiveFileAllocationIterator::finished()
   }
 }
 
+off_t AdaptiveFileAllocationIterator::getCurrentLength()
+{
+  if(!allocator_) {
+    return offset_;
+  } else {
+    return allocator_->getCurrentLength();
+  }
+}
+
+uint64_t AdaptiveFileAllocationIterator::getTotalLength()
+{
+  return totalLength_;
+}
+
 } // namespace aria2
diff --git a/src/AdaptiveFileAllocationIterator.h b/src/AdaptiveFileAllocationIterator.h
index cac27bc3..ac7d22a4 100644
--- a/src/AdaptiveFileAllocationIterator.h
+++ b/src/AdaptiveFileAllocationIterator.h
@@ -64,19 +64,9 @@ public:
   
   virtual bool finished();
 
-  virtual off_t getCurrentLength()
-  {
-    if(!allocator_) {
-      return offset_;
-    } else {
-      return allocator_->getCurrentLength();
-    }
-  }
+  virtual off_t getCurrentLength();
 
-  virtual uint64_t getTotalLength()
-  {
-    return totalLength_;
-  }
+  virtual uint64_t getTotalLength();
 };
 
 } // namespace aria2
diff --git a/src/AlphaNumberDecorator.cc b/src/AlphaNumberDecorator.cc
new file mode 100644
index 00000000..8f11df57
--- /dev/null
+++ b/src/AlphaNumberDecorator.cc
@@ -0,0 +1,82 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "AlphaNumberDecorator.h"
+
+#include <algorithm>
+
+namespace aria2 {
+
+namespace {
+std::string widen(const std::string& s, size_t width, char zeroChar)
+{
+  std::string t = s;
+  std::string zero(1, zeroChar);
+  while(t.size() < width) {
+    t.insert(0, zero);
+  }
+  return t;
+}
+} // namespace
+
+AlphaNumberDecorator::AlphaNumberDecorator(size_t width, bool uppercase)
+  : width_(width),
+    zero_(uppercase?'A':'a')
+{}
+
+AlphaNumberDecorator::~AlphaNumberDecorator() {}
+
+std::string AlphaNumberDecorator::decorate(unsigned int number)
+{
+  if(number == 0) {
+    return widen(std::string(1, zero_), width_, zero_);
+  }
+
+  int base = 26;
+  char u[14]; // because if unsigned int is 64bit, which is the
+              // biggest integer for the time being and number is
+              // UINT64_MAX, you get "HLHXCZMXSYUMQP"
+  size_t index = 0;
+  do {
+    unsigned int quot = number/base;
+    unsigned int rem = number%base;
+    u[index++] = zero_+rem;
+    number = quot;
+  } while(number);
+  std::reverse(&u[0], &u[index]);
+
+  return widen(std::string(&u[0], &u[index]), width_, zero_);
+}
+
+} // namespace aria2
diff --git a/src/AlphaNumberDecorator.h b/src/AlphaNumberDecorator.h
index d916b0de..1e7ecfce 100644
--- a/src/AlphaNumberDecorator.h
+++ b/src/AlphaNumberDecorator.h
@@ -36,54 +36,23 @@
 #define D_ALPHA_NUMBER_DECORATOR_H
 
 #include "NumberDecorator.h"
-#include "DlAbortEx.h"
-#include <algorithm>
 
 namespace aria2 {
 
 class AlphaNumberDecorator : public NumberDecorator
 {
 private:
-
   size_t width_;
-
   char zero_;
-
-  std::string widen(const std::string& s, size_t width)
-  {
-    std::string t = s;
-    std::string zero(1, zero_);
-    while(t.size() < width) {
-      t.insert(0, zero);
-    }
-    return t;
-  }
-
 public:
-  AlphaNumberDecorator(size_t width, bool uppercase = false):
-    width_(width), zero_(uppercase?'A':'a') {}
+  AlphaNumberDecorator(size_t width, bool uppercase = false);
+  virtual ~AlphaNumberDecorator();
 
-  virtual ~AlphaNumberDecorator() {}
+  // Don't allow copying
+  AlphaNumberDecorator(const AlphaNumberDecorator& c);
+  AlphaNumberDecorator& operator=(const AlphaNumberDecorator& c);
 
-  virtual std::string decorate(unsigned int number)
-  {
-    if(number == 0) {
-      return widen(std::string(1, zero_), width_);
-    }
-
-    int base = 26;
-    char u[14]; // because if unsigned int is 64bit, which is the biggest integer for the time being and number is UINT64_MAX, you get "HLHXCZMXSYUMQP"
-    size_t index = 0;
-    do {
-      unsigned int quot = number/base;
-      unsigned int rem = number%base;
-      u[index++] = zero_+rem;
-      number = quot;
-    } while(number);
-    std::reverse(&u[0], &u[index]);
-
-    return widen(std::string(&u[0], &u[index]), width_);
-  }
+  virtual std::string decorate(unsigned int number);
 };
 
 } // namespace aria2
diff --git a/src/AnnounceList.cc b/src/AnnounceList.cc
index c495798e..5b05d033 100644
--- a/src/AnnounceList.cc
+++ b/src/AnnounceList.cc
@@ -38,7 +38,6 @@
 
 #include "A2STR.h"
 #include "SimpleRandomizer.h"
-#include "util.h"
 #include "a2algo.h"
 
 namespace aria2 {
@@ -49,6 +48,8 @@ const std::string AnnounceList::STOPPED("stopped");
 
 const std::string AnnounceList::COMPLETED("completed");
 
+AnnounceList::AnnounceList():currentTrackerInitialized_(false) {}
+
 AnnounceList::AnnounceList
 (const std::vector<std::vector<std::string> >& announceList):
   currentTrackerInitialized_(false) {
@@ -61,6 +62,8 @@ AnnounceList::AnnounceList
   resetIterator();
 }
 
+AnnounceList::~AnnounceList() {}
+
 void AnnounceList::reconfigure
 (const std::vector<std::vector<std::string> >& announceList)
 {
@@ -262,4 +265,9 @@ bool AnnounceList::currentTierAcceptsCompletedEvent() const
   }
 }
 
+size_t AnnounceList::countTier() const
+{
+  return tiers_.size();
+}
+
 } // namespace aria2
diff --git a/src/AnnounceList.h b/src/AnnounceList.h
index b0cb2d77..a4e064a1 100644
--- a/src/AnnounceList.h
+++ b/src/AnnounceList.h
@@ -54,16 +54,19 @@ private:
   void setCurrentTier
   (const std::deque<SharedHandle<AnnounceTier> >::iterator& itr);
 public:
-  AnnounceList():currentTrackerInitialized_(false) {}
+  AnnounceList();
   AnnounceList(const std::vector<std::vector<std::string> >& announceList);
   AnnounceList(const std::deque<SharedHandle<AnnounceTier> >& tiers);
+  ~AnnounceList();
+
+  // Don't allow copying
+  AnnounceList(const AnnounceList&);
+  AnnounceList& operator=(const AnnounceList&);
 
   void reconfigure(const std::vector<std::vector<std::string> >& announceList);
   void reconfigure(const std::string& url);
 
-  size_t countTier() const {
-    return tiers_.size();
-  }
+  size_t countTier() const;
 
   /**
    * Shuffles all the URLs in each group.
diff --git a/src/AnnounceTier.cc b/src/AnnounceTier.cc
new file mode 100644
index 00000000..ae0ec22a
--- /dev/null
+++ b/src/AnnounceTier.cc
@@ -0,0 +1,79 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "AnnounceTier.h"
+
+namespace aria2 {
+
+AnnounceTier::AnnounceTier(const std::deque<std::string>& urls)
+  : event(STARTED), urls(urls)
+{}
+
+AnnounceTier::~AnnounceTier() {}
+
+void AnnounceTier::nextEvent()
+{
+  switch(event) {
+  case STARTED:
+    event = DOWNLOADING;
+    break;
+  case STARTED_AFTER_COMPLETION:
+    event = SEEDING;
+    break;
+  case STOPPED:
+    event = HALTED;
+    break;
+  case COMPLETED:
+    event = SEEDING;
+    break;
+  default:
+    break;
+  }
+}
+
+void AnnounceTier::nextEventIfAfterStarted()
+{
+  switch(event) {
+  case STOPPED:
+    event = HALTED;
+    break;
+  case COMPLETED:
+    event = SEEDING;
+    break;
+  default:
+    break;
+  }
+}
+
+} // namespace aria2
diff --git a/src/AnnounceTier.h b/src/AnnounceTier.h
index 08a113d3..77de3759 100644
--- a/src/AnnounceTier.h
+++ b/src/AnnounceTier.h
@@ -36,10 +36,12 @@
 #define D_ANNOUNCE_TIER_H
 
 #include "common.h"
-#include "SharedHandle.h"
+
 #include <string>
 #include <deque>
 
+#include "SharedHandle.h"
+
 namespace aria2 {
 
 class AnnounceTier {
@@ -57,40 +59,17 @@ public:
   AnnounceEvent event;
   std::deque<std::string> urls;
 
-  AnnounceTier(const std::deque<std::string>& urls):event(STARTED), urls(urls) {}
+  AnnounceTier(const std::deque<std::string>& urls);
 
-  void nextEvent() {
-    switch(event) {
-    case STARTED:
-      event = DOWNLOADING;
-      break;
-    case STARTED_AFTER_COMPLETION:
-      event = SEEDING;
-      break;
-    case STOPPED:
-      event = HALTED;
-      break;
-    case COMPLETED:
-      event = SEEDING;
-      break;
-    default:
-      break;
-    }
-  }
+  ~AnnounceTier();
 
-  void nextEventIfAfterStarted()
-  {
-    switch(event) {
-    case STOPPED:
-      event = HALTED;
-      break;
-    case COMPLETED:
-      event = SEEDING;
-      break;
-    default:
-      break;
-    }
-  }
+  // Don't allow copying
+  AnnounceTier(const AnnounceTier&);
+  AnnounceTier& operator=(const AnnounceTier&);
+
+  void nextEvent();
+
+  void nextEventIfAfterStarted();
 };
 
 } // namespace aria2
diff --git a/src/AuthConfig.cc b/src/AuthConfig.cc
index 27288705..ec80b99f 100644
--- a/src/AuthConfig.cc
+++ b/src/AuthConfig.cc
@@ -33,10 +33,27 @@
  */
 /* copyright --> */
 #include "AuthConfig.h"
+
 #include <ostream>
 
+#include "a2functional.h"
+
 namespace aria2 {
 
+AuthConfig::AuthConfig() {}
+
+AuthConfig::AuthConfig(const std::string& user, const std::string& password)
+    : user_(user),
+      password_(password)
+{}
+
+AuthConfig::~AuthConfig() {}
+
+std::string AuthConfig::getAuthText() const
+{
+  return strconcat(user_, ":", password_);
+}
+
 std::ostream& operator<<(std::ostream& o, const AuthConfigHandle& authConfig)
 {
   o << authConfig->getAuthText();
diff --git a/src/AuthConfig.h b/src/AuthConfig.h
index f8c02bce..bdf7c8ae 100644
--- a/src/AuthConfig.h
+++ b/src/AuthConfig.h
@@ -41,7 +41,6 @@
 #include <iosfwd>
 
 #include "SharedHandle.h"
-#include "a2functional.h"
 
 namespace aria2 {
 
@@ -51,15 +50,15 @@ private:
   std::string user_;
   std::string password_;
 public:
+  AuthConfig();
+  AuthConfig(const std::string& user, const std::string& password);
+  ~AuthConfig();
 
-  AuthConfig() {}
-  AuthConfig(const std::string& user, const std::string& password):
-    user_(user), password_(password) {}
+  // Don't allow copying
+  AuthConfig(const AuthConfig&);
+  AuthConfig& operator=(const AuthConfig&);
 
-  std::string getAuthText() const
-  {
-    return strconcat(user_, ":", password_);
-  }
+  std::string getAuthText() const;
 
   const std::string& getUser() const
   {
diff --git a/src/AutoSaveCommand.cc b/src/AutoSaveCommand.cc
index 9784f948..8362d196 100644
--- a/src/AutoSaveCommand.cc
+++ b/src/AutoSaveCommand.cc
@@ -35,15 +35,13 @@
 #include "AutoSaveCommand.h"
 #include "DownloadEngine.h"
 #include "RequestGroupMan.h"
-#include "FileEntry.h"
-#include "ServerStatMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
 
 namespace aria2 {
 
-AutoSaveCommand::AutoSaveCommand(cuid_t cuid, DownloadEngine* e, time_t interval):
-  TimeBasedCommand(cuid, e, interval, true) {}
+AutoSaveCommand::AutoSaveCommand
+(cuid_t cuid, DownloadEngine* e, time_t interval)
+  : TimeBasedCommand(cuid, e, interval, true)
+{}
 
 AutoSaveCommand::~AutoSaveCommand() {}
 
diff --git a/src/BitfieldMan.cc b/src/BitfieldMan.cc
index d5e1e1c1..99b3cfb3 100644
--- a/src/BitfieldMan.cc
+++ b/src/BitfieldMan.cc
@@ -37,7 +37,6 @@
 #include <cassert>
 #include <cstring>
 
-#include "util.h"
 #include "array_fun.h"
 #include "bitfield.h"
 
@@ -131,6 +130,11 @@ BitfieldMan::~BitfieldMan() {
   delete [] filterBitfield_;
 }
 
+size_t BitfieldMan::getLastBlockLength() const
+{
+  return totalLength_-blockLength_*(blocks_-1);
+}
+
 size_t BitfieldMan::getBlockLength(size_t index) const
 {
   if(index == blocks_-1) {
@@ -716,4 +720,30 @@ uint64_t BitfieldMan::getMissingUnusedLength(size_t startingIndex) const
   return length;
 }
 
+BitfieldMan::Range::Range(size_t startIndex, size_t endIndex)
+ :
+  startIndex(startIndex),
+  endIndex(endIndex)
+{}
+  
+size_t BitfieldMan::Range::getSize() const
+{
+  return endIndex-startIndex;
+}
+
+size_t BitfieldMan::Range::getMidIndex() const
+{
+  return (endIndex-startIndex)/2+startIndex;
+}
+
+bool BitfieldMan::Range::operator<(const Range& range) const
+{
+  return getSize() < range.getSize();
+}
+    
+bool BitfieldMan::Range::operator==(const Range& range) const
+{
+  return getSize() == range.getSize();
+}
+
 } // namespace aria2
diff --git a/src/BitfieldMan.h b/src/BitfieldMan.h
index 591a3b05..8fb9de86 100644
--- a/src/BitfieldMan.h
+++ b/src/BitfieldMan.h
@@ -74,29 +74,14 @@ private:
   void ensureFilterBitfield();
 public:
   // [startIndex, endIndex)
-  class Range {
-  public:
+  struct Range {
     size_t startIndex;
     size_t endIndex;
-    Range(size_t startIndex = 0, size_t endIndex = 0):startIndex(startIndex),
-                                                      endIndex(endIndex) {}
-  
-    size_t getSize() const {
-      return endIndex-startIndex;
-    }
-
-    size_t getMidIndex() const {
-      return (endIndex-startIndex)/2+startIndex;
-    }
-
-    bool operator<(const Range& range) const {
-      return getSize() < range.getSize();
-    }
-    
-    bool operator==(const Range& range) const
-    {
-      return getSize() == range.getSize();
-    }
+    Range(size_t startIndex = 0, size_t endIndex = 0);
+    size_t getSize() const;
+    size_t getMidIndex() const;
+    bool operator<(const Range& range) const;    
+    bool operator==(const Range& range) const;
   };
 public:
   BitfieldMan(size_t blockLength, uint64_t totalLength);
@@ -110,10 +95,7 @@ public:
     return blockLength_;
   }
 
-  size_t getLastBlockLength() const
-  {
-    return totalLength_-blockLength_*(blocks_-1);
-  }
+  size_t getLastBlockLength() const;
 
   size_t getBlockLength(size_t index) const;
 
diff --git a/src/BtAbortOutstandingRequestEvent.cc b/src/BtAbortOutstandingRequestEvent.cc
new file mode 100644
index 00000000..e015a3f3
--- /dev/null
+++ b/src/BtAbortOutstandingRequestEvent.cc
@@ -0,0 +1,47 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "BtAbortOutstandingRequestEvent.h"
+#include "Piece.h"
+
+namespace aria2 {
+
+BtAbortOutstandingRequestEvent::BtAbortOutstandingRequestEvent
+(const SharedHandle<Piece>& piece)
+  : piece_(piece)
+{}
+
+BtAbortOutstandingRequestEvent::~BtAbortOutstandingRequestEvent() {}
+
+} // namespace aria2
diff --git a/src/BtAbortOutstandingRequestEvent.h b/src/BtAbortOutstandingRequestEvent.h
index d31fb659..cd58d50e 100644
--- a/src/BtAbortOutstandingRequestEvent.h
+++ b/src/BtAbortOutstandingRequestEvent.h
@@ -37,16 +37,17 @@
 
 #include "common.h"
 #include "SharedHandle.h"
-#include "Piece.h"
 
 namespace aria2 {
 
+class Piece;
+
 class BtAbortOutstandingRequestEvent {
 private:
   SharedHandle<Piece> piece_;
 public:
-  BtAbortOutstandingRequestEvent(const SharedHandle<Piece>& piece):
-    piece_(piece) {}
+  BtAbortOutstandingRequestEvent(const SharedHandle<Piece>& piece);
+  ~BtAbortOutstandingRequestEvent();
 
   const SharedHandle<Piece>& getPiece() const { return piece_; }
 };
diff --git a/src/BtAnnounce.h b/src/BtAnnounce.h
index e9d8a438..ce29941e 100644
--- a/src/BtAnnounce.h
+++ b/src/BtAnnounce.h
@@ -36,9 +36,11 @@
 #define D_BT_ANNOUNCE_H
 
 #include "common.h"
+
+#include <string>
+
 #include "SharedHandle.h"
 #include "a2time.h"
-#include <string>
 
 namespace aria2 {
 
diff --git a/src/BtBitfieldMessageValidator.cc b/src/BtBitfieldMessageValidator.cc
new file mode 100644
index 00000000..03d0bf1f
--- /dev/null
+++ b/src/BtBitfieldMessageValidator.cc
@@ -0,0 +1,56 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "BtBitfieldMessageValidator.h"
+#include "BtBitfieldMessage.h"
+#include "bittorrent_helper.h"
+
+namespace aria2 {
+
+BtBitfieldMessageValidator::BtBitfieldMessageValidator
+(const BtBitfieldMessage* message, size_t numPiece)
+  : message_(message),
+    numPiece_(numPiece)
+{}
+
+BtBitfieldMessageValidator::~BtBitfieldMessageValidator() {}
+
+void BtBitfieldMessageValidator::validate()
+{
+  bittorrent::checkBitfield(message_->getBitfield(),
+                            message_->getBitfieldLength(),
+                            numPiece_);
+}
+
+} // namespace aria2
diff --git a/src/BtBitfieldMessageValidator.h b/src/BtBitfieldMessageValidator.h
index 7754b807..ecdaa3a6 100644
--- a/src/BtBitfieldMessageValidator.h
+++ b/src/BtBitfieldMessageValidator.h
@@ -36,27 +36,21 @@
 #define D_BT_BITFIELD_MESSAGE_VALIDATOR_H
 
 #include "BtMessageValidator.h"
-#include "BtBitfieldMessage.h"
-#include "bittorrent_helper.h"
 
 namespace aria2 {
 
+class BtBitfieldMessage;
+
 class BtBitfieldMessageValidator : public BtMessageValidator {
 private:
   const BtBitfieldMessage* message_;
   size_t numPiece_;
 public:
   BtBitfieldMessageValidator(const BtBitfieldMessage* message,
-                             size_t numPiece):
-    message_(message),
-    numPiece_(numPiece) {}
+                             size_t numPiece);
+  ~BtBitfieldMessageValidator();
 
-  virtual void validate()
-  {
-    bittorrent::checkBitfield(message_->getBitfield(),
-                              message_->getBitfieldLength(),
-                              numPiece_);
-  }
+  virtual void validate();
 };
 
 typedef SharedHandle<BtBitfieldMessageValidator> BtBitfieldMessageValidatorHandle;
diff --git a/src/BtCheckIntegrityEntry.cc b/src/BtCheckIntegrityEntry.cc
index 9766f6a3..050b4ce5 100644
--- a/src/BtCheckIntegrityEntry.cc
+++ b/src/BtCheckIntegrityEntry.cc
@@ -40,9 +40,6 @@
 #include "DiskAdaptor.h"
 #include "prefs.h"
 #include "Option.h"
-#include "DownloadContext.h"
-#include "RequestGroupMan.h"
-#include "ServerStatMan.h"
 
 namespace aria2 {
 
diff --git a/src/BtDependency.cc b/src/BtDependency.cc
index 376790a2..8eb6dd8d 100644
--- a/src/BtDependency.cc
+++ b/src/BtDependency.cc
@@ -48,6 +48,7 @@
 #include "bittorrent_helper.h"
 #include "DlAbortEx.h"
 #include "StringFormat.h"
+#include "FileEntry.h"
 
 namespace aria2 {
 
diff --git a/src/BtExtendedMessage.cc b/src/BtExtendedMessage.cc
index 8b1bcec2..bca9e84d 100644
--- a/src/BtExtendedMessage.cc
+++ b/src/BtExtendedMessage.cc
@@ -58,6 +58,8 @@ BtExtendedMessage::BtExtendedMessage
   msgLength_(0)
 {}
 
+BtExtendedMessage::~BtExtendedMessage() {}
+
 unsigned char* BtExtendedMessage::createMessage()
 {
   /**
diff --git a/src/BtExtendedMessage.h b/src/BtExtendedMessage.h
index f3009bdc..887384ec 100644
--- a/src/BtExtendedMessage.h
+++ b/src/BtExtendedMessage.h
@@ -53,6 +53,7 @@ private:
 public:
   BtExtendedMessage(const SharedHandle<ExtensionMessage>& extensionMessage =
                     SharedHandle<ExtensionMessage>());
+  virtual ~BtExtendedMessage();
 
   static const uint8_t ID = 20;
 
diff --git a/src/BtFileAllocationEntry.cc b/src/BtFileAllocationEntry.cc
index 3dc5d722..94f6df94 100644
--- a/src/BtFileAllocationEntry.cc
+++ b/src/BtFileAllocationEntry.cc
@@ -41,9 +41,7 @@
 #include "Command.h"
 #include "DownloadEngine.h"
 #include "DownloadContext.h"
-#include "RequestGroupMan.h"
-#include "CheckIntegrityEntry.h"
-#include "ServerStatMan.h"
+#include "FileEntry.h"
 
 namespace aria2 {
 
diff --git a/src/BtHandshakeMessageValidator.cc b/src/BtHandshakeMessageValidator.cc
new file mode 100644
index 00000000..7f7e0587
--- /dev/null
+++ b/src/BtHandshakeMessageValidator.cc
@@ -0,0 +1,76 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "BtHandshakeMessageValidator.h"
+
+#include <cstring>
+
+#include "BtHandshakeMessage.h"
+#include "util.h"
+#include "StringFormat.h"
+#include "DlAbortEx.h"
+
+namespace aria2 {
+
+BtHandshakeMessageValidator::BtHandshakeMessageValidator
+(const BtHandshakeMessage* message, const unsigned char* infoHash)
+  : message_(message)
+{
+  memcpy(infoHash_, infoHash, sizeof(infoHash_));
+}
+
+BtHandshakeMessageValidator::~BtHandshakeMessageValidator() {}
+
+void BtHandshakeMessageValidator::validate()
+{
+  if(message_->getPstrlen() != 19) {
+    throw DL_ABORT_EX(StringFormat("invalid handshake pstrlen=%u",
+                                   message_->getPstrlen()).str());
+  }
+  if(memcmp(BtHandshakeMessage::BT_PSTR, message_->getPstr(), 19) != 0) {
+    throw DL_ABORT_EX
+      (StringFormat("invalid handshake pstr=%s",
+                    util::percentEncode
+                    (message_->getPstr(), 19).c_str()).str());
+  }
+  if(memcmp(infoHash_, message_->getInfoHash(), sizeof(infoHash_)) != 0) {
+    throw DL_ABORT_EX
+      (StringFormat("invalid handshake info hash: expected:%s, actual:%s",
+                    util::toHex(infoHash_, sizeof(infoHash_)).c_str(),
+                    util::toHex(message_->getInfoHash(),
+                                INFO_HASH_LENGTH).c_str()).str());
+  }
+}
+
+} // namespace aria2
diff --git a/src/BtHandshakeMessageValidator.h b/src/BtHandshakeMessageValidator.h
index 931f567e..f0e863d0 100644
--- a/src/BtHandshakeMessageValidator.h
+++ b/src/BtHandshakeMessageValidator.h
@@ -39,45 +39,23 @@
 
 #include <cstring>
 
-#include "BtHandshakeMessage.h"
-#include "util.h"
-#include "StringFormat.h"
 #include "BtConstants.h"
 
 namespace aria2 {
 
+class BtHandshakeMessage;
+
 class BtHandshakeMessageValidator : public BtMessageValidator {
 private:
   const BtHandshakeMessage* message_;
   unsigned char infoHash_[INFO_HASH_LENGTH];
 public:
   BtHandshakeMessageValidator(const BtHandshakeMessage* message,
-                              const unsigned char* infoHash):
-    message_(message)
-  {
-    memcpy(infoHash_, infoHash, sizeof(infoHash_));
-  }
+                              const unsigned char* infoHash);
 
-  virtual void validate()
-  {
-    if(message_->getPstrlen() != 19) {
-      throw DL_ABORT_EX(StringFormat("invalid handshake pstrlen=%u",
-                                     message_->getPstrlen()).str());
-    }
-    if(memcmp(BtHandshakeMessage::BT_PSTR, message_->getPstr(), 19) != 0) {
-      throw DL_ABORT_EX
-        (StringFormat("invalid handshake pstr=%s",
-                      util::percentEncode
-                      (message_->getPstr(), 19).c_str()).str());
-    }
-    if(memcmp(infoHash_, message_->getInfoHash(), sizeof(infoHash_)) != 0) {
-      throw DL_ABORT_EX
-        (StringFormat("invalid handshake info hash: expected:%s, actual:%s",
-                      util::toHex(infoHash_, sizeof(infoHash_)).c_str(),
-                      util::toHex(message_->getInfoHash(),
-                                  INFO_HASH_LENGTH).c_str()).str());
-    }
-  }
+  ~BtHandshakeMessageValidator();
+
+  virtual void validate();
 };
 
 typedef SharedHandle<BtHandshakeMessageValidator> BtHandshakeMessageValidatorHandle;
diff --git a/src/BtInterestedMessage.cc b/src/BtInterestedMessage.cc
index 683769f5..0d38184f 100644
--- a/src/BtInterestedMessage.cc
+++ b/src/BtInterestedMessage.cc
@@ -42,6 +42,8 @@ const std::string BtInterestedMessage::NAME("interested");
 
 BtInterestedMessage::BtInterestedMessage():ZeroBtMessage(ID, NAME) {}
 
+BtInterestedMessage::~BtInterestedMessage() {}
+
 SharedHandle<BtInterestedMessage> BtInterestedMessage::create
 (const unsigned char* data, size_t dataLength)
 {
diff --git a/src/BtInterestedMessage.h b/src/BtInterestedMessage.h
index 65e161ee..30ce2fe8 100644
--- a/src/BtInterestedMessage.h
+++ b/src/BtInterestedMessage.h
@@ -49,6 +49,7 @@ private:
   SharedHandle<PeerStorage> peerStorage_;
 public:
   BtInterestedMessage();
+  virtual ~BtInterestedMessage();
 
   static const uint8_t ID = 2;
 
diff --git a/src/BtLeecherStateChoke.cc b/src/BtLeecherStateChoke.cc
index 30bb3d34..361a3412 100644
--- a/src/BtLeecherStateChoke.cc
+++ b/src/BtLeecherStateChoke.cc
@@ -58,6 +58,25 @@ BtLeecherStateChoke::PeerEntry::PeerEntry(const SharedHandle<Peer>& peer):
   (peer->peerInterested() &&
    peer->getLastDownloadUpdate().difference(global::wallclock) < 30) {}
 
+BtLeecherStateChoke::PeerEntry::PeerEntry(const PeerEntry& c)
+  : peer_(c.peer_),
+    downloadSpeed_(c.downloadSpeed_),
+    regularUnchoker_(c.regularUnchoker_)
+{}
+
+BtLeecherStateChoke::PeerEntry& BtLeecherStateChoke::PeerEntry::operator=
+(const PeerEntry& c)
+{
+  if(this != &c) {
+    peer_ = c.peer_;
+    downloadSpeed_ = c.downloadSpeed_;
+    regularUnchoker_ = c.regularUnchoker_;
+  }
+  return *this;
+}
+
+BtLeecherStateChoke::PeerEntry::~PeerEntry() {}
+
 const SharedHandle<Peer>& BtLeecherStateChoke::PeerEntry::getPeer() const
 {
   return peer_;
diff --git a/src/BtLeecherStateChoke.h b/src/BtLeecherStateChoke.h
index 4489b283..db22e23a 100644
--- a/src/BtLeecherStateChoke.h
+++ b/src/BtLeecherStateChoke.h
@@ -62,6 +62,10 @@ private:
     bool regularUnchoker_;
   public:
     PeerEntry(const SharedHandle<Peer>& peer);
+    PeerEntry(const PeerEntry& c);
+    ~PeerEntry();
+
+    PeerEntry& operator=(const PeerEntry& c);
 
     bool operator<(const PeerEntry& rhs) const;
 
diff --git a/src/BtNotInterestedMessage.cc b/src/BtNotInterestedMessage.cc
index c3cdd305..8678a222 100644
--- a/src/BtNotInterestedMessage.cc
+++ b/src/BtNotInterestedMessage.cc
@@ -42,6 +42,8 @@ const std::string BtNotInterestedMessage::NAME("not interested");
 
 BtNotInterestedMessage::BtNotInterestedMessage():ZeroBtMessage(ID, NAME) {}
 
+BtNotInterestedMessage::~BtNotInterestedMessage() {}
+
 SharedHandle<BtNotInterestedMessage> BtNotInterestedMessage::create
 (const unsigned char* data, size_t dataLength)
 {
diff --git a/src/BtNotInterestedMessage.h b/src/BtNotInterestedMessage.h
index 57197605..39e1dc06 100644
--- a/src/BtNotInterestedMessage.h
+++ b/src/BtNotInterestedMessage.h
@@ -49,6 +49,7 @@ private:
   SharedHandle<PeerStorage> peerStorage_;
 public:
   BtNotInterestedMessage();
+  virtual ~BtNotInterestedMessage();
 
   static const uint8_t ID = 3;
 
diff --git a/src/BtPieceMessageValidator.cc b/src/BtPieceMessageValidator.cc
new file mode 100644
index 00000000..e1f5be5d
--- /dev/null
+++ b/src/BtPieceMessageValidator.cc
@@ -0,0 +1,56 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "BtPieceMessageValidator.h"
+#include "BtPieceMessage.h"
+#include "bittorrent_helper.h"
+
+namespace aria2 {
+
+BtPieceMessageValidator::BtPieceMessageValidator
+(const BtPieceMessage* message, size_t numPiece, size_t pieceLength)
+  : message_(message),
+    numPiece_(numPiece),
+    pieceLength_(pieceLength)
+{}
+
+BtPieceMessageValidator::~BtPieceMessageValidator() {}
+
+void BtPieceMessageValidator::validate()
+{
+  bittorrent::checkIndex(message_->getIndex(), numPiece_);
+  bittorrent::checkBegin(message_->getBegin(), pieceLength_);
+}
+
+} // namespace aria2
diff --git a/src/BtPieceMessageValidator.h b/src/BtPieceMessageValidator.h
index 9935e335..30f065d8 100644
--- a/src/BtPieceMessageValidator.h
+++ b/src/BtPieceMessageValidator.h
@@ -36,11 +36,11 @@
 #define D_BT_PIECE_MESSAGE_VALIDATOR_H
 
 #include "BtMessageValidator.h"
-#include "BtPieceMessage.h"
-#include "bittorrent_helper.h"
 
 namespace aria2 {
 
+class BtPieceMessage;
+
 class BtPieceMessageValidator : public BtMessageValidator {
 private:
   const BtPieceMessage* message_;
@@ -49,16 +49,11 @@ private:
 public:
   BtPieceMessageValidator(const BtPieceMessage* message,
                           size_t numPiece,
-                          size_t pieceLength):
-    message_(message),
-    numPiece_(numPiece),
-    pieceLength_(pieceLength) {}
+                          size_t pieceLength);
 
-  virtual void validate()
-  {
-    bittorrent::checkIndex(message_->getIndex(), numPiece_);
-    bittorrent::checkBegin(message_->getBegin(), pieceLength_);
-  }
+  ~BtPieceMessageValidator();
+
+  virtual void validate();
 };
 
 typedef SharedHandle<BtPieceMessageValidator> BtPieceMessageValidatorHandle;
diff --git a/src/BtRegistry.cc b/src/BtRegistry.cc
index e6b938c9..85c6e9ed 100644
--- a/src/BtRegistry.cc
+++ b/src/BtRegistry.cc
@@ -89,4 +89,55 @@ void BtRegistry::removeAll() {
   pool_.clear();
 }
 
+BtObject::BtObject
+(const SharedHandle<DownloadContext>& downloadContext,
+ const SharedHandle<PieceStorage>& pieceStorage,
+ const SharedHandle<PeerStorage>& peerStorage,
+ const SharedHandle<BtAnnounce>& btAnnounce,
+ const SharedHandle<BtRuntime>& btRuntime,
+ const SharedHandle<BtProgressInfoFile>& btProgressInfoFile)
+  : downloadContext_(downloadContext),
+    pieceStorage_(pieceStorage),
+    peerStorage_(peerStorage),
+    btAnnounce_(btAnnounce),
+    btRuntime_(btRuntime),
+    btProgressInfoFile_(btProgressInfoFile)
+{}
+
+BtObject::BtObject() {}
+
+BtObject::BtObject(const BtObject& c)
+  : downloadContext_(c.downloadContext_),
+    pieceStorage_(c.pieceStorage_),
+    peerStorage_(c.peerStorage_),
+    btAnnounce_(c.btAnnounce_),
+    btRuntime_(c.btRuntime_),
+    btProgressInfoFile_(c.btProgressInfoFile_)
+{}
+
+BtObject::~BtObject() {}
+
+BtObject& BtObject::operator=(const BtObject& c)
+{
+  if(this != &c) {
+    downloadContext_ = c.downloadContext_;
+    pieceStorage_ = c.pieceStorage_;
+    peerStorage_ = c.peerStorage_;
+    btAnnounce_ = c.btAnnounce_;
+    btRuntime_ = c.btRuntime_;
+    btProgressInfoFile_ = c.btProgressInfoFile_;
+  }
+  return *this;
+}
+
+bool BtObject::isNull() const
+{
+  return !downloadContext_ &&
+    !pieceStorage_ &&
+    !peerStorage_ &&
+    !btAnnounce_ &&
+    !btRuntime_ &&
+    !btProgressInfoFile_;
+}
+
 } // namespace aria2
diff --git a/src/BtRegistry.h b/src/BtRegistry.h
index a39700f5..c37f6257 100644
--- a/src/BtRegistry.h
+++ b/src/BtRegistry.h
@@ -64,25 +64,17 @@ struct BtObject {
            const SharedHandle<PeerStorage>& peerStorage,
            const SharedHandle<BtAnnounce>& btAnnounce,
            const SharedHandle<BtRuntime>& btRuntime,
-           const SharedHandle<BtProgressInfoFile>& btProgressInfoFile):
-    downloadContext_(downloadContext),
-    pieceStorage_(pieceStorage),
-    peerStorage_(peerStorage),
-    btAnnounce_(btAnnounce),
-    btRuntime_(btRuntime),
-    btProgressInfoFile_(btProgressInfoFile) {}
+           const SharedHandle<BtProgressInfoFile>& btProgressInfoFile);
 
-  BtObject() {}
+  BtObject();
 
-  bool isNull() const
-  {
-    return !downloadContext_ &&
-      !pieceStorage_ &&
-      !peerStorage_ &&
-      !btAnnounce_ &&
-      !btRuntime_ &&
-      !btProgressInfoFile_;
-  }
+  BtObject(const BtObject& c);
+
+  ~BtObject();
+
+  BtObject& operator=(const BtObject& c);
+
+  bool isNull() const;
 };
 
 class BtRegistry {
diff --git a/src/BtRuntime.cc b/src/BtRuntime.cc
new file mode 100644
index 00000000..a639a4f0
--- /dev/null
+++ b/src/BtRuntime.cc
@@ -0,0 +1,61 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "BtRuntime.h"
+#include "BtConstants.h"
+
+namespace aria2 {
+
+BtRuntime::BtRuntime()
+  : uploadLengthAtStartup_(0),
+    port_(0),
+    halt_(false),
+    connections_(0),
+    ready_(false),
+    maxPeers_(DEFAULT_MAX_PEERS),
+    minPeers_(DEFAULT_MIN_PEERS)
+{}
+
+BtRuntime::~BtRuntime() {}
+
+void BtRuntime::setMaxPeers(unsigned int maxPeers)
+{
+  maxPeers_ = maxPeers;
+  minPeers_ = static_cast<unsigned int>(maxPeers*0.8);
+  if(minPeers_ == 0 && maxPeers != 0) {
+    minPeers_ = maxPeers;
+  }
+}
+
+} // namespace aria2
diff --git a/src/BtRuntime.h b/src/BtRuntime.h
index b45aa7e9..30676d84 100644
--- a/src/BtRuntime.h
+++ b/src/BtRuntime.h
@@ -36,7 +36,7 @@
 #define D_BT_RUNTIME_H
 
 #include "common.h"
-#include "BtConstants.h"
+#include "SharedHandle.h"
 
 namespace aria2 {
 
@@ -57,17 +57,9 @@ private:
   static const unsigned int DEFAULT_MIN_PEERS = 40;
 
 public:
-  BtRuntime():
-    uploadLengthAtStartup_(0),
-    port_(0),
-    halt_(false),
-    connections_(0),
-    ready_(false),
-    maxPeers_(DEFAULT_MAX_PEERS),
-    minPeers_(DEFAULT_MIN_PEERS)
-  {}
+  BtRuntime();
 
-  ~BtRuntime() {}
+  ~BtRuntime();
 
   uint64_t getUploadLengthAtStartup() const {
     return uploadLengthAtStartup_;
@@ -114,14 +106,7 @@ public:
 
   void setReady(bool go) { ready_ = go; }
 
-  void setMaxPeers(unsigned int maxPeers)
-  {
-    maxPeers_ = maxPeers;
-    minPeers_ = static_cast<unsigned int>(maxPeers*0.8);
-    if(minPeers_ == 0 && maxPeers != 0) {
-      minPeers_ = maxPeers;
-    }
-  }
+  void setMaxPeers(unsigned int maxPeers);
 
   unsigned int getMaxPeers() const
   {
diff --git a/src/BtSeederStateChoke.cc b/src/BtSeederStateChoke.cc
index 3ff4993b..ca062a02 100644
--- a/src/BtSeederStateChoke.cc
+++ b/src/BtSeederStateChoke.cc
@@ -60,6 +60,29 @@ BtSeederStateChoke::PeerEntry::PeerEntry
   uploadSpeed_(peer->calculateUploadSpeed())
 {}
 
+BtSeederStateChoke::PeerEntry::PeerEntry(const PeerEntry& c)
+  : peer_(c.peer_),
+    outstandingUpload_(c.outstandingUpload_),
+    lastAmUnchoking_(c.lastAmUnchoking_),
+    recentUnchoking_(c.recentUnchoking_),
+    uploadSpeed_(c.uploadSpeed_)
+{}
+
+BtSeederStateChoke::PeerEntry::~PeerEntry() {}
+
+BtSeederStateChoke::PeerEntry& BtSeederStateChoke::PeerEntry::operator=
+(const PeerEntry& c)
+{
+  if(this != &c) {
+    peer_ = c.peer_;
+    outstandingUpload_ = c.outstandingUpload_;
+    lastAmUnchoking_ = c.lastAmUnchoking_;
+    recentUnchoking_ = c.recentUnchoking_;
+    uploadSpeed_ = c.uploadSpeed_;
+  }
+  return *this;
+}
+
 bool
 BtSeederStateChoke::PeerEntry::operator<(const PeerEntry& rhs) const
 {
diff --git a/src/BtSeederStateChoke.h b/src/BtSeederStateChoke.h
index 75f1c7c1..9c30fb92 100644
--- a/src/BtSeederStateChoke.h
+++ b/src/BtSeederStateChoke.h
@@ -66,6 +66,10 @@ private:
     const static time_t TIME_FRAME = 20;
   public:
     PeerEntry(const SharedHandle<Peer>& peer);
+    PeerEntry(const PeerEntry& c);
+    ~PeerEntry();
+
+    PeerEntry& operator=(const PeerEntry& c);
 
     bool operator<(const PeerEntry& rhs) const;
 
diff --git a/src/BtSetup.cc b/src/BtSetup.cc
index 0a6ffc17..6943a5c6 100644
--- a/src/BtSetup.cc
+++ b/src/BtSetup.cc
@@ -78,12 +78,11 @@
 #include "LpdMessageDispatcher.h"
 #include "message.h"
 #include "SocketCore.h"
-#include "RequestGroupMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
-#include "ServerStatMan.h"
 #include "DlAbortEx.h"
 #include "array_fun.h"
+#include "DownloadContext.h"
+#include "PieceStorage.h"
+#include "PeerStorage.h"
 
 namespace aria2 {
 
diff --git a/src/BtStopDownloadCommand.cc b/src/BtStopDownloadCommand.cc
index 1d906dcc..aaa47627 100644
--- a/src/BtStopDownloadCommand.cc
+++ b/src/BtStopDownloadCommand.cc
@@ -36,8 +36,6 @@
 #include "PieceStorage.h"
 #include "RequestGroup.h"
 #include "BtRuntime.h"
-#include "Peer.h"
-#include "DownloadContext.h"
 #include "Logger.h"
 #include "wallclock.h"
 #include "util.h"
diff --git a/src/ByteArrayDiskWriter.cc b/src/ByteArrayDiskWriter.cc
index b1b1008b..51974003 100644
--- a/src/ByteArrayDiskWriter.cc
+++ b/src/ByteArrayDiskWriter.cc
@@ -33,7 +33,6 @@
  */
 /* copyright --> */
 #include "ByteArrayDiskWriter.h"
-#include "util.h"
 #include "A2STR.h"
 
 namespace aria2 {
@@ -90,4 +89,14 @@ uint64_t ByteArrayDiskWriter::size()
   return buf_.tellg();
 }
 
+void ByteArrayDiskWriter::setString(const std::string& s)
+{
+  buf_.str(s);
+}
+
+std::string ByteArrayDiskWriter::getString() const
+{
+  return buf_.str();
+}
+
 } // namespace aria2
diff --git a/src/ByteArrayDiskWriter.h b/src/ByteArrayDiskWriter.h
index e049a06e..cba19b08 100644
--- a/src/ByteArrayDiskWriter.h
+++ b/src/ByteArrayDiskWriter.h
@@ -66,15 +66,9 @@ public:
 
   virtual void disableDirectIO() {}
 
-  void setString(const std::string& s)
-  {
-    buf_.str(s);
-  }
+  void setString(const std::string& s);
 
-  std::string getString() const
-  {
-    return buf_.str();
-  }
+  std::string getString() const;
 };
 
 typedef SharedHandle<ByteArrayDiskWriter> ByteArrayDiskWriterHandle;
diff --git a/src/CUIDCounter.cc b/src/CUIDCounter.cc
new file mode 100644
index 00000000..3ae6b88d
--- /dev/null
+++ b/src/CUIDCounter.cc
@@ -0,0 +1,51 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "CUIDCounter.h"
+
+namespace aria2 {
+
+CUIDCounter::CUIDCounter():count_(0) {}
+
+CUIDCounter::~CUIDCounter() {}
+
+cuid_t CUIDCounter::newID()
+{
+  if(count_ == INT64_MAX) {
+    count_ = 0;
+  }
+  return ++count_;
+}
+
+} // namespace aria2
diff --git a/src/CUIDCounter.h b/src/CUIDCounter.h
index f18a38a1..eb118f64 100644
--- a/src/CUIDCounter.h
+++ b/src/CUIDCounter.h
@@ -44,19 +44,11 @@ class CUIDCounter {
 private:
   cuid_t count_;
 public:
-  CUIDCounter():count_(0) {}
-
-  ~CUIDCounter() {}
-
-  cuid_t newID()
-  {
-    if(count_ == INT64_MAX) {
-      count_ = 0;
-    }
-    return ++count_;
-  }
+  CUIDCounter();
+  ~CUIDCounter();
+  cuid_t newID();
 };
 
-}
+} // namespace aria2
 
 #endif // D_CUID_COUNTER_H
diff --git a/src/CheckIntegrityCommand.cc b/src/CheckIntegrityCommand.cc
index 6ab47c2c..a9c0ff8d 100644
--- a/src/CheckIntegrityCommand.cc
+++ b/src/CheckIntegrityCommand.cc
@@ -43,9 +43,6 @@
 #include "a2functional.h"
 #include "RecoverableException.h"
 #include "util.h"
-#include "RequestGroupMan.h"
-#include "FileAllocationEntry.h"
-#include "ServerStatMan.h"
 
 namespace aria2 {
 
diff --git a/src/CheckIntegrityDispatcherCommand.cc b/src/CheckIntegrityDispatcherCommand.cc
index bb0b1b16..9c76e662 100644
--- a/src/CheckIntegrityDispatcherCommand.cc
+++ b/src/CheckIntegrityDispatcherCommand.cc
@@ -37,10 +37,7 @@
 #include "CheckIntegrityCommand.h"
 #include "message.h"
 #include "Logger.h"
-#include "FileEntry.h"
 #include "util.h"
-#include "ServerStatMan.h"
-#include "FileAllocationEntry.h"
 
 namespace aria2 {
 
diff --git a/src/CheckIntegrityEntry.cc b/src/CheckIntegrityEntry.cc
index a5f28418..b07f5dac 100644
--- a/src/CheckIntegrityEntry.cc
+++ b/src/CheckIntegrityEntry.cc
@@ -41,9 +41,6 @@
 #include "FileAllocationEntry.h"
 #include "DownloadEngine.h"
 #include "Option.h"
-#include "DownloadContext.h"
-#include "RequestGroupMan.h"
-#include "ServerStatMan.h"
 
 namespace aria2 {
 
diff --git a/src/Checksum.cc b/src/Checksum.cc
new file mode 100644
index 00000000..05653304
--- /dev/null
+++ b/src/Checksum.cc
@@ -0,0 +1,65 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "Checksum.h"
+
+namespace aria2 {
+
+Checksum::Checksum(const std::string& algo, const std::string& messageDigest)
+    : algo_(algo),
+      messageDigest_(messageDigest)
+{}
+
+Checksum::Checksum()
+    : algo_("sha-1")
+{}
+
+Checksum::~Checksum() {}
+
+bool Checksum::isEmpty() const
+{
+  return messageDigest_.empty();
+}
+
+void Checksum::setMessageDigest(const std::string& md)
+{
+  messageDigest_ = md;
+}
+  
+void Checksum::setAlgo(const std::string& algo)
+{
+  algo_ = algo;
+}
+
+} // namespace aria2
diff --git a/src/Checksum.h b/src/Checksum.h
index d036b09e..a800111e 100644
--- a/src/Checksum.h
+++ b/src/Checksum.h
@@ -47,29 +47,21 @@ private:
   std::string messageDigest_;
 public:
   // messageDigest_ is ascii hexadecimal notation.
-  Checksum(const std::string& algo, const std::string& messageDigest):
-    algo_(algo), messageDigest_(messageDigest) {}
-  Checksum():
-    algo_("sha-1") {}
+  Checksum(const std::string& algo, const std::string& messageDigest);
+  Checksum();
+  ~Checksum();
 
-  ~Checksum() {}
+  bool isEmpty() const;
 
-  bool isEmpty() const {
-    return messageDigest_.empty();
-  }
-
-  void setMessageDigest(const std::string& md) {
-    this->messageDigest_ = md;
-  }
-  const std::string& getMessageDigest() const {
+  void setMessageDigest(const std::string& md);
+  const std::string& getMessageDigest() const
+  {
     return messageDigest_;
   }
   
-  void setAlgo(const std::string& algo) {
-    this->algo_ = algo;
-  }
-
-  const std::string& getAlgo() const {
+  void setAlgo(const std::string& algo);
+  const std::string& getAlgo() const
+  {
     return algo_;
   }
 };
diff --git a/src/ChecksumCheckIntegrityEntry.cc b/src/ChecksumCheckIntegrityEntry.cc
index 6b384d58..93c4f130 100644
--- a/src/ChecksumCheckIntegrityEntry.cc
+++ b/src/ChecksumCheckIntegrityEntry.cc
@@ -39,9 +39,7 @@
 #include "IteratableChecksumValidator.h"
 #include "DownloadEngine.h"
 #include "PieceStorage.h"
-#include "RequestGroupMan.h"
 #include "FileAllocationEntry.h"
-#include "ServerStatMan.h"
 #include "StreamFileAllocationEntry.h"
 
 namespace aria2 {
diff --git a/src/ChunkChecksum.cc b/src/ChunkChecksum.cc
new file mode 100644
index 00000000..2a0c337d
--- /dev/null
+++ b/src/ChunkChecksum.cc
@@ -0,0 +1,91 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "ChunkChecksum.h"
+#include "A2STR.h"
+
+namespace aria2 {
+
+ChunkChecksum::ChunkChecksum():checksumLength_(0) {}
+
+ChunkChecksum::ChunkChecksum
+(const std::string& algo,
+ const std::vector<std::string>& checksums,
+ size_t checksumLength)
+    : algo_(algo),
+      checksums_(checksums),
+      checksumLength_(checksumLength)
+{}
+
+bool ChunkChecksum::validateChunk
+(const std::string& actualChecksum,
+ size_t checksumIndex) const
+{
+  if(checksumIndex < checksums_.size()) {
+    return actualChecksum == getChecksum(checksumIndex);
+  } else {
+    return false;
+  }
+}
+
+uint64_t ChunkChecksum::getEstimatedDataLength() const
+{
+  return static_cast<uint64_t>(checksumLength_)*checksums_.size();
+}
+
+size_t ChunkChecksum::countChecksum() const
+{
+  return checksums_.size();
+}
+
+const std::string& ChunkChecksum::getChecksum(size_t index) const
+{
+  if(index < checksums_.size()) {
+    return checksums_[index];
+  } else {
+    return A2STR::NIL;
+  }
+}
+
+void ChunkChecksum::setAlgo(const std::string& algo)
+{
+  algo_ = algo;
+}
+
+void ChunkChecksum::setChecksums(const std::vector<std::string>& mds)
+{
+  checksums_ = mds;
+}
+
+} // namespace aria2
diff --git a/src/ChunkChecksum.h b/src/ChunkChecksum.h
index 86d3d9bb..3f73bc46 100644
--- a/src/ChunkChecksum.h
+++ b/src/ChunkChecksum.h
@@ -41,7 +41,6 @@
 #include <vector>
 
 #include "SharedHandle.h"
-#include "A2STR.h"
 
 namespace aria2 {
 
@@ -51,44 +50,22 @@ private:
   std::vector<std::string> checksums_;
   size_t checksumLength_;
 public:
-  ChunkChecksum():checksumLength_(0) {}    
+  ChunkChecksum();
 
   ChunkChecksum(const std::string& algo,
                 const std::vector<std::string>& checksums,
-                size_t checksumLength):
-    algo_(algo),
-    checksums_(checksums),
-    checksumLength_(checksumLength) {}
+                size_t checksumLength);
 
   bool validateChunk(const std::string& actualChecksum,
-                     size_t checksumIndex) const
-  {
-    if(checksumIndex < checksums_.size()) {
-      return actualChecksum == getChecksum(checksumIndex);
-    } else {
-      return false;
-    }
-  }
+                     size_t checksumIndex) const;
 
-  uint64_t getEstimatedDataLength() const
-  {
-    return ((uint64_t)checksumLength_)*checksums_.size();
-  }
+  uint64_t getEstimatedDataLength() const;
 
-  size_t countChecksum() const
-  {
-    return checksums_.size();
-  }
+  size_t countChecksum() const;
 
-  const std::string& getChecksum(size_t index) const
-  {
-    if(index < checksums_.size()) {
-      return checksums_[index];
-    } else {
-      return A2STR::NIL;
-    }
-  }
+  const std::string& getChecksum(size_t index) const;
   
+  void setChecksums(const std::vector<std::string>& mds);
   const std::vector<std::string>& getChecksums() const
   {
     return checksums_;
@@ -99,25 +76,16 @@ public:
     return checksumLength_;
   }
 
+  void setAlgo(const std::string& algo);
   const std::string& getAlgo() const
   {
     return algo_;
   }
 
-  void setAlgo(const std::string& algo)
-  {
-    algo_ = algo;
-  }
-
   void setChecksumLength(size_t length)
   {
     checksumLength_ = length;
   }
-
-  void setChecksums(const std::vector<std::string>& mds)
-  {
-    checksums_ = mds;
-  }
 };
 
 } // namespace aria2
diff --git a/src/Command.h b/src/Command.h
index 46406db0..8b724045 100644
--- a/src/Command.h
+++ b/src/Command.h
@@ -36,7 +36,6 @@
 #define D_COMMAND_H
 
 #include "common.h"
-#include <stdint.h>
 
 namespace aria2 {
 
diff --git a/src/ConsoleStatCalc.cc b/src/ConsoleStatCalc.cc
index da14b244..adbaaab7 100644
--- a/src/ConsoleStatCalc.cc
+++ b/src/ConsoleStatCalc.cc
@@ -60,20 +60,40 @@
 #include "util.h"
 #include "DownloadContext.h"
 #include "wallclock.h"
-#include "ServerStatMan.h"
+#include "FileEntry.h"
 #ifdef ENABLE_BITTORRENT
 # include "bittorrent_helper.h"
-# include "Peer.h"
 # include "PeerStorage.h"
 # include "BtRegistry.h"
-# include "BtProgressInfoFile.h"
-# include "BtRuntime.h"
-# include "BtAnnounce.h"
-# include "PieceStorage.h"
 #endif // ENABLE_BITTORRENT
 
 namespace aria2 {
 
+std::string SizeFormatter::operator()(int64_t size) const
+{
+  return format(size);
+}
+
+namespace {
+class AbbrevSizeFormatter:public SizeFormatter {
+protected:
+  virtual std::string format(int64_t size) const
+  {
+    return util::abbrevSize(size);
+  }
+};
+} // namespace
+
+namespace {
+class PlainSizeFormatter:public SizeFormatter {
+protected:
+  virtual std::string format(int64_t size) const
+  {
+    return util::itos(size);
+  }
+};
+} // namespace
+
 namespace {
 void printProgress
 (std::ostream& o, const SharedHandle<RequestGroup>& rg, const DownloadEngine* e,
diff --git a/src/ConsoleStatCalc.h b/src/ConsoleStatCalc.h
index ddb32b0f..d13f34fe 100644
--- a/src/ConsoleStatCalc.h
+++ b/src/ConsoleStatCalc.h
@@ -36,8 +36,10 @@
 #define D_CONSOLE_STAT_CALC_H
 
 #include "StatCalc.h"
+
+#include <string>
+
 #include "TimerA2.h"
-#include "util.h"
 
 namespace aria2 {
 
@@ -47,26 +49,7 @@ protected:
 public:
   virtual ~SizeFormatter() {}
 
-  std::string operator()(int64_t size) const
-  {
-    return format(size);
-  }
-};
-
-class AbbrevSizeFormatter:public SizeFormatter {
-protected:
-  virtual std::string format(int64_t size) const
-  {
-    return util::abbrevSize(size);
-  }
-};
-
-class PlainSizeFormatter:public SizeFormatter {
-protected:
-  virtual std::string format(int64_t size) const
-  {
-    return util::itos(size);
-  }
+  std::string operator()(int64_t size) const;
 };
 
 class ConsoleStatCalc:public StatCalc
diff --git a/src/ContextAttribute.h b/src/ContextAttribute.h
index 9ca25b8d..02bda128 100644
--- a/src/ContextAttribute.h
+++ b/src/ContextAttribute.h
@@ -37,8 +37,12 @@
 
 #include "common.h"
 
+namespace aria2 {
+
 struct ContextAttribute {
   virtual ~ContextAttribute() {}
 };
 
+} // namespace aria2
+
 #endif // D_CONTEXT_ATTRIBUTE_H
diff --git a/src/Cookie.cc b/src/Cookie.cc
index c8ea1ffb..40cb36f2 100644
--- a/src/Cookie.cc
+++ b/src/Cookie.cc
@@ -74,8 +74,40 @@ Cookie::Cookie():
   creationTime_(0),
   lastAccessTime_(0) {}
 
+Cookie::Cookie(const Cookie& c)
+  : name_(c.name_),
+    value_(c.value_),
+    expiryTime_(c.expiryTime_),
+    persistent_(c.persistent_),
+    domain_(c.domain_),
+    hostOnly_(c.hostOnly_),
+    path_(c.path_),
+    secure_(c.secure_),
+    httpOnly_(c.httpOnly_),
+    creationTime_(c.creationTime_),
+    lastAccessTime_(c.lastAccessTime_)
+{}
+
 Cookie::~Cookie() {}
 
+Cookie& Cookie::operator=(const Cookie& c)
+{
+  if(this != &c) {
+    name_ = c.name_;
+    value_ = c.value_;
+    expiryTime_ = c.expiryTime_;
+    persistent_ = c.persistent_;
+    domain_ = c.domain_;
+    hostOnly_ = c.hostOnly_;
+    path_ = c.path_;
+    secure_ = c.secure_;
+    httpOnly_ = c.httpOnly_;
+    creationTime_ = c.creationTime_;
+    lastAccessTime_ = c.lastAccessTime_;
+  }
+  return *this;
+}
+
 std::string Cookie::toString() const
 {
   return strconcat(name_, '=', value_);
@@ -139,4 +171,24 @@ std::string Cookie::toNsCookieFormat() const
   return ss.str();
 }
 
+void Cookie::setName(const std::string& name)
+{
+  name_ = name;
+}
+
+void Cookie::setValue(const std::string& value)
+{
+  value_ = value;
+}
+
+void Cookie::setDomain(const std::string& domain)
+{
+  domain_ = domain;
+}
+
+void Cookie::setPath(const std::string& path)
+{
+  path_ = path;
+}
+
 } // namespace aria2
diff --git a/src/Cookie.h b/src/Cookie.h
index 5c4bc4e3..5462891d 100644
--- a/src/Cookie.h
+++ b/src/Cookie.h
@@ -74,8 +74,12 @@ public:
    bool httpOnly,
    time_t creationTime);
 
+  Cookie(const Cookie& c);
+
   ~Cookie();
 
+  Cookie& operator=(const Cookie& c);
+
   std::string toString() const;
 
   bool match
@@ -91,20 +95,14 @@ public:
     return name_;
   }
 
-  void setName(const std::string& name)
-  {
-    name_ = name;
-  }
+  void setName(const std::string& name);
 
   const std::string& getValue() const
   {
     return value_;
   }
 
-  void setValue(const std::string& value)
-  {
-    value_ = value;
-  }
+  void setValue(const std::string& value);
 
   time_t getExpiryTime() const
   {
@@ -131,10 +129,7 @@ public:
     return domain_;
   }
 
-  void setDomain(const std::string& domain)
-  {
-    domain_ = domain;
-  }
+  void setDomain(const std::string& domain);
 
   bool getHostOnly() const
   {
@@ -151,10 +146,7 @@ public:
     return path_;
   }
 
-  void setPath(const std::string& path)
-  {
-    path_ = path;
-  }
+  void setPath(const std::string& path);
 
   bool getSecure() const
   {
diff --git a/src/CookieStorage.cc b/src/CookieStorage.cc
index c1d451bb..6ebb99cd 100644
--- a/src/CookieStorage.cc
+++ b/src/CookieStorage.cc
@@ -55,11 +55,30 @@
 
 namespace aria2 {
 
-CookieStorage::DomainEntry::DomainEntry
-(const std::string& domain):
-  key_(util::isNumericHost(domain)?domain:cookie::reverseDomainLevel(domain))
+CookieStorage::DomainEntry::DomainEntry(const std::string& domain)
+ : key_(util::isNumericHost(domain)?domain:cookie::reverseDomainLevel(domain))
 {}
 
+CookieStorage::DomainEntry::DomainEntry
+(const DomainEntry& c)
+  : key_(c.key_),
+    lastAccessTime_(c.lastAccessTime_),
+    cookies_(c.cookies_)
+{}
+
+CookieStorage::DomainEntry::~DomainEntry() {}
+
+CookieStorage::DomainEntry& CookieStorage::DomainEntry::operator=
+(const DomainEntry& c)
+{
+  if(this != &c) {
+    key_ = c.key_;
+    lastAccessTime_ = c.lastAccessTime_;
+    cookies_ = c.cookies_;
+  }
+  return *this;
+}
+
 bool CookieStorage::DomainEntry::addCookie(const Cookie& cookie, time_t now)
 {
   setLastAccessTime(now);
@@ -109,6 +128,17 @@ void CookieStorage::DomainEntry::writeCookie(std::ostream& o) const
   }
 }
 
+size_t CookieStorage::DomainEntry::countCookie() const
+{
+  return cookies_.size();
+}
+
+
+bool CookieStorage::DomainEntry::operator<(const DomainEntry& de) const
+{
+  return key_ < de.key_;
+}
+
 CookieStorage::CookieStorage():logger_(LogFactory::getInstance()) {}
 
 CookieStorage::~CookieStorage() {}
diff --git a/src/CookieStorage.h b/src/CookieStorage.h
index ad2add92..d56be1c0 100644
--- a/src/CookieStorage.h
+++ b/src/CookieStorage.h
@@ -66,6 +66,10 @@ public:
     std::deque<Cookie> cookies_;
   public:
     DomainEntry(const std::string& domain);
+    DomainEntry(const DomainEntry& c);
+    ~DomainEntry();
+
+    DomainEntry& operator=(const DomainEntry& c);
 
     const std::string& getKey() const
     {
@@ -89,10 +93,7 @@ public:
       return out;
     }
 
-    size_t countCookie() const
-    {
-      return cookies_.size();
-    }
+    size_t countCookie() const;
 
     bool addCookie(const Cookie& cookie, time_t now);
 
@@ -116,10 +117,7 @@ public:
       return std::copy(cookies_.begin(), cookies_.end(), out);
     }
 
-    bool operator<(const DomainEntry& de) const
-    {
-      return key_ < de.key_;
-    }
+    bool operator<(const DomainEntry& de) const;
   };
 private:
   std::deque<DomainEntry> domains_;
diff --git a/src/CreateRequestCommand.cc b/src/CreateRequestCommand.cc
index ef1f70c2..d6e84f20 100644
--- a/src/CreateRequestCommand.cc
+++ b/src/CreateRequestCommand.cc
@@ -44,9 +44,7 @@
 #include "prefs.h"
 #include "Option.h"
 #include "RequestGroupMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
-#include "ServerStatMan.h"
+#include "FileEntry.h"
 
 namespace aria2 {
 
diff --git a/src/DHTAutoSaveCommand.cc b/src/DHTAutoSaveCommand.cc
index 4ceda309..f9b06118 100644
--- a/src/DHTAutoSaveCommand.cc
+++ b/src/DHTAutoSaveCommand.cc
@@ -43,7 +43,6 @@
 #include "DHTRoutingTableSerializer.h"
 #include "RecoverableException.h"
 #include "DownloadEngine.h"
-#include "util.h"
 #include "DHTBucket.h"
 #include "RequestGroupMan.h"
 #include "prefs.h"
@@ -54,9 +53,6 @@
 #include "FileEntry.h"
 #include "DlAbortEx.h"
 #include "StringFormat.h"
-#include "ServerStatMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
 
 namespace aria2 {
 
diff --git a/src/DHTBucketRefreshCommand.cc b/src/DHTBucketRefreshCommand.cc
index 5c155872..aa155b52 100644
--- a/src/DHTBucketRefreshCommand.cc
+++ b/src/DHTBucketRefreshCommand.cc
@@ -39,10 +39,6 @@
 #include "DHTTask.h"
 #include "DownloadEngine.h"
 #include "RequestGroupMan.h"
-#include "FileEntry.h"
-#include "ServerStatMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
 
 namespace aria2 {
 
diff --git a/src/DHTEntryPointNameResolveCommand.cc b/src/DHTEntryPointNameResolveCommand.cc
index 905a2710..9f4c1a5f 100644
--- a/src/DHTEntryPointNameResolveCommand.cc
+++ b/src/DHTEntryPointNameResolveCommand.cc
@@ -34,9 +34,6 @@
 /* copyright --> */
 #include "DHTEntryPointNameResolveCommand.h"
 #include "DownloadEngine.h"
-#ifdef ENABLE_ASYNC_DNS
-#include "AsyncNameResolver.h"
-#endif // ENABLE_ASYNC_DNS
 #include "NameResolver.h"
 #include "DlAbortEx.h"
 #include "prefs.h"
@@ -51,10 +48,9 @@
 #include "RequestGroupMan.h"
 #include "Logger.h"
 #include "StringFormat.h"
-#include "FileEntry.h"
-#include "ServerStatMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
+#ifdef ENABLE_ASYNC_DNS
+#include "AsyncNameResolver.h"
+#endif // ENABLE_ASYNC_DNS
 
 namespace aria2 {
 
diff --git a/src/DHTGetPeersCommand.cc b/src/DHTGetPeersCommand.cc
index b0365959..f48a6149 100644
--- a/src/DHTGetPeersCommand.cc
+++ b/src/DHTGetPeersCommand.cc
@@ -47,10 +47,6 @@
 #include "bittorrent_helper.h"
 #include "DownloadContext.h"
 #include "wallclock.h"
-#include "RequestGroupMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
-#include "ServerStatMan.h"
 
 namespace aria2 {
 
diff --git a/src/DHTInteractionCommand.cc b/src/DHTInteractionCommand.cc
index e49d9fb3..c67aab2f 100644
--- a/src/DHTInteractionCommand.cc
+++ b/src/DHTInteractionCommand.cc
@@ -45,10 +45,6 @@
 #include "Logger.h"
 #include "DHTMessageCallback.h"
 #include "DHTNode.h"
-#include "FileEntry.h"
-#include "ServerStatMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
 
 namespace aria2 {
 
diff --git a/src/DHTMessageTrackerEntry.cc b/src/DHTMessageTrackerEntry.cc
index f5042440..86b1153b 100644
--- a/src/DHTMessageTrackerEntry.cc
+++ b/src/DHTMessageTrackerEntry.cc
@@ -53,6 +53,8 @@ DHTMessageTrackerEntry::DHTMessageTrackerEntry(const SharedHandle<DHTMessage>& s
   timeout_(timeout)
 {}
 
+DHTMessageTrackerEntry::~DHTMessageTrackerEntry() {}
+
 bool DHTMessageTrackerEntry::isTimeout() const
 {
   return dispatchedTime_.difference(global::wallclock) >= timeout_;
@@ -77,4 +79,9 @@ bool DHTMessageTrackerEntry::match(const std::string& transactionID, const std::
   return false;
 }
 
+int64_t DHTMessageTrackerEntry::getElapsedMillis() const
+{
+  return dispatchedTime_.differenceInMillis(global::wallclock);
+}
+
 } // namespace aria2
diff --git a/src/DHTMessageTrackerEntry.h b/src/DHTMessageTrackerEntry.h
index 70989715..524fd17d 100644
--- a/src/DHTMessageTrackerEntry.h
+++ b/src/DHTMessageTrackerEntry.h
@@ -69,6 +69,8 @@ public:
                          const SharedHandle<DHTMessageCallback>& callback =
                          SharedHandle<DHTMessageCallback>());
 
+  ~DHTMessageTrackerEntry();
+
   bool isTimeout() const;
 
   void extendTimeout();
@@ -90,10 +92,7 @@ public:
     return callback_;
   }  
 
-  int64_t getElapsedMillis() const
-  {
-    return dispatchedTime_.differenceInMillis(global::wallclock);
-  }
+  int64_t getElapsedMillis() const;
 };
 
 } // namespace aria2
diff --git a/src/DHTNode.cc b/src/DHTNode.cc
index 1bb48927..02f7b7dd 100644
--- a/src/DHTNode.cc
+++ b/src/DHTNode.cc
@@ -53,6 +53,8 @@ DHTNode::DHTNode(const unsigned char* id):port_(0), rtt_(0), condition_(1), last
   memcpy(id_, id, DHT_ID_LENGTH);
 }
 
+DHTNode::~DHTNode() {}
+
 void DHTNode::generateID()
 {
   util::generateRandomKey(id_);
@@ -126,4 +128,9 @@ void DHTNode::setID(const unsigned char* id)
   memcpy(id_, id, DHT_ID_LENGTH);
 }
 
+void DHTNode::setIPAddress(const std::string& ipaddr)
+{
+  ipaddr_ = ipaddr;
+}
+
 } // namespace aria2
diff --git a/src/DHTNode.h b/src/DHTNode.h
index 425697f2..dcddcdf2 100644
--- a/src/DHTNode.h
+++ b/src/DHTNode.h
@@ -36,10 +36,12 @@
 #define D_DHT_NODE_H
 
 #include "common.h"
+
+#include <string>
+
 #include "SharedHandle.h"
 #include "DHTConstants.h"
 #include "TimerA2.h"
-#include <string>
 
 namespace aria2 {
 
@@ -65,6 +67,8 @@ public:
    */
   DHTNode(const unsigned char* id);
 
+  ~DHTNode();
+  
   void generateID();
 
   const unsigned char* getID() const
@@ -82,10 +86,7 @@ public:
     return ipaddr_;
   }
 
-  void setIPAddress(const std::string& ipaddr)
-  {
-    ipaddr_ = ipaddr;
-  }
+  void setIPAddress(const std::string& ipaddr);
 
   void setID(const unsigned char* id);
 
diff --git a/src/DHTPeerAnnounceCommand.cc b/src/DHTPeerAnnounceCommand.cc
index 43f67183..96fd3bda 100644
--- a/src/DHTPeerAnnounceCommand.cc
+++ b/src/DHTPeerAnnounceCommand.cc
@@ -39,10 +39,6 @@
 #include "RecoverableException.h"
 #include "message.h"
 #include "Logger.h"
-#include "FileEntry.h"
-#include "ServerStatMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
 
 namespace aria2 {
 
diff --git a/src/DHTTokenUpdateCommand.cc b/src/DHTTokenUpdateCommand.cc
index 4c6fab32..8253bc88 100644
--- a/src/DHTTokenUpdateCommand.cc
+++ b/src/DHTTokenUpdateCommand.cc
@@ -39,10 +39,6 @@
 #include "RecoverableException.h"
 #include "message.h"
 #include "Logger.h"
-#include "FileEntry.h"
-#include "ServerStatMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
 
 namespace aria2 {
 
diff --git a/src/DNSCache.cc b/src/DNSCache.cc
new file mode 100644
index 00000000..4faa9f16
--- /dev/null
+++ b/src/DNSCache.cc
@@ -0,0 +1,209 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "DNSCache.h"
+#include "A2STR.h"
+
+namespace aria2 {
+
+DNSCache::AddrEntry::AddrEntry(const std::string& addr)
+  : addr_(addr), good_(true)
+{}
+
+DNSCache::AddrEntry::AddrEntry(const AddrEntry& c)
+  : addr_(c.addr_), good_(c.good_)
+{}
+
+DNSCache::AddrEntry::~AddrEntry() {}
+
+DNSCache::AddrEntry& DNSCache::AddrEntry::operator=(const AddrEntry& c)
+{
+  if(this != &c) {
+    addr_ = c.addr_;
+    good_ = c.good_;
+  }
+  return *this;
+}
+
+DNSCache::CacheEntry::CacheEntry(const std::string& hostname, uint16_t port)
+  : hostname_(hostname), port_(port)
+{}
+
+DNSCache::CacheEntry::CacheEntry(const CacheEntry& c)
+  : hostname_(c.hostname_), port_(c.port_), addrEntries_(c.addrEntries_)
+{}
+
+DNSCache::CacheEntry::~CacheEntry() {}
+
+DNSCache::CacheEntry& DNSCache::CacheEntry::operator=(const CacheEntry& c)
+{
+  if(this != &c) {
+    hostname_ = c.hostname_;
+    port_ = c.port_;
+    addrEntries_ = c.addrEntries_;
+  }
+  return *this;
+}
+
+void DNSCache::CacheEntry::add(const std::string& addr)
+{
+  addrEntries_.push_back(AddrEntry(addr));
+}
+
+std::vector<DNSCache::AddrEntry>::iterator DNSCache::CacheEntry::find
+(const std::string& addr)
+{
+  for(std::vector<AddrEntry>::iterator i = addrEntries_.begin(),
+        eoi = addrEntries_.end(); i != eoi; ++i) {
+    if((*i).addr_ == addr) {
+      return i;
+    }
+  }
+  return addrEntries_.end();
+}
+
+std::vector<DNSCache::AddrEntry>::const_iterator DNSCache::CacheEntry::find
+(const std::string& addr) const
+{
+  for(std::vector<AddrEntry>::const_iterator i = addrEntries_.begin(),
+        eoi = addrEntries_.end(); i != eoi; ++i) {
+    if((*i).addr_ == addr) {
+      return i;
+    }
+  }
+  return addrEntries_.end();
+}
+
+bool DNSCache::CacheEntry::contains(const std::string& addr) const
+{
+  return find(addr) != addrEntries_.end();
+}
+
+const std::string& DNSCache::CacheEntry::getGoodAddr() const
+{
+  for(std::vector<AddrEntry>::const_iterator i = addrEntries_.begin(),
+        eoi = addrEntries_.end(); i != eoi; ++i) {
+    if((*i).good_) {
+      return (*i).addr_;
+    }
+  }
+  return A2STR::NIL;
+}
+
+void DNSCache::CacheEntry::markBad(const std::string& addr)
+{
+  std::vector<AddrEntry>::iterator i = find(addr);
+  if(i != addrEntries_.end()) {
+    (*i).good_ = false;
+  }
+}
+
+bool DNSCache::CacheEntry::operator<(const CacheEntry& e) const
+{
+  int r = hostname_.compare(e.hostname_);
+  if(r != 0) {
+    return r < 0;
+  }
+  return port_ < e.port_;
+}
+
+bool DNSCache::CacheEntry::operator==(const CacheEntry& e) const
+{
+  return hostname_ == e.hostname_ && port_ == e.port_;
+}
+
+DNSCache::DNSCache() {}
+
+DNSCache::DNSCache(const DNSCache& c):entries_(c.entries_) {}
+
+DNSCache::~DNSCache() {}
+
+DNSCache& DNSCache::operator=(const DNSCache& c)
+{
+  if(this != &c) {
+    entries_ = c.entries_;
+  }
+  return *this;
+}
+
+const std::string& DNSCache::find
+(const std::string& hostname, uint16_t port) const
+{
+  CacheEntry target(hostname, port);
+  std::deque<CacheEntry>::const_iterator i =
+    std::lower_bound(entries_.begin(), entries_.end(), target);
+  if(i != entries_.end() && (*i) == target) {
+    return (*i).getGoodAddr();
+  }
+  return A2STR::NIL;
+}
+
+void DNSCache::put
+(const std::string& hostname, const std::string& ipaddr, uint16_t port)
+{
+  CacheEntry target(hostname, port);
+  std::deque<CacheEntry>::iterator i =
+    std::lower_bound(entries_.begin(), entries_.end(), target);
+  if(i == entries_.end() || !((*i) == target)) {
+    target.add(ipaddr);
+    entries_.insert(i, target);
+  } else {
+    if(!(*i).contains(ipaddr)) {
+      (*i).add(ipaddr);
+    }
+  }
+}
+
+void DNSCache::markBad
+(const std::string& hostname, const std::string& ipaddr, uint16_t port)
+{
+  CacheEntry target(hostname, port);
+  std::deque<CacheEntry>::iterator i =
+    std::lower_bound(entries_.begin(), entries_.end(), target);
+  if(i != entries_.end() && (*i) == target) {
+    (*i).markBad(ipaddr);
+  }
+}
+
+void DNSCache::remove(const std::string& hostname, uint16_t port)
+{
+  CacheEntry target(hostname, port);
+  std::deque<CacheEntry>::iterator i =
+    std::lower_bound(entries_.begin(), entries_.end(), target);
+  if(i != entries_.end() && (*i) == target) {
+    entries_.erase(i);
+  }
+}
+
+} // namespace aria2
diff --git a/src/DNSCache.h b/src/DNSCache.h
index 64b1e4a1..7ba89f06 100644
--- a/src/DNSCache.h
+++ b/src/DNSCache.h
@@ -42,8 +42,6 @@
 #include <algorithm>
 #include <vector>
 
-#include "A2STR.h"
-
 namespace aria2 {
 
 class DNSCache {
@@ -52,7 +50,11 @@ private:
     std::string addr_;
     bool good_;
 
-    AddrEntry(const std::string& addr):addr_(addr), good_(true) {}
+    AddrEntry(const std::string& addr);
+    AddrEntry(const AddrEntry& c);
+    ~AddrEntry();
+
+    AddrEntry& operator=(const AddrEntry& c);
   };
 
   struct CacheEntry {
@@ -60,52 +62,21 @@ private:
     uint16_t port_;
     std::vector<AddrEntry> addrEntries_;
 
-    CacheEntry
-    (const std::string& hostname, uint16_t port):
-      hostname_(hostname), port_(port) {}
+    CacheEntry(const std::string& hostname, uint16_t port);
+    CacheEntry(const CacheEntry& c);
+    ~CacheEntry();
 
-    void add(const std::string& addr)
-    {
-      addrEntries_.push_back(AddrEntry(addr));
-    }
+    CacheEntry& operator=(const CacheEntry& c);
 
-    std::vector<AddrEntry>::iterator find(const std::string& addr)
-    {
-      for(std::vector<AddrEntry>::iterator i = addrEntries_.begin(),
-            eoi = addrEntries_.end(); i != eoi; ++i) {
-        if((*i).addr_ == addr) {
-          return i;
-        }
-      }
-      return addrEntries_.end();
-    }
+    void add(const std::string& addr);
 
-    std::vector<AddrEntry>::const_iterator find(const std::string& addr) const
-    {
-      for(std::vector<AddrEntry>::const_iterator i = addrEntries_.begin(),
-            eoi = addrEntries_.end(); i != eoi; ++i) {
-        if((*i).addr_ == addr) {
-          return i;
-        }
-      }
-      return addrEntries_.end();
-    }
+    std::vector<AddrEntry>::iterator find(const std::string& addr);
 
-    bool contains(const std::string& addr) const
-    {
-      return find(addr) != addrEntries_.end();
-    }
+    std::vector<AddrEntry>::const_iterator find(const std::string& addr) const;
 
-    const std::string& getGoodAddr() const
-    {
-      for(std::vector<AddrEntry>::const_iterator i = addrEntries_.begin(),
-            eoi = addrEntries_.end(); i != eoi; ++i) {
-        if((*i).good_) {
-          return (*i).addr_;
-        }
-      }
-      return A2STR::NIL;
-    }
+    bool contains(const std::string& addr) const;
+
+    const std::string& getGoodAddr() const;
 
     template<typename OutputIterator>
     void getAllGoodAddrs(OutputIterator out) const
@@ -118,42 +89,23 @@ private:
       }      
     }
 
-    void markBad(const std::string& addr)
-    {
-      std::vector<AddrEntry>::iterator i = find(addr);
-      if(i != addrEntries_.end()) {
-        (*i).good_ = false;
-      }
-    }
+    void markBad(const std::string& addr);
 
-    bool operator<(const CacheEntry& e) const
-    {
-      int r = hostname_.compare(e.hostname_);
-      if(r != 0) {
-        return r < 0;
-      }
-      return port_ < e.port_;
-    }
+    bool operator<(const CacheEntry& e) const;
 
-    bool operator==(const CacheEntry& e) const
-    {
-      return hostname_ == e.hostname_ && port_ == e.port_;
-    }
+    bool operator==(const CacheEntry& e) const;
   };
 
   std::deque<CacheEntry> entries_;
 
 public:
-  const std::string& find(const std::string& hostname, uint16_t port) const
-  {
-    CacheEntry target(hostname, port);
-    std::deque<CacheEntry>::const_iterator i =
-      std::lower_bound(entries_.begin(), entries_.end(), target);
-    if(i != entries_.end() && (*i) == target) {
-      return (*i).getGoodAddr();
-    }
-    return A2STR::NIL;
-  }
+  DNSCache();
+  DNSCache(const DNSCache& c);
+  ~DNSCache();
+
+  DNSCache& operator=(const DNSCache& c);
+
+  const std::string& find(const std::string& hostname, uint16_t port) const;
   
   template<typename OutputIterator>
   void findAll
@@ -168,41 +120,12 @@ public:
   }
 
   void put
-  (const std::string& hostname, const std::string& ipaddr, uint16_t port)
-  {
-    CacheEntry target(hostname, port);
-    std::deque<CacheEntry>::iterator i =
-      std::lower_bound(entries_.begin(), entries_.end(), target);
-    if(i == entries_.end() || !((*i) == target)) {
-      target.add(ipaddr);
-      entries_.insert(i, target);
-    } else {
-      if(!(*i).contains(ipaddr)) {
-        (*i).add(ipaddr);
-      }
-    }
-  }
+  (const std::string& hostname, const std::string& ipaddr, uint16_t port);
 
   void markBad
-  (const std::string& hostname, const std::string& ipaddr, uint16_t port)
-  {
-    CacheEntry target(hostname, port);
-    std::deque<CacheEntry>::iterator i =
-      std::lower_bound(entries_.begin(), entries_.end(), target);
-    if(i != entries_.end() && (*i) == target) {
-      (*i).markBad(ipaddr);
-    }
-  }
+  (const std::string& hostname, const std::string& ipaddr, uint16_t port);
 
-  void remove(const std::string& hostname, uint16_t port)
-  {
-    CacheEntry target(hostname, port);
-    std::deque<CacheEntry>::iterator i =
-      std::lower_bound(entries_.begin(), entries_.end(), target);
-    if(i != entries_.end() && (*i) == target) {
-      entries_.erase(i);
-    }
-  }
+  void remove(const std::string& hostname, uint16_t port);
 };
 
 } // namespace aria2
diff --git a/src/DiskAdaptor.cc b/src/DiskAdaptor.cc
index d9722f4b..8d307869 100644
--- a/src/DiskAdaptor.cc
+++ b/src/DiskAdaptor.cc
@@ -43,4 +43,6 @@ DiskAdaptor::DiskAdaptor():
   fallocate_(false),
   logger_(LogFactory::getInstance()) {}
 
+DiskAdaptor::~DiskAdaptor() {}
+
 } // namespace aria2
diff --git a/src/DiskAdaptor.h b/src/DiskAdaptor.h
index 1b93ca51..fa215707 100644
--- a/src/DiskAdaptor.h
+++ b/src/DiskAdaptor.h
@@ -62,7 +62,7 @@ protected:
   }
 public:
   DiskAdaptor();
-  virtual ~DiskAdaptor() {}
+  virtual ~DiskAdaptor();
 
   virtual void openFile() = 0;
 
diff --git a/src/DownloadCommand.cc b/src/DownloadCommand.cc
index ed59a940..b47f6d28 100644
--- a/src/DownloadCommand.cc
+++ b/src/DownloadCommand.cc
@@ -58,9 +58,8 @@
 #include "StringFormat.h"
 #include "RequestGroupMan.h"
 #include "wallclock.h"
-#include "ServerStatMan.h"
-#include "FileAllocationEntry.h"
 #include "SinkStreamFilter.h"
+#include "FileEntry.h"
 #ifdef ENABLE_MESSAGE_DIGEST
 # include "MessageDigest.h"
 # include "MessageDigestHelper.h"
diff --git a/src/DownloadCommand.h b/src/DownloadCommand.h
index fbc3e43b..cad06a56 100644
--- a/src/DownloadCommand.h
+++ b/src/DownloadCommand.h
@@ -37,6 +37,8 @@
 
 #include "AbstractCommand.h"
 
+#include <unistd.h>
+
 namespace aria2 {
 
 class PeerStat;
diff --git a/src/DownloadContext.cc b/src/DownloadContext.cc
index f0397634..b38ff692 100644
--- a/src/DownloadContext.cc
+++ b/src/DownloadContext.cc
@@ -42,6 +42,8 @@
 #include "wallclock.h"
 #include "DlAbortEx.h"
 #include "a2functional.h"
+#include "Signature.h"
+#include "ContextAttribute.h"
 
 namespace aria2 {
 
@@ -69,6 +71,8 @@ DownloadContext::DownloadContext(size_t pieceLength,
   fileEntries_.push_back(fileEntry);
 }
 
+DownloadContext::~DownloadContext() {}
+
 void DownloadContext::resetDownloadStartTime()
 {
   downloadStartTime_ = global::wallclock;
@@ -226,4 +230,43 @@ bool DownloadContext::isPieceHashVerificationAvailable() const
     pieceHashes_.size() > 0 && pieceHashes_.size() == getNumPieces();
 }
 
+const std::string& DownloadContext::getPieceHash(size_t index) const
+{
+  if(index < pieceHashes_.size()) {
+    return pieceHashes_[index];
+  } else {
+    return A2STR::NIL;
+  }
+}
+
+void DownloadContext::setPieceHashAlgo(const std::string& algo)
+{
+  pieceHashAlgo_ = algo;
+}
+
+void DownloadContext::setChecksum(const std::string& checksum)
+{
+  checksum_ = checksum;
+}
+
+void DownloadContext::setChecksumHashAlgo(const std::string& algo)
+{
+  checksumHashAlgo_ = algo;
+}
+
+void DownloadContext::setBasePath(const std::string& basePath)
+{
+  basePath_ = basePath;
+}
+
+void DownloadContext::setDir(const std::string& dir)
+{
+  dir_ = dir;
+}
+
+void DownloadContext::setSignature(const SharedHandle<Signature>& signature)
+{
+  signature_ = signature;
+}
+
 } // namespace aria2
diff --git a/src/DownloadContext.h b/src/DownloadContext.h
index a01faefb..fc343214 100644
--- a/src/DownloadContext.h
+++ b/src/DownloadContext.h
@@ -42,17 +42,17 @@
 #include <vector>
 
 #include "SharedHandle.h"
-#include "Signature.h"
 #include "TimerA2.h"
 #include "A2STR.h"
 #include "ValueBase.h"
 #include "IntSequence.h"
-#include "FileEntry.h"
-#include "TorrentAttribute.h"
 
 namespace aria2 {
 
 class RequestGroup;
+class Signature;
+class FileEntry;
+class ContextAttribute;
 
 class DownloadContext
 {
@@ -95,14 +95,9 @@ public:
                   uint64_t totalLength,
                   const std::string& path = A2STR::NIL);
 
-  const std::string& getPieceHash(size_t index) const
-  {
-    if(index < pieceHashes_.size()) {
-      return pieceHashes_[index];
-    } else {
-      return A2STR::NIL;
-    }
-  }
+  ~DownloadContext();
+
+  const std::string& getPieceHash(size_t index) const;
   
   const std::vector<std::string>& getPieceHashes() const
   {
@@ -148,24 +143,15 @@ public:
 
   const std::string& getPieceHashAlgo() const { return pieceHashAlgo_; }
 
-  void setPieceHashAlgo(const std::string& algo)
-  {
-    pieceHashAlgo_ = algo;
-  }
+  void setPieceHashAlgo(const std::string& algo);
 
   const std::string& getChecksum() const { return checksum_; }
 
-  void setChecksum(const std::string& checksum)
-  {
-    checksum_ = checksum;
-  }
+  void setChecksum(const std::string& checksum);
 
   const std::string& getChecksumHashAlgo() const { return checksumHashAlgo_; }
 
-  void setChecksumHashAlgo(const std::string& algo)
-  {
-    checksumHashAlgo_ = algo;
-  }
+  void setChecksumHashAlgo(const std::string& algo);
 
   // The representative path name for this context. It is used as a
   // part of .aria2 control file. If basePath_ is set, returns
@@ -173,18 +159,15 @@ public:
   // returned.
   const std::string& getBasePath() const;
 
-  void setBasePath(const std::string& basePath) { basePath_ = basePath; }
+  void setBasePath(const std::string& basePath);
 
   const std::string& getDir() const { return dir_; }
 
-  void setDir(const std::string& dir) { dir_ = dir; }
+  void setDir(const std::string& dir);
 
   const SharedHandle<Signature>& getSignature() const { return signature_; }
 
-  void setSignature(const SharedHandle<Signature>& signature)
-  {
-    signature_ = signature;
-  }
+  void setSignature(const SharedHandle<Signature>& signature);
 
   RequestGroup* getOwnerRequestGroup() { return ownerRequestGroup_; }
 
diff --git a/src/DownloadEngine.cc b/src/DownloadEngine.cc
index c37082bb..a6b33732 100644
--- a/src/DownloadEngine.cc
+++ b/src/DownloadEngine.cc
@@ -66,10 +66,6 @@
 #include "DownloadContext.h"
 #ifdef ENABLE_BITTORRENT
 # include "BtRegistry.h"
-# include "PeerStorage.h"
-# include "PieceStorage.h"
-# include "BtAnnounce.h"
-# include "BtRuntime.h"
 #endif // ENABLE_BITTORRENT
 
 namespace aria2 {
@@ -540,4 +536,32 @@ void DownloadEngine::setRefreshInterval(int64_t interval)
   refreshInterval_ = interval;
 }
 
+void DownloadEngine::addCommand(const std::vector<Command*>& commands)
+{
+  commands_.insert(commands_.end(), commands.begin(), commands.end());
+}
+
+void DownloadEngine::addCommand(Command* command)
+{
+  commands_.push_back(command);
+}
+
+void DownloadEngine::setRequestGroupMan
+(const SharedHandle<RequestGroupMan>& rgman)
+{
+  requestGroupMan_ = rgman;
+}
+
+void DownloadEngine::setFileAllocationMan
+(const SharedHandle<FileAllocationMan>& faman)
+{
+  fileAllocationMan_ = faman;
+}
+
+void DownloadEngine::setCheckIntegrityMan
+(const SharedHandle<CheckIntegrityMan>& ciman)
+{
+  checkIntegrityMan_ = ciman;
+}
+
 } // namespace aria2
diff --git a/src/DownloadEngine.h b/src/DownloadEngine.h
index f3d8291f..ded45806 100644
--- a/src/DownloadEngine.h
+++ b/src/DownloadEngine.h
@@ -46,13 +46,13 @@
 #include "a2netcompat.h"
 #include "TimerA2.h"
 #include "a2io.h"
-#ifdef ENABLE_ASYNC_DNS
-# include "AsyncNameResolver.h"
-#endif // ENABLE_ASYNC_DNS
 #include "CUIDCounter.h"
 #include "FileAllocationMan.h"
 #include "CheckIntegrityMan.h"
 #include "DNSCache.h"
+#ifdef ENABLE_ASYNC_DNS
+# include "AsyncNameResolver.h"
+#endif // ENABLE_ASYNC_DNS
 
 namespace aria2 {
 
@@ -187,45 +187,30 @@ public:
                                Command* command);
 #endif // ENABLE_ASYNC_DNS
 
-  void addCommand(const std::vector<Command*>& commands)
-  {
-    commands_.insert(commands_.end(), commands.begin(), commands.end());
-  }
+  void addCommand(const std::vector<Command*>& commands);
 
-  void addCommand(Command* command)
-  {
-    commands_.push_back(command);
-  }
+  void addCommand(Command* command);
 
   const SharedHandle<RequestGroupMan>& getRequestGroupMan() const
   {
     return requestGroupMan_;
   }
 
-  void setRequestGroupMan(const SharedHandle<RequestGroupMan>& rgman)
-  {
-    requestGroupMan_ = rgman;
-  }
+  void setRequestGroupMan(const SharedHandle<RequestGroupMan>& rgman);
 
   const SharedHandle<FileAllocationMan>& getFileAllocationMan() const
   {
     return fileAllocationMan_;
   }
 
-  void setFileAllocationMan(const SharedHandle<FileAllocationMan>& faman)
-  {
-    fileAllocationMan_ = faman;
-  }
+  void setFileAllocationMan(const SharedHandle<FileAllocationMan>& faman);
 
   const SharedHandle<CheckIntegrityMan>& getCheckIntegrityMan() const
   {
     return checkIntegrityMan_;
   }
 
-  void setCheckIntegrityMan(const SharedHandle<CheckIntegrityMan>& ciman)
-  {
-    checkIntegrityMan_ = ciman;
-  }
+  void setCheckIntegrityMan(const SharedHandle<CheckIntegrityMan>& ciman);
 
   Option* getOption() const
   {
diff --git a/src/DownloadResult.cc b/src/DownloadResult.cc
new file mode 100644
index 00000000..0ad04587
--- /dev/null
+++ b/src/DownloadResult.cc
@@ -0,0 +1,46 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "DownloadResult.h"
+#include "FileEntry.h"
+#include "Option.h"
+#include "MetadataInfo.h"
+
+namespace aria2 {
+
+DownloadResult::DownloadResult() {}
+
+DownloadResult::~DownloadResult() {}
+
+} // namespace aria2
diff --git a/src/DownloadResult.h b/src/DownloadResult.h
index 56851268..ce3aece0 100644
--- a/src/DownloadResult.h
+++ b/src/DownloadResult.h
@@ -45,12 +45,12 @@
 #include "SharedHandle.h"
 #include "DownloadResultCode.h"
 #include "RequestGroup.h"
-#include "Option.h"
-#include "MetadataInfo.h"
 
 namespace aria2 {
 
+class Option;
 class FileEntry;
+class MetadataInfo;
 
 struct DownloadResult
 {
@@ -94,6 +94,13 @@ struct DownloadResult
   size_t numPieces;
 
   std::string dir;
+
+  DownloadResult();
+  ~DownloadResult();
+
+  // Don't allow copying
+  DownloadResult(const DownloadResult& c);
+  DownloadResult& operator=(const DownloadResult& c);
 };
 
 typedef SharedHandle<DownloadResult> DownloadResultHandle;
diff --git a/src/Exception.cc b/src/Exception.cc
index 567d39a3..5b93242f 100644
--- a/src/Exception.cc
+++ b/src/Exception.cc
@@ -72,4 +72,9 @@ std::string Exception::stackTrace() const
   return s.str();
 }
 
+const char* Exception::what() const throw()
+{
+  return msg_.c_str();
+}
+
 } // namespace aria2
diff --git a/src/Exception.h b/src/Exception.h
index c1026dab..2be24127 100644
--- a/src/Exception.h
+++ b/src/Exception.h
@@ -71,10 +71,7 @@ public:
 
   virtual ~Exception() throw();
 
-  virtual const char* what() const throw()
-  {
-    return msg_.c_str();
-  }
+  virtual const char* what() const throw();
 
   std::string stackTrace() const;
 
diff --git a/src/ExtensionMessageRegistry.cc b/src/ExtensionMessageRegistry.cc
new file mode 100644
index 00000000..b4100930
--- /dev/null
+++ b/src/ExtensionMessageRegistry.cc
@@ -0,0 +1,78 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "ExtensionMessageRegistry.h"
+#include "BtConstants.h"
+#include "A2STR.h"
+
+namespace aria2 {
+
+ExtensionMessageRegistry::ExtensionMessageRegistry()
+{
+  extensions_["ut_pex"] = 8;
+  // http://www.bittorrent.org/beps/bep_0009.html
+  extensions_["ut_metadata"] = 9;
+}
+
+ExtensionMessageRegistry::~ExtensionMessageRegistry() {}
+
+uint8_t ExtensionMessageRegistry::getExtensionMessageID
+(const std::string& name) const
+{
+  Extensions::const_iterator itr = extensions_.find(name);
+  if(itr == extensions_.end()) {
+    return 0;
+  } else {
+    return (*itr).second;
+  }
+}
+
+const std::string& ExtensionMessageRegistry::getExtensionName(uint8_t id) const
+{
+  for(Extensions::const_iterator itr = extensions_.begin(),
+        eoi = extensions_.end(); itr != eoi; ++itr) {
+    const Extensions::value_type& p = *itr;
+    if(p.second == id) {
+      return p.first;
+    }
+  }
+  return A2STR::NIL;
+}
+
+void ExtensionMessageRegistry::removeExtension(const std::string& name)
+{
+  extensions_.erase(name);
+}
+
+} // namespace aria2
diff --git a/src/ExtensionMessageRegistry.h b/src/ExtensionMessageRegistry.h
index d79f2e86..91b118ff 100644
--- a/src/ExtensionMessageRegistry.h
+++ b/src/ExtensionMessageRegistry.h
@@ -40,7 +40,6 @@
 #include <string>
 
 #include "BtConstants.h"
-#include "A2STR.h"
 
 namespace aria2 {
 
@@ -48,44 +47,20 @@ class ExtensionMessageRegistry {
 private:
   Extensions extensions_;
 public:
-  ExtensionMessageRegistry()
-  {
-    extensions_["ut_pex"] = 8;
-    // http://www.bittorrent.org/beps/bep_0009.html
-    extensions_["ut_metadata"] = 9;
-  }
+  ExtensionMessageRegistry();
+
+  ~ExtensionMessageRegistry();
 
   const Extensions& getExtensions() const
   {
     return extensions_;
   }
 
-  uint8_t getExtensionMessageID(const std::string& name) const
-  {
-    Extensions::const_iterator itr = extensions_.find(name);
-    if(itr == extensions_.end()) {
-      return 0;
-    } else {
-      return (*itr).second;
-    }
-  }
+  uint8_t getExtensionMessageID(const std::string& name) const;
 
-  const std::string& getExtensionName(uint8_t id) const
-  {
-    for(Extensions::const_iterator itr = extensions_.begin(),
-          eoi = extensions_.end(); itr != eoi; ++itr) {
-      const Extensions::value_type& p = *itr;
-      if(p.second == id) {
-        return p.first;
-      }
-    }
-    return A2STR::NIL;
-  }
+  const std::string& getExtensionName(uint8_t id) const;
 
-  void removeExtension(const std::string& name)
-  {
-    extensions_.erase(name);
-  }
+  void removeExtension(const std::string& name);
 };
 
 } // namespace aria2
diff --git a/src/FeatureConfig.cc b/src/FeatureConfig.cc
index 1c10b1f8..01667a2b 100644
--- a/src/FeatureConfig.cc
+++ b/src/FeatureConfig.cc
@@ -120,6 +120,8 @@ FeatureConfig::FeatureConfig() {
   features_.insert(vbegin(featureArray), vend(featureArray));
 }
 
+FeatureConfig::~FeatureConfig() {}
+
 const SharedHandle<FeatureConfig>& FeatureConfig::getInstance()
 {
   if(!featureConfig_) {
diff --git a/src/FeatureConfig.h b/src/FeatureConfig.h
index 0473630e..8609dcf1 100644
--- a/src/FeatureConfig.h
+++ b/src/FeatureConfig.h
@@ -56,6 +56,8 @@ private:
 
   FeatureConfig();
 public:
+  ~FeatureConfig();
+
   static const SharedHandle<FeatureConfig>& getInstance();
 
   uint16_t getDefaultPort(const std::string& protocol) const;
diff --git a/src/File.cc b/src/File.cc
index 6a522589..3c0dc294 100644
--- a/src/File.cc
+++ b/src/File.cc
@@ -54,10 +54,20 @@ namespace aria2 {
 # include <windows.h>
 #endif // __MINGW32__
 
-File::File(const std::string& name):name_(name) {}
+File::File(const std::string& name) : name_(name) {}
+
+File::File(const File& c) : name_(c.name_) {}
 
 File::~File() {}
 
+File& File::operator=(const File& c)
+{
+  if(this != &c) {
+    name_ = c.name_;
+  }
+  return *this;
+}
+
 int File::fillStat(a2_struct_stat& fstat) {
   return a2stat(name_.c_str(), &fstat);
 }
diff --git a/src/File.h b/src/File.h
index 36236fb0..8e4d0f3f 100644
--- a/src/File.h
+++ b/src/File.h
@@ -57,8 +57,13 @@ private:
   int fillStat(a2_struct_stat& fstat);
 public:
   File(const std::string& name);
+
+  File(const File& c);
+
   ~File();
 
+  File& operator=(const File& c);
+
   /**
    * Tests whether the file or directory denoted by name exists.
    */
diff --git a/src/FileAllocationCommand.cc b/src/FileAllocationCommand.cc
index 9106a4bf..a0b9a296 100644
--- a/src/FileAllocationCommand.cc
+++ b/src/FileAllocationCommand.cc
@@ -47,8 +47,6 @@
 #include "RecoverableException.h"
 #include "wallclock.h"
 #include "RequestGroupMan.h"
-#include "CheckIntegrityEntry.h"
-#include "ServerStatMan.h"
 
 namespace aria2 {
 
diff --git a/src/FileAllocationDispatcherCommand.cc b/src/FileAllocationDispatcherCommand.cc
index 818f3342..46c2f7fd 100644
--- a/src/FileAllocationDispatcherCommand.cc
+++ b/src/FileAllocationDispatcherCommand.cc
@@ -37,10 +37,7 @@
 #include "FileAllocationCommand.h"
 #include "message.h"
 #include "Logger.h"
-#include "DownloadContext.h"
 #include "util.h"
-#include "ServerStatMan.h"
-#include "CheckIntegrityEntry.h"
 
 namespace aria2 {
 
diff --git a/src/FileEntry.cc b/src/FileEntry.cc
index cf09a054..c8664941 100644
--- a/src/FileEntry.cc
+++ b/src/FileEntry.cc
@@ -43,6 +43,7 @@
 #include "wallclock.h"
 #include "a2algo.h"
 #include "uri.h"
+#include "PeerStat.h"
 
 namespace aria2 {
 
@@ -458,4 +459,34 @@ bool FileEntry::insertUri(const std::string& uri, size_t pos)
   }
 }
 
+void FileEntry::setPath(const std::string& path)
+{
+  path_ = path;
+}
+
+void FileEntry::setContentType(const std::string& contentType)
+{
+  contentType_ = contentType;
+}
+
+size_t FileEntry::countInFlightRequest() const
+{
+  return inFlightRequests_.size();
+}
+
+size_t FileEntry::countPooledRequest() const
+{
+  return requestPool_.size();
+}
+
+void FileEntry::setOriginalName(const std::string& originalName)
+{
+  originalName_ = originalName;
+}
+
+bool FileEntry::emptyRequestUri() const
+{
+  return uris_.empty() && inFlightRequests_.empty() && requestPool_.empty();
+}
+
 } // namespace aria2
diff --git a/src/FileEntry.h b/src/FileEntry.h
index 4313e3d9..0d661af3 100644
--- a/src/FileEntry.h
+++ b/src/FileEntry.h
@@ -93,7 +93,7 @@ public:
 
   const std::string& getPath() const { return path_; }
 
-  void setPath(const std::string& path) { path_ = path; }
+  void setPath(const std::string& path);
 
   uint64_t getLength() const { return length_; }
 
@@ -147,10 +147,7 @@ public:
   // Inserts uris_ and spentUris_ into uris.
   void getUris(std::vector<std::string>& uris) const;
 
-  void setContentType(const std::string& contentType)
-  {
-    contentType_ = contentType;
-  }
+  void setContentType(const std::string& contentType);
 
   const std::string& getContentType() const { return contentType_; }
 
@@ -181,15 +178,9 @@ public:
 
   bool removeRequest(const SharedHandle<Request>& request);
 
-  size_t countInFlightRequest() const
-  {
-    return inFlightRequests_.size();
-  }
+  size_t countInFlightRequest() const;
 
-  size_t countPooledRequest() const
-  {
-    return requestPool_.size();
-  }
+  size_t countPooledRequest() const;
 
   const std::deque<SharedHandle<Request> >& getInFlightRequests() const
   {
@@ -236,10 +227,7 @@ public:
 
   void releaseRuntimeResource();
 
-  void setOriginalName(const std::string& originalName)
-  {
-    originalName_ = originalName;
-  }
+  void setOriginalName(const std::string& originalName);
 
   const std::string& getOriginalName() const
   {
@@ -248,10 +236,7 @@ public:
 
   bool removeUri(const std::string& uri);
 
-  bool emptyRequestUri() const
-  {
-    return uris_.empty() && inFlightRequests_.empty() && requestPool_.empty();
-  }
+  bool emptyRequestUri() const;
 
   void setUniqueProtocol(bool f)
   {
@@ -340,6 +325,6 @@ void writeFilePath
   }
 }
 
-}
+} // namespace aria2
 
 #endif // D_FILE_ENTRY_H
diff --git a/src/FillRequestGroupCommand.cc b/src/FillRequestGroupCommand.cc
index 7e754108..191b153e 100644
--- a/src/FillRequestGroupCommand.cc
+++ b/src/FillRequestGroupCommand.cc
@@ -40,9 +40,6 @@
 #include "message.h"
 #include "Logger.h"
 #include "DownloadContext.h"
-#include "ServerStatMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
 
 namespace aria2 {
 
diff --git a/src/FixedWidthNumberDecorator.cc b/src/FixedWidthNumberDecorator.cc
new file mode 100644
index 00000000..8b76061b
--- /dev/null
+++ b/src/FixedWidthNumberDecorator.cc
@@ -0,0 +1,55 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "FixedWidthNumberDecorator.h"
+#include "util.h"
+
+namespace aria2 {
+
+FixedWidthNumberDecorator::FixedWidthNumberDecorator(size_t width)
+ : width_(width)
+{}
+
+FixedWidthNumberDecorator::~FixedWidthNumberDecorator() {}
+
+std::string FixedWidthNumberDecorator::decorate(unsigned int number)
+{
+  std::string s = util::uitos(number);
+  while(s.size() < width_) {
+    s.insert(0, "0");
+  }
+  return s;
+}
+
+} // namespace aria2
diff --git a/src/FixedWidthNumberDecorator.h b/src/FixedWidthNumberDecorator.h
index 692488be..a6113f5d 100644
--- a/src/FixedWidthNumberDecorator.h
+++ b/src/FixedWidthNumberDecorator.h
@@ -36,7 +36,6 @@
 #define D_FIXED_WIDTH_NUMBER_DECORATOR_H
 
 #include "NumberDecorator.h"
-#include "util.h"
 
 namespace aria2 {
 
@@ -45,18 +44,11 @@ class FixedWidthNumberDecorator : public NumberDecorator
 private:
   size_t width_;
 public:
-  FixedWidthNumberDecorator(size_t width):width_(width) {}
+  FixedWidthNumberDecorator(size_t width);
 
-  virtual ~FixedWidthNumberDecorator() {}
+  virtual ~FixedWidthNumberDecorator();
 
-  virtual std::string decorate(unsigned int number)
-  {
-    std::string s = util::uitos(number);
-    while(s.size() < width_) {
-      s.insert(0, "0");
-    }
-    return s;
-  }
+  virtual std::string decorate(unsigned int number);
 };
 
 } // namespace aria2
diff --git a/src/FtpDownloadCommand.cc b/src/FtpDownloadCommand.cc
index a72d98a0..8abd826b 100644
--- a/src/FtpDownloadCommand.cc
+++ b/src/FtpDownloadCommand.cc
@@ -43,11 +43,7 @@
 #include "FtpFinishDownloadCommand.h"
 #include "FtpConnection.h"
 #include "Logger.h"
-#include "DownloadContext.h"
-#include "RequestGroupMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
-#include "ServerStatMan.h"
+#include "FileEntry.h"
 
 namespace aria2 {
 
diff --git a/src/FtpFinishDownloadCommand.cc b/src/FtpFinishDownloadCommand.cc
index 6578d67e..64555cd7 100644
--- a/src/FtpFinishDownloadCommand.cc
+++ b/src/FtpFinishDownloadCommand.cc
@@ -47,12 +47,8 @@
 #include "SocketCore.h"
 #include "RequestGroup.h"
 #include "Logger.h"
-#include "DownloadContext.h"
-#include "RequestGroupMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
-#include "ServerStatMan.h"
 #include "util.h"
+#include "wallclock.h"
 
 namespace aria2 {
 
@@ -68,6 +64,8 @@ FtpFinishDownloadCommand::FtpFinishDownloadCommand
    ftpConnection_(ftpConnection)
 {}
 
+FtpFinishDownloadCommand::~FtpFinishDownloadCommand() {}
+
 // overrides AbstractCommand::execute().
 // AbstractCommand::_segments is empty.
 bool FtpFinishDownloadCommand::execute()
diff --git a/src/FtpFinishDownloadCommand.h b/src/FtpFinishDownloadCommand.h
index f3819d30..fc9e24f3 100644
--- a/src/FtpFinishDownloadCommand.h
+++ b/src/FtpFinishDownloadCommand.h
@@ -56,6 +56,7 @@ public:
                            const SharedHandle<FtpConnection>& ftpConnection,
                            DownloadEngine* e,
                            const SharedHandle<SocketCore>& socket);
+  virtual ~FtpFinishDownloadCommand();
 };
 
 } // namespace aria2
diff --git a/src/FtpInitiateConnectionCommand.cc b/src/FtpInitiateConnectionCommand.cc
index 0e7be69f..7538f23e 100644
--- a/src/FtpInitiateConnectionCommand.cc
+++ b/src/FtpInitiateConnectionCommand.cc
@@ -50,14 +50,9 @@
 #include "prefs.h"
 #include "HttpConnection.h"
 #include "Socket.h"
-#include "DownloadContext.h"
 #include "util.h"
 #include "AuthConfigFactory.h"
 #include "AuthConfig.h"
-#include "RequestGroupMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
-#include "ServerStatMan.h"
 
 namespace aria2 {
 
diff --git a/src/FtpNegotiationCommand.cc b/src/FtpNegotiationCommand.cc
index fa6a006c..508e280d 100644
--- a/src/FtpNegotiationCommand.cc
+++ b/src/FtpNegotiationCommand.cc
@@ -70,9 +70,6 @@
 #include "HttpRequest.h"
 #include "HttpResponse.h"
 #include "DlRetryEx.h"
-#include "CookieStorage.h"
-#include "ServerStatMan.h"
-#include "FileAllocationEntry.h"
 #include "CheckIntegrityEntry.h"
 
 namespace aria2 {
diff --git a/src/FtpNegotiationCommand.h b/src/FtpNegotiationCommand.h
index 26393319..3403e907 100644
--- a/src/FtpNegotiationCommand.h
+++ b/src/FtpNegotiationCommand.h
@@ -37,6 +37,8 @@
 
 #include "AbstractCommand.h"
 
+#include <deque>
+
 namespace aria2 {
 
 class FtpConnection;
diff --git a/src/FtpTunnelResponseCommand.cc b/src/FtpTunnelResponseCommand.cc
index 86084fe2..354a6a7f 100644
--- a/src/FtpTunnelResponseCommand.cc
+++ b/src/FtpTunnelResponseCommand.cc
@@ -39,7 +39,6 @@
 #include "HttpRequest.h"
 #include "Segment.h"
 #include "Socket.h"
-#include "DownloadContext.h"
 
 namespace aria2 {
 
diff --git a/src/HandshakeExtensionMessage.cc b/src/HandshakeExtensionMessage.cc
index 6beb2a43..181ce614 100644
--- a/src/HandshakeExtensionMessage.cc
+++ b/src/HandshakeExtensionMessage.cc
@@ -45,6 +45,7 @@
 #include "bittorrent_helper.h"
 #include "RequestGroup.h"
 #include "PieceStorage.h"
+#include "FileEntry.h"
 
 namespace aria2 {
 
diff --git a/src/HaveEraseCommand.cc b/src/HaveEraseCommand.cc
index c1cca2f9..0c0756e9 100644
--- a/src/HaveEraseCommand.cc
+++ b/src/HaveEraseCommand.cc
@@ -37,10 +37,6 @@
 #include "RequestGroupMan.h"
 #include "PieceStorage.h"
 #include "RequestGroup.h"
-#include "DownloadContext.h"
-#include "ServerStatMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
 
 namespace aria2 {
 
diff --git a/src/HttpConnection.cc b/src/HttpConnection.cc
index 127ff192..7512bca4 100644
--- a/src/HttpConnection.cc
+++ b/src/HttpConnection.cc
@@ -71,6 +71,8 @@ HttpConnection::HttpConnection(cuid_t cuid, const SocketHandle& socket):
   logger_(LogFactory::getInstance())
 {}
 
+HttpConnection::~HttpConnection() {}
+
 std::string HttpConnection::eraseConfidentialInfo(const std::string& request)
 {
   std::istringstream istr(request);
diff --git a/src/HttpConnection.h b/src/HttpConnection.h
index a8544b06..6d1c9524 100644
--- a/src/HttpConnection.h
+++ b/src/HttpConnection.h
@@ -90,6 +90,7 @@ private:
   std::string eraseConfidentialInfo(const std::string& request);
 public:
   HttpConnection(cuid_t cuid, const SharedHandle<SocketCore>& socket);
+  ~HttpConnection();
 
   /**
    * Sends Http request.
diff --git a/src/HttpDownloadCommand.cc b/src/HttpDownloadCommand.cc
index 7a304682..7503ee16 100644
--- a/src/HttpDownloadCommand.cc
+++ b/src/HttpDownloadCommand.cc
@@ -47,10 +47,6 @@
 #include "HttpHeader.h"
 #include "Range.h"
 #include "DownloadContext.h"
-#include "RequestGroupMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
-#include "ServerStatMan.h"
 #include "Logger.h"
 #include "StreamFilter.h"
 #include "SinkStreamFilter.h"
diff --git a/src/HttpHeader.cc b/src/HttpHeader.cc
index 5f63e730..4b25462e 100644
--- a/src/HttpHeader.cc
+++ b/src/HttpHeader.cc
@@ -98,6 +98,9 @@ const std::string HttpHeader::S401("401");
   
 const std::string HttpHeader::S404("404");
 
+HttpHeader::HttpHeader() {}
+HttpHeader::~HttpHeader() {}
+
 void HttpHeader::put(const std::string& name, const std::string& value) {
   std::multimap<std::string, std::string>::value_type vt
     (util::toLower(name), value);
diff --git a/src/HttpHeader.h b/src/HttpHeader.h
index 93157e17..ca7c99d3 100644
--- a/src/HttpHeader.h
+++ b/src/HttpHeader.h
@@ -65,8 +65,8 @@ private:
   // Request Path
   std::string requestPath_;
 public:
-  HttpHeader() {}
-  ~HttpHeader() {}
+  HttpHeader();
+  ~HttpHeader();
 
   void put(const std::string& name, const std::string& value);
   bool defined(const std::string& name) const;
diff --git a/src/HttpInitiateConnectionCommand.cc b/src/HttpInitiateConnectionCommand.cc
index bba0f7ee..e625f470 100644
--- a/src/HttpInitiateConnectionCommand.cc
+++ b/src/HttpInitiateConnectionCommand.cc
@@ -47,12 +47,8 @@
 #include "message.h"
 #include "prefs.h"
 #include "A2STR.h"
-#include "DownloadContext.h"
 #include "util.h"
-#include "RequestGroupMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
-#include "ServerStatMan.h"
+
 namespace aria2 {
 
 HttpInitiateConnectionCommand::HttpInitiateConnectionCommand
diff --git a/src/HttpListenCommand.cc b/src/HttpListenCommand.cc
index 13c67912..9a59a530 100644
--- a/src/HttpListenCommand.cc
+++ b/src/HttpListenCommand.cc
@@ -41,13 +41,9 @@
 #include "HttpServerCommand.h"
 #include "CUIDCounter.h"
 #include "RequestGroupMan.h"
-#include "FileEntry.h"
 #include "prefs.h"
 #include "Option.h"
 #include "util.h"
-#include "ServerStatMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
 #include "A2STR.h"
 
 namespace aria2 {
diff --git a/src/HttpProxyRequestCommand.cc b/src/HttpProxyRequestCommand.cc
index 90cd0298..a315e079 100644
--- a/src/HttpProxyRequestCommand.cc
+++ b/src/HttpProxyRequestCommand.cc
@@ -36,7 +36,6 @@
 #include "HttpProxyResponseCommand.h"
 #include "Request.h"
 #include "Socket.h"
-#include "DownloadContext.h"
 
 namespace aria2 {
 
diff --git a/src/HttpProxyResponseCommand.cc b/src/HttpProxyResponseCommand.cc
index e0a23c36..b41952ea 100644
--- a/src/HttpProxyResponseCommand.cc
+++ b/src/HttpProxyResponseCommand.cc
@@ -39,7 +39,6 @@
 #include "HttpRequest.h"
 #include "Segment.h"
 #include "Socket.h"
-#include "DownloadContext.h"
 
 namespace aria2 {
 
diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc
index 1b2b2c40..6f9b155f 100644
--- a/src/HttpRequest.cc
+++ b/src/HttpRequest.cc
@@ -50,6 +50,7 @@
 #include "a2functional.h"
 #include "TimeA2.h"
 #include "array_fun.h"
+#include "Request.h"
 
 namespace aria2 {
 
@@ -62,6 +63,8 @@ HttpRequest::HttpRequest():contentEncodingEnabled_(true),
                            endOffsetOverride_(0)
 {}
 
+HttpRequest::~HttpRequest() {}
+
 void HttpRequest::setSegment(const SharedHandle<Segment>& segment)
 {
   segment_ = segment;
@@ -357,4 +360,75 @@ const SharedHandle<AuthConfig>& HttpRequest::getAuthConfig() const
   return authConfig_;
 }
 
+uint64_t HttpRequest::getEntityLength() const
+{
+  assert(fileEntry_);
+  return fileEntry_->getLength();
+}
+
+const std::string& HttpRequest::getHost() const
+{
+  return request_->getHost();
+}
+
+uint16_t HttpRequest::getPort() const
+{
+  return request_->getPort();
+}
+
+const std::string& HttpRequest::getMethod() const
+{
+  return request_->getMethod();
+}
+
+const std::string& HttpRequest::getProtocol() const
+{
+  return request_->getProtocol();
+}
+
+const std::string& HttpRequest::getCurrentURI() const
+{
+  return request_->getCurrentUri();
+}
+  
+const std::string& HttpRequest::getDir() const
+{
+  return request_->getDir();
+}
+
+const std::string& HttpRequest::getFile() const
+{
+  return request_->getFile();
+}
+
+const std::string& HttpRequest::getQuery() const
+{
+  return request_->getQuery();
+}
+
+const std::string& HttpRequest::getPreviousURI() const
+{
+  return request_->getPreviousUri();
+}
+
+std::string HttpRequest::getURIHost() const
+{
+  return request_->getURIHost();
+}
+
+void HttpRequest::setUserAgent(const std::string& userAgent)
+{
+  userAgent_ = userAgent;
+}
+
+void HttpRequest::setFileEntry(const SharedHandle<FileEntry>& fileEntry)
+{
+  fileEntry_ = fileEntry;
+}
+
+void HttpRequest::setIfModifiedSinceHeader(const std::string& hd)
+{
+  ifModSinceHeader_ = hd;
+}
+
 } // namespace aria2
diff --git a/src/HttpRequest.h b/src/HttpRequest.h
index 55c67438..f9a08b17 100644
--- a/src/HttpRequest.h
+++ b/src/HttpRequest.h
@@ -42,11 +42,11 @@
 #include <vector>
 
 #include "SharedHandle.h"
-#include "Request.h"
 #include "FileEntry.h"
 
 namespace aria2 {
 
+class Request;
 class Segment;
 class Range;
 class Option;
@@ -94,6 +94,7 @@ private:
   std::pair<std::string, std::string> getProxyAuthString() const;
 public:
   HttpRequest();
+  ~HttpRequest();
 
   const SharedHandle<Segment>& getSegment() const
   {
@@ -104,61 +105,27 @@ public:
 
   void setRequest(const SharedHandle<Request>& request);
 
-  uint64_t getEntityLength() const
-  {
-    assert(fileEntry_);
-    return fileEntry_->getLength();
-  }
+  uint64_t getEntityLength() const;
 
-  const std::string& getHost() const
-  {
-    return request_->getHost();
-  }
+  const std::string& getHost() const;
 
-  uint16_t getPort() const
-  {
-    return request_->getPort();
-  }
+  uint16_t getPort() const;
 
-  const std::string& getMethod() const
-  {
-    return request_->getMethod();
-  }
+  const std::string& getMethod() const;
 
-  const std::string& getProtocol() const
-  {
-    return request_->getProtocol();
-  }
+  const std::string& getProtocol() const;
 
-  const std::string& getCurrentURI() const
-  {
-    return request_->getCurrentUri();
-  }
+  const std::string& getCurrentURI() const;
   
-  const std::string& getDir() const
-  {
-    return request_->getDir();
-  }
+  const std::string& getDir() const;
 
-  const std::string& getFile() const
-  {
-    return request_->getFile();
-  }
+  const std::string& getFile() const;
 
-  const std::string& getQuery() const
-  {
-    return request_->getQuery();
-  }
+  const std::string& getQuery() const;
 
-  const std::string& getPreviousURI() const
-  {
-    return request_->getPreviousUri();
-  }
+  const std::string& getPreviousURI() const;
 
-  std::string getURIHost() const
-  {
-    return request_->getURIHost();
-  }
+  std::string getURIHost() const;
 
   SharedHandle<Range> getRange() const;
 
@@ -196,10 +163,7 @@ public:
 
   void disableContentEncoding();
 
-  void setUserAgent(const std::string& userAgent)
-  {
-    userAgent_ = userAgent;
-  }
+  void setUserAgent(const std::string& userAgent);
   
   // accepts multiline headers, delimited by LF
   void addHeader(const std::string& headers);
@@ -242,10 +206,7 @@ public:
   // createRequest().
   const SharedHandle<AuthConfig>& getAuthConfig() const;
 
-  void setFileEntry(const SharedHandle<FileEntry>& fileEntry)
-  {
-    fileEntry_ = fileEntry;
-  }
+  void setFileEntry(const SharedHandle<FileEntry>& fileEntry);
 
   const SharedHandle<FileEntry>& getFileEntry() const
   {
@@ -282,10 +243,7 @@ public:
     endOffsetOverride_ = offset;
   }
 
-  void setIfModifiedSinceHeader(const std::string& hd)
-  {
-    ifModSinceHeader_ = hd;
-  }
+  void setIfModifiedSinceHeader(const std::string& hd);
 
   const std::string& getIfModifiedSinceHeader() const
   {
diff --git a/src/HttpRequestCommand.cc b/src/HttpRequestCommand.cc
index d8964052..54bfb91c 100644
--- a/src/HttpRequestCommand.cc
+++ b/src/HttpRequestCommand.cc
@@ -53,10 +53,6 @@
 #include "AuthConfigFactory.h"
 #include "AuthConfig.h"
 #include "DownloadContext.h"
-#include "RequestGroupMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
-#include "ServerStatMan.h"
 #include "PieceStorage.h"
 #include "DefaultBtProgressInfoFile.h"
 #include "Logger.h"
diff --git a/src/HttpResponseCommand.cc b/src/HttpResponseCommand.cc
index e17b298e..04036a40 100644
--- a/src/HttpResponseCommand.cc
+++ b/src/HttpResponseCommand.cc
@@ -66,8 +66,6 @@
 #include "AuthConfig.h"
 #include "a2functional.h"
 #include "URISelector.h"
-#include "ServerStatMan.h"
-#include "FileAllocationEntry.h"
 #include "CheckIntegrityEntry.h"
 #include "StreamFilter.h"
 #include "SinkStreamFilter.h"
diff --git a/src/HttpServer.cc b/src/HttpServer.cc
index 9a299ec9..4f1e5e92 100644
--- a/src/HttpServer.cc
+++ b/src/HttpServer.cc
@@ -203,4 +203,11 @@ bool HttpServer::authenticate()
   return username_ == userpassPair.first && password_ == userpassPair.second;
 }
 
+void HttpServer::setUsernamePassword
+(const std::string& username, const std::string& password)
+{
+  username_ = username;
+  password_ = password;
+}
+
 } // namespace aria2
diff --git a/src/HttpServer.h b/src/HttpServer.h
index f474ce7b..19f5358f 100644
--- a/src/HttpServer.h
+++ b/src/HttpServer.h
@@ -91,11 +91,7 @@ public:
   bool authenticate();
 
   void setUsernamePassword
-  (const std::string& username, const std::string& password)
-  {
-    username_ = username;
-    password_ = password;
-  }
+  (const std::string& username, const std::string& password);
 
   ssize_t sendResponse();
 
diff --git a/src/HttpServerBodyCommand.cc b/src/HttpServerBodyCommand.cc
index 22a23e2a..7246ef16 100644
--- a/src/HttpServerBodyCommand.cc
+++ b/src/HttpServerBodyCommand.cc
@@ -49,12 +49,8 @@
 #include "XmlRpcMethod.h"
 #include "XmlRpcMethodFactory.h"
 #include "XmlRpcResponse.h"
-#include "DownloadContext.h"
 #include "wallclock.h"
 #include "util.h"
-#include "ServerStatMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
 
 namespace aria2 {
 
diff --git a/src/HttpServerCommand.cc b/src/HttpServerCommand.cc
index 95f48d67..0a76d011 100644
--- a/src/HttpServerCommand.cc
+++ b/src/HttpServerCommand.cc
@@ -46,11 +46,7 @@
 #include "prefs.h"
 #include "Option.h"
 #include "util.h"
-#include "DownloadContext.h"
 #include "wallclock.h"
-#include "ServerStatMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
 
 namespace aria2 {
 
diff --git a/src/HttpServerResponseCommand.cc b/src/HttpServerResponseCommand.cc
index ebdd167f..c234c76a 100644
--- a/src/HttpServerResponseCommand.cc
+++ b/src/HttpServerResponseCommand.cc
@@ -40,12 +40,8 @@
 #include "HttpServerCommand.h"
 #include "RequestGroupMan.h"
 #include "RecoverableException.h"
-#include "FileEntry.h"
 #include "wallclock.h"
 #include "util.h"
-#include "ServerStatMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
 
 namespace aria2 {
 
diff --git a/src/HttpSkipResponseCommand.cc b/src/HttpSkipResponseCommand.cc
index 3eaef917..7edbde63 100644
--- a/src/HttpSkipResponseCommand.cc
+++ b/src/HttpSkipResponseCommand.cc
@@ -53,10 +53,6 @@
 #include "AuthConfigFactory.h"
 #include "AuthConfig.h"
 #include "DownloadContext.h"
-#include "RequestGroupMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
-#include "ServerStatMan.h"
 #include "StreamFilter.h"
 #include "BinaryStream.h"
 #include "NullSinkStreamFilter.h"
diff --git a/src/IndexBtMessageValidator.cc b/src/IndexBtMessageValidator.cc
new file mode 100644
index 00000000..3c845fc7
--- /dev/null
+++ b/src/IndexBtMessageValidator.cc
@@ -0,0 +1,54 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "IndexBtMessageValidator.h"
+#include "IndexBtMessage.h"
+#include "bittorrent_helper.h"
+
+namespace aria2 {
+
+IndexBtMessageValidator::IndexBtMessageValidator
+(const IndexBtMessage* message, size_t numPiece)
+  : message_(message),
+    numPiece_(numPiece)
+{}
+
+IndexBtMessageValidator::~IndexBtMessageValidator() {}
+
+void IndexBtMessageValidator::validate()
+{
+  bittorrent::checkIndex(message_->getIndex(), numPiece_);
+}
+
+} // namespace aria2
diff --git a/src/IndexBtMessageValidator.h b/src/IndexBtMessageValidator.h
index 43ab9f30..a8ac2ef4 100644
--- a/src/IndexBtMessageValidator.h
+++ b/src/IndexBtMessageValidator.h
@@ -36,26 +36,21 @@
 #define D_INDEX_BT_VALIDATOR_H
 
 #include "BtMessageValidator.h"
-#include "IndexBtMessage.h"
-#include "bittorrent_helper.h"
 
 namespace aria2 {
 
+class IndexBtMessage;
+
 class IndexBtMessageValidator : public BtMessageValidator {
 private:
   const IndexBtMessage* message_;
   size_t numPiece_;
 public:
-  IndexBtMessageValidator(const IndexBtMessage* message,
-                          size_t numPiece):
-    message_(message),
-    numPiece_(numPiece) {}
+  IndexBtMessageValidator(const IndexBtMessage* message, size_t numPiece);
 
-  virtual void validate()
-  {
-    bittorrent::checkIndex(message_->getIndex(), numPiece_);
-  }
+  ~IndexBtMessageValidator();
 
+  virtual void validate();
 };
 
 } // namespace aria2
diff --git a/src/InitiateConnectionCommand.cc b/src/InitiateConnectionCommand.cc
index 50c47ddd..e58da6c7 100644
--- a/src/InitiateConnectionCommand.cc
+++ b/src/InitiateConnectionCommand.cc
@@ -43,15 +43,10 @@
 #include "SocketCore.h"
 #include "FileEntry.h"
 #include "RequestGroup.h"
-#include "DownloadContext.h"
 #include "Segment.h"
 #include "a2functional.h"
 #include "InitiateConnectionCommandFactory.h"
 #include "util.h"
-#include "RequestGroupMan.h"
-#include "ServerStatMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
 #include "RecoverableException.h"
 
 namespace aria2 {
diff --git a/src/InitiatorMSEHandshakeCommand.cc b/src/InitiatorMSEHandshakeCommand.cc
index c39d1135..d9bf4289 100644
--- a/src/InitiatorMSEHandshakeCommand.cc
+++ b/src/InitiatorMSEHandshakeCommand.cc
@@ -54,10 +54,6 @@
 #include "DownloadContext.h"
 #include "bittorrent_helper.h"
 #include "util.h"
-#include "RequestGroupMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
-#include "ServerStatMan.h"
 
 namespace aria2 {
 
diff --git a/src/LibgcryptARC4Context.cc b/src/LibgcryptARC4Context.cc
new file mode 100644
index 00000000..b45cacf2
--- /dev/null
+++ b/src/LibgcryptARC4Context.cc
@@ -0,0 +1,84 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "LibgcryptARC4Context.h"
+#include "DlAbortEx.h"
+#include "StringFormat.h"
+
+namespace aria2 {
+
+namespace {
+void handleError(gcry_error_t err)
+{
+  throw DL_ABORT_EX
+    (StringFormat("Exception in libgcrypt routine(ARC4Context class): %s",
+                  gcry_strerror(err)).str());
+}
+} // namespace
+
+LibgcryptARC4Context::LibgcryptARC4Context():cipherCtx_(0) {}
+
+LibgcryptARC4Context::~LibgcryptARC4Context()
+{
+  gcry_cipher_close(cipherCtx_);
+}
+
+void LibgcryptARC4Context::init(const unsigned char* key, size_t keyLength)
+{
+  gcry_cipher_close(cipherCtx_);
+
+  int algo = GCRY_CIPHER_ARCFOUR;
+  int mode = GCRY_CIPHER_MODE_STREAM;
+  unsigned int flags = 0;
+  {
+    gcry_error_t r = gcry_cipher_open(&cipherCtx_, algo, mode, flags);
+    if(r) {
+      handleError(r);
+    }
+  }
+  {
+    gcry_error_t r = gcry_cipher_setkey(cipherCtx_, key, keyLength);
+    if(r) {
+      handleError(r);
+    }
+  }
+  {
+    gcry_error_t r = gcry_cipher_setiv(cipherCtx_, 0, 0);
+    if(r) {
+      handleError(r);
+    }
+  }
+}
+
+} // namespace aria2
diff --git a/src/LibgcryptARC4Context.h b/src/LibgcryptARC4Context.h
index d2a0cc65..d8e6240d 100644
--- a/src/LibgcryptARC4Context.h
+++ b/src/LibgcryptARC4Context.h
@@ -39,60 +39,22 @@
 
 #include <gcrypt.h>
 
-#include "DlAbortEx.h"
-#include "StringFormat.h"
-
 namespace aria2 {
 
 class LibgcryptARC4Context {
 private:
   gcry_cipher_hd_t cipherCtx_;
-
-  void handleError(gcry_error_t err) const
-  {
-    throw DL_ABORT_EX
-      (StringFormat("Exception in libgcrypt routine(ARC4Context class): %s",
-                    gcry_strerror(err)).str());
-  }
 public:
-  LibgcryptARC4Context():cipherCtx_(0) {}
+  LibgcryptARC4Context();
 
-  ~LibgcryptARC4Context()
-  {
-    gcry_cipher_close(cipherCtx_);
-  }
+  ~LibgcryptARC4Context();
 
   gcry_cipher_hd_t getCipherContext() const
   {
     return cipherCtx_;
   }
 
-  void init(const unsigned char* key, size_t keyLength)
-  {
-    gcry_cipher_close(cipherCtx_);
-
-    int algo = GCRY_CIPHER_ARCFOUR;
-    int mode = GCRY_CIPHER_MODE_STREAM;
-    unsigned int flags = 0;
-    {
-      gcry_error_t r = gcry_cipher_open(&cipherCtx_, algo, mode, flags);
-      if(r) {
-        handleError(r);
-      }
-    }
-    {
-      gcry_error_t r = gcry_cipher_setkey(cipherCtx_, key, keyLength);
-      if(r) {
-        handleError(r);
-      }
-    }
-    {
-      gcry_error_t r = gcry_cipher_setiv(cipherCtx_, 0, 0);
-      if(r) {
-        handleError(r);
-      }
-    }
-  }
+  void init(const unsigned char* key, size_t keyLength);
 };
 
 } // namespace aria2
diff --git a/src/LibgcryptARC4Decryptor.cc b/src/LibgcryptARC4Decryptor.cc
new file mode 100644
index 00000000..16cf4431
--- /dev/null
+++ b/src/LibgcryptARC4Decryptor.cc
@@ -0,0 +1,72 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "LibgcryptARC4Decryptor.h"
+
+#include <gcrypt.h>
+
+#include "DlAbortEx.h"
+#include "StringFormat.h"
+
+namespace aria2 {
+
+namespace {
+void handleError(gcry_error_t err)
+{
+  throw DL_ABORT_EX
+    (StringFormat("Exception in libgcrypt routine(ARC4Decryptor class): %s",
+                  gcry_strerror(err)).str());
+}
+} // namespace
+
+ARC4Decryptor::ARC4Decryptor() {}
+
+ARC4Decryptor::~ARC4Decryptor() {}
+
+void ARC4Decryptor::init(const unsigned char* key, size_t keyLength)
+{
+  ctx_.init(key, keyLength);
+}
+
+void ARC4Decryptor::decrypt
+(unsigned char* out, size_t outLength, const unsigned char* in, size_t inLength)
+{
+  gcry_error_t r = gcry_cipher_decrypt(ctx_.getCipherContext(),
+                                       out, outLength, in, inLength);
+  if(r) {
+    handleError(r);
+  }
+}
+
+} // namespace aria2
diff --git a/src/LibgcryptARC4Decryptor.h b/src/LibgcryptARC4Decryptor.h
index 10650c94..738528d7 100644
--- a/src/LibgcryptARC4Decryptor.h
+++ b/src/LibgcryptARC4Decryptor.h
@@ -36,44 +36,22 @@
 #define D_LIBGCRYPT_ARC4_DECRYPTOR_H
 
 #include "common.h"
-
-#include <gcrypt.h>
-
-#include "DlAbortEx.h"
 #include "LibgcryptARC4Context.h"
-#include "StringFormat.h"
 
 namespace aria2 {
 
 class ARC4Decryptor {
 private:
   LibgcryptARC4Context ctx_;
-
-  void handleError(gcry_error_t err) const
-  {
-    throw DL_ABORT_EX
-      (StringFormat("Exception in libgcrypt routine(ARC4Decryptor class): %s",
-                    gcry_strerror(err)).str());
-  }
 public:
-  ARC4Decryptor() {}
+  ARC4Decryptor();
 
-  ~ARC4Decryptor() {}
+  ~ARC4Decryptor();
 
-  void init(const unsigned char* key, size_t keyLength)
-  {
-    ctx_.init(key, keyLength);
-  }
+  void init(const unsigned char* key, size_t keyLength);
 
   void decrypt(unsigned char* out, size_t outLength,
-               const unsigned char* in, size_t inLength)
-  {
-    gcry_error_t r = gcry_cipher_decrypt(ctx_.getCipherContext(),
-                                         out, outLength, in, inLength);
-    if(r) {
-      handleError(r);
-    }
-  }
+               const unsigned char* in, size_t inLength);
 };
 
 } // namespace aria2
diff --git a/src/LibgcryptARC4Encryptor.cc b/src/LibgcryptARC4Encryptor.cc
new file mode 100644
index 00000000..8548a74c
--- /dev/null
+++ b/src/LibgcryptARC4Encryptor.cc
@@ -0,0 +1,72 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "LibgcryptARC4Encryptor.h"
+
+#include <gcrypt.h>
+
+#include "DlAbortEx.h"
+#include "StringFormat.h"
+
+namespace aria2 {
+
+namespace {
+void handleError(gcry_error_t err)
+{
+  throw DL_ABORT_EX
+    (StringFormat("Exception in libgcrypt routine(ARC4Encryptor class): %s",
+                  gcry_strerror(err)).str());
+}
+} // namespace
+
+ARC4Encryptor::ARC4Encryptor() {}
+
+ARC4Encryptor::~ARC4Encryptor() {}
+
+void ARC4Encryptor::init(const unsigned char* key, size_t keyLength)
+{
+  ctx_.init(key, keyLength);
+}
+
+void ARC4Encryptor::encrypt(unsigned char* out, size_t outLength,
+                            const unsigned char* in, size_t inLength)
+{
+  gcry_error_t r = gcry_cipher_encrypt(ctx_.getCipherContext(),
+                                       out, outLength, in, inLength);
+  if(r) {
+    handleError(r);
+  }
+}
+
+} // namespace aria2
diff --git a/src/LibgcryptARC4Encryptor.h b/src/LibgcryptARC4Encryptor.h
index 1e21837a..c6257989 100644
--- a/src/LibgcryptARC4Encryptor.h
+++ b/src/LibgcryptARC4Encryptor.h
@@ -39,41 +39,22 @@
 
 #include <gcrypt.h>
 
-#include "DlAbortEx.h"
 #include "LibgcryptARC4Context.h"
-#include "StringFormat.h"
 
 namespace aria2 {
 
 class ARC4Encryptor {
 private:
   LibgcryptARC4Context ctx_;
-
-  void handleError(gcry_error_t err) const
-  {
-    throw DL_ABORT_EX
-      (StringFormat("Exception in libgcrypt routine(ARC4Encryptor class): %s",
-                    gcry_strerror(err)).str());
-  }
 public:
-  ARC4Encryptor() {}
+  ARC4Encryptor();
 
-  ~ARC4Encryptor() {}
+  ~ARC4Encryptor();
 
-  void init(const unsigned char* key, size_t keyLength)
-  {
-    ctx_.init(key, keyLength);
-  }
+  void init(const unsigned char* key, size_t keyLength);
 
   void encrypt(unsigned char* out, size_t outLength,
-               const unsigned char* in, size_t inLength)
-  {
-    gcry_error_t r = gcry_cipher_encrypt(ctx_.getCipherContext(),
-                                         out, outLength, in, inLength);
-    if(r) {
-      handleError(r);
-    }
-  }
+               const unsigned char* in, size_t inLength);
 };
 
 } // namespace aria2
diff --git a/src/LibgcryptDHKeyExchange.cc b/src/LibgcryptDHKeyExchange.cc
new file mode 100644
index 00000000..e7347b01
--- /dev/null
+++ b/src/LibgcryptDHKeyExchange.cc
@@ -0,0 +1,165 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "LibgcryptDHKeyExchange.h"
+#include "DlAbortEx.h"
+#include "StringFormat.h"
+
+namespace aria2 {
+
+namespace {
+void handleError(gcry_error_t err)
+{
+  throw DL_ABORT_EX
+    (StringFormat("Exception in libgcrypt routine(DHKeyExchange class): %s",
+                  gcry_strerror(err)).str());
+}
+} // namespace
+
+DHKeyExchange::DHKeyExchange()
+  : keyLength_(0),
+    prime_(0),
+    generator_(0),
+    privateKey_(0),
+    publicKey_(0)
+{}
+
+DHKeyExchange::~DHKeyExchange()
+{
+  gcry_mpi_release(prime_);
+  gcry_mpi_release(generator_);
+  gcry_mpi_release(privateKey_);
+  gcry_mpi_release(publicKey_);
+}
+
+void DHKeyExchange::init(const unsigned char* prime, size_t primeBits,
+                         const unsigned char* generator,
+                         size_t privateKeyBits)
+{
+  gcry_mpi_release(prime_);
+  gcry_mpi_release(generator_);
+  gcry_mpi_release(privateKey_);
+  {
+    gcry_error_t r = gcry_mpi_scan(&prime_, GCRYMPI_FMT_HEX,
+                                   prime, 0, 0);
+    if(r) {
+      handleError(r);
+    }
+  }
+  {
+    gcry_error_t r = gcry_mpi_scan(&generator_, GCRYMPI_FMT_HEX,
+                                   generator, 0, 0);
+    if(r) {
+      handleError(r);
+    }
+  }
+  privateKey_ = gcry_mpi_new(0);
+  gcry_mpi_randomize(privateKey_, privateKeyBits, GCRY_STRONG_RANDOM);
+  keyLength_ = (primeBits+7)/8;
+}
+
+void DHKeyExchange::generatePublicKey()
+{
+  gcry_mpi_release(publicKey_);
+  publicKey_ = gcry_mpi_new(0);
+  gcry_mpi_powm(publicKey_, generator_, privateKey_, prime_);
+}
+
+size_t DHKeyExchange::getPublicKey(unsigned char* out, size_t outLength) const
+{
+  if(outLength < keyLength_) {
+    throw DL_ABORT_EX
+      (StringFormat
+       ("Insufficient buffer for public key. expect:%lu, actual:%lu",
+        static_cast<unsigned long>(keyLength_),
+        static_cast<unsigned long>(outLength)).str());
+  }
+  memset(out, 0, outLength);
+  size_t publicKeyBytes = (gcry_mpi_get_nbits(publicKey_)+7)/8;
+  size_t offset = keyLength_-publicKeyBytes;
+  size_t nwritten;
+  gcry_error_t r = gcry_mpi_print(GCRYMPI_FMT_USG, out+offset,
+                                  outLength-offset, &nwritten, publicKey_);
+  if(r) {
+    handleError(r);
+  }
+  return nwritten;
+}
+
+void DHKeyExchange::generateNonce(unsigned char* out, size_t outLength) const
+{
+  gcry_create_nonce(out, outLength);
+}
+
+size_t DHKeyExchange::computeSecret(unsigned char* out, size_t outLength,
+                                    const unsigned char* peerPublicKeyData,
+                                    size_t peerPublicKeyLength) const
+{
+  if(outLength < keyLength_) {
+    throw DL_ABORT_EX
+      (StringFormat("Insufficient buffer for secret. expect:%lu, actual:%lu",
+                    static_cast<unsigned long>(keyLength_),
+                    static_cast<unsigned long>(outLength)).str());
+  }
+  gcry_mpi_t peerPublicKey;
+  {
+    gcry_error_t r = gcry_mpi_scan(&peerPublicKey,
+                                   GCRYMPI_FMT_USG,
+                                   peerPublicKeyData,
+                                   peerPublicKeyLength,
+                                   0);
+    if(r) {
+      handleError(r);
+    }
+  }
+  gcry_mpi_t secret = gcry_mpi_new(0);
+  gcry_mpi_powm(secret, peerPublicKey, privateKey_, prime_);
+  gcry_mpi_release(peerPublicKey);
+
+  memset(out, 0, outLength);
+  size_t secretBytes = (gcry_mpi_get_nbits(secret)+7)/8;
+  size_t offset = keyLength_-secretBytes;
+  size_t nwritten;
+  {
+    gcry_error_t r = gcry_mpi_print(GCRYMPI_FMT_USG, out+offset,
+                                    outLength-offset, &nwritten, secret);
+    gcry_mpi_release(secret);
+    if(r) {
+      handleError(r);
+    }
+  }
+  return nwritten;
+}
+
+} // namespace aria2
diff --git a/src/LibgcryptDHKeyExchange.h b/src/LibgcryptDHKeyExchange.h
index b9df9149..36b34217 100644
--- a/src/LibgcryptDHKeyExchange.h
+++ b/src/LibgcryptDHKeyExchange.h
@@ -36,8 +36,7 @@
 #define D_LIBGCRYPT_DH_KEY_EXCHANGE_H
 
 #include "common.h"
-#include "DlAbortEx.h"
-#include "StringFormat.h"
+
 #include <gcrypt.h>
 
 namespace aria2 {
@@ -53,124 +52,24 @@ private:
   gcry_mpi_t privateKey_;
 
   gcry_mpi_t publicKey_;
-
-  void handleError(gcry_error_t err) const
-  {
-    throw DL_ABORT_EX
-      (StringFormat("Exception in libgcrypt routine(DHKeyExchange class): %s",
-                    gcry_strerror(err)).str());
-  }
 public:
-  DHKeyExchange():
-    keyLength_(0),
-    prime_(0),
-    generator_(0),
-    privateKey_(0),
-    publicKey_(0) {}
+  DHKeyExchange();
 
-  ~DHKeyExchange()
-  {
-    gcry_mpi_release(prime_);
-    gcry_mpi_release(generator_);
-    gcry_mpi_release(privateKey_);
-    gcry_mpi_release(publicKey_);
-  }
+  ~DHKeyExchange();
 
   void init(const unsigned char* prime, size_t primeBits,
             const unsigned char* generator,
-            size_t privateKeyBits)
-  {
-    gcry_mpi_release(prime_);
-    gcry_mpi_release(generator_);
-    gcry_mpi_release(privateKey_);
-    {
-      gcry_error_t r = gcry_mpi_scan(&prime_, GCRYMPI_FMT_HEX,
-                                     prime, 0, 0);
-      if(r) {
-        handleError(r);
-      }
-    }
-    {
-      gcry_error_t r = gcry_mpi_scan(&generator_, GCRYMPI_FMT_HEX,
-                                     generator, 0, 0);
-      if(r) {
-        handleError(r);
-      }
-    }
-    privateKey_ = gcry_mpi_new(0);
-    gcry_mpi_randomize(privateKey_, privateKeyBits, GCRY_STRONG_RANDOM);
-    keyLength_ = (primeBits+7)/8;
-  }
+            size_t privateKeyBits);
 
-  void generatePublicKey()
-  {
-    gcry_mpi_release(publicKey_);
-    publicKey_ = gcry_mpi_new(0);
-    gcry_mpi_powm(publicKey_, generator_, privateKey_, prime_);
-  }
+  void generatePublicKey();
 
-  size_t getPublicKey(unsigned char* out, size_t outLength) const
-  {
-    if(outLength < keyLength_) {
-      throw DL_ABORT_EX
-        (StringFormat
-         ("Insufficient buffer for public key. expect:%lu, actual:%lu",
-          static_cast<unsigned long>(keyLength_),
-          static_cast<unsigned long>(outLength)).str());
-    }
-    memset(out, 0, outLength);
-    size_t publicKeyBytes = (gcry_mpi_get_nbits(publicKey_)+7)/8;
-    size_t offset = keyLength_-publicKeyBytes;
-    size_t nwritten;
-    gcry_error_t r = gcry_mpi_print(GCRYMPI_FMT_USG, out+offset,
-                                    outLength-offset, &nwritten, publicKey_);
-    if(r) {
-      handleError(r);
-    }
-    return nwritten;
-  }
+  size_t getPublicKey(unsigned char* out, size_t outLength) const;
 
-  void generateNonce(unsigned char* out, size_t outLength) const
-  {
-    gcry_create_nonce(out, outLength);
-  }
+  void generateNonce(unsigned char* out, size_t outLength) const;
 
   size_t computeSecret(unsigned char* out, size_t outLength,
                        const unsigned char* peerPublicKeyData,
-                       size_t peerPublicKeyLength) const
-  {
-    if(outLength < keyLength_) {
-      throw DL_ABORT_EX
-        (StringFormat("Insufficient buffer for secret. expect:%lu, actual:%lu",
-                      static_cast<unsigned long>(keyLength_),
-                      static_cast<unsigned long>(outLength)).str());
-    }
-    gcry_mpi_t peerPublicKey;
-    {
-      gcry_error_t r = gcry_mpi_scan(&peerPublicKey, GCRYMPI_FMT_USG, peerPublicKeyData,
-                                     peerPublicKeyLength, 0);
-      if(r) {
-        handleError(r);
-      }
-    }
-    gcry_mpi_t secret = gcry_mpi_new(0);
-    gcry_mpi_powm(secret, peerPublicKey, privateKey_, prime_);
-    gcry_mpi_release(peerPublicKey);
-
-    memset(out, 0, outLength);
-    size_t secretBytes = (gcry_mpi_get_nbits(secret)+7)/8;
-    size_t offset = keyLength_-secretBytes;
-    size_t nwritten;
-    {
-      gcry_error_t r = gcry_mpi_print(GCRYMPI_FMT_USG, out+offset,
-                                      outLength-offset, &nwritten, secret);
-      gcry_mpi_release(secret);
-      if(r) {
-        handleError(r);
-      }
-    }
-    return nwritten;
-  }
+                       size_t peerPublicKeyLength) const;
 };
 
 } // namespace aria2
diff --git a/src/LibsslARC4Context.cc b/src/LibsslARC4Context.cc
new file mode 100644
index 00000000..d31006ca
--- /dev/null
+++ b/src/LibsslARC4Context.cc
@@ -0,0 +1,91 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "LibsslARC4Context.h"
+
+#include <openssl/err.h>
+
+#include "DlAbortEx.h"
+#include "StringFormat.h"
+
+namespace aria2 {
+
+namespace {
+void handleError()
+{
+  throw DL_ABORT_EX
+    (StringFormat("Exception in libssl routine(ARC4Context class): %s",
+                  ERR_error_string(ERR_get_error(), 0)).str());
+}
+} // namespace
+
+LibsslARC4Context::LibsslARC4Context():cipherCtx_(0) {}
+
+LibsslARC4Context::~LibsslARC4Context()
+{
+  if(cipherCtx_) {
+    EVP_CIPHER_CTX_cleanup(cipherCtx_);
+  }
+  delete cipherCtx_;
+}
+
+EVP_CIPHER_CTX* LibsslARC4Context::getCipherContext() const
+{
+  return cipherCtx_;
+}
+
+// enc == 1: encryption
+// enc == 0: decryption
+void LibsslARC4Context::init
+(const unsigned char* key, size_t keyLength, int enc)
+{
+  if(cipherCtx_) {
+    EVP_CIPHER_CTX_cleanup(cipherCtx_);
+  }
+  delete cipherCtx_;
+  cipherCtx_ = new EVP_CIPHER_CTX;
+  EVP_CIPHER_CTX_init(cipherCtx_);
+
+  if(!EVP_CipherInit_ex(cipherCtx_, EVP_rc4(), 0, 0, 0, enc)) {
+    handleError();
+  }
+  if(!EVP_CIPHER_CTX_set_key_length(cipherCtx_, keyLength)) {
+    handleError();
+  }
+  if(!EVP_CipherInit_ex(cipherCtx_, 0, 0, key, 0, -1)) {
+    handleError();
+  }
+}
+
+} // namespace aria2
diff --git a/src/LibsslARC4Context.h b/src/LibsslARC4Context.h
index 638d9545..4f570570 100644
--- a/src/LibsslARC4Context.h
+++ b/src/LibsslARC4Context.h
@@ -38,61 +38,22 @@
 #include "common.h"
 
 #include <openssl/evp.h>
-#include <openssl/err.h>
-
-#include "DlAbortEx.h"
-#include "StringFormat.h"
 
 namespace aria2 {
 
 class LibsslARC4Context {
 private:
   EVP_CIPHER_CTX* cipherCtx_;
-
-  void handleError() const
-  {
-    throw DL_ABORT_EX
-      (StringFormat("Exception in libssl routine(ARC4Context class): %s",
-                    ERR_error_string(ERR_get_error(), 0)).str());
-  }
 public:
-  LibsslARC4Context():cipherCtx_(0) {}
+  LibsslARC4Context();
 
-  ~LibsslARC4Context()
-  {
-    if(cipherCtx_) {
-      EVP_CIPHER_CTX_cleanup(cipherCtx_);
-    }
-    delete cipherCtx_;
-  }
+  ~LibsslARC4Context();
 
-  EVP_CIPHER_CTX* getCipherContext() const
-  {
-    return cipherCtx_;
-  }
+  EVP_CIPHER_CTX* getCipherContext() const;
 
   // enc == 1: encryption
   // enc == 0: decryption
-  void init(const unsigned char* key, size_t keyLength, int enc)
-  {
-    if(cipherCtx_) {
-      EVP_CIPHER_CTX_cleanup(cipherCtx_);
-    }
-    delete cipherCtx_;
-    cipherCtx_ = new EVP_CIPHER_CTX;
-    EVP_CIPHER_CTX_init(cipherCtx_);
-
-    if(!EVP_CipherInit_ex(cipherCtx_, EVP_rc4(), 0, 0, 0, enc)) {
-      handleError();
-    }
-    if(!EVP_CIPHER_CTX_set_key_length(cipherCtx_, keyLength)) {
-      handleError();
-    }
-    if(!EVP_CipherInit_ex(cipherCtx_, 0, 0, key, 0, -1)) {
-      handleError();
-    }
-  }
-  
+  void init(const unsigned char* key, size_t keyLength, int enc);  
 };
 
 } // namespace aria2
diff --git a/src/LibsslARC4Decryptor.cc b/src/LibsslARC4Decryptor.cc
new file mode 100644
index 00000000..73508ab7
--- /dev/null
+++ b/src/LibsslARC4Decryptor.cc
@@ -0,0 +1,72 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "LibsslARC4Decryptor.h"
+
+#include <openssl/err.h>
+
+#include "DlAbortEx.h"
+#include "StringFormat.h"
+
+namespace aria2 {
+
+namespace {
+void handleError()
+{
+  throw DL_ABORT_EX
+    (StringFormat("Exception in libssl routine(ARC4Decryptor class): %s",
+                  ERR_error_string(ERR_get_error(), 0)).str());
+}
+} // namespace
+
+ARC4Decryptor::ARC4Decryptor() {}
+
+ARC4Decryptor::~ARC4Decryptor() {}
+
+void ARC4Decryptor::init(const unsigned char* key, size_t keyLength)
+{
+  ctx_.init(key, keyLength, 0);
+}
+
+void ARC4Decryptor::decrypt(unsigned char* out, size_t outLength,
+                            const unsigned char* in, size_t inLength)
+{
+  int soutLength = outLength;
+  if(!EVP_CipherUpdate(ctx_.getCipherContext(), out, &soutLength,
+                       in, inLength)) {
+    handleError();
+  }
+}
+
+} // namespace aria2
diff --git a/src/LibsslARC4Decryptor.h b/src/LibsslARC4Decryptor.h
index 25647081..53e591c7 100644
--- a/src/LibsslARC4Decryptor.h
+++ b/src/LibsslARC4Decryptor.h
@@ -38,42 +38,23 @@
 #include "common.h"
 
 #include <openssl/evp.h>
-#include <openssl/err.h>
 
-#include "DlAbortEx.h"
 #include "LibsslARC4Context.h"
-#include "StringFormat.h"
 
 namespace aria2 {
 
 class ARC4Decryptor {
 private:
   LibsslARC4Context ctx_;
-
-  void handleError() const
-  {
-    throw DL_ABORT_EX
-      (StringFormat("Exception in libssl routine(ARC4Decryptor class): %s",
-                    ERR_error_string(ERR_get_error(), 0)).str());
-  }
 public:
-  ARC4Decryptor() {}
+  ARC4Decryptor();
 
-  ~ARC4Decryptor() {}
+  ~ARC4Decryptor();
 
-  void init(const unsigned char* key, size_t keyLength)
-  {
-    ctx_.init(key, keyLength, 0);
-  }
+  void init(const unsigned char* key, size_t keyLength);
 
   void decrypt(unsigned char* out, size_t outLength,
-               const unsigned char* in, size_t inLength)
-  {
-    int soutLength = outLength;
-    if(!EVP_CipherUpdate(ctx_.getCipherContext(), out, &soutLength, in, inLength)) {
-      handleError();
-    }
-  }
+               const unsigned char* in, size_t inLength);
 };
 
 } // namespace aria2
diff --git a/src/LibsslARC4Encryptor.cc b/src/LibsslARC4Encryptor.cc
new file mode 100644
index 00000000..d732aa52
--- /dev/null
+++ b/src/LibsslARC4Encryptor.cc
@@ -0,0 +1,72 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "LibsslARC4Encryptor.h"
+
+#include <openssl/err.h>
+
+#include "DlAbortEx.h"
+#include "StringFormat.h"
+
+namespace aria2 {
+
+namespace {
+void handleError()
+{
+  throw DL_ABORT_EX
+    (StringFormat("Exception in libssl routine(ARC4Encryptor class): %s",
+                  ERR_error_string(ERR_get_error(), 0)).str());
+}
+} // namespace
+
+ARC4Encryptor::ARC4Encryptor() {}
+
+ARC4Encryptor::~ARC4Encryptor() {}
+
+void ARC4Encryptor::init(const unsigned char* key, size_t keyLength)
+{
+  ctx_.init(key, keyLength, 1);
+}
+
+void ARC4Encryptor::encrypt(unsigned char* out, size_t outLength,
+                            const unsigned char* in, size_t inLength)
+{
+  int soutLength = outLength;
+  if(!EVP_CipherUpdate(ctx_.getCipherContext(), out, &soutLength,
+                       in, inLength)) {
+    handleError();
+  }
+}
+
+} // namespace aria2
diff --git a/src/LibsslARC4Encryptor.h b/src/LibsslARC4Encryptor.h
index c2bc2f94..29a87492 100644
--- a/src/LibsslARC4Encryptor.h
+++ b/src/LibsslARC4Encryptor.h
@@ -38,42 +38,23 @@
 #include "common.h"
 
 #include <openssl/evp.h>
-#include <openssl/err.h>
 
-#include "DlAbortEx.h"
 #include "LibsslARC4Context.h"
-#include "StringFormat.h"
 
 namespace aria2 {
 
 class ARC4Encryptor {
 private:
   LibsslARC4Context ctx_;
-
-  void handleError() const
-  {
-    throw DL_ABORT_EX
-      (StringFormat("Exception in libssl routine(ARC4Encryptor class): %s",
-                    ERR_error_string(ERR_get_error(), 0)).str());
-  }
 public:
-  ARC4Encryptor() {}
+  ARC4Encryptor();
 
-  ~ARC4Encryptor() {}
+  ~ARC4Encryptor();
 
-  void init(const unsigned char* key, size_t keyLength)
-  {
-    ctx_.init(key, keyLength, 1);
-  }
+  void init(const unsigned char* key, size_t keyLength);
 
   void encrypt(unsigned char* out, size_t outLength,
-               const unsigned char* in, size_t inLength)
-  {
-    int soutLength = outLength;
-    if(!EVP_CipherUpdate(ctx_.getCipherContext(), out, &soutLength, in, inLength)) {
-      handleError();
-    }
-  }
+               const unsigned char* in, size_t inLength);
 };
 
 } // namespace aria2
diff --git a/src/LibsslDHKeyExchange.cc b/src/LibsslDHKeyExchange.cc
new file mode 100644
index 00000000..e90a9394
--- /dev/null
+++ b/src/LibsslDHKeyExchange.cc
@@ -0,0 +1,180 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "LibsslDHKeyExchange.h"
+
+#include <cstring>
+
+#include <openssl/rand.h>
+#include <openssl/err.h>
+
+#include "DlAbortEx.h"
+#include "StringFormat.h"
+
+namespace aria2 {
+
+namespace {
+void handleError(const std::string& funName)
+{
+  throw DL_ABORT_EX
+    (StringFormat("Exception in libssl routine %s(DHKeyExchange class): %s",
+                  funName.c_str(), ERR_error_string(ERR_get_error(), 0)).str());
+}
+} // namespace
+
+DHKeyExchange::DHKeyExchange()
+  : bnCtx_(0),
+    keyLength_(0),
+    prime_(0),
+    generator_(0),
+    privateKey_(0),
+    publicKey_(0)
+{}
+
+DHKeyExchange::~DHKeyExchange()
+{
+  BN_CTX_free(bnCtx_);
+  BN_free(prime_);
+  BN_free(generator_);
+  BN_free(privateKey_);
+  BN_free(publicKey_);
+}
+
+void DHKeyExchange::init(const unsigned char* prime, size_t primeBits,
+                         const unsigned char* generator,
+                         size_t privateKeyBits)
+{
+  BN_CTX_free(bnCtx_);
+  bnCtx_ = BN_CTX_new();
+  if(!bnCtx_) {
+    handleError("BN_CTX_new in init");
+  }
+
+  BN_free(prime_);
+  prime_ = 0;
+  BN_free(generator_);
+  generator_ = 0;
+  BN_free(privateKey_);
+  privateKey_ = 0;
+
+  if(BN_hex2bn(&prime_, reinterpret_cast<const char*>(prime)) == 0) {
+    handleError("BN_hex2bn in init");
+  }
+  if(BN_hex2bn(&generator_, reinterpret_cast<const char*>(generator)) == 0) {
+    handleError("BN_hex2bn in init");
+  }
+  privateKey_ = BN_new();
+  if(BN_rand(privateKey_, privateKeyBits, -1, false) == 0) {
+    handleError("BN_new in init");
+  }
+  keyLength_ = (primeBits+7)/8;
+}
+
+void DHKeyExchange::generatePublicKey()
+{
+  BN_free(publicKey_);
+  publicKey_ = BN_new();
+  BN_mod_exp(publicKey_, generator_, privateKey_, prime_, bnCtx_);
+}
+
+size_t DHKeyExchange::getPublicKey
+(unsigned char* out, size_t outLength) const
+{
+  if(outLength < keyLength_) {
+    throw DL_ABORT_EX
+      (StringFormat
+       ("Insufficient buffer for public key. expect:%lu, actual:%lu",
+        static_cast<unsigned long>(keyLength_),
+        static_cast<unsigned long>(outLength)).str());
+  }
+  memset(out, 0, outLength);
+  size_t publicKeyBytes = BN_num_bytes(publicKey_);
+  size_t offset = keyLength_-publicKeyBytes;
+  size_t nwritten = BN_bn2bin(publicKey_, out+offset);
+  if(nwritten != publicKeyBytes) {
+    throw DL_ABORT_EX
+      (StringFormat
+       ("BN_bn2bin in DHKeyExchange::getPublicKey, %lu bytes written,"
+        " but %lu bytes expected.",
+        static_cast<unsigned long>(nwritten),
+        static_cast<unsigned long>(publicKeyBytes)).str());
+  }
+  return nwritten;
+}
+
+void DHKeyExchange::generateNonce(unsigned char* out, size_t outLength) const
+{
+  if(RAND_bytes(out, outLength) != 1) {
+    handleError("RAND_bytes in generateNonce");
+  }
+}
+
+size_t DHKeyExchange::computeSecret(unsigned char* out, size_t outLength,
+                                    const unsigned char* peerPublicKeyData,
+                                    size_t peerPublicKeyLength) const
+{
+  if(outLength < keyLength_) {
+    throw DL_ABORT_EX
+      (StringFormat("Insufficient buffer for secret. expect:%lu, actual:%lu",
+                    static_cast<unsigned long>(keyLength_),
+                    static_cast<unsigned long>(outLength)).str());
+  }
+
+
+  BIGNUM* peerPublicKey = BN_bin2bn(peerPublicKeyData, peerPublicKeyLength, 0);
+  if(!peerPublicKey) {
+    handleError("BN_bin2bn in computeSecret");
+  }
+
+  BIGNUM* secret = BN_new();
+  BN_mod_exp(secret, peerPublicKey, privateKey_, prime_, bnCtx_);
+  BN_free(peerPublicKey);
+
+  memset(out, 0, outLength);
+  size_t secretBytes = BN_num_bytes(secret);
+  size_t offset = keyLength_-secretBytes;
+  size_t nwritten = BN_bn2bin(secret, out+offset);
+  BN_free(secret);
+  if(nwritten != secretBytes) {
+    throw DL_ABORT_EX
+      (StringFormat
+       ("BN_bn2bin in DHKeyExchange::getPublicKey, %lu bytes written,"
+        " but %lu bytes expected.",
+        static_cast<unsigned long>(nwritten),
+        static_cast<unsigned long>(secretBytes)).str());
+  }
+  return nwritten;
+}
+
+} // namespace aria2
diff --git a/src/LibsslDHKeyExchange.h b/src/LibsslDHKeyExchange.h
index ac28aa4d..39af7dbc 100644
--- a/src/LibsslDHKeyExchange.h
+++ b/src/LibsslDHKeyExchange.h
@@ -36,18 +36,13 @@
 #define D_LIBSSL_DH_KEY_EXCHANGE_H
 
 #include "common.h"
-#include "DlAbortEx.h"
-#include "StringFormat.h"
-#include <cstring>
-#include <openssl/dh.h>
-#include <openssl/rand.h>
-#include <openssl/err.h>
+
+#include <openssl/bn.h>
 
 namespace aria2 {
 
 class DHKeyExchange {
 private:
-
   BN_CTX* bnCtx_;
 
   size_t keyLength_;
@@ -59,134 +54,24 @@ private:
   BIGNUM* privateKey_;
 
   BIGNUM* publicKey_;
-
-  void handleError(const std::string& funName) const
-  {
-    throw DL_ABORT_EX
-      (StringFormat("Exception in libssl routine %s(DHKeyExchange class): %s",
-                    funName.c_str(), ERR_error_string(ERR_get_error(), 0)).str());
-  }
 public:
-  DHKeyExchange():bnCtx_(0),
-                  keyLength_(0),
-                  prime_(0),
-                  generator_(0),
-                  privateKey_(0),
-                  publicKey_(0) {}
+  DHKeyExchange();
 
-  ~DHKeyExchange()
-  {
-    BN_CTX_free(bnCtx_);
-    BN_free(prime_);
-    BN_free(generator_);
-    BN_free(privateKey_);
-    BN_free(publicKey_);
-  }
+  ~DHKeyExchange();
 
   void init(const unsigned char* prime, size_t primeBits,
             const unsigned char* generator,
-            size_t privateKeyBits)
-  {
-    BN_CTX_free(bnCtx_);
-    bnCtx_ = BN_CTX_new();
-    if(!bnCtx_) {
-      handleError("BN_CTX_new in init");
-    }
+            size_t privateKeyBits);
 
-    BN_free(prime_);
-    prime_ = 0;
-    BN_free(generator_);
-    generator_ = 0;
-    BN_free(privateKey_);
-    privateKey_ = 0;
+  void generatePublicKey();
 
-    if(BN_hex2bn(&prime_, reinterpret_cast<const char*>(prime)) == 0) {
-      handleError("BN_hex2bn in init");
-    }
-    if(BN_hex2bn(&generator_, reinterpret_cast<const char*>(generator)) == 0) {
-      handleError("BN_hex2bn in init");
-    }
-    privateKey_ = BN_new();
-    if(BN_rand(privateKey_, privateKeyBits, -1, false) == 0) {
-      handleError("BN_new in init");
-    }
-    keyLength_ = (primeBits+7)/8;
-  }
+  size_t getPublicKey(unsigned char* out, size_t outLength) const;
 
-  void generatePublicKey()
-  {
-    BN_free(publicKey_);
-    publicKey_ = BN_new();
-    BN_mod_exp(publicKey_, generator_, privateKey_, prime_, bnCtx_);
-  }
-
-  size_t getPublicKey(unsigned char* out, size_t outLength) const
-  {
-    if(outLength < keyLength_) {
-      throw DL_ABORT_EX
-        (StringFormat
-         ("Insufficient buffer for public key. expect:%lu, actual:%lu",
-          static_cast<unsigned long>(keyLength_),
-          static_cast<unsigned long>(outLength)).str());
-    }
-    memset(out, 0, outLength);
-    size_t publicKeyBytes = BN_num_bytes(publicKey_);
-    size_t offset = keyLength_-publicKeyBytes;
-    size_t nwritten = BN_bn2bin(publicKey_, out+offset);
-    if(nwritten != publicKeyBytes) {
-      throw DL_ABORT_EX
-        (StringFormat
-         ("BN_bn2bin in DHKeyExchange::getPublicKey, %lu bytes written,"
-          " but %lu bytes expected.",
-          static_cast<unsigned long>(nwritten),
-          static_cast<unsigned long>(publicKeyBytes)).str());
-    }
-    return nwritten;
-  }
-
-  void generateNonce(unsigned char* out, size_t outLength) const
-  {
-    if(RAND_bytes(out, outLength) != 1) {
-      handleError("RAND_bytes in generateNonce");
-    }
-  }
+  void generateNonce(unsigned char* out, size_t outLength) const;
 
   size_t computeSecret(unsigned char* out, size_t outLength,
                        const unsigned char* peerPublicKeyData,
-                       size_t peerPublicKeyLength) const
-  {
-    if(outLength < keyLength_) {
-      throw DL_ABORT_EX
-        (StringFormat("Insufficient buffer for secret. expect:%lu, actual:%lu",
-                      static_cast<unsigned long>(keyLength_),
-                      static_cast<unsigned long>(outLength)).str());
-    }
-
-
-    BIGNUM* peerPublicKey = BN_bin2bn(peerPublicKeyData, peerPublicKeyLength, 0);
-    if(!peerPublicKey) {
-      handleError("BN_bin2bn in computeSecret");
-    }
-
-    BIGNUM* secret = BN_new();
-    BN_mod_exp(secret, peerPublicKey, privateKey_, prime_, bnCtx_);
-    BN_free(peerPublicKey);
-
-    memset(out, 0, outLength);
-    size_t secretBytes = BN_num_bytes(secret);
-    size_t offset = keyLength_-secretBytes;
-    size_t nwritten = BN_bn2bin(secret, out+offset);
-    BN_free(secret);
-    if(nwritten != secretBytes) {
-      throw DL_ABORT_EX
-        (StringFormat
-         ("BN_bn2bin in DHKeyExchange::getPublicKey, %lu bytes written,"
-          " but %lu bytes expected.",
-          static_cast<unsigned long>(nwritten),
-          static_cast<unsigned long>(secretBytes)).str());
-    }
-    return nwritten;
-  }
+                       size_t peerPublicKeyLength) const;
 };
 
 } // namespace aria2
diff --git a/src/Logger.cc b/src/Logger.cc
index 120d65d9..de60f246 100644
--- a/src/Logger.cc
+++ b/src/Logger.cc
@@ -197,4 +197,14 @@ void Logger::writeStackTrace
   }
 }
 
+bool Logger::debug()
+{
+  return levelEnabled(A2_DEBUG);
+}
+
+bool Logger::info()
+{
+  return levelEnabled(A2_INFO);
+}
+
 } // namespace aria2
diff --git a/src/Logger.h b/src/Logger.h
index 208fe566..af032453 100644
--- a/src/Logger.h
+++ b/src/Logger.h
@@ -137,15 +137,9 @@ public:
 
   // Returns true if this logger actually writes debug log message to
   // either file or stdout.
-  bool debug()
-  {
-    return levelEnabled(A2_DEBUG);
-  }
+  bool debug();
 
-  bool info()
-  {
-    return levelEnabled(A2_INFO);
-  }
+  bool info();
 };
 
 } // namespace aria2
diff --git a/src/LpdDispatchMessageCommand.cc b/src/LpdDispatchMessageCommand.cc
index 4ef7b06a..a6044a12 100644
--- a/src/LpdDispatchMessageCommand.cc
+++ b/src/LpdDispatchMessageCommand.cc
@@ -40,11 +40,6 @@
 #include "RecoverableException.h"
 #include "SocketCore.h"
 #include "util.h"
-#include "RequestGroupMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
-#include "ServerStatMan.h"
-#include "FileEntry.h"
 
 namespace aria2 {
 
@@ -57,6 +52,8 @@ LpdDispatchMessageCommand::LpdDispatchMessageCommand
   e_(e),
   tryCount_(0) {}
 
+LpdDispatchMessageCommand::~LpdDispatchMessageCommand() {}
+
 bool LpdDispatchMessageCommand::execute()
 {
   if(btRuntime_->isHalt()) {
diff --git a/src/LpdDispatchMessageCommand.h b/src/LpdDispatchMessageCommand.h
index 4da65af7..d034a815 100644
--- a/src/LpdDispatchMessageCommand.h
+++ b/src/LpdDispatchMessageCommand.h
@@ -56,6 +56,8 @@ public:
    const SharedHandle<LpdMessageDispatcher>& dispatcher,
    DownloadEngine* e);
 
+  ~LpdDispatchMessageCommand();
+
   virtual bool execute();
 
   void setBtRuntime(const SharedHandle<BtRuntime>& btRuntime)
diff --git a/src/LpdMessage.cc b/src/LpdMessage.cc
new file mode 100644
index 00000000..87596ec8
--- /dev/null
+++ b/src/LpdMessage.cc
@@ -0,0 +1,47 @@
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+#include "LpdMessage.h"
+#include "Peer.h"
+
+namespace aria2 {
+
+LpdMessage::LpdMessage() {}
+
+LpdMessage::LpdMessage
+(const SharedHandle<Peer>& peer, const std::string& infoHash)
+  : peer_(peer), infoHash_(infoHash)
+{}
+
+LpdMessage::~LpdMessage() {}
+
+} // namespace aria2
diff --git a/src/LpdMessage.h b/src/LpdMessage.h
index aed5de60..928f926f 100644
--- a/src/LpdMessage.h
+++ b/src/LpdMessage.h
@@ -37,19 +37,22 @@
 
 #include <string>
 
-#include "Peer.h"
+#include "SharedHandle.h"
 
 namespace aria2 {
 
+class Peer;
+
 class LpdMessage {
 private:
   SharedHandle<Peer> peer_;
   std::string infoHash_;
 public:
-  LpdMessage() {}
+  LpdMessage();
 
-  LpdMessage(const SharedHandle<Peer>& peer, const std::string& infoHash):
-    peer_(peer), infoHash_(infoHash) {}
+  LpdMessage(const SharedHandle<Peer>& peer, const std::string& infoHash);
+
+  ~LpdMessage();
 
   const SharedHandle<Peer>& getPeer() const
   {
diff --git a/src/LpdMessageDispatcher.cc b/src/LpdMessageDispatcher.cc
index a1f2778b..629e5dff 100644
--- a/src/LpdMessageDispatcher.cc
+++ b/src/LpdMessageDispatcher.cc
@@ -56,6 +56,8 @@ LpdMessageDispatcher::LpdMessageDispatcher
                                         infoHash_, port_)),
   logger_(LogFactory::getInstance()) {}
 
+LpdMessageDispatcher::~LpdMessageDispatcher() {}
+
 bool LpdMessageDispatcher::init(const std::string& localAddr,
                                 unsigned char ttl, unsigned char loop)
 {
diff --git a/src/LpdMessageDispatcher.h b/src/LpdMessageDispatcher.h
index 1e4b1a00..edfee452 100644
--- a/src/LpdMessageDispatcher.h
+++ b/src/LpdMessageDispatcher.h
@@ -62,6 +62,8 @@ public:
    const std::string& multicastAddr, uint16_t multicastPort,
    time_t interval = 5*60);
 
+  ~LpdMessageDispatcher();
+
   // No throw
   bool init(const std::string& localAddr, unsigned char ttl,unsigned char loop);
 
diff --git a/src/LpdMessageReceiver.cc b/src/LpdMessageReceiver.cc
index 4935d6fa..1c6db0a0 100644
--- a/src/LpdMessageReceiver.cc
+++ b/src/LpdMessageReceiver.cc
@@ -39,6 +39,7 @@
 #include "util.h"
 #include "LpdMessage.h"
 #include "RecoverableException.h"
+#include "Peer.h"
 
 namespace aria2 {
 
@@ -48,6 +49,8 @@ LpdMessageReceiver::LpdMessageReceiver
   multicastPort_(multicastPort),
   logger_(LogFactory::getInstance()) {}
 
+LpdMessageReceiver::~LpdMessageReceiver() {}
+
 bool LpdMessageReceiver::init(const std::string& localAddr)
 {
   try {
diff --git a/src/LpdMessageReceiver.h b/src/LpdMessageReceiver.h
index dcc3cfc8..2cff5700 100644
--- a/src/LpdMessageReceiver.h
+++ b/src/LpdMessageReceiver.h
@@ -57,6 +57,8 @@ public:
   LpdMessageReceiver
   (const std::string& multicastAddress, uint16_t multicastPort);
 
+  ~LpdMessageReceiver();
+
   // No throw.
   bool init(const std::string& localAddr);
 
diff --git a/src/LpdReceiveMessageCommand.cc b/src/LpdReceiveMessageCommand.cc
index 511cce78..a898f3c3 100644
--- a/src/LpdReceiveMessageCommand.cc
+++ b/src/LpdReceiveMessageCommand.cc
@@ -49,9 +49,6 @@
 #include "BtAnnounce.h"
 #include "LpdMessage.h"
 #include "bittorrent_helper.h"
-#include "ServerStatMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
 #include "util.h"
 
 namespace aria2 {
diff --git a/src/Makefile.am b/src/Makefile.am
index 839ed4cb..7abef93a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -58,13 +58,13 @@ SRCS =  Socket.h\
 	FeatureConfig.cc FeatureConfig.h\
 	DownloadEngineFactory.cc DownloadEngineFactory.h\
 	SpeedCalc.cc SpeedCalc.h\
-	PeerStat.h\
+	PeerStat.cc PeerStat.h\
 	BitfieldMan.cc BitfieldMan.h\
 	Randomizer.h\
 	SimpleRandomizer.cc SimpleRandomizer.h\
 	HttpResponse.cc HttpResponse.h\
 	HttpRequest.cc HttpRequest.h\
-	Range.h\
+	Range.cc Range.h\
 	AbstractProxyRequestCommand.cc AbstractProxyRequestCommand.h\
 	AbstractProxyResponseCommand.cc AbstractProxyResponseCommand.h\
 	Netrc.cc Netrc.h\
@@ -77,8 +77,8 @@ SRCS =  Socket.h\
 	OptionParser.cc OptionParser.h\
 	OptionHandlerFactory.cc OptionHandlerFactory.h\
 	OptionHandler.cc OptionHandler.h\
-	OptionHandlerImpl.h\
-	NameMatchOptionHandler.h\
+	OptionHandlerImpl.cc OptionHandlerImpl.h\
+	NameMatchOptionHandler.cc NameMatchOptionHandler.h\
 	NameResolver.cc NameResolver.h\
 	RequestGroup.cc RequestGroup.h\
 	RequestGroupMan.cc RequestGroupMan.h\
@@ -99,14 +99,14 @@ SRCS =  Socket.h\
 	Platform.cc Platform.h\
 	PStringDatum.h\
 	PStringSegment.cc PStringSegment.h\
-	PStringNumLoop.h\
-	PStringSelect.h\
+	PStringNumLoop.cc PStringNumLoop.h\
+	PStringSelect.cc PStringSelect.h\
 	PStringVisitor.h\
 	PStringBuildVisitor.cc PStringBuildVisitor.h\
 	ParameterizedStringParser.cc ParameterizedStringParser.h\
-	FixedWidthNumberDecorator.h\
+	FixedWidthNumberDecorator.cc FixedWidthNumberDecorator.h\
 	NumberDecorator.h\
-	AlphaNumberDecorator.h\
+	AlphaNumberDecorator.cc AlphaNumberDecorator.h\
 	TimeBasedCommand.cc TimeBasedCommand.h\
 	AutoSaveCommand.cc AutoSaveCommand.h\
 	PieceStorage.h\
@@ -147,9 +147,9 @@ SRCS =  Socket.h\
 	ByteArrayDiskWriterFactory.cc ByteArrayDiskWriterFactory.h\
 	DownloadContext.cc DownloadContext.h\
 	TimedHaltCommand.cc TimedHaltCommand.h\
-	CUIDCounter.h\
-	DNSCache.h\
-	DownloadResult.h\
+	CUIDCounter.cc CUIDCounter.h\
+	DNSCache.cc DNSCache.h\
+	DownloadResult.cc DownloadResult.h\
 	Sequence.h\
 	IntSequence.h\
 	PostDownloadHandler.h\
@@ -203,7 +203,7 @@ SRCS =  Socket.h\
 	timespec.h\
 	ValueBase.cc ValueBase.h\
 	ContextAttribute.h\
-	TorrentAttribute.h\
+	TorrentAttribute.cc TorrentAttribute.h\
 	AdaptiveFileAllocationIterator.cc AdaptiveFileAllocationIterator.h\
 	StreamFilter.cc StreamFilter.h\
 	SinkStreamFilter.cc SinkStreamFilter.h\
@@ -255,12 +255,20 @@ endif # ENABLE_SSL
 
 if HAVE_LIBGNUTLS
 SRCS += LibgnutlsTLSContext.cc LibgnutlsTLSContext.h\
-	LibgcryptMessageDigestImpl.cc LibgcryptMessageDigestImpl.h
+	LibgcryptMessageDigestImpl.cc LibgcryptMessageDigestImpl.h\
+	LibgcryptARC4Context.cc LibgcryptARC4Context.h\
+	LibgcryptARC4Decryptor.cc LibgcryptARC4Decryptor.h\
+	LibgcryptARC4Encryptor.cc LibgcryptARC4Encryptor.h\
+	LibgcryptDHKeyExchange.cc LibgcryptDHKeyExchange.h
 endif # HAVE_LIBGNUTLS
 
 if HAVE_LIBSSL
 SRCS += LibsslTLSContext.cc LibsslTLSContext.h\
-	LibsslMessageDigestImpl.cc LibsslMessageDigestImpl.h
+	LibsslMessageDigestImpl.cc LibsslMessageDigestImpl.h\
+	LibsslARC4Context.cc LibsslARC4Context.h\
+	LibsslARC4Decryptor.cc LibsslARC4Decryptor.h\
+	LibsslARC4Encryptor.cc LibsslARC4Encryptor.h\
+	LibsslDHKeyExchange.cc LibsslDHKeyExchange.h
 endif # HAVE_LIBSSL
 
 if HAVE_LIBZ
@@ -285,8 +293,8 @@ SRCS += IteratableChunkChecksumValidator.cc IteratableChunkChecksumValidator.h\
 	CheckIntegrityCommand.cc CheckIntegrityCommand.h\
 	ChecksumCheckIntegrityEntry.cc ChecksumCheckIntegrityEntry.h\
 	MessageDigestHelper.cc MessageDigestHelper.h\
-	Checksum.h\
-	ChunkChecksum.h\
+	Checksum.cc Checksum.h\
+	ChunkChecksum.cc ChunkChecksum.h\
 	MessageDigest.cc MessageDigest.h\
 	HashFuncEntry.h
 endif # ENABLE_MESSAGE_DIGEST
@@ -301,17 +309,17 @@ SRCS += PeerAbstractCommand.cc PeerAbstractCommand.h\
 	TrackerWatcherCommand.cc TrackerWatcherCommand.h\
 	PeerChokeCommand.cc PeerChokeCommand.h\
 	SeedCriteria.h\
-	TimeSeedCriteria.h\
-	ShareRatioSeedCriteria.h\
-	UnionSeedCriteria.h\
+	TimeSeedCriteria.cc TimeSeedCriteria.h\
+	ShareRatioSeedCriteria.cc ShareRatioSeedCriteria.h\
+	UnionSeedCriteria.cc UnionSeedCriteria.h\
 	SeedCheckCommand.cc SeedCheckCommand.h\
-	AnnounceTier.h\
+	AnnounceTier.cc AnnounceTier.h\
 	AnnounceList.h AnnounceList.cc\
 	PeerStorage.h\
 	DefaultPeerStorage.cc DefaultPeerStorage.h\
 	BtAnnounce.cc BtAnnounce.h\
 	DefaultBtAnnounce.cc DefaultBtAnnounce.h\
-	BtRuntime.h\
+	BtRuntime.cc BtRuntime.h\
 	BtMessage.h\
 	AbstractBtMessage.cc AbstractBtMessage.h\
 	SimpleBtMessage.cc SimpleBtMessage.h\
@@ -333,9 +341,9 @@ SRCS += PeerAbstractCommand.cc PeerAbstractCommand.h\
 	BtUnchokeMessage.cc BtUnchokeMessage.h\
 	BtHandshakeMessage.cc BtHandshakeMessage.h\
 	BtMessageValidator.h\
-	BtBitfieldMessageValidator.h\
-	BtPieceMessageValidator.h\
-	BtHandshakeMessageValidator.h\
+	BtBitfieldMessageValidator.cc BtBitfieldMessageValidator.h\
+	BtPieceMessageValidator.cc BtPieceMessageValidator.h\
+	BtHandshakeMessageValidator.cc BtHandshakeMessageValidator.h\
 	BtMessageFactory.h\
 	DefaultBtMessageFactory.cc DefaultBtMessageFactory.h\
 	BtMessageDispatcher.h\
@@ -345,7 +353,7 @@ SRCS += PeerAbstractCommand.cc PeerAbstractCommand.h\
 	BtRequestFactory.h\
 	DefaultBtRequestFactory.cc DefaultBtRequestFactory.h\
 	BtCancelSendingPieceEvent.h\
-	BtAbortOutstandingRequestEvent.h\
+	BtAbortOutstandingRequestEvent.cc BtAbortOutstandingRequestEvent.h\
 	BtChokingEvent.h\
 	BtInteractive.h\
 	DefaultBtInteractive.cc DefaultBtInteractive.h\
@@ -433,36 +441,28 @@ SRCS += PeerAbstractCommand.cc PeerAbstractCommand.h\
 	DHTIDCloser.h\
 	DHTConstants.h\
 	XORCloser.h\
-	PeerAddrEntry.h\
+	PeerAddrEntry.cc PeerAddrEntry.h\
 	InitiatorMSEHandshakeCommand.cc InitiatorMSEHandshakeCommand.h\
 	ReceiverMSEHandshakeCommand.cc ReceiverMSEHandshakeCommand.h\
 	MSEHandshake.cc MSEHandshake.h\
 	ARC4Decryptor.h\
 	ARC4Encryptor.h\
 	DHKeyExchange.h\
-	LibgcryptARC4Context.h\
-	LibgcryptARC4Decryptor.h\
-	LibgcryptARC4Encryptor.h\
-	LibgcryptDHKeyExchange.h\
-	LibsslARC4Context.h\
-	LibsslARC4Decryptor.h\
-	LibsslARC4Encryptor.h\
-	LibsslDHKeyExchange.h\
 	BtConstants.h\
 	BtLeecherStateChoke.cc BtLeecherStateChoke.h\
 	BtSeederStateChoke.cc BtSeederStateChoke.h\
 	RangeBtMessage.cc RangeBtMessage.h\
 	IndexBtMessage.cc IndexBtMessage.h\
 	ZeroBtMessage.cc ZeroBtMessage.h\
-	RangeBtMessageValidator.h\
-	IndexBtMessageValidator.h\
-	ExtensionMessageRegistry.h\
+	RangeBtMessageValidator.cc RangeBtMessageValidator.h\
+	IndexBtMessageValidator.cc IndexBtMessageValidator.h\
+	ExtensionMessageRegistry.cc ExtensionMessageRegistry.h\
 	bittorrent_helper.cc bittorrent_helper.h\
 	BtStopDownloadCommand.cc BtStopDownloadCommand.h\
 	PriorityPieceSelector.cc PriorityPieceSelector.h\
 	LpdMessageDispatcher.cc LpdMessageDispatcher.h\
 	LpdMessageReceiver.cc LpdMessageReceiver.h\
-	LpdMessage.h\
+	LpdMessage.cc LpdMessage.h\
 	LpdReceiveMessageCommand.cc LpdReceiveMessageCommand.h\
 	LpdDispatchMessageCommand.cc LpdDispatchMessageCommand.h\
 	bencode2.cc bencode2.h
@@ -476,7 +476,7 @@ SRCS += Metalinker.cc Metalinker.h\
 	MetalinkProcessor.h\
 	MetalinkParserController.cc MetalinkParserController.h\
 	MetalinkParserStateMachine.cc MetalinkParserStateMachine.h\
-	MetalinkParserState.h\
+	MetalinkParserState.cc MetalinkParserState.h\
 	MetalinkParserStateImpl.cc MetalinkParserStateImpl.h\
 	MetalinkParserStateV3Impl.cc MetalinkParserStateV3Impl.h\
 	MetalinkParserStateV4Impl.cc MetalinkParserStateV4Impl.h\
diff --git a/src/Makefile.in b/src/Makefile.in
index aada6138..206acd7c 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -60,10 +60,18 @@ bin_PROGRAMS = aria2c$(EXEEXT)
 @HAVE_EPOLL_TRUE@am__append_5 = EpollEventPoll.cc EpollEventPoll.h
 @ENABLE_SSL_TRUE@am__append_6 = TLSContext.h
 @HAVE_LIBGNUTLS_TRUE@am__append_7 = LibgnutlsTLSContext.cc LibgnutlsTLSContext.h\
-@HAVE_LIBGNUTLS_TRUE@	LibgcryptMessageDigestImpl.cc LibgcryptMessageDigestImpl.h
+@HAVE_LIBGNUTLS_TRUE@	LibgcryptMessageDigestImpl.cc LibgcryptMessageDigestImpl.h\
+@HAVE_LIBGNUTLS_TRUE@	LibgcryptARC4Context.cc LibgcryptARC4Context.h\
+@HAVE_LIBGNUTLS_TRUE@	LibgcryptARC4Decryptor.cc LibgcryptARC4Decryptor.h\
+@HAVE_LIBGNUTLS_TRUE@	LibgcryptARC4Encryptor.cc LibgcryptARC4Encryptor.h\
+@HAVE_LIBGNUTLS_TRUE@	LibgcryptDHKeyExchange.cc LibgcryptDHKeyExchange.h
 
 @HAVE_LIBSSL_TRUE@am__append_8 = LibsslTLSContext.cc LibsslTLSContext.h\
-@HAVE_LIBSSL_TRUE@	LibsslMessageDigestImpl.cc LibsslMessageDigestImpl.h
+@HAVE_LIBSSL_TRUE@	LibsslMessageDigestImpl.cc LibsslMessageDigestImpl.h\
+@HAVE_LIBSSL_TRUE@	LibsslARC4Context.cc LibsslARC4Context.h\
+@HAVE_LIBSSL_TRUE@	LibsslARC4Decryptor.cc LibsslARC4Decryptor.h\
+@HAVE_LIBSSL_TRUE@	LibsslARC4Encryptor.cc LibsslARC4Encryptor.h\
+@HAVE_LIBSSL_TRUE@	LibsslDHKeyExchange.cc LibsslDHKeyExchange.h
 
 @HAVE_LIBZ_TRUE@am__append_9 = GZipDecoder.cc GZipDecoder.h\
 @HAVE_LIBZ_TRUE@	GZipEncoder.cc GZipEncoder.h\
@@ -79,8 +87,8 @@ bin_PROGRAMS = aria2c$(EXEEXT)
 @ENABLE_MESSAGE_DIGEST_TRUE@	CheckIntegrityCommand.cc CheckIntegrityCommand.h\
 @ENABLE_MESSAGE_DIGEST_TRUE@	ChecksumCheckIntegrityEntry.cc ChecksumCheckIntegrityEntry.h\
 @ENABLE_MESSAGE_DIGEST_TRUE@	MessageDigestHelper.cc MessageDigestHelper.h\
-@ENABLE_MESSAGE_DIGEST_TRUE@	Checksum.h\
-@ENABLE_MESSAGE_DIGEST_TRUE@	ChunkChecksum.h\
+@ENABLE_MESSAGE_DIGEST_TRUE@	Checksum.cc Checksum.h\
+@ENABLE_MESSAGE_DIGEST_TRUE@	ChunkChecksum.cc ChunkChecksum.h\
 @ENABLE_MESSAGE_DIGEST_TRUE@	MessageDigest.cc MessageDigest.h\
 @ENABLE_MESSAGE_DIGEST_TRUE@	HashFuncEntry.h
 
@@ -93,17 +101,17 @@ bin_PROGRAMS = aria2c$(EXEEXT)
 @ENABLE_BITTORRENT_TRUE@	TrackerWatcherCommand.cc TrackerWatcherCommand.h\
 @ENABLE_BITTORRENT_TRUE@	PeerChokeCommand.cc PeerChokeCommand.h\
 @ENABLE_BITTORRENT_TRUE@	SeedCriteria.h\
-@ENABLE_BITTORRENT_TRUE@	TimeSeedCriteria.h\
-@ENABLE_BITTORRENT_TRUE@	ShareRatioSeedCriteria.h\
-@ENABLE_BITTORRENT_TRUE@	UnionSeedCriteria.h\
+@ENABLE_BITTORRENT_TRUE@	TimeSeedCriteria.cc TimeSeedCriteria.h\
+@ENABLE_BITTORRENT_TRUE@	ShareRatioSeedCriteria.cc ShareRatioSeedCriteria.h\
+@ENABLE_BITTORRENT_TRUE@	UnionSeedCriteria.cc UnionSeedCriteria.h\
 @ENABLE_BITTORRENT_TRUE@	SeedCheckCommand.cc SeedCheckCommand.h\
-@ENABLE_BITTORRENT_TRUE@	AnnounceTier.h\
+@ENABLE_BITTORRENT_TRUE@	AnnounceTier.cc AnnounceTier.h\
 @ENABLE_BITTORRENT_TRUE@	AnnounceList.h AnnounceList.cc\
 @ENABLE_BITTORRENT_TRUE@	PeerStorage.h\
 @ENABLE_BITTORRENT_TRUE@	DefaultPeerStorage.cc DefaultPeerStorage.h\
 @ENABLE_BITTORRENT_TRUE@	BtAnnounce.cc BtAnnounce.h\
 @ENABLE_BITTORRENT_TRUE@	DefaultBtAnnounce.cc DefaultBtAnnounce.h\
-@ENABLE_BITTORRENT_TRUE@	BtRuntime.h\
+@ENABLE_BITTORRENT_TRUE@	BtRuntime.cc BtRuntime.h\
 @ENABLE_BITTORRENT_TRUE@	BtMessage.h\
 @ENABLE_BITTORRENT_TRUE@	AbstractBtMessage.cc AbstractBtMessage.h\
 @ENABLE_BITTORRENT_TRUE@	SimpleBtMessage.cc SimpleBtMessage.h\
@@ -125,9 +133,9 @@ bin_PROGRAMS = aria2c$(EXEEXT)
 @ENABLE_BITTORRENT_TRUE@	BtUnchokeMessage.cc BtUnchokeMessage.h\
 @ENABLE_BITTORRENT_TRUE@	BtHandshakeMessage.cc BtHandshakeMessage.h\
 @ENABLE_BITTORRENT_TRUE@	BtMessageValidator.h\
-@ENABLE_BITTORRENT_TRUE@	BtBitfieldMessageValidator.h\
-@ENABLE_BITTORRENT_TRUE@	BtPieceMessageValidator.h\
-@ENABLE_BITTORRENT_TRUE@	BtHandshakeMessageValidator.h\
+@ENABLE_BITTORRENT_TRUE@	BtBitfieldMessageValidator.cc BtBitfieldMessageValidator.h\
+@ENABLE_BITTORRENT_TRUE@	BtPieceMessageValidator.cc BtPieceMessageValidator.h\
+@ENABLE_BITTORRENT_TRUE@	BtHandshakeMessageValidator.cc BtHandshakeMessageValidator.h\
 @ENABLE_BITTORRENT_TRUE@	BtMessageFactory.h\
 @ENABLE_BITTORRENT_TRUE@	DefaultBtMessageFactory.cc DefaultBtMessageFactory.h\
 @ENABLE_BITTORRENT_TRUE@	BtMessageDispatcher.h\
@@ -137,7 +145,7 @@ bin_PROGRAMS = aria2c$(EXEEXT)
 @ENABLE_BITTORRENT_TRUE@	BtRequestFactory.h\
 @ENABLE_BITTORRENT_TRUE@	DefaultBtRequestFactory.cc DefaultBtRequestFactory.h\
 @ENABLE_BITTORRENT_TRUE@	BtCancelSendingPieceEvent.h\
-@ENABLE_BITTORRENT_TRUE@	BtAbortOutstandingRequestEvent.h\
+@ENABLE_BITTORRENT_TRUE@	BtAbortOutstandingRequestEvent.cc BtAbortOutstandingRequestEvent.h\
 @ENABLE_BITTORRENT_TRUE@	BtChokingEvent.h\
 @ENABLE_BITTORRENT_TRUE@	BtInteractive.h\
 @ENABLE_BITTORRENT_TRUE@	DefaultBtInteractive.cc DefaultBtInteractive.h\
@@ -225,36 +233,28 @@ bin_PROGRAMS = aria2c$(EXEEXT)
 @ENABLE_BITTORRENT_TRUE@	DHTIDCloser.h\
 @ENABLE_BITTORRENT_TRUE@	DHTConstants.h\
 @ENABLE_BITTORRENT_TRUE@	XORCloser.h\
-@ENABLE_BITTORRENT_TRUE@	PeerAddrEntry.h\
+@ENABLE_BITTORRENT_TRUE@	PeerAddrEntry.cc PeerAddrEntry.h\
 @ENABLE_BITTORRENT_TRUE@	InitiatorMSEHandshakeCommand.cc InitiatorMSEHandshakeCommand.h\
 @ENABLE_BITTORRENT_TRUE@	ReceiverMSEHandshakeCommand.cc ReceiverMSEHandshakeCommand.h\
 @ENABLE_BITTORRENT_TRUE@	MSEHandshake.cc MSEHandshake.h\
 @ENABLE_BITTORRENT_TRUE@	ARC4Decryptor.h\
 @ENABLE_BITTORRENT_TRUE@	ARC4Encryptor.h\
 @ENABLE_BITTORRENT_TRUE@	DHKeyExchange.h\
-@ENABLE_BITTORRENT_TRUE@	LibgcryptARC4Context.h\
-@ENABLE_BITTORRENT_TRUE@	LibgcryptARC4Decryptor.h\
-@ENABLE_BITTORRENT_TRUE@	LibgcryptARC4Encryptor.h\
-@ENABLE_BITTORRENT_TRUE@	LibgcryptDHKeyExchange.h\
-@ENABLE_BITTORRENT_TRUE@	LibsslARC4Context.h\
-@ENABLE_BITTORRENT_TRUE@	LibsslARC4Decryptor.h\
-@ENABLE_BITTORRENT_TRUE@	LibsslARC4Encryptor.h\
-@ENABLE_BITTORRENT_TRUE@	LibsslDHKeyExchange.h\
 @ENABLE_BITTORRENT_TRUE@	BtConstants.h\
 @ENABLE_BITTORRENT_TRUE@	BtLeecherStateChoke.cc BtLeecherStateChoke.h\
 @ENABLE_BITTORRENT_TRUE@	BtSeederStateChoke.cc BtSeederStateChoke.h\
 @ENABLE_BITTORRENT_TRUE@	RangeBtMessage.cc RangeBtMessage.h\
 @ENABLE_BITTORRENT_TRUE@	IndexBtMessage.cc IndexBtMessage.h\
 @ENABLE_BITTORRENT_TRUE@	ZeroBtMessage.cc ZeroBtMessage.h\
-@ENABLE_BITTORRENT_TRUE@	RangeBtMessageValidator.h\
-@ENABLE_BITTORRENT_TRUE@	IndexBtMessageValidator.h\
-@ENABLE_BITTORRENT_TRUE@	ExtensionMessageRegistry.h\
+@ENABLE_BITTORRENT_TRUE@	RangeBtMessageValidator.cc RangeBtMessageValidator.h\
+@ENABLE_BITTORRENT_TRUE@	IndexBtMessageValidator.cc IndexBtMessageValidator.h\
+@ENABLE_BITTORRENT_TRUE@	ExtensionMessageRegistry.cc ExtensionMessageRegistry.h\
 @ENABLE_BITTORRENT_TRUE@	bittorrent_helper.cc bittorrent_helper.h\
 @ENABLE_BITTORRENT_TRUE@	BtStopDownloadCommand.cc BtStopDownloadCommand.h\
 @ENABLE_BITTORRENT_TRUE@	PriorityPieceSelector.cc PriorityPieceSelector.h\
 @ENABLE_BITTORRENT_TRUE@	LpdMessageDispatcher.cc LpdMessageDispatcher.h\
 @ENABLE_BITTORRENT_TRUE@	LpdMessageReceiver.cc LpdMessageReceiver.h\
-@ENABLE_BITTORRENT_TRUE@	LpdMessage.h\
+@ENABLE_BITTORRENT_TRUE@	LpdMessage.cc LpdMessage.h\
 @ENABLE_BITTORRENT_TRUE@	LpdReceiveMessageCommand.cc LpdReceiveMessageCommand.h\
 @ENABLE_BITTORRENT_TRUE@	LpdDispatchMessageCommand.cc LpdDispatchMessageCommand.h\
 @ENABLE_BITTORRENT_TRUE@	bencode2.cc bencode2.h
@@ -266,7 +266,7 @@ bin_PROGRAMS = aria2c$(EXEEXT)
 @ENABLE_METALINK_TRUE@	MetalinkProcessor.h\
 @ENABLE_METALINK_TRUE@	MetalinkParserController.cc MetalinkParserController.h\
 @ENABLE_METALINK_TRUE@	MetalinkParserStateMachine.cc MetalinkParserStateMachine.h\
-@ENABLE_METALINK_TRUE@	MetalinkParserState.h\
+@ENABLE_METALINK_TRUE@	MetalinkParserState.cc MetalinkParserState.h\
 @ENABLE_METALINK_TRUE@	MetalinkParserStateImpl.cc MetalinkParserStateImpl.h\
 @ENABLE_METALINK_TRUE@	MetalinkParserStateV3Impl.cc MetalinkParserStateV3Impl.h\
 @ENABLE_METALINK_TRUE@	MetalinkParserStateV4Impl.cc MetalinkParserStateV4Impl.h\
@@ -360,10 +360,10 @@ am__libaria2c_a_SOURCES_DIST = Socket.h SocketCore.cc SocketCore.h \
 	base32.h LogFactory.cc LogFactory.h TimerA2.cc TimerA2.h \
 	TimeA2.cc TimeA2.h SharedHandle.h FeatureConfig.cc \
 	FeatureConfig.h DownloadEngineFactory.cc \
-	DownloadEngineFactory.h SpeedCalc.cc SpeedCalc.h PeerStat.h \
-	BitfieldMan.cc BitfieldMan.h Randomizer.h SimpleRandomizer.cc \
-	SimpleRandomizer.h HttpResponse.cc HttpResponse.h \
-	HttpRequest.cc HttpRequest.h Range.h \
+	DownloadEngineFactory.h SpeedCalc.cc SpeedCalc.h PeerStat.cc \
+	PeerStat.h BitfieldMan.cc BitfieldMan.h Randomizer.h \
+	SimpleRandomizer.cc SimpleRandomizer.h HttpResponse.cc \
+	HttpResponse.h HttpRequest.cc HttpRequest.h Range.cc Range.h \
 	AbstractProxyRequestCommand.cc AbstractProxyRequestCommand.h \
 	AbstractProxyResponseCommand.cc AbstractProxyResponseCommand.h \
 	Netrc.cc Netrc.h AuthConfig.cc AuthConfig.h AuthResolver.h \
@@ -372,7 +372,8 @@ am__libaria2c_a_SOURCES_DIST = Socket.h SocketCore.cc SocketCore.h \
 	NetrcAuthResolver.cc NetrcAuthResolver.h AuthConfigFactory.cc \
 	AuthConfigFactory.h OptionParser.cc OptionParser.h \
 	OptionHandlerFactory.cc OptionHandlerFactory.h \
-	OptionHandler.cc OptionHandler.h OptionHandlerImpl.h \
+	OptionHandler.cc OptionHandler.h OptionHandlerImpl.cc \
+	OptionHandlerImpl.h NameMatchOptionHandler.cc \
 	NameMatchOptionHandler.h NameResolver.cc NameResolver.h \
 	RequestGroup.cc RequestGroup.h RequestGroupMan.cc \
 	RequestGroupMan.h FileAllocationMan.h FileAllocationCommand.cc \
@@ -386,13 +387,15 @@ am__libaria2c_a_SOURCES_DIST = Socket.h SocketCore.cc SocketCore.h \
 	RequestGroupEntry.cc RequestGroupEntry.h Cookie.cc Cookie.h \
 	HttpHeaderProcessor.cc HttpHeaderProcessor.h FileEntry.cc \
 	FileEntry.h Platform.cc Platform.h PStringDatum.h \
-	PStringSegment.cc PStringSegment.h PStringNumLoop.h \
-	PStringSelect.h PStringVisitor.h PStringBuildVisitor.cc \
-	PStringBuildVisitor.h ParameterizedStringParser.cc \
-	ParameterizedStringParser.h FixedWidthNumberDecorator.h \
-	NumberDecorator.h AlphaNumberDecorator.h TimeBasedCommand.cc \
-	TimeBasedCommand.h AutoSaveCommand.cc AutoSaveCommand.h \
-	PieceStorage.h DefaultPieceStorage.cc DefaultPieceStorage.h \
+	PStringSegment.cc PStringSegment.h PStringNumLoop.cc \
+	PStringNumLoop.h PStringSelect.cc PStringSelect.h \
+	PStringVisitor.h PStringBuildVisitor.cc PStringBuildVisitor.h \
+	ParameterizedStringParser.cc ParameterizedStringParser.h \
+	FixedWidthNumberDecorator.cc FixedWidthNumberDecorator.h \
+	NumberDecorator.h AlphaNumberDecorator.cc \
+	AlphaNumberDecorator.h TimeBasedCommand.cc TimeBasedCommand.h \
+	AutoSaveCommand.cc AutoSaveCommand.h PieceStorage.h \
+	DefaultPieceStorage.cc DefaultPieceStorage.h \
 	UnknownLengthPieceStorage.cc UnknownLengthPieceStorage.h \
 	PieceStatMan.cc PieceStatMan.h StatCalc.h ConsoleStatCalc.cc \
 	ConsoleStatCalc.h TransferStat.cc TransferStat.h Dependency.h \
@@ -420,18 +423,18 @@ am__libaria2c_a_SOURCES_DIST = Socket.h SocketCore.cc SocketCore.h \
 	ByteArrayDiskWriter.h ByteArrayDiskWriterFactory.cc \
 	ByteArrayDiskWriterFactory.h DownloadContext.cc \
 	DownloadContext.h TimedHaltCommand.cc TimedHaltCommand.h \
-	CUIDCounter.h DNSCache.h DownloadResult.h Sequence.h \
-	IntSequence.h PostDownloadHandler.h PreDownloadHandler.h \
-	SingletonHolder.h TrueRequestGroupCriteria.h a2algo.h \
-	a2functional.h a2io.h a2netcompat.h a2time.h array_fun.h \
-	help_tags.h prefs.cc prefs.h usage_text.h ProtocolDetector.cc \
-	ProtocolDetector.h NullStatCalc.h StringFormat.cc \
-	StringFormat.h HttpSkipResponseCommand.cc \
-	HttpSkipResponseCommand.h InitiateConnectionCommand.cc \
-	InitiateConnectionCommand.h FtpFinishDownloadCommand.cc \
-	FtpFinishDownloadCommand.h A2STR.cc A2STR.h \
-	RarestPieceSelector.cc RarestPieceSelector.h Decoder.h \
-	Signature.cc Signature.h ServerStat.cc ServerStat.h \
+	CUIDCounter.cc CUIDCounter.h DNSCache.cc DNSCache.h \
+	DownloadResult.cc DownloadResult.h Sequence.h IntSequence.h \
+	PostDownloadHandler.h PreDownloadHandler.h SingletonHolder.h \
+	TrueRequestGroupCriteria.h a2algo.h a2functional.h a2io.h \
+	a2netcompat.h a2time.h array_fun.h help_tags.h prefs.cc \
+	prefs.h usage_text.h ProtocolDetector.cc ProtocolDetector.h \
+	NullStatCalc.h StringFormat.cc StringFormat.h \
+	HttpSkipResponseCommand.cc HttpSkipResponseCommand.h \
+	InitiateConnectionCommand.cc InitiateConnectionCommand.h \
+	FtpFinishDownloadCommand.cc FtpFinishDownloadCommand.h \
+	A2STR.cc A2STR.h RarestPieceSelector.cc RarestPieceSelector.h \
+	Decoder.h Signature.cc Signature.h ServerStat.cc ServerStat.h \
 	ServerStatMan.cc ServerStatMan.h URISelector.h \
 	AdaptiveURISelector.cc AdaptiveURISelector.h \
 	InOrderURISelector.cc InOrderURISelector.h \
@@ -447,7 +450,8 @@ am__libaria2c_a_SOURCES_DIST = Socket.h SocketCore.cc SocketCore.h \
 	download_helper.cc download_helper.h MetadataInfo.cc \
 	MetadataInfo.h SessionSerializer.cc SessionSerializer.h \
 	Event.h timespec.h ValueBase.cc ValueBase.h ContextAttribute.h \
-	TorrentAttribute.h AdaptiveFileAllocationIterator.cc \
+	TorrentAttribute.cc TorrentAttribute.h \
+	AdaptiveFileAllocationIterator.cc \
 	AdaptiveFileAllocationIterator.h StreamFilter.cc \
 	StreamFilter.h SinkStreamFilter.cc SinkStreamFilter.h \
 	ChunkedDecodingStreamFilter.cc ChunkedDecodingStreamFilter.h \
@@ -473,9 +477,17 @@ am__libaria2c_a_SOURCES_DIST = Socket.h SocketCore.cc SocketCore.h \
 	EpollEventPoll.cc EpollEventPoll.h TLSContext.h \
 	LibgnutlsTLSContext.cc LibgnutlsTLSContext.h \
 	LibgcryptMessageDigestImpl.cc LibgcryptMessageDigestImpl.h \
+	LibgcryptARC4Context.cc LibgcryptARC4Context.h \
+	LibgcryptARC4Decryptor.cc LibgcryptARC4Decryptor.h \
+	LibgcryptARC4Encryptor.cc LibgcryptARC4Encryptor.h \
+	LibgcryptDHKeyExchange.cc LibgcryptDHKeyExchange.h \
 	LibsslTLSContext.cc LibsslTLSContext.h \
 	LibsslMessageDigestImpl.cc LibsslMessageDigestImpl.h \
-	GZipDecoder.cc GZipDecoder.h GZipEncoder.cc GZipEncoder.h \
+	LibsslARC4Context.cc LibsslARC4Context.h \
+	LibsslARC4Decryptor.cc LibsslARC4Decryptor.h \
+	LibsslARC4Encryptor.cc LibsslARC4Encryptor.h \
+	LibsslDHKeyExchange.cc LibsslDHKeyExchange.h GZipDecoder.cc \
+	GZipDecoder.h GZipEncoder.cc GZipEncoder.h \
 	GZipDecodingStreamFilter.cc GZipDecodingStreamFilter.h \
 	Sqlite3CookieParser.cc Sqlite3CookieParser.h \
 	Sqlite3CookieParserImpl.cc Sqlite3CookieParserImpl.h \
@@ -487,21 +499,23 @@ am__libaria2c_a_SOURCES_DIST = Socket.h SocketCore.cc SocketCore.h \
 	CheckIntegrityDispatcherCommand.h CheckIntegrityCommand.cc \
 	CheckIntegrityCommand.h ChecksumCheckIntegrityEntry.cc \
 	ChecksumCheckIntegrityEntry.h MessageDigestHelper.cc \
-	MessageDigestHelper.h Checksum.h ChunkChecksum.h \
-	MessageDigest.cc MessageDigest.h HashFuncEntry.h \
-	PeerAbstractCommand.cc PeerAbstractCommand.h \
+	MessageDigestHelper.h Checksum.cc Checksum.h ChunkChecksum.cc \
+	ChunkChecksum.h MessageDigest.cc MessageDigest.h \
+	HashFuncEntry.h PeerAbstractCommand.cc PeerAbstractCommand.h \
 	PeerInitiateConnectionCommand.cc \
 	PeerInitiateConnectionCommand.h PeerInteractionCommand.cc \
 	PeerInteractionCommand.h Peer.cc Peer.h PeerListenCommand.cc \
 	PeerListenCommand.h RequestSlot.cc RequestSlot.h \
 	TrackerWatcherCommand.cc TrackerWatcherCommand.h \
 	PeerChokeCommand.cc PeerChokeCommand.h SeedCriteria.h \
-	TimeSeedCriteria.h ShareRatioSeedCriteria.h \
-	UnionSeedCriteria.h SeedCheckCommand.cc SeedCheckCommand.h \
-	AnnounceTier.h AnnounceList.h AnnounceList.cc PeerStorage.h \
+	TimeSeedCriteria.cc TimeSeedCriteria.h \
+	ShareRatioSeedCriteria.cc ShareRatioSeedCriteria.h \
+	UnionSeedCriteria.cc UnionSeedCriteria.h SeedCheckCommand.cc \
+	SeedCheckCommand.h AnnounceTier.cc AnnounceTier.h \
+	AnnounceList.h AnnounceList.cc PeerStorage.h \
 	DefaultPeerStorage.cc DefaultPeerStorage.h BtAnnounce.cc \
 	BtAnnounce.h DefaultBtAnnounce.cc DefaultBtAnnounce.h \
-	BtRuntime.h BtMessage.h AbstractBtMessage.cc \
+	BtRuntime.cc BtRuntime.h BtMessage.h AbstractBtMessage.cc \
 	AbstractBtMessage.h SimpleBtMessage.cc SimpleBtMessage.h \
 	BtAllowedFastMessage.cc BtAllowedFastMessage.h \
 	BtBitfieldMessage.cc BtBitfieldMessage.h BtCancelMessage.cc \
@@ -517,14 +531,16 @@ am__libaria2c_a_SOURCES_DIST = Socket.h SocketCore.cc SocketCore.h \
 	BtSuggestPieceMessage.cc BtSuggestPieceMessage.h \
 	BtUnchokeMessage.cc BtUnchokeMessage.h BtHandshakeMessage.cc \
 	BtHandshakeMessage.h BtMessageValidator.h \
-	BtBitfieldMessageValidator.h BtPieceMessageValidator.h \
-	BtHandshakeMessageValidator.h BtMessageFactory.h \
-	DefaultBtMessageFactory.cc DefaultBtMessageFactory.h \
-	BtMessageDispatcher.h DefaultBtMessageDispatcher.cc \
-	DefaultBtMessageDispatcher.h BtMessageReceiver.h \
-	DefaultBtMessageReceiver.cc DefaultBtMessageReceiver.h \
-	BtRequestFactory.h DefaultBtRequestFactory.cc \
-	DefaultBtRequestFactory.h BtCancelSendingPieceEvent.h \
+	BtBitfieldMessageValidator.cc BtBitfieldMessageValidator.h \
+	BtPieceMessageValidator.cc BtPieceMessageValidator.h \
+	BtHandshakeMessageValidator.cc BtHandshakeMessageValidator.h \
+	BtMessageFactory.h DefaultBtMessageFactory.cc \
+	DefaultBtMessageFactory.h BtMessageDispatcher.h \
+	DefaultBtMessageDispatcher.cc DefaultBtMessageDispatcher.h \
+	BtMessageReceiver.h DefaultBtMessageReceiver.cc \
+	DefaultBtMessageReceiver.h BtRequestFactory.h \
+	DefaultBtRequestFactory.cc DefaultBtRequestFactory.h \
+	BtCancelSendingPieceEvent.h BtAbortOutstandingRequestEvent.cc \
 	BtAbortOutstandingRequestEvent.h BtChokingEvent.h \
 	BtInteractive.h DefaultBtInteractive.cc DefaultBtInteractive.h \
 	ActivePeerConnectionCommand.cc ActivePeerConnectionCommand.h \
@@ -592,25 +608,23 @@ am__libaria2c_a_SOURCES_DIST = Socket.h SocketCore.cc SocketCore.h \
 	DHTRoutingTableSerializer.h DHTRoutingTableDeserializer.cc \
 	DHTRoutingTableDeserializer.h DHTAutoSaveCommand.cc \
 	DHTAutoSaveCommand.h DHTRegistry.cc DHTRegistry.h \
-	DHTIDCloser.h DHTConstants.h XORCloser.h PeerAddrEntry.h \
-	InitiatorMSEHandshakeCommand.cc InitiatorMSEHandshakeCommand.h \
-	ReceiverMSEHandshakeCommand.cc ReceiverMSEHandshakeCommand.h \
-	MSEHandshake.cc MSEHandshake.h ARC4Decryptor.h ARC4Encryptor.h \
-	DHKeyExchange.h LibgcryptARC4Context.h \
-	LibgcryptARC4Decryptor.h LibgcryptARC4Encryptor.h \
-	LibgcryptDHKeyExchange.h LibsslARC4Context.h \
-	LibsslARC4Decryptor.h LibsslARC4Encryptor.h \
-	LibsslDHKeyExchange.h BtConstants.h BtLeecherStateChoke.cc \
-	BtLeecherStateChoke.h BtSeederStateChoke.cc \
-	BtSeederStateChoke.h RangeBtMessage.cc RangeBtMessage.h \
-	IndexBtMessage.cc IndexBtMessage.h ZeroBtMessage.cc \
-	ZeroBtMessage.h RangeBtMessageValidator.h \
-	IndexBtMessageValidator.h ExtensionMessageRegistry.h \
-	bittorrent_helper.cc bittorrent_helper.h \
-	BtStopDownloadCommand.cc BtStopDownloadCommand.h \
-	PriorityPieceSelector.cc PriorityPieceSelector.h \
-	LpdMessageDispatcher.cc LpdMessageDispatcher.h \
-	LpdMessageReceiver.cc LpdMessageReceiver.h LpdMessage.h \
+	DHTIDCloser.h DHTConstants.h XORCloser.h PeerAddrEntry.cc \
+	PeerAddrEntry.h InitiatorMSEHandshakeCommand.cc \
+	InitiatorMSEHandshakeCommand.h ReceiverMSEHandshakeCommand.cc \
+	ReceiverMSEHandshakeCommand.h MSEHandshake.cc MSEHandshake.h \
+	ARC4Decryptor.h ARC4Encryptor.h DHKeyExchange.h BtConstants.h \
+	BtLeecherStateChoke.cc BtLeecherStateChoke.h \
+	BtSeederStateChoke.cc BtSeederStateChoke.h RangeBtMessage.cc \
+	RangeBtMessage.h IndexBtMessage.cc IndexBtMessage.h \
+	ZeroBtMessage.cc ZeroBtMessage.h RangeBtMessageValidator.cc \
+	RangeBtMessageValidator.h IndexBtMessageValidator.cc \
+	IndexBtMessageValidator.h ExtensionMessageRegistry.cc \
+	ExtensionMessageRegistry.h bittorrent_helper.cc \
+	bittorrent_helper.h BtStopDownloadCommand.cc \
+	BtStopDownloadCommand.h PriorityPieceSelector.cc \
+	PriorityPieceSelector.h LpdMessageDispatcher.cc \
+	LpdMessageDispatcher.h LpdMessageReceiver.cc \
+	LpdMessageReceiver.h LpdMessage.cc LpdMessage.h \
 	LpdReceiveMessageCommand.cc LpdReceiveMessageCommand.h \
 	LpdDispatchMessageCommand.cc LpdDispatchMessageCommand.h \
 	bencode2.cc bencode2.h Metalinker.cc Metalinker.h \
@@ -618,13 +632,14 @@ am__libaria2c_a_SOURCES_DIST = Socket.h SocketCore.cc SocketCore.h \
 	MetalinkResource.h MetalinkMetaurl.cc MetalinkMetaurl.h \
 	MetalinkProcessor.h MetalinkParserController.cc \
 	MetalinkParserController.h MetalinkParserStateMachine.cc \
-	MetalinkParserStateMachine.h MetalinkParserState.h \
-	MetalinkParserStateImpl.cc MetalinkParserStateImpl.h \
-	MetalinkParserStateV3Impl.cc MetalinkParserStateV3Impl.h \
-	MetalinkParserStateV4Impl.cc MetalinkParserStateV4Impl.h \
-	Metalink2RequestGroup.cc Metalink2RequestGroup.h \
-	MetalinkPostDownloadHandler.cc MetalinkPostDownloadHandler.h \
-	MetalinkHelper.cc MetalinkHelper.h XML2SAXMetalinkProcessor.cc \
+	MetalinkParserStateMachine.h MetalinkParserState.cc \
+	MetalinkParserState.h MetalinkParserStateImpl.cc \
+	MetalinkParserStateImpl.h MetalinkParserStateV3Impl.cc \
+	MetalinkParserStateV3Impl.h MetalinkParserStateV4Impl.cc \
+	MetalinkParserStateV4Impl.h Metalink2RequestGroup.cc \
+	Metalink2RequestGroup.h MetalinkPostDownloadHandler.cc \
+	MetalinkPostDownloadHandler.h MetalinkHelper.cc \
+	MetalinkHelper.h XML2SAXMetalinkProcessor.cc \
 	XML2SAXMetalinkProcessor.h ExpatMetalinkProcessor.cc \
 	ExpatMetalinkProcessor.h asctime_r.c asctime_r.h libgen.c \
 	libgen.h getaddrinfo.c getaddrinfo.h gai_strerror.c \
@@ -655,9 +670,17 @@ am__libaria2c_a_SOURCES_DIST = Socket.h SocketCore.cc SocketCore.h \
 @HAVE_EPOLL_TRUE@am__objects_5 = EpollEventPoll.$(OBJEXT)
 am__objects_6 =
 @HAVE_LIBGNUTLS_TRUE@am__objects_7 = LibgnutlsTLSContext.$(OBJEXT) \
-@HAVE_LIBGNUTLS_TRUE@	LibgcryptMessageDigestImpl.$(OBJEXT)
+@HAVE_LIBGNUTLS_TRUE@	LibgcryptMessageDigestImpl.$(OBJEXT) \
+@HAVE_LIBGNUTLS_TRUE@	LibgcryptARC4Context.$(OBJEXT) \
+@HAVE_LIBGNUTLS_TRUE@	LibgcryptARC4Decryptor.$(OBJEXT) \
+@HAVE_LIBGNUTLS_TRUE@	LibgcryptARC4Encryptor.$(OBJEXT) \
+@HAVE_LIBGNUTLS_TRUE@	LibgcryptDHKeyExchange.$(OBJEXT)
 @HAVE_LIBSSL_TRUE@am__objects_8 = LibsslTLSContext.$(OBJEXT) \
-@HAVE_LIBSSL_TRUE@	LibsslMessageDigestImpl.$(OBJEXT)
+@HAVE_LIBSSL_TRUE@	LibsslMessageDigestImpl.$(OBJEXT) \
+@HAVE_LIBSSL_TRUE@	LibsslARC4Context.$(OBJEXT) \
+@HAVE_LIBSSL_TRUE@	LibsslARC4Decryptor.$(OBJEXT) \
+@HAVE_LIBSSL_TRUE@	LibsslARC4Encryptor.$(OBJEXT) \
+@HAVE_LIBSSL_TRUE@	LibsslDHKeyExchange.$(OBJEXT)
 @HAVE_LIBZ_TRUE@am__objects_9 = GZipDecoder.$(OBJEXT) \
 @HAVE_LIBZ_TRUE@	GZipEncoder.$(OBJEXT) \
 @HAVE_LIBZ_TRUE@	GZipDecodingStreamFilter.$(OBJEXT)
@@ -670,6 +693,8 @@ am__objects_6 =
 @ENABLE_MESSAGE_DIGEST_TRUE@	CheckIntegrityCommand.$(OBJEXT) \
 @ENABLE_MESSAGE_DIGEST_TRUE@	ChecksumCheckIntegrityEntry.$(OBJEXT) \
 @ENABLE_MESSAGE_DIGEST_TRUE@	MessageDigestHelper.$(OBJEXT) \
+@ENABLE_MESSAGE_DIGEST_TRUE@	Checksum.$(OBJEXT) \
+@ENABLE_MESSAGE_DIGEST_TRUE@	ChunkChecksum.$(OBJEXT) \
 @ENABLE_MESSAGE_DIGEST_TRUE@	MessageDigest.$(OBJEXT)
 @ENABLE_BITTORRENT_TRUE@am__objects_13 =  \
 @ENABLE_BITTORRENT_TRUE@	PeerAbstractCommand.$(OBJEXT) \
@@ -680,11 +705,16 @@ am__objects_6 =
 @ENABLE_BITTORRENT_TRUE@	RequestSlot.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	TrackerWatcherCommand.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	PeerChokeCommand.$(OBJEXT) \
+@ENABLE_BITTORRENT_TRUE@	TimeSeedCriteria.$(OBJEXT) \
+@ENABLE_BITTORRENT_TRUE@	ShareRatioSeedCriteria.$(OBJEXT) \
+@ENABLE_BITTORRENT_TRUE@	UnionSeedCriteria.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	SeedCheckCommand.$(OBJEXT) \
+@ENABLE_BITTORRENT_TRUE@	AnnounceTier.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	AnnounceList.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	DefaultPeerStorage.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	BtAnnounce.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	DefaultBtAnnounce.$(OBJEXT) \
+@ENABLE_BITTORRENT_TRUE@	BtRuntime.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	AbstractBtMessage.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	SimpleBtMessage.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	BtAllowedFastMessage.$(OBJEXT) \
@@ -704,10 +734,14 @@ am__objects_6 =
 @ENABLE_BITTORRENT_TRUE@	BtSuggestPieceMessage.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	BtUnchokeMessage.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	BtHandshakeMessage.$(OBJEXT) \
+@ENABLE_BITTORRENT_TRUE@	BtBitfieldMessageValidator.$(OBJEXT) \
+@ENABLE_BITTORRENT_TRUE@	BtPieceMessageValidator.$(OBJEXT) \
+@ENABLE_BITTORRENT_TRUE@	BtHandshakeMessageValidator.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	DefaultBtMessageFactory.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	DefaultBtMessageDispatcher.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	DefaultBtMessageReceiver.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	DefaultBtRequestFactory.$(OBJEXT) \
+@ENABLE_BITTORRENT_TRUE@	BtAbortOutstandingRequestEvent.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	DefaultBtInteractive.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	ActivePeerConnectionCommand.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	BtDependency.$(OBJEXT) \
@@ -777,6 +811,7 @@ am__objects_6 =
 @ENABLE_BITTORRENT_TRUE@	DHTRoutingTableDeserializer.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	DHTAutoSaveCommand.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	DHTRegistry.$(OBJEXT) \
+@ENABLE_BITTORRENT_TRUE@	PeerAddrEntry.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	InitiatorMSEHandshakeCommand.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	ReceiverMSEHandshakeCommand.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	MSEHandshake.$(OBJEXT) \
@@ -785,11 +820,15 @@ am__objects_6 =
 @ENABLE_BITTORRENT_TRUE@	RangeBtMessage.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	IndexBtMessage.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	ZeroBtMessage.$(OBJEXT) \
+@ENABLE_BITTORRENT_TRUE@	RangeBtMessageValidator.$(OBJEXT) \
+@ENABLE_BITTORRENT_TRUE@	IndexBtMessageValidator.$(OBJEXT) \
+@ENABLE_BITTORRENT_TRUE@	ExtensionMessageRegistry.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	bittorrent_helper.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	BtStopDownloadCommand.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	PriorityPieceSelector.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	LpdMessageDispatcher.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	LpdMessageReceiver.$(OBJEXT) \
+@ENABLE_BITTORRENT_TRUE@	LpdMessage.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	LpdReceiveMessageCommand.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	LpdDispatchMessageCommand.$(OBJEXT) \
 @ENABLE_BITTORRENT_TRUE@	bencode2.$(OBJEXT)
@@ -799,6 +838,7 @@ am__objects_6 =
 @ENABLE_METALINK_TRUE@	MetalinkMetaurl.$(OBJEXT) \
 @ENABLE_METALINK_TRUE@	MetalinkParserController.$(OBJEXT) \
 @ENABLE_METALINK_TRUE@	MetalinkParserStateMachine.$(OBJEXT) \
+@ENABLE_METALINK_TRUE@	MetalinkParserState.$(OBJEXT) \
 @ENABLE_METALINK_TRUE@	MetalinkParserStateImpl.$(OBJEXT) \
 @ENABLE_METALINK_TRUE@	MetalinkParserStateV3Impl.$(OBJEXT) \
 @ENABLE_METALINK_TRUE@	MetalinkParserStateV4Impl.$(OBJEXT) \
@@ -848,14 +888,16 @@ am__objects_32 = SocketCore.$(OBJEXT) Command.$(OBJEXT) \
 	Option.$(OBJEXT) Base64.$(OBJEXT) base32.$(OBJEXT) \
 	LogFactory.$(OBJEXT) TimerA2.$(OBJEXT) TimeA2.$(OBJEXT) \
 	FeatureConfig.$(OBJEXT) DownloadEngineFactory.$(OBJEXT) \
-	SpeedCalc.$(OBJEXT) BitfieldMan.$(OBJEXT) \
+	SpeedCalc.$(OBJEXT) PeerStat.$(OBJEXT) BitfieldMan.$(OBJEXT) \
 	SimpleRandomizer.$(OBJEXT) HttpResponse.$(OBJEXT) \
-	HttpRequest.$(OBJEXT) AbstractProxyRequestCommand.$(OBJEXT) \
+	HttpRequest.$(OBJEXT) Range.$(OBJEXT) \
+	AbstractProxyRequestCommand.$(OBJEXT) \
 	AbstractProxyResponseCommand.$(OBJEXT) Netrc.$(OBJEXT) \
 	AuthConfig.$(OBJEXT) AbstractAuthResolver.$(OBJEXT) \
 	DefaultAuthResolver.$(OBJEXT) NetrcAuthResolver.$(OBJEXT) \
 	AuthConfigFactory.$(OBJEXT) OptionParser.$(OBJEXT) \
 	OptionHandlerFactory.$(OBJEXT) OptionHandler.$(OBJEXT) \
+	OptionHandlerImpl.$(OBJEXT) NameMatchOptionHandler.$(OBJEXT) \
 	NameResolver.$(OBJEXT) RequestGroup.$(OBJEXT) \
 	RequestGroupMan.$(OBJEXT) FileAllocationCommand.$(OBJEXT) \
 	FillRequestGroupCommand.$(OBJEXT) \
@@ -866,8 +908,11 @@ am__objects_32 = SocketCore.$(OBJEXT) Command.$(OBJEXT) \
 	RealtimeCommand.$(OBJEXT) RequestGroupEntry.$(OBJEXT) \
 	Cookie.$(OBJEXT) HttpHeaderProcessor.$(OBJEXT) \
 	FileEntry.$(OBJEXT) Platform.$(OBJEXT) \
-	PStringSegment.$(OBJEXT) PStringBuildVisitor.$(OBJEXT) \
-	ParameterizedStringParser.$(OBJEXT) TimeBasedCommand.$(OBJEXT) \
+	PStringSegment.$(OBJEXT) PStringNumLoop.$(OBJEXT) \
+	PStringSelect.$(OBJEXT) PStringBuildVisitor.$(OBJEXT) \
+	ParameterizedStringParser.$(OBJEXT) \
+	FixedWidthNumberDecorator.$(OBJEXT) \
+	AlphaNumberDecorator.$(OBJEXT) TimeBasedCommand.$(OBJEXT) \
 	AutoSaveCommand.$(OBJEXT) DefaultPieceStorage.$(OBJEXT) \
 	UnknownLengthPieceStorage.$(OBJEXT) PieceStatMan.$(OBJEXT) \
 	ConsoleStatCalc.$(OBJEXT) TransferStat.$(OBJEXT) \
@@ -887,7 +932,8 @@ am__objects_32 = SocketCore.$(OBJEXT) Command.$(OBJEXT) \
 	MultiFileAllocationIterator.$(OBJEXT) PeerConnection.$(OBJEXT) \
 	ByteArrayDiskWriter.$(OBJEXT) \
 	ByteArrayDiskWriterFactory.$(OBJEXT) DownloadContext.$(OBJEXT) \
-	TimedHaltCommand.$(OBJEXT) prefs.$(OBJEXT) \
+	TimedHaltCommand.$(OBJEXT) CUIDCounter.$(OBJEXT) \
+	DNSCache.$(OBJEXT) DownloadResult.$(OBJEXT) prefs.$(OBJEXT) \
 	ProtocolDetector.$(OBJEXT) StringFormat.$(OBJEXT) \
 	HttpSkipResponseCommand.$(OBJEXT) \
 	InitiateConnectionCommand.$(OBJEXT) \
@@ -902,7 +948,8 @@ am__objects_32 = SocketCore.$(OBJEXT) Command.$(OBJEXT) \
 	LongestSequencePieceSelector.$(OBJEXT) bitfield.$(OBJEXT) \
 	CreateRequestCommand.$(OBJEXT) download_helper.$(OBJEXT) \
 	MetadataInfo.$(OBJEXT) SessionSerializer.$(OBJEXT) \
-	ValueBase.$(OBJEXT) AdaptiveFileAllocationIterator.$(OBJEXT) \
+	ValueBase.$(OBJEXT) TorrentAttribute.$(OBJEXT) \
+	AdaptiveFileAllocationIterator.$(OBJEXT) \
 	StreamFilter.$(OBJEXT) SinkStreamFilter.$(OBJEXT) \
 	ChunkedDecodingStreamFilter.$(OBJEXT) \
 	NullSinkStreamFilter.$(OBJEXT) uri.$(OBJEXT) \
@@ -1161,10 +1208,10 @@ SRCS = Socket.h SocketCore.cc SocketCore.h BinaryStream.h Command.cc \
 	base32.h LogFactory.cc LogFactory.h TimerA2.cc TimerA2.h \
 	TimeA2.cc TimeA2.h SharedHandle.h FeatureConfig.cc \
 	FeatureConfig.h DownloadEngineFactory.cc \
-	DownloadEngineFactory.h SpeedCalc.cc SpeedCalc.h PeerStat.h \
-	BitfieldMan.cc BitfieldMan.h Randomizer.h SimpleRandomizer.cc \
-	SimpleRandomizer.h HttpResponse.cc HttpResponse.h \
-	HttpRequest.cc HttpRequest.h Range.h \
+	DownloadEngineFactory.h SpeedCalc.cc SpeedCalc.h PeerStat.cc \
+	PeerStat.h BitfieldMan.cc BitfieldMan.h Randomizer.h \
+	SimpleRandomizer.cc SimpleRandomizer.h HttpResponse.cc \
+	HttpResponse.h HttpRequest.cc HttpRequest.h Range.cc Range.h \
 	AbstractProxyRequestCommand.cc AbstractProxyRequestCommand.h \
 	AbstractProxyResponseCommand.cc AbstractProxyResponseCommand.h \
 	Netrc.cc Netrc.h AuthConfig.cc AuthConfig.h AuthResolver.h \
@@ -1173,7 +1220,8 @@ SRCS = Socket.h SocketCore.cc SocketCore.h BinaryStream.h Command.cc \
 	NetrcAuthResolver.cc NetrcAuthResolver.h AuthConfigFactory.cc \
 	AuthConfigFactory.h OptionParser.cc OptionParser.h \
 	OptionHandlerFactory.cc OptionHandlerFactory.h \
-	OptionHandler.cc OptionHandler.h OptionHandlerImpl.h \
+	OptionHandler.cc OptionHandler.h OptionHandlerImpl.cc \
+	OptionHandlerImpl.h NameMatchOptionHandler.cc \
 	NameMatchOptionHandler.h NameResolver.cc NameResolver.h \
 	RequestGroup.cc RequestGroup.h RequestGroupMan.cc \
 	RequestGroupMan.h FileAllocationMan.h FileAllocationCommand.cc \
@@ -1187,13 +1235,15 @@ SRCS = Socket.h SocketCore.cc SocketCore.h BinaryStream.h Command.cc \
 	RequestGroupEntry.cc RequestGroupEntry.h Cookie.cc Cookie.h \
 	HttpHeaderProcessor.cc HttpHeaderProcessor.h FileEntry.cc \
 	FileEntry.h Platform.cc Platform.h PStringDatum.h \
-	PStringSegment.cc PStringSegment.h PStringNumLoop.h \
-	PStringSelect.h PStringVisitor.h PStringBuildVisitor.cc \
-	PStringBuildVisitor.h ParameterizedStringParser.cc \
-	ParameterizedStringParser.h FixedWidthNumberDecorator.h \
-	NumberDecorator.h AlphaNumberDecorator.h TimeBasedCommand.cc \
-	TimeBasedCommand.h AutoSaveCommand.cc AutoSaveCommand.h \
-	PieceStorage.h DefaultPieceStorage.cc DefaultPieceStorage.h \
+	PStringSegment.cc PStringSegment.h PStringNumLoop.cc \
+	PStringNumLoop.h PStringSelect.cc PStringSelect.h \
+	PStringVisitor.h PStringBuildVisitor.cc PStringBuildVisitor.h \
+	ParameterizedStringParser.cc ParameterizedStringParser.h \
+	FixedWidthNumberDecorator.cc FixedWidthNumberDecorator.h \
+	NumberDecorator.h AlphaNumberDecorator.cc \
+	AlphaNumberDecorator.h TimeBasedCommand.cc TimeBasedCommand.h \
+	AutoSaveCommand.cc AutoSaveCommand.h PieceStorage.h \
+	DefaultPieceStorage.cc DefaultPieceStorage.h \
 	UnknownLengthPieceStorage.cc UnknownLengthPieceStorage.h \
 	PieceStatMan.cc PieceStatMan.h StatCalc.h ConsoleStatCalc.cc \
 	ConsoleStatCalc.h TransferStat.cc TransferStat.h Dependency.h \
@@ -1221,18 +1271,18 @@ SRCS = Socket.h SocketCore.cc SocketCore.h BinaryStream.h Command.cc \
 	ByteArrayDiskWriter.h ByteArrayDiskWriterFactory.cc \
 	ByteArrayDiskWriterFactory.h DownloadContext.cc \
 	DownloadContext.h TimedHaltCommand.cc TimedHaltCommand.h \
-	CUIDCounter.h DNSCache.h DownloadResult.h Sequence.h \
-	IntSequence.h PostDownloadHandler.h PreDownloadHandler.h \
-	SingletonHolder.h TrueRequestGroupCriteria.h a2algo.h \
-	a2functional.h a2io.h a2netcompat.h a2time.h array_fun.h \
-	help_tags.h prefs.cc prefs.h usage_text.h ProtocolDetector.cc \
-	ProtocolDetector.h NullStatCalc.h StringFormat.cc \
-	StringFormat.h HttpSkipResponseCommand.cc \
-	HttpSkipResponseCommand.h InitiateConnectionCommand.cc \
-	InitiateConnectionCommand.h FtpFinishDownloadCommand.cc \
-	FtpFinishDownloadCommand.h A2STR.cc A2STR.h \
-	RarestPieceSelector.cc RarestPieceSelector.h Decoder.h \
-	Signature.cc Signature.h ServerStat.cc ServerStat.h \
+	CUIDCounter.cc CUIDCounter.h DNSCache.cc DNSCache.h \
+	DownloadResult.cc DownloadResult.h Sequence.h IntSequence.h \
+	PostDownloadHandler.h PreDownloadHandler.h SingletonHolder.h \
+	TrueRequestGroupCriteria.h a2algo.h a2functional.h a2io.h \
+	a2netcompat.h a2time.h array_fun.h help_tags.h prefs.cc \
+	prefs.h usage_text.h ProtocolDetector.cc ProtocolDetector.h \
+	NullStatCalc.h StringFormat.cc StringFormat.h \
+	HttpSkipResponseCommand.cc HttpSkipResponseCommand.h \
+	InitiateConnectionCommand.cc InitiateConnectionCommand.h \
+	FtpFinishDownloadCommand.cc FtpFinishDownloadCommand.h \
+	A2STR.cc A2STR.h RarestPieceSelector.cc RarestPieceSelector.h \
+	Decoder.h Signature.cc Signature.h ServerStat.cc ServerStat.h \
 	ServerStatMan.cc ServerStatMan.h URISelector.h \
 	AdaptiveURISelector.cc AdaptiveURISelector.h \
 	InOrderURISelector.cc InOrderURISelector.h \
@@ -1248,7 +1298,8 @@ SRCS = Socket.h SocketCore.cc SocketCore.h BinaryStream.h Command.cc \
 	download_helper.cc download_helper.h MetadataInfo.cc \
 	MetadataInfo.h SessionSerializer.cc SessionSerializer.h \
 	Event.h timespec.h ValueBase.cc ValueBase.h ContextAttribute.h \
-	TorrentAttribute.h AdaptiveFileAllocationIterator.cc \
+	TorrentAttribute.cc TorrentAttribute.h \
+	AdaptiveFileAllocationIterator.cc \
 	AdaptiveFileAllocationIterator.h StreamFilter.cc \
 	StreamFilter.h SinkStreamFilter.cc SinkStreamFilter.h \
 	ChunkedDecodingStreamFilter.cc ChunkedDecodingStreamFilter.h \
@@ -1379,7 +1430,9 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ActivePeerConnectionCommand.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AdaptiveFileAllocationIterator.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AdaptiveURISelector.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AlphaNumberDecorator.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AnnounceList.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AnnounceTier.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AsyncNameResolver.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AuthConfig.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AuthConfigFactory.Po@am__quote@
@@ -1387,9 +1440,11 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BNode.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Base64.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BitfieldMan.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtAbortOutstandingRequestEvent.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtAllowedFastMessage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtAnnounce.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtBitfieldMessage.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtBitfieldMessageValidator.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtCancelMessage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtCheckIntegrityEntry.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtChokeMessage.Po@am__quote@
@@ -1397,6 +1452,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtExtendedMessage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtFileAllocationEntry.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtHandshakeMessage.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtHandshakeMessageValidator.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtHaveAllMessage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtHaveMessage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtHaveNoneMessage.Po@am__quote@
@@ -1405,11 +1461,13 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtLeecherStateChoke.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtNotInterestedMessage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtPieceMessage.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtPieceMessageValidator.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtPortMessage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtPostDownloadHandler.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtRegistry.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtRejectMessage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtRequestMessage.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtRuntime.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtSeederStateChoke.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtSetup.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtStopDownloadCommand.Po@am__quote@
@@ -1417,10 +1475,13 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BtUnchokeMessage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ByteArrayDiskWriter.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ByteArrayDiskWriterFactory.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CUIDCounter.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CheckIntegrityCommand.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CheckIntegrityDispatcherCommand.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CheckIntegrityEntry.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Checksum.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChecksumCheckIntegrityEntry.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChunkChecksum.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ChunkedDecodingStreamFilter.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Command.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ConsoleStatCalc.Po@am__quote@
@@ -1477,6 +1538,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DHTTokenTracker.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DHTTokenUpdateCommand.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DHTUnknownMessage.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DNSCache.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DefaultAuthResolver.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DefaultBtAnnounce.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DefaultBtInteractive.Po@am__quote@
@@ -1502,10 +1564,12 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DownloadHandler.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DownloadHandlerConstants.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DownloadHandlerFactory.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DownloadResult.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/EpollEventPoll.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Exception.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ExpatMetalinkProcessor.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ExpatXmlRpcRequestProcessor.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ExtensionMessageRegistry.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FallocFileAllocationIterator.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FatalException.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FeatureConfig.Po@am__quote@
@@ -1516,6 +1580,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FileAllocationEntry.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FileEntry.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FillRequestGroupCommand.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FixedWidthNumberDecorator.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FtpConnection.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FtpDownloadCommand.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FtpFinishDownloadCommand.Po@am__quote@
@@ -1548,20 +1613,30 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HttpSkipResponseCommand.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/InOrderURISelector.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IndexBtMessage.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IndexBtMessageValidator.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/InitiateConnectionCommand.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/InitiateConnectionCommandFactory.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/InitiatorMSEHandshakeCommand.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IteratableChecksumValidator.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IteratableChunkChecksumValidator.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/KqueueEventPoll.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LibgcryptARC4Context.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LibgcryptARC4Decryptor.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LibgcryptARC4Encryptor.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LibgcryptDHKeyExchange.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LibgcryptMessageDigestImpl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LibgnutlsTLSContext.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LibsslARC4Context.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LibsslARC4Decryptor.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LibsslARC4Encryptor.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LibsslDHKeyExchange.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LibsslMessageDigestImpl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LibsslTLSContext.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LogFactory.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Logger.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LongestSequencePieceSelector.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LpdDispatchMessageCommand.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LpdMessage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LpdMessageDispatcher.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LpdMessageReceiver.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LpdReceiveMessageCommand.Po@am__quote@
@@ -1575,6 +1650,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MetalinkHelper.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MetalinkMetaurl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MetalinkParserController.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MetalinkParserState.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MetalinkParserStateImpl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MetalinkParserStateMachine.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MetalinkParserStateV3Impl.Po@am__quote@
@@ -1585,6 +1661,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MultiDiskAdaptor.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MultiFileAllocationIterator.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MultiUrlRequestInfo.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NameMatchOptionHandler.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NameResolver.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Netrc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NetrcAuthResolver.Po@am__quote@
@@ -1594,12 +1671,16 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OptionHandler.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OptionHandlerException.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OptionHandlerFactory.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OptionHandlerImpl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/OptionParser.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PStringBuildVisitor.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PStringNumLoop.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PStringSegment.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PStringSelect.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ParameterizedStringParser.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Peer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PeerAbstractCommand.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PeerAddrEntry.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PeerChokeCommand.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PeerConnection.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PeerInitiateConnectionCommand.Po@am__quote@
@@ -1607,6 +1688,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PeerListenCommand.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PeerReceiveHandshakeCommand.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PeerSessionResource.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PeerStat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Piece.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PieceHashCheckIntegrityEntry.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PieceStatMan.Po@am__quote@
@@ -1616,7 +1698,9 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PortEventPoll.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PriorityPieceSelector.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ProtocolDetector.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Range.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RangeBtMessage.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RangeBtMessageValidator.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RarestPieceSelector.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RealtimeCommand.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ReceiverMSEHandshakeCommand.Po@am__quote@
@@ -1632,6 +1716,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ServerStat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ServerStatMan.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SessionSerializer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ShareRatioSeedCriteria.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Signature.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SimpleBtMessage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SimpleLogFormatter.Po@am__quote@
@@ -1650,8 +1735,10 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StringFormat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TimeA2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TimeBasedCommand.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TimeSeedCriteria.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TimedHaltCommand.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TimerA2.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TorrentAttribute.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TrackerWatcherCommand.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TransferStat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/URIResult.Po@am__quote@
@@ -1663,6 +1750,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UTMetadataRequestFactory.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UTMetadataRequestTracker.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UTPexExtensionMessage.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UnionSeedCriteria.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UnknownLengthPieceStorage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UriListParser.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ValueBase.Po@am__quote@
diff --git a/src/MetadataInfo.cc b/src/MetadataInfo.cc
index 1f0625a4..bfed340f 100644
--- a/src/MetadataInfo.cc
+++ b/src/MetadataInfo.cc
@@ -38,6 +38,14 @@ namespace aria2 {
 
 int64_t MetadataInfo::count_ = 0;
 
+MetadataInfo::MetadataInfo(const std::string& uri)
+  : id_(genId()), uri_(uri), dataOnly_(false)
+{}
+
+MetadataInfo::MetadataInfo():id_(genId()), dataOnly_(true) {}
+
+MetadataInfo::~MetadataInfo() {}
+
 int64_t MetadataInfo::genId()
 {
   if(count_ == INT64_MAX) {
diff --git a/src/MetadataInfo.h b/src/MetadataInfo.h
index ab3cfe88..2774cce9 100644
--- a/src/MetadataInfo.h
+++ b/src/MetadataInfo.h
@@ -48,10 +48,11 @@ private:
   bool dataOnly_;
   static int64_t count_;
 public:
-  MetadataInfo(const std::string& uri):id_(genId()), uri_(uri), dataOnly_(false)
-  {}
+  MetadataInfo(const std::string& uri);
 
-  MetadataInfo():id_(genId()), dataOnly_(true) {}
+  MetadataInfo();
+
+  ~MetadataInfo();
 
   bool dataOnly() const
   {
diff --git a/src/MetalinkEntry.cc b/src/MetalinkEntry.cc
index 24e5711a..9c720a2d 100644
--- a/src/MetalinkEntry.cc
+++ b/src/MetalinkEntry.cc
@@ -204,4 +204,14 @@ void MetalinkEntry::setSignature(const SharedHandle<Signature>& signature)
   signature_ = signature;
 }
 
+bool MetalinkEntry::containsLanguage(const std::string& lang) const
+{
+  return std::find(languages.begin(), languages.end(), lang) != languages.end();
+}
+
+bool MetalinkEntry::containsOS(const std::string& os) const
+{
+  return std::find(oses.begin(), oses.end(), os) != oses.end();
+}
+
 } // namespace aria2
diff --git a/src/MetalinkEntry.h b/src/MetalinkEntry.h
index 998c6c29..43b1ebdb 100644
--- a/src/MetalinkEntry.h
+++ b/src/MetalinkEntry.h
@@ -39,7 +39,6 @@
 
 #include <string>
 #include <vector>
-#include <algorithm>
 
 #include "SharedHandle.h"
 
@@ -93,16 +92,9 @@ public:
 
   void reorderMetaurlsByPriority();
   
-  bool containsLanguage(const std::string& lang) const
-  {
-    return
-      std::find(languages.begin(), languages.end(), lang) != languages.end();
-  }
+  bool containsLanguage(const std::string& lang) const;
 
-  bool containsOS(const std::string& os) const
-  {
-    return std::find(oses.begin(), oses.end(), os) != oses.end();
-  }
+  bool containsOS(const std::string& os) const;
 
   void setLocationPriority
   (const std::vector<std::string>& locations, int priorityToAdd);
diff --git a/src/MetalinkMetaurl.cc b/src/MetalinkMetaurl.cc
index 2058fcc1..0f0a2935 100644
--- a/src/MetalinkMetaurl.cc
+++ b/src/MetalinkMetaurl.cc
@@ -47,4 +47,6 @@ MetalinkMetaurl::MetalinkMetaurl
  const std::string& name, int priority):
   url(url), mediatype(mediatype), name(name), priority(priority) {}
 
+MetalinkMetaurl::~MetalinkMetaurl() {}
+
 } // namespace aria2
diff --git a/src/MetalinkMetaurl.h b/src/MetalinkMetaurl.h
index 7d57a322..7919396c 100644
--- a/src/MetalinkMetaurl.h
+++ b/src/MetalinkMetaurl.h
@@ -53,6 +53,8 @@ public:
   MetalinkMetaurl(const std::string& url, const std::string& mediatype,
                   const std::string& name, int priority);
 
+  ~MetalinkMetaurl();
+
   static const std::string MEDIATYPE_TORRENT;
 };
 
diff --git a/src/MetalinkParserState.cc b/src/MetalinkParserState.cc
new file mode 100644
index 00000000..080cd413
--- /dev/null
+++ b/src/MetalinkParserState.cc
@@ -0,0 +1,58 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "MetalinkParserState.h"
+
+namespace aria2 {
+
+XmlAttr::XmlAttr() {}
+
+XmlAttr::XmlAttr(const XmlAttr& c)
+  : localname(c.localname), prefix(c.prefix), nsUri(c.nsUri), value(c.value)
+{}
+
+XmlAttr::~XmlAttr() {}
+
+XmlAttr& XmlAttr::operator=(const XmlAttr& c)
+{
+  if(this != &c) {
+    localname = c.localname;
+    prefix = c.prefix;
+    nsUri = c.nsUri;
+    value = c.value;
+  }
+  return *this;
+}
+
+} // namespace aria2
diff --git a/src/MetalinkParserState.h b/src/MetalinkParserState.h
index 445cbe7d..79f52b6a 100644
--- a/src/MetalinkParserState.h
+++ b/src/MetalinkParserState.h
@@ -49,6 +49,11 @@ struct XmlAttr {
   std::string prefix;
   std::string nsUri;
   std::string value;
+
+  XmlAttr();
+  XmlAttr(const XmlAttr& attr);
+  ~XmlAttr();
+  XmlAttr& operator=(const XmlAttr&);
 };
 
 class MetalinkParserState
diff --git a/src/MetalinkParserStateMachine.cc b/src/MetalinkParserStateMachine.cc
index f9fcfc3b..8653d68e 100644
--- a/src/MetalinkParserStateMachine.cc
+++ b/src/MetalinkParserStateMachine.cc
@@ -110,6 +110,8 @@ MetalinkParserStateMachine::MetalinkParserStateMachine():
   stateStack_.push(initialState_);
 }
 
+MetalinkParserStateMachine::~MetalinkParserStateMachine() {}
+
 void MetalinkParserStateMachine::setMetalinkState()
 {
   stateStack_.push(metalinkState_);
diff --git a/src/MetalinkParserStateMachine.h b/src/MetalinkParserStateMachine.h
index f87363fd..43f98443 100644
--- a/src/MetalinkParserStateMachine.h
+++ b/src/MetalinkParserStateMachine.h
@@ -92,6 +92,8 @@ private:
 public:
   MetalinkParserStateMachine();
 
+  ~MetalinkParserStateMachine();
+
   void setSkipTagState();
 
   void setMetalinkState();
diff --git a/src/MetalinkResource.cc b/src/MetalinkResource.cc
index e1d1d690..0fae987c 100644
--- a/src/MetalinkResource.cc
+++ b/src/MetalinkResource.cc
@@ -50,10 +50,10 @@ const std::string MetalinkResource::BITTORRENT("bittorrent");
 
 const std::string MetalinkResource::TORRENT("torrent");
 
-MetalinkResource::MetalinkResource():
-  type(TYPE_UNKNOWN),
-  priority(getLowestPriority()),
-  maxConnections(-1)
+MetalinkResource::MetalinkResource()
+  : type(TYPE_UNKNOWN),
+    priority(getLowestPriority()),
+    maxConnections(-1)
 {}
 
 MetalinkResource::~MetalinkResource() {}
diff --git a/src/MetalinkResource.h b/src/MetalinkResource.h
index a84ad23f..4b139e8e 100644
--- a/src/MetalinkResource.h
+++ b/src/MetalinkResource.h
@@ -73,16 +73,9 @@ public:
   MetalinkResource();
   ~MetalinkResource();
 
-  MetalinkResource& operator=(const MetalinkResource& metalinkResource) {
-    if(this != &metalinkResource) {
-      this->url = metalinkResource.url;
-      this->type = metalinkResource.type;
-      this->location = metalinkResource.location;
-      this->priority = metalinkResource.priority;
-      this->maxConnections = metalinkResource.maxConnections;
-    }
-    return *this;
-  }
+  // Don't allow copying
+  MetalinkResource(const MetalinkResource&);
+  MetalinkResource& operator=(const MetalinkResource&);
 
   static const std::string& getTypeString(TYPE type)
   {
diff --git a/src/Metalinker.cc b/src/Metalinker.cc
index 8b1cd85e..5b6adbc6 100644
--- a/src/Metalinker.cc
+++ b/src/Metalinker.cc
@@ -89,4 +89,9 @@ void Metalinker::queryEntry
                       std::not1(EntryQuery(version, language, os)));
 }
 
+void Metalinker::addEntry(const SharedHandle<MetalinkEntry>& entry)
+{
+  entries_.push_back(entry);
+}
+
 } // namespace aria2
diff --git a/src/Metalinker.h b/src/Metalinker.h
index 5b90016b..b6399d34 100644
--- a/src/Metalinker.h
+++ b/src/Metalinker.h
@@ -53,12 +53,9 @@ public:
   Metalinker();
   ~Metalinker();
 
-  Metalinker& operator=(const Metalinker& metalinker) {
-    if(this != &metalinker) {
-      entries_ = metalinker.entries_;
-    }
-    return *this;
-  }
+  // Don't allow copying
+  Metalinker(const Metalinker&);
+  Metalinker& operator=(const Metalinker&);
 
   void queryEntry
   (std::vector<SharedHandle<MetalinkEntry> >& queryResult,
@@ -71,10 +68,7 @@ public:
     return entries_;
   }
 
-  void addEntry(const SharedHandle<MetalinkEntry>& entry)
-  {
-    entries_.push_back(entry);
-  }
+  void addEntry(const SharedHandle<MetalinkEntry>& entry);
 };
 
 } // namespace aria2
diff --git a/src/MultiDiskAdaptor.cc b/src/MultiDiskAdaptor.cc
index f9d899d4..3e574613 100644
--- a/src/MultiDiskAdaptor.cc
+++ b/src/MultiDiskAdaptor.cc
@@ -144,6 +144,8 @@ MultiDiskAdaptor::MultiDiskAdaptor():
   directIOAllowed_(false),
   readOnly_(false) {}
 
+MultiDiskAdaptor::~MultiDiskAdaptor() {}
+
 namespace {
 SharedHandle<DiskWriterEntry> createDiskWriterEntry
 (const SharedHandle<FileEntry>& fileEntry,
diff --git a/src/MultiDiskAdaptor.h b/src/MultiDiskAdaptor.h
index 34f1b1ce..6be2f634 100644
--- a/src/MultiDiskAdaptor.h
+++ b/src/MultiDiskAdaptor.h
@@ -137,6 +137,7 @@ private:
 
 public:
   MultiDiskAdaptor();
+  ~MultiDiskAdaptor();
 
   virtual void initAndOpenFile();
 
diff --git a/src/NameMatchOptionHandler.cc b/src/NameMatchOptionHandler.cc
new file mode 100644
index 00000000..0917c4b7
--- /dev/null
+++ b/src/NameMatchOptionHandler.cc
@@ -0,0 +1,91 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "NameMatchOptionHandler.h"
+
+#include <algorithm>
+
+#include "OptionHandlerException.h"
+#include "a2functional.h"
+#include "Option.h"
+
+namespace aria2 {
+
+NameMatchOptionHandler::NameMatchOptionHandler
+(const std::string& optName,
+ const std::string& description,
+ const std::string& defaultValue,
+ ARG_TYPE argType,
+ char shortName)
+  : optName_(optName),
+    description_(description),
+    defaultValue_(defaultValue),
+    id_(0),
+    argType_(argType),
+    shortName_(shortName),
+    hidden_(false)
+{}
+
+NameMatchOptionHandler::~NameMatchOptionHandler() {}
+  
+bool NameMatchOptionHandler::canHandle(const std::string& optName)
+{
+  return optName_ == optName;
+}
+
+void NameMatchOptionHandler::parse(Option& option, const std::string& arg)
+{
+  try {
+    parseArg(option, arg);
+  } catch(Exception& e) {
+    throw OPTION_HANDLER_EXCEPTION2(optName_, e);
+  }
+}
+
+bool NameMatchOptionHandler::hasTag(const std::string& tag) const
+{
+  return std::find(tags_.begin(), tags_.end(), tag) != tags_.end();
+}
+
+void NameMatchOptionHandler::addTag(const std::string& tag)
+{
+  tags_.push_back(tag);
+}
+
+std::string NameMatchOptionHandler::toTagString() const
+{
+  return strjoin(tags_.begin(), tags_.end(), ", ");
+}
+
+} // namespace aria2
diff --git a/src/NameMatchOptionHandler.h b/src/NameMatchOptionHandler.h
index 2770ac51..8eddb549 100644
--- a/src/NameMatchOptionHandler.h
+++ b/src/NameMatchOptionHandler.h
@@ -37,17 +37,9 @@
 
 #include "OptionHandler.h"
 
-#include <strings.h>
-
-#include <algorithm>
-#include <sstream>
-#include <iterator>
 #include <vector>
 
 #include "A2STR.h"
-#include "util.h"
-#include "OptionHandlerException.h"
-#include "a2functional.h"
 
 #define NO_DESCRIPTION A2STR::NIL
 #define NO_DEFAULT_VALUE A2STR::NIL
@@ -80,45 +72,19 @@ public:
                          const std::string& description = NO_DESCRIPTION,
                          const std::string& defaultValue = NO_DEFAULT_VALUE,
                          ARG_TYPE argType = REQ_ARG,
-                         char shortName = 0):
-    optName_(optName),
-    description_(description),
-    defaultValue_(defaultValue),
-    id_(0),
-    argType_(argType),
-    shortName_(shortName),
-    hidden_(false) {}
+                         char shortName = 0);
 
-  virtual ~NameMatchOptionHandler() {}
+  virtual ~NameMatchOptionHandler();
   
-  virtual bool canHandle(const std::string& optName)
-  {
-    return strcasecmp(optName_.c_str(), optName.c_str()) == 0;
-  }
+  virtual bool canHandle(const std::string& optName);
 
-  virtual void parse(Option& option, const std::string& arg)
-  {
-    try {
-      parseArg(option, arg);
-    } catch(Exception& e) {
-      throw OPTION_HANDLER_EXCEPTION2(optName_, e);
-    }
-  }
+  virtual void parse(Option& option, const std::string& arg);
 
-  virtual bool hasTag(const std::string& tag) const
-  {
-    return std::find(tags_.begin(), tags_.end(), tag) != tags_.end();
-  }
+  virtual bool hasTag(const std::string& tag) const;
 
-  virtual void addTag(const std::string& tag)
-  {
-    tags_.push_back(tag);
-  }
+  virtual void addTag(const std::string& tag);
 
-  virtual std::string toTagString() const
-  {
-    return strjoin(tags_.begin(), tags_.end(), ", ");
-  }
+  virtual std::string toTagString() const;
 
   virtual const std::string& getName() const
   {
diff --git a/src/Netrc.cc b/src/Netrc.cc
index 99e0eb8d..43a39057 100644
--- a/src/Netrc.cc
+++ b/src/Netrc.cc
@@ -44,6 +44,70 @@
 
 namespace aria2 {
 
+Authenticator::Authenticator() {}
+
+Authenticator::Authenticator
+(const std::string& machine,
+ const std::string& login,
+ const std::string& password,
+ const std::string& account)
+  : machine_(machine),
+    login_(login),
+    password_(password),
+    account_(account)
+{}
+
+Authenticator::~Authenticator() {}
+
+bool Authenticator::match(const std::string& hostname) const
+{
+  if(util::isNumericHost(hostname)) {
+    return hostname == machine_;
+  } else {
+    if(util::startsWith(machine_, A2STR::DOT_C)) {
+      return util::endsWith(A2STR::DOT_C+hostname, machine_);
+    } else {
+      return hostname == machine_;
+    }
+  }
+}
+
+void Authenticator::setMachine(const std::string& machine)
+{
+  machine_ = machine;
+}
+
+void Authenticator::setLogin(const std::string& login)
+{
+  login_ = login;
+}
+
+void Authenticator::setPassword(const std::string& password)
+{
+  password_ = password;
+}
+
+void Authenticator::setAccount(const std::string& account)
+{
+  account_ = account;
+}
+
+DefaultAuthenticator::DefaultAuthenticator() {}
+
+DefaultAuthenticator::DefaultAuthenticator
+(const std::string& login,
+ const std::string& password,
+ const std::string& account)
+  : Authenticator(A2STR::NIL, login, password, account)
+{}
+
+DefaultAuthenticator::~DefaultAuthenticator() {}
+
+bool DefaultAuthenticator::match(const std::string& hostname) const
+{
+  return true;
+}
+
 const std::string Netrc::A2_MACHINE("machine");
 
 const std::string Netrc::A2_DEFAULT("default");
@@ -56,6 +120,15 @@ const std::string Netrc::A2_ACCOUNT("account");
 
 const std::string Netrc::A2_MACDEF("macdef");
 
+Netrc::Netrc() {}
+
+Netrc::~Netrc() {}
+
+void Netrc::addAuthenticator(const SharedHandle<Authenticator>& authenticator)
+{
+  authenticators_.push_back(authenticator);
+}
+
 void Netrc::skipMacdef(std::ifstream& f) const
 {
   std::string line;
diff --git a/src/Netrc.h b/src/Netrc.h
index f29c7c94..be9e46fb 100644
--- a/src/Netrc.h
+++ b/src/Netrc.h
@@ -42,8 +42,6 @@
 #include <iosfwd>
 
 #include "SharedHandle.h"
-#include "A2STR.h"
-#include "util.h"
 
 namespace aria2 {
 
@@ -61,76 +59,57 @@ private:
   std::string password_;
   std::string account_;
 public:
-  Authenticator() {}
+  Authenticator();
 
   Authenticator(const std::string& machine,
                 const std::string& login,
                 const std::string& password,
-                const std::string& account)
-    :machine_(machine),
-     login_(login),
-     password_(password),
-     account_(account) {}
+                const std::string& account);
 
-  virtual ~Authenticator() {}
+  virtual ~Authenticator();
 
-  virtual bool match(const std::string& hostname) const
-  {
-    if(util::isNumericHost(hostname)) {
-      return hostname == machine_;
-    } else {
-      if(util::startsWith(machine_, A2STR::DOT_C)) {
-        return util::endsWith(A2STR::DOT_C+hostname, machine_);
-      } else {
-        return hostname == machine_;
-      }
-    }
-  }
+  virtual bool match(const std::string& hostname) const;
 
   const std::string& getMachine() const
   {
     return machine_;
   }
 
-  void setMachine(const std::string& machine) { machine_ = machine; }
+  void setMachine(const std::string& machine);
 
   const std::string& getLogin() const
   {
     return login_;
   }
 
-  void setLogin(const std::string& login) { login_ = login; }
+  void setLogin(const std::string& login);
 
   const std::string& getPassword() const
   {
     return password_;
   }
 
-  void setPassword(const std::string& password) { password_ = password; }
+  void setPassword(const std::string& password);
 
   const std::string& getAccount() const
   {
     return account_;
   }
 
-  void setAccount(const std::string& account) { account_ = account; }
+  void setAccount(const std::string& account);
 };
 
 class DefaultAuthenticator : public Authenticator {
 public:
-  DefaultAuthenticator() {}
+  DefaultAuthenticator();
 
   DefaultAuthenticator(const std::string& login,
                        const std::string& password,
-                       const std::string& account)
-    :Authenticator(A2STR::NIL, login, password, account) {}
+                       const std::string& account);
 
-  virtual ~DefaultAuthenticator() {}
+  virtual ~DefaultAuthenticator();
 
-  virtual bool match(const std::string& hostname) const
-  {
-    return true;
-  }
+  virtual bool match(const std::string& hostname) const;
 };
 
 class Netrc {
@@ -143,7 +122,9 @@ private:
   
   void skipMacdef(std::ifstream& f) const;
 public:
-  Netrc() {}
+  Netrc();
+
+  ~Netrc();
 
   void parse(const std::string& path);
 
@@ -155,10 +136,7 @@ public:
     return authenticators_;
   }
 
-  void addAuthenticator(const SharedHandle<Authenticator>& authenticator)
-  {
-    authenticators_.push_back(authenticator);
-  }
+  void addAuthenticator(const SharedHandle<Authenticator>& authenticator);
 
   static const std::string A2_MACHINE;
 
diff --git a/src/NumberDecorator.h b/src/NumberDecorator.h
index 18f3fe0a..4d3f5aaf 100644
--- a/src/NumberDecorator.h
+++ b/src/NumberDecorator.h
@@ -39,8 +39,6 @@
 
 #include <string>
 
-#include "SharedHandle.h"
-
 namespace aria2 {
 
 class NumberDecorator {
diff --git a/src/Option.cc b/src/Option.cc
index 351ce328..579d7e73 100644
--- a/src/Option.cc
+++ b/src/Option.cc
@@ -112,4 +112,14 @@ void Option::clear()
   table_.clear();
 }
 
+std::map<std::string, std::string>::const_iterator Option::begin() const
+{
+  return table_.begin();
+}
+
+std::map<std::string, std::string>::const_iterator Option::end() const
+{
+  return table_.end();
+}
+
 } // namespace aria2
diff --git a/src/Option.h b/src/Option.h
index 53656cb6..7770859f 100644
--- a/src/Option.h
+++ b/src/Option.h
@@ -65,15 +65,9 @@ public:
 
   void clear();
 
-  std::map<std::string, std::string>::const_iterator begin() const
-  {
-    return table_.begin();
-  }
+  std::map<std::string, std::string>::const_iterator begin() const;
 
-  std::map<std::string, std::string>::const_iterator end() const
-  {
-    return table_.end();
-  }
+  std::map<std::string, std::string>::const_iterator end() const;
 };
 
 } // namespace aria2
diff --git a/src/OptionHandlerImpl.cc b/src/OptionHandlerImpl.cc
new file mode 100644
index 00000000..90186d1c
--- /dev/null
+++ b/src/OptionHandlerImpl.cc
@@ -0,0 +1,728 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "OptionHandlerImpl.h"
+
+#include <cassert>
+#include <cstdio>
+#include <utility>
+#include <algorithm>
+#include <numeric>
+#include <sstream>
+#include <iterator>
+#include <vector>
+
+#include "util.h"
+#include "DlAbortEx.h"
+#include "prefs.h"
+#include "Option.h"
+#include "StringFormat.h"
+#include "A2STR.h"
+#include "Request.h"
+#include "a2functional.h"
+#include "message.h"
+#include "File.h"
+#include "FileEntry.h"
+#include "a2io.h"
+
+namespace aria2 {
+
+NullOptionHandler::~NullOptionHandler() {}
+
+bool NullOptionHandler::canHandle(const std::string& optName) { return true; }
+
+void NullOptionHandler::parse(Option& option, const std::string& arg) {}
+
+bool NullOptionHandler::hasTag(const std::string& tag) const { return false; }
+
+void NullOptionHandler::addTag(const std::string& tag) {}
+
+std::string NullOptionHandler::toTagString() const { return A2STR::NIL; }
+
+const std::string& NullOptionHandler::getName() const { return A2STR::NIL; }
+
+const std::string& NullOptionHandler::getDescription() const
+{
+  return A2STR::NIL;
+}
+
+const std::string& NullOptionHandler::getDefaultValue() const
+{
+  return A2STR::NIL;
+}
+
+std::string NullOptionHandler::createPossibleValuesString() const
+{
+  return A2STR::NIL;
+}
+
+bool NullOptionHandler::isHidden() const
+{
+  return true;
+}
+
+void NullOptionHandler::hide() {}
+
+OptionHandler::ARG_TYPE NullOptionHandler::getArgType() const
+{
+  return OptionHandler::NO_ARG;
+}
+
+int NullOptionHandler::getOptionID() const
+{
+  return id_;
+}
+
+void NullOptionHandler::setOptionID(int id)
+{
+  id_ = id;
+}
+
+char NullOptionHandler::getShortName() const
+{
+  return 0;
+}
+
+BooleanOptionHandler::BooleanOptionHandler
+(const std::string& optName,
+ const std::string& description,
+ const std::string& defaultValue,
+ OptionHandler::ARG_TYPE argType,
+ char shortName)
+  : NameMatchOptionHandler(optName, description, defaultValue,
+                           argType, shortName)
+{}
+
+BooleanOptionHandler::~BooleanOptionHandler() {}
+
+void BooleanOptionHandler::parseArg(Option& option, const std::string& optarg)
+{
+  if(optarg == "true" ||
+     ((argType_ == OptionHandler::OPT_ARG ||
+       argType_ == OptionHandler::NO_ARG)
+      && optarg.empty())) {
+    option.put(optName_, A2_V_TRUE);
+  } else if(optarg == "false") {
+    option.put(optName_, A2_V_FALSE);
+  } else {
+    std::string msg = optName_;
+    strappend(msg, " ", _("must be either 'true' or 'false'."));
+    throw DL_ABORT_EX(msg);
+  }
+}
+
+std::string BooleanOptionHandler::createPossibleValuesString() const
+{
+  return "true,false";
+}
+
+IntegerRangeOptionHandler::IntegerRangeOptionHandler
+(const std::string& optName,
+ const std::string& description,
+ const std::string& defaultValue,
+ int32_t min, int32_t max,
+ char shortName)
+  : NameMatchOptionHandler(optName, description, defaultValue,
+                           OptionHandler::REQ_ARG, shortName),
+    min_(min),
+    max_(max)
+{}
+
+IntegerRangeOptionHandler::~IntegerRangeOptionHandler() {}
+
+void IntegerRangeOptionHandler::parseArg
+(Option& option, const std::string& optarg)
+{
+  IntSequence seq = util::parseIntRange(optarg);
+  while(seq.hasNext()) {
+    int32_t v = seq.next();
+    if(v < min_ || max_ < v) {
+      std::string msg = optName_;
+      strappend(msg, " ", _("must be between %s and %s."));
+      throw DL_ABORT_EX
+        (StringFormat(msg.c_str(), util::itos(min_).c_str(),
+                      util::itos(max_).c_str()).str());
+    }
+    option.put(optName_, optarg);
+  }
+}
+
+std::string IntegerRangeOptionHandler::createPossibleValuesString() const
+{
+  return util::itos(min_)+"-"+util::itos(max_);
+}
+
+NumberOptionHandler::NumberOptionHandler
+(const std::string& optName,
+ const std::string& description,
+ const std::string& defaultValue,
+ int64_t min,
+ int64_t max,
+ char shortName)
+  : NameMatchOptionHandler(optName, description, defaultValue,
+                           OptionHandler::REQ_ARG, shortName),
+    min_(min),
+    max_(max)
+{}
+
+NumberOptionHandler::~NumberOptionHandler() {}
+
+void NumberOptionHandler::parseArg(Option& option, const std::string& optarg)
+{
+  int64_t num = util::parseLLInt(optarg);
+  parseArg(option, num);
+}
+
+void NumberOptionHandler::parseArg(Option& option, int64_t number)
+{
+  if((min_ == -1 || min_ <= number) && (max_ ==  -1 || number <= max_)) {
+    option.put(optName_, util::itos(number));
+  } else {
+    std::string msg = optName_;
+    msg += " ";
+    if(min_ == -1 && max_ != -1) {
+      msg += StringFormat(_("must be smaller than or equal to %s."),
+                          util::itos(max_).c_str()).str();
+    } else if(min_ != -1 && max_ != -1) {
+      msg += StringFormat(_("must be between %s and %s."),
+                          util::itos(min_).c_str(),
+                          util::itos(max_).c_str()).str();
+    } else if(min_ != -1 && max_ == -1) {
+      msg += StringFormat(_("must be greater than or equal to %s."),
+                          util::itos(min_).c_str()).str();
+    } else {
+      msg += _("must be a number.");
+    }
+    throw DL_ABORT_EX(msg);
+  }
+}
+
+std::string NumberOptionHandler::createPossibleValuesString() const
+{
+  std::string values;
+  if(min_ == -1) {
+    values += "*";
+  } else {
+    values += util::itos(min_);
+  }
+  values += "-";
+  if(max_ == -1) {
+    values += "*";
+  } else {
+    values += util::itos(max_);
+  }
+  return values;
+}
+
+UnitNumberOptionHandler::UnitNumberOptionHandler
+(const std::string& optName,
+ const std::string& description,
+ const std::string& defaultValue,
+ int64_t min,
+ int64_t max,
+ char shortName)
+  : NumberOptionHandler(optName, description, defaultValue, min, max,
+                        shortName)
+{}
+
+UnitNumberOptionHandler::~UnitNumberOptionHandler() {}
+
+void UnitNumberOptionHandler::parseArg
+(Option& option, const std::string& optarg)
+{
+  int64_t num = util::getRealSize(optarg);
+  NumberOptionHandler::parseArg(option, num);
+}
+
+FloatNumberOptionHandler::FloatNumberOptionHandler
+(const std::string& optName,
+ const std::string& description,
+ const std::string& defaultValue,
+ double min,
+ double max,
+ char shortName)
+  : NameMatchOptionHandler(optName, description, defaultValue,
+                           OptionHandler::REQ_ARG, shortName),
+    min_(min),
+    max_(max)
+{}
+
+FloatNumberOptionHandler::~FloatNumberOptionHandler() {}
+
+void FloatNumberOptionHandler::parseArg
+(Option& option, const std::string& optarg)
+{
+  double number = strtod(optarg.c_str(), 0);
+  if((min_ < 0 || min_ <= number) && (max_ < 0 || number <= max_)) {
+    option.put(optName_, optarg);
+  } else {
+    std::string msg = optName_;
+    msg += " ";
+    if(min_ < 0 && max_ >= 0) {
+      msg += StringFormat(_("must be smaller than or equal to %.1f."),
+                          max_).str();
+    } else if(min_ >= 0 && max_ >= 0) {
+      msg += StringFormat(_("must be between %.1f and %.1f."),
+                          min_, max_).str();
+    } else if(min_ >= 0 && max_ < 0) {
+      msg += StringFormat(_("must be greater than or equal to %.1f."),
+                          min_).str();
+    } else {
+      msg += _("must be a number.");
+    }
+    throw DL_ABORT_EX(msg);
+  }
+}
+
+std::string FloatNumberOptionHandler::createPossibleValuesString() const
+{
+  std::string valuesString;
+  if(min_ < 0) {
+    valuesString += "*";
+  } else {
+    char buf[11];
+    snprintf(buf, sizeof(buf), "%.1f", min_);
+    valuesString += buf;
+  }
+  valuesString += "-";
+  if(max_ < 0) {
+    valuesString += "*";
+  } else {
+    char buf[11];
+    snprintf(buf, sizeof(buf), "%.1f", max_);
+    valuesString += buf;
+  }
+  return valuesString;
+}
+
+DefaultOptionHandler::DefaultOptionHandler
+(const std::string& optName,
+ const std::string& description,
+ const std::string& defaultValue,
+ const std::string& possibleValuesString,
+ OptionHandler::ARG_TYPE argType,
+ char shortName)
+  : NameMatchOptionHandler(optName, description, defaultValue, argType,
+                           shortName),
+    possibleValuesString_(possibleValuesString)
+{}
+
+DefaultOptionHandler::~DefaultOptionHandler() {}
+
+void DefaultOptionHandler::parseArg(Option& option, const std::string& optarg)
+{
+  option.put(optName_, optarg);
+}
+
+std::string DefaultOptionHandler::createPossibleValuesString() const
+{
+  return possibleValuesString_;
+}
+
+CumulativeOptionHandler::CumulativeOptionHandler
+(const std::string& optName,
+ const std::string& description,
+ const std::string& defaultValue,
+ const std::string& delim,
+ const std::string& possibleValuesString,
+ OptionHandler::ARG_TYPE argType,
+ char shortName)
+  : NameMatchOptionHandler(optName, description, defaultValue, argType,
+                           shortName),
+    delim_(delim),
+    possibleValuesString_(possibleValuesString)
+{}
+
+CumulativeOptionHandler::~CumulativeOptionHandler() {}
+
+void CumulativeOptionHandler::parseArg
+(Option& option, const std::string& optarg)
+{
+  std::string value = option.get(optName_);
+  strappend(value, optarg, delim_);
+  option.put(optName_, value);
+}
+
+std::string CumulativeOptionHandler::createPossibleValuesString() const
+{
+  return possibleValuesString_;
+}
+
+IndexOutOptionHandler::IndexOutOptionHandler
+(const std::string& optName,
+ const std::string& description,
+ char shortName)
+  : NameMatchOptionHandler(optName, description, NO_DEFAULT_VALUE,
+                           OptionHandler::REQ_ARG, shortName)
+{}
+
+IndexOutOptionHandler::~IndexOutOptionHandler() {}
+
+void IndexOutOptionHandler::parseArg(Option& option, const std::string& optarg)
+{
+  // See optarg is in the fomrat of "INDEX=PATH"
+  util::parseIndexPath(optarg);
+  std::string value = option.get(optName_);
+  strappend(value, optarg, "\n");
+  option.put(optName_, value);
+}
+
+std::string IndexOutOptionHandler::createPossibleValuesString() const
+{
+  return "INDEX=PATH";
+}
+
+ParameterOptionHandler::ParameterOptionHandler
+(const std::string& optName,
+ const std::string& description,
+ const std::string& defaultValue,
+ const std::vector<std::string>& validParamValues,
+ char shortName)
+  : NameMatchOptionHandler(optName, description, defaultValue,
+                           OptionHandler::REQ_ARG, shortName),
+    validParamValues_(validParamValues)
+{}
+
+ParameterOptionHandler::ParameterOptionHandler
+(const std::string& optName,
+ const std::string& description,
+ const std::string& defaultValue,
+ const std::string& validParamValue,
+ char shortName)
+  : NameMatchOptionHandler(optName, description, defaultValue,
+                           OptionHandler::REQ_ARG, shortName)
+{
+  validParamValues_.push_back(validParamValue);
+}
+
+ParameterOptionHandler::ParameterOptionHandler
+(const std::string& optName,
+ const std::string& description,
+ const std::string& defaultValue,
+ const std::string& validParamValue1,
+ const std::string& validParamValue2,
+ char shortName)
+  : NameMatchOptionHandler(optName, description, defaultValue,
+                           OptionHandler::REQ_ARG, shortName)
+{
+  validParamValues_.push_back(validParamValue1);
+  validParamValues_.push_back(validParamValue2);
+}
+
+ParameterOptionHandler::ParameterOptionHandler
+(const std::string& optName,
+ const std::string& description,
+ const std::string& defaultValue,
+ const std::string& validParamValue1,
+ const std::string& validParamValue2,
+ const std::string& validParamValue3,
+ char shortName)
+  : NameMatchOptionHandler(optName, description, defaultValue,
+                           OptionHandler::REQ_ARG, shortName)
+{
+  validParamValues_.push_back(validParamValue1);
+  validParamValues_.push_back(validParamValue2);
+  validParamValues_.push_back(validParamValue3);
+}
+   
+ParameterOptionHandler::~ParameterOptionHandler() {}
+
+void ParameterOptionHandler::parseArg(Option& option, const std::string& optarg)
+{
+  std::vector<std::string>::const_iterator itr =
+    std::find(validParamValues_.begin(), validParamValues_.end(), optarg);
+  if(itr == validParamValues_.end()) {
+    std::string msg = optName_;
+    strappend(msg, " ", _("must be one of the following:"));
+    if(validParamValues_.size() == 0) {
+      msg += "''";
+    } else {
+      for(std::vector<std::string>::const_iterator itr =
+            validParamValues_.begin(), eoi = validParamValues_.end();
+          itr != eoi; ++itr) {
+        strappend(msg, "'", *itr, "' ");
+      }
+    }
+    throw DL_ABORT_EX(msg);
+  } else {
+    option.put(optName_, optarg);
+  }
+}
+
+std::string ParameterOptionHandler::createPossibleValuesString() const
+{
+  std::stringstream s;
+  std::copy(validParamValues_.begin(), validParamValues_.end(),
+            std::ostream_iterator<std::string>(s, ","));
+  return util::strip(s.str(), ", ");
+}
+
+HostPortOptionHandler::HostPortOptionHandler
+(const std::string& optName,
+ const std::string& description,
+ const std::string& defaultValue,
+ const std::string& hostOptionName,
+ const std::string& portOptionName,
+ char shortName)
+  : NameMatchOptionHandler(optName, description, defaultValue,
+                           OptionHandler::REQ_ARG, shortName),
+    hostOptionName_(hostOptionName),
+    portOptionName_(portOptionName)
+{}
+
+HostPortOptionHandler::~HostPortOptionHandler() {}
+
+void HostPortOptionHandler::parseArg(Option& option, const std::string& optarg)
+{
+  std::string uri = "http://";
+  uri += optarg;
+  Request req;
+  if(!req.setUri(uri)) {
+    throw DL_ABORT_EX(_("Unrecognized format"));
+  }
+  option.put(optName_, optarg);
+  setHostAndPort(option, req.getHost(), req.getPort());
+}
+
+void HostPortOptionHandler::setHostAndPort
+(Option& option, const std::string& hostname, uint16_t port)
+{
+  option.put(hostOptionName_, hostname);
+  option.put(portOptionName_, util::uitos(port));
+}
+
+std::string HostPortOptionHandler::createPossibleValuesString() const
+{
+  return "HOST:PORT";
+}
+
+HttpProxyUserOptionHandler::HttpProxyUserOptionHandler
+(const std::string& optName,
+ const std::string& description,
+ const std::string& defaultValue,
+ char shortName)
+  : NameMatchOptionHandler(optName, description, defaultValue,
+                           OptionHandler::REQ_ARG, shortName)
+{}
+
+void HttpProxyUserOptionHandler::parseArg
+(Option& option, const std::string& optarg)
+{
+  if(util::endsWith(optName_, "-user")) {
+    const std::string proxyPref = optName_.substr(0, optName_.size()-5);
+    const std::string& olduri = option.get(proxyPref);
+    if(!olduri.empty()) {
+      Request req;
+      bool b = req.setUri(olduri);
+      assert(b);
+      std::string uri = "http://";
+      if(!optarg.empty()) {
+        uri += util::percentEncode(optarg);
+      }
+      if(req.hasPassword()) {
+        uri += A2STR::COLON_C;
+        uri += util::percentEncode(req.getPassword());
+      }
+      if(uri.size() > 7) {
+        uri += "@";
+      }
+      strappend(uri, req.getHost(),A2STR::COLON_C,util::uitos(req.getPort()));
+      option.put(proxyPref, uri);
+    }
+  }
+  option.put(optName_, optarg);
+}
+
+std::string HttpProxyUserOptionHandler::createPossibleValuesString() const
+{
+  return "";
+}
+
+HttpProxyPasswdOptionHandler::HttpProxyPasswdOptionHandler
+(const std::string& optName,
+ const std::string& description,
+ const std::string& defaultValue,
+ char shortName)
+  : NameMatchOptionHandler(optName, description, defaultValue,
+                           OptionHandler::REQ_ARG, shortName)
+{}
+
+void HttpProxyPasswdOptionHandler::parseArg
+(Option& option, const std::string& optarg)
+{
+  if(util::endsWith(optName_, "-passwd")) {
+    const std::string proxyPref = optName_.substr(0, optName_.size()-7);
+    const std::string& olduri = option.get(proxyPref);
+    if(!olduri.empty()) {
+      Request req;
+      bool b = req.setUri(olduri);
+      assert(b);
+      std::string uri = "http://";
+      if(!req.getUsername().empty()) {
+        uri += util::percentEncode(req.getUsername());
+      }
+      uri += A2STR::COLON_C;
+      if(!optarg.empty()) {
+        uri += util::percentEncode(optarg);
+      }
+      if(uri.size() > 7) {
+        uri += "@";
+      }
+      strappend(uri, req.getHost(), A2STR::COLON_C,util::itos(req.getPort()));
+      option.put(proxyPref, uri);
+    }
+  }
+  option.put(optName_, optarg);
+}
+
+std::string HttpProxyPasswdOptionHandler::createPossibleValuesString() const
+{
+  return "";
+}
+
+HttpProxyOptionHandler::HttpProxyOptionHandler
+(const std::string& optName,
+ const std::string& description,
+ const std::string& defaultValue,
+ char shortName)
+  : NameMatchOptionHandler(optName, description, defaultValue,
+                           OptionHandler::REQ_ARG, shortName),
+    proxyUserPref_(optName_+"-user"),
+    proxyPasswdPref_(optName_+"-passwd")
+{}
+
+HttpProxyOptionHandler::~HttpProxyOptionHandler() {}
+
+void HttpProxyOptionHandler::parseArg(Option& option, const std::string& optarg)
+{
+  if(optarg.empty()) {
+    option.put(optName_, optarg);
+  } else {
+    Request req;
+    std::string uri;
+    if(util::startsWith(optarg, "http://")) {
+      uri = optarg;
+    } else {
+      uri = "http://"+optarg;
+    }
+    if(!req.setUri(uri)) {
+      throw DL_ABORT_EX(_("unrecognized proxy format"));
+    }
+    uri = "http://";
+    if(req.getUsername().empty()) {
+      if(option.defined(proxyUserPref_)) {
+        uri += util::percentEncode(option.get(proxyUserPref_));
+      }
+    } else {
+      uri += util::percentEncode(req.getUsername());
+    }
+    if(!req.hasPassword()) {
+      if(option.defined(proxyPasswdPref_)) {
+        uri += A2STR::COLON_C;
+        uri += util::percentEncode(option.get(proxyPasswdPref_));
+      }
+    } else {
+      uri += A2STR::COLON_C;
+      uri += util::percentEncode(req.getPassword());
+    }
+    if(uri.size() > 7) {
+      uri += "@";
+    }
+    strappend(uri, req.getHost(), A2STR::COLON_C, util::uitos(req.getPort()));
+    option.put(optName_, uri);
+  }
+}
+
+std::string HttpProxyOptionHandler::createPossibleValuesString() const
+{
+  return "[http://][USER:PASSWORD@]HOST[:PORT]";
+}
+
+LocalFilePathOptionHandler::LocalFilePathOptionHandler
+(const std::string& optName,
+ const std::string& description,
+ const std::string& defaultValue,
+ bool acceptStdin,
+ char shortName)
+  : NameMatchOptionHandler(optName, description, defaultValue,
+                           OptionHandler::REQ_ARG, shortName),
+    acceptStdin_(acceptStdin)
+{}
+
+void LocalFilePathOptionHandler::parseArg
+(Option& option, const std::string& optarg)
+{
+  if(acceptStdin_ && optarg == "-") {
+    option.put(optName_, DEV_STDIN);
+  } else {
+    File f(optarg);
+    if(!f.exists() || f.isDir()) {
+      throw DL_ABORT_EX
+        (StringFormat(MSG_NOT_FILE, optarg.c_str()).str());
+    }
+    option.put(optName_, optarg);
+  }
+}
+  
+std::string LocalFilePathOptionHandler::createPossibleValuesString() const
+{
+  return "/path/to/file";
+}
+
+PrioritizePieceOptionHandler::PrioritizePieceOptionHandler
+(const std::string& optName,
+ const std::string& description,
+ const std::string& defaultValue,
+ char shortName)
+  : NameMatchOptionHandler(optName, description, defaultValue,
+                           OptionHandler::REQ_ARG, shortName)
+{}
+
+void PrioritizePieceOptionHandler::parseArg
+(Option& option, const std::string& optarg)
+{
+  // Parse optarg against empty FileEntry list to detect syntax
+  // error.
+  std::vector<size_t> result;
+  util::parsePrioritizePieceRange
+    (result, optarg, std::vector<SharedHandle<FileEntry> >(), 1024);
+  option.put(optName_, optarg);
+}
+
+std::string PrioritizePieceOptionHandler::createPossibleValuesString() const
+{
+  return "head[=SIZE],tail[=SIZE]";
+}
+
+} // namespace aria2
diff --git a/src/OptionHandlerImpl.h b/src/OptionHandlerImpl.h
index 82c9460e..87e4b5ac 100644
--- a/src/OptionHandlerImpl.h
+++ b/src/OptionHandlerImpl.h
@@ -37,78 +37,34 @@
 
 #include "OptionHandler.h"
 
-#include <cassert>
-#include <cstdio>
-#include <utility>
-#include <algorithm>
-#include <numeric>
-#include <sstream>
-#include <iterator>
 #include <vector>
 
 #include "NameMatchOptionHandler.h"
-#include "util.h"
-#include "DlAbortEx.h"
-#include "prefs.h"
-#include "Option.h"
-#include "StringFormat.h"
-#include "A2STR.h"
-#include "Request.h"
-#include "a2functional.h"
-#include "message.h"
-#include "File.h"
-#include "FileEntry.h"
-#include "a2io.h"
 
 namespace aria2 {
 
+class Option;
+
 class NullOptionHandler : public OptionHandler {
 private:
   int id_;
 public:
-  virtual ~NullOptionHandler() {}
-
-  virtual bool canHandle(const std::string& optName) { return true; }
-
-  virtual void parse(Option& option, const std::string& arg) {}
-
-  virtual bool hasTag(const std::string& tag) const { return false; }
-
-  virtual void addTag(const std::string& tag) {}
-
-  virtual std::string toTagString() const { return A2STR::NIL; }
-
-  virtual const std::string& getName() const { return A2STR::NIL; }
-
-  virtual const std::string& getDescription() const { return A2STR::NIL; }
-
-  virtual const std::string& getDefaultValue() const { return A2STR::NIL; }
-
-  virtual std::string createPossibleValuesString() const { return A2STR::NIL; }
-
-  virtual bool isHidden() const { return true; }
-
-  virtual void hide() {}
-
-  virtual OptionHandler::ARG_TYPE getArgType() const
-  {
-    return OptionHandler::NO_ARG;
-  }
-
-  virtual int getOptionID() const
-  {
-    return id_;
-  }
-
-  virtual void setOptionID(int id)
-  {
-    id_ = id;
-  }
-
-  virtual char getShortName() const
-  {
-    return 0;
-  }
+  virtual ~NullOptionHandler();
+  virtual bool canHandle(const std::string& optName);
+  virtual void parse(Option& option, const std::string& arg);
+  virtual bool hasTag(const std::string& tag) const;
+  virtual void addTag(const std::string& tag);
+  virtual std::string toTagString() const;
+  virtual const std::string& getName() const;
+  virtual const std::string& getDescription() const;
+  virtual const std::string& getDefaultValue() const;
+  virtual std::string createPossibleValuesString() const;
+  virtual bool isHidden() const;
+  virtual void hide();
+  virtual OptionHandler::ARG_TYPE getArgType() const;
+  virtual int getOptionID() const;
+  virtual void setOptionID(int id);
+  virtual char getShortName() const;
 };
 
 class BooleanOptionHandler : public NameMatchOptionHandler {
@@ -117,32 +73,10 @@ public:
                        const std::string& description = NO_DESCRIPTION,
                        const std::string& defaultValue = NO_DEFAULT_VALUE,
                        OptionHandler::ARG_TYPE argType = OptionHandler::REQ_ARG,
-                       char shortName = 0):
-    NameMatchOptionHandler(optName, description, defaultValue,
-                           argType, shortName) {}
-
-  virtual ~BooleanOptionHandler() {}
-
-  virtual void parseArg(Option& option, const std::string& optarg)
-  {
-    if(optarg == "true" ||
-       ((argType_ == OptionHandler::OPT_ARG ||
-         argType_ == OptionHandler::NO_ARG)
-        && optarg.empty())) {
-      option.put(optName_, A2_V_TRUE);
-    } else if(optarg == "false") {
-      option.put(optName_, A2_V_FALSE);
-    } else {
-      std::string msg = optName_;
-      strappend(msg, " ", _("must be either 'true' or 'false'."));
-      throw DL_ABORT_EX(msg);
-    }
-  }
-
-  virtual std::string createPossibleValuesString() const
-  {
-    return "true,false";
-  }
+                       char shortName = 0);
+  virtual ~BooleanOptionHandler();
+  virtual void parseArg(Option& option, const std::string& optarg);
+  virtual std::string createPossibleValuesString() const;
 };
 
 class IntegerRangeOptionHandler : public NameMatchOptionHandler {
@@ -154,33 +88,10 @@ public:
                             const std::string& description,
                             const std::string& defaultValue,
                             int32_t min, int32_t max,
-                            char shortName = 0):
-    NameMatchOptionHandler(optName, description, defaultValue,
-                           OptionHandler::REQ_ARG, shortName),
-    min_(min), max_(max) {}
-
-  virtual ~IntegerRangeOptionHandler() {}
-
-  virtual void parseArg(Option& option, const std::string& optarg)
-  {
-    IntSequence seq = util::parseIntRange(optarg);
-    while(seq.hasNext()) {
-      int32_t v = seq.next();
-      if(v < min_ || max_ < v) {
-        std::string msg = optName_;
-        strappend(msg, " ", _("must be between %s and %s."));
-        throw DL_ABORT_EX
-          (StringFormat(msg.c_str(), util::itos(min_).c_str(),
-                        util::itos(max_).c_str()).str());
-      }
-      option.put(optName_, optarg);
-    }
-  }
-
-  virtual std::string createPossibleValuesString() const
-  {
-    return util::itos(min_)+"-"+util::itos(max_);
-  }
+                            char shortName = 0);
+  virtual ~IntegerRangeOptionHandler();
+  virtual void parseArg(Option& option, const std::string& optarg);
+  virtual std::string createPossibleValuesString() const;
 };
 
 class NumberOptionHandler : public NameMatchOptionHandler {
@@ -193,58 +104,12 @@ public:
                       const std::string& defaultValue = NO_DEFAULT_VALUE,
                       int64_t min = -1,
                       int64_t max = -1,
-                      char shortName = 0):
-    NameMatchOptionHandler(optName, description, defaultValue,
-                           OptionHandler::REQ_ARG, shortName),
-    min_(min), max_(max) {}
+                      char shortName = 0);
+  virtual ~NumberOptionHandler();
 
-  virtual ~NumberOptionHandler() {}
-
-  virtual void parseArg(Option& option, const std::string& optarg)
-  {
-    int64_t num = util::parseLLInt(optarg);
-    parseArg(option, num);
-  }
-
-  void parseArg(Option& option, int64_t number)
-  {
-    if((min_ == -1 || min_ <= number) && (max_ ==  -1 || number <= max_)) {
-      option.put(optName_, util::itos(number));
-    } else {
-      std::string msg = optName_;
-      msg += " ";
-      if(min_ == -1 && max_ != -1) {
-        msg += StringFormat(_("must be smaller than or equal to %s."),
-                            util::itos(max_).c_str()).str();
-      } else if(min_ != -1 && max_ != -1) {
-        msg += StringFormat(_("must be between %s and %s."),
-                            util::itos(min_).c_str(), util::itos(max_).c_str()).str();
-      } else if(min_ != -1 && max_ == -1) {
-        msg += StringFormat(_("must be greater than or equal to %s."),
-                            util::itos(min_).c_str()).str();
-      } else {
-        msg += _("must be a number.");
-      }
-      throw DL_ABORT_EX(msg);
-    }
-  }
-
-  virtual std::string createPossibleValuesString() const
-  {
-    std::string values;
-    if(min_ == -1) {
-      values += "*";
-    } else {
-      values += util::itos(min_);
-    }
-    values += "-";
-    if(max_ == -1) {
-      values += "*";
-    } else {
-      values += util::itos(max_);
-    }
-    return values;
-  }
+  virtual void parseArg(Option& option, const std::string& optarg);
+  void parseArg(Option& option, int64_t number);
+  virtual std::string createPossibleValuesString() const;
 };
 
 class UnitNumberOptionHandler : public NumberOptionHandler {
@@ -254,17 +119,9 @@ public:
                           const std::string& defaultValue = NO_DEFAULT_VALUE,
                           int64_t min = -1,
                           int64_t max = -1,
-                          char shortName = 0):
-    NumberOptionHandler(optName, description, defaultValue, min, max,
-                        shortName) {}
-
-  virtual ~UnitNumberOptionHandler() {}
-
-  virtual void parseArg(Option& option, const std::string& optarg)
-  {
-    int64_t num = util::getRealSize(optarg);
-    NumberOptionHandler::parseArg(option, num);
-  }
+                          char shortName = 0);
+  virtual ~UnitNumberOptionHandler();
+  virtual void parseArg(Option& option, const std::string& optarg);
 };
 
 class FloatNumberOptionHandler : public NameMatchOptionHandler {
@@ -276,57 +133,10 @@ public:
                            const std::string& description = NO_DESCRIPTION,
                            const std::string& defaultValue = NO_DEFAULT_VALUE,
                            double min = -1, double max = -1,
-                           char shortName = 0):
-    NameMatchOptionHandler(optName, description, defaultValue,
-                           OptionHandler::REQ_ARG, shortName),
-    min_(min), max_(max) {}
-
-  virtual ~FloatNumberOptionHandler() {}
-
-  virtual void parseArg(Option& option, const std::string& optarg)
-  {
-    double number = strtod(optarg.c_str(), 0);
-    if((min_ < 0 || min_ <= number) && (max_ < 0 || number <= max_)) {
-      option.put(optName_, optarg);
-    } else {
-      std::string msg = optName_;
-      msg += " ";
-      if(min_ < 0 && max_ >= 0) {
-        msg += StringFormat(_("must be smaller than or equal to %.1f."),
-                            max_).str();
-      } else if(min_ >= 0 && max_ >= 0) {
-        msg += StringFormat(_("must be between %.1f and %.1f."),
-                            min_, max_).str();
-      } else if(min_ >= 0 && max_ < 0) {
-        msg += StringFormat(_("must be greater than or equal to %.1f."),
-                            min_).str();
-      } else {
-        msg += _("must be a number.");
-      }
-      throw DL_ABORT_EX(msg);
-    }
-  }
-
-  virtual std::string createPossibleValuesString() const
-  {
-    std::string valuesString;
-    if(min_ < 0) {
-      valuesString += "*";
-    } else {
-      char buf[11];
-      snprintf(buf, sizeof(buf), "%.1f", min_);
-      valuesString += buf;
-    }
-    valuesString += "-";
-    if(max_ < 0) {
-      valuesString += "*";
-    } else {
-      char buf[11];
-      snprintf(buf, sizeof(buf), "%.1f", max_);
-      valuesString += buf;
-    }
-    return valuesString;
-  }
+                           char shortName = 0);
+  virtual ~FloatNumberOptionHandler();
+  virtual void parseArg(Option& option, const std::string& optarg);
+  virtual std::string createPossibleValuesString() const;
 };
 
 class DefaultOptionHandler : public NameMatchOptionHandler {
@@ -338,28 +148,15 @@ public:
                        const std::string& defaultValue = NO_DEFAULT_VALUE,
                        const std::string& possibleValuesString = A2STR::NIL,
                        OptionHandler::ARG_TYPE argType = OptionHandler::REQ_ARG,
-                       char shortName = 0):
-    NameMatchOptionHandler(optName, description, defaultValue, argType,
-                           shortName),
-    possibleValuesString_(possibleValuesString) {}
-
-  virtual ~DefaultOptionHandler() {}
-
-  virtual void parseArg(Option& option, const std::string& optarg)
-  {
-    option.put(optName_, optarg);
-  }
-
-  virtual std::string createPossibleValuesString() const
-  {
-    return possibleValuesString_;
-  }
+                       char shortName = 0);
+  virtual ~DefaultOptionHandler();
+  virtual void parseArg(Option& option, const std::string& optarg);
+  virtual std::string createPossibleValuesString() const;
 };
 
 class CumulativeOptionHandler : public NameMatchOptionHandler {
 private:
   std::string delim_;
-
   std::string possibleValuesString_;
 public:
   CumulativeOptionHandler(const std::string& optName,
@@ -369,25 +166,10 @@ public:
                           const std::string& possibleValuesString = A2STR::NIL,
                           OptionHandler::ARG_TYPE argType =
                           OptionHandler::REQ_ARG,
-                          char shortName = 0):
-    NameMatchOptionHandler(optName, description, defaultValue, argType,
-                           shortName),
-    delim_(delim),
-    possibleValuesString_(possibleValuesString) {}
-
-  virtual ~CumulativeOptionHandler() {}
-
-  virtual void parseArg(Option& option, const std::string& optarg)
-  {
-    std::string value = option.get(optName_);
-    strappend(value, optarg, delim_);
-    option.put(optName_, value);
-  }
-
-  virtual std::string createPossibleValuesString() const
-  {
-    return possibleValuesString_;
-  }
+                          char shortName = 0);
+  virtual ~CumulativeOptionHandler();
+  virtual void parseArg(Option& option, const std::string& optarg);
+  virtual std::string createPossibleValuesString() const;
 };
 
 class IndexOutOptionHandler : public NameMatchOptionHandler {
@@ -395,25 +177,10 @@ private:
 public:
   IndexOutOptionHandler(const std::string& optName,
                         const std::string& description,
-                        char shortName = 0):
-    NameMatchOptionHandler(optName, description, NO_DEFAULT_VALUE,
-                           OptionHandler::REQ_ARG, shortName) {}
-
-  virtual ~IndexOutOptionHandler() {}
-
-  virtual void parseArg(Option& option, const std::string& optarg)
-  {
-    // See optarg is in the fomrat of "INDEX=PATH"
-    util::parseIndexPath(optarg);
-    std::string value = option.get(optName_);
-    strappend(value, optarg, "\n");
-    option.put(optName_, value);
-  }
-
-  virtual std::string createPossibleValuesString() const
-  {
-    return "INDEX=PATH";
-  }
+                        char shortName = 0);
+  virtual ~IndexOutOptionHandler();
+  virtual void parseArg(Option& option, const std::string& optarg);
+  virtual std::string createPossibleValuesString() const;
 };
 
 class ParameterOptionHandler : public NameMatchOptionHandler {
@@ -424,87 +191,33 @@ public:
                          const std::string& description,
                          const std::string& defaultValue,
                          const std::vector<std::string>& validParamValues,
-                         char shortName = 0):
-    NameMatchOptionHandler(optName, description, defaultValue,
-                           OptionHandler::REQ_ARG, shortName),
-    validParamValues_(validParamValues) {}
-
+                         char shortName = 0);
   ParameterOptionHandler(const std::string& optName,
                          const std::string& description,
                          const std::string& defaultValue,
                          const std::string& validParamValue,
-                         char shortName = 0):
-    NameMatchOptionHandler(optName, description, defaultValue,
-                           OptionHandler::REQ_ARG, shortName)
-  {
-    validParamValues_.push_back(validParamValue);
-  }
-
+                         char shortName = 0);
   ParameterOptionHandler(const std::string& optName,
                          const std::string& description,
                          const std::string& defaultValue,
                          const std::string& validParamValue1,
                          const std::string& validParamValue2,
-                         char shortName = 0):
-    NameMatchOptionHandler(optName, description, defaultValue,
-                           OptionHandler::REQ_ARG, shortName)
-  {
-    validParamValues_.push_back(validParamValue1);
-    validParamValues_.push_back(validParamValue2);
-  }
-
+                         char shortName = 0);
   ParameterOptionHandler(const std::string& optName,
                          const std::string& description,
                          const std::string& defaultValue,
                          const std::string& validParamValue1,
                          const std::string& validParamValue2,
                          const std::string& validParamValue3,
-                         char shortName = 0):
-    NameMatchOptionHandler(optName, description, defaultValue,
-                           OptionHandler::REQ_ARG, shortName)
-  {
-    validParamValues_.push_back(validParamValue1);
-    validParamValues_.push_back(validParamValue2);
-    validParamValues_.push_back(validParamValue3);
-  }
-   
-  virtual ~ParameterOptionHandler() {}
-
-  virtual void parseArg(Option& option, const std::string& optarg)
-  {
-    std::vector<std::string>::const_iterator itr =
-      std::find(validParamValues_.begin(), validParamValues_.end(), optarg);
-    if(itr == validParamValues_.end()) {
-      std::string msg = optName_;
-      strappend(msg, " ", _("must be one of the following:"));
-      if(validParamValues_.size() == 0) {
-        msg += "''";
-      } else {
-        for(std::vector<std::string>::const_iterator itr =
-              validParamValues_.begin(), eoi = validParamValues_.end();
-            itr != eoi; ++itr) {
-          strappend(msg, "'", *itr, "' ");
-        }
-      }
-      throw DL_ABORT_EX(msg);
-    } else {
-      option.put(optName_, optarg);
-    }
-  }
-
-  virtual std::string createPossibleValuesString() const
-  {
-    std::stringstream s;
-    std::copy(validParamValues_.begin(), validParamValues_.end(),
-              std::ostream_iterator<std::string>(s, ","));
-    return util::strip(s.str(), ", ");
-  }
+                         char shortName = 0);
+  virtual ~ParameterOptionHandler();
+  virtual void parseArg(Option& option, const std::string& optarg);
+  virtual std::string createPossibleValuesString() const;
 };
 
 class HostPortOptionHandler : public NameMatchOptionHandler {
 private:
   std::string hostOptionName_;
-  
   std::string portOptionName_;
 public:
   HostPortOptionHandler(const std::string& optName,
@@ -512,37 +225,12 @@ public:
                         const std::string& defaultValue,
                         const std::string& hostOptionName,
                         const std::string& portOptionName,
-                        char shortName = 0):
-    NameMatchOptionHandler(optName, description, defaultValue,
-                           OptionHandler::REQ_ARG, shortName),
-    hostOptionName_(hostOptionName),
-    portOptionName_(portOptionName) {}
-
-  virtual ~HostPortOptionHandler() {}
-
-  virtual void parseArg(Option& option, const std::string& optarg)
-  {
-    std::string uri = "http://";
-    uri += optarg;
-    Request req;
-    if(!req.setUri(uri)) {
-      throw DL_ABORT_EX(_("Unrecognized format"));
-    }
-    option.put(optName_, optarg);
-    setHostAndPort(option, req.getHost(), req.getPort());
-  }
-
+                        char shortName = 0);
+  virtual ~HostPortOptionHandler();
+  virtual void parseArg(Option& option, const std::string& optarg);
   void setHostAndPort
-  (Option& option, const std::string& hostname, uint16_t port)
-  {
-    option.put(hostOptionName_, hostname);
-    option.put(portOptionName_, util::uitos(port));
-  }
-
-  virtual std::string createPossibleValuesString() const
-  {
-    return "HOST:PORT";
-  }
+  (Option& option, const std::string& hostname, uint16_t port);
+  virtual std::string createPossibleValuesString() const;
 };
 
 class HttpProxyUserOptionHandler:public NameMatchOptionHandler {
@@ -550,42 +238,9 @@ public:
   HttpProxyUserOptionHandler(const std::string& optName,
                              const std::string& description,
                              const std::string& defaultValue,
-                             char shortName = 0):
-    NameMatchOptionHandler(optName, description, defaultValue,
-                           OptionHandler::REQ_ARG, shortName)
-  {}
-
-  virtual void parseArg(Option& option, const std::string& optarg)
-  {
-    if(util::endsWith(optName_, "-user")) {
-      const std::string proxyPref = optName_.substr(0, optName_.size()-5);
-      const std::string& olduri = option.get(proxyPref);
-      if(!olduri.empty()) {
-        Request req;
-        bool b = req.setUri(olduri);
-        assert(b);
-        std::string uri = "http://";
-        if(!optarg.empty()) {
-          uri += util::percentEncode(optarg);
-        }
-        if(req.hasPassword()) {
-          uri += A2STR::COLON_C;
-          uri += util::percentEncode(req.getPassword());
-        }
-        if(uri.size() > 7) {
-          uri += "@";
-        }
-        strappend(uri, req.getHost(),A2STR::COLON_C,util::uitos(req.getPort()));
-        option.put(proxyPref, uri);
-      }
-    }
-    option.put(optName_, optarg);
-  }
-
-  virtual std::string createPossibleValuesString() const
-  {
-    return "";
-  }
+                             char shortName = 0);
+  virtual void parseArg(Option& option, const std::string& optarg);
+  virtual std::string createPossibleValuesString() const;
 };
 
 class HttpProxyPasswdOptionHandler:public NameMatchOptionHandler {
@@ -593,42 +248,9 @@ public:
   HttpProxyPasswdOptionHandler(const std::string& optName,
                                const std::string& description,
                                const std::string& defaultValue,
-                               char shortName = 0):
-    NameMatchOptionHandler(optName, description, defaultValue,
-                           OptionHandler::REQ_ARG, shortName)
-  {}
-
-  virtual void parseArg(Option& option, const std::string& optarg)
-  {
-    if(util::endsWith(optName_, "-passwd")) {
-      const std::string proxyPref = optName_.substr(0, optName_.size()-7);
-      const std::string& olduri = option.get(proxyPref);
-      if(!olduri.empty()) {
-        Request req;
-        bool b = req.setUri(olduri);
-        assert(b);
-        std::string uri = "http://";
-        if(!req.getUsername().empty()) {
-          uri += util::percentEncode(req.getUsername());
-        }
-        uri += A2STR::COLON_C;
-        if(!optarg.empty()) {
-          uri += util::percentEncode(optarg);
-        }
-        if(uri.size() > 7) {
-          uri += "@";
-        }
-        strappend(uri, req.getHost(), A2STR::COLON_C,util::itos(req.getPort()));
-        option.put(proxyPref, uri);
-      }
-    }
-    option.put(optName_, optarg);
-  }
-
-  virtual std::string createPossibleValuesString() const
-  {
-    return "";
-  }
+                               char shortName = 0);
+  virtual void parseArg(Option& option, const std::string& optarg);
+  virtual std::string createPossibleValuesString() const;
 };
 
 class HttpProxyOptionHandler : public NameMatchOptionHandler {
@@ -639,60 +261,10 @@ public:
   HttpProxyOptionHandler(const std::string& optName,
                          const std::string& description,
                          const std::string& defaultValue,
-                         char shortName = 0)
-    :
-    NameMatchOptionHandler(optName, description, defaultValue,
-                           OptionHandler::REQ_ARG, shortName),
-    proxyUserPref_(optName_+"-user"),
-    proxyPasswdPref_(optName_+"-passwd")
-  {}
-
-  virtual ~HttpProxyOptionHandler() {}
-
-  virtual void parseArg(Option& option, const std::string& optarg)
-  {
-    if(optarg.empty()) {
-      option.put(optName_, optarg);
-    } else {
-      Request req;
-      std::string uri;
-      if(util::startsWith(optarg, "http://")) {
-        uri = optarg;
-      } else {
-        uri = "http://"+optarg;
-      }
-      if(!req.setUri(uri)) {
-        throw DL_ABORT_EX(_("unrecognized proxy format"));
-      }
-      uri = "http://";
-      if(req.getUsername().empty()) {
-        if(option.defined(proxyUserPref_)) {
-          uri += util::percentEncode(option.get(proxyUserPref_));
-        }
-      } else {
-        uri += util::percentEncode(req.getUsername());
-      }
-      if(!req.hasPassword()) {
-        if(option.defined(proxyPasswdPref_)) {
-          uri += A2STR::COLON_C;
-          uri += util::percentEncode(option.get(proxyPasswdPref_));
-        }
-      } else {
-        uri += A2STR::COLON_C;
-        uri += util::percentEncode(req.getPassword());
-      }
-      if(uri.size() > 7) {
-        uri += "@";
-      }
-      strappend(uri, req.getHost(), A2STR::COLON_C, util::uitos(req.getPort()));
-      option.put(optName_, uri);
-    }
-  }
-
-  virtual std::string createPossibleValuesString() const
-  {
-    return "[http://][USER:PASSWORD@]HOST[:PORT]";
-  }
+                         char shortName = 0);
+  virtual ~HttpProxyOptionHandler();
+  virtual void parseArg(Option& option, const std::string& optarg);
+  virtual std::string createPossibleValuesString() const;
 };
 
 class LocalFilePathOptionHandler : public NameMatchOptionHandler {
@@ -704,30 +276,9 @@ public:
    const std::string& description = NO_DESCRIPTION,
    const std::string& defaultValue = NO_DEFAULT_VALUE,
    bool acceptStdin = false,
-   char shortName = 0):
-    NameMatchOptionHandler(optName, description, defaultValue,
-                           OptionHandler::REQ_ARG,
-                           shortName),
-    acceptStdin_(acceptStdin) {}
-
-  virtual void parseArg(Option& option, const std::string& optarg)
-  {
-    if(acceptStdin_ && optarg == "-") {
-      option.put(optName_, DEV_STDIN);
-    } else {
-      File f(optarg);
-      if(!f.exists() || f.isDir()) {
-        throw DL_ABORT_EX
-          (StringFormat(MSG_NOT_FILE, optarg.c_str()).str());
-      }
-      option.put(optName_, optarg);
-    }
-  }
-  
-  virtual std::string createPossibleValuesString() const
-  {
-    return "/path/to/file";
-  }
+   char shortName = 0);
+  virtual void parseArg(Option& option, const std::string& optarg);
+  virtual std::string createPossibleValuesString() const;
 };
 
 class PrioritizePieceOptionHandler:public NameMatchOptionHandler {
@@ -736,24 +287,9 @@ public:
   (const std::string& optName,
    const std::string& description = NO_DESCRIPTION,
    const std::string& defaultValue = NO_DEFAULT_VALUE,
-   char shortName = 0):
-    NameMatchOptionHandler(optName, description, defaultValue,
-                           OptionHandler::REQ_ARG, shortName) {}
-
-  virtual void parseArg(Option& option, const std::string& optarg)
-  {
-    // Parse optarg against empty FileEntry list to detect syntax
-    // error.
-    std::vector<size_t> result;
-    util::parsePrioritizePieceRange
-      (result, optarg, std::vector<SharedHandle<FileEntry> >(), 1024);
-    option.put(optName_, optarg);
-  }
-
-  virtual std::string createPossibleValuesString() const
-  {
-    return "head[=SIZE],tail[=SIZE]";
-  }
+   char shortName = 0);
+  virtual void parseArg(Option& option, const std::string& optarg);
+  virtual std::string createPossibleValuesString() const;
 };
 
 } // namespace aria2
diff --git a/src/OptionParser.cc b/src/OptionParser.cc
index be872d3e..6b38074f 100644
--- a/src/OptionParser.cc
+++ b/src/OptionParser.cc
@@ -48,6 +48,7 @@
 #include "a2functional.h"
 #include "array_fun.h"
 #include "OptionHandlerFactory.h"
+#include "DlAbortEx.h"
 
 namespace aria2 {
 
@@ -55,6 +56,8 @@ OptionParser::OptionParser():
   idCounter_(0)
 {}
 
+OptionParser::~OptionParser() {}
+
 namespace {
 template<typename InputIterator>
 size_t countPublicOption(InputIterator first, InputIterator last)
diff --git a/src/OptionParser.h b/src/OptionParser.h
index 13d1b827..d06e01d8 100644
--- a/src/OptionParser.h
+++ b/src/OptionParser.h
@@ -63,7 +63,7 @@ private:
 public:
   OptionParser();
 
-  ~OptionParser() {}
+  ~OptionParser();
 
   // Parses options in argv and writes option name and value to out in
   // NAME=VALUE format. Non-option strings are stored in nonopts.
diff --git a/src/PStringBuildVisitor.cc b/src/PStringBuildVisitor.cc
index 0c06c470..249bd1cc 100644
--- a/src/PStringBuildVisitor.cc
+++ b/src/PStringBuildVisitor.cc
@@ -36,10 +36,15 @@
 #include "PStringSegment.h"
 #include "PStringNumLoop.h"
 #include "PStringSelect.h"
+#include "NumberDecorator.h"
 #include "a2functional.h"
 
 namespace aria2 {
 
+PStringBuildVisitor::PStringBuildVisitor() {}
+
+PStringBuildVisitor::~PStringBuildVisitor() {}
+
 void PStringBuildVisitor::visit(PStringSegment& segment)
 {
   std::string uri;
diff --git a/src/PStringBuildVisitor.h b/src/PStringBuildVisitor.h
index bcf3b772..a4d98cd6 100644
--- a/src/PStringBuildVisitor.h
+++ b/src/PStringBuildVisitor.h
@@ -53,6 +53,8 @@ private:
 
   std::vector<std::string> uris_;
 public:
+  PStringBuildVisitor();
+  ~PStringBuildVisitor();
   
   virtual void visit(PStringSegment& s);
 
diff --git a/src/PStringNumLoop.cc b/src/PStringNumLoop.cc
new file mode 100644
index 00000000..ca4a0d2b
--- /dev/null
+++ b/src/PStringNumLoop.cc
@@ -0,0 +1,70 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "PStringNumLoop.h"
+#include "NumberDecorator.h"
+#include "PStringVisitor.h"
+
+namespace aria2 {
+
+PStringNumLoop::PStringNumLoop
+(unsigned int startValue, unsigned int endValue,
+ unsigned int step,
+ const SharedHandle<NumberDecorator>& nd,
+ const SharedHandle<PStringDatum>& next)
+  : startValue_(startValue),
+    endValue_(endValue),
+    step_(step),
+    numberDecorator_(nd),
+    next_(next)
+{}
+
+PStringNumLoop::PStringNumLoop
+(unsigned int startValue, unsigned int endValue,
+ unsigned int step,
+ const SharedHandle<NumberDecorator>& nd)
+  : startValue_(startValue),
+    endValue_(endValue),
+    step_(step),
+    numberDecorator_(nd)
+{}
+
+PStringNumLoop::~PStringNumLoop() {}
+
+void PStringNumLoop::accept(PStringVisitor& visitor)
+{
+  visitor.visit(*this);
+}
+
+} // namespace aria2
diff --git a/src/PStringNumLoop.h b/src/PStringNumLoop.h
index f50d269a..c13e388a 100644
--- a/src/PStringNumLoop.h
+++ b/src/PStringNumLoop.h
@@ -36,12 +36,12 @@
 #define D_P_STRING_NUM_LOOP_H
 
 #include "PStringDatum.h"
-#include "PStringSegment.h"
-#include "NumberDecorator.h"
-#include "PStringVisitor.h"
 
 namespace aria2 {
 
+class NumberDecorator;
+class PStringVisitor;
+
 class PStringNumLoop : public PStringDatum
 {
 private:
@@ -60,27 +60,15 @@ public:
   PStringNumLoop(unsigned int startValue, unsigned int endValue,
                  unsigned int step,
                  const SharedHandle<NumberDecorator>& nd,
-                 const SharedHandle<PStringDatum>& next):
-    startValue_(startValue),
-    endValue_(endValue),
-    step_(step),
-    numberDecorator_(nd),
-    next_(next) {}
+                 const SharedHandle<PStringDatum>& next);
 
   PStringNumLoop(unsigned int startValue, unsigned int endValue,
                  unsigned int step,
-                 const SharedHandle<NumberDecorator>& nd):
-    startValue_(startValue),
-    endValue_(endValue),
-    step_(step),
-    numberDecorator_(nd) {}
+                 const SharedHandle<NumberDecorator>& nd);
 
-  virtual ~PStringNumLoop() {}
+  virtual ~PStringNumLoop();
 
-  virtual void accept(PStringVisitor& visitor)
-  {
-    visitor.visit(*this);
-  }
+  virtual void accept(PStringVisitor& visitor);
 
   const SharedHandle<NumberDecorator>& getNumberDecorator() const
   {
diff --git a/src/PStringSelect.cc b/src/PStringSelect.cc
new file mode 100644
index 00000000..08ba48a5
--- /dev/null
+++ b/src/PStringSelect.cc
@@ -0,0 +1,68 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "PStringSelect.h"
+#include "PStringVisitor.h"
+
+namespace aria2 {
+
+PStringSelect::PStringSelect
+(const std::vector<std::string>& values,
+ const SharedHandle<PStringDatum>& next)
+  : values_(values),
+    next_(next)
+{}
+
+PStringSelect::PStringSelect(const std::vector<std::string>& values)
+  : values_(values)
+{}
+
+PStringSelect::~PStringSelect() {}
+
+void PStringSelect::accept(PStringVisitor& visitor)
+{
+  visitor.visit(*this);
+}
+
+const std::vector<std::string>& PStringSelect::getValues() const
+{
+  return values_;
+}
+
+const SharedHandle<PStringDatum>& PStringSelect::getNext() const
+{
+  return next_;
+}
+
+} // namespace aria2
diff --git a/src/PStringSelect.h b/src/PStringSelect.h
index 690f2828..3ffcdb6c 100644
--- a/src/PStringSelect.h
+++ b/src/PStringSelect.h
@@ -36,11 +36,14 @@
 #define D_P_STRING_SELECT_H
 
 #include "PStringDatum.h"
-#include "PStringSegment.h"
-#include "PStringVisitor.h"
+
+#include <vector>
+#include <string>
 
 namespace aria2 {
 
+class PStringVisitor;
+
 class PStringSelect : public PStringDatum
 {
 private:
@@ -51,29 +54,17 @@ private:
 
 public:
   PStringSelect(const std::vector<std::string>& values,
-                const SharedHandle<PStringDatum>& next):
-    values_(values),
-    next_(next) {}
+                const SharedHandle<PStringDatum>& next);
 
-  PStringSelect(const std::vector<std::string>& values):
-    values_(values) {}
+  PStringSelect(const std::vector<std::string>& values);
 
-  virtual ~PStringSelect() {}
+  virtual ~PStringSelect();
 
-  virtual void accept(PStringVisitor& visitor)
-  {
-    visitor.visit(*this);
-  }
+  virtual void accept(PStringVisitor& visitor);
 
-  const std::vector<std::string>& getValues() const
-  {
-    return values_;
-  }
+  const std::vector<std::string>& getValues() const;
 
-  SharedHandle<PStringDatum> getNext() const
-  {
-    return next_;
-  }
+  const SharedHandle<PStringDatum>& getNext() const;
 };
 
 } // namespace aria2
diff --git a/src/PeerAddrEntry.cc b/src/PeerAddrEntry.cc
new file mode 100644
index 00000000..27cb3228
--- /dev/null
+++ b/src/PeerAddrEntry.cc
@@ -0,0 +1,72 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "PeerAddrEntry.h"
+
+namespace aria2 {
+
+PeerAddrEntry::PeerAddrEntry
+(const std::string& ipaddr, uint16_t port, Timer updated)
+  : ipaddr_(ipaddr), port_(port), lastUpdated_(updated)
+{}
+
+PeerAddrEntry::PeerAddrEntry(const PeerAddrEntry& c)
+  : ipaddr_(c.ipaddr_),
+    port_(c.port_),
+    lastUpdated_(c.lastUpdated_)
+{}
+
+PeerAddrEntry::~PeerAddrEntry() {}
+
+PeerAddrEntry& PeerAddrEntry::operator=(const PeerAddrEntry& c)
+{
+  if(this != &c) {
+    ipaddr_ = c.ipaddr_;
+    port_ = c.port_;
+    lastUpdated_ = c.lastUpdated_;
+  }
+  return *this;
+}
+
+void PeerAddrEntry::notifyUpdate()
+{
+  lastUpdated_.reset();
+}
+
+bool PeerAddrEntry::operator==(const PeerAddrEntry& entry) const
+{
+  return ipaddr_ == entry.ipaddr_ && port_ == entry.port_;
+}
+
+} // namespace aria2
diff --git a/src/PeerAddrEntry.h b/src/PeerAddrEntry.h
index 874027be..d6690a6a 100644
--- a/src/PeerAddrEntry.h
+++ b/src/PeerAddrEntry.h
@@ -52,8 +52,11 @@ private:
   Timer lastUpdated_;
 public:
   PeerAddrEntry
-  (const std::string& ipaddr, uint16_t port, Timer updated = Timer()):
-    ipaddr_(ipaddr), port_(port), lastUpdated_(updated) {}
+  (const std::string& ipaddr, uint16_t port, Timer updated = Timer());
+  PeerAddrEntry(const PeerAddrEntry& c);
+  ~PeerAddrEntry();
+
+  PeerAddrEntry& operator=(const PeerAddrEntry& c);
 
   const std::string& getIPAddress() const
   {
@@ -70,15 +73,9 @@ public:
     return lastUpdated_;
   }
 
-  void notifyUpdate()
-  {
-    lastUpdated_.reset();
-  }
+  void notifyUpdate();
 
-  bool operator==(const PeerAddrEntry& entry) const
-  {
-    return ipaddr_ == entry.ipaddr_ && port_ == entry.port_;
-  }
+  bool operator==(const PeerAddrEntry& entry) const;
 };
 
 } // namespace aria2
diff --git a/src/PeerConnection.cc b/src/PeerConnection.cc
index cabc2a0a..23d12093 100644
--- a/src/PeerConnection.cc
+++ b/src/PeerConnection.cc
@@ -279,4 +279,11 @@ ssize_t PeerConnection::sendPendingData()
   return writtenLength;
 }
 
+unsigned char* PeerConnection::detachBuffer()
+{
+  unsigned char* detachbuf = resbuf_;
+  resbuf_ = new unsigned char[MAX_PAYLOAD_LEN];
+  return detachbuf;
+}
+
 } // namespace aria2
diff --git a/src/PeerConnection.h b/src/PeerConnection.h
index 31636e97..fd2acd7a 100644
--- a/src/PeerConnection.h
+++ b/src/PeerConnection.h
@@ -119,12 +119,7 @@ public:
     return resbuf_;
   }
 
-  unsigned char* detachBuffer()
-  {
-    unsigned char* detachbuf = resbuf_;
-    resbuf_ = new unsigned char[MAX_PAYLOAD_LEN];
-    return detachbuf;
-  }
+  unsigned char* detachBuffer();
 };
 
 typedef SharedHandle<PeerConnection> PeerConnectionHandle;
diff --git a/src/PeerInitiateConnectionCommand.cc b/src/PeerInitiateConnectionCommand.cc
index d3d6dd29..95e62869 100644
--- a/src/PeerInitiateConnectionCommand.cc
+++ b/src/PeerInitiateConnectionCommand.cc
@@ -47,12 +47,7 @@
 #include "PieceStorage.h"
 #include "PeerConnection.h"
 #include "RequestGroup.h"
-#include "DownloadContext.h"
 #include "util.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
-#include "RequestGroupMan.h"
-#include "ServerStatMan.h"
 
 namespace aria2 {
 
diff --git a/src/PeerInteractionCommand.cc b/src/PeerInteractionCommand.cc
index 2c39f7c8..9339ec6d 100644
--- a/src/PeerInteractionCommand.cc
+++ b/src/PeerInteractionCommand.cc
@@ -77,9 +77,6 @@
 #include "bittorrent_helper.h"
 #include "UTMetadataRequestFactory.h"
 #include "UTMetadataRequestTracker.h"
-#include "ServerStatMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
 
 namespace aria2 {
 
diff --git a/src/PeerListenCommand.cc b/src/PeerListenCommand.cc
index ab8e16b7..25188e07 100644
--- a/src/PeerListenCommand.cc
+++ b/src/PeerListenCommand.cc
@@ -46,11 +46,7 @@
 #include "Logger.h"
 #include "Socket.h"
 #include "SimpleRandomizer.h"
-#include "FileEntry.h"
 #include "util.h"
-#include "ServerStatMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
 
 namespace aria2 {
 
diff --git a/src/PeerReceiveHandshakeCommand.cc b/src/PeerReceiveHandshakeCommand.cc
index 0d1bfef5..fe1ee0ae 100644
--- a/src/PeerReceiveHandshakeCommand.cc
+++ b/src/PeerReceiveHandshakeCommand.cc
@@ -46,7 +46,6 @@
 #include "PieceStorage.h"
 #include "BtRuntime.h"
 #include "BtAnnounce.h"
-#include "BtProgressInfoFile.h"
 #include "BtConstants.h"
 #include "message.h"
 #include "Socket.h"
@@ -56,9 +55,6 @@
 #include "RequestGroupMan.h"
 #include "StringFormat.h"
 #include "RequestGroup.h"
-#include "ServerStatMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
 
 namespace aria2 {
 
diff --git a/src/PeerStat.cc b/src/PeerStat.cc
new file mode 100644
index 00000000..6aa19497
--- /dev/null
+++ b/src/PeerStat.cc
@@ -0,0 +1,133 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "PeerStat.h"
+#include "SharedHandle.h"
+#include "wallclock.h"
+
+namespace aria2 {
+
+PeerStat::PeerStat
+(cuid_t cuid, const std::string& hostname, const::std::string& protocol)
+  : cuid_(cuid),
+    hostname_(hostname),
+    protocol_(protocol),
+    downloadStartTime_(global::wallclock),
+    status_(PeerStat::IDLE),
+    avgDownloadSpeed_(0),
+    avgUploadSpeed_(0),
+    sessionDownloadLength_(0),
+    sessionUploadLength_(0)
+{}
+
+PeerStat::PeerStat(cuid_t cuid)
+  : cuid_(cuid),
+    status_(PeerStat::IDLE),
+    avgDownloadSpeed_(0),
+    avgUploadSpeed_(0),
+    sessionDownloadLength_(0),
+    sessionUploadLength_(0)
+{}
+
+PeerStat::~PeerStat() {}
+
+/**
+ * Returns current download speed in byte per sec.
+ */
+unsigned int PeerStat::calculateDownloadSpeed()
+{
+  return downloadSpeed_.calculateSpeed();
+}
+
+unsigned int PeerStat::calculateAvgDownloadSpeed()
+{
+  avgDownloadSpeed_ = downloadSpeed_.calculateAvgSpeed();
+  return avgDownloadSpeed_;
+}
+
+unsigned int PeerStat::calculateUploadSpeed()
+{
+  return uploadSpeed_.calculateSpeed();
+}
+
+unsigned int PeerStat::calculateAvgUploadSpeed()
+{
+  avgUploadSpeed_ = uploadSpeed_.calculateAvgSpeed();
+  return avgUploadSpeed_;
+}
+
+void PeerStat::updateDownloadLength(size_t bytes)
+{
+  downloadSpeed_.update(bytes);
+  sessionDownloadLength_ += bytes;
+}
+
+void PeerStat::updateUploadLength(size_t bytes)
+{
+  uploadSpeed_.update(bytes);
+  sessionUploadLength_ += bytes;
+}
+
+unsigned int PeerStat::getMaxDownloadSpeed() const
+{
+  return downloadSpeed_.getMaxSpeed();
+}
+
+unsigned int PeerStat::getMaxUploadSpeed() const
+{
+  return uploadSpeed_.getMaxSpeed();
+}
+
+void PeerStat::reset()
+{
+  downloadSpeed_.reset();
+  uploadSpeed_.reset();
+  downloadStartTime_ = global::wallclock;
+  status_ = PeerStat::IDLE;
+}
+
+void PeerStat::downloadStart()
+{
+  reset();
+  status_ = PeerStat::ACTIVE;
+}
+
+void PeerStat::downloadStop()
+{
+  calculateAvgDownloadSpeed();
+  calculateAvgUploadSpeed();
+  status_ = PeerStat::IDLE;
+}
+
+} // namespace aria2
diff --git a/src/PeerStat.h b/src/PeerStat.h
index b84571bd..fc491c1a 100644
--- a/src/PeerStat.h
+++ b/src/PeerStat.h
@@ -42,7 +42,6 @@
 #include "SpeedCalc.h"
 #include "SharedHandle.h"
 #include "Command.h"
-#include "wallclock.h"
 
 namespace aria2 {
 
@@ -65,101 +64,64 @@ private:
   uint64_t sessionDownloadLength_;
   uint64_t sessionUploadLength_;
 public:
+  PeerStat
+  (cuid_t cuid, const std::string& hostname, const::std::string& protocol);
 
-  PeerStat(cuid_t cuid, const std::string& hostname,
-           const::std::string& protocol):
-    cuid_(cuid),
-    hostname_(hostname),
-    protocol_(protocol),
-    downloadStartTime_(global::wallclock),
-    status_(PeerStat::IDLE),
-    avgDownloadSpeed_(0),
-    avgUploadSpeed_(0),
-    sessionDownloadLength_(0),
-    sessionUploadLength_(0) {}
+  PeerStat(cuid_t cuid = 0);
 
-  PeerStat(cuid_t cuid = 0):
-    cuid_(cuid),
-    status_(PeerStat::IDLE),
-    avgDownloadSpeed_(0),
-    avgUploadSpeed_(0),
-    sessionDownloadLength_(0),
-    sessionUploadLength_(0) {}
+  ~PeerStat();
+
+  // Don't allow copying
+  PeerStat(const PeerStat&);
+  PeerStat& operator=(const PeerStat&);
 
   /**
    * Returns current download speed in byte per sec.
    */
-  unsigned int calculateDownloadSpeed() {
-    return downloadSpeed_.calculateSpeed();
-  }
+  unsigned int calculateDownloadSpeed();
 
-  unsigned int calculateAvgDownloadSpeed() {
-    avgDownloadSpeed_ = downloadSpeed_.calculateAvgSpeed();
+  unsigned int calculateAvgDownloadSpeed();
+
+  unsigned int calculateUploadSpeed();
+
+  unsigned int calculateAvgUploadSpeed();
+
+  void updateDownloadLength(size_t bytes);
+
+  void updateUploadLength(size_t bytes);
+
+  unsigned int getMaxDownloadSpeed() const;
+
+  unsigned int getMaxUploadSpeed() const;
+
+  unsigned int getAvgDownloadSpeed() const
+  {
     return avgDownloadSpeed_;
   }
 
-  unsigned int calculateUploadSpeed() {
-    return uploadSpeed_.calculateSpeed();
-  }
-
-  unsigned int calculateAvgUploadSpeed() {
-    avgUploadSpeed_ = uploadSpeed_.calculateAvgSpeed();
+  unsigned int getAvgUploadSpeed() const
+  {
     return avgUploadSpeed_;
   }
 
-  void updateDownloadLength(size_t bytes) {
-    downloadSpeed_.update(bytes);
-    sessionDownloadLength_ += bytes;
-  }
+  void reset();
 
-  void updateUploadLength(size_t bytes) {
-    uploadSpeed_.update(bytes);
-    sessionUploadLength_ += bytes;
-  }
+  void downloadStart();
 
-  unsigned int getMaxDownloadSpeed() const {
-    return downloadSpeed_.getMaxSpeed();
-  }
+  void downloadStop();
 
-  unsigned int getMaxUploadSpeed() const {
-    return uploadSpeed_.getMaxSpeed();
-  }
-
-  unsigned int getAvgDownloadSpeed() const {
-    return avgDownloadSpeed_;
-  }
-
-  unsigned int getAvgUploadSpeed() const {
-    return avgUploadSpeed_;
-  }
-
-  void reset() {
-    downloadSpeed_.reset();
-    uploadSpeed_.reset();
-    downloadStartTime_ = global::wallclock;
-    status_ = PeerStat::IDLE;
-  }
-
-  void downloadStart() {
-    reset();
-    status_ = PeerStat::ACTIVE;
-  }
-
-  void downloadStop() {
-    calculateAvgDownloadSpeed();
-    calculateAvgUploadSpeed();
-    status_ = PeerStat::IDLE;
-  }
-
-  const Timer& getDownloadStartTime() const {
+  const Timer& getDownloadStartTime() const
+  {
     return downloadStartTime_;
   }
 
-  PeerStat::STATUS getStatus() const {
+  PeerStat::STATUS getStatus() const
+  {
     return status_;
   }
 
-  cuid_t getCuid() const {
+  cuid_t getCuid() const
+  {
     return cuid_;
   }
 
diff --git a/src/PieceStatMan.cc b/src/PieceStatMan.cc
index 2fd8818b..f4b28c82 100644
--- a/src/PieceStatMan.cc
+++ b/src/PieceStatMan.cc
@@ -93,6 +93,8 @@ PieceStatMan::PieceStatMan(size_t pieceNum, bool randomShuffle):
   }  
 }
 
+PieceStatMan::~PieceStatMan() {}
+
 namespace {
 class PieceStatRarer {
 private:
diff --git a/src/PieceStatMan.h b/src/PieceStatMan.h
index 1bc9ee11..1f1931a0 100644
--- a/src/PieceStatMan.h
+++ b/src/PieceStatMan.h
@@ -93,6 +93,8 @@ private:
 public:
   PieceStatMan(size_t pieceNum, bool randomShuffle);
 
+  ~PieceStatMan();
+
   void addPieceStats(size_t index);
 
   void addPieceStats(const unsigned char* bitfield,
diff --git a/src/ProgressAwareEntry.h b/src/ProgressAwareEntry.h
index 07732e4b..48f0ad0f 100644
--- a/src/ProgressAwareEntry.h
+++ b/src/ProgressAwareEntry.h
@@ -36,10 +36,12 @@
 #define D_PROGRESS_AWARE_ENTRY_H
 
 #include "common.h"
-#include "SharedHandle.h"
+
 #include <stdint.h>
 #include <unistd.h>
 
+#include "SharedHandle.h"
+
 namespace aria2 {
 
 class ProgressAwareEntry {
diff --git a/src/Range.cc b/src/Range.cc
new file mode 100644
index 00000000..ba2439c7
--- /dev/null
+++ b/src/Range.cc
@@ -0,0 +1,84 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "Range.h"
+
+namespace aria2 {
+
+Range::Range():startByte_(0), endByte_(0), entityLength_(0) {}
+
+Range::Range(off_t startByte, off_t endByte, uint64_t entityLength)
+  : startByte_(startByte), endByte_(endByte), entityLength_(entityLength)
+{}
+
+Range::Range(const Range& c)
+  : startByte_(c.startByte_),
+    endByte_(c.endByte_),
+    entityLength_(c.entityLength_)
+{}
+
+Range::~Range() {}
+
+Range& Range::operator=(const Range& c)
+{
+  if(this != &c) {
+    startByte_ = c.startByte_;
+    endByte_ = c.endByte_;
+    entityLength_ = c.entityLength_;
+  }
+  return *this;
+}
+
+bool Range::operator==(const Range& range) const
+{
+  return startByte_ == range.startByte_ &&
+    endByte_ == range.endByte_ &&
+    entityLength_ == range.entityLength_;
+}
+
+bool Range::operator!=(const Range& range) const
+{
+  return !(*this == range);
+}
+
+uint64_t Range::getContentLength() const
+{
+  if(endByte_ >= startByte_) {
+    return endByte_-startByte_+1;
+  } else {
+    return 0;
+  }
+}
+
+} // namespace aria2
diff --git a/src/Range.h b/src/Range.h
index c3ed4b61..c43b99b2 100644
--- a/src/Range.h
+++ b/src/Range.h
@@ -36,6 +36,9 @@
 #define D_RANGE_H
 
 #include "common.h"
+
+#include <unistd.h>
+
 #include "SharedHandle.h"
 
 namespace aria2 {
@@ -46,22 +49,19 @@ private:
   off_t endByte_;
   uint64_t entityLength_;
 public:
-  Range():startByte_(0), endByte_(0), entityLength_(0) {}
+  Range();
 
-  Range(off_t startByte, off_t endByte, uint64_t entityLength):
-    startByte_(startByte), endByte_(endByte), entityLength_(entityLength) {}
+  Range(off_t startByte, off_t endByte, uint64_t entityLength);
 
-  bool operator==(const Range& range) const
-  {
-    return startByte_ == range.startByte_ &&
-      endByte_ == range.endByte_ &&
-      entityLength_ == range.entityLength_;
-  }
+  Range(const Range& c);
 
-  bool operator!=(const Range& range) const
-  {
-    return !(*this == range);
-  }
+  ~Range();
+
+  Range& operator=(const Range& c);
+
+  bool operator==(const Range& range) const;
+
+  bool operator!=(const Range& range) const;
 
   off_t getStartByte() const
   {
@@ -78,14 +78,7 @@ public:
     return entityLength_;
   }
 
-  uint64_t getContentLength() const
-  {
-    if(endByte_ >= startByte_) {
-      return endByte_-startByte_+1;
-    } else {
-      return 0;
-    }
-  }
+  uint64_t getContentLength() const;
 };
 
 typedef SharedHandle<Range> RangeHandle;
diff --git a/src/RangeBtMessageValidator.cc b/src/RangeBtMessageValidator.cc
new file mode 100644
index 00000000..a9c8b509
--- /dev/null
+++ b/src/RangeBtMessageValidator.cc
@@ -0,0 +1,60 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "RangeBtMessageValidator.h"
+#include "RangeBtMessage.h"
+#include "bittorrent_helper.h"
+
+namespace aria2 {
+
+RangeBtMessageValidator::RangeBtMessageValidator
+(const RangeBtMessage* message, size_t numPiece, size_t pieceLength)
+  : message_(message),
+    numPiece_(numPiece),
+    pieceLength_(pieceLength)
+{}
+
+RangeBtMessageValidator::~RangeBtMessageValidator() {}
+
+void RangeBtMessageValidator::validate()
+{
+  bittorrent::checkIndex(message_->getIndex(), numPiece_);
+  bittorrent::checkBegin(message_->getBegin(), pieceLength_);
+  bittorrent::checkLength(message_->getLength());
+  bittorrent::checkRange(message_->getBegin(),
+                         message_->getLength(),
+                         pieceLength_);
+}
+
+} // namespace aria2
diff --git a/src/RangeBtMessageValidator.h b/src/RangeBtMessageValidator.h
index a7af8104..1db5c16f 100644
--- a/src/RangeBtMessageValidator.h
+++ b/src/RangeBtMessageValidator.h
@@ -36,11 +36,11 @@
 #define D_RANGE_BT_MESSAGE_VALIDATOR_H
 
 #include "BtMessageValidator.h"
-#include "RangeBtMessage.h"
-#include "bittorrent_helper.h"
 
 namespace aria2 {
 
+class RangeBtMessage;
+
 class RangeBtMessageValidator : public BtMessageValidator {
 private:
   const RangeBtMessage* message_;
@@ -49,20 +49,11 @@ private:
 public:
   RangeBtMessageValidator(const RangeBtMessage* message,
                           size_t numPiece,
-                          size_t pieceLength):
-    message_(message),
-    numPiece_(numPiece),
-    pieceLength_(pieceLength) {}
+                          size_t pieceLength);
 
-  virtual void validate()
-  {
-    bittorrent::checkIndex(message_->getIndex(), numPiece_);
-    bittorrent::checkBegin(message_->getBegin(), pieceLength_);
-    bittorrent::checkLength(message_->getLength());
-    bittorrent::checkRange(message_->getBegin(),
-                           message_->getLength(),
-                           pieceLength_);
-  }
+  ~RangeBtMessageValidator();
+
+  virtual void validate();
 };
 
 } // namespace aria2
diff --git a/src/ReceiverMSEHandshakeCommand.cc b/src/ReceiverMSEHandshakeCommand.cc
index 5c6113f7..14edea78 100644
--- a/src/ReceiverMSEHandshakeCommand.cc
+++ b/src/ReceiverMSEHandshakeCommand.cc
@@ -50,14 +50,6 @@
 #include "RequestGroupMan.h"
 #include "BtRegistry.h"
 #include "DownloadContext.h"
-#include "PeerStorage.h"
-#include "PieceStorage.h"
-#include "BtAnnounce.h"
-#include "BtRuntime.h"
-#include "BtProgressInfoFile.h"
-#include "ServerStatMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
 
 namespace aria2 {
 
diff --git a/src/Request.cc b/src/Request.cc
index da44ea32..03d0076e 100644
--- a/src/Request.cc
+++ b/src/Request.cc
@@ -38,11 +38,10 @@
 #include <utility>
 
 #include "util.h"
-#include "FeatureConfig.h"
 #include "StringFormat.h"
 #include "A2STR.h"
-#include "a2functional.h"
 #include "uri.h"
+#include "PeerStat.h"
 
 namespace aria2 {
 
@@ -70,6 +69,8 @@ Request::Request():
   connectedPort_(0)
 {}
 
+Request::~Request() {}
+
 namespace {
 std::string removeFragment(const std::string& uri)
 {
@@ -188,4 +189,26 @@ const SharedHandle<PeerStat>& Request::initPeerStat()
   return peerStat_;
 }
 
+std::string Request::getURIHost() const
+{
+  if(isIPv6LiteralAddress()) {
+    return strconcat("[", getHost(), "]");
+  } else {
+    return getHost();
+  }
+}
+
+void Request::setMethod(const std::string& method)
+{
+  method_ = method;
+}
+
+void Request::setConnectedAddrInfo
+(const std::string& hostname, const std::string& addr, uint16_t port)
+{
+  connectedHostname_ = hostname;
+  connectedAddr_ = addr;
+  connectedPort_ = port;
+}
+
 } // namespace aria2
diff --git a/src/Request.h b/src/Request.h
index 0ce648eb..e1889ad2 100644
--- a/src/Request.h
+++ b/src/Request.h
@@ -39,11 +39,11 @@
 #include <string>
 
 #include "SharedHandle.h"
-#include "PeerStat.h"
-#include "a2functional.h"
 
 namespace aria2 {
 
+class PeerStat;
+
 class Request {
 private:
   std::string uri_;
@@ -99,7 +99,7 @@ private:
   bool parseUri(const std::string& uri);
 public:
   Request();
-
+  ~Request();
   // Sets uri to uri_ and parses URI.  Returns true if parsing goes
   // successful, otherwise returns false.
   bool setUri(const std::string& uri);
@@ -110,14 +110,8 @@ public:
   void resetTryCount() { tryCount_ = 0; }
   void addTryCount() { ++tryCount_; }
   unsigned int getTryCount() const { return tryCount_; }
-
   void resetRedirectCount();
-  
-  unsigned int getRedirectCount() const
-  {
-    return redirectCount_;
-  }
-
+  unsigned int getRedirectCount() const { return redirectCount_; }
   // Returns URI passed by setUri()
   const std::string& getUri() const { return uri_; }
   const std::string& getCurrentUri() const { return currentUri_; }
@@ -128,14 +122,7 @@ public:
   const std::string& getHost() const { return host_; }
   // Same as getHost(), but for IPv6 literal addresses, enclose them
   // with square brackets and return.
-  std::string getURIHost() const
-  {
-    if(isIPv6LiteralAddress()) {
-      return strconcat("[", getHost(), "]");
-    } else {
-      return getHost();
-    }
-  }
+  std::string getURIHost() const;
   uint16_t getPort() const { return port_; }
   const std::string& getDir() const { return dir_; }
   const std::string& getFile() const { return file_;}
@@ -184,9 +171,7 @@ public:
     return maxPipelinedRequest_;
   }
 
-  void setMethod(const std::string& method) {
-    method_ = method;
-  }
+  void setMethod(const std::string& method);
 
   const std::string& getUsername() const
   {
@@ -204,11 +189,15 @@ public:
     return hasPassword_;
   }
 
-  const std::string& getMethod() const {
+  const std::string& getMethod() const
+  {
     return method_;
   }
 
-  const SharedHandle<PeerStat>& getPeerStat() const { return peerStat_; }
+  const SharedHandle<PeerStat>& getPeerStat() const
+  {
+    return peerStat_;
+  }
 
   const SharedHandle<PeerStat>& initPeerStat();
 
@@ -223,12 +212,7 @@ public:
   }
 
   void setConnectedAddrInfo
-  (const std::string& hostname, const std::string& addr, uint16_t port)
-  {
-    connectedHostname_ = hostname;
-    connectedAddr_ = addr;
-    connectedPort_ = port;
-  }
+  (const std::string& hostname, const std::string& addr, uint16_t port);
 
   const std::string& getConnectedHostname() const
   {
diff --git a/src/RequestGroupMan.cc b/src/RequestGroupMan.cc
index fed34d67..a9181afa 100644
--- a/src/RequestGroupMan.cc
+++ b/src/RequestGroupMan.cc
@@ -73,6 +73,7 @@
 #include "DlAbortEx.h"
 #include "uri.h"
 #include "Triplet.h"
+#include "Signature.h"
 
 namespace aria2 {
 
@@ -95,6 +96,8 @@ RequestGroupMan::RequestGroupMan
   maxDownloadResult_(option->getAsInt(PREF_MAX_DOWNLOAD_RESULT))
 {}
 
+RequestGroupMan::~RequestGroupMan() {}
+
 bool RequestGroupMan::downloadFinished()
 {
 #ifdef ENABLE_XML_RPC
diff --git a/src/RequestGroupMan.h b/src/RequestGroupMan.h
index 45ab77b9..dde0bb29 100644
--- a/src/RequestGroupMan.h
+++ b/src/RequestGroupMan.h
@@ -98,6 +98,8 @@ public:
                   unsigned int maxSimultaneousDownloads,
                   const Option* option);
 
+  ~RequestGroupMan();
+
   bool downloadFinished();
 
   void save();
diff --git a/src/SeedCheckCommand.cc b/src/SeedCheckCommand.cc
index 43bbfe93..2ec138eb 100644
--- a/src/SeedCheckCommand.cc
+++ b/src/SeedCheckCommand.cc
@@ -40,11 +40,6 @@
 #include "SeedCriteria.h"
 #include "message.h"
 #include "RequestGroup.h"
-#include "DownloadContext.h"
-#include "RequestGroupMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
-#include "ServerStatMan.h"
 
 namespace aria2 {
 
diff --git a/src/Segment.h b/src/Segment.h
index 17efcad6..b8f38c9f 100644
--- a/src/Segment.h
+++ b/src/Segment.h
@@ -37,7 +37,6 @@
 
 #include "common.h"
 
-#include <unistd.h>
 #include <stdint.h>
 #include <string>
 
diff --git a/src/SegmentMan.cc b/src/SegmentMan.cc
index 0d412e4f..bc668145 100644
--- a/src/SegmentMan.cc
+++ b/src/SegmentMan.cc
@@ -55,6 +55,12 @@
 
 namespace aria2 {
 
+SegmentEntry::SegmentEntry(cuid_t cuid, const SharedHandle<Segment>& segment)
+  : cuid(cuid), segment(segment)
+{}
+
+SegmentEntry::~SegmentEntry() {}
+
 SegmentMan::SegmentMan(const Option* option,
                        const SharedHandle<DownloadContext>& downloadContext,
                        const PieceStorageHandle& pieceStorage):
diff --git a/src/SegmentMan.h b/src/SegmentMan.h
index 2166b1d4..41837287 100644
--- a/src/SegmentMan.h
+++ b/src/SegmentMan.h
@@ -60,8 +60,13 @@ class FileEntry;
 struct SegmentEntry {
   cuid_t cuid;
   SharedHandle<Segment> segment;
-  SegmentEntry(cuid_t cuid, const SharedHandle<Segment>& segment):
-    cuid(cuid), segment(segment) {}
+
+  SegmentEntry(cuid_t cuid, const SharedHandle<Segment>& segment);
+  ~SegmentEntry();
+
+  // Don't allow copying
+  SegmentEntry(const SegmentEntry&);
+  SegmentEntry& operator=(const SegmentEntry&);
 };
 
 typedef SharedHandle<SegmentEntry> SegmentEntryHandle;
diff --git a/src/ShareRatioSeedCriteria.cc b/src/ShareRatioSeedCriteria.cc
new file mode 100644
index 00000000..9240c537
--- /dev/null
+++ b/src/ShareRatioSeedCriteria.cc
@@ -0,0 +1,76 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "ShareRatioSeedCriteria.h"
+#include "DownloadContext.h"
+#include "PeerStorage.h"
+#include "PieceStorage.h"
+
+namespace aria2 {
+
+ShareRatioSeedCriteria::ShareRatioSeedCriteria
+(double ratio, const SharedHandle<DownloadContext>& downloadContext)
+  : ratio_(ratio),
+    downloadContext_(downloadContext)
+{}
+
+ShareRatioSeedCriteria::~ShareRatioSeedCriteria() {}
+
+void ShareRatioSeedCriteria::reset() {}
+
+bool ShareRatioSeedCriteria::evaluate()
+{
+  if(downloadContext_->getTotalLength() == 0) {
+    return false;
+  }
+  TransferStat stat = peerStorage_->calculateStat();
+  return ratio_ <=
+    static_cast<double>(stat.getAllTimeUploadLength())/
+    pieceStorage_->getCompletedLength();
+}
+
+
+void ShareRatioSeedCriteria::setPeerStorage
+(const SharedHandle<PeerStorage>& peerStorage)
+{
+  peerStorage_ = peerStorage;
+}
+
+void ShareRatioSeedCriteria::setPieceStorage
+(const SharedHandle<PieceStorage>& pieceStorage)
+{
+  pieceStorage_ = pieceStorage;
+}
+
+} // namespace aria2
diff --git a/src/ShareRatioSeedCriteria.h b/src/ShareRatioSeedCriteria.h
index 50ef2f4a..c4e2def6 100644
--- a/src/ShareRatioSeedCriteria.h
+++ b/src/ShareRatioSeedCriteria.h
@@ -36,55 +36,40 @@
 #define D_SHARE_RATIO_SEED_CRITERIA_H
 
 #include "SeedCriteria.h"
-#include "DownloadContext.h"
-#include "PeerStorage.h"
-#include "PieceStorage.h"
 
 namespace aria2 {
 
+class DownloadContext;
+class PeerStorage;
+class PieceStorage;
+
 class ShareRatioSeedCriteria : public SeedCriteria {
 private:
-  double ratio;
+  double ratio_;
   SharedHandle<DownloadContext> downloadContext_;
   SharedHandle<PeerStorage> peerStorage_;
   SharedHandle<PieceStorage> pieceStorage_;
 public:
   ShareRatioSeedCriteria
-  (double ratio, const SharedHandle<DownloadContext>& downloadContext)
-    :ratio(ratio),
-     downloadContext_(downloadContext) {}
+  (double ratio, const SharedHandle<DownloadContext>& downloadContext);
 
-  virtual ~ShareRatioSeedCriteria() {}
+  virtual ~ShareRatioSeedCriteria();
 
-  virtual void reset() {}
+  virtual void reset();
 
-  virtual bool evaluate() {
-    if(downloadContext_->getTotalLength() == 0) {
-      return false;
-    }
-    TransferStat stat = peerStorage_->calculateStat();
-    return ratio <=
-      (double)stat.getAllTimeUploadLength()/
-      pieceStorage_->getCompletedLength();
-  }
+  virtual bool evaluate();
 
   void setRatio(double ratio) {
-    this->ratio = ratio;
+    ratio_ = ratio;
   }
 
   double getRatio() const {
-    return ratio;
+    return ratio_;
   }
 
-  void setPeerStorage(const SharedHandle<PeerStorage>& peerStorage)
-  {
-    peerStorage_ = peerStorage;
-  }
+  void setPeerStorage(const SharedHandle<PeerStorage>& peerStorage);
 
-  void setPieceStorage(const SharedHandle<PieceStorage>& pieceStorage)
-  {
-    pieceStorage_ = pieceStorage;
-  }
+  void setPieceStorage(const SharedHandle<PieceStorage>& pieceStorage);
 };
 
 } // namespace aria2
diff --git a/src/SocketBuffer.h b/src/SocketBuffer.h
index 910f1f9a..791703eb 100644
--- a/src/SocketBuffer.h
+++ b/src/SocketBuffer.h
@@ -96,6 +96,10 @@ public:
 
   ~SocketBuffer();
 
+  // Don't allow copying
+  SocketBuffer(const SocketBuffer&);
+  SocketBuffer& operator=(const SocketBuffer&);
+
   // Feeds data pointered by bytes with length len. into queue.  This
   // object gets ownership of bytes, so caller must not delete or
   // later bytes after this call. This function doesn't send data.
diff --git a/src/StreamFileAllocationEntry.cc b/src/StreamFileAllocationEntry.cc
index 62322395..3aeef067 100644
--- a/src/StreamFileAllocationEntry.cc
+++ b/src/StreamFileAllocationEntry.cc
@@ -45,6 +45,8 @@
 #include "RequestGroupMan.h"
 #include "CheckIntegrityEntry.h"
 #include "ServerStatMan.h"
+#include "PeerStat.h"
+#include "FileEntry.h"
 
 namespace aria2 {
 
diff --git a/src/StreamFilter.cc b/src/StreamFilter.cc
index 9155cc3f..5ab31d47 100644
--- a/src/StreamFilter.cc
+++ b/src/StreamFilter.cc
@@ -40,6 +40,8 @@ StreamFilter::StreamFilter
 (const SharedHandle<StreamFilter>& delegate):
   delegate_(delegate) {}
 
+StreamFilter::~StreamFilter() {}
+
 bool StreamFilter::installDelegate(const SharedHandle<StreamFilter>& filter)
 {
   if(!delegate_) {
diff --git a/src/StreamFilter.h b/src/StreamFilter.h
index f1588976..b37a1f09 100644
--- a/src/StreamFilter.h
+++ b/src/StreamFilter.h
@@ -52,7 +52,7 @@ public:
   StreamFilter
   (const SharedHandle<StreamFilter>& delegate = SharedHandle<StreamFilter>());
 
-  virtual ~StreamFilter() {}
+  virtual ~StreamFilter();
 
   // init() must be called before calling decode().
   virtual void init() = 0;
diff --git a/src/StringFormat.cc b/src/StringFormat.cc
index a39eb929..e5f5a943 100644
--- a/src/StringFormat.cc
+++ b/src/StringFormat.cc
@@ -52,6 +52,8 @@ StringFormat::StringFormat(const char* fmt, ...)
   va_end(ap);
 }
 
+StringFormat::~StringFormat() {}
+
 const std::string& StringFormat::str() const
 {
   return msg_;
diff --git a/src/StringFormat.h b/src/StringFormat.h
index 8fa536ac..fdd413eb 100644
--- a/src/StringFormat.h
+++ b/src/StringFormat.h
@@ -49,6 +49,7 @@ private:
 public:
   StringFormat(const char* fmt, ...)
     __attribute__ ((format (printf, 2, 3)));
+  ~StringFormat();
 
   const std::string& str() const;
 };
diff --git a/src/TimeBasedCommand.cc b/src/TimeBasedCommand.cc
index b94fe60c..78891c00 100644
--- a/src/TimeBasedCommand.cc
+++ b/src/TimeBasedCommand.cc
@@ -35,11 +35,6 @@
 #include "TimeBasedCommand.h"
 #include "DownloadEngine.h"
 #include "wallclock.h"
-#include "RequestGroupMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
-#include "ServerStatMan.h"
-#include "FileEntry.h"
 
 namespace aria2 {
 
diff --git a/src/TimeSeedCriteria.cc b/src/TimeSeedCriteria.cc
new file mode 100644
index 00000000..eb46e1cc
--- /dev/null
+++ b/src/TimeSeedCriteria.cc
@@ -0,0 +1,54 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "TimeSeedCriteria.h"
+#include "wallclock.h"
+
+namespace aria2 {
+
+TimeSeedCriteria::TimeSeedCriteria(time_t duration):duration_(duration) {}
+
+TimeSeedCriteria::~TimeSeedCriteria() {}
+
+void TimeSeedCriteria::reset()
+{
+  watch_ = global::wallclock;
+}
+
+bool TimeSeedCriteria::evaluate()
+{
+  return watch_.difference(global::wallclock) >= duration_;
+}
+
+} // namespace aria2
diff --git a/src/TimeSeedCriteria.h b/src/TimeSeedCriteria.h
index af7676a0..9dba4023 100644
--- a/src/TimeSeedCriteria.h
+++ b/src/TimeSeedCriteria.h
@@ -37,7 +37,6 @@
 
 #include "SeedCriteria.h"
 #include "TimerA2.h"
-#include "wallclock.h"
 
 namespace aria2 {
 
@@ -47,22 +46,20 @@ private:
   time_t duration_;
   Timer watch_;
 public:
-  TimeSeedCriteria(time_t duration):duration_(duration) {}
-  virtual ~TimeSeedCriteria() {}
+  TimeSeedCriteria(time_t duration);
+  virtual ~TimeSeedCriteria();
 
-  virtual void reset() {
-    watch_ = global::wallclock;
-  }
+  virtual void reset();
 
-  virtual bool evaluate() {
-    return watch_.difference(global::wallclock) >= duration_;
-  }
+  virtual bool evaluate();
 
-  void setDuration(time_t duration) {
+  void setDuration(time_t duration)
+  {
     duration_ = duration;
   }
 
-  time_t getDuration() const {
+  time_t getDuration() const
+  {
     return duration_;
   }
 };
diff --git a/src/TimedHaltCommand.cc b/src/TimedHaltCommand.cc
index 96cd758c..ab36a110 100644
--- a/src/TimedHaltCommand.cc
+++ b/src/TimedHaltCommand.cc
@@ -37,10 +37,6 @@
 #include "RequestGroupMan.h"
 #include "Logger.h"
 #include "message.h"
-#include "FileEntry.h"
-#include "ServerStatMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
 
 namespace aria2 {
 
diff --git a/src/TorrentAttribute.cc b/src/TorrentAttribute.cc
new file mode 100644
index 00000000..76a34bb1
--- /dev/null
+++ b/src/TorrentAttribute.cc
@@ -0,0 +1,45 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "TorrentAttribute.h"
+
+namespace aria2 {
+
+TorrentAttribute::TorrentAttribute()
+ : metadataSize(0), privateTorrent(false), creationDate(0)
+{}
+
+TorrentAttribute::~TorrentAttribute() {}
+
+} // namespace aria2
diff --git a/src/TorrentAttribute.h b/src/TorrentAttribute.h
index f977a4f2..aba5e4e8 100644
--- a/src/TorrentAttribute.h
+++ b/src/TorrentAttribute.h
@@ -42,6 +42,8 @@
 
 #include "a2time.h"
 
+namespace aria2 {
+
 struct TorrentAttribute:public ContextAttribute {
   std::string name;
   std::string mode;
@@ -57,10 +59,15 @@ struct TorrentAttribute:public ContextAttribute {
   std::string createdBy;
   std::vector<std::string> urlList;
 
-  TorrentAttribute():metadataSize(0),
-                     privateTorrent(false),
-                     creationDate(0) {}
+  TorrentAttribute();
+  ~TorrentAttribute();
+
+  // Don't allow copying
+  TorrentAttribute(const TorrentAttribute&);
+  TorrentAttribute& operator=(const TorrentAttribute&);
 };
 
+} // namespace aria2
+
 #endif // D_TORRENT_ATTRIBUTE_H
 
diff --git a/src/TrackerWatcherCommand.cc b/src/TrackerWatcherCommand.cc
index 1a5a57a9..e20bcf88 100644
--- a/src/TrackerWatcherCommand.cc
+++ b/src/TrackerWatcherCommand.cc
@@ -61,10 +61,6 @@
 #include "bittorrent_helper.h"
 #include "a2functional.h"
 #include "util.h"
-#include "RequestGroupMan.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
-#include "ServerStatMan.h"
 
 namespace aria2 {
 
diff --git a/src/URIResult.cc b/src/URIResult.cc
index 0e39e65e..ae6ef8be 100644
--- a/src/URIResult.cc
+++ b/src/URIResult.cc
@@ -36,7 +36,10 @@
 
 namespace aria2 {
 
-URIResult::URIResult(const std::string& uri, downloadresultcode::RESULT result):
-  uri_(uri), result_(result) {}
+URIResult::URIResult(const std::string& uri, downloadresultcode::RESULT result)
+  : uri_(uri), result_(result)
+{}
+
+URIResult::~URIResult() {}
 
 } // namespace aria2
diff --git a/src/URIResult.h b/src/URIResult.h
index bef47b34..9358e2d6 100644
--- a/src/URIResult.h
+++ b/src/URIResult.h
@@ -52,6 +52,8 @@ private:
 public:
   URIResult(const std::string& uri, downloadresultcode::RESULT result);
 
+  ~URIResult();
+
   const std::string& getURI() const
   {
     return uri_;
diff --git a/src/UTMetadataDataExtensionMessage.cc b/src/UTMetadataDataExtensionMessage.cc
index 59455409..75166108 100644
--- a/src/UTMetadataDataExtensionMessage.cc
+++ b/src/UTMetadataDataExtensionMessage.cc
@@ -55,6 +55,8 @@ UTMetadataDataExtensionMessage::UTMetadataDataExtensionMessage
                              tracker_(0),
                              logger_(LogFactory::getInstance()) {}
 
+UTMetadataDataExtensionMessage::~UTMetadataDataExtensionMessage() {}
+
 std::string UTMetadataDataExtensionMessage::getPayload()
 {
   Dict dict;
@@ -106,4 +108,21 @@ void UTMetadataDataExtensionMessage::doReceivedAction()
   }
 }
 
+void UTMetadataDataExtensionMessage::setData(const std::string& data)
+{
+  data_ = data;
+}
+
+void UTMetadataDataExtensionMessage::setPieceStorage
+(const SharedHandle<PieceStorage>& pieceStorage)
+{
+  pieceStorage_ = pieceStorage;
+}
+
+void UTMetadataDataExtensionMessage::setDownloadContext
+(const SharedHandle<DownloadContext>& dctx)
+{
+  dctx_ = dctx;
+}
+
 } // namespace aria2
diff --git a/src/UTMetadataDataExtensionMessage.h b/src/UTMetadataDataExtensionMessage.h
index 7c8d7e3f..e4a70862 100644
--- a/src/UTMetadataDataExtensionMessage.h
+++ b/src/UTMetadataDataExtensionMessage.h
@@ -60,6 +60,8 @@ private:
 public:
   UTMetadataDataExtensionMessage(uint8_t extensionMessageID);
 
+  ~UTMetadataDataExtensionMessage();
+
   virtual std::string getPayload();
 
   virtual std::string toString() const;
@@ -76,30 +78,21 @@ public:
     return totalSize_;
   }
 
-  void setData(const std::string& data)
-  {
-    data_ = data;
-  }
+  void setData(const std::string& data);
 
   const std::string& getData() const
   {
     return data_;
   }
 
-  void setPieceStorage(const SharedHandle<PieceStorage>& pieceStorage)
-  {
-    pieceStorage_ = pieceStorage;
-  }
+  void setPieceStorage(const SharedHandle<PieceStorage>& pieceStorage);
 
   void setUTMetadataRequestTracker(UTMetadataRequestTracker* tracker)
   {
     tracker_ = tracker;
   }
 
-  void setDownloadContext(const SharedHandle<DownloadContext>& dctx)
-  {
-    dctx_ = dctx;
-  }
+  void setDownloadContext(const SharedHandle<DownloadContext>& dctx);
 };
 
 } // namespace aria2
diff --git a/src/UTMetadataRequestExtensionMessage.cc b/src/UTMetadataRequestExtensionMessage.cc
index f5c1379b..380a75c8 100644
--- a/src/UTMetadataRequestExtensionMessage.cc
+++ b/src/UTMetadataRequestExtensionMessage.cc
@@ -57,6 +57,8 @@ UTMetadataRequestExtensionMessage::UTMetadataRequestExtensionMessage
                              messageFactory_(0)
 {}
 
+UTMetadataRequestExtensionMessage::~UTMetadataRequestExtensionMessage() {}
+
 std::string UTMetadataRequestExtensionMessage::getPayload()
 {
   Dict dict;
@@ -102,4 +104,15 @@ void UTMetadataRequestExtensionMessage::doReceivedAction()
   }
 }
 
+void UTMetadataRequestExtensionMessage::setDownloadContext
+(const SharedHandle<DownloadContext>& dctx)
+{
+  dctx_ = dctx;
+}
+
+void UTMetadataRequestExtensionMessage::setPeer(const SharedHandle<Peer>& peer)
+{
+  peer_ = peer;
+}
+
 } // namespace aria2
diff --git a/src/UTMetadataRequestExtensionMessage.h b/src/UTMetadataRequestExtensionMessage.h
index 91631192..12ea1436 100644
--- a/src/UTMetadataRequestExtensionMessage.h
+++ b/src/UTMetadataRequestExtensionMessage.h
@@ -56,16 +56,15 @@ private:
 public:
   UTMetadataRequestExtensionMessage(uint8_t extensionMessageID);
 
+  ~UTMetadataRequestExtensionMessage();
+
   virtual std::string getPayload();
 
   virtual std::string toString() const;
 
   virtual void doReceivedAction();
 
-  void setDownloadContext(const SharedHandle<DownloadContext>& dctx)
-  {
-    dctx_ = dctx;
-  }
+  void setDownloadContext(const SharedHandle<DownloadContext>& dctx);
 
   void setBtMessageDispatcher(BtMessageDispatcher* disp)
   {
@@ -77,10 +76,7 @@ public:
     messageFactory_ = factory;
   }
 
-  void setPeer(const SharedHandle<Peer>& peer)
-  {
-    peer_ = peer;
-  }
+  void setPeer(const SharedHandle<Peer>& peer);
 };
 
 } // namespace aria2
diff --git a/src/UnionSeedCriteria.cc b/src/UnionSeedCriteria.cc
new file mode 100644
index 00000000..d2785b71
--- /dev/null
+++ b/src/UnionSeedCriteria.cc
@@ -0,0 +1,81 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2010 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#include "UnionSeedCriteria.h"
+
+#include <algorithm>
+
+namespace aria2 {
+
+namespace {
+class Reset {
+public:
+  void operator()(const SharedHandle<SeedCriteria>& cri)
+  {
+    cri->reset();
+  }
+};
+} // namespace
+
+namespace {
+class Eval {
+public:
+  bool operator()(const SharedHandle<SeedCriteria>& cri)
+  {
+    return cri->evaluate();
+  }
+};
+} // namespace
+
+UnionSeedCriteria::UnionSeedCriteria() {}
+UnionSeedCriteria::~UnionSeedCriteria() {}
+
+void UnionSeedCriteria::reset()
+{
+  std::for_each(criterion_.begin(), criterion_.end(), Reset());
+}
+
+bool UnionSeedCriteria::evaluate()
+{
+  std::vector<SharedHandle<SeedCriteria> >::iterator itr =
+    std::find_if(criterion_.begin(), criterion_.end(), Eval());
+  return itr != criterion_.end();
+}
+
+void UnionSeedCriteria::addSeedCriteria(const SharedHandle<SeedCriteria>& cri)
+{
+  criterion_.push_back(cri);
+}
+
+} // namespace aria2
diff --git a/src/UnionSeedCriteria.h b/src/UnionSeedCriteria.h
index 216039db..22af8f40 100644
--- a/src/UnionSeedCriteria.h
+++ b/src/UnionSeedCriteria.h
@@ -36,7 +36,7 @@
 #define D_UNION_SEED_CRITERIA_H
 
 #include "SeedCriteria.h"
-#include <algorithm>
+
 #include <vector>
 
 namespace aria2 {
@@ -44,43 +44,15 @@ namespace aria2 {
 class UnionSeedCriteria : public SeedCriteria {
 private:
   std::vector<SharedHandle<SeedCriteria> > criterion_;
-
-  class Reset {
-  public:
-    void operator()(const SharedHandle<SeedCriteria>& cri)
-    {
-      cri->reset();
-    }
-  };
-
-  class Eval {
-  public:
-    bool operator()(const SharedHandle<SeedCriteria>& cri)
-    {
-      return cri->evaluate();
-    }
-  };
 public:
-  UnionSeedCriteria() {}
-  virtual ~UnionSeedCriteria() {}
-
+  UnionSeedCriteria();
+  virtual ~UnionSeedCriteria();
     
-  virtual void reset()
-  {
-    std::for_each(criterion_.begin(), criterion_.end(), Reset());
-  }
+  virtual void reset();
 
-  virtual bool evaluate()
-  {
-    std::vector<SharedHandle<SeedCriteria> >::iterator itr =
-      std::find_if(criterion_.begin(), criterion_.end(), Eval());
-    return itr != criterion_.end();
-  }
+  virtual bool evaluate();
 
-  void addSeedCriteria(const SharedHandle<SeedCriteria>& cri)
-  {
-    criterion_.push_back(cri);
-  }
+  void addSeedCriteria(const SharedHandle<SeedCriteria>& cri);
 
   const std::vector<SharedHandle<SeedCriteria> >& getSeedCriterion() const
   {
diff --git a/src/ValueBase.cc b/src/ValueBase.cc
index ddc11f51..5048970d 100644
--- a/src/ValueBase.cc
+++ b/src/ValueBase.cc
@@ -49,6 +49,8 @@ String::String(const unsigned char* data, size_t length):
 
 String::String() {}
 
+String::~String() {}
+
 const String::ValueType& String::s() const
 {
   return str_;
@@ -78,6 +80,8 @@ Integer::Integer(ValueType integer):integer_(integer) {}
 
 Integer::Integer():integer_(0) {}
 
+Integer::~Integer() {}
+
 Integer::ValueType Integer::i() const
 {
   return integer_;
@@ -95,6 +99,8 @@ void Integer::accept(ValueBaseVisitor& v) const
 
 List::List() {}
 
+List::~List() {}
+
 const SharedHandle<ValueBase>& List::get(size_t index) const
 {
   return list_[index];
@@ -168,6 +174,8 @@ void List::accept(ValueBaseVisitor& v) const
 
 Dict::Dict() {}
 
+Dict::~Dict() {}
+
 void Dict::put(const std::string& key, const SharedHandle<ValueBase>& vlb)
 {
   ValueType::value_type p = std::make_pair(key, vlb);
diff --git a/src/ValueBase.h b/src/ValueBase.h
index 3f907923..a262b853 100644
--- a/src/ValueBase.h
+++ b/src/ValueBase.h
@@ -87,7 +87,13 @@ public:
   String(const unsigned char* data, size_t length);
 
   String();
-  
+
+  ~String();
+
+  // Don't allow copying
+  String(const String&);
+  String& operator=(const String&);
+
   const ValueType& s() const;
 
   // Returns std::string.data() casted to unsigned char*.
@@ -111,6 +117,12 @@ public:
 
   Integer();
 
+  ~Integer();
+
+  // Don't allow copying
+  Integer(const Integer&);
+  Integer& operator=(const Integer&);
+
   // Returns Integer.
   ValueType i() const;
 
@@ -127,6 +139,12 @@ public:
 
   List();
 
+  ~List();
+
+  // Don't allow copying
+  List(const List&);
+  List& operator=(const List&);
+
   // Appends given v to list.
   void append(const SharedHandle<ValueBase>& v);
 
@@ -180,6 +198,12 @@ public:
 
   Dict();
 
+  ~Dict();
+
+  // Don't allow copying
+  Dict(const Dict&);
+  Dict& operator=(const Dict&);
+
   void put(const std::string& key, const SharedHandle<ValueBase>& vlb);
 
   // Putting string is so common that we provide shortcut function.
diff --git a/src/XML2SAXMetalinkProcessor.cc b/src/XML2SAXMetalinkProcessor.cc
index e5ffca2a..1410f4d2 100644
--- a/src/XML2SAXMetalinkProcessor.cc
+++ b/src/XML2SAXMetalinkProcessor.cc
@@ -179,6 +179,10 @@ xmlSAXHandler mySAXHandler =
   };
 } // namespace
 
+MetalinkProcessor::MetalinkProcessor() {}
+
+MetalinkProcessor::~MetalinkProcessor() {}
+
 SharedHandle<Metalinker>
 MetalinkProcessor::parseFile(const std::string& filename)
 {
diff --git a/src/XML2SAXMetalinkProcessor.h b/src/XML2SAXMetalinkProcessor.h
index 54068ebe..7ce8d1fe 100644
--- a/src/XML2SAXMetalinkProcessor.h
+++ b/src/XML2SAXMetalinkProcessor.h
@@ -54,6 +54,10 @@ class MetalinkProcessor {
 private:
   SharedHandle<MetalinkParserStateMachine> stm_;
 public:
+  MetalinkProcessor();
+
+  ~MetalinkProcessor();
+
   SharedHandle<Metalinker> parseFile(const std::string& filename);
 
   SharedHandle<Metalinker> parseFromBinaryStream
diff --git a/src/Xml2XmlRpcRequestProcessor.cc b/src/Xml2XmlRpcRequestProcessor.cc
index 181b8f5d..545f9c69 100644
--- a/src/Xml2XmlRpcRequestProcessor.cc
+++ b/src/Xml2XmlRpcRequestProcessor.cc
@@ -144,6 +144,10 @@ xmlSAXHandler mySAXHandler =
   };
 } // namespace
 
+XmlRpcRequestProcessor::XmlRpcRequestProcessor() {}
+
+XmlRpcRequestProcessor::~XmlRpcRequestProcessor() {}
+
 XmlRpcRequest
 XmlRpcRequestProcessor::parseMemory(const std::string& xml)
 {
diff --git a/src/Xml2XmlRpcRequestProcessor.h b/src/Xml2XmlRpcRequestProcessor.h
index 0fe9092a..631c4ed0 100644
--- a/src/Xml2XmlRpcRequestProcessor.h
+++ b/src/Xml2XmlRpcRequestProcessor.h
@@ -52,6 +52,10 @@ class XmlRpcRequestProcessor {
 private:
   SharedHandle<XmlRpcRequestParserStateMachine> stm_;
 public:
+  XmlRpcRequestProcessor();
+
+  ~XmlRpcRequestProcessor();
+
   XmlRpcRequest parseMemory(const std::string& xml);
 };
 
diff --git a/src/XmlRpcMethod.cc b/src/XmlRpcMethod.cc
index cb43470b..b0209a4b 100644
--- a/src/XmlRpcMethod.cc
+++ b/src/XmlRpcMethod.cc
@@ -61,6 +61,8 @@ XmlRpcMethod::XmlRpcMethod():
   optionParser_(OptionParser::getInstance()),
   logger_(LogFactory::getInstance()) {}
 
+XmlRpcMethod::~XmlRpcMethod() {}
+
 SharedHandle<ValueBase> XmlRpcMethod::createErrorResponse
 (const Exception& e)
 {
diff --git a/src/XmlRpcMethod.h b/src/XmlRpcMethod.h
index e51efe5c..3a875ed6 100644
--- a/src/XmlRpcMethod.h
+++ b/src/XmlRpcMethod.h
@@ -100,7 +100,7 @@ protected:
 public:
   XmlRpcMethod();
 
-  virtual ~XmlRpcMethod() {}
+  virtual ~XmlRpcMethod();
 
   // Do work to fulfill XmlRpcRequest req and returns its result as
   // XmlRpcResponse. This method delegates to process() method.
diff --git a/src/XmlRpcRequest.cc b/src/XmlRpcRequest.cc
index 5dce9944..08d58b68 100644
--- a/src/XmlRpcRequest.cc
+++ b/src/XmlRpcRequest.cc
@@ -38,6 +38,26 @@ namespace aria2 {
 
 namespace xmlrpc {
 
+XmlRpcRequest::XmlRpcRequest(const std::string& methodName,
+                             const SharedHandle<List>& params)
+  : methodName(methodName), params(params)
+{}
+
+XmlRpcRequest::XmlRpcRequest(const XmlRpcRequest& c)
+  : methodName(c.methodName), params(c.params)
+{}
+
+XmlRpcRequest::~XmlRpcRequest() {}
+
+XmlRpcRequest& XmlRpcRequest::operator=(const XmlRpcRequest& c)
+{
+  if(this != &c) {
+    methodName = c.methodName;
+    params = c.params;
+  }
+  return *this;
+}
+
 const String* XmlRpcRequest::getStringParam(size_t index) const
 {
   const String* stringParam = 0;
diff --git a/src/XmlRpcRequest.h b/src/XmlRpcRequest.h
index 3d338aef..5b654e03 100644
--- a/src/XmlRpcRequest.h
+++ b/src/XmlRpcRequest.h
@@ -50,8 +50,13 @@ struct XmlRpcRequest {
   SharedHandle<List> params;
 
   XmlRpcRequest(const std::string& methodName,
-                const SharedHandle<List>& params):
-    methodName(methodName), params(params) {}
+                const SharedHandle<List>& params);
+
+  ~XmlRpcRequest();
+
+  XmlRpcRequest(const XmlRpcRequest& c);
+
+  XmlRpcRequest& operator=(const XmlRpcRequest& c);
 
   const String* getStringParam(size_t index) const;
 
diff --git a/src/XmlRpcResponse.cc b/src/XmlRpcResponse.cc
index 81b966b8..a4d586f0 100644
--- a/src/XmlRpcResponse.cc
+++ b/src/XmlRpcResponse.cc
@@ -116,6 +116,27 @@ std::string encodeAll
 }
 } // namespace
 
+XmlRpcResponse::XmlRpcResponse
+(int code, const SharedHandle<ValueBase>& param)
+  : code(code), param(param)
+{}
+
+XmlRpcResponse::XmlRpcResponse(const XmlRpcResponse& c)
+  : code(c.code),
+    param(c.param)
+{}
+
+XmlRpcResponse::~XmlRpcResponse() {}
+
+XmlRpcResponse& XmlRpcResponse::operator=(const XmlRpcResponse& c)
+{
+  if(this != &c) {
+    code = c.code;
+    param = c.param;
+  }
+  return *this;
+}
+
 std::string XmlRpcResponse::toXml(bool gzip) const
 {
   if(gzip) {
diff --git a/src/XmlRpcResponse.h b/src/XmlRpcResponse.h
index e784ba60..eea95e0d 100644
--- a/src/XmlRpcResponse.h
+++ b/src/XmlRpcResponse.h
@@ -51,8 +51,13 @@ struct XmlRpcResponse {
   
   SharedHandle<ValueBase> param;
 
-  XmlRpcResponse
-  (int code, const SharedHandle<ValueBase>& param):code(code), param(param) {}
+  XmlRpcResponse(int code, const SharedHandle<ValueBase>& param);
+
+  XmlRpcResponse(const XmlRpcResponse& c);
+
+  ~XmlRpcResponse();
+
+  XmlRpcResponse& operator=(const XmlRpcResponse& c);
 
   std::string toXml(bool gzip = false) const;
 };
diff --git a/src/bittorrent_helper.cc b/src/bittorrent_helper.cc
index d5c420af..8a584843 100644
--- a/src/bittorrent_helper.cc
+++ b/src/bittorrent_helper.cc
@@ -57,6 +57,7 @@
 #include "SocketCore.h"
 #include "Option.h"
 #include "prefs.h"
+#include "FileEntry.h"
 
 namespace aria2 {
 
diff --git a/src/uri.cc b/src/uri.cc
index cee5589a..6c4b4685 100644
--- a/src/uri.cc
+++ b/src/uri.cc
@@ -41,6 +41,42 @@ namespace aria2 {
 
 namespace uri {
 
+UriStruct::UriStruct()
+  : port(0), hasPassword(false), ipv6LiteralAddress(false)
+{}
+
+UriStruct::UriStruct(const UriStruct& c)
+  : protocol(c.protocol),
+    host(c.host),
+    port(c.port),
+    dir(c.dir),
+    file(c.file),
+    query(c.query),
+    username(c.username),
+    password(c.password),
+    hasPassword(c.hasPassword),
+    ipv6LiteralAddress(c.ipv6LiteralAddress)
+{}
+
+UriStruct::~UriStruct() {}
+
+UriStruct& UriStruct::operator=(const UriStruct& c)
+{
+  if(this != &c) {
+    protocol = c.protocol;
+    host = c.host;
+    port = c.port;
+    dir = c.dir;
+    file = c.file;
+    query = c.query;
+    username = c.username;
+    password = c.password;
+    hasPassword = c.hasPassword;
+    ipv6LiteralAddress = c.ipv6LiteralAddress;
+  }
+  return *this;
+}
+
 bool parse(UriStruct& result, const std::string& uri)
 {
   // http://user:password@aria2.sourceforge.net:80/dir/file?query#fragment
diff --git a/src/uri.h b/src/uri.h
index 97ed7ac6..48ed3562 100644
--- a/src/uri.h
+++ b/src/uri.h
@@ -38,7 +38,6 @@
 #include "common.h"
 
 #include <string>
-#include "A2STR.h"
 
 namespace aria2 {
 
@@ -56,7 +55,11 @@ struct UriStruct {
   bool hasPassword;
   bool ipv6LiteralAddress;
 
-  UriStruct():port(0), hasPassword(false), ipv6LiteralAddress(false) {}
+  UriStruct();
+  UriStruct(const UriStruct& c);
+  ~UriStruct();
+
+  UriStruct& operator=(const UriStruct& c);
 };
 
 // Splits URI uri into components and stores them into result.  On
diff --git a/test/DownloadHelperTest.cc b/test/DownloadHelperTest.cc
index dd61859c..9cecee44 100644
--- a/test/DownloadHelperTest.cc
+++ b/test/DownloadHelperTest.cc
@@ -13,6 +13,7 @@
 #include "prefs.h"
 #include "Exception.h"
 #include "util.h"
+#include "FileEntry.h"
 #ifdef ENABLE_BITTORRENT
 # include "bittorrent_helper.h"
 #endif // ENABLE_BITTORRENT
diff --git a/test/LpdMessageReceiverTest.cc b/test/LpdMessageReceiverTest.cc
index 7bd468f8..98673970 100644
--- a/test/LpdMessageReceiverTest.cc
+++ b/test/LpdMessageReceiverTest.cc
@@ -11,6 +11,7 @@
 #include "BtConstants.h"
 #include "LpdMessage.h"
 #include "LpdMessageDispatcher.h"
+#include "Peer.h"
 
 namespace aria2 {
 
diff --git a/test/Metalink2RequestGroupTest.cc b/test/Metalink2RequestGroupTest.cc
index a3745a1f..d2fc13fc 100644
--- a/test/Metalink2RequestGroupTest.cc
+++ b/test/Metalink2RequestGroupTest.cc
@@ -9,6 +9,7 @@
 #include "Option.h"
 #include "RequestGroup.h"
 #include "FileEntry.h"
+#include "Signature.h"
 
 namespace aria2 {
 
diff --git a/test/OptionHandlerTest.cc b/test/OptionHandlerTest.cc
index 720ae75f..bf549231 100644
--- a/test/OptionHandlerTest.cc
+++ b/test/OptionHandlerTest.cc
@@ -2,6 +2,7 @@
 
 #include <cppunit/extensions/HelperMacros.h>
 
+#include "Option.h"
 #include "prefs.h"
 #include "Exception.h"
 
diff --git a/test/SegmentManTest.cc b/test/SegmentManTest.cc
index 7afa8283..463f2dbe 100644
--- a/test/SegmentManTest.cc
+++ b/test/SegmentManTest.cc
@@ -8,6 +8,8 @@
 #include "Segment.h"
 #include "Option.h"
 #include "PieceSelector.h"
+#include "FileEntry.h"
+#include "PeerStat.h"
 
 namespace aria2 {
 
diff --git a/test/SessionSerializerTest.cc b/test/SessionSerializerTest.cc
index 10b96618..1a693da3 100644
--- a/test/SessionSerializerTest.cc
+++ b/test/SessionSerializerTest.cc
@@ -6,11 +6,11 @@
 #include <cppunit/extensions/HelperMacros.h>
 
 #include "RequestGroupMan.h"
-#include "ServerStatMan.h"
 #include "array_fun.h"
 #include "download_helper.h"
-#include "FileEntry.h"
 #include "prefs.h"
+#include "Option.h"
+#include "a2functional.h"
 
 namespace aria2 {
 
diff --git a/test/XmlRpcMethodTest.cc b/test/XmlRpcMethodTest.cc
index 4c8c97b6..60002624 100644
--- a/test/XmlRpcMethodTest.cc
+++ b/test/XmlRpcMethodTest.cc
@@ -6,7 +6,6 @@
 #include "SelectEventPoll.h"
 #include "Option.h"
 #include "RequestGroupMan.h"
-#include "ServerStatMan.h"
 #include "RequestGroup.h"
 #include "XmlRpcMethodImpl.h"
 #include "OptionParser.h"
@@ -20,15 +19,10 @@
 #include "util.h"
 #include "array_fun.h"
 #include "download_helper.h"
-#include "FileAllocationEntry.h"
-#include "CheckIntegrityEntry.h"
+#include "FileEntry.h"
 #ifdef ENABLE_BITTORRENT
 # include "BtRegistry.h"
 # include "BtRuntime.h"
-# include "PieceStorage.h"
-# include "PeerStorage.h"
-# include "BtProgressInfoFile.h"
-# include "BtAnnounce.h"
 # include "bittorrent_helper.h"
 #endif // ENABLE_BITTORRENT