diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index de2b029525ee51290cc97c666750ded904bbcdee..42b88a3b31af04e4072e4c306e43da1acc4e9ad7 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-13  J. Brobecker  <brobecker@gnat.com>
+
+	* aix-thread.c: #include "gdb_string.h". Needed for memset and memcopy.
+	* Makefile.in (aix-thread.o): Add dependency on gdb_string.h.
+
 2004-05-13  Andrew Cagney  <cagney@redhat.com>
 
 	* infrun.c (handle_inferior_event): Check for
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 07e57a44a8891d193f932d8c046b06a4a4f07a01..fef46ae52b81762c67ee1233407395c32814d4c8 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1505,7 +1505,7 @@ ada-valprint.o: ada-valprint.c $(defs_h) $(symtab_h) $(gdbtypes_h) \
 	$(annotate_h) $(ada_lang_h) $(c_lang_h) $(infcall_h)
 aix-thread.o: aix-thread.c $(defs_h) $(gdb_assert_h) $(gdbthread_h) \
 	$(target_h) $(inferior_h) $(regcache_h) $(gdbcmd_h) $(language_h) \
-	$(ppc_tdep_h)
+	$(ppc_tdep_h) $(gdb_string_h)
 alphabsd-nat.o: alphabsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) \
 	$(alpha_tdep_h) $(alphabsd_tdep_h) $(gregset_h)
 alphabsd-tdep.o: alphabsd-tdep.c $(defs_h) $(alpha_tdep_h) \
diff --git a/gdb/aix-thread.c b/gdb/aix-thread.c
index d95f7e39b1253ddd7009662e1893cea67635cfbc..5e8fadffe301864db9f9b7fd7b4b2fdd28b14b3f 100644
--- a/gdb/aix-thread.c
+++ b/gdb/aix-thread.c
@@ -50,6 +50,7 @@
 #include "gdbcmd.h"
 #include "language.h"		/* for local_hex_string() */
 #include "ppc-tdep.h"
+#include "gdb_string.h"
 
 #include <procinfo.h>
 #include <sys/types.h>