diff -r e03176e728c7 gdb/defs.h
--- a/gdb/defs.h	Fri Sep 12 20:42:16 2008 -0700
+++ b/gdb/defs.h	Fri Sep 12 21:24:21 2008 -0700
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <errno.h>		/* System call error return status.  */
 #include <limits.h>
-#include <stdint.h>
+#include <gstdint.h>
 
 #ifdef HAVE_STDDEF_H
 #include <stddef.h>
diff -r e03176e728c7 gdb/gstdint.h
--- a/gdb/gstdint.h	Fri Sep 12 20:42:16 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/* Copyright (C) 2008 Free Software Foundation, Inc.
-
-   This file is part of GDB.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* The libdecnumber library, on which GDB depends, includes a header file
-   called gstdint.h instead of relying directly on stdint.h.  GDB, on the
-   other hand, includes stdint.h directly, relying on the fact that gnulib
-   generates a copy if the system doesn't provide one or if it is missing
-   some features.  Unfortunately, gstdint.h and stdint.h cannot be included
-   at the same time, which may happen when we include a file from
-   libdecnumber.
-
-   The purpose of this file is to override the libdecnumber/gstdint.h file
-   to use stdint.h instead.  Thanks to the order of our include path,
-   files from the GDB source tree have precedence over files from our
-   dependencies.  So the presence of this file will ensure that we
-   consistently use the same stdint.h file when compiling GDB source
-   files.  */
-
-#include <stdint.h>
diff -r e03176e728c7 gdb/Makefile.in
--- a/gdb/Makefile.in	Fri Sep 12 20:42:16 2008 -0700
+++ b/gdb/Makefile.in	Fri Sep 12 21:24:21 2008 -0700
@@ -178,7 +178,7 @@
 
 # Generated headers in the gnulib directory.  These must be listed
 # so that they are generated before other files are compiled.
-GNULIB_H = gnulib/string.h @GNULIB_STDINT_H@
+GNULIB_H = gnulib/string.h
 
 #
 # CLI sub directory definitons
@@ -682,7 +682,7 @@
 cli/cli-decode.h cli/cli-cmds.h cli/cli-utils.h cli/cli-dump.h \
 cli/cli-script.h macrotab.h symtab.h version.h gnulib/wchar.in.h \
 gnulib/string.in.h gnulib/str-two-way.h gnulib/extra/link-warning.h \
-gnulib/stdint.in.h remote.h gdb.h sparc-nat.h gdbserver/win32-low.h \
+remote.h gdb.h sparc-nat.h gdbserver/win32-low.h \
 gdbserver/i387-fp.h gdbserver/server.h gdbserver/terminal.h \
 gdbserver/mem-break.h gdbserver/wincecompat.h gdbserver/target.h \
 gdbserver/linux-low.h gdbserver/gdb_proc_service.h \
diff -r e03176e728c7 gdb/configure.ac
--- a/gdb/configure.ac	Fri Sep 12 20:42:16 2008 -0700
+++ b/gdb/configure.ac	Fri Sep 12 21:24:21 2008 -0700
@@ -76,13 +76,6 @@
 fi
 
 gl_INIT
-
-# For Makefile dependencies.
-GNULIB_STDINT_H=
-if test x"$STDINT_H" != x; then
-  GNULIB_STDINT_H=gnulib/$STDINT_H
-fi
-AC_SUBST(GNULIB_STDINT_H)
 
 PACKAGE=gdb
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package. ])