Index: defs.h
===================================================================
RCS file: /cvs/src/src/gdb/defs.h,v
retrieving revision 1.322
diff -u -p -r1.322 defs.h
--- defs.h	22 Aug 2012 17:48:51 -0000	1.322
+++ defs.h	22 Aug 2012 18:35:14 -0000
@@ -27,6 +27,7 @@
 #endif
 
 #include "config.h"		/* Generated by configure.  */
+#include "build-gnulib/config.h"
 
 #include <sys/types.h>
 #include <stdio.h>
Index: gdbserver/server.h
===================================================================
RCS file: /cvs/src/src/gdb/gdbserver/server.h,v
retrieving revision 1.98
diff -u -p -r1.98 server.h
--- gdbserver/server.h	27 Jul 2012 08:09:12 -0000	1.98
+++ gdbserver/server.h	22 Aug 2012 18:35:14 -0000
@@ -21,6 +21,7 @@
 #define SERVER_H
 
 #include "config.h"
+#include "build-gnulib-gdbserver/config.h"
 
 #ifdef __MINGW32CE__
 #include "wincecompat.h"
Index: gdbserver/gdbreplay.c
===================================================================
RCS file: /cvs/src/src/gdb/gdbserver/gdbreplay.c,v
retrieving revision 1.34
diff -u -p -r1.34 gdbreplay.c
--- gdbserver/gdbreplay.c	4 Jan 2012 08:17:23 -0000	1.34
+++ gdbserver/gdbreplay.c	22 Aug 2012 18:35:14 -0000
@@ -19,6 +19,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "config.h"
+#include "build-gnulib-gdbserver/config.h"
+
 #include <stdio.h>
 #if HAVE_SYS_FILE_H
 #include <sys/file.h>