Sort and cleanup src/Makefile.am

src/Makefile.am

@@ -1,269 +1,270 @@
 SUBDIRS = includes
 bin_PROGRAMS = aria2c
 aria2c_SOURCES = main.cc
-SRCS =  option_processing.cc\
-	version_usage.cc\
-	Context.cc Context.h\
-	SocketCore.cc SocketCore.h\
-	BinaryStream.h\
-	Command.cc Command.h\
+SRCS =  \
+	a2algo.h\
+	a2functional.h\
+	a2io.h\
+	a2iterator.h\
+	a2netcompat.h\
+	A2STR.cc A2STR.h\
+	a2time.h\
+	AbstractAuthResolver.cc AbstractAuthResolver.h\
 	AbstractCommand.cc AbstractCommand.h\
-	InitiateConnectionCommandFactory.cc InitiateConnectionCommandFactory.h\
-	DownloadCommand.cc DownloadCommand.h\
-	HttpInitiateConnectionCommand.cc HttpInitiateConnectionCommand.h\
-	HttpRequestCommand.cc HttpRequestCommand.h\
-	HttpResponseCommand.cc HttpResponseCommand.h\
-	HttpProxyRequestCommand.cc HttpProxyRequestCommand.h\
-	HttpProxyResponseCommand.cc HttpProxyResponseCommand.h\
-	HttpDownloadCommand.cc HttpDownloadCommand.h\
-	HttpHeader.cc HttpHeader.h\
-	HttpConnection.cc HttpConnection.h\
-	FtpConnection.cc FtpConnection.h\
-	FtpInitiateConnectionCommand.cc FtpInitiateConnectionCommand.h\
-	FtpNegotiationCommand.cc FtpNegotiationCommand.h\
-	FtpDownloadCommand.cc FtpDownloadCommand.h\
-	FtpTunnelRequestCommand.cc FtpTunnelRequestCommand.h\
-	FtpTunnelResponseCommand.cc FtpTunnelResponseCommand.h\
-	DownloadEngine.cc DownloadEngine.h\
-	Segment.h\
-	GrowSegment.cc GrowSegment.h\
-	PiecedSegment.cc PiecedSegment.h\
-	SegmentMan.cc SegmentMan.h\
-	util.cc util.h\
-	Request.cc Request.h\
-	common.h\
-	message.h\
-	Exception.cc Exception.h\
-	FatalException.cc FatalException.h\
-	RecoverableException.cc RecoverableException.h\
-	DlAbortEx.cc DlAbortEx.h\
-	DlRetryEx.cc DlRetryEx.h\
-	DownloadFailureException.cc DownloadFailureException.h\
-	Logger.cc Logger.h\
-	fmt.cc fmt.h\
-	DiskWriter.h\
-	DiskWriterFactory.h\
 	AbstractDiskWriter.cc AbstractDiskWriter.h\
-	DefaultDiskWriter.cc DefaultDiskWriter.h\
-	DefaultDiskWriterFactory.cc DefaultDiskWriterFactory.h\
-	File.cc File.h\
-	Option.cc Option.h\
-	base64.h\
-	base32.cc base32.h\
-	LogFactory.cc LogFactory.h\
-	TimerA2.cc TimerA2.h\
-	TimeA2.cc TimeA2.h\
-	FeatureConfig.cc FeatureConfig.h\
-	DownloadEngineFactory.cc DownloadEngineFactory.h\
-	SpeedCalc.cc SpeedCalc.h\
-	PeerStat.cc PeerStat.h\
-	NetStat.cc NetStat.h\
-	BitfieldMan.cc BitfieldMan.h\
-	Randomizer.h\
-	SimpleRandomizer.cc SimpleRandomizer.h\
-	HttpResponse.cc HttpResponse.h\
-	HttpRequest.cc HttpRequest.h\
-	Range.cc Range.h\
+	AbstractHttpServerResponseCommand.cc \
+	AbstractHttpServerResponseCommand.h \
+	AbstractOptionHandler.cc AbstractOptionHandler.h\
 	AbstractProxyRequestCommand.cc AbstractProxyRequestCommand.h\
 	AbstractProxyResponseCommand.cc AbstractProxyResponseCommand.h\
-	Netrc.cc Netrc.h\
+	AbstractSingleDiskAdaptor.cc AbstractSingleDiskAdaptor.h\
+	AdaptiveFileAllocationIterator.cc AdaptiveFileAllocationIterator.h\
+	AdaptiveURISelector.cc AdaptiveURISelector.h\
+	AnonDiskWriterFactory.h\
+	array_fun.h\
 	AuthConfig.cc AuthConfig.h\
-	AuthResolver.h\
-	AbstractAuthResolver.cc AbstractAuthResolver.h\
-	DefaultAuthResolver.cc DefaultAuthResolver.h\
-	NetrcAuthResolver.cc NetrcAuthResolver.h\
 	AuthConfigFactory.cc AuthConfigFactory.h\
-	OptionParser.cc OptionParser.h\
-	OptionHandlerFactory.cc OptionHandlerFactory.h\
-	OptionHandler.cc OptionHandler.h\
-	OptionHandlerImpl.cc OptionHandlerImpl.h\
-	AbstractOptionHandler.cc AbstractOptionHandler.h\
-	NameResolver.cc NameResolver.h\
-	RequestGroup.cc RequestGroup.h\
-	RequestGroupMan.cc RequestGroupMan.h\
-	FileAllocationMan.h\
-	FileAllocationCommand.cc FileAllocationCommand.h\
-	FillRequestGroupCommand.cc FillRequestGroupCommand.h\
-	FileAllocationDispatcherCommand.cc FileAllocationDispatcherCommand.h\
-	FileAllocationEntry.cc FileAllocationEntry.h\
-	StreamFileAllocationEntry.cc StreamFileAllocationEntry.h\
-	MultiUrlRequestInfo.cc MultiUrlRequestInfo.h\
-	UriListParser.cc UriListParser.h\
-	RealtimeCommand.cc RealtimeCommand.h\
-	ProgressAwareEntry.h\
-	RequestGroupEntry.cc RequestGroupEntry.h\
-	Cookie.cc Cookie.h\
-	HttpHeaderProcessor.cc HttpHeaderProcessor.h\
-	FileEntry.cc FileEntry.h\
-	Platform.cc Platform.h\
-	TimeBasedCommand.cc TimeBasedCommand.h\
+	AuthResolver.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\
+	BackupIPv4ConnectCommand.h BackupIPv4ConnectCommand.cc\
+	base32.cc base32.h\
+	base64.h\
+	BinaryStream.h\
+	bitfield.cc bitfield.h\
+	BitfieldMan.cc BitfieldMan.h\
 	BtProgressInfoFile.h\
