diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c452d995b8..a6445cd0f1 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2008-08-25  Pedro Alves  <pedro@codesourcery.com>
+
+	* cp-name-parser.y: Include config.h before system headers.
+
 2008-08-25  Ulrich Weigand  <uweigand@de.ibm.com>
 
 	* m88k-tdep.c: Update for unwinder changes.
diff --git a/gdb/cp-name-parser.y b/gdb/cp-name-parser.y
index 1cfbcfbce8..023e306e11 100644
--- a/gdb/cp-name-parser.y
+++ b/gdb/cp-name-parser.y
@@ -31,12 +31,13 @@ Boston, MA 02110-1301, USA.  */
 
 %{
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 
-#include "config.h"
 #include "safe-ctype.h"
 #include "libiberty.h"
 #include "demangle.h"