diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 555e184660d9e63af569e98307ef9f33fb6e6f45..4fa2c777632ad1fc7601cc5587fbe105a7ebb00d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-02  Richard Guenther  <rguenther@suse.de>
+
+	* g++.dg/plugin/header_plugin.c: Include cp-tree.h before
+	diagnostic.h.
+
 2010-06-02  Iain Sandoe  <iains@gcc.gnu.org>
 
 	* lib/lto.exp (lto-link-and-maybe-run): Show the options in
diff --git a/gcc/testsuite/g++.dg/plugin/header_plugin.c b/gcc/testsuite/g++.dg/plugin/header_plugin.c
index a9340307e8ce8dcb787d7c93d08c079b86352f55..71a0c3bf2f48f2c78e82bcb3ae11eeaf9efdebf9 100644
--- a/gcc/testsuite/g++.dg/plugin/header_plugin.c
+++ b/gcc/testsuite/g++.dg/plugin/header_plugin.c
@@ -11,6 +11,7 @@
 #include "tm.h"
 
 /* gcc/ headers. */
+#include "cp/cp-tree.h"
 #include "diagnostic.h"
 #include "c-common.h"
 #include "c-pretty-print.h"
@@ -18,7 +19,6 @@
 #include "plugin.h"
 #include "tree-flow.h"
 #include "langhooks.h"
-#include "cp/cp-tree.h"
 #include "cp/cxx-pretty-print.h"
 #include "cp/name-lookup.h"