-	DefaultBtProgressInfoFile.cc DefaultBtProgressInfoFile.h\
-	NullProgressInfoFile.h\
-	FileAllocationIterator.h\
-	SingleFileAllocationIterator.cc SingleFileAllocationIterator.h\
-	RequestGroupCriteria.h\
+	BufferedFile.cc BufferedFile.h\
+	ByteArrayDiskWriter.cc ByteArrayDiskWriter.h\
+	ByteArrayDiskWriterFactory.h\
+	CheckIntegrityCommand.cc CheckIntegrityCommand.h\
+	CheckIntegrityDispatcherCommand.cc CheckIntegrityDispatcherCommand.h\
+	CheckIntegrityEntry.cc CheckIntegrityEntry.h\
+	CheckIntegrityMan.h\
+	Checksum.cc Checksum.h\
+	ChecksumCheckIntegrityEntry.cc ChecksumCheckIntegrityEntry.h\
+	ChunkChecksum.cc ChunkChecksum.h\
+	ChunkedDecodingStreamFilter.cc ChunkedDecodingStreamFilter.h\
+	ColorizedStream.cc ColorizedStream.h\
+	Command.cc Command.h\
+	common.h\
+	ConnectCommand.cc ConnectCommand.h\
+	console.cc console.h\
+	ConsoleStatCalc.cc ConsoleStatCalc.h\
 	ContentTypeRequestGroupCriteria.cc ContentTypeRequestGroupCriteria.h\
+	Context.cc Context.h\
+	ContextAttribute.cc ContextAttribute.h\
+	ControlChain.h\
+	Cookie.cc Cookie.h\
+	CookieStorage.cc CookieStorage.h\
+	cookie_helper.cc cookie_helper.h\
+	CreateRequestCommand.cc CreateRequestCommand.h\
+	CUIDCounter.cc CUIDCounter.h\
+	DefaultAuthResolver.cc DefaultAuthResolver.h\
+	DefaultBtProgressInfoFile.cc DefaultBtProgressInfoFile.h\
+	DefaultDiskWriter.cc DefaultDiskWriter.h\
+	DefaultDiskWriterFactory.cc DefaultDiskWriterFactory.h\
+	DefaultPieceStorage.cc DefaultPieceStorage.h\
+	DefaultStreamPieceSelector.cc DefaultStreamPieceSelector.h\
+	Dependency.h\
+	DirectDiskAdaptor.cc DirectDiskAdaptor.h\
+	DiskAdaptor.cc DiskAdaptor.h\
+	DiskWriter.h\
+	DiskWriterFactory.h\
+	DlAbortEx.cc DlAbortEx.h\
+	DlRetryEx.cc DlRetryEx.h\
+	DNSCache.cc DNSCache.h\
+	DownloadCommand.cc DownloadCommand.h\
+	DownloadContext.cc DownloadContext.h\
+	DownloadEngine.cc DownloadEngine.h\
+	DownloadEngineFactory.cc DownloadEngineFactory.h\
+	DownloadFailureException.cc DownloadFailureException.h\
 	DownloadHandler.cc DownloadHandler.h\
 	DownloadHandlerConstants.cc DownloadHandlerConstants.h\
+	DownloadResult.cc DownloadResult.h\
 	download_handlers.cc download_handlers.h\
-	MemoryPreDownloadHandler.h\
-	MemoryBufferPreDownloadHandler.h\
+	download_helper.cc download_helper.h\
+	error_code.h\
+	Event.h\
+	EventPoll.h\
+	Exception.cc Exception.h\
+	FatalException.cc FatalException.h\
+	FeatureConfig.cc FeatureConfig.h\
+	FeedbackURISelector.cc FeedbackURISelector.h\
+	File.cc File.h\
+	FileAllocationCommand.cc FileAllocationCommand.h\
+	FileAllocationDispatcherCommand.cc FileAllocationDispatcherCommand.h\
+	FileAllocationEntry.cc FileAllocationEntry.h\
+	FileAllocationIterator.h\
+	FileAllocationMan.h\
+	FileEntry.cc FileEntry.h\
+	FillRequestGroupCommand.cc FillRequestGroupCommand.h\
+	fmt.cc fmt.h\
+	FtpConnection.cc FtpConnection.h\
+	FtpDownloadCommand.cc FtpDownloadCommand.h\
+	FtpFinishDownloadCommand.cc FtpFinishDownloadCommand.h\
+	FtpInitiateConnectionCommand.cc FtpInitiateConnectionCommand.h\
+	FtpNegotiationCommand.cc FtpNegotiationCommand.h\
+	FtpNegotiationConnectChain.h\
+	FtpTunnelRequestCommand.cc FtpTunnelRequestCommand.h\
+	FtpTunnelRequestConnectChain.h\
+	FtpTunnelResponseCommand.cc FtpTunnelResponseCommand.h\
+	GenericParser.h\
+	GeomStreamPieceSelector.cc GeomStreamPieceSelector.h\
+	GroupId.cc GroupId.h\
+	GrowSegment.cc GrowSegment.h\
+	HashFuncEntry.h \
 	HaveEraseCommand.cc HaveEraseCommand.h\
-	Piece.cc Piece.h\
-	CheckIntegrityMan.h\
-	CheckIntegrityEntry.cc CheckIntegrityEntry.h\
-	PieceHashCheckIntegrityEntry.cc PieceHashCheckIntegrityEntry.h\
-	StreamCheckIntegrityEntry.cc StreamCheckIntegrityEntry.h\
+	help_tags.cc help_tags.h\
+	HttpConnection.cc HttpConnection.h\
+	HttpDownloadCommand.cc HttpDownloadCommand.h\
+	HttpHeader.cc HttpHeader.h\
+	HttpHeaderProcessor.cc HttpHeaderProcessor.h\
+	HttpInitiateConnectionCommand.cc HttpInitiateConnectionCommand.h\
+	HttpListenCommand.cc HttpListenCommand.h\
+	HttpProxyRequestCommand.cc HttpProxyRequestCommand.h\
+	HttpProxyRequestConnectChain.h\
+	HttpProxyResponseCommand.cc HttpProxyResponseCommand.h\
+	HttpRequest.cc HttpRequest.h\
+	HttpRequestCommand.cc HttpRequestCommand.h\
+	HttpRequestConnectChain.h\
+	HttpResponse.cc HttpResponse.h\
+	HttpResponseCommand.cc HttpResponseCommand.h\
+	HttpServer.cc HttpServer.h\
+	HttpServerBodyCommand.cc HttpServerBodyCommand.h\
+	HttpServerCommand.cc HttpServerCommand.h\
+	HttpServerResponseCommand.cc HttpServerResponseCommand.h\
+	HttpSkipResponseCommand.cc HttpSkipResponseCommand.h\
+	IndexedList.h\
+	InitiateConnectionCommand.cc InitiateConnectionCommand.h\
+	InitiateConnectionCommandFactory.cc InitiateConnectionCommandFactory.h\
+	InorderStreamPieceSelector.cc InorderStreamPieceSelector.h\
+	InorderURISelector.cc InorderURISelector.h\
+	IOFile.cc IOFile.h\
+	IteratableChecksumValidator.cc IteratableChecksumValidator.h\
+	IteratableChunkChecksumValidator.cc IteratableChunkChecksumValidator.h\
 	IteratableValidator.h\
