diff --git a/ChangeLog b/ChangeLog
index 9d9a5dcc..b39cb79b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-03  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
+
+	Reorganized includes.
+	* src/NameResolver.cc
+
 2008-03-01  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
 
 	Fixed compilation error without ares/c-ares
diff --git a/src/NameResolver.cc b/src/NameResolver.cc
index 6311e7d0..df77cd0e 100644
--- a/src/NameResolver.cc
+++ b/src/NameResolver.cc
@@ -34,6 +34,7 @@
 /* copyright --> */
 #include "NameResolver.h"
 #include "DlAbortEx.h"
+#include "message.h"
 #include <cstring>
 
 namespace aria2 {
@@ -95,9 +96,6 @@ void NameResolver::reset()
 
 #else // ENABLE_ASYNC_DNS
 
-#include "DlAbortEx.h"
-#include "message.h"
-
 void NameResolver::resolve(const std::string& hostname)
 {
   memset(&_addr, 0, sizeof(in_addr));