Applied patch from Dan Fandrich.

Thanks to Dan Fandrich.
I modified some lines to suite my taste.

13 files changed, 22 insertions, 0 deletions

diff --git a/src/ConsoleStatCalc.h b/src/ConsoleStatCalc.h
index dd134e43..2ee99e7f 100644
--- a/src/ConsoleStatCalc.h
+++ b/src/ConsoleStatCalc.h
@@ -38,6 +38,7 @@
 #include "StatCalc.h"
 
 #include <string>
+#include <functional>
 
 #include "TimerA2.h"
 
diff --git a/src/DHTEntryPointNameResolveCommand.h b/src/DHTEntryPointNameResolveCommand.h
index 40a260e1..79c1b8c7 100644
--- a/src/DHTEntryPointNameResolveCommand.h
+++ b/src/DHTEntryPointNameResolveCommand.h
@@ -40,6 +40,7 @@
 #include <utility>
 #include <vector>
 #include <deque>
+#include <string>
 
 #include "SharedHandle.h"
 
diff --git a/src/DHTMessageReceiver.h b/src/DHTMessageReceiver.h
index 7d7fac2f..8a652c2d 100644
--- a/src/DHTMessageReceiver.h
+++ b/src/DHTMessageReceiver.h
@@ -36,6 +36,9 @@
 #define D_DHT_MESSAGE_RECEIVER_H
 
 #include "common.h"
+
+#include <string>
+
 #include "SharedHandle.h"
 
 namespace aria2 {
diff --git a/src/DHTPeerAnnounceStorage.h b/src/DHTPeerAnnounceStorage.h
index ceae63b1..071954fa 100644
--- a/src/DHTPeerAnnounceStorage.h
+++ b/src/DHTPeerAnnounceStorage.h
@@ -39,6 +39,7 @@
 
 #include <deque>
 #include <vector>
+#include <string>
 
 #include "SharedHandle.h"
 
diff --git a/src/DefaultPeerStorage.h b/src/DefaultPeerStorage.h
index 44f5c6d4..fe6a5eb1 100644
--- a/src/DefaultPeerStorage.h
+++ b/src/DefaultPeerStorage.h
@@ -37,6 +37,7 @@
 
 #include "PeerStorage.h"
 
+#include <string>
 #include <map>
 
 #include "TimerA2.h"
diff --git a/src/DiskWriterFactory.h b/src/DiskWriterFactory.h
index 8e154ec9..2ab57196 100644
--- a/src/DiskWriterFactory.h
+++ b/src/DiskWriterFactory.h
@@ -36,6 +36,9 @@
 #define D_DISK_WRITER_FACTORY_H
 
 #include "common.h"
+
+#include <string>
+
 #include "SharedHandle.h"
 
 namespace aria2 {
diff --git a/src/IteratableChunkChecksumValidator.h b/src/IteratableChunkChecksumValidator.h
index 46f41b5c..841bf671 100644
--- a/src/IteratableChunkChecksumValidator.h
+++ b/src/IteratableChunkChecksumValidator.h
@@ -37,6 +37,8 @@
 
 #include "IteratableValidator.h"
 
+#include <string>
+
 namespace aria2 {
 
 class DownloadContext;
diff --git a/src/Logger.cc b/src/Logger.cc
index a650236c..6161fdcd 100644
--- a/src/Logger.cc
+++ b/src/Logger.cc
@@ -35,6 +35,7 @@
 #include "Logger.h"
 
 #include <cstring>
+#include <cstdio>
 #include <iostream>
 
 #include "DlAbortEx.h"
diff --git a/src/Metalinker.cc b/src/Metalinker.cc
index 5b6adbc6..435c81e5 100644
--- a/src/Metalinker.cc
+++ b/src/Metalinker.cc
@@ -35,6 +35,7 @@
 #include "Metalinker.h"
 #include "MetalinkEntry.h"
 #include <algorithm>
+#include <functional>
 
 namespace aria2 {
 
diff --git a/src/OptionHandler.h b/src/OptionHandler.h
index 725cf22a..46327f8f 100644
--- a/src/OptionHandler.h
+++ b/src/OptionHandler.h
@@ -40,6 +40,7 @@
 #include <string>
 #include <vector>
 #include <iosfwd>
+#include <functional>
 
 #include "SharedHandle.h"
 
diff --git a/src/ParameterizedStringParser.h b/src/ParameterizedStringParser.h
index 91a23db1..11b41dd4 100644
--- a/src/ParameterizedStringParser.h
+++ b/src/ParameterizedStringParser.h
@@ -36,6 +36,9 @@
 #define D_PARAMETERIZED_STRING_PARSER_H
 
 #include "common.h"
+
+#include <string>
+
 #include "PStringDatum.h"
 
 namespace aria2 {
diff --git a/src/RequestGroupMan.cc b/src/RequestGroupMan.cc
index 897d4a6c..2bf6f2a5 100644
--- a/src/RequestGroupMan.cc
+++ b/src/RequestGroupMan.cc
@@ -42,6 +42,7 @@
 #include <fstream>
 #include <numeric>
 #include <algorithm>
+#include <utility>
 
 #include "BtProgressInfoFile.h"
 #include "RecoverableException.h"
diff --git a/src/TrackerWatcherCommand.h b/src/TrackerWatcherCommand.h
index a38bc815..73887f8a 100644
--- a/src/TrackerWatcherCommand.h
+++ b/src/TrackerWatcherCommand.h
@@ -36,6 +36,9 @@
 #define D_TRACKER_WATCHER_COMMAND_H
 
 #include "Command.h"
+
+#include <string>
+
 #include "SharedHandle.h"
 
 namespace aria2 {