-	DiskAdaptor.cc DiskAdaptor.h\
-	AbstractSingleDiskAdaptor.cc AbstractSingleDiskAdaptor.h\
-	DirectDiskAdaptor.cc DirectDiskAdaptor.h\
+	json.cc json.h\
+	JsonDiskWriter.h\
+	JsonParser.cc JsonParser.h\
+	Lock.h \
+	LogFactory.cc LogFactory.h\
+	Logger.cc Logger.h\
+	LongestSequencePieceSelector.cc LongestSequencePieceSelector.h\
+	MemoryBufferPreDownloadHandler.h\
+	MemoryPreDownloadHandler.h\
+	message.h\
+	MessageDigest.cc MessageDigest.h\
+	MessageDigestImpl.h\
+	message_digest_helper.cc message_digest_helper.h\
+	MetadataInfo.cc MetadataInfo.h\
+	MetalinkHttpEntry.cc MetalinkHttpEntry.h\
 	MultiDiskAdaptor.cc MultiDiskAdaptor.h\
 	MultiFileAllocationIterator.cc MultiFileAllocationIterator.h\
-	ByteArrayDiskWriter.cc ByteArrayDiskWriter.h\
-	ByteArrayDiskWriterFactory.h\
-	DownloadContext.cc DownloadContext.h\
-	TimedHaltCommand.cc TimedHaltCommand.h\
-	CUIDCounter.cc CUIDCounter.h\
-	DNSCache.cc DNSCache.h\
-	DownloadResult.cc DownloadResult.h\
+	MultiUrlRequestInfo.cc MultiUrlRequestInfo.h\
+	NameResolver.cc NameResolver.h\
+	Netrc.cc Netrc.h\
+	NetrcAuthResolver.cc NetrcAuthResolver.h\
+	NetStat.cc NetStat.h\
+	Notifier.cc Notifier.h\
+	NsCookieParser.cc NsCookieParser.h\
+	NullHandle.h\
+	NullOutputFile.h\
+	NullProgressInfoFile.h\
+	NullSinkStreamFilter.cc NullSinkStreamFilter.h\
+	NullStatCalc.h\
+	Option.cc Option.h\
+	OptionHandler.cc OptionHandler.h\
+	OptionHandlerException.cc OptionHandlerException.h\
+	OptionHandlerFactory.cc OptionHandlerFactory.h\
+	OptionHandlerImpl.cc OptionHandlerImpl.h\
+	OptionParser.cc OptionParser.h\
+	option_processing.cc\
+	OutputFile.h\
+	paramed_string.cc paramed_string.h\
+	PeerStat.cc PeerStat.h\
+	Piece.cc Piece.h\
+	PiecedSegment.cc PiecedSegment.h\
+	PieceHashCheckIntegrityEntry.cc PieceHashCheckIntegrityEntry.h\
+	PieceSelector.h\
+	PieceStatMan.cc PieceStatMan.h\
+	PieceStorage.h\
+	Platform.cc Platform.h\
 	PostDownloadHandler.h\
 	PreDownloadHandler.h\
-	SingletonHolder.h\
-	a2algo.h\
-	a2functional.h\
-	a2io.h\
-	a2netcompat.h\
-	a2time.h\
-	array_fun.h\
-	help_tags.cc help_tags.h\
 	prefs.cc prefs.h\
-	usage_text.h\
+	ProgressAwareEntry.h\
 	ProtocolDetector.cc ProtocolDetector.h\
-	NullStatCalc.h\
-	HttpSkipResponseCommand.cc HttpSkipResponseCommand.h\
-	InitiateConnectionCommand.cc InitiateConnectionCommand.h\
-	FtpFinishDownloadCommand.cc FtpFinishDownloadCommand.h\
-	A2STR.cc A2STR.h\
+	Randomizer.h\
+	Range.cc Range.h\
 	RarestPieceSelector.cc RarestPieceSelector.h\
-	Signature.cc Signature.h\
+	RealtimeCommand.cc RealtimeCommand.h\
+	RecoverableException.cc RecoverableException.h\
+	Request.cc Request.h\
+	RequestGroup.cc RequestGroup.h\
+	RequestGroupCriteria.h\
+	RequestGroupEntry.cc RequestGroupEntry.h\
+	RequestGroupMan.cc RequestGroupMan.h\
+	RpcMethod.cc RpcMethod.h\
+	RpcMethodFactory.cc RpcMethodFactory.h\
+	RpcMethodImpl.cc RpcMethodImpl.h\
+	RpcRequest.cc RpcRequest.h\
+	RpcResponse.cc RpcResponse.h\
+	rpc_helper.cc rpc_helper.h\
+	SaveSessionCommand.h SaveSessionCommand.cc\
+	SegList.h\
+	Segment.h\
+	SegmentMan.cc SegmentMan.h\
+	SelectEventPoll.cc SelectEventPoll.h\
+	SequentialDispatcherCommand.h\
+	SequentialPicker.h\
 	ServerStat.cc ServerStat.h\
 	ServerStatMan.cc ServerStatMan.h\
-	URISelector.h\
-	AdaptiveURISelector.cc AdaptiveURISelector.h\
-	InorderURISelector.cc InorderURISelector.h\
-	FeedbackURISelector.cc FeedbackURISelector.h\
-	NsCookieParser.cc NsCookieParser.h\
-	CookieStorage.cc CookieStorage.h\
+	SessionSerializer.cc SessionSerializer.h\
+	Signature.cc Signature.h\
+	SimpleRandomizer.cc SimpleRandomizer.h\
+	SingleFileAllocationIterator.cc SingleFileAllocationIterator.h\
+	SingletonHolder.h\
+	SinkStreamFilter.cc SinkStreamFilter.h\
 	SocketBuffer.cc SocketBuffer.h\
+	SocketCore.cc SocketCore.h\
 	SocketRecvBuffer.cc SocketRecvBuffer.h\
