diff --git a/gold/ChangeLog b/gold/ChangeLog
index 486812a5cc5..07bfd19feed 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-22  Ian Lance Taylor  <iant@google.com>
+
+	* gold.h: Include <cstddef> and <sys/types.h>
+	* options.h: Include <cstring>.
+
 2008-03-21  Ian Lance Taylor  <iant@google.com>
 
 	* Added source code to GNU binutils.
diff --git a/gold/gold.h b/gold/gold.h
index 6a96f1bc498..b34e0320b06 100644
--- a/gold/gold.h
+++ b/gold/gold.h
@@ -26,6 +26,9 @@
 #include "config.h"
 #include "ansidecl.h"
 
+#include <cstddef>
+#include <sys/types.h>
+
 #ifdef ENABLE_NLS
 # include <libintl.h>
 # define _(String) gettext (String)
diff --git a/gold/options.h b/gold/options.h
index 22866497353..ee48d112490 100644
--- a/gold/options.h
+++ b/gold/options.h
@@ -37,6 +37,7 @@
 #define GOLD_OPTIONS_H
 
 #include <cstdlib>
+#include <cstring>
 #include <list>
 #include <string>
 #include <vector>