diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7dd1b32d6ae..80215df4c08 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2016-10-18  Pedro Alves  <palves@redhat.com>
+
+	* common/common-defs.h (__STDC_CONSTANT_MACROS)
+	(__STDC_LIMIT_MACROS): Delete.
+
 2016-10-18  Pedro Alves  <palves@redhat.com>
 
 	* gnulib/update-gnulib.sh (GNULIB_COMMIT_SHA1): Set to
diff --git a/gdb/common/common-defs.h b/gdb/common/common-defs.h
index 5426dd5d98a..9b5d853c255 100644
--- a/gdb/common/common-defs.h
+++ b/gdb/common/common-defs.h
@@ -31,23 +31,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
-
-/* From:
-    https://www.gnu.org/software/gnulib/manual/html_node/stdint_002eh.html
-
-   "On some hosts that predate C++11, when using C++ one must define
-   __STDC_CONSTANT_MACROS to make visible the definitions of constant
-   macros such as INTMAX_C, and one must define __STDC_LIMIT_MACROS to
-   make visible the definitions of limit macros such as INTMAX_MAX."
-
-   gnulib doesn't fix this for us correctly yet.  See:
-     https://lists.gnu.org/archive/html/bug-gnulib/2015-11/msg00004.html
-
-   Meanwhile, explicitly define these ourselves, as C99 intended.  */
-#define __STDC_CONSTANT_MACROS 1
-#define __STDC_LIMIT_MACROS 1
 #include <stdint.h>
-
 #include <string.h>
 #ifdef HAVE_STRINGS_H
 #include <strings.h>	/* for strcasecmp and strncasecmp */