-	OptionHandlerException.cc OptionHandlerException.h\
-	URIResult.cc URIResult.h\
-	EventPoll.h\
-	SelectEventPoll.cc SelectEventPoll.h\
-	SequentialPicker.h\
-	SequentialDispatcherCommand.h\
-	PieceSelector.h\
-	LongestSequencePieceSelector.cc LongestSequencePieceSelector.h\
-	bitfield.cc bitfield.h\
-	CreateRequestCommand.cc CreateRequestCommand.h\
-	error_code.h\
-	wallclock.cc wallclock.h\
-	download_helper.cc download_helper.h\
-	MetadataInfo.cc MetadataInfo.h\
-	SessionSerializer.cc SessionSerializer.h\
-	Event.h\
+	SpeedCalc.cc SpeedCalc.h\
+	StatCalc.h\
+	StreamCheckIntegrityEntry.cc StreamCheckIntegrityEntry.h\
+	StreamFileAllocationEntry.cc StreamFileAllocationEntry.h\
+	StreamFilter.cc StreamFilter.h\
+	StreamPieceSelector.h\
+	StructParserStateMachine.h\
+	TimeA2.cc TimeA2.h\
+	TimeBasedCommand.cc TimeBasedCommand.h\
+	TimedHaltCommand.cc TimedHaltCommand.h\
+	TimerA2.cc TimerA2.h\
 	timespec.h\
-	ValueBase.cc ValueBase.h\
-	ContextAttribute.cc ContextAttribute.h\
 	TorrentAttribute.cc TorrentAttribute.h\
-	AdaptiveFileAllocationIterator.cc AdaptiveFileAllocationIterator.h\
+	TransferStat.cc TransferStat.h\
 	TruncFileAllocationIterator.cc TruncFileAllocationIterator.h\
-	StreamFilter.cc StreamFilter.h\
-	SinkStreamFilter.cc SinkStreamFilter.h\
-	ChunkedDecodingStreamFilter.cc ChunkedDecodingStreamFilter.h\
-	NullSinkStreamFilter.cc NullSinkStreamFilter.h\
+	UnknownLengthPieceStorage.cc UnknownLengthPieceStorage.h\
+	UnknownOptionException.cc UnknownOptionException.h\
 	uri.cc uri.h\
+	UriListParser.cc UriListParser.h\
+	URIResult.cc URIResult.h\
+	URISelector.h\
 	uri_split.c uri_split.h\
-	cookie_helper.cc cookie_helper.h\
-	json.cc json.h\
-	JsonParser.cc JsonParser.h\
-	StructParserStateMachine.h\
-	GenericParser.h\
+	usage_text.h\
+	util.cc util.h\
+	util_security.cc util_security.h\
+	ValueBase.cc ValueBase.h\
+	ValueBaseDiskWriter.h\
 	ValueBaseJsonParser.h\
 	ValueBaseStructParserState.h\
 	ValueBaseStructParserStateImpl.cc ValueBaseStructParserStateImpl.h\
 	ValueBaseStructParserStateMachine.cc ValueBaseStructParserStateMachine.h\
-	JsonDiskWriter.h\
-	HttpServerBodyCommand.cc HttpServerBodyCommand.h\
-	RpcRequest.cc RpcRequest.h\
-	RpcMethod.cc RpcMethod.h\
-	RpcMethodImpl.cc RpcMethodImpl.h\
-	RpcMethodFactory.cc RpcMethodFactory.h\
-	RpcResponse.cc RpcResponse.h\
-	HttpListenCommand.cc HttpListenCommand.h\
-	HttpServerCommand.cc HttpServerCommand.h\
-	HttpServerResponseCommand.cc HttpServerResponseCommand.h\
-	AbstractHttpServerResponseCommand.cc \
-	AbstractHttpServerResponseCommand.h \
-	HttpServer.cc HttpServer.h\
-	StreamPieceSelector.h\
-	DefaultStreamPieceSelector.cc DefaultStreamPieceSelector.h\
-	InorderStreamPieceSelector.cc InorderStreamPieceSelector.h\
-	GeomStreamPieceSelector.cc GeomStreamPieceSelector.h\
-	MetalinkHttpEntry.cc MetalinkHttpEntry.h\
-	OutputFile.h\
-	NullOutputFile.h\
-	console.cc console.h\
-	ColorizedStream.cc ColorizedStream.h\
-	IOFile.cc IOFile.h\
-	BufferedFile.cc BufferedFile.h\
-	SegList.h\
-	NullHandle.h\
-	a2iterator.h\
-	paramed_string.cc paramed_string.h\
-	rpc_helper.cc rpc_helper.h\
+	version_usage.cc\
+	wallclock.cc wallclock.h\
 	WatchProcessCommand.cc WatchProcessCommand.h\
-	UnknownOptionException.cc UnknownOptionException.h\
-	Notifier.cc Notifier.h\
-	ValueBaseDiskWriter.h\
-	AnonDiskWriterFactory.h\
-	XmlRpcRequestParserController.cc XmlRpcRequestParserController.h\
 	WrDiskCache.cc WrDiskCache.h\
 	WrDiskCacheEntry.cc WrDiskCacheEntry.h\
-	GroupId.cc GroupId.h\
-	IndexedList.h\
-	SaveSessionCommand.h SaveSessionCommand.cc\
-	BackupIPv4ConnectCommand.h BackupIPv4ConnectCommand.cc\
-	ConnectCommand.cc ConnectCommand.h\
-	ControlChain.h\
-	HttpRequestConnectChain.h\
-	HttpProxyRequestConnectChain.h\
-	FtpNegotiationConnectChain.h\
-	FtpTunnelRequestConnectChain.h\
-	Lock.h \
-	IteratableChunkChecksumValidator.cc IteratableChunkChecksumValidator.h\
-	IteratableChecksumValidator.cc IteratableChecksumValidator.h\
-	CheckIntegrityDispatcherCommand.cc CheckIntegrityDispatcherCommand.h\
-	CheckIntegrityCommand.cc CheckIntegrityCommand.h\
-	ChecksumCheckIntegrityEntry.cc ChecksumCheckIntegrityEntry.h\
-	message_digest_helper.cc message_digest_helper.h\
-	Checksum.cc Checksum.h\
-	ChunkChecksum.cc ChunkChecksum.h\
-	MessageDigest.cc MessageDigest.h\
-	MessageDigestImpl.h\
-	HashFuncEntry.h \
-	util_security.cc util_security.h
+	XmlRpcRequestParserController.cc XmlRpcRequestParserController.h
 
 if ANDROID
 SRCS += android/android.c
@@ -288,10 +289,11 @@ SRCS += WinConsoleFile.cc WinConsoleFile.h
 endif # MINGW_BUILD
 
 if ENABLE_WEBSOCKET
-SRCS += WebSocketSession.cc WebSocketSession.h\
-	WebSocketSessionMan.cc WebSocketSessionMan.h\
+SRCS += \
+	WebSocketInteractionCommand.cc WebSocketInteractionCommand.h\
 	WebSocketResponseCommand.cc WebSocketResponseCommand.h\
-	WebSocketInteractionCommand.cc WebSocketInteractionCommand.h
+	WebSocketSession.cc WebSocketSession.h\
+	WebSocketSessionMan.cc WebSocketSessionMan.h
 endif # ENABLE_WEBSOCKET
 
 if !ENABLE_WEBSOCKET
