diff --git a/ChangeLog b/ChangeLog
index 0063df94..00f2a6eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-23  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
+
+	Removed 'extern' from 'extern typedef ...' in src/*.h
+
 2007-11-22  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
 
 	Updated usage
diff --git a/src/AbstractCommand.h b/src/AbstractCommand.h
index 0ab4618e..34be35b7 100644
--- a/src/AbstractCommand.h
+++ b/src/AbstractCommand.h
@@ -41,15 +41,15 @@
 #include "Socket.h"
 
 class Request;
-extern typedef SharedHandle<Request> RequestHandle;
+typedef SharedHandle<Request> RequestHandle;
 class DownloadEngine;
 class Segment;
-extern typedef SharedHandle<Segment> SegmentHandle;
-extern typedef deque<SegmentHandle> Segments;
+typedef SharedHandle<Segment> SegmentHandle;
+typedef deque<SegmentHandle> Segments;
 class NameResolver;
-extern typedef SharedHandle<NameResolver> NameResolverHandle;
+typedef SharedHandle<NameResolver> NameResolverHandle;
 class BtProgressInfoFile;
-extern typedef SharedHandle<BtProgressInfoFile> BtProgressInfoFileHandle;
+typedef SharedHandle<BtProgressInfoFile> BtProgressInfoFileHandle;
 
 class AbstractCommand : public Command, public RequestGroupAware {
 private:
diff --git a/src/AbstractProxyRequestCommand.h b/src/AbstractProxyRequestCommand.h
index 18dc1336..545cb6a2 100644
--- a/src/AbstractProxyRequestCommand.h
+++ b/src/AbstractProxyRequestCommand.h
@@ -38,7 +38,7 @@
 #include "AbstractCommand.h"
 
 class HttpConnection;
-extern typedef SharedHandle<HttpConnection> HttpConnectionHandle;
+typedef SharedHandle<HttpConnection> HttpConnectionHandle;
 
 class AbstractProxyRequestCommand : public AbstractCommand {
 protected:
diff --git a/src/AbstractProxyResponseCommand.h b/src/AbstractProxyResponseCommand.h
index 44aa8647..b0ef904d 100644
--- a/src/AbstractProxyResponseCommand.h
+++ b/src/AbstractProxyResponseCommand.h
@@ -38,7 +38,7 @@
 #include "AbstractCommand.h"
 
 class HttpConnection;
-extern typedef SharedHandle<HttpConnection> HttpConnectionHandle;
+typedef SharedHandle<HttpConnection> HttpConnectionHandle;
 
 class AbstractProxyResponseCommand : public AbstractCommand {
 protected:
diff --git a/src/AuthConfigFactory.h b/src/AuthConfigFactory.h
index ac1ecbcb..a6b97c1f 100644
--- a/src/AuthConfigFactory.h
+++ b/src/AuthConfigFactory.h
@@ -39,13 +39,13 @@
 
 class Option;
 class Netrc;
-extern typedef SharedHandle<Netrc> NetrcHandle;
+typedef SharedHandle<Netrc> NetrcHandle;
 class AuthConfig;
-extern typedef SharedHandle<AuthConfig> AuthConfigHandle;
+typedef SharedHandle<AuthConfig> AuthConfigHandle;
 class Request;
-extern typedef SharedHandle<Request> RequestHandle;
+typedef SharedHandle<Request> RequestHandle;
 class AuthResolver;
-extern typedef SharedHandle<AuthResolver> AuthResolverHandle;
+typedef SharedHandle<AuthResolver> AuthResolverHandle;
 
 class AuthConfigFactory {
 private:
diff --git a/src/BtContext.h b/src/BtContext.h
index 5d9d493a..8adfcc0d 100644
--- a/src/BtContext.h
+++ b/src/BtContext.h
@@ -42,7 +42,7 @@
 #define MAX_PEERS 55
 
 class AnnounceTier;
-extern typedef SharedHandle<AnnounceTier> AnnounceTierHandle;
+typedef SharedHandle<AnnounceTier> AnnounceTierHandle;
 typedef deque<AnnounceTierHandle> AnnounceTiers;
 
 class RequestGroup;
diff --git a/src/BtDependency.h b/src/BtDependency.h
index b688a957..e9872a9f 100644
--- a/src/BtDependency.h
+++ b/src/BtDependency.h
@@ -38,7 +38,7 @@
 #include "Dependency.h"
 
 class RequestGroup;
-extern typedef WeakHandle<RequestGroup> RequestGroupWeakHandle;
+typedef WeakHandle<RequestGroup> RequestGroupWeakHandle;
 class Option;
 class Logger;
 
diff --git a/src/BtFileAllocationEntry.h b/src/BtFileAllocationEntry.h
index 9b21f856..ab80954c 100644
--- a/src/BtFileAllocationEntry.h
+++ b/src/BtFileAllocationEntry.h
@@ -40,7 +40,7 @@
 class RequestGroup;
 class DownloadEngine;
 class Command;
-extern typedef deque<Command*> Commands;
+typedef deque<Command*> Commands;
 
 class BtFileAllocationEntry : public FileAllocationEntry {
 public:
diff --git a/src/BtSetup.h b/src/BtSetup.h
index e44bc5f4..76efb4ed 100644
--- a/src/BtSetup.h
+++ b/src/BtSetup.h
@@ -42,7 +42,7 @@ class RequestGroup;
 class DownloadEngine;
 class Option;
 class Command;
-extern typedef deque<Command*> Commands;
+typedef deque<Command*> Commands;
 
 class BtSetup {
 private:
diff --git a/src/CheckIntegrityCommand.h b/src/CheckIntegrityCommand.h
index c924b8b1..6475b73a 100644
--- a/src/CheckIntegrityCommand.h
+++ b/src/CheckIntegrityCommand.h
@@ -39,7 +39,7 @@
 #include "TimeA2.h"
 
 class CheckIntegrityEntry;
-extern typedef SharedHandle<CheckIntegrityEntry> CheckIntegrityEntryHandle;
+typedef SharedHandle<CheckIntegrityEntry> CheckIntegrityEntryHandle;
 
 class CheckIntegrityCommand : public RealtimeCommand {
 private:
diff --git a/src/CheckIntegrityEntry.h b/src/CheckIntegrityEntry.h
index df22a79e..d1ae8ca0 100644
--- a/src/CheckIntegrityEntry.h
+++ b/src/CheckIntegrityEntry.h
@@ -38,9 +38,9 @@
 #include "RequestGroupEntry.h"
 
 class IteratableValidator;
-extern typedef SharedHandle<IteratableValidator> IteratableValidatorHandle;
+typedef SharedHandle<IteratableValidator> IteratableValidatorHandle;
 class Command;
-extern typedef deque<Command*> Commands;
+typedef deque<Command*> Commands;
 class DownloadEngine;
 
 class CheckIntegrityEntry : public RequestGroupEntry,
diff --git a/src/CheckIntegrityMan.h b/src/CheckIntegrityMan.h
index 1e07cd78..ed8f3f7a 100644
--- a/src/CheckIntegrityMan.h
+++ b/src/CheckIntegrityMan.h
@@ -38,8 +38,8 @@
 #include "common.h"
 
 class CheckIntegrityEntry;
-extern typedef SharedHandle<CheckIntegrityEntry> CheckIntegrityEntryHandle;
-extern typedef deque<CheckIntegrityEntryHandle> CheckIntegrityEntries;
+typedef SharedHandle<CheckIntegrityEntry> CheckIntegrityEntryHandle;
+typedef deque<CheckIntegrityEntryHandle> CheckIntegrityEntries;
 
 class CheckIntegrityMan {
 private:
diff --git a/src/DefaultBtAnnounce.h b/src/DefaultBtAnnounce.h
index 60deeebb..6ec123e6 100644
--- a/src/DefaultBtAnnounce.h
+++ b/src/DefaultBtAnnounce.h
@@ -46,7 +46,7 @@
 #include "PeerStorage.h"
 
 class Randomizer;
-extern typedef SharedHandle<Randomizer> RandomizerHandle;
+typedef SharedHandle<Randomizer> RandomizerHandle;
 
 #define DEFAULT_ANNOUNCE_INTERVAL 1800
 
diff --git a/src/DefaultBtContext.h b/src/DefaultBtContext.h
index 3dfd81c4..880ae5de 100644
--- a/src/DefaultBtContext.h
+++ b/src/DefaultBtContext.h
@@ -41,7 +41,7 @@
 #include "List.h"
 
 class Randomizer;
-extern typedef SharedHandle<Randomizer> RandomizerHandle;
+typedef SharedHandle<Randomizer> RandomizerHandle;
 
 #define INFO_HASH_LENGTH 20
 #define PIECE_HASH_LENGTH 20
diff --git a/src/DefaultBtProgressInfoFile.h b/src/DefaultBtProgressInfoFile.h
index 4ca0e5e6..e11249eb 100644
--- a/src/DefaultBtProgressInfoFile.h
+++ b/src/DefaultBtProgressInfoFile.h
@@ -38,9 +38,9 @@
 #include "BtProgressInfoFile.h"
 
 class DownloadContext;
-extern typedef SharedHandle<DownloadContext> DownloadContextHandle;
+typedef SharedHandle<DownloadContext> DownloadContextHandle;
 class PieceStorage;
-extern typedef SharedHandle<PieceStorage> PieceStorageHandle;
+typedef SharedHandle<PieceStorage> PieceStorageHandle;
 class Logger;
 class Option;
 
diff --git a/src/DefaultPieceStorage.h b/src/DefaultPieceStorage.h
index 0c26bd5c..5832ac48 100644
--- a/src/DefaultPieceStorage.h
+++ b/src/DefaultPieceStorage.h
@@ -38,15 +38,15 @@
 #include "PieceStorage.h"
 
 class DownloadContext;
-extern typedef SharedHandle<DownloadContext> DownloadContextHandle;
+typedef SharedHandle<DownloadContext> DownloadContextHandle;
 class BitfieldMan;
 class Logger;
 class Option;
-extern typedef deque<PieceHandle> Pieces;
+typedef deque<PieceHandle> Pieces;
 class DiskWriterFactory;
-extern typedef SharedHandle<DiskWriterFactory> DiskWriterFactoryHandle;
+typedef SharedHandle<DiskWriterFactory> DiskWriterFactoryHandle;
 class FileEntry;
-extern typedef SharedHandle<FileEntry> FileEntryHandle;
+typedef SharedHandle<FileEntry> FileEntryHandle;
 
 #define END_GAME_PIECE_NUM 20
 
diff --git a/src/DownloadCommand.h b/src/DownloadCommand.h
index a4dc6fb4..23214868 100644
--- a/src/DownloadCommand.h
+++ b/src/DownloadCommand.h
@@ -38,9 +38,9 @@
 #include "AbstractCommand.h"
 
 class TransferEncoding;
-extern typedef SharedHandle<TransferEncoding> TransferEncodingHandle;
+typedef SharedHandle<TransferEncoding> TransferEncodingHandle;
 class PeerStat;
-extern typedef SharedHandle<PeerStat> PeerStatHandle;
+typedef SharedHandle<PeerStat> PeerStatHandle;
 
 class DownloadCommand : public AbstractCommand {
 private:
diff --git a/src/DownloadEngine.h b/src/DownloadEngine.h
index 17a0c09c..fee3ce51 100644
--- a/src/DownloadEngine.h
+++ b/src/DownloadEngine.h
@@ -39,20 +39,20 @@
 #include "Command.h"
 
 class SocketCore;
-extern typedef SharedHandle<SocketCore> SocketHandle;
-extern typedef deque<SocketHandle> Sockets;
+typedef SharedHandle<SocketCore> SocketHandle;
+typedef deque<SocketHandle> Sockets;
 class Logger;
 class Option;
 class NameResolver;
-extern typedef SharedHandle<NameResolver> NameResolverHandle;
+typedef SharedHandle<NameResolver> NameResolverHandle;
 class RequestGroupMan;
-extern typedef SharedHandle<RequestGroupMan> RequestGroupManHandle;
+typedef SharedHandle<RequestGroupMan> RequestGroupManHandle;
 class FileAllocationMan;
-extern typedef SharedHandle<FileAllocationMan> FileAllocationManHandle;
+typedef SharedHandle<FileAllocationMan> FileAllocationManHandle;
 class StatCalc;
-extern typedef SharedHandle<StatCalc> StatCalcHandle;
+typedef SharedHandle<StatCalc> StatCalcHandle;
 class CheckIntegrityMan;
-extern typedef SharedHandle<CheckIntegrityMan> CheckIntegrityManHandle;
+typedef SharedHandle<CheckIntegrityMan> CheckIntegrityManHandle;
 
 class SocketEntry {
 public:
diff --git a/src/DownloadEngineFactory.h b/src/DownloadEngineFactory.h
index 59c41712..2c782618 100644
--- a/src/DownloadEngineFactory.h
+++ b/src/DownloadEngineFactory.h
@@ -40,10 +40,10 @@
 class Logger;
 class Option;
 class RequestGroup;
-extern typedef SharedHandle<RequestGroup> RequestGroupHandle;
-extern typedef deque<RequestGroupHandle> RequestGroups;
+typedef SharedHandle<RequestGroup> RequestGroupHandle;
+typedef deque<RequestGroupHandle> RequestGroups;
 class DownloadEngine;
-extern typedef SharedHandle<DownloadEngine> DownloadEngineHandle;
+typedef SharedHandle<DownloadEngine> DownloadEngineHandle;
 
 class DownloadEngineFactory {
 private:
diff --git a/src/FileAllocationCommand.h b/src/FileAllocationCommand.h
index 371c6091..7870d8d1 100644
--- a/src/FileAllocationCommand.h
+++ b/src/FileAllocationCommand.h
@@ -39,7 +39,7 @@
 #include "TimeA2.h"
 
 class FileAllocationEntry;
-extern typedef SharedHandle<FileAllocationEntry> FileAllocationEntryHandle;
+typedef SharedHandle<FileAllocationEntry> FileAllocationEntryHandle;
 class Exception;
 
 class FileAllocationCommand : public RealtimeCommand {
diff --git a/src/FileAllocationEntry.h b/src/FileAllocationEntry.h
index 02843c03..c5be8968 100644
--- a/src/FileAllocationEntry.h
+++ b/src/FileAllocationEntry.h
@@ -38,9 +38,9 @@
 #include "RequestGroupEntry.h"
 
 class FileAllocationIterator;
-extern typedef SharedHandle<FileAllocationIterator> FileAllocationIteratorHandle;
+typedef SharedHandle<FileAllocationIterator> FileAllocationIteratorHandle;
 class Command;
-extern typedef deque<Command*> Commands;
+typedef deque<Command*> Commands;
 class DownloadEngine;
 
 class FileAllocationEntry : public RequestGroupEntry, public ProgressAwareEntry {
diff --git a/src/FileAllocationMan.h b/src/FileAllocationMan.h
index 17557d9b..c911b41f 100644
--- a/src/FileAllocationMan.h
+++ b/src/FileAllocationMan.h
@@ -38,8 +38,8 @@
 #include "common.h"
 
 class FileAllocationEntry;
-extern typedef SharedHandle<FileAllocationEntry> FileAllocationEntryHandle;
-extern typedef deque<FileAllocationEntryHandle> FileAllocationEntries;
+typedef SharedHandle<FileAllocationEntry> FileAllocationEntryHandle;
+typedef deque<FileAllocationEntryHandle> FileAllocationEntries;
 
 class FileAllocationMan {
 private:
diff --git a/src/FillRequestGroupCommand.h b/src/FillRequestGroupCommand.h
index bc2ff3b0..167818d1 100644
--- a/src/FillRequestGroupCommand.h
+++ b/src/FillRequestGroupCommand.h
@@ -39,8 +39,8 @@
 #include "TimeA2.h"
 
 class RequestGroup;
-extern typedef SharedHandle<RequestGroup> RequestGroupHandle;
-extern typedef deque<RequestGroupHandle> RequestGroups;
+typedef SharedHandle<RequestGroup> RequestGroupHandle;
+typedef deque<RequestGroupHandle> RequestGroups;
 class DownloadEngine;
 
 class FillRequestGroupCommand : public Command {
diff --git a/src/HttpDownloadCommand.h b/src/HttpDownloadCommand.h
index 0d0345b7..7a784ee3 100644
--- a/src/HttpDownloadCommand.h
+++ b/src/HttpDownloadCommand.h
@@ -38,7 +38,7 @@
 #include "DownloadCommand.h"
 
 class HttpConnection;
-extern typedef SharedHandle<HttpConnection> HttpConnectionHandle;
+typedef SharedHandle<HttpConnection> HttpConnectionHandle;
 
 class HttpDownloadCommand : public DownloadCommand {
 private:
diff --git a/src/HttpRequestCommand.h b/src/HttpRequestCommand.h
index 00322ba1..c318dddb 100644
--- a/src/HttpRequestCommand.h
+++ b/src/HttpRequestCommand.h
@@ -38,7 +38,7 @@
 #include "AbstractCommand.h"
 
 class HttpConnection;
-extern typedef SharedHandle<HttpConnection> HttpConnectionHandle;
+typedef SharedHandle<HttpConnection> HttpConnectionHandle;
 
 class HttpRequestCommand:public AbstractCommand {
 private:
diff --git a/src/HttpResponseCommand.h b/src/HttpResponseCommand.h
index 18c3102e..ce474e44 100644
--- a/src/HttpResponseCommand.h
+++ b/src/HttpResponseCommand.h
@@ -38,10 +38,10 @@
 #include "AbstractCommand.h"
 
 class HttpConnection;
-extern typedef SharedHandle<HttpConnection> HttpConnectionHandle;
+typedef SharedHandle<HttpConnection> HttpConnectionHandle;
 class HttpDownloadCommand;
 class HttpResponse;
-extern typedef SharedHandle<HttpResponse> HttpResponseHandle;
+typedef SharedHandle<HttpResponse> HttpResponseHandle;
 
 class HttpResponseCommand : public AbstractCommand {
 private:
diff --git a/src/IteratableChecksumValidator.h b/src/IteratableChecksumValidator.h
index a47eb170..de7d3cc1 100644
--- a/src/IteratableChecksumValidator.h
+++ b/src/IteratableChecksumValidator.h
@@ -38,12 +38,12 @@
 #include "IteratableValidator.h"
 
 class SingleFileDownloadContext;
-extern typedef SharedHandle<SingleFileDownloadContext> SingleFileDownloadContextHandle;
+typedef SharedHandle<SingleFileDownloadContext> SingleFileDownloadContextHandle;
 class PieceStorage;
-extern typedef SharedHandle<PieceStorage> PieceStorageHandle;
+typedef SharedHandle<PieceStorage> PieceStorageHandle;
 class Logger;
 class MessageDigestContext;
-extern typedef SharedHandle<MessageDigestContext> MessageDigestContextHandle;
+typedef SharedHandle<MessageDigestContext> MessageDigestContextHandle;
 
 class IteratableChecksumValidator:public IteratableValidator
 {
diff --git a/src/IteratableChunkChecksumValidator.h b/src/IteratableChunkChecksumValidator.h
index 3150f7a3..b8de18f7 100644
--- a/src/IteratableChunkChecksumValidator.h
+++ b/src/IteratableChunkChecksumValidator.h
@@ -38,9 +38,9 @@
 #include "IteratableValidator.h"
 
 class DownloadContext;
-extern typedef SharedHandle<DownloadContext> DownloadContextHandle;
+typedef SharedHandle<DownloadContext> DownloadContextHandle;
 class PieceStorage;
-extern typedef SharedHandle<PieceStorage> PieceStorageHandle;
+typedef SharedHandle<PieceStorage> PieceStorageHandle;
 class BitfieldMan;
 class Logger;
 
diff --git a/src/Metalink2RequestGroup.h b/src/Metalink2RequestGroup.h
index 1c72fee8..f739a702 100644
--- a/src/Metalink2RequestGroup.h
+++ b/src/Metalink2RequestGroup.h
@@ -40,8 +40,8 @@
 class Option;
 class Logger;
 class RequestGroup;
-extern typedef SharedHandle<RequestGroup> RequestGroupHandle;
-extern typedef deque<RequestGroupHandle> RequestGroups;
+typedef SharedHandle<RequestGroup> RequestGroupHandle;
+typedef deque<RequestGroupHandle> RequestGroups;
 
 class Metalink2RequestGroup {
 private:
diff --git a/src/MetalinkHelper.h b/src/MetalinkHelper.h
index 15ca83cc..809ef680 100644
--- a/src/MetalinkHelper.h
+++ b/src/MetalinkHelper.h
@@ -39,8 +39,8 @@
 
 class Option;
 class MetalinkEntry;
-extern typedef SharedHandle<MetalinkEntry> MetalinkEntryHandle;
-extern typedef deque<MetalinkEntryHandle> MetalinkEntries;
+typedef SharedHandle<MetalinkEntry> MetalinkEntryHandle;
+typedef deque<MetalinkEntryHandle> MetalinkEntries;
 
 class MetalinkHelper {
 private:
diff --git a/src/MultiFileAllocationIterator.h b/src/MultiFileAllocationIterator.h
index 11d017bf..bbed59b6 100644
--- a/src/MultiFileAllocationIterator.h
+++ b/src/MultiFileAllocationIterator.h
@@ -39,8 +39,8 @@
 
 class MultiDiskAdaptor;
 class FileEntry;
-extern typedef SharedHandle<FileEntry> FileEntryHandle;
-extern typedef deque<FileEntryHandle> FileEntries;
+typedef SharedHandle<FileEntry> FileEntryHandle;
+typedef deque<FileEntryHandle> FileEntries;
 
 class MultiFileAllocationIterator:public FileAllocationIterator
 {
diff --git a/src/MultiUrlRequestInfo.h b/src/MultiUrlRequestInfo.h
index 7eac2ed6..650141a9 100644
--- a/src/MultiUrlRequestInfo.h
+++ b/src/MultiUrlRequestInfo.h
@@ -38,8 +38,8 @@
 #include "common.h"
 
 class RequestGroup;
-extern typedef SharedHandle<RequestGroup> RequestGroupHandle;
-extern typedef deque<RequestGroupHandle> RequestGroups;
+typedef SharedHandle<RequestGroup> RequestGroupHandle;
+typedef deque<RequestGroupHandle> RequestGroups;
 class Option;
 class Logger;
 
diff --git a/src/PeerAbstractCommand.h b/src/PeerAbstractCommand.h
index 79a4d030..103e3713 100644
--- a/src/PeerAbstractCommand.h
+++ b/src/PeerAbstractCommand.h
@@ -42,7 +42,7 @@
 class DownloadEngine;
 class Exception;
 class Peer;
-extern typedef SharedHandle<Peer> PeerHandle;
+typedef SharedHandle<Peer> PeerHandle;
 
 class PeerAbstractCommand : public Command {
 private:
diff --git a/src/PeerReceiveHandshakeCommand.h b/src/PeerReceiveHandshakeCommand.h
index 26b907ad..8784dd99 100644
--- a/src/PeerReceiveHandshakeCommand.h
+++ b/src/PeerReceiveHandshakeCommand.h
@@ -38,7 +38,7 @@
 #include "PeerAbstractCommand.h"
 
 class PeerConnection;
-extern typedef SharedHandle<PeerConnection> PeerConnectionHandle;
+typedef SharedHandle<PeerConnection> PeerConnectionHandle;
 
 class PeerReceiveHandshakeCommand:public PeerAbstractCommand
 {
diff --git a/src/PieceStorage.h b/src/PieceStorage.h
index a440f82a..72aeb4d4 100644
--- a/src/PieceStorage.h
+++ b/src/PieceStorage.h
@@ -40,12 +40,12 @@
 #include "IntSequence.h"
 
 class Piece;
-extern typedef SharedHandle<Piece> PieceHandle;
-extern typedef deque<PieceHandle> Pieces;
+typedef SharedHandle<Piece> PieceHandle;
+typedef deque<PieceHandle> Pieces;
 class Peer;
-extern typedef SharedHandle<Peer> PeerHandle;
+typedef SharedHandle<Peer> PeerHandle;
 class DiskAdaptor;
-extern typedef SharedHandle<DiskAdaptor> DiskAdaptorHandle;
+typedef SharedHandle<DiskAdaptor> DiskAdaptorHandle;
 
 class PieceStorage {
 public:
diff --git a/src/RequestGroup.h b/src/RequestGroup.h
index fc2f5a2e..f74fd171 100644
--- a/src/RequestGroup.h
+++ b/src/RequestGroup.h
@@ -40,32 +40,32 @@
 
 class DownloadEngine;
 class SegmentMan;
-extern typedef SharedHandle<SegmentMan> SegmentManHandle;
+typedef SharedHandle<SegmentMan> SegmentManHandle;
 class SegmentManFactory;
-extern typedef SharedHandle<SegmentManFactory> SegmentManFactoryHandle;
+typedef SharedHandle<SegmentManFactory> SegmentManFactoryHandle;
 class Command;
-extern typedef deque<Command*> Commands;
+typedef deque<Command*> Commands;
 class DownloadContext;
-extern typedef SharedHandle<DownloadContext> DownloadContextHandle;
+typedef SharedHandle<DownloadContext> DownloadContextHandle;
 class PieceStorage;
-extern typedef SharedHandle<PieceStorage> PieceStorageHandle;
+typedef SharedHandle<PieceStorage> PieceStorageHandle;
 class BtProgressInfoFile;
-extern typedef SharedHandle<BtProgressInfoFile> BtProgressInfoFileHandle;
+typedef SharedHandle<BtProgressInfoFile> BtProgressInfoFileHandle;
 class Dependency;
-extern typedef SharedHandle<Dependency> DependencyHandle;
+typedef SharedHandle<Dependency> DependencyHandle;
 class DlAbortEx;
 class PostDownloadHandler;
-extern typedef SharedHandle<PostDownloadHandler> PostDownloadHandlerHandle;
-extern typedef deque<PostDownloadHandlerHandle> PostDownloadHandlers;
+typedef SharedHandle<PostDownloadHandler> PostDownloadHandlerHandle;
+typedef deque<PostDownloadHandlerHandle> PostDownloadHandlers;
 class DiskWriterFactory;
-extern typedef SharedHandle<DiskWriterFactory> DiskWriterFactoryHandle;
+typedef SharedHandle<DiskWriterFactory> DiskWriterFactoryHandle;
 class Option;
 class Logger;
 class RequestGroup;
-extern typedef SharedHandle<RequestGroup> RequestGroupHandle;
-extern typedef deque<RequestGroupHandle> RequestGroups;
+typedef SharedHandle<RequestGroup> RequestGroupHandle;
+typedef deque<RequestGroupHandle> RequestGroups;
 class CheckIntegrityEntry;
-extern typedef SharedHandle<CheckIntegrityEntry> CheckIntegrityEntryHandle;
+typedef SharedHandle<CheckIntegrityEntry> CheckIntegrityEntryHandle;
 
 
 class RequestGroup {
diff --git a/src/RequestGroupMan.h b/src/RequestGroupMan.h
index a533b71c..bb6a2646 100644
--- a/src/RequestGroupMan.h
+++ b/src/RequestGroupMan.h
@@ -40,10 +40,10 @@
 
 class DownloadEngine;
 class RequestGroup;
-extern typedef SharedHandle<RequestGroup> RequestGroupHandle;
-extern typedef deque<RequestGroupHandle> RequestGroups;
+typedef SharedHandle<RequestGroup> RequestGroupHandle;
+typedef deque<RequestGroupHandle> RequestGroups;
 class Command;
-extern typedef deque<Command*> Commands;
+typedef deque<Command*> Commands;
 class Logger;
 
 class RequestGroupMan {
diff --git a/src/Segment.h b/src/Segment.h
index de92686f..156f94c2 100644
--- a/src/Segment.h
+++ b/src/Segment.h
@@ -38,7 +38,7 @@
 #include "common.h"
 
 class Piece;
-extern typedef SharedHandle<Piece> PieceHandle;
+typedef SharedHandle<Piece> PieceHandle;
 
 class Segment {
 public:
diff --git a/src/SegmentMan.h b/src/SegmentMan.h
index 8b135f71..14270a86 100644
--- a/src/SegmentMan.h
+++ b/src/SegmentMan.h
@@ -38,19 +38,19 @@
 #include "common.h"
 
 class Segment;
-extern typedef SharedHandle<Segment> SegmentHandle;
-extern typedef deque<SegmentHandle> Segments;
+typedef SharedHandle<Segment> SegmentHandle;
+typedef deque<SegmentHandle> Segments;
 class Logger;
 class Option;
 class PeerStat;
-extern typedef SharedHandle<PeerStat> PeerStatHandle;
+typedef SharedHandle<PeerStat> PeerStatHandle;
 typedef deque<PeerStatHandle> PeerStats;
 class DownloadContext;
-extern typedef SharedHandle<DownloadContext> DownloadContextHandle;
+typedef SharedHandle<DownloadContext> DownloadContextHandle;
 class PieceStorage;
-extern typedef SharedHandle<PieceStorage> PieceStorageHandle;
+typedef SharedHandle<PieceStorage> PieceStorageHandle;
 class Piece;
-extern typedef SharedHandle<Piece> PieceHandle;
+typedef SharedHandle<Piece> PieceHandle;
 
 #define SEGMENT_FILE_EXTENSION ".aria2"
 
diff --git a/src/StatCalc.h b/src/StatCalc.h
index ba3ce80d..2a5dbc9f 100644
--- a/src/StatCalc.h
+++ b/src/StatCalc.h
@@ -38,11 +38,11 @@
 #include "common.h"
 
 class RequestGroupMan;
-extern typedef SharedHandle<RequestGroupMan> RequestGroupManHandle;
+typedef SharedHandle<RequestGroupMan> RequestGroupManHandle;
 class FileAllocationMan;
-extern typedef SharedHandle<FileAllocationMan> FileAllocationManHandle;
+typedef SharedHandle<FileAllocationMan> FileAllocationManHandle;
 class CheckIntegrityMan;
-extern typedef SharedHandle<CheckIntegrityMan> CheckIntegrityManHandle;
+typedef SharedHandle<CheckIntegrityMan> CheckIntegrityManHandle;
 
 class StatCalc {
 public:
diff --git a/src/StreamFileAllocationEntry.h b/src/StreamFileAllocationEntry.h
index df272883..96afc1e1 100644
--- a/src/StreamFileAllocationEntry.h
+++ b/src/StreamFileAllocationEntry.h
@@ -39,7 +39,7 @@
 #include "TimeA2.h"
 
 class Request;
-extern typedef SharedHandle<Request> RequestHandle;
+typedef SharedHandle<Request> RequestHandle;
 
 class StreamFileAllocationEntry : public FileAllocationEntry {
 private:
diff --git a/src/TrackerWatcherCommand.h b/src/TrackerWatcherCommand.h
index 4cc02f93..7fbcf7f8 100644
--- a/src/TrackerWatcherCommand.h
+++ b/src/TrackerWatcherCommand.h
@@ -41,7 +41,7 @@
 
 class DownloadEngine;
 class RequestGroup;
-extern typedef SharedHandle<RequestGroup> RequestGroupHandle;
+typedef SharedHandle<RequestGroup> RequestGroupHandle;
 
 class TrackerWatcherCommand : public Command,
 			      public BtContextAwareCommand,
diff --git a/src/UnknownLengthPieceStorage.h b/src/UnknownLengthPieceStorage.h
index cf66a1a1..2aec4ede 100644
--- a/src/UnknownLengthPieceStorage.h
+++ b/src/UnknownLengthPieceStorage.h
@@ -39,9 +39,9 @@
 
 class Option;
 class DownloadContext;
-extern typedef SharedHandle<DownloadContext> DownloadContextHandle;
+typedef SharedHandle<DownloadContext> DownloadContextHandle;
 class DiskWriterFactory;
-extern typedef SharedHandle<DiskWriterFactory> DiskWriterFactoryHandle;
+typedef SharedHandle<DiskWriterFactory> DiskWriterFactoryHandle;
 
 class UnknownLengthPieceStorage:public PieceStorage {
 private:
diff --git a/src/Util.h b/src/Util.h
index 143920c1..7bf1a7a8 100644
--- a/src/Util.h
+++ b/src/Util.h
@@ -44,7 +44,7 @@
 #include <ostream>
 
 class Randomizer;
-extern typedef SharedHandle<Randomizer> RandomizerHandle;
+typedef SharedHandle<Randomizer> RandomizerHandle;
 class BitfieldMan;
 
 #define STRTOLL(X) strtoll(X, (char**)NULL, 10)