diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index b252f5d2380..708d557047b 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2012-04-13  Yao Qi  <yao@codesourcery.com>
+
+	* tracepoint.c: Include stdint.h unconditionally.
+
 2012-04-13  Thiago Jung Bauermann  <thiago.bauermann@linaro.org>
 
 	* acinclude.m4 (GDBSERVER_HAVE_THREAD_DB_TYPE): New macro based
diff --git a/gdb/gdbserver/tracepoint.c b/gdb/gdbserver/tracepoint.c
index 33173c6a0d8..280c281d65d 100644
--- a/gdb/gdbserver/tracepoint.c
+++ b/gdb/gdbserver/tracepoint.c
@@ -24,9 +24,8 @@
 #include <unistd.h>
 #include <sys/time.h>
 #include <stddef.h>
-#if HAVE_STDINT_H
 #include <stdint.h>
-#endif
+
 #include "ax.h"
 
 /* This file is built for both GDBserver, and the in-process