@@ -299,9 +301,10 @@ SRCS += NullWebSocketSessionMan.h
 endif # !ENABLE_WEBSOCKET
 
 if HAVE_SOME_XMLLIB
-SRCS += XmlAttr.cc XmlAttr.h\
-	XmlParser.cc XmlParser.h\
-	ParserStateMachine.h
+SRCS += \
+	ParserStateMachine.h\
+	XmlAttr.cc XmlAttr.h\
+	XmlParser.cc XmlParser.h
 endif # HAVE_SOME_XMLLIB
 
 if HAVE_LIBXML2
@@ -313,10 +316,11 @@ SRCS +=  ExpatXmlParser.cc ExpatXmlParser.h
 endif # HAVE_LIBEXPAT
 
 if ENABLE_XML_RPC
-SRCS += XmlRpcRequestParserStateMachine.cc XmlRpcRequestParserStateMachine.h\
+SRCS += \
+	XmlRpcDiskWriter.cc XmlRpcDiskWriter.h\
 	XmlRpcRequestParserState.h\
 	XmlRpcRequestParserStateImpl.cc XmlRpcRequestParserStateImpl.h\
-	XmlRpcDiskWriter.cc XmlRpcDiskWriter.h
+	XmlRpcRequestParserStateMachine.cc XmlRpcRequestParserStateMachine.h
 
 endif # ENABLE_XML_RPC
 
@@ -337,8 +341,9 @@ SRCS += AppleMessageDigestImpl.cc
 endif # USE_APPLE_MD
 
 if HAVE_APPLETLS
-SRCS += AppleTLSContext.cc AppleTLSContext.h \
-        AppleTLSSession.cc AppleTLSSession.h
+SRCS += \
+	AppleTLSContext.cc AppleTLSContext.h \
+	AppleTLSSession.cc AppleTLSSession.h
 endif # HAVE_APPLETLS
 
 if USE_WINDOWS_MD
@@ -346,12 +351,15 @@ SRCS += WinMessageDigestImpl.cc
 endif # USE_WINDOWS_MD
 
 if HAVE_WINTLS
-SRCS += WinTLSContext.cc WinTLSContext.h \
+SRCS += \
+	WinTLSContext.cc WinTLSContext.h \
 	WinTLSSession.cc WinTLSSession.h
 endif # HAVE_WINTLS
 
 if USE_INTERNAL_BIGNUM
-SRCS += InternalDHKeyExchange.cc InternalDHKeyExchange.h bignum.h
+SRCS += \
+	bignum.h\
+	InternalDHKeyExchange.cc InternalDHKeyExchange.h
 endif
 
 if USE_INTERNAL_ARC4
@@ -359,16 +367,21 @@ SRCS += InternalARC4Encryptor.cc InternalARC4Encryptor.h
 endif
 
 if USE_INTERNAL_MD
-SRCS += InternalMessageDigestImpl.cc sha1.c sha1.h md5.c md5.h
+SRCS += \
+	InternalMessageDigestImpl.cc\
+	md5.c md5.h\
+	sha1.c sha1.h
 endif # USE_WINDOWS_MD
 
 if HAVE_LIBGNUTLS
-SRCS += LibgnutlsTLSContext.cc LibgnutlsTLSContext.h \
+SRCS += \
+	LibgnutlsTLSContext.cc LibgnutlsTLSContext.h \
         LibgnutlsTLSSession.cc LibgnutlsTLSSession.h
 endif # HAVE_LIBGNUTLS
 
 if HAVE_LIBGCRYPT
-SRCS += LibgcryptARC4Encryptor.cc LibgcryptARC4Encryptor.h \
+SRCS += \
+	LibgcryptARC4Encryptor.cc LibgcryptARC4Encryptor.h \
         LibgcryptDHKeyExchange.cc LibgcryptDHKeyExchange.h
 if USE_LIBGCRYPT_MD
 SRCS += LibgcryptMessageDigestImpl.cc
@@ -383,230 +396,238 @@ endif # USE_LIBNETTLE_MD
 endif # HAVE_LIBNETTLE
 
 if HAVE_LIBGMP
-SRCS += a2gmp.cc a2gmp.h \
+SRCS += \
+	a2gmp.cc a2gmp.h \
         LibgmpDHKeyExchange.cc LibgmpDHKeyExchange.h
 endif # HAVE_LIBGMP
 
 if HAVE_OPENSSL
-SRCS += LibsslARC4Encryptor.cc LibsslARC4Encryptor.h \
+SRCS += \
+	LibsslARC4Encryptor.cc LibsslARC4Encryptor.h \
         LibsslDHKeyExchange.cc LibsslDHKeyExchange.h
 if !HAVE_APPLETLS
-SRCS += LibsslTLSContext.cc LibsslTLSContext.h \
+SRCS += \
+	LibsslTLSContext.cc LibsslTLSContext.h \
         LibsslTLSSession.cc LibsslTLSSession.h
 endif # !HAVE_APPLETLS
 if USE_OPENSSL_MD
-SRCS += LibsslMessageDigestImpl.cc
-endif
-endif # HAVE_OPENSSL
-
-if HAVE_ZLIB
-SRCS += GZipEncoder.cc GZipEncoder.h\
-	GZipDecodingStreamFilter.cc GZipDecodingStreamFilter.h\
-	GZipFile.cc GZipFile.h
-endif # HAVE_ZLIB
-
-if HAVE_SQLITE3
-SRCS += Sqlite3CookieParser.cc Sqlite3CookieParser.h\
-	Sqlite3CookieParserImpl.cc Sqlite3CookieParserImpl.h
-endif # HAVE_SQLITE3
-
-if ENABLE_ASYNC_DNS
-SRCS += AsyncNameResolver.cc AsyncNameResolver.h\
-	AsyncNameResolverMan.cc AsyncNameResolverMan.h
-endif # ENABLE_ASYNC_DNS
-
-if ENABLE_BITTORRENT
-SRCS += PeerAbstractCommand.cc PeerAbstractCommand.h\
-	PeerInitiateConnectionCommand.cc PeerInitiateConnectionCommand.h\
-	PeerInteractionCommand.cc PeerInteractionCommand.h\
-	Peer.cc Peer.h\
-	PeerSessionResource.cc PeerSessionResource.h\
-	PeerConnection.cc PeerConnection.h\
-	PeerListenCommand.cc PeerListenCommand.h\
-	BtRegistry.cc BtRegistry.h\
-	RequestSlot.cc RequestSlot.h\
-	TrackerWatcherCommand.cc TrackerWatcherCommand.h\
-	PeerChokeCommand.cc PeerChokeCommand.h\
-	SeedCriteria.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.cc BtRuntime.h\
-	BtMessage.h\
+SRCS += LibsslMessageDigestImpl.cc
+endif
+endif # HAVE_OPENSSL
+
+if HAVE_ZLIB
+SRCS += \
+	GZipDecodingStreamFilter.cc GZipDecodingStreamFilter.h\
+	GZipEncoder.cc GZipEncoder.h\
+	GZipFile.cc GZipFile.h
+endif # HAVE_ZLIB
+
+if HAVE_SQLITE3
+SRCS += \
+	Sqlite3CookieParser.cc Sqlite3CookieParser.h\
+	Sqlite3CookieParserImpl.cc Sqlite3CookieParserImpl.h
+endif # HAVE_SQLITE3
+
+if ENABLE_ASYNC_DNS
+SRCS += \
+	AsyncNameResolver.cc AsyncNameResolver.h\
+	AsyncNameResolverMan.cc AsyncNameResolverMan.h
+endif # ENABLE_ASYNC_DNS
+
+if ENABLE_BITTORRENT
+SRCS += \
 	AbstractBtMessage.cc AbstractBtMessage.h\
