diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2ab31ce3af76a6a66d688014653e9dc9695f2476..eb23497e1b41b7808bdbe25cb15784fd6952f60b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-11  Roger Sayle  <roger@eyesopen.com>
+
+	* caller-save.c: #include "addresses.h" after #include "tm_p.h".
+
 2006-04-11  Richard Sandiford  <richard@codesourcery.com>
 
 	PR rtl-optimization/27073
diff --git a/gcc/caller-save.c b/gcc/caller-save.c
index d0c33e3cf31221c89808a6721fb71e2824eb6c02..576c6417e4d09928a5a390fad0e46460289cce5c 100644
--- a/gcc/caller-save.c
+++ b/gcc/caller-save.c
@@ -25,7 +25,6 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 #include "tm.h"
 #include "rtl.h"
 #include "regs.h"
-#include "addresses.h"
 #include "insn-config.h"
 #include "flags.h"
 #include "hard-reg-set.h"
@@ -36,6 +35,7 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 #include "expr.h"
 #include "toplev.h"
 #include "tm_p.h"
+#include "addresses.h"
 
 #ifndef MAX_MOVE_MAX
 #define MAX_MOVE_MAX MOVE_MAX