diff --git a/ChangeLog b/ChangeLog
index 051d664f..21ceea24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-24  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
+
+	Fixed compile error on Ubuntu.
+	* src/BtPieceMessage.cc
+	* src/MessageDigestHelper.cc
+	* src/Util.cc
+
 2008-05-21  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
 
 	Fixed compile error when configured with --disable-bittorrent
diff --git a/src/BtPieceMessage.cc b/src/BtPieceMessage.cc
index 6a81c194..1b43def5 100644
--- a/src/BtPieceMessage.cc
+++ b/src/BtPieceMessage.cc
@@ -52,6 +52,7 @@
 #include "PeerConnection.h"
 #include "StringFormat.h"
 #include <cstring>
+#include <cstdlib>
 
 namespace aria2 {
 
diff --git a/src/MessageDigestHelper.cc b/src/MessageDigestHelper.cc
index 3b54baf5..cb6ebb67 100644
--- a/src/MessageDigestHelper.cc
+++ b/src/MessageDigestHelper.cc
@@ -41,6 +41,7 @@
 #include "StringFormat.h"
 #include <cerrno>
 #include <cstring>
+#include <cstdlib>
 
 namespace aria2 {
 
diff --git a/src/Util.cc b/src/Util.cc
index a8a947ab..a6ce84d9 100644
--- a/src/Util.cc
+++ b/src/Util.cc
@@ -45,9 +45,12 @@
 #include "StringFormat.h"
 #include "A2STR.h"
 #include <signal.h>
+#include <limits.h>
+#include <stdint.h>
 #include <cerrno>
 #include <cassert>
 #include <cstring>
+#include <cstdlib>
 #include <iomanip>
 #include <sstream>
 #include <algorithm>