-	SimpleBtMessage.cc SimpleBtMessage.h\
+	ActivePeerConnectionCommand.cc ActivePeerConnectionCommand.h\
+	AnnounceList.h AnnounceList.cc\
+	AnnounceTier.cc AnnounceTier.h\
+	ARC4Encryptor.h\
+	bencode2.cc bencode2.h\
+	BencodeDiskWriter.h\
+	BencodeDiskWriterFactory.h\
+	BencodeParser.cc BencodeParser.h\
+	bittorrent_helper.cc bittorrent_helper.h\
+	BtAbortOutstandingRequestEvent.cc BtAbortOutstandingRequestEvent.h\
 	BtAllowedFastMessage.cc BtAllowedFastMessage.h\
+	BtAnnounce.cc BtAnnounce.h\
 	BtBitfieldMessage.cc BtBitfieldMessage.h\
+	BtBitfieldMessageValidator.cc BtBitfieldMessageValidator.h\
 	BtCancelMessage.cc BtCancelMessage.h\
+	BtCancelSendingPieceEvent.h\
+	BtCheckIntegrityEntry.cc BtCheckIntegrityEntry.h\
 	BtChokeMessage.cc BtChokeMessage.h\
+	BtChokingEvent.h\
+	BtConstants.h\
+	BtDependency.cc BtDependency.h\
+	BtExtendedMessage.cc BtExtendedMessage.h\
+	BtFileAllocationEntry.cc BtFileAllocationEntry.h\
+	BtHandshakeMessage.cc BtHandshakeMessage.h\
+	BtHandshakeMessageValidator.cc BtHandshakeMessageValidator.h\
 	BtHaveAllMessage.cc BtHaveAllMessage.h\
 	BtHaveMessage.cc BtHaveMessage.h\
 	BtHaveNoneMessage.cc BtHaveNoneMessage.h\
+	BtInteractive.h\
 	BtInterestedMessage.cc BtInterestedMessage.h\
 	BtKeepAliveMessage.cc BtKeepAliveMessage.h\
+	BtLeecherStateChoke.cc BtLeecherStateChoke.h\
+	BtMessage.h\
+	BtMessageDispatcher.h\
+	BtMessageFactory.h\
+	BtMessageReceiver.h\
+	BtMessageValidator.h\
 	BtNotInterestedMessage.cc BtNotInterestedMessage.h\
 	BtPieceMessage.cc BtPieceMessage.h\
+	BtPieceMessageValidator.cc BtPieceMessageValidator.h\
 	BtPortMessage.cc BtPortMessage.h\
+	BtPostDownloadHandler.cc BtPostDownloadHandler.h\
+	BtRegistry.cc BtRegistry.h\
 	BtRejectMessage.cc BtRejectMessage.h\
+	BtRequestFactory.h\
 	BtRequestMessage.cc BtRequestMessage.h\
+	BtRuntime.cc BtRuntime.h\
+	BtSeederStateChoke.cc BtSeederStateChoke.h\
+	BtSetup.cc BtSetup.h\
+	BtStopDownloadCommand.cc BtStopDownloadCommand.h\
 	BtSuggestPieceMessage.cc BtSuggestPieceMessage.h\
 	BtUnchokeMessage.cc BtUnchokeMessage.h\
-	BtHandshakeMessage.cc BtHandshakeMessage.h\
-	BtMessageValidator.h\
-	BtBitfieldMessageValidator.cc BtBitfieldMessageValidator.h\
-	BtPieceMessageValidator.cc BtPieceMessageValidator.h\
-	BtHandshakeMessageValidator.cc BtHandshakeMessageValidator.h\
-	BtMessageFactory.h\
-	DefaultBtMessageFactory.cc DefaultBtMessageFactory.h\
-	BtMessageDispatcher.h\
+	DefaultBtAnnounce.cc DefaultBtAnnounce.h\
+	DefaultBtInteractive.cc DefaultBtInteractive.h\
 	DefaultBtMessageDispatcher.cc DefaultBtMessageDispatcher.h\
-	BtMessageReceiver.h\
+	DefaultBtMessageFactory.cc DefaultBtMessageFactory.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\
-	BtDependency.cc BtDependency.h\
-	PeerReceiveHandshakeCommand.cc PeerReceiveHandshakeCommand.h\
-	BtSetup.cc BtSetup.h\
-	BtFileAllocationEntry.cc BtFileAllocationEntry.h\
-	BtPostDownloadHandler.cc BtPostDownloadHandler.h\
-	BtCheckIntegrityEntry.cc BtCheckIntegrityEntry.h\
-	BtExtendedMessage.cc BtExtendedMessage.h\
-	ExtensionMessage.h\
-	ExtensionMessageFactory.h\
 	DefaultExtensionMessageFactory.cc DefaultExtensionMessageFactory.h\
-	HandshakeExtensionMessage.cc HandshakeExtensionMessage.h\
-	UTPexExtensionMessage.cc UTPexExtensionMessage.h\
-	UTMetadataExtensionMessage.cc UTMetadataExtensionMessage.h\
-	UTMetadataRequestExtensionMessage.cc\
-	UTMetadataRequestExtensionMessage.h\
-	UTMetadataRejectExtensionMessage.cc UTMetadataRejectExtensionMessage.h\
-	UTMetadataDataExtensionMessage.cc UTMetadataDataExtensionMessage.h\
-	UTMetadataRequestTracker.cc UTMetadataRequestTracker.h\
-	UTMetadataRequestFactory.cc UTMetadataRequestFactory.h\
-	UTMetadataPostDownloadHandler.cc UTMetadataPostDownloadHandler.h\
-	magnet.cc magnet.h\
-	DHTNode.cc DHTNode.h\
+	DefaultPeerStorage.cc DefaultPeerStorage.h\
+	DHKeyExchange.h\
+	DHTAbstractMessage.cc DHTAbstractMessage.h\
+	DHTAbstractNodeLookupTask.h\
+	DHTAbstractTask.cc DHTAbstractTask.h\
+	DHTAnnouncePeerMessage.cc DHTAnnouncePeerMessage.h\
+	DHTAnnouncePeerReplyMessage.cc DHTAnnouncePeerReplyMessage.h\
+	DHTAutoSaveCommand.cc DHTAutoSaveCommand.h\
 	DHTBucket.cc DHTBucket.h\
