diff --git a/ChangeLog b/ChangeLog
index d8f43db4..63031ac1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2008-03-11  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
+
+	Included a2time.h
+	* src/DHTMessageDispatcher.h
+	* src/DHTMessageEntry.h
+	* src/DHTReplaceNodeTask.h
+	* src/DHTMessageTracker.h
+	* src/Util.h
+	* src/CookieBox.h
+	* src/SocketCore.h
+	* src/DefaultBtMessageDispatcher.h
+	* src/SocketCore.cc
+	* src/Util.cc
+	* src/DHTPingTask.h
+
 2008-03-11  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
 
 	Fixed high memory footprint when DHT is enabled.
diff --git a/src/CookieBox.h b/src/CookieBox.h
index ab36eff3..a6792f58 100644
--- a/src/CookieBox.h
+++ b/src/CookieBox.h
@@ -38,6 +38,7 @@
 #include "common.h"
 #include "SharedHandle.h"
 #include "Cookie.h"
+#include "a2time.h"
 
 namespace aria2 {
 
diff --git a/src/DHTMessageDispatcher.h b/src/DHTMessageDispatcher.h
index fc8b98c9..1a6c4390 100644
--- a/src/DHTMessageDispatcher.h
+++ b/src/DHTMessageDispatcher.h
@@ -37,6 +37,7 @@
 
 #include "common.h"
 #include "SharedHandle.h"
+#include "a2time.h"
 
 namespace aria2 {
 
diff --git a/src/DHTMessageEntry.h b/src/DHTMessageEntry.h
index 2253e70d..64c32850 100644
--- a/src/DHTMessageEntry.h
+++ b/src/DHTMessageEntry.h
@@ -37,6 +37,7 @@
 
 #include "common.h"
 #include "SharedHandle.h"
+#include "a2time.h"
 
 namespace aria2 {
 
diff --git a/src/DHTMessageTracker.h b/src/DHTMessageTracker.h
index e23c4920..2c1f57f1 100644
--- a/src/DHTMessageTracker.h
+++ b/src/DHTMessageTracker.h
@@ -37,6 +37,7 @@
 
 #include "common.h"
 #include "SharedHandle.h"
+#include "a2time.h"
 #include <utility>
 #include <deque>
 
diff --git a/src/DHTPingTask.h b/src/DHTPingTask.h
index 27232c24..8294a8e3 100644
--- a/src/DHTPingTask.h
+++ b/src/DHTPingTask.h
@@ -37,6 +37,7 @@
 
 #include "DHTAbstractTask.h"
 #include "DHTMessageCallbackListener.h"
+#include "a2time.h"
 
 namespace aria2 {
 
diff --git a/src/DHTReplaceNodeTask.h b/src/DHTReplaceNodeTask.h
index 214207cf..dce4c278 100644
--- a/src/DHTReplaceNodeTask.h
+++ b/src/DHTReplaceNodeTask.h
@@ -37,6 +37,7 @@
 
 #include "DHTAbstractTask.h"
 #include "DHTMessageCallbackListener.h"
+#include "a2time.h"
 
 namespace aria2 {
 
diff --git a/src/DefaultBtMessageDispatcher.h b/src/DefaultBtMessageDispatcher.h
index 4f98b043..e5a0817e 100644
--- a/src/DefaultBtMessageDispatcher.h
+++ b/src/DefaultBtMessageDispatcher.h
@@ -36,6 +36,7 @@
 #define _D_DEFAULT_BT_MESSAGE_DISPATCHER_H_
 
 #include "BtMessageDispatcher.h"
+#include "a2time.h"
 
 namespace aria2 {
 
diff --git a/src/SocketCore.cc b/src/SocketCore.cc
index f792f71a..83c1f80b 100644
--- a/src/SocketCore.cc
+++ b/src/SocketCore.cc
@@ -35,7 +35,6 @@
 #include "SocketCore.h"
 #include "message.h"
 #include "a2netcompat.h"
-#include "a2time.h"
 #include "DlRetryEx.h"
 #include "DlAbortEx.h"
 #include <unistd.h>
diff --git a/src/SocketCore.h b/src/SocketCore.h
index cc4d54a9..4fd53a81 100644
--- a/src/SocketCore.h
+++ b/src/SocketCore.h
@@ -37,6 +37,7 @@
 
 #include "common.h"
 #include "a2netcompat.h"
+#include "a2time.h"
 #include <string>
 #include <utility>
 
diff --git a/src/Util.cc b/src/Util.cc
index c2d18416..9d532270 100644
--- a/src/Util.cc
+++ b/src/Util.cc
@@ -37,7 +37,6 @@
 #include "message.h"
 #include "Randomizer.h"
 #include "a2netcompat.h"
-#include "a2time.h"
 #include "DlAbortEx.h"
 #include "BitfieldMan.h"
 #include "DefaultDiskWriter.h"
diff --git a/src/Util.h b/src/Util.h
index 971cde61..00588531 100644
--- a/src/Util.h
+++ b/src/Util.h
@@ -38,6 +38,7 @@
 #include "common.h"
 #include "SharedHandle.h"
 #include "IntSequence.h"
+#include "a2time.h"
 #include <sys/time.h>
 #include <string>
 #include <utility>