diff -ur libherdstat-0.2.0.orig/herdstat/exceptions.cc libherdstat-0.2.0/herdstat/exceptions.cc
--- libherdstat-0.2.0.orig/herdstat/exceptions.cc	2009-02-02 23:34:47.440005860 +0100
+++ libherdstat-0.2.0/herdstat/exceptions.cc	2009-02-02 23:39:42.884039379 +0100
@@ -25,6 +25,7 @@
 #endif
 
 #include <string>
+#include <cstring>
 #include <cerrno>
 #include <cstdarg>
 #include <herdstat/exceptions.hh>
diff -ur libherdstat-0.2.0.orig/herdstat/exceptions.hh libherdstat-0.2.0/herdstat/exceptions.hh
--- libherdstat-0.2.0.orig/herdstat/exceptions.hh	2009-02-02 23:34:47.424006130 +0100
+++ libherdstat-0.2.0/herdstat/exceptions.hh	2009-02-02 23:36:16.781046472 +0100
@@ -32,6 +32,7 @@
  * @brief Defines exception classes used in libherdstat.
  */
 
+#include <cstdio>
 #include <exception>
 #include <stdexcept>
 #include <sys/types.h>
diff -ur libherdstat-0.2.0.orig/herdstat/portage/project_xml.cc libherdstat-0.2.0/herdstat/portage/project_xml.cc
--- libherdstat-0.2.0.orig/herdstat/portage/project_xml.cc	2009-02-02 23:34:47.440005860 +0100
+++ libherdstat-0.2.0/herdstat/portage/project_xml.cc	2009-02-02 23:39:04.448143336 +0100
@@ -24,6 +24,7 @@
 # include "config.h"
 #endif
 
+#include <ctime>
 #include <iostream>
 #include <herdstat/util/string.hh>
 #include <herdstat/util/file.hh>
diff -ur libherdstat-0.2.0.orig/herdstat/util/algorithm.hh libherdstat-0.2.0/herdstat/util/algorithm.hh
--- libherdstat-0.2.0.orig/herdstat/util/algorithm.hh	2009-02-02 23:34:47.432005960 +0100
+++ libherdstat-0.2.0/herdstat/util/algorithm.hh	2009-02-02 23:38:08.480217667 +0100
@@ -32,6 +32,7 @@
  * @brief Defines the general purpose algorithms.
  */
 
+#include <algorithm>
 #include <iterator>
 
 namespace herdstat {
diff -ur libherdstat-0.2.0.orig/herdstat/util/misc.hh libherdstat-0.2.0/herdstat/util/misc.hh
--- libherdstat-0.2.0.orig/herdstat/util/misc.hh	2009-02-02 23:34:47.432005960 +0100
+++ libherdstat-0.2.0/herdstat/util/misc.hh	2009-02-02 23:36:53.952007375 +0100
@@ -34,6 +34,7 @@
 
 #include <string>
 #include <map>
+#include <ctime>
 
 enum ASCIIColor
 {
diff -ur libherdstat-0.2.0.orig/herdstat/util/string.hh libherdstat-0.2.0/herdstat/util/string.hh
--- libherdstat-0.2.0.orig/herdstat/util/string.hh	2009-02-02 23:34:47.432005960 +0100
+++ libherdstat-0.2.0/herdstat/util/string.hh	2009-02-02 23:35:58.296045935 +0100
@@ -40,6 +40,7 @@
 #include <cerrno>
 #include <cctype>
 #include <cstring>
+#include <climits>
 
 #include <herdstat/exceptions.hh>