-	DHTRoutingTable.cc DHTRoutingTable.h\
-	DHTMessageEntry.cc DHTMessageEntry.h\
-	DHTMessageDispatcher.h\
-	DHTMessageDispatcherImpl.cc DHTMessageDispatcherImpl.h\
-	DHTMessageReceiver.cc DHTMessageReceiver.h\
-	DHTMessageTracker.cc DHTMessageTracker.h\
-	DHTMessageTrackerEntry.cc DHTMessageTrackerEntry.h\
-	DHTMessage.cc DHTMessage.h\
+	DHTBucketRefreshCommand.cc DHTBucketRefreshCommand.h\
+	DHTBucketRefreshTask.cc DHTBucketRefreshTask.h\
+	DHTBucketTree.cc DHTBucketTree.h\
 	DHTConnection.h\
 	DHTConnectionImpl.cc DHTConnectionImpl.h\
-	DHTAbstractMessage.cc DHTAbstractMessage.h\
-	DHTQueryMessage.cc DHTQueryMessage.h\
-	DHTResponseMessage.cc DHTResponseMessage.h\
-	DHTPingMessage.cc DHTPingMessage.h\
-	DHTPingReplyMessage.cc DHTPingReplyMessage.h\
+	DHTConstants.h\
+	DHTEntryPointNameResolveCommand.cc DHTEntryPointNameResolveCommand.h\
 	DHTFindNodeMessage.cc DHTFindNodeMessage.h\
 	DHTFindNodeReplyMessage.cc DHTFindNodeReplyMessage.h\
+	DHTGetPeersCommand.cc DHTGetPeersCommand.h\
 	DHTGetPeersMessage.cc DHTGetPeersMessage.h\
 	DHTGetPeersReplyMessage.cc DHTGetPeersReplyMessage.h\
-	DHTAnnouncePeerMessage.cc DHTAnnouncePeerMessage.h\
-	DHTAnnouncePeerReplyMessage.cc DHTAnnouncePeerReplyMessage.h\
-	DHTUnknownMessage.cc DHTUnknownMessage.h\
+	DHTIDCloser.h\
+	DHTInteractionCommand.cc DHTInteractionCommand.h\
+	DHTMessage.cc DHTMessage.h\
+	DHTMessageCallback.h\
+	DHTMessageDispatcher.h\
+	DHTMessageDispatcherImpl.cc DHTMessageDispatcherImpl.h\
+	DHTMessageEntry.cc DHTMessageEntry.h\
 	DHTMessageFactory.h\
 	DHTMessageFactoryImpl.cc DHTMessageFactoryImpl.h\
-	DHTNodeLookupTask.cc DHTNodeLookupTask.h\
+	DHTMessageReceiver.cc DHTMessageReceiver.h\
+	DHTMessageTracker.cc DHTMessageTracker.h\
+	DHTMessageTrackerEntry.cc DHTMessageTrackerEntry.h\
+	DHTNode.cc DHTNode.h\
 	DHTNodeLookupEntry.cc DHTNodeLookupEntry.h\
-	DHTBucketTree.cc DHTBucketTree.h\
-	DHTMessageCallback.h\
+	DHTNodeLookupTask.cc DHTNodeLookupTask.h\
 	DHTNodeLookupTaskCallback.cc DHTNodeLookupTaskCallback.h\
-	DHTPingReplyMessageCallback.h\
+	DHTPeerAnnounceCommand.cc DHTPeerAnnounceCommand.h\
+	DHTPeerAnnounceEntry.cc DHTPeerAnnounceEntry.h\
+	DHTPeerAnnounceStorage.cc DHTPeerAnnounceStorage.h\
+	DHTPeerLookupTask.cc DHTPeerLookupTask.h\
 	DHTPeerLookupTaskCallback.cc DHTPeerLookupTaskCallback.h\
-	DHTAbstractTask.cc DHTAbstractTask.h\
-	DHTTask.h\
+	DHTPingMessage.cc DHTPingMessage.h\
+	DHTPingReplyMessage.cc DHTPingReplyMessage.h\
+	DHTPingReplyMessageCallback.h\
 	DHTPingTask.cc DHTPingTask.h\
-	DHTTaskQueue.h\
-	DHTTaskQueueImpl.cc DHTTaskQueueImpl.h\
-	DHTTaskExecutor.cc DHTTaskExecutor.h\
-	DHTBucketRefreshTask.cc DHTBucketRefreshTask.h\
-	DHTAbstractNodeLookupTask.h\
-	DHTPeerLookupTask.cc DHTPeerLookupTask.h\
+	DHTQueryMessage.cc DHTQueryMessage.h\
+	DHTRegistry.cc DHTRegistry.h\
+	DHTReplaceNodeTask.cc DHTReplaceNodeTask.h\
+	DHTResponseMessage.cc DHTResponseMessage.h\
+	DHTRoutingTable.cc DHTRoutingTable.h\
+	DHTRoutingTableDeserializer.cc DHTRoutingTableDeserializer.h\
+	DHTRoutingTableSerializer.cc DHTRoutingTableSerializer.h\
 	DHTSetup.cc DHTSetup.h\
+	DHTTask.h\
+	DHTTaskExecutor.cc DHTTaskExecutor.h\
 	DHTTaskFactory.h\
 	DHTTaskFactoryImpl.cc DHTTaskFactoryImpl.h\
-	DHTInteractionCommand.cc DHTInteractionCommand.h\
-	DHTPeerAnnounceEntry.cc DHTPeerAnnounceEntry.h\
-	DHTPeerAnnounceStorage.cc DHTPeerAnnounceStorage.h\
+	DHTTaskQueue.h\
+	DHTTaskQueueImpl.cc DHTTaskQueueImpl.h\
 	DHTTokenTracker.cc DHTTokenTracker.h\
-	DHTGetPeersCommand.cc DHTGetPeersCommand.h\
 	DHTTokenUpdateCommand.cc DHTTokenUpdateCommand.h\
-	DHTBucketRefreshCommand.cc DHTBucketRefreshCommand.h\
-	DHTPeerAnnounceCommand.cc DHTPeerAnnounceCommand.h\
-	DHTReplaceNodeTask.cc DHTReplaceNodeTask.h\
-	DHTEntryPointNameResolveCommand.cc DHTEntryPointNameResolveCommand.h\
-	DHTRoutingTableSerializer.cc DHTRoutingTableSerializer.h\
-	DHTRoutingTableDeserializer.cc DHTRoutingTableDeserializer.h\
-	DHTAutoSaveCommand.cc DHTAutoSaveCommand.h\
-	DHTRegistry.cc DHTRegistry.h\
-	DHTIDCloser.h\
-	DHTConstants.h\
-	XORCloser.h\
-	PeerAddrEntry.cc PeerAddrEntry.h\
-	InitiatorMSEHandshakeCommand.cc InitiatorMSEHandshakeCommand.h\
-	ReceiverMSEHandshakeCommand.cc ReceiverMSEHandshakeCommand.h\
-	MSEHandshake.cc MSEHandshake.h\
-	ARC4Encryptor.h\
-	DHKeyExchange.h\
-	BtConstants.h\
-	BtLeecherStateChoke.cc BtLeecherStateChoke.h\
-	BtSeederStateChoke.cc BtSeederStateChoke.h\
-	RangeBtMessage.cc RangeBtMessage.h\
+	DHTUnknownMessage.cc DHTUnknownMessage.h\
+	ExtensionMessage.h\
+	ExtensionMessageFactory.h\
+	ExtensionMessageRegistry.cc ExtensionMessageRegistry.h\
+	HandshakeExtensionMessage.cc HandshakeExtensionMessage.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\
+	InitiatorMSEHandshakeCommand.cc InitiatorMSEHandshakeCommand.h\
+	LpdDispatchMessageCommand.cc LpdDispatchMessageCommand.h\
+	LpdMessage.cc LpdMessage.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\
-	BencodeParser.cc BencodeParser.h\
-	ValueBaseBencodeParser.h\
-	BencodeDiskWriter.h\
-	BencodeDiskWriterFactory.h\
+	magnet.cc magnet.h\
 	MemoryBencodePreDownloadHandler.h\
+	MSEHandshake.cc MSEHandshake.h\
+	NameResolveCommand.cc NameResolveCommand.h\
+	Peer.cc Peer.h\
+	PeerAbstractCommand.cc PeerAbstractCommand.h\
+	PeerAddrEntry.cc PeerAddrEntry.h\
+	PeerChokeCommand.cc PeerChokeCommand.h\
+	PeerConnection.cc PeerConnection.h\
+	PeerInitiateConnectionCommand.cc PeerInitiateConnectionCommand.h\
+	PeerInteractionCommand.cc PeerInteractionCommand.h\
+	PeerListenCommand.cc PeerListenCommand.h\
+	PeerReceiveHandshakeCommand.cc PeerReceiveHandshakeCommand.h\
+	PeerSessionResource.cc PeerSessionResource.h\
+	PeerStorage.h\
+	PriorityPieceSelector.cc PriorityPieceSelector.h\
+	RangeBtMessage.cc RangeBtMessage.h\
+	RangeBtMessageValidator.cc RangeBtMessageValidator.h\
+	ReceiverMSEHandshakeCommand.cc ReceiverMSEHandshakeCommand.h\
+	RequestSlot.cc RequestSlot.h\
+	SeedCheckCommand.cc SeedCheckCommand.h\
+	SeedCriteria.h\
+	ShareRatioSeedCriteria.cc ShareRatioSeedCriteria.h\
+	SimpleBtMessage.cc SimpleBtMessage.h\
+	TimeSeedCriteria.cc TimeSeedCriteria.h\
+	TrackerWatcherCommand.cc TrackerWatcherCommand.h\
 	UDPTrackerClient.cc UDPTrackerClient.h\
 	UDPTrackerRequest.cc UDPTrackerRequest.h\
-	NameResolveCommand.cc NameResolveCommand.h
+	UnionSeedCriteria.cc UnionSeedCriteria.h\
+	UTMetadataDataExtensionMessage.cc UTMetadataDataExtensionMessage.h\
+	UTMetadataExtensionMessage.cc UTMetadataExtensionMessage.h\
+	UTMetadataPostDownloadHandler.cc UTMetadataPostDownloadHandler.h\
+	UTMetadataRejectExtensionMessage.cc UTMetadataRejectExtensionMessage.h\
+	UTMetadataRequestExtensionMessage.cc\
+	UTMetadataRequestExtensionMessage.h\
+	UTMetadataRequestFactory.cc UTMetadataRequestFactory.h\
+	UTMetadataRequestTracker.cc UTMetadataRequestTracker.h\
+	UTPexExtensionMessage.cc UTPexExtensionMessage.h\
+	ValueBaseBencodeParser.h\
+	XORCloser.h\
+	ZeroBtMessage.cc ZeroBtMessage.h
 endif # ENABLE_BITTORRENT
 
 if ENABLE_METALINK
-SRCS += Metalinker.cc Metalinker.h\
+SRCS += \
+	Metalink2RequestGroup.cc Metalink2RequestGroup.h\
 	MetalinkEntry.cc MetalinkEntry.h\
-	MetalinkResource.cc MetalinkResource.h\
+	Metalinker.cc Metalinker.h\
 	MetalinkMetaurl.cc MetalinkMetaurl.h\
 	MetalinkParserController.cc MetalinkParserController.h\
-	MetalinkParserStateMachine.cc MetalinkParserStateMachine.h\
 	MetalinkParserState.cc MetalinkParserState.h\
 	MetalinkParserStateImpl.cc MetalinkParserStateImpl.h\
+	MetalinkParserStateMachine.cc MetalinkParserStateMachine.h\
 	MetalinkParserStateV3Impl.cc MetalinkParserStateV3Impl.h\
 	MetalinkParserStateV4Impl.cc MetalinkParserStateV4Impl.h\
-	Metalink2RequestGroup.cc Metalink2RequestGroup.h\
 	MetalinkPostDownloadHandler.cc MetalinkPostDownloadHandler.h\
+	MetalinkResource.cc MetalinkResource.h\
 	metalink_helper.cc metalink_helper.h
 
 endif # ENABLE_METALINK
@@ -679,15 +700,16 @@ pkgconfig_DATA = libaria2.pc
 DISTCLEANFILES = $(pkgconfig_DATA)
 
 lib_LTLIBRARIES = libaria2.la
-libaria2_la_SOURCES = $(SRCS) \
+SRCS += \
+	ApiCallbackDownloadEventListener.cc ApiCallbackDownloadEventListener.h\
 	aria2api.cc aria2api.h \
-	KeepRunningCommand.cc KeepRunningCommand.h \
-	ApiCallbackDownloadEventListener.cc ApiCallbackDownloadEventListener.h
+	KeepRunningCommand.cc KeepRunningCommand.h
 else # !ENABLE_LIBARIA2
 noinst_LTLIBRARIES = libaria2.la
-libaria2_la_SOURCES = $(SRCS)
 endif # !ENABLE_LIBARIA2
 
+libaria2_la_SOURCES = $(SRCS)
+
 libaria2_la_LIBADD = @WSLAY_LIBS@
 
 LDADD = libaria2.la @LIBINTL@ @ALLOCA@ #